gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /app-admin
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
215 files changed, 6969 insertions, 4098 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index bae7fc8a921f..ee1f62d9fcd7 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index 029b39de0fea..525c74e60cec 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -1,9 +1,5 @@
 AUX abrt-2.0.12-r1-conf 687 BLAKE2B 771c5370e3f7f181c22f8a56d8a13a02759aed2fdd5f7182d4bf9e7bebf1f80f6178acbce4ffddff7ab292c773685148621d53528b96c3099d96dcd0f26b1280 SHA512 8dc19a07ca57a7a95184366e747f20e36b97eea6423aafb88390f9754f90bfa76b6d0c33806c714fcadfebeebda05e989b282bf07cd0ce50cf01efa8721357f2
 AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b90014619aa87614f0a8e1c6e9bb79afa964e5c0324ca090fefa9b90f2705c7388b488709f31619d824850e3e8 SHA512 a6f7c4029f974af083f33020756bc0eaa877c23f658d6b92388627e3a923aae499dd44e1b0e22af792a6c431a683ebe4604d6dec62bf09f70a2a5209cd45be81
-DIST abrt-2.14.0.tar.gz 6102393 BLAKE2B 6bba45604406c1f2f84d778475acc6b5db3747f292fcb74a881703491b2d92adda3cc88d6ed741087c1ed2f88a68cdc4858f3640b506a6be650ea4d1d1f2bfd3 SHA512 26cf04ef6f52da445e825d5f1074186c4c77d1b093174bb6f7b0a8fa6175e265fcaf56fa4a977851a2352f9fd004425bc397e35a91f6f8e78f37564cd492c571
-DIST abrt-2.14.1.tar.gz 6113024 BLAKE2B ddceda689fa51b04a0c201fe560c31ba5c8233c1f75c878b391b0b61cff241e6c2ce5b1829faa6e5f286c3c5efe96941c823234affe94b59fdd2aa3d7cd33cc3 SHA512 24126a54778b7e612c8b950321686bdee7ce15a16e79c8d967f8126c89f7da7060270fc0929cfabfc35100d069b0a626c3380833a3f62614cea6b00a44238ec3
 DIST abrt-2.14.2.tar.gz 6113632 BLAKE2B 904ec2ca4c3aa70b62573ca2730742689f4446c1e5f04bfb6dc4267a4a9a6d44ef8c2b6e82c1e0aba04876b400c3a965a879da65bbff7ec729846f1b5c28cdf9 SHA512 82ba10cb151b4585024e3dfc626f46a7d967797e0375158cd76355c4f6a66c59578cc7b41bc5d5aaa3e694b3653b8658650df458676225660cfe95ec318c6886
-EBUILD abrt-2.14.0.ebuild 3158 BLAKE2B 61454e86d94458b541971bd1b249864ad141cd0ac30a19929c65d49c30336441ad2c1d17170d54302d73bce65bd7f0785e5564865608158c5ffb852e05036bf4 SHA512 0917826e044cadd00bb4b87271e4a76c59fa07629186a49475d941785c90b0f9c0c111dc96c4efaf68442a545d1494484c9fab3397a6088f5b6803660ce2f57e
-EBUILD abrt-2.14.1.ebuild 3160 BLAKE2B e4091dd74e7cad18a4ec51bb5d220b746afa11e200649d3e088e2c67bceaf94466228e5979979e6d59cc8bf6cb7c389c7eb15f0500ed5d3c9872e91061529f32 SHA512 ec18ee6df3ec45164caf460bb6159473e54398fcbcb719f3acb93b3986b18333aece2efdf96b97cbb040e3adacdf9215935ac452431c7d24a1940dc41f69c021
 EBUILD abrt-2.14.2.ebuild 3161 BLAKE2B 4106e0fd301e1c8007faef3570cdbe024b2f6e14d6e1dd1e0919c8c0739ec7c48daad5c6163fe88d68eb97074c12bdb70b7628a321fef40662c66b5bd0186275 SHA512 4001b1d60b6559a36947264cc008e9417b9d6bb6cbf353b73d9fc7ca7127c6b6b5260565ebb5c3ffcf021082210169d0ff716151f03843092e3f706f2e1973b9
 MISC metadata.xml 327 BLAKE2B e5a24f189c128e35fd3b878143c5d99da897af8535258f7eece0153df8a5b2dfc8b4f19000c60a6fcb70bb4f0b9efad98d2deab9e36dd205615e4176a06c0c45 SHA512 687cee8b12e63a46b815a1d6099a2853ed72d3d19d118e4e0cdbe67f501475ed02949848a4537a7c5eef0ac4a398edab868f816bdff277e3c1b348e5ab73ee40
diff --git a/app-admin/abrt/abrt-2.14.0.ebuild b/app-admin/abrt/abrt-2.14.0.ebuild
deleted file mode 100644
index 2664d60151a3..000000000000
--- a/app-admin/abrt/abrt-2.14.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools python-single-r1 systemd xdg-utils
-
-DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="selinux test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libreport-2.10.0[gtk,python]
-	dev-libs/libxml2:2
-	>=gnome-base/gsettings-desktop-schemas-3.15.1
-	net-libs/libsoup:2.4
-	sys-apps/dbus
-	sys-apps/systemd:0=
-	sys-auth/polkit
-	sys-libs/libcap
-	sys-fs/inotify-tools
-	x11-libs/gtk+:3
-"
-RDEPEND="${DEPEND}
-	acct-user/abrt
-	acct-group/abrt
-	app-arch/cpio
-	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
-	dev-libs/elfutils
-	dev-libs/json-c:0=
-	sys-apps/util-linux
-	>=sys-devel/gdb-7
-	$(python_gen_cond_dep '
-			dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
-			dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-			dev-python/argh[${PYTHON_MULTI_USEDEP}]
-			dev-python/humanize[${PYTHON_MULTI_USEDEP}]
-	')
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
-	)
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-	default
-
-	# Install under proper directory
-	sed -i -e 's:dbusabrtdocdir = ${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = ${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die
-
-	# Ensure this works for systems with and without /usr merge
-	sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service || die
-
-	# Fix hardcoded "pytest-3"
-	sed -i -e "s:pytest-3:pytest:" \
-		configure.ac src/python-problem/tests/Makefile.am src/cli/test || die
-
-	# pyhook test is sensitive to the format of python's error messages, and
-	# fails with certain python versions
-	sed -e '/pyhook.at/ d' \
-		-i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
-	./gen-version || die # Needed to be run before autoreconf
-	eautoreconf
-}
-
-src_configure() {
-	myeconfargs=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-bodhi
-		# package breaks due to not finding libreport-web with bodhi plugin enabled
-		--without-rpm
-		$(usex selinux "" "--without-selinux")
-		--with-python3
-		--without-pythondoc
-		# package breaks due to no sphinx-build-3
-		$(use_with test pythontests)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	keepdir /var/run/abrt
-	# /var/spool/abrt is created by dev-libs/libreport
-
-	diropts -m 700 -o abrt -g abrt
-	keepdir /var/spool/abrt-upload
-
-	diropts -m 775 -o abrt -g abrt
-	keepdir /var/cache/abrt-di
-
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
-	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-admin/abrt/abrt-2.14.1.ebuild b/app-admin/abrt/abrt-2.14.1.ebuild
deleted file mode 100644
index 0c87155270c0..000000000000
--- a/app-admin/abrt/abrt-2.14.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit autotools python-single-r1 systemd xdg-utils
-
-DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="selinux test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libreport-2.10.0[gtk,python]
-	dev-libs/libxml2:2
-	>=gnome-base/gsettings-desktop-schemas-3.15.1
-	net-libs/libsoup:2.4
-	sys-apps/dbus
-	sys-apps/systemd:0=
-	sys-auth/polkit
-	sys-libs/libcap
-	sys-fs/inotify-tools
-	x11-libs/gtk+:3
-"
-RDEPEND="${DEPEND}
-	acct-user/abrt
-	acct-group/abrt
-	app-arch/cpio
-	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
-	dev-libs/elfutils
-	dev-libs/json-c:0=
-	sys-apps/util-linux
-	>=sys-devel/gdb-7
-	$(python_gen_cond_dep '
-			dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
-			dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-			dev-python/argh[${PYTHON_MULTI_USEDEP}]
-			dev-python/humanize[${PYTHON_MULTI_USEDEP}]
-	')
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
-	)
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-	default
-
-	# Install under proper directory
-	sed -i -e 's:dbusabrtdocdir = ${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = ${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die
-
-	# Ensure this works for systems with and without /usr merge
-	sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service || die
-
-	# Fix hardcoded "pytest-3"
-	sed -i -e "s:pytest-3:pytest:" \
-		configure.ac src/python-problem/tests/Makefile.am src/cli/test || die
-
-	# pyhook test is sensitive to the format of python's error messages, and
-	# fails with certain python versions
-	sed -e '/pyhook.at/ d' \
-		-i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
-	./gen-version || die # Needed to be run before autoreconf
-	eautoreconf
-}
-
-src_configure() {
-	myeconfargs=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-bodhi
-		# package breaks due to not finding libreport-web with bodhi plugin enabled
-		--without-rpm
-		$(usex selinux "" "--without-selinux")
-		--with-python3
-		--without-pythondoc
-		# package breaks due to no sphinx-build-3
-		$(use_with test pythontests)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	keepdir /var/run/abrt
-	# /var/spool/abrt is created by dev-libs/libreport
-
-	diropts -m 700 -o abrt -g abrt
-	keepdir /var/spool/abrt-upload
-
-	diropts -m 775 -o abrt -g abrt
-	keepdir /var/cache/abrt-di
-
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
-	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-admin/aerospike-amc-community/Manifest b/app-admin/aerospike-amc-community/Manifest
index 1fe1ed42f51f..085e2087bcd1 100644
--- a/app-admin/aerospike-amc-community/Manifest
+++ b/app-admin/aerospike-amc-community/Manifest
@@ -1,6 +1,4 @@
-AUX amc.init 562 BLAKE2B f4aed655b924f345905aa8d3f149799ad299086cca1555e4902e09b376a47e2da8a34445446b00f7508cf4b6ef1d7eb83df93ae6af7c89d9b6e23d027ea5ce45 SHA512 4f50237b23ec1d2257791266ee5ee4c8b963bb0429c7386d50e4ba74ee8a451cd99a8dde277ed92b490a9b40bf33f5f6920e66c777e388bae43cfe402d255094
 AUX amc.init.4 401 BLAKE2B a649832bdbc6dc33de0f87ac0037b1c38212b97abdec16d25d714db6c183fcaed0eb8374d7fecccaf8c8cdeff2c125007b4a924e208721e9d6a8e83befb93dc6 SHA512 00cca21719821efff950d272bfe1c35bbedaf5597507d2b19ecdf6f6c2e7ac7c1c1bdd42474177551e55b9751060ec396add7f4cc94f693537c105f5cbe1bac6
-AUX amc.init2 583 BLAKE2B 0745a48ecfdc060ac9995c0634761d9b16d7d190df9d6a3d8fd7ec415fda486157e22f6f7ff03b2d4a3afe93632a67e7ad07214831007101bd9ebc71557f6003 SHA512 c91d1e66a6bcd286efec425295fc168c7d277f0d4886c9e0cd43f49e58b9c9ae0b0c2c453d278404d4d07935c55baf91bffe272699de095df13028316cc0d317
 DIST aerospike-amc-community-4.0.19.tar.gz 7868527 BLAKE2B 69835bdf3d7f1a4b23cd63bb7344c50b6bbbdc04fd55b2d6ec5783a429a442fa6cdf985c77cb4ac73f8ac0663ed2524c8d7a853e970cc086335cf810fd9eaecf SHA512 821de8569bf020b9a2b829e71aab5d48d25639620468aa0b3ed28dc24e0d57bc61be60939425c0a69c418602fa2fbf5ef60f1870edb3f04fa40a2a2aca281218
 EBUILD aerospike-amc-community-4.0.19-r1.ebuild 539 BLAKE2B f68e4bdeed829f5340c2ce1dd15773da038a1755e7682aa4cc02236e7654ff956f87582be75bcea950c1aafd9f8b26848039990354ac780a9574425ae93b3a55 SHA512 89c275ed1d9706a4cd9bf068f0ab6d7931f6a7b346248b5ced94163e98434461b2c22226c0c83a75cec4f5f13a0efec63ab3a09c8537d513fe6bc1dcdd4681f4
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/app-admin/aerospike-amc-community/files/amc.init b/app-admin/aerospike-amc-community/files/amc.init
deleted file mode 100644
index 06c14001f5d6..000000000000
--- a/app-admin/aerospike-amc-community/files/amc.init
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-config_file=${config_file:-/etc/amc/config/gunicorn_config.py}
-run_dir=${run_dir:-/run}
-
-command="/usr/bin/gunicorn"
-command_args="--daemon --config ${config_file} flaskapp:app"
-command_background="true"
-pidfile=${run_dir}/${SVCNAME}.pid
-user=${user:-root}
-group=${group:-root}
-start_stop_daemon_args="--user ${user} --group ${group}"
-required_files="${config_file}"
-
-depend() {
-	use net
-}
-
-start_post() {
-	ewaitfile 60 "${pidfile}"
-}
diff --git a/app-admin/aerospike-amc-community/files/amc.init2 b/app-admin/aerospike-amc-community/files/amc.init2
deleted file mode 100644
index 3e3bdd9920a3..000000000000
--- a/app-admin/aerospike-amc-community/files/amc.init2
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-config_file=${config_file:-/etc/amc/config/gunicorn_config.py}
-run_dir=${run_dir:-/run}
-
-command="/usr/bin/gunicorn"
-command_args="--daemon --config ${config_file} flaskapp:app"
-command_progress="true"
-retry='TERM/30/KILL/5'
-pidfile=${run_dir}/${SVCNAME}.pid
-user=${user:-root}
-group=${group:-root}
-start_stop_daemon_args="--user ${user} --group ${group}"
-required_files="${config_file}"
-
-depend() {
-	use net
-}
-
-start_post() {
-	ewaitfile 60 "${pidfile}"
-}
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index 96437737fdb5..baaa17b89c69 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,5 +1,5 @@
-DIST ansible-base-2.10.0.tar.gz 5775091 BLAKE2B 2a087b1a9d675c5218e8700f5b455ff280a5dc6e66b575a47755b9936c54594300e3c22acadbe14acfd335c3be788e3d63f6ad3c5c51650cbc036c77ceec41ef SHA512 f9e9631f9ce77e55b06d01814422cbc0ca170e3fbbbd5886e4f87065b68b4d7eefe1c782f6dce14241cc548192c7b06ef778446636be02a342d4bd112000126e
-DIST ansible-base-2.10.1.tar.gz 5980851 BLAKE2B 478c9ca6ebf423dea98830ed0447201dfb8db24f963f2fc849e0eab395611c1fb923c5060c397e12138c3e98d7118e367c4713f44ad07ca914e20c3044e74bba SHA512 77bc2f3f6b924299add7e3a57beaf4a0517b036027a785c177874ae6a07a06679de65770a296f81ab0022cb0b495f17e2ceb772f906172fbf46fb65609be1ce2
-EBUILD ansible-base-2.10.0.ebuild 1877 BLAKE2B 41d5f94fbd49411c1d796dad14cfddf8c1279e043500360d6daf7ca445d7b460388a7eac22ee7a3fbaddd9f3e125b3523821706e61c7014f070581a3f44d4756 SHA512 9a02e1576700fcb9fed6ee86d90b6bd9ce533a354ea37c6012ac007e706aa64ed1862f2502c8f95121dc01ddfd89d86de12f3136b63fd4006799dcc15ae938e2
-EBUILD ansible-base-2.10.1.ebuild 1879 BLAKE2B f6b0bd28b79238cff7d918209757a8cf8b37ce9d3b23644e242afb799ae7d4fe5eb7978ceeb49ab1644fc7dab068035578217e5afe9962e408d8da34b552e7df SHA512 99ae5fa5f41f025a8483c561fcdfa33211e7c0ee44dd351fb5dce8c0e71104b6b27a62ee91310840271a374ec6ac0f89a9ceeba9800f521e22f879c16734878f
+DIST ansible-base-2.10.2.tar.gz 6023200 BLAKE2B 80abfa3fab56d3f997cbe90b557ffd5004b216709d6ba2c6d50ea0fb7a2e5a2ad49ce83bfc7a17054582e786f53ce29814d8b5a3fc2408a1e729b1647619080c SHA512 2ee60303841e88d3451ddbcc4c18473d3a37253873406b0783816b1bbf9d8404599ebed12bac7c7f32693314048668b84f3a1c593621c7b8c37a7b48687c769b
+DIST ansible-base-2.10.3.tar.gz 5836841 BLAKE2B 000ee1e369beb450a9a58680030fc7605f62020a28f0ec4634569be0b12ca54c79d0c36a6022895f93b6f8449b8f8483e07590eeea233383490600bbce600aff SHA512 4da2c79c7d990bbe07e136447643484d947e512693194017623deadd88d6556dac67865069182059ae2daf82a13876600dc5472712d6ab6e0556cb829fce3b5b
+EBUILD ansible-base-2.10.2.ebuild 1943 BLAKE2B 30d354d1f5dbd1d9245552b7a992d88f3184655344f29b13f5dd8f2ccc3c838ff4c715a5cc0c72d9b7932a72075b0f769a7c759b248e60dbd80a0b3f003c9216 SHA512 ebdf8075dbf9abd8006b9a2dcf6f8417a2b9fb596ca3e79fe4a1c60e2f80cff1f8192080b0b492dd43c36366c78b9405759834cb0ce5ed213e10682355d6e050
+EBUILD ansible-base-2.10.3.ebuild 1946 BLAKE2B a6027d8b698968a9096acfac7f206704f9ab46a187e5df8c982469e4afa522d2de9e634ebf3d44de3739bdecef79bb86f053c968bbd244b9e67316cbcd42e731 SHA512 70bfc7aee70fb3dbe70b393fb16bddab0e9d7b809671e3e31b9f9e931f0d6649c069c66f1272392b160274b77adcc29083118f8c202debc98b34f7c2926a0dc2
 MISC metadata.xml 1266 BLAKE2B 449ac5109e0fb6b64d32185f0660ce6e8c3828a830f8516d680f47ebc25aef880ab5116103d67cfba02e04b1ad496917fbf67252b7bfc062d828e22f15b961fd SHA512 95d52b68b5b3efad6d8575741430b2d1c18a7c7b41a1374229763fea7c599f3ff2b46dee51845e20388829faa4246e5a05011e61254e91d10709457a4b822f0f
diff --git a/app-admin/ansible-base/ansible-base-2.10.0.ebuild b/app-admin/ansible-base/ansible-base-2.10.2.ebuild
index 3610e3b40b00..6843d55c4702 100644
--- a/app-admin/ansible-base/ansible-base-2.10.0.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 eutils
 
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
@@ -29,10 +29,11 @@ RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
-	!app-admin/ansible
+	!<app-admin/ansible-2.10
 "
+# ansible-2.10 or above is needed for the collections
 DEPEND="
-	!app-admin/ansible
+	!<app-admin/ansible-2.10
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	doc? (
diff --git a/app-admin/ansible-base/ansible-base-2.10.1.ebuild b/app-admin/ansible-base/ansible-base-2.10.3.ebuild
index 2cfa0593cbec..c30b5bcbb879 100644
--- a/app-admin/ansible-base/ansible-base-2.10.1.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 eutils
 
@@ -29,10 +29,11 @@ RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
-	!app-admin/ansible
+	!<app-admin/ansible-2.10
 "
+# ansible-2.10 or above is needed for the collections
 DEPEND="
-	!app-admin/ansible
+	!<app-admin/ansible-2.10
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	doc? (
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index c1afa7e4c554..b3d3d1a1d5ca 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,8 +1,7 @@
+AUX ansible-2.10.0-CVE-2020-25635-6.patch 2961 BLAKE2B bd023424bb075a743881056d6e0c0c194ae56cde0ed3b9aad2ef5a2f75d6a63994a0455a896e6e9f16cacd0f1c3438eb45cd2352d4f4b53810f19728b5a7de5e SHA512 36bb9321e9524d04f06d7156ad6f7f72ce4bd75332437a33ff49c226e12e8e4f8cd82976ccb0c02076ee95de762988d6783a2ed00453b1b8893fe8127847bc30
 DIST ansible-2.10.0.tar.gz 25454980 BLAKE2B 91f930518b90b36aa2c21f553092233059fada86fd1674c9c6e881484b1bd4e68a3eaa05d82e15115906e55da99c43394c3de36a898e26bb222f780b82f8a5bd SHA512 878036f06e1705e4392223bda210b2acae0232069d0cec02a47f13f6b3bc6c9538fb515a2d2dc6003695bcf0915fdd3dfc5b8dc59355e37e2ca8fa48bbd79657
-DIST ansible-2.9.12.tar.gz 14260349 BLAKE2B 6d7fdc82489df755196b890b39c166e9639c94e4238b4bf33686a3ab17fcc92c6b3a05f80e1276795b966aaa318ec7d9003099950102c014adb1a5d730928633 SHA512 6c05c49e363d4d68516dfea448cead3e2c281d1288c9467a0b6dd083504f303df694ed1c5957ae6582b28acc937d12d13333254328e13bac430b9b7fa4354f23
-DIST ansible-2.9.13.tar.gz 14261322 BLAKE2B 5de939a99cd703eaf240f536a9a4b707e3931364647782dde2bbebd5b755253594cbb1cf8c4e9f22a14fca85c9f018ee6ea26bce1cbe2145ba72e5f5ec313670 SHA512 cb08adf62df0f3650425a5d960baadd7439c7c1e95b8f9df3d08e7504f9622b9e5f7104b8700b0f1e9fe318d349a6a5728e9178f0193fb4a190456e30a2f1eb2
-EBUILD ansible-2.10.0.ebuild 1793 BLAKE2B d28af2621729fe04a885e1c453aa95b7541ffea6064d127046882793b472c37b7cee7df68088bada6111946cee1671d1382a1413527a22c1cebdf2465fc083f7 SHA512 e5a0c899b16e2948e03601559d525d3f46e430e4a805872d30b76dbc65afaa30850de7234ca92f6a6782eef3e7ab38fe565f13eb51899714bc1e3a20a91b6e71
-EBUILD ansible-2.9.12.ebuild 1761 BLAKE2B 6107712ccf535e58d00972c73b6a07b40d09b1b3180a69a4cbb0909d9de532d1f4c2699e51ad2b280fa66ff854d69a5e65c01530a527f600e45ba31c5fba8f5e SHA512 a53f8f993f8f77ddbeb41948a2a1dc1943f86784984ecad49ccd099d65af2faba7467f927193fa25bee6125baf9c9ee460986ea7d04ff7e78cd588c9e4a1621e
-EBUILD ansible-2.9.13.ebuild 1763 BLAKE2B 968a38a35b853ead47f04d4094cb86be79972d5d13415272472776403e63e160842a6cc7e3d1c936efc80a6945fd580d56cfdad185f9efa7ad2ce161b58c4b2e SHA512 bb0dbd464c6c3edfb4aad153e1b558b1e1e4bc076b6ca787b17aed61b9d7a21505c65a3b345a02528a41598bf9a558f5ea4f300152fefa7aa8a5af008d294b9a
-EBUILD ansible-9999.ebuild 1747 BLAKE2B 8f93eabc728ab74ad23a341e1d58bedd9547562532eb55f43d1045d67a17a9ea4bc4cc8c8a386b4791bc5010713d1d4769970dc660ea126499fb172f2fc1fcb5 SHA512 e36d1d4adc1136e01a294c361ec18cd611dc2e7ac4061d139efb6fda14b3e396a3503200fa2c371865c78c38ec8b27db3c24e9329785d2f833da95e6f2cd7532
+DIST ansible-2.10.1.tar.gz 25851704 BLAKE2B f9f42ab9f7864a48f0d960b4e8149dfba3ece6c4b01c08db59f9ba5fbcd39771c7b315bf7c9853641d15c2bb6319c9b9ebc791440fc8933780895024c9b74c12 SHA512 46bbbfb22e5c3715df0069d420b174877dffd59f91613779e7057648d15751d528a9cb57357709d0c04a507a60e20c87b109ba1904e1f313441cf5832ba93b5e
+EBUILD ansible-2.10.0-r2.ebuild 1985 BLAKE2B 30885a55981450ae698183239f9659e770e5afafb774722dc4dfeb48789c3b4e8985f39e917ff497911f84363dceaf1bdf7c2d45537c8f6e3bf21e57fc88a67e SHA512 e48e28eaf5ee8bfa2e54e3245b448105e6687cca172ba1f3fba5b68b2c165a16045d94f5794b936426658bdc53883342aaf7fc7a4eb4bb7ef7b3bb8bc0e014b9
+EBUILD ansible-2.10.1.ebuild 1923 BLAKE2B 63317a87180642d280eabbb19f5858b3d45a87b6aa503ff2f86bfb0d04accbbf2269ad6ede57b6617d3e7252844f0839e487f06c87abe5062eed2be02cdbe0ae SHA512 57478bab16bb0432ef913f8402ac239b7882d47d7c1e4c0c01c01607c35b0604d1c0f9eabb816f0fd3164373fe7bb3dab020c5876515ea100c135ed2e6de19cb
+EBUILD ansible-9999.ebuild 1937 BLAKE2B 98ab62b10f1d118b9d491639800cf12c61d89c76d7c825bee3f944baec488d7de3ac699e8e4ee024ce80b97ecc5625fdffa04c32b1a6590c3c2dd73103b9ca60 SHA512 c067bbb92042d932316ee2a26f43f974586eff96b8f5f679a8b51e4a66f2e6a7c532edc0d0bf996bf665a875c7af61e29d6fb5ac1b4ac10896140e77004778c8
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.9.13.ebuild b/app-admin/ansible/ansible-2.10.0-r2.ebuild
index 7a568caa73b3..eae0967a94af 100644
--- a/app-admin/ansible/ansible-2.9.13.ebuild
+++ b/app-admin/ansible/ansible-2.10.0-r2.ebuild
@@ -3,17 +3,26 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1 eutils
 
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
@@ -21,7 +30,6 @@ RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
@@ -29,12 +37,11 @@ RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
-	!app-admin/ansible-base
+	app-admin/ansible-base
 "
 DEPEND="
-	!app-admin/ansible-base
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	app-admin/ansible-base
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
@@ -50,6 +57,13 @@ DEPEND="
 		dev-vcs/git
 	)"
 
+PATCHES=( "${FILESDIR}/ansible-2.10.0-CVE-2020-25635-6.patch" )
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
 python_compile_all() {
 	if use doc; then
 		cd docs/docsite || die
@@ -65,6 +79,4 @@ python_test() {
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
 	distutils-r1_python_install_all
-
-	dodoc -r examples
 }
diff --git a/app-admin/ansible/ansible-2.10.0.ebuild b/app-admin/ansible/ansible-2.10.0.ebuild
deleted file mode 100644
index c19820e359f3..000000000000
--- a/app-admin/ansible/ansible-2.10.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-BDEPEND="!<app-admin/ansible-2.10.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-	!app-admin/ansible-base
-"
-DEPEND="
-	!app-admin/ansible-base
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-admin/ansible/ansible-2.9.12.ebuild b/app-admin/ansible/ansible-2.10.1.ebuild
index 7d5eb95e9a9e..3bfcb1fab2c6 100644
--- a/app-admin/ansible/ansible-2.9.12.ebuild
+++ b/app-admin/ansible/ansible-2.10.1.ebuild
@@ -3,17 +3,26 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1 eutils
 
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
@@ -21,7 +30,6 @@ RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
@@ -29,12 +37,11 @@ RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
-	!app-admin/ansible-base
+	app-admin/ansible-base
 "
 DEPEND="
-	!app-admin/ansible-base
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	app-admin/ansible-base
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
@@ -50,6 +57,11 @@ DEPEND="
 		dev-vcs/git
 	)"
 
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
 python_compile_all() {
 	if use doc; then
 		cd docs/docsite || die
@@ -65,6 +77,4 @@ python_test() {
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
 	distutils-r1_python_install_all
-
-	dodoc -r examples
 }
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 6ff1f27cd47b..d3bff29efe2f 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -3,14 +3,23 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
 
-inherit distutils-r1 git-r3 eutils
+inherit distutils-r1 eutils
 
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="https://ansible.com/"
-EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-EGIT_BRANCH="devel"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -22,7 +31,6 @@ RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
@@ -34,7 +42,6 @@ RDEPEND="
 "
 DEPEND="
 	!app-admin/ansible-base
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
@@ -51,6 +58,11 @@ DEPEND="
 		dev-vcs/git
 	)"
 
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
 python_compile_all() {
 	if use doc; then
 		cd docs/docsite || die
@@ -66,6 +78,4 @@ python_test() {
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
 	distutils-r1_python_install_all
-
-	dodoc -r examples
 }
diff --git a/app-admin/ansible/files/ansible-2.10.0-CVE-2020-25635-6.patch b/app-admin/ansible/files/ansible-2.10.0-CVE-2020-25635-6.patch
new file mode 100644
index 000000000000..df88be4264ff
--- /dev/null
+++ b/app-admin/ansible/files/ansible-2.10.0-CVE-2020-25635-6.patch
@@ -0,0 +1,54 @@
+From 921bd53103c2b543e95c9e6b863702db3ff54d0c Mon Sep 17 00:00:00 2001
+From: Jill R <4121322+jillr@users.noreply.github.com>
+Date: Fri, 2 Oct 2020 11:37:37 -0700
+Subject: [PATCH] aws_ssm: Namespace S3 buckets and delete transferred files
+ (#237)
+
+Files transferred to instances via the SSM connection plugin should use
+folders within the bucket that are namespaced per-host, to prevent collisions.
+Files should also be deleted from buckets when they are no longer required.
+
+Fixes: #221
+Fixes: #222
+
+Based on work by abeluck
+
+changelog
+---
+ ansible_collections/community/aws/changelogs/fragments/221_222_ssm_bucket_operations.yaml | 2 ++
+ ansible_collections/community/aws/plugins/connection/aws_ssm.py                           | 6 +++++-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+ create mode 100644 ansible_collections/community/aws/changelogs/fragments/221_222_ssm_bucket_operations.yaml
+
+diff --git a/ansible_collections/community/aws/changelogs/fragments/221_222_ssm_bucket_operations.yaml b/ansible_collections/community/aws/changelogs/fragments/221_222_ssm_bucket_operations.yaml
+new file mode 100644
+index 00000000..247d5e36
+--- /dev/null
++++ b/ansible_collections/community/aws/changelogs/fragments/221_222_ssm_bucket_operations.yaml
+@@ -0,0 +1,2 @@
++bugfixes:
++  - aws_ssm connection plugin - namespace file uploads to S3 into unique folders per host, to prevent name collisions. Also deletes files from S3 to ensure temp files are not left behind. (https://github.com/ansible-collections/community.aws/issues/221, https://github.com/ansible-collections/community.aws/issues/222)
+diff --git a/ansible_collections/community/aws/plugins/connection/aws_ssm.py b/ansible_collections/community/aws/plugins/connection/aws_ssm.py
+index 7f7d6926..94289eee 100644
+--- a/ansible_collections/community/aws/plugins/connection/aws_ssm.py
++++ b/ansible_collections/community/aws/plugins/connection/aws_ssm.py
+@@ -522,7 +522,8 @@ def _get_boto_client(self, service, region_name=None):
+     def _file_transport_command(self, in_path, out_path, ssm_action):
+         ''' transfer a file from using an intermediate S3 bucket '''
+ 
+-        s3_path = out_path.replace('\\', '/')
++        path_unescaped = "{0}/{1}".format(self.instance_id, out_path)
++        s3_path = path_unescaped.replace('\\', '/')
+         bucket_url = 's3://%s/%s' % (self.get_option('bucket_name'), s3_path)
+ 
+         if self.is_windows:
+@@ -546,6 +547,9 @@ def _file_transport_command(self, in_path, out_path, ssm_action):
+                 client.upload_fileobj(data, self.get_option('bucket_name'), s3_path)
+             (returncode, stdout, stderr) = self.exec_command(get_command, in_data=None, sudoable=False)
+ 
++        # Remove the files from the bucket after they've been transferred
++        client.delete_object(Bucket=self.get_option('bucket_name'), Key=s3_path)
++
+         # Check the return code
+         if returncode == 0:
+             return (returncode, stdout, stderr)
diff --git a/app-admin/aws-elb-tools/Manifest b/app-admin/aws-elb-tools/Manifest
index 3ce8b7d4817e..172387ff92df 100644
--- a/app-admin/aws-elb-tools/Manifest
+++ b/app-admin/aws-elb-tools/Manifest
@@ -1,3 +1,3 @@
 DIST ElasticLoadBalancing-1.0.15.1.zip 6717939 BLAKE2B deef8cfb32a9c0d3627af26f32430efbe27a7712acd7c5dd9b7e8947b7c16ac866cec64100dd1bc315c4a2729451d181da8d16f133ea81fc927452cce6cc4f9b SHA512 813f00d632b483a5ec98632d830be4b02fc1bc71aa7bd845faa477f7d05bda7c801e5d83992c111dfc136bf5e1204bf96b00a1c24e5b19438decb356d0841725
-EBUILD aws-elb-tools-1.0.15.1-r1.ebuild 1562 BLAKE2B 54ac1fd7d026dd4f58dc2d1a294efa97ca4f6c94c869a968cee44e104e31356be2309e931d1c764fa5d8e1b5a1ee2c10df49880fb8d223d6927ccc34e9432b62 SHA512 a443939e59330c71b6b360c0420d18649ea21c26eefb4f8da961295faed18242578354bc954c8d64359168308b8a3d1a2bb57116c515e1ea734e87ac17c01672
+EBUILD aws-elb-tools-1.0.15.1-r1.ebuild 1566 BLAKE2B 3b758e06fc4f910c89f5b34dc9c8251e945d1de3ed0f1ee305d9bf4fa4900285da686dcadd51c5fa6f2d4a4720f77fb6af9156163acdbb9a5b0ef2c78fd7cd23 SHA512 f2b107190635642854a6e19f347202feb1a89f84e18b2fffcab604f1541dad2aceb67f732ce4184b3a42aaf9a895405062a26e692460e26bdbbc5b538fb6fafa
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
index 7b6784456062..ab4c2ae10a56 100644
--- a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
+++ b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sabayon/${CATEGORY}/ElasticLoadBalancing-${PV}.zip"
 
 LICENSE="Amazon"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-admin/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest
new file mode 100644
index 000000000000..0c07355752f3
--- /dev/null
+++ b/app-admin/bitwarden-desktop-bin/Manifest
@@ -0,0 +1,5 @@
+DIST Bitwarden-1.22.2-amd64.deb 47983282 BLAKE2B f84bdfb44803fc13292b4fdd8653a9217efcfea08ed58407929d3061bce436727f1ec86ff99e6b968de17510ddb0aaeb2781beaae198661d30496050db90cf3f SHA512 131e49ef2dc74b601e31eb6a07da92ae43747c4fdf4729b84fb35f95c4bc38731e6b6f9185b919ede5c7c2cd4813dbddaea172d1287cd60f747b3032e12c09e9
+DIST Bitwarden-1.23.0-amd64.deb 47990216 BLAKE2B 7383c4b2b4b0c60bc78abdbb333846ed12d00025d90a6b2c49c177ffe53046652c4e8e4738a6d25495e087c38835ae03131a2f332cf9afaa0c00a613ea5e1349 SHA512 f23f8ba987308a2753fa8fc9450f01abcc49f2917d9a9f5feb64540ba0640630cd757a88d8aa3caad2a5f5383f8fdaac7845f59b33966dcc8ac6fec3cc3618c7
+EBUILD bitwarden-desktop-bin-1.22.2.ebuild 1464 BLAKE2B 0521f369c01aca63eb2c1115daba08af89e556ba02fef56eef527be668d980ef12513e755493056a3563ede87393118e8890d13820707d7ca6364a66e1d17c85 SHA512 245c57f1026a8d3e863cf4c61c1f9d1b0b466f82285c964e29d8e4ce37643fd65d14f72c03ecf2c2d21795008d290acf391f35612038b70479e38ba7d8f052b6
+EBUILD bitwarden-desktop-bin-1.23.0.ebuild 1485 BLAKE2B dc6de23e0c4138771e6c17d509b36041f1d780179003dabdd3034981ce869aa84e7bb3137464468a0a26b8619045273a8babbc36034a55978686fe287cb4c752 SHA512 a6fdc2dbefba14548cc9582e7c0848b22ec9bed551457bf4bc2950c498410cbfde31f18e144db975fe78641744a95af5a029f2e945266a8672e79d9caaa374c8
+MISC metadata.xml 303 BLAKE2B d92d9a59d759d67d5c87577ad1b8255f016f1228044100ba18d6ec73a7ca054ca0403399d677f2470a782721e7179d693860eb2c52a35cace59e58348d38df93 SHA512 81073a2078b481982c3beffcb76a84e19521e4bc6255095848e5479fc13c5a60b8a0d861156b02ff26c80529111dade666758e22a341ba8a31f9a89304a215c1
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.22.2.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.22.2.ebuild
new file mode 100644
index 000000000000..2bd860d216b8
--- /dev/null
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.22.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker xdg-utils
+
+MY_PN="Bitwarden"
+DESCRIPTION="Bitwarden password manager desktop client"
+HOMEPAGE="https://bitwarden.com/"
+SRC_URI="https://github.com/bitwarden/desktop/releases/download/v${PV}/Bitwarden-${PV}-amd64.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/Bitwarden/*.so
+	opt/Bitwarden/bitwarden
+	opt/Bitwarden/chrome-sandbox
+"
+
+src_install() {
+	insinto /opt
+	doins -r opt/${MY_PN}
+	fperms 755 /opt/Bitwarden/bitwarden
+	fperms 4755 /opt/Bitwarden/chrome-sandbox
+
+	insinto /usr/share/applications
+	doins usr/share/applications/bitwarden.desktop
+
+	insinto /usr/share/icons
+	doins -r usr/share/icons/hicolor
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.23.0.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.23.0.ebuild
new file mode 100644
index 000000000000..c7f2fc77d073
--- /dev/null
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.23.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker xdg-utils
+
+MY_PN="Bitwarden"
+DESCRIPTION="Bitwarden password manager desktop client"
+HOMEPAGE="https://bitwarden.com/"
+SRC_URI="https://github.com/bitwarden/desktop/releases/download/v${PV}/Bitwarden-${PV}-amd64.deb"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
+	app-crypt/libsecret
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/Bitwarden/*.so
+	opt/Bitwarden/bitwarden
+	opt/Bitwarden/chrome-sandbox
+"
+
+src_install() {
+	insinto /opt
+	doins -r opt/${MY_PN}
+	fperms 755 /opt/Bitwarden/bitwarden
+	fperms 4755 /opt/Bitwarden/chrome-sandbox
+
+	insinto /usr/share/applications
+	doins usr/share/applications/bitwarden.desktop
+
+	insinto /usr/share/icons
+	doins -r usr/share/icons/hicolor
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-admin/bitwarden-desktop-bin/metadata.xml b/app-admin/bitwarden-desktop-bin/metadata.xml
new file mode 100644
index 000000000000..95838755067d
--- /dev/null
+++ b/app-admin/bitwarden-desktop-bin/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">bitwarden/desktop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 11c75e2f2bca..a3197446a31d 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,4 +1,5 @@
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
-DIST calamares-3.2.28.3.tar.gz 3837417 BLAKE2B d248423e09aa21cd3808e00408f34d7c178a19d2c82bed5ab0dedff945ab7aad601f4aefbee62a772e4fdf5915dc3888af1fb0711e4bbe1e9b089adfbae2b1a0 SHA512 124de0bdd09fe15450460fa858c6f3df3a00c609684238bf3bc8eb18f10c39c4bc0e8fd02b0e9bae50d42bade2716cb16247c23ace397288a5e8f27790b60280
-EBUILD calamares-3.2.28.3.ebuild 2194 BLAKE2B 3c9bf74a167dff378a09cdf6f882b98e065a23645025a316f9012ad61b7f3560ba9fa557fc9f9462aa3d91995e0a39ec9a2065ea6b7c66d2df50b0b648fa9bcf SHA512 2a35274fbc2a11ad86ef4020422e82f007d65bac58c9e906a0168e5b24307665ca8e695325dfa6767d9f3f75b32ac7599b8a93099ec4bf263261bea8ef8483ab
-MISC metadata.xml 1055 BLAKE2B a6c7974103baa5a646cb1d594e3f224903df9ce5c618ad4ed46c0b3d4df5d3437be570eda0d55e3b0ca8f6df4af9627b088ace2a3f0efc802528aeb49fc7bce6 SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f
+DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4 SHA512 30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222
+EBUILD calamares-3.2.32.1.ebuild 2181 BLAKE2B 51657120350b031f39b10fee5f84c92586a198dc6d576e9043334b8c6b31febf7f72219566c22f639222071156e419628a73c2d21616322589ed8cc1ed0f7e66 SHA512 4be64c8b57a0f690a121628e3fd1c2586aedda193cfcf6d1fd8b5cb2b0f1928b987eb12bd4c4f56f7092c4ddafc5cbd24ac4196110070217aa6de8a3ec4a8ca2
+EBUILD files/calamares-3.2.32.1-remove-broken-tests.ebuild 1682 BLAKE2B 1d41c22b99797d41066e55b21bd5b9957411c210be3d1a8c01470694211387aa7e8b931d5499143d7d2747657625ac1c3db17d67bac9f741aada25fde93f517a SHA512 1c4a5a2d8b6c96299f45d3ef7581dfdca81c0854c9c746e6636a07101fb4e0d05809a4d64d826180599969c6fe398175dc7f5322ab52ff6c61dac4925919f275
+MISC metadata.xml 970 BLAKE2B fc958c25bf44e37c32da53c4fe0bfabc0e2ba8ef6213f8c3b3d95a685c8f7bfb6806ab06719ea5b39f94800c03f9f3ef211408ad57f58f60d0d09e5fbb823c12 SHA512 b5ca20e1baddb3f7cb4f704d9becbb7163cdc90be23145367d0787cfa1f55a54f5740e4bb57231dbd4ced0a23406341a89e00cf03cee21808c5c26a1ead35712
diff --git a/app-admin/calamares/calamares-3.2.28.3.ebuild b/app-admin/calamares/calamares-3.2.32.1.ebuild
index 8ad695ecfb23..0c4287a8e8fd 100644
--- a/app-admin/calamares/calamares-3.2.28.3.ebuild
+++ b/app-admin/calamares/calamares-3.2.32.1.ebuild
@@ -4,17 +4,18 @@
 EAPI=7
 
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit ecm python-single-r1
 
 DESCRIPTION="Distribution-independent installer framework"
 HOMEPAGE="https://calamares.io"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="~amd64"
-SLOT=5
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
 
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="+networkmanager +upower"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
@@ -45,7 +46,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	sys-apps/dmidecode
 	sys-auth/polkit-qt
 	>=sys-libs/kpmcore-4.0.0:5=
-	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] )
 "
 DEPEND="${COMMON_DEPEND}
 	test? ( dev-qt/qttest:5 )
@@ -63,6 +63,8 @@ RDEPEND="${COMMON_DEPEND}
 	upower? ( sys-power/upower )
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-3.2.32.1-remove-broken-tests.ebuild )
+
 src_prepare() {
 	ecm_src_prepare
 	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
@@ -81,7 +83,7 @@ src_configure() {
 		-DINSTALL_CONFIG=ON
 		-DWEBVIEW_FORCE_WEBKIT=OFF
 		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-		-DWITH_PYTHONQT=$(usex pythonqt)
+		-DWITH_PYTHONQT=OFF
 	)
 
 	ecm_src_configure
diff --git a/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild
new file mode 100644
index 000000000000..346e1bfb4028
--- /dev/null
+++ b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild
@@ -0,0 +1,83 @@
+--- a/src/libcalamares/CMakeLists.txt
++++ b/src/libcalamares/CMakeLists.txt
+@@ -216,12 +216,6 @@
+ )
+ 
+ calamares_add_test(
+-    libcalamaresnetworktest
+-    SOURCES
+-        network/Tests.cpp
+-)
+-
+-calamares_add_test(
+     libcalamarespartitiontest
+     SOURCES
+         partition/Tests.cpp
+@@ -238,12 +232,6 @@
+ endif()
+ 
+ calamares_add_test(
+-    libcalamaresutilstest
+-    SOURCES
+-        utils/Tests.cpp
+-)
+-
+-calamares_add_test(
+     libcalamaresutilspathstest
+     SOURCES
+         utils/TestPaths.cpp
+--- a/src/modules/locale/CMakeLists.txt
++++ b/src/modules/locale/CMakeLists.txt
+@@ -37,18 +37,3 @@
+         yamlcpp
+     SHARED_LIB
+ )
+-
+-calamares_add_test(
+-    localetest
+-    SOURCES
+-        Tests.cpp
+-        Config.cpp
+-        LocaleConfiguration.cpp
+-        SetTimezoneJob.cpp
+-        timezonewidget/TimeZoneImage.cpp
+-    DEFINITIONS
+-        SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images"
+-        DEBUG_TIMEZONES=1
+-    LIBRARIES
+-        Qt5::Gui
+-)
+--- a/src/modules/packagechooser/CMakeLists.txt
++++ b/src/modules/packagechooser/CMakeLists.txt
+@@ -58,13 +58,3 @@
+         ${_extra_libraries}
+     SHARED_LIB
+ )
+-
+-calamares_add_test(
+-    packagechoosertest
+-    GUI
+-    SOURCES
+-        Tests.cpp
+-    LIBRARIES
+-        calamares_viewmodule_packagechooser
+-        ${_extra_libraries}
+-)
+--- a/src/modules/users/CMakeLists.txt
++++ b/src/modules/users/CMakeLists.txt
+@@ -70,15 +70,6 @@
+ )
+ 
+ calamares_add_test(
+-    usershostnametest
+-    SOURCES
+-        TestSetHostNameJob.cpp
+-        SetHostNameJob.cpp
+-    LIBRARIES
+-        Qt5::DBus  # HostName job can use DBus to systemd
+-)
+-
+-calamares_add_test(
+     userstest
+     SOURCES
+         Tests.cpp
diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
index bc9aeb32994b..8c2f79648746 100644
--- a/app-admin/calamares/metadata.xml
+++ b/app-admin/calamares/metadata.xml
@@ -21,7 +21,4 @@
 	<upstream>
 		<remote-id type="github">calamares/calamares</remote-id>
 	</upstream>
-	<use>
-		<flag name="pythonqt">Enable PythonQt-based module interface</flag>
-	</use>
 </pkgmetadata>
diff --git a/app-admin/cgmanager/Manifest b/app-admin/cgmanager/Manifest
index fadcc4c69689..e10e4cee10cd 100644
--- a/app-admin/cgmanager/Manifest
+++ b/app-admin/cgmanager/Manifest
@@ -2,6 +2,6 @@ AUX cgmanager.initd-r1 331 BLAKE2B 725b5044fa567e7f7146bd62cc63a0674873d6fcb022e
 AUX cgproxy.initd-r1 661 BLAKE2B f84189b5fe16b6327cd1a6a2cd1805f1bbd75791d0f6f75a601ea58fa51d5a490d655371355205c499a51628b4e9cdf21f98431adcb3000397508cdacef2928b SHA512 7f43ea6369428d71d122a191c6a1718987ed09eafe2217ae326606ddf2a50f0500d0de0520fe21e5d2edefb8ddd4c3a85623d2aac1212e821ea922cb8256fffc
 DIST cgmanager-0.41.tar.gz 461805 BLAKE2B 22c779953d637012694c19490da9d3707b9e2a935f910d192fd1e6a44c27e933e93b6ae516399991924175a9e8e05fd650cf3117d3e7bde034a20bc083ebaa09 SHA512 e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd
 DIST cgmanager-0.42.tar.gz 467980 BLAKE2B 70df5ebda230773f3a2a4ed6f784e591126769122533182821b0fe2c157f9bd7b9fd58a3bb104b0ef089320b167d3136c379d760ea6c65dab0c88f46d41596cb SHA512 d92113a6748084f1c0708f75c8bdf5de484d534bf00f664a5288902be887c2a1c7cf3d91afaab3331f0d573a86fbc6edb2fa1d37c070250cf53e0621213d7d74
-EBUILD cgmanager-0.41.ebuild 1236 BLAKE2B 289d44cc85bbea6fd632b7e69bf7c3ae60e2236cb55790aac75ed8d44b5421c86ce24373a10a26b127ad406b6fe5ce7ae30a0739ef68da29f3dccae96617327d SHA512 016072c94bd1af5f4d85a8786ad2451e98fc963a055ec45bda76a1b18333edd9c0b93801a67de23f4c014557083665c31fe00e84c964142e3eab3dcd16ac0663
-EBUILD cgmanager-0.42.ebuild 1245 BLAKE2B 527c823491ebc2152517b196da4fdb766c2332696c49c3252fca30dcd01d29a0847fe636b7dd5d0710f2a812d212f8a7264f45ff77ca133b85f4ed8159493b70 SHA512 e6ef521ea70992a4ab5527e7c22f44ede3b5821b6dd37752def52b7900f38b2d275682a9c860f9d3070cf27e2859aa59aee2c814d17f5fe7eb5886cc5a0155db
+EBUILD cgmanager-0.41.ebuild 1300 BLAKE2B e16ca7b9cbde2ea92117f52431943dd8f306afdd2281fc4d5c1f3741a27713430c7be20ff0a00d316f528e5919c24a865a1034401674981c4e3844d901533975 SHA512 7a4ea409234e13d8ad8d98c65617ebdfcbe4fa363cadfc2463385db3684f54c0352fe318a913b5dbcf8dae7ed4575f3ccb71b1b0c295244b22e434c21418d116
+EBUILD cgmanager-0.42.ebuild 1309 BLAKE2B 985d4a6688f42a7827b44bee2a32049a3737bca821f063390b3a4e0d53e52fcbd618a5a78fbdfd5dd837c5b8c5ea5cff2e33d7d6a701752d36709347eb198cc4 SHA512 bcae337c5d161982540b87aaee4fd9132d976ff0644534f50a032ade8673ad369fbd7d12b2c0744a13145c65f2dbb7712940380b2f8f2527e7c9ed884ae23697
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/app-admin/cgmanager/cgmanager-0.41.ebuild b/app-admin/cgmanager/cgmanager-0.41.ebuild
index f50a2b4463c1..f54b2d44c503 100644
--- a/app-admin/cgmanager/cgmanager-0.41.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.41.ebuild
@@ -35,7 +35,8 @@ src_configure() {
 	econf \
 		--with-distro=gentoo \
 		--with-pamdir="$(usex pam $(getpam_mod_dir) none)" \
-		--with-init-script=systemd
+		--with-init-script=systemd \
+		--disable-static
 }
 
 src_install() {
@@ -46,4 +47,6 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 	newinitd "${FILESDIR}"/cgproxy.initd-r1 cgproxy
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-admin/cgmanager/cgmanager-0.42.ebuild b/app-admin/cgmanager/cgmanager-0.42.ebuild
index af8480ae28ea..da4663f6c806 100644
--- a/app-admin/cgmanager/cgmanager-0.42.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.42.ebuild
@@ -35,7 +35,8 @@ src_configure() {
 	econf \
 		--with-distro=gentoo \
 		--with-pamdir="$(usex pam $(getpam_mod_dir) none)" \
-		--with-init-script=systemd
+		--with-init-script=systemd \
+		--disable-static
 }
 
 src_install() {
@@ -46,4 +47,6 @@ src_install() {
 
 	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
 	newinitd "${FILESDIR}"/cgproxy.initd-r1 cgproxy
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
index 23f8e702bd9e..e6730e54c058 100644
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@@ -7,6 +7,7 @@ DIST checksec-2.2.0.tar.gz 2241197 BLAKE2B 33e76d1e74188f0944cbce2fcec3daab5a3bb
 DIST checksec-2.2.1.tar.gz 2241504 BLAKE2B 65d71e4ad589494d34ae0458f4b3e453f6bfb86ec0ce46b5c18b6e5c49e1820b9721b616da22bafe7614fca59473a736058584a488a84b85e9799dbf59f7b3e4 SHA512 7c6474479b51f70a627515a0d770f4d70df0350253547b3b8c1a5be83e2976b127172167ca9890d5e0848627c582adddde5acb2f7b30ff7d12d4a81370b43b0f
 DIST checksec-2.2.2.tar.gz 2241541 BLAKE2B 310553aa419373acc9b86bd25d801a99db0173ef76d8ccfdce4b185102a8ad39a91ade906c521c9caf7989aab1da42c35cbfe5e8fcbea23eafb47f917bb87718 SHA512 d975a9cea60869ddda445515396b67b6ea3c9b33770e711071e1cff684f89b4718b135a3a3c1a88b11b96ccde0df72d6b7924cade0619d24e38db428251d22b0
 DIST checksec-2.2.3.tar.gz 2241535 BLAKE2B 850977dc14d1b57dc947f81af904aca71a7d664bf695619de2b6f7a1014a95176813c4fcd8c39a6c89b028291fa1a08a2beaf6f4dce27f53624202bb0e72ed2c SHA512 d1516dc4321f30a57f88d3279fa228b4dbb0f16345c3c7e9d89575ddc3ed9dffae42f392e76321a5a9aba876717aae959365fc829f0abb58c1c21f34dbbf59b7
+DIST checksec-2.4.0.tar.gz 2242079 BLAKE2B c1878c1312d13591147f0efd1a2d535ae8e75292dbc53e7ba0802c8d165b18b4bc0b22a5cc3a9159ddcf05a1518d58c18cb54700ea5a52ff29d261068194b96a SHA512 1a02dfac48b5979cb5c2eb7b8f1fe290d3ac090726d1b95a14864bfc4bc3d32eefc10e2cc227c9dc01809c78fe003d1faea9b720d5cb5fbc16599fc0e2512947
 EBUILD checksec-1.11.1.ebuild 757 BLAKE2B cb3a4bb1505399b4b6b8f13e5237bb17f74d153a088d782427e2e8c53b2422f740455dca99ff29de6bf3fccaff2b1c8b1bea7ba760d08fadf8eb99bfee9f6150 SHA512 5669162f5f0d7e6c679bbf4cbb374d71c18452c7ac59451d5a4d39979f14dee9cebb91d63a37b61e38ea09d62e6931c3c48e853219dca6109c1cba32aceba52c
 EBUILD checksec-1.9.0.ebuild 757 BLAKE2B 526fb5bd77d4f06d01dafef1174eae285b5ee2a1ae72882f1d05d07ec141b519ef39f622f16f4e098c3df0b31f8419b6460f2d51a462b09324519efa3235fa67 SHA512 29ec62f61fbf71e19aae933ea6b01e6f606c043e50d4c004214219a04cbc96d8ede61a444a822e1a83c0245e0e379ee553e5f4bc2d7d11a2577aa0b2e9f9eeae
 EBUILD checksec-2.0.1.ebuild 759 BLAKE2B 18b155566819f22cd16c0c13798bda4b70da1bbdc5cbf94c0977d2edcf6877f7819fc91421d6be8619c8a20f7d2fac3fce2f698a41f25aea727e3f843b1ddaab SHA512 3b34ecfcc2c1c73ec5a8565e9c07415bf6b1d6a682c6f7c8b17db07917706c9247c7c67aaca7d03d894547892a978efe11e4fa01322e80c9093d0a6d3b0d0386
@@ -15,4 +16,5 @@ EBUILD checksec-2.2.0.ebuild 759 BLAKE2B 114f4b61410767dcbe0828b48bc6e67b047ce0f
 EBUILD checksec-2.2.1.ebuild 759 BLAKE2B 114f4b61410767dcbe0828b48bc6e67b047ce0fa0293b51da79e19870f654a20ca11ccef4abd684fc1f7ab992a0491ac46c634104d514e7752c77eca9975a00b SHA512 d8eaaaa60e82cfc7d063cd1f20441abfc16ad9caf9ea0b3a67a81aa0fc910817ec4d1ba0411c2bb051fab7ce458d544d0cbdfccc046163a2fb59beece440d10b
 EBUILD checksec-2.2.2.ebuild 759 BLAKE2B 114f4b61410767dcbe0828b48bc6e67b047ce0fa0293b51da79e19870f654a20ca11ccef4abd684fc1f7ab992a0491ac46c634104d514e7752c77eca9975a00b SHA512 d8eaaaa60e82cfc7d063cd1f20441abfc16ad9caf9ea0b3a67a81aa0fc910817ec4d1ba0411c2bb051fab7ce458d544d0cbdfccc046163a2fb59beece440d10b
 EBUILD checksec-2.2.3.ebuild 757 BLAKE2B f0752c0d0636142ecadf0abd561bebe82ee923570ef55374cfe567776d22785ad99e1ccd1cd5660723a24c0a2a9a9d428f43f3622e5bb472a4347514d8bf7692 SHA512 aa6e146d7ce82d49ada59ffb4f2f327c99608b5b2c164af317d4c0a627f28f10a8760f4b958678f1726fcaa496f87689165185f8a6e9bd2cb0c1cbb297fb7f91
+EBUILD checksec-2.4.0.ebuild 759 BLAKE2B 114f4b61410767dcbe0828b48bc6e67b047ce0fa0293b51da79e19870f654a20ca11ccef4abd684fc1f7ab992a0491ac46c634104d514e7752c77eca9975a00b SHA512 d8eaaaa60e82cfc7d063cd1f20441abfc16ad9caf9ea0b3a67a81aa0fc910817ec4d1ba0411c2bb051fab7ce458d544d0cbdfccc046163a2fb59beece440d10b
 MISC metadata.xml 334 BLAKE2B 96b933c9475a18c3957d46b58c41162e396f27ff7c53eaf4ba5be2a24e22e8a136a0814cce5c0d3c113e5d18a286fdd34a1b3cd46e509a7eec986f82d7d8ea9c SHA512 dd9373f93f165e576bd930ae4a49019d0c53359c4ef288c5d1ed5fc1033b82afff7d0421551eb9518bbfb3f25bc7cdab09cf89b1e0bd9c1ffe0137432d70b716
diff --git a/app-admin/checksec/checksec-2.4.0.ebuild b/app-admin/checksec/checksec-2.4.0.ebuild
new file mode 100644
index 000000000000..894f6578719b
--- /dev/null
+++ b/app-admin/checksec/checksec-2.4.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.2-path.patch
+)
+
+src_prepare() {
+	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
+	default
+}
+
+src_install() {
+	default
+
+	doman extras/man/*
+
+	insinto /usr/share/zsh/site-functions
+	doins extras/zsh/_${PN}
+
+	dobin ${PN}
+}
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index de316e4e36ae..295e78838889 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -2,6 +2,8 @@ AUX clsync.conf 589 BLAKE2B fb7736b0972c91916770c6cfca693267bdf0cb3f6ad540388967
 AUX clsync.confd 645 BLAKE2B f2e2f70f5a88ea3a416f4151637d63f79cce483b499ee0c1b5005ef8e9d16558f0d1c23ddd182335f7e963172bafaf4b41a37c1288f7fe55e7a57e2868418ae1 SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5
 AUX clsync.initd 555 BLAKE2B 18b3f0e1e8e079eb306709d2b55b99100ce3efa852f285d7ac9acd4269fe41e0fe5d1b7c12fa966dc01f60a598d6178cf5c8b6a2cd21410bdcf0f66c1facf1d2 SHA512 a5ee987466dec0e8ca7ce2502bd71d000419e03f33e1585e47fa5d91fdb5321f949f3d3ca566e68a0aedcc50ab6a84a92210aa866520d1703805958a2bfa270a
 DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322 SHA512 cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd
+DIST clsync-0.4.5.tar.gz 276096 BLAKE2B 4fa534b342a806ca691f8a65455cb800800f7a943fa3f0913a26c37d2cd0f9d762630ad01eeb80bdd0d90a0731bed5f2aa60444a654972da9479c116e0e937aa SHA512 6568f3c49ac4fe11e54593ba23eed392d0b7d9b5bf052983c4a5a2befbb807dbd3f9d13412264f8909998702f869d1cd6db77d89bd9491414b1f3213437c5212
 EBUILD clsync-0.4.4.ebuild 2832 BLAKE2B b741cb0c391ae3bf8599d7013cd1a9f0a3680e61474312701775c2a3ef9c998cf547c83311d2d47ea377279aefdec794def5fcdb0d29aac04442da772871fe97 SHA512 239f53bda723da6e72852ef46fba96a30d6c1bf71623df6248ec113ce202b981bd9980deadcc2833c9a3796d16dce2d3f02947d1f07b16d6386d453f2e5b6f34
-EBUILD clsync-9999.ebuild 3766 BLAKE2B 23e453aa44654178f9620e76491ac570c4318173ae365903e17ffef52d67c4c1ff478c84c5e00ee77874a93af126e8d3f77f8133fe7e21070508bb05db557e5d SHA512 1ef43cea9877707a8531641ec03e86b491f2313950be8254d19699510bfd21e6b9446b5e2c3282ac2e7ef132f338ede69aba809e242a7401698571a470034e85
-MISC metadata.xml 2069 BLAKE2B d3525ec1686a46a433d0bbf6f18143a8092ea34c33ca2ad58acce1aa378fac27177c709b235ba7a831cf397a0a36e6b3745412d065172925f15ba794e5f2b43f SHA512 ff5d6b0cd92aa78e9eab0d87e05b12b9102c53e367e8965122be5c10a6bcefccc4a6568fea6d16a01fe15bc438d2616445a6ea37655df7f1811d945398b4afc4
+EBUILD clsync-0.4.5.ebuild 3787 BLAKE2B bdbe927f14f77f9ce3a456543226dd60ec5ee77fe995b215453f45efeec59a51a69632466c3fe2150884d1a1a13d4bd31ed3f28c77ae92a4c3c70d5297a29322 SHA512 4c8be692a96362156fbb863cb27ca8ea932bfd8a9a46db27c186b8cf5f178d11171718559d0e8719f1f300a87db11a62602db54652fbb4c6995d047e5d985ee3
+EBUILD clsync-9999.ebuild 3787 BLAKE2B bdbe927f14f77f9ce3a456543226dd60ec5ee77fe995b215453f45efeec59a51a69632466c3fe2150884d1a1a13d4bd31ed3f28c77ae92a4c3c70d5297a29322 SHA512 4c8be692a96362156fbb863cb27ca8ea932bfd8a9a46db27c186b8cf5f178d11171718559d0e8719f1f300a87db11a62602db54652fbb4c6995d047e5d985ee3
+MISC metadata.xml 2138 BLAKE2B 95be20be2bd87c771de6f49269bfa7e54b2a10f6c0166648130198647fcc37b86dab3501c1df8f5ef211dd0ef04f60244fec80907c95e78efd9f7c6b148023bb SHA512 0a70059c2f24248056a5aade206eafb457b39f37ab559d61284941cfcd6b01ff40328049e2edacd9a8f1a8dbbb313aed4add7092629c6bdfca0c1151ab8d69ca
diff --git a/app-admin/clsync/clsync-0.4.5.ebuild b/app-admin/clsync/clsync-0.4.5.ebuild
new file mode 100644
index 000000000000..c17448327bb2
--- /dev/null
+++ b/app-admin/clsync/clsync-0.4.5.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/clsync/clsync.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Live sync tool based on inotify, written in GNU C"
+HOMEPAGE="https://github.com/clsync/clsync http://ut.mephi.ru/oss/clsync"
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="apidoc +caps +clsync cluster control-socket cgroups doc debug
+examples extra-debug extra-hardened gio +hardened +highload-locks
++inotify +lto mhash namespaces seccomp socket-library static-libs"
+
+REQUIRED_USE="
+	|| ( clsync socket-library )
+	|| ( gio inotify )
+	mhash? ( cluster )
+	seccomp? ( caps )
+"
+BDEPEND="
+	virtual/pkgconfig
+	apidoc? ( app-doc/doxygen[dot] )
+"
+DEPEND="
+	caps? ( sys-libs/libcap )
+	cgroups? ( dev-libs/libcgroup )
+	clsync? ( dev-libs/glib:2 )
+	mhash? ( app-crypt/mhash )
+"
+RDEPEND="${DEPEND}
+	!app-doc/clsync-docs
+	!dev-libs/libclsync
+"
+
+pkg_pretend() {
+	if use clsync; then
+		use inotify && CONFIG_CHECK+=" ~INOTIFY_USER"
+		use namespaces && CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local harden_level=0
+	use hardened && harden_level=1
+	use extra-hardened && harden_level=2
+
+	local debug_level=0
+	use debug && debug_level=1
+	use extra-debug && debug_level=2
+
+	econf \
+		--enable-debug=${debug_level} \
+		--enable-paranoid=${harden_level} \
+		--without-bsm \
+		--without-kqueue \
+		$(use_enable caps capabilities) \
+		$(use_enable clsync) \
+		$(use_enable cluster) \
+		$(use_enable control-socket socket) \
+		$(use_enable highload-locks) \
+		$(use_enable lto) \
+		$(use_enable namespaces unshare) \
+		$(use_enable seccomp) \
+		$(use_enable socket-library) \
+		$(use_with cgroups libcgroup) \
+		$(use_with gio gio lib) \
+		$(use_with inotify inotify native) \
+		$(use_with mhash)
+}
+
+src_compile() {
+	default
+	if use apidoc; then
+		doxygen .doxygen || die "doxygen failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use socket-library; then
+		find "${ED}" -name "*.la" -delete
+		use static-libs || find "${ED}" -name "*.a" -delete || die "failed to remove static libs"
+	fi
+
+	if use clsync; then
+		newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+		newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+		# filter rules and sync scripts are supposed to be here
+		insinto /etc/${PN}
+		newins "${FILESDIR}/${PN}.conf" "${PN}.conf"
+		keepdir /etc/${PN}
+
+		systemd_dounit "examples/clsync@.service"
+	fi
+
+	if use doc; then
+		dodoc -r DEVELOPING NOTES PROTOCOL SHORTHANDS TODO doc/devel/*
+	else
+		rm "${ED}/usr/share/doc/${PF}/"{DEVELOPING,LICENSE,PROTOCOL,TODO}* || die
+	fi
+	use apidoc && dodoc -r doc/doxygen/html
+	if ! use examples; then
+		rm -r "${ED}/usr/share/doc/${PF}/examples" || die
+	fi
+}
+
+pkg_postinst() {
+	einfo "${PN} is just a convenient way to run synchronization tools on live data,"
+	einfo "it doesn't copy data itself, so you need to install software to do actual"
+	einfo "data transfer. Usually net-misc/rsync is a good choise, but ${PN} is"
+	einfo "is flexible enough to use any user tool, see manual page for details."
+	einfo
+	einfo "${PN} init script can be multiplexed, to use symlink init script to"
+	einfo "othername and use conf.d/othername to configure it."
+	einfo
+	einfo "If you're interested in improved security, enable"
+	einfo "USE=\"caps cgroups extra-hardened namespaces seccomp\""
+
+	if use socket-library; then
+		einfo
+		einfo "clsync instances you are going to use _must_ be compiled"
+		einfo "with control-socket support"
+	fi
+}
diff --git a/app-admin/clsync/clsync-9999.ebuild b/app-admin/clsync/clsync-9999.ebuild
index 05e00ff84f2b..c17448327bb2 100644
--- a/app-admin/clsync/clsync-9999.ebuild
+++ b/app-admin/clsync/clsync-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="https://github.com/clsync/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+	SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -20,7 +20,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="apidoc +caps +clsync cluster control-socket cgroups doc debug
 examples extra-debug extra-hardened gio +hardened +highload-locks
-+inotify mhash namespaces seccomp socket-library static-libs"
++inotify +lto mhash namespaces seccomp socket-library static-libs"
 
 REQUIRED_USE="
 	|| ( clsync socket-library )
@@ -76,6 +76,7 @@ src_configure() {
 		$(use_enable cluster) \
 		$(use_enable control-socket socket) \
 		$(use_enable highload-locks) \
+		$(use_enable lto) \
 		$(use_enable namespaces unshare) \
 		$(use_enable seccomp) \
 		$(use_enable socket-library) \
diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml
index fd64593a2778..39a9cda50e2d 100644
--- a/app-admin/clsync/metadata.xml
+++ b/app-admin/clsync/metadata.xml
@@ -24,6 +24,7 @@
     <flag name="extra-hardened">Enable extra security checks. This will hurt performance.</flag>
     <flag name="gio">Enable GIO for FS monitoring (glib based alternative to inotify interface, not recommended; if both are compiled, may be selected at runtime).</flag>
     <flag name="highload-locks">Allows to use spinlocks for short delays instead of mutexes, but only on SMP systems.</flag>
+    <flag name="lto">Build with link time optimization (LTO).</flag>
     <flag name="namespaces">Enable namespaces isolation.</flag>
     <flag name="socket-library">Build the control and monitoring socket library: libclsync.</flag>
   </use>
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 996e77bfd793..3cc898799f46 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,13 +1,13 @@
 AUX conky-1.10.8-clang.patch 773 BLAKE2B 1e1920093c8cea54190d2907f1966b66aae343f20bec111df0b6c6009f572d57912869ff879f05b55fa18ac4b40736acaeef03b0ec207baac2053937a305649c SHA512 82c7795c33256bd22575d3133ef20dc3a5cbdc4ae68ef7e6fefc3a9295d5e9f0f2d9d912122a5a22e1d6d42cbe1c40cdd3513d9bd7d08db636d96972a622c2a7
+AUX conky-1.10.8-fpermissive.patch 1081 BLAKE2B 637b91609242272617c146db05f1f6a9e6e620aef353850b2d9db329e4b643ebacada6d6239b8fda5be8e315e76cf3f457a6a57ca92e5be0ba559d84de747737 SHA512 15d53485284f27c300df8365f3ed1eae720538a8dbe0ab44b864b12b5819dcb64e0196a87b72afdab77a26ba452521050f47adfa1d9f1d61f8fc8a50e21b2cc7
 AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e32cd176d4efee3aa3816f36b782d823502a4a1cb79646995e90c9ac25d9a4bcd6f1879abe365173c3e29fc8583f213 SHA512 40cdd81f975c5198149ac62066af1a7b8eaa2c722d896d71a88663bef5bfdda17521d841a4fa8e08b5c4cc9106929385d626afcbe65709360b669b10a118f397
 AUX conky-1.10.8-portmon.patch 551 BLAKE2B 6b69ebb6c8ec194e51d616f487ab8d736062636b12c11b1beb6ae5d599a34c2598a0bc96563fa9e01e55a7187597b78b311ce729a0bdbe3f0c7c7135372aa764 SHA512 2a793c9b297c9ff13eba4cff37af0699c30f30e58edd3c73243090d26235db45a554b9f5751878937606ac6a1bb1759edc2507372412c25ff4df613327aedc03
 AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
 AUX conky-1.10.8-virtual-sinks.patch 2054 BLAKE2B e047348df61b00dec0de151422a891feede717007e552ffb8fde0f390c0c3208e2c03bb1a615c89f7f4bfaaa8fdb603dd0eb75b4e6bdffe718c9eb6702787c2e SHA512 fe07eb460165bba0521071e7b5c452d4dc5626c7bb8e0c559ac4b275e09e8484a21eec275cfc02ca2162b6461a4198704fd806d6ba3c72504f8d007310a60ccb
+AUX conky-1.11.6-fpermissive.patch 1517 BLAKE2B 6f0c0fc9370955786f74c9a707fd63eb9ead7b5889ab57fe8c6a9326a1ff0253b90c7ccd3f38baa837404787bcded00de46d8132cc0d013ad70910b3fd64f91c SHA512 df645d30e4d6f88348af5dc1c782f6146fab86d744f54d77b0c6561f0f0c2491472e72b55f075a22bc3d16e87a01303955d0a0bffc6495dae390c9904e1f783f
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
-DIST conky-1.11.5.tar.gz 2400965 BLAKE2B 06b6817ed3cb4bb638b5fa7f9a5f8544c9d274560dbef2bc8f8c10ed681b83d0ab27988f60bed70cd0c13cd4947a2bd9b70ad66c38dbb6f516f5d57165ef5765 SHA512 71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be
 DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
-EBUILD conky-1.10.8-r10.ebuild 4822 BLAKE2B 9632e70138cbe4323adc317bccc856db9f2e3cd1599b0f4d390f46f3079ff4db626963374a0dcb00f431bd3938f94ca60e2e37a94dec402d7f6e013bcf34041e SHA512 d21b88ca76c9c7d32050b76a270748bfa96ba620a0061a2a392b55bb3e85caa7fe7053266c33639340e54e17fc0aa359a3ef9df18e8188d4c1713994658fc687
+EBUILD conky-1.10.8-r10.ebuild 4860 BLAKE2B bfa7ab46f34c8fac5a395869ad3ce175c75b748d87cabacac03a39f7d19ac904f5fd1fbb989fe4dbb6aee947b6d775c06d7941f7eecdbc566e09c17087bd7299 SHA512 b2160e9147005b2cc90020c07f8a7c4c0de7641a88f87ff983e573d24d52edd04ab3cefcea96cceb6579a48e021975248cb8f066b9137542def3c801ba57b587
 EBUILD conky-1.10.8-r9.ebuild 4777 BLAKE2B 42eff9a8b3bb93f1620b301c6b4c313415c39ca4c4f9c81ee860fd15314ab4d12b2a1cbc1b58b58cd533f6dd9c69ce45a527a6e00c337aae9108ed73f9729b08 SHA512 612d3d918499ad3c51816256fb826d432e45be4634cd810d623a26a3138e7feef80639fb98206a8f590ab37f4a90e08bc3352627f5fce2abda0579f75f551d65
-EBUILD conky-1.11.5.ebuild 4626 BLAKE2B 4253a66bfa4639def23e37d97f8b8b9500ae50ca3bde4ed9ccfaacae1d4d1a66f56de536f2f1dc1ba5283ef2b71ddb87680d9adbcdec2ed89ab2a3b6213604e2 SHA512 83fc0bad524ad97e2b796f4023d249497a1b616e47d62fd448a33fc0a263a29e20a832c00745686a58b379a186f464e7363c864fec0147cb5c103561e52d298c
-EBUILD conky-1.11.6.ebuild 4626 BLAKE2B 4253a66bfa4639def23e37d97f8b8b9500ae50ca3bde4ed9ccfaacae1d4d1a66f56de536f2f1dc1ba5283ef2b71ddb87680d9adbcdec2ed89ab2a3b6213604e2 SHA512 83fc0bad524ad97e2b796f4023d249497a1b616e47d62fd448a33fc0a263a29e20a832c00745686a58b379a186f464e7363c864fec0147cb5c103561e52d298c
+EBUILD conky-1.11.6-r2.ebuild 4764 BLAKE2B 5aa4d74f05a7a6301911314c1fed06c451f54ab49a4fa1ba314e128a5e71279a9d342b7ead5e42268c5d9034280b0f14bdc6dedd1900d4084b9c49f7d43fadfd SHA512 7b706907e4669c7cec665893d478fa73129d88c3eda9304c29114f2b91ebd550ca019c1a4415e9e4b8633f42a7df68254582ba1f1a31b0269d2ac18410e8807b
 MISC metadata.xml 2469 BLAKE2B 15947c03593a9d5215a9c1dd142458aeb84f61c77a669bbfa4abe256c94e28650516a0226350323f56bbc225c5edc5e9b9e3310d7957e072b6701e77e40623ce SHA512 75e2d5bd8f4848779c03fd983d995d8216f4bc35ca1d3af47cf004d1d43e36c2924523d286e13ea82c720a51a63d91e03af795e6c31471af71716b4c5ce46c4e
diff --git a/app-admin/conky/conky-1.10.8-r10.ebuild b/app-admin/conky/conky-1.10.8-r10.ebuild
index 4097461fbccc..66c0ffbf31c9 100644
--- a/app-admin/conky/conky-1.10.8-r10.ebuild
+++ b/app-admin/conky/conky-1.10.8-r10.ebuild
@@ -71,6 +71,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-portmon.patch
 	"${FILESDIR}"/${P}-clang.patch
 	"${FILESDIR}"/${P}-virtual-sinks.patch
+	"${FILESDIR}"/${P}-fpermissive.patch
 )
 
 DISABLE_AUTOFORMATTING="yes"
diff --git a/app-admin/conky/conky-1.11.5.ebuild b/app-admin/conky/conky-1.11.6-r2.ebuild
index 78607b854ef4..fb7f8a7087d9 100644
--- a/app-admin/conky/conky-1.11.5.ebuild
+++ b/app-admin/conky/conky-1.11.6-r2.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit cmake linux-info readme.gentoo-r1 xdg
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake linux-info lua-single readme.gentoo-r1 xdg
 
 DESCRIPTION="An advanced, highly configurable system monitor for X"
 HOMEPAGE="https://github.com/brndnmtthws/conky"
@@ -15,16 +17,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="apcupsd bundled-toluapp cmus curl doc 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"
+	vim-syntax weather-metar webserver wifi X xinerama xmms2"
 
 COMMON_DEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-		x11-libs/libXfixes
-		x11-libs/libXext
-	)
 	cmus? ( media-sound/cmus )
 	curl? ( net-misc/curl )
 	ical? ( dev-libs/libical:= )
@@ -44,8 +39,15 @@ COMMON_DEPEND="
 	wifi? ( net-wireless/wireless-tools )
 	weather-metar? ( net-misc/curl )
 	webserver? ( net-libs/libmicrohttpd )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+		x11-libs/libXext
+	)
+	xinerama? ( x11-libs/libXinerama )
 	xmms2? ( media-sound/xmms2 )
-	|| ( dev-lang/lua:5.3 dev-lang/lua:5.2 )
+	${LUA_DEPS}
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -62,17 +64,22 @@ DEPEND="
 
 REQUIRED_USE="
 	imlib? ( X )
-	nvidia? ( X )
-	truetype? ( X )
 	lua-cairo? ( X  bundled-toluapp )
 	lua-imlib? ( X  bundled-toluapp )
 	lua-rsvg? ( X  bundled-toluapp )
+	nvidia? ( X )
+	truetype? ( X )
+	xinerama? ( X )
 "
 
 CONFIG_CHECK="~IPV6"
 
 DOCS=( README.md AUTHORS )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fpermissive.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
@@ -85,6 +92,8 @@ Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
 
 pkg_setup() {
 	use ipv6 && linux-info_pkg_setup
+
+	lua-single_pkg_setup
 }
 
 src_prepare() {
@@ -101,30 +110,29 @@ src_configure() {
 
 	if use X; then
 		mycmakeargs=(
-			-DBUILD_ARGB=ON
-			-DBUILD_X11=ON
-			-DBUILD_XDAMAGE=ON
-			-DBUILD_XDBE=ON
-			-DBUILD_XINERAMA=ON
-			-DBUILD_XSHAPE=ON
-			-DOWN_WINDOW=ON
+			-DBUILD_ARGB=yes
+			-DBUILD_X11=yes
+			-DBUILD_XDAMAGE=yes
+			-DBUILD_XDBE=yes
+			-DBUILD_XSHAPE=yes
+			-DOWN_WINDOW=yes
 		)
 	else
 		mycmakeargs=(
-			-DBUILD_X11=OFF
+			-DBUILD_X11=no
 		)
 	fi
 
 	mycmakeargs+=(
 		-DBUILD_APCUPSD=$(usex apcupsd)
-		-DBUILD_AUDACIOUS=OFF
-		-DBUILD_BUILTIN_CONFIG=ON
+		-DBUILD_AUDACIOUS=no
+		-DBUILD_BUILTIN_CONFIG=yes
 		-DBUILD_CMUS=$(usex cmus)
 		-DBUILD_CURL=$(usex curl)
 		-DBUILD_DOCS=$(usex doc)
 		-DBUILD_HDDTEMP=$(usex hddtemp)
 		-DBUILD_HTTP=$(usex webserver)
-		-DBUILD_I18N=ON
+		-DBUILD_I18N=yes
 		-DBUILD_IBM=$(usex thinkpad)
 		-DBUILD_ICAL=$(usex ical)
 		-DBUILD_ICONV=$(usex iconv)
@@ -142,17 +150,18 @@ src_configure() {
 		-DBUILD_MYSQL=$(usex mysql)
 		-DBUILD_NCURSES=$(usex ncurses)
 		-DBUILD_NVIDIA=$(usex nvidia)
-		-DBUILD_OLD_CONFIG=ON
+		-DBUILD_OLD_CONFIG=yes
 		-DBUILD_PORT_MONITORS=$(usex portmon)
 		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
 		-DBUILD_RSS=$(usex rss)
 		-DBUILD_WEATHER_METAR=$(usex weather-metar)
 		-DBUILD_WLAN=$(usex wifi)
 		-DBUILD_XFT=$(usex truetype)
+		-DBUILD_XINERAMA=$(usex xinerama)
 		-DBUILD_XMMS2=$(usex xmms2)
 		-DDOC_PATH=/usr/share/doc/${PF}
-		-DMAINTAINER_MODE=OFF
-		-DRELEASE=ON
+		-DMAINTAINER_MODE=no
+		-DRELEASE=yes
 	)
 
 	cmake_src_configure
diff --git a/app-admin/conky/conky-1.11.6.ebuild b/app-admin/conky/conky-1.11.6.ebuild
deleted file mode 100644
index 78607b854ef4..000000000000
--- a/app-admin/conky/conky-1.11.6.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info readme.gentoo-r1 xdg
-
-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 bundled-toluapp cmus curl doc 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? (
-		x11-libs/libX11
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-		x11-libs/libXfixes
-		x11-libs/libXext
-	)
-	cmus? ( media-sound/cmus )
-	curl? ( net-misc/curl )
-	ical? ( dev-libs/libical:= )
-	iconv? ( virtual/libiconv )
-	imlib? ( media-libs/imlib2[X] )
-	irc? ( net-libs/libircclient )
-	lua-cairo? ( x11-libs/cairo[X] )
-	lua-imlib? ( media-libs/imlib2[X] )
-	lua-rsvg? ( gnome-base/librsvg )
-	mysql? ( dev-db/mysql-connector-c )
-	ncurses? ( sys-libs/ncurses:= )
-	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
-	pulseaudio? ( media-sound/pulseaudio )
-	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
-	systemd? ( sys-apps/systemd )
-	truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
-	wifi? ( net-wireless/wireless-tools )
-	weather-metar? ( net-misc/curl )
-	webserver? ( net-libs/libmicrohttpd )
-	xmms2? ( media-sound/xmms2 )
-	|| ( dev-lang/lua:5.3 dev-lang/lua:5.2 )
-"
-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}
-	doc? ( app-text/docbook2X dev-libs/libxslt )
-"
-
-REQUIRED_USE="
-	imlib? ( X )
-	nvidia? ( X )
-	truetype? ( X )
-	lua-cairo? ( X  bundled-toluapp )
-	lua-imlib? ( X  bundled-toluapp )
-	lua-rsvg? ( X  bundled-toluapp )
-"
-
-CONFIG_CHECK="~IPV6"
-
-DOCS=( README.md AUTHORS )
-
-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 when built with USE=doc.
-
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
-
-pkg_setup() {
-	use ipv6 && linux-info_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	xdg_environment_reset
-
-	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_ARGB=ON
-			-DBUILD_X11=ON
-			-DBUILD_XDAMAGE=ON
-			-DBUILD_XDBE=ON
-			-DBUILD_XINERAMA=ON
-			-DBUILD_XSHAPE=ON
-			-DOWN_WINDOW=ON
-		)
-	else
-		mycmakeargs=(
-			-DBUILD_X11=OFF
-		)
-	fi
-
-	mycmakeargs+=(
-		-DBUILD_APCUPSD=$(usex apcupsd)
-		-DBUILD_AUDACIOUS=OFF
-		-DBUILD_BUILTIN_CONFIG=ON
-		-DBUILD_CMUS=$(usex cmus)
-		-DBUILD_CURL=$(usex curl)
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_HDDTEMP=$(usex hddtemp)
-		-DBUILD_HTTP=$(usex webserver)
-		-DBUILD_I18N=ON
-		-DBUILD_IBM=$(usex thinkpad)
-		-DBUILD_ICAL=$(usex ical)
-		-DBUILD_ICONV=$(usex iconv)
-		-DBUILD_IMLIB2=$(usex imlib)
-		-DBUILD_IOSTATS=$(usex iostats)
-		-DBUILD_IPV6=$(usex ipv6)
-		-DBUILD_IRC=$(usex irc)
-		-DBUILD_JOURNAL=$(usex systemd)
-		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
-		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
-		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
-		-DBUILD_MATH=$(usex math)
-		-DBUILD_MOC=$(usex moc)
-		-DBUILD_MPD=$(usex mpd)
-		-DBUILD_MYSQL=$(usex mysql)
-		-DBUILD_NCURSES=$(usex ncurses)
-		-DBUILD_NVIDIA=$(usex nvidia)
-		-DBUILD_OLD_CONFIG=ON
-		-DBUILD_PORT_MONITORS=$(usex portmon)
-		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_RSS=$(usex rss)
-		-DBUILD_WEATHER_METAR=$(usex weather-metar)
-		-DBUILD_WLAN=$(usex wifi)
-		-DBUILD_XFT=$(usex truetype)
-		-DBUILD_XMMS2=$(usex xmms2)
-		-DDOC_PATH=/usr/share/doc/${PF}
-		-DMAINTAINER_MODE=OFF
-		-DRELEASE=ON
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_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
-
-	xdg_pkg_postinst
-}
diff --git a/app-admin/conky/files/conky-1.10.8-fpermissive.patch b/app-admin/conky/files/conky-1.10.8-fpermissive.patch
new file mode 100644
index 000000000000..42abeb831cd6
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-fpermissive.patch
@@ -0,0 +1,14 @@
+--- conky-1.10.8/src/conky.cc.orig	2020-08-28 13:17:22.330113596 -0400
++++ conky-1.10.8/src/conky.cc	2020-08-28 13:19:48.564891015 -0400
+@@ -478,9 +478,9 @@
+ struct MHD_Daemon *httpd;
+ static conky::simple_config_setting<bool> http_refresh("http_refresh", false, true);
+ 
+-int sendanswer(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) {
++MHD_Result sendanswer(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) {
+ 	struct MHD_Response *response = MHD_create_response_from_data(webpage.length(), (void*) webpage.c_str(), MHD_NO, MHD_NO);
+-	int ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
++	MHD_Result ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
+ 	MHD_destroy_response(response);
+ 	if(cls || url || method || version || upload_data || upload_data_size || con_cls) {}	//make compiler happy
+ 	return ret;
diff --git a/app-admin/conky/files/conky-1.11.6-fpermissive.patch b/app-admin/conky/files/conky-1.11.6-fpermissive.patch
new file mode 100644
index 000000000000..1ac1173ba646
--- /dev/null
+++ b/app-admin/conky/files/conky-1.11.6-fpermissive.patch
@@ -0,0 +1,31 @@
+From 16be0e1571a586168855bedb6da1ddc732b0bbf4 Mon Sep 17 00:00:00 2001
+From: Brenden Matthews <brenden@brndn.io>
+Date: Thu, 22 Oct 2020 13:02:00 -0400
+Subject: [PATCH] Build fix for libmicrohttpd.
+
+---
+ src/conky.cc | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/conky.cc b/src/conky.cc
+index 79633a40..b1743466 100644
+--- a/src/conky.cc
++++ b/src/conky.cc
+@@ -322,12 +322,13 @@ struct MHD_Daemon *httpd;
+ static conky::simple_config_setting<bool> http_refresh("http_refresh", false,
+                                                        true);
+ 
+-int sendanswer(void *cls, struct MHD_Connection *connection, const char *url,
+-               const char *method, const char *version, const char *upload_data,
+-               size_t *upload_data_size, void **con_cls) {
++MHD_Result sendanswer(void *cls, struct MHD_Connection *connection,
++                      const char *url, const char *method, const char *version,
++                      const char *upload_data, unsigned long *upload_data_size,
++                      void **con_cls) {
+   struct MHD_Response *response = MHD_create_response_from_buffer(
+       webpage.length(), (void *)webpage.c_str(), MHD_RESPMEM_PERSISTENT);
+-  int ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
++  MHD_Result ret = MHD_queue_response(connection, MHD_HTTP_OK, response);
+   MHD_destroy_response(response);
+   if (cls || url || method || version || upload_data || upload_data_size ||
+       con_cls) {}  // make compiler happy
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 37fad0855e06..f4abe7a73b92 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -6,7 +6,9 @@ AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b
 DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
 DIST conserver-8.2.4.tar.gz 432854 BLAKE2B 5b6003609187e629544a7183b32cb7b2ab6c854cabf915271a3a924d18c2c13a1bf01f0524740b35859d83c4cb5cc525b87182c342b0075d5486ba428ed71091 SHA512 c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad
 DIST conserver-8.2.5.tar.gz 434260 BLAKE2B f057a99db8e2f39f644ac8c55dc75372e74a9736c403ceaee8b70af6418ebec881f0c00d0ed4e0825c5f00900c70e0cf5c340637f5f16d19875448c58172ffb3 SHA512 76a1d75307faabeb04b65c5cd5fb1bb7df22e0ff25769f94a86a4b9134da262e6523ba207c8da1ec5b67299498c807ec92279a10846c0b3f23c9effa4ee01c1e
+DIST conserver-8.2.6.tar.gz 437315 BLAKE2B 9f62bb8ac91b57759c6b08d5a6ff31727a547c1991d322d75350a879a247925bbb1bbcab25b8a3d99a2ce6a997ba9f2e6c35338588e913055b29f3574e00e434 SHA512 3b7769675fd0edfd3727e5e84785f33c037b9e7a17c8c69c0ce48a447ea3b7de916e217c0f3b808b8350818b7bc702c917ea7a122ed96ae6b73f81ff0b5ae283
 EBUILD conserver-8.2.3.ebuild 2332 BLAKE2B 41d68bea10c5a0e8a351f69fac90c8f0b4b250a541b347ae9411d9c36e0c32cf835b8ddd2435c224436a46cea8569c6600fca1126b40518e11065c08cd4aa1f3 SHA512 4191c9985dec41cca907319c9684c0898114d59d79116f4a4944cf6535669744f6020af0c003e196e3dc1a39012bda501964e715b49f380d16aea0f22babb48e
 EBUILD conserver-8.2.4.ebuild 2339 BLAKE2B 36da2173617d2c970a95a8417992dcbfacb4d139c2674a94a75e00292aae7025dabab5a0249fd83867cf5c5ffd1d8dc643fd0f8d650562f7e44ebca408b02d3c SHA512 a9b2ee02b808c42887f5655efa16ddb70d986c528f8a4017a1f833aa0eed5e024a0289fe0ad018d9f09682aca2547749c7fb8571deed41faf4ad072e787b14b4
 EBUILD conserver-8.2.5.ebuild 2291 BLAKE2B ba84ea1948480e942fdfc466c4f9b35dec108a278db1a89cc6c25036ea58228e16bb279335a097ea761b962afc5fe847afd27b501a260b06d9630ecfb0c46f99 SHA512 ee3f120c30bef5c20e2df9f47d5193e7b4effc7cb41d8d9e2bda473a860b5fa64f02398bd1afb639c18caec52c9aa95d744865595ac7cd4b1f36487a9329cc57
+EBUILD conserver-8.2.6.ebuild 2291 BLAKE2B ba84ea1948480e942fdfc466c4f9b35dec108a278db1a89cc6c25036ea58228e16bb279335a097ea761b962afc5fe847afd27b501a260b06d9630ecfb0c46f99 SHA512 ee3f120c30bef5c20e2df9f47d5193e7b4effc7cb41d8d9e2bda473a860b5fa64f02398bd1afb639c18caec52c9aa95d744865595ac7cd4b1f36487a9329cc57
 MISC metadata.xml 1378 BLAKE2B 942f6b9d8fd616f089d0651fbdfc41de96033acf65f127cbfded2fb9c390fd9b86c037a62679ea27b18e4e618bf764d09277350e9fdbaadc914c18a6961618e2 SHA512 6b3e06cfa1013f71eb42c9c073df8c97d2b8fa6b935b637ba29096db88d75bab1bb192695ed4a5dad63d88341a366327f419cb357777c0abb09799c8bcc40970
diff --git a/app-admin/conserver/conserver-8.2.6.ebuild b/app-admin/conserver/conserver-8.2.6.ebuild
new file mode 100644
index 000000000000..8ecd6b02a530
--- /dev/null
+++ b/app-admin/conserver/conserver-8.2.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pam ssl-cert
+
+DESCRIPTION="Serial Console Manager"
+HOMEPAGE="https://www.conserver.com"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
+RESTRICT="!test? ( test )"
+
+DEPEND="debug? ( dev-libs/dmalloc:= )
+	freeipmi? ( sys-libs/freeipmi:= )
+	kerberos? (
+		virtual/krb5
+		net-libs/libgssglue
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	pam? ( sys-libs/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}
+	pam? ( sys-auth/pambase )"
+
+DOCS=( CHANGES FAQ PROTOCOL README.md conserver/Sun-serial contrib/maketestcerts)
+
+src_prepare() {
+	default
+	sed -e '/^INSTALL_PROGRAM/s:-s::' \
+		-i {console,conserver,autologin,contrib/chat}/Makefile.in || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with debug dmalloc)
+		$(use_with ipv6)
+		$(use_with freeipmi)
+		$(use_with kerberos gssapi)
+		$(use_with ssl openssl)
+		$(use_with pam)
+		$(use_with tcpd libwrap)
+		--with-cffile=conserver/conserver.cf
+		--with-logfile=/var/log/conserver.log
+		--with-master=localhost
+		--with-pidfile=/run/conserver.pid
+		--with-port=7782
+		--with-pwdfile=conserver/conserver.passwd
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
+
+	keepdir /var/consoles
+	fowners daemon:daemon /var/consoles
+	fperms 700 /var/consoles
+
+	newinitd "${FILESDIR}"/conserver.initd-r1 conserver
+	newconfd "${FILESDIR}"/conserver.confd-r1 conserver
+
+	dodir /etc/conserver
+	fperms 700 /etc/conserver
+	insinto /etc/conserver
+	newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
+	newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
+
+	einstalldocs
+	docinto examples
+	dodoc -r conserver.cf/samples/.
+
+	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+}
+
+src_test() {
+	# hangs without -j1
+	emake -j1 test
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"/etc/ssl/conserver/conserver.key ]]; then
+			install_cert /etc/ssl/conserver/conserver
+		fi
+	fi
+}
diff --git a/app-admin/cpulimit/Manifest b/app-admin/cpulimit/Manifest
index e3486ff29bea..7a6ccbbecd5c 100644
--- a/app-admin/cpulimit/Manifest
+++ b/app-admin/cpulimit/Manifest
@@ -1,4 +1,3 @@
-AUX cpulimit.8 1451 BLAKE2B d65e5e47767e6202635cdb1247c343f2a68e49b70b0748e16d7eb8a5e17344ccaa929d77bfc29462d61909b9363d9486b709f9a23552aa0d2db58aac04d410e7 SHA512 3cceb217f5053aa6583a13ada2ef9ed6370859bb072474fcc6fef88f5184985b0a369b1f0c1ead634b07a1318ea1f81a4f4128de95513f9e6cabdf86223f6083
 DIST cpulimit-2.4.tar.gz 24669 BLAKE2B e0fe0d6766e76e6e2a68dcdc553039400233daabbb14ce4a9dae46a7b694d2ecd660f4c1d13f417a74b12365c719780c732a03bd91c6384d1e7118d0fce521fb SHA512 008dc3fbdcbd8afd875a2a1ce03d609db595c6e110803140c676d3713ea60f4877a1bb8e7aa0e8b669dce31522ad81e2703f616341a0f4cbc69a6b01865b66d0
 EBUILD cpulimit-2.4.ebuild 637 BLAKE2B efcc65d22d2e18aec1fcc72d2e6efce525e4c5eb5ddc295690cfe5e8075e8e7b551420a500118e1d19ba34892ad0f562566383a1e6235c0c33303a0c95ac079b SHA512 ede24c34a0a8f35f8127c81fbf0857f64817cd5f21be4c73cc53d32b80dfbc18eb558caad64eba93d052f14cfb4349359696dd906ebca104d910df08e10321d7
 MISC metadata.xml 328 BLAKE2B cfd9269eca123a335dd8b842cf59029ae1aef98293d1f955cd4cf33ddd56a658c1aba076e7de6318720c4ee0a282bee3c5282dab611e316a1ddbbf45c18af334 SHA512 5bf3122d96aba89083a0776bfeb5cd1ca84cdabc59a1ad4e158b1b50e4eb42b3ebf7a45a51807af380a040c6ae106ddc30c97003a2398e7944bce932fb35d8b1
diff --git a/app-admin/cpulimit/files/cpulimit.8 b/app-admin/cpulimit/files/cpulimit.8
deleted file mode 100644
index 8e6dcf9bbf42..000000000000
--- a/app-admin/cpulimit/files/cpulimit.8
+++ /dev/null
@@ -1,49 +0,0 @@
-.TH CPULIMIT "8" "July 2006" "cpulimit" "System Management"
-.SH NAME
-cpulimit -- limits the CPU usage of a process
-.SH SYNOPSIS
-.B cpulimit
-\fITARGET \fR[\fIOPTIONS\fR...]
-.SH DESCRIPTION
-.P
-\fITARGET \fRmust be exactly one of these:
-.TP
-\fB\-p\fR, \fB\-\-pid\fR=\fIN\fR
-pid of the process
-.TP
-\fB\-e\fR, \fB\-\-exe\fR=\fIFILE\fR
-name of the executable program file
-.TP
-\fB\-P\fR, \fB\-\-path\fR=\fIPATH\fR
-absolute path name of the executable program file
-.P
-\fIOPTIONS\fR
-.TP
-\fB\-l\fR, \fB\-\-limit\fR=\fIN\fR
-percentage of CPU allowed from 0 to 100 (mandatory)
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show control statistics
-.TP
-\fB\-z\fR, \fB\-\-lazy\fR
-exit if there is no suitable target process, or if it dies
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-display this help and exit
-.SH EXAMPLES
-Assuming you have started \fB`foo \-\-bar`\fR and you find out with \fItop\fR(1) or
-\fIps\fR(1) that this process uses all your CPU time you can either
-.TP
-\[sh] \fBcpulimit \-e foo \-l 50\fR
-limits the CPU usage of the process by acting on the executable program file
-(note: the argument "\-\-bar" is omitted)
-.TP
-\[sh] \fBcpulimit \-p 1234 \-l 50\fR
-limits the CPU usage of the process by acting on its PID, as shown by
-\fIps\fR(1)
-.TP
-\[sh] \fBcpulimit \-P /usr/bin/foo \-l 50\fR
-same as \fI\-e\fR but uses the absolute path name 
-.SH AUTHOR
-This manpage was written for the Debian project by gregor herrmann
-<gregor+debian@comodo.priv.at> but may be used by others.
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
index d5475f16c58c..9549a0d3ff50 100644
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@@ -1,5 +1,5 @@
 DIST OpenDoas-6.0.tar.gz 28482 BLAKE2B 8d35a12f18609c9dd7746ff8ce7c39d16d7c5e595a05c0f1b91211d757029ae78311573228178f95ef92624f7a49d6ca1d1d0efd264104d66e1d20a8aa623241 SHA512 2bf5e00895a45d87785e7a494a1506844afd843ef5375e0b0e3795ebc24712bb941c6feeb87e426e41a240d40aca9b4c099f77220745bb7142a7a4b303441f60
 DIST OpenDoas-6.6.1.tar.gz 30783 BLAKE2B cf6dabddb9a0ef837355516f7344efca33a639ede126e54466644521b5b1a7073b6cfa96cc8573ef16221a748ae6395f7e4fef4ff912ca7889742fb46d1a4da5 SHA512 390e0e139a2641be22c4493c3ed755d9cb4091f4ab8d590123b7c8c4f2f116cea3b3500926ff191fb98d92192ca9e92118cbcbeb463a7833763e00c65603e678
 EBUILD doas-6.0.ebuild 757 BLAKE2B 5cc07f49c5d2d6cc265b64cec423210db1a9b7a23420452495a8872821dba52205222e6437abf23e57f948a95a8d3baccc66bc77b88866739d075a3f4275c6bd SHA512 e4ac22ef41bdc89438d4165a1552e4883b5eaa02a484a978f15ceeb07a9775bdbda6a1669feb7fdac5d5ac39396bdd1789c88af2189369cbe339617f9795c2cc
-EBUILD doas-6.6.1.ebuild 802 BLAKE2B 9c18a5a3f6774c581154fe0ecdeea768f0e297edd03c18b80755936d82331e62a6a5c2988c0c68e05579eb80910880c6e9b744c033c6ea99e5fa8bb3bbe4a10c SHA512 c608a26476db06359868d8b7e22e101b951678a3e0317d9659df65fc2832b903ac40ca318ddc9180830182de3a1b039fa8e545b8a2146b8d3121c3be75eaf1cf
-MISC metadata.xml 529 BLAKE2B 670e6d1d61b588eae2b125d19b96f5c145f5712f50e1ef067b38965653c0ca14807efb16b5e0b4ae851531cd4b93fa82c2bfd092958c2806079fb1972df846f8 SHA512 27269e7fa6fdcdbab3676c4940da7f1836c17a82efba1b00a233dbc753959b6ae17e8df9402c5a9467fe9b0336ce0cb7c325fa62d84a361f302621ed3cde77af
+EBUILD doas-6.6.1.ebuild 805 BLAKE2B 75a6f6d0d0113530e958a5c489f41397a73724b579e1f49b79762db0333d81c526ff383315b4952f8d03ff3a72b320965d8981ab6252bea1066813ee34e8901e SHA512 117905bdc83d7f55fbf32694d63c213ddfded77d3c743de7d4e1281f850ab061ad41cb5cb208d84439b44bbfec097733f7a19e00c4d750e4ee1e4464150871a1
+MISC metadata.xml 527 BLAKE2B ec5f403c54f18989467cc64c023cc86f0ccdf3f4d974db83a0a0ed660b1f32caac090b43317e5e2b4de46fd7c92a38d622735f9718b0680020557d378a290630 SHA512 1cc9427b113968557fc9764a552138e5a17ed44ef1ed20cb087a8fb60865b8d3e9331baf1d172180409ff636143ad23e1a6d3e5de6af4a8e7b8a7b9bbdfac718
diff --git a/app-admin/doas/doas-6.6.1.ebuild b/app-admin/doas/doas-6.6.1.ebuild
index d2d4191ca08b..a873bffa4231 100644
--- a/app-admin/doas/doas-6.6.1.ebuild
+++ b/app-admin/doas/doas-6.6.1.ebuild
@@ -15,8 +15,8 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE="pam timestamp"
+KEYWORDS="amd64 arm arm64"
+IUSE="pam persist"
 
 RDEPEND="pam? ( sys-libs/pam )"
 DEPEND="${RDEPEND}
@@ -33,6 +33,6 @@ src_configure() {
 		--prefix="${EPREFIX}"/usr \
 		--sysconfdir="${EPREFIX}"/etc \
 		$(use_with pam) \
-		$(use_with timestamp) \
+		$(use_with persist timestamp) \
 		|| die
 }
diff --git a/app-admin/doas/metadata.xml b/app-admin/doas/metadata.xml
index 5646de6e7eed..67799a199867 100644
--- a/app-admin/doas/metadata.xml
+++ b/app-admin/doas/metadata.xml
@@ -10,7 +10,7 @@
 	<name>Proxy Maintainers</name>
 </maintainer>
 <use>
-	<flag name="timestamp">Adds support for "persist" feature (experimental)</flag>
+	<flag name="persist">Adds support for "persist" feature (experimental)</flag>
 </use>
 <upstream>
 	<remote-id type="github">Duncaen/OpenDoas</remote-id>
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index d682cc217a49..cb93761e342d 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -5,6 +5,6 @@ DIST eclean-kernel-2.99.2.tar.gz 18743 BLAKE2B 493a3f54e92821c76dde0228b382dbca0
 EBUILD eclean-kernel-0.4.3.ebuild 504 BLAKE2B c655f9fcd2ed91fea54d637d0d4f04275d7b8bbccb82ecc07f70b8a48b9307037fe2243013fcb180232b6a8e55c1634084a9ddf651eda2bd05a5b71bbc9429dd SHA512 6a3675baf96a4c883f14b9f2d21a4d4f2aaa26d7ffb773de9df7d159510a9fc23592b155d35dcaf45337350a1fc49e2c2b82b8f86e978cf4b052f3f736d9c346
 EBUILD eclean-kernel-1.99.4.ebuild 362 BLAKE2B 20894519cc3270ab4880c0373894638d18ecfeb34fa49a7f801e4889d22f78702c87201c3cba929092b38149f3b14109b058f95f597eea8c1507011af37b14d8 SHA512 61b64ce5d1f0e842de988f1d62bb41af6e16ef73a05ab35b90d97410292c5409c3873fac6dbd9a09e4be033cd19e70a283cfd6be48183409822c29ef26abdc85
 EBUILD eclean-kernel-2.99.1.ebuild 542 BLAKE2B 60fbfa52a815f7ac57167e033f5a94e67295882c0a8d52bc5713209846946444005b33c69dc1112b32075c9043eb6cb567600a32e32d900c43251ac350e73355 SHA512 88f6c6f8cdafcba4eeec381a069f87f4eb5fa080cf3e5670d3f4d572badd6bcac0ea4978ed4985177efbbab97e8097b5e382d565e022495dc5c415d207ce69fc
-EBUILD eclean-kernel-2.99.2.ebuild 542 BLAKE2B 60fbfa52a815f7ac57167e033f5a94e67295882c0a8d52bc5713209846946444005b33c69dc1112b32075c9043eb6cb567600a32e32d900c43251ac350e73355 SHA512 88f6c6f8cdafcba4eeec381a069f87f4eb5fa080cf3e5670d3f4d572badd6bcac0ea4978ed4985177efbbab97e8097b5e382d565e022495dc5c415d207ce69fc
-EBUILD eclean-kernel-9999.ebuild 511 BLAKE2B f19c47829c9f0a644d0b3a44655ef9afa52ba1f428e71176449f19128f33d99ae38c3651d133a8b6bc15e2ae9b3693201f4f2425014212698d0468a1b9d1bf6c SHA512 aa71821ee76230407ee479c45b7780d94ae36c96c50ddd4fb9bd880e5ee0e7b154275ff0c31af1e96e8c59f47ff0959cd23e2682e4e1b365bc6136396ecde166
+EBUILD eclean-kernel-2.99.2.ebuild 541 BLAKE2B b4e174ed17cfeb897f393b98baf9b92cac3f27b2cb6bc2524e1585c338cd61fcfed9a983151183a696f56d2fce3eeca78b2d03d169b997cf58d0df5dd4208081 SHA512 3640f471de8fe4f9fe54e67d43ae5daf838bdf690c54355bf6d36b5ada5439b895ccae5d2f98485325a685cd9f6b38bd824aedacd939e10aa70e718d159c4cd6
+EBUILD eclean-kernel-9999.ebuild 510 BLAKE2B 1d80e3255a4f443291b73733b1b185155a7b5e044c048ac7519d3a17f01b5864f6eddbea168ce238ad150678cb832e181046e72118cb39cdc3d12e6f4ce05c13 SHA512 2a289a6f002b2deac3fa65ba4f6e849b774ed77dd3a598f007984387f6e62110930f63265caaeb8d0a2111641224587b50a1c1b87d16d6ac9de7e6074615c2a0
 MISC metadata.xml 539 BLAKE2B 23dbdae146e666b8698181642673dc708027ddac7c33a9f53edc9cbf1d1e1ce62e8d4531a6962098bdd6cd2029369b587823b2f9630e285b43c0db340b29e70f SHA512 2a74b715ba28178d042f907014b02fd181e0e481f4eb9230b15ef542be61b2e1fce17efba4819b6d06de09ed7988b39047b59182b6c4de86a2a05ad0350635dd
diff --git a/app-admin/eclean-kernel/eclean-kernel-2.99.2.ebuild b/app-admin/eclean-kernel/eclean-kernel-2.99.2.ebuild
index 80c233f40feb..81d82b128cbc 100644
--- a/app-admin/eclean-kernel/eclean-kernel-2.99.2.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-2.99.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
index edb37d5f75dc..deeedcc7a341 100644
--- a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 5fad7f71b031..11558a2fd38a 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.18.0.tar.gz 4625622 BLAKE2B 618aec5cec7a41f06963d728c627f043f08ba39695691154118261a6fb71bac93cdb07b039e74e05a464227dca4da66c17c4c319553894f2d46af6203a36a038 SHA512 862dd138a6b6cbf9471206a07cf4447df113a77f44523e72e89a1f87362086fa168ded51d43c32408946b8cf2d6cb9668ff29818494a2eb6d94b0ef7d3bf4420
-EBUILD exo-1.18.0.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
+DIST exo-1.20.2.tar.gz 4623465 BLAKE2B 07d19c95e06ec0bc43d5d70d332be50dcba623740ea60316640bfeffa6f6378f6d57bc474a8accc10e685d9c5816acc9fef140fc47999a93dd3f42d982adf282 SHA512 9618973b3038e6bdce7cc8a324715d0a95bd75eb4d2c96919370ea3840b0cdda315cd8e1d26f6d56505a984d2de8606d97783072286143359c0b271d151181dd
+EBUILD exo-1.20.2.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.18.0.ebuild b/app-admin/exo/exo-1.20.2.ebuild
index 0c2c8d861fe4..0c2c8d861fe4 100644
--- a/app-admin/exo/exo-1.18.0.ebuild
+++ b/app-admin/exo/exo-1.20.2.ebuild
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index b5b376a0d63b..17ecf0fb2c47 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -10,4 +10,4 @@ DIST fam_2.7.0-17.3.diff.gz 28847 BLAKE2B d46e0d60d438459b43e24d2757771f02f3b5ee
 DIST fam_2.7.0.orig.tar.gz 301945 BLAKE2B 9219c15b998bbac49e76eeac86f2de666ac49dca773c82ff6220c11ee77f0381b93ddbeeb500a7775bff3cc29ad6e7008e12304f0b0e361cbcc951d9f995a229 SHA512 dae6e883ef10214b1506d342e32cb5c59d0b4b7b66c1b099daa836958651ff3b04d526b4e516abd96e51587a97a8950e9517d1b38c6f7e6637ee3e7d20243531
 EBUILD fam-2.7.0_p17_p2.ebuild 1768 BLAKE2B a913d5b761c70f175d9f7e5f9666881f2f054fda5dbea96fa613bd0841eeba15ef5cc2905bd139d96af479f813b985c7e2e27a2312434ff0e50d99625b0d9a2a SHA512 38dad20f2f0b2a822ca6bb1f6df5e8339657e562f1cf19db2454901e0b817ea6d6ae5166fa57e47574199b7e4939c9687d1f8b23648922206cbbf5101c20bcf9
 EBUILD fam-2.7.0_p17_p3.ebuild 2003 BLAKE2B ea0435726b29f434a9b909bf54e89d78f23cc069a4faa0bac9a2c659d549e25c3460f8265d4f447c8d991e4edcad29d271a789c0236a31be9843494ce04ce78f SHA512 a0f1cf4708563f3203fa014a9799c9dc75814779371c0e7b6646093dc622a79da2504c7db11758ca9fa51fbd3782885da0310ac303118517e2302ceb1ce02555
-MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/fam/metadata.xml b/app-admin/fam/metadata.xml
index f8bd6f3f34f9..7a38bb900964 100644
--- a/app-admin/fam/metadata.xml
+++ b/app-admin/fam/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index c13ae6612d26..cb217d1d11b9 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -32,12 +32,11 @@ DIST code.cloudfoundry.org%2Fgofileutils%2F@v%2Fv0.0.0-20170111115228-4d0c80011a
 DIST code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.mod 37 BLAKE2B 7f1d6b0d3a4466e42d7eef1cc7fb543f9e3614c482fc33462f006a193bbac8f629b55ff4f6046091dd19cc3414517bff8817e43836c9caa68284b580edcc0d78 SHA512 f05b5cedfdb7a281ab89b8150387ddcd695b84617c0355bad4bad1abb7609cec47d3e16bdd3fda172f067ad58e68a120b9abd18a240e5181e94d2912f4b6308d
 DIST code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.zip 12973 BLAKE2B 761863ec1f123172069a000a43a5aa2e60a07bae4b8ece617450608603121ac81b12b771f9ae3ab0f3eb9cf14c2d2c23319a31e4f8cd49e93d5e19f5a6dc2c12 SHA512 d39f126bbd0bc0ce86098d3eb4e14ff02d0b6b053cb2e63ba202d5fed007d673ef39d2653d29751ee0b7107e96ad32d48c66944d55815dab4f7b9c778c531c55
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
-DIST filebeat-6.8.12.tar.gz 35567860 BLAKE2B d9650806ec4889bbcf511f1433a6b85678852c79aaba0a1f3493ff1451d012a1e3c6d2ca613a627a0c2c43c5ad43467c23fbb6993003bb9e836ac49ab8ab6539 SHA512 7d322506949e365046411beefbf87c45da4b9e2fa4b5a8b8820f97be73d48a9ae75fc85fe209602752eb18e21784f6b8f3bc7f83881efa91ad4995f07a773bd2
-DIST filebeat-7.3.2.tar.gz 49977990 BLAKE2B 6219a382b415572fdea2ff4b0aa3f02b3c1e500d77ed5200b6d5b4334a08b8e91d389ea41b3afe98355f8b20e7f8ecaccf5996f0bb7aad5f10e0f0d69400a0d6 SHA512 75943b251343d28f478f2f19665e4ba31f5bc6e4b26f6e6da8aa062322da4ab8e134c87a9557a97677ba3b22484c44ebaeaeeb87866e0f12e67f1647fe34131a
-DIST filebeat-7.6.1.tar.gz 77795975 BLAKE2B 2ca420b339b96baefff5042dba456fe1086dfdc5ccc1503609ff1989d79952709347662be60b18591e2b1a9f6557bfb942429b9aa6412dc02072331c8918c95c SHA512 c4f8daff002fe393b95f00b47df1ecb5566a69a9345bbbe1caceffecd8d413e3e9886f30cd4f2914579526db3de92c036c78fb37d703d447567fe921275b5fac
-DIST filebeat-7.7.0.tar.gz 90104462 BLAKE2B d044ec00bcae08745d012e49fc3cf9369b201da68ee2bfca2ce7f91ecd74c78e7c48d2045e539b6752c164e4c3f6cba38a00f1ee7a82493e008f6be49581b5d5 SHA512 1e0c7cc77b90cb3764d62db23a5a66ac3214c97a2f305c46f568ccc91a21f247c9e42c91a0771c9fc7500f6d0769e3d224b81a2c76399fd2bc6edd5afa1cb367
+DIST filebeat-6.8.13.tar.gz 35569151 BLAKE2B 2ede230e537055065b70a79578e775b0ae9da104ab21ed895e4fd2f8d2070d07ab60e33f24c2850cae908a42f0d537a8e24a6256b7a6a5fca9b6897e43f95439 SHA512 39f1ba06e1930ea498c13dda11cd835096adbcd075585672004fdc9e19d96971936e47f9c631ee02f59984c10858cfd914de136ddc356e8c39fe833401b42304
+DIST filebeat-7.10.0.tar.gz 87244908 BLAKE2B e6ef888011c053287a4b6c6d49420f6d0cd68866be208ed4a3ec630cc627e13df21a73f1db5e4f9cd959690eccaa78d15c78bf72c65023c4263d3d6826ad7aa9 SHA512 5a26a0c6638e01fb1b9c621a5ad20b2f65d255da82eb31a45110c96d8ab966a3e5e3c212bae5d27a618226d1a4ef0649102fdaeffa8069141fbb1dcb109f868b
 DIST filebeat-7.8.1.tar.gz 95430122 BLAKE2B ca79479ae8bec318a69b49fa8ba08c460755b356348ac5aa067ae90ffdd1d4e0c38b05938a80920a2d6886dc08fc0ccda0153c8a3299aafc5d2c2dab4c4fbdec SHA512 ccbf8fbbd2c094400b24e5cf8a40a910c69f4ae1bc858c496118519f5424b03b192f4852620ad1b9b8dc14f627c0d0548127406b015cc2a3d7b624801196ea60
-DIST filebeat-7.9.1.tar.gz 82853636 BLAKE2B c995e4cfe8a51b0597116d9e218360c574b4eee3f0b2174bddaacca5da7a286005bb9fb9b0b4f6de4202be95e390f32924755461b3b2cc03c4b88331e8a2329f SHA512 ae113efca9ff997dc77b44b6d1962653ef2b752a2d1b77e3131b94d7139db5672e29d02d02c8c7447f3a53a13126beb7dbfaaf228261053b6520acfaaf13ab23
+DIST filebeat-7.9.2.tar.gz 82861097 BLAKE2B 902f124215d4017c65dbb5fca033a7597cca0fede573f6b564bff656e540030eec7536075cd24f28dce31de28bac2508fb492c42eea90fa25f06b2120716b73a SHA512 8e6eba2d201997af21bb268e4708cd9c4fb22a862152dcf45e2720ccb3bf7c1e40907f468ecd4492a0a4c1f2c426bd6077a0739951f7dc42c9b0b12ecc28e90e
+DIST filebeat-7.9.3.tar.gz 82872010 BLAKE2B e437905a13e556e1bec9b59a8837eb4649f063e4ddb9815a3e18efdc291758e39b5abc0465295f8526f042aecdfc2b8e49ebb6980aeb8b3b13be9d4431863401 SHA512 35c2c8038f0f540e467feef341f3248eadda5e5b1a80c247bcd54c073153a7839f797be327b65c4eee255f4d656e36c57d112b7ff0e637342ccc13f4f59366d7
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod 372 BLAKE2B 80a7e0aac984acb79239b3309290cd8ef1eeca8d9f53b3c91628cbe6dd112706d2313c47e33ac52ea9e8a6417289dacae8e2e72a03e679836d3ed89cb86c0aee SHA512 6db1a52bbab1332ab7e761532cb110394afa1dd69cc5f7443c3fb733c7d95fa712cf6bf8a78fc3f51d89b2d368a248e532bab06bc93e2e663b8f836c91aef0de
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip 29788 BLAKE2B c1e493471bca24ac64c8119e624ea077a74678a492b036deb907ede12b5e93c3ef699820cb2ec9468a98d00e83d84c6bb45cf274b4812a0f319a0248610a4d2c SHA512 a412fbe597ab0c47223d733303ed2277656fe35866f52e4ed1f25cc03b691f15f5592cb07b3c5fb39d4cb98c6d73dbc8e1e7869cea17241a33dfc29db0a1d121
 DIST github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.mod 916 BLAKE2B eda68c483b29b920a2a3efafcf5b36b7d4f1c01bc5f55fefafc3ff9805cbf62a9a83a9d8f870319776a53f55d21efd52de8174ecb45c1c648e65d5e187be21fa SHA512 6fd1c6d13559028e1fac3c9cd3de1a914e5cd0607519de8b71e622b187168c377dc8bcc3de87c4905f0a7ed846b123885fc2dd9b8a4a6d9a49f7781a61ef53bb
@@ -59,7 +58,6 @@ DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.2.0+incompatible.mod 36 BLAKE2
 DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.2.0+incompatible.zip 21424 BLAKE2B c22d29ed317c6490a0856a177c7624ca87b3015f6512f4ab330aed250a3742276f2e6fce0e6e20d3cb1660e384c429949321a7fdd949b325f0bbbd2433652d47 SHA512 cd43fd5be17c3e334f8bc4810cd92ddeea02b0ccf550a73e38212536fac21aedf6684b42244edf8dd2dba58eda2aabf0d6c499b2a5de83c05af1ff636f833f76
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.mod 315 BLAKE2B 2f508451778b22bf72bb0e6b4479991dd1dda0b474ed3f09d4bebdfdde1628c780d70c9c0edc38fb91c6b7568eeb0db63e7c8500a908adf967370fe16682e24c SHA512 72629745cdd14c9c66a696700baecb37589b565862873cbdb9711545df08c7af659aeb4dc4725c7ef9c19af9889b9007935487530a87ff97267f98811b701924
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.3.zip 104877 BLAKE2B d266dc408ad799bb289293df8dfb2ccd6008b01dbbf0436e5b49ffe48da4cca98fff7759010750e63c9cd3c7ce8bbd89b1b1642e1a08c0b81d801ceb1d168ffe SHA512 a9622ef347ea7bb305a20121552e185c3854c901f3495a5eb48da7eb9cbe58fc1f63bed48f659cbfcff87fdae961dd4c214e9191cd89ec0303f502a26ef4fb1d
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.mod 315 BLAKE2B 2f508451778b22bf72bb0e6b4479991dd1dda0b474ed3f09d4bebdfdde1628c780d70c9c0edc38fb91c6b7568eeb0db63e7c8500a908adf967370fe16682e24c SHA512 72629745cdd14c9c66a696700baecb37589b565862873cbdb9711545df08c7af659aeb4dc4725c7ef9c19af9889b9007935487530a87ff97267f98811b701924
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.4.zip 104907 BLAKE2B 553d09eecc922a448b2b321f0ea9f03237aa34d202b295a2e2e7367548f65b7189692ba84241d7a2d232622229e568b646a9a9a899f435a452b82a75f3255900 SHA512 c474d9e5f9d3f471a707a1c6f565f1f1ee87349eb3162722db1e6ce3f8fd51382fd4e1101aa485ddde258df492c7ee4b9c3b9f534e7389034d01391f15e8d4ff
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 BLAKE2B 1ff6851c8e73b2a566cfafdc2ebd259478b39258f785040407cd853433312ef10e492da8dc0dc9cbd4a2d2470e2715ef5ba4c05100c35f5b0664c9b23879e721 SHA512 61c06f593c1759bb078042d461319db2f91afcbddf50186d09195021eab865159ca5c017eb078d354d7db590365846e401ec3f91a2cbbf753bc32d7111683bd2
@@ -88,6 +86,8 @@ DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip 6278 BLAKE2B
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.mod 31 BLAKE2B 3f699ae120e91b47e91e35449ae06e146a77a3b8c6834a6494ee4809e3f524bcfbb7b0d9a53b6c64b6ba9f3b1814a7cefa525030871557e52e54be629bae3aee SHA512 5d47517c29477f39a7f12d63ee80c1c64cbbe8065ede96732c133a0159e541b95bb17f10fea0ed5acde361deb84cbb66e79a38cf4be0dc7b28d8b8e342d45a88
+DIST github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.zip 565502 BLAKE2B cdcd85a821838a709b28b3d7e8dae6af9d562f7394ae155624f9975900cad193d91ed80e6183aff82d95a367a8ce0af28c575cefd5f8cd16b7bc16596f6eb22c SHA512 e4551cb3fb58cc60e1e141c2c11952c524c07280e530309ffee13ade0e9cadc873def7b279d024b3efb3d6aada5817c2d248aaf140323507172fca2d2d5a1855
 DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.mod 37 BLAKE2B 60b2ec6aeaaece8fbe3ca154b432f677dbb46672fdbc95b503f613190df535c7254900c9cfaa3319ab2d7562513640c7cc9fe650d75d97dc09fe84a17e359a86 SHA512 4f01cd11b3ae6f26266154ee37e7a4084e61e865fa9427187a24a02631415f2367a4afad83b4e1cf772b263aaf8f180b4b177e30ae884cdcab239919c9e08bbc
 DIST github.com%2F!masterminds%2Fsemver%2F@v%2Fv1.4.2.zip 20216 BLAKE2B cf3a8d5190067f8e58d632df761abcf3b122f7ff384137607a90b1afb23a42deb63a348dc1c1003d043a607adb7da997511c136d728f2c5fd553b2bced3fe62f SHA512 4c6cbe7e391a6c667c74b2cbd5f71be014d3f4cd5f384978fd4c6e2847b6e66ee6d5aa80cdeadef1e1edd6188a92d9032321a5365872ee18970175070b33c182
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod 177 BLAKE2B f2d2eb41aaa0f3f47a75ab260a461e6df690c34e7e817ec61afc7854ae26bec641cddf4f4481b5b3b27394e303d1fb1c4a9864f4de2d6c01f33e3fa0521b05bc SHA512 584c9a707b6115caac28ff373974faa59d12531962997f9640a4172b020f72c5d527355f035449a767d65ce426fc9705c143a7bd8afb5058c9ece241c9ad5d1f
@@ -95,6 +95,8 @@ DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod 1988 BLAKE2B e89ecdb4644e50e2cd545eb43452729d909745705f5254a59547420baf3da357e77bf5d73b220da6899fe08a4eb034b0d1815702dceda20ada57e277b83b9954 SHA512 67df97dbec1c4a0c0f84551ea80df88a827c9ff4467614ef61544a611e19de6d063af40cf33673621f2e52e198595b61c8d6e5d732fe87f00eb7c5bd653e0399
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.zip 552856 BLAKE2B ec7ad9c6e4c49c04f8aaca1c42e198027e5db5abd79ed84f1bc8dcef2e26d3e386e02554285b666eaed6dae5ac9bec5f0e9c01cb703585921f2834cd8f49b65e SHA512 5d4575dc4e98137cfacd463cabbaefe2df0e49b81af900e9c43d2f98fe2aa4a02323e395b390bdf4c05bdb1d470f8fd2f2766123d27360541f249cde5e91c738
 DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod 38 BLAKE2B 3f0ac051b31c84f5e98663c1e6245a4e2bde2be5c0be61ec80764d753bef5479251bbad3cedf6fb998d1a4a4e66a80beeafa6f3291ed45f46d643f7be109004a SHA512 aa1f503fe0c19002da21ae30df5393c15f2b2243ff415493420204d11032a562d5d40047705b1644d031523881dbbf284d3c56ce8106a2a969d2610504426762
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip 17606 BLAKE2B ee5acf57c658d87b97b533d695cb72c9d83e281f9e533271f03d85d52f92c3c90e240f3b6d2a01bebbea6befb147ab66d7f75c403fb8bb3e58a2bc0bb1269f6e SHA512 89912d8630bed5c71dcf391b57e4537b93f01c4f1cf320a8c11d5d34d47fa4e3ea4abbfb3bc3aa76ad3cf08350da67e190cd80322597d0de3123fbaccbcea9e4
 DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
 DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
 DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B af7b84d9f1cd163555b32bcf960b28b64a5689a1c9694f430af310f5041cd967fcf0d6c1a6c4020478544d347e4ba5b2fd16a6ef54258d33314ee0ad9239752c SHA512 917ada7ac198a013d2b090dfc59a45bd2619dcb7227df1521ca38a0d822fab12ea8c158c526257fef4ef506af29d9fa678e8dc2a73fc13c8dfeb57b398801744
@@ -125,8 +127,11 @@ DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.m
 DIST github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod 35 BLAKE2B 42febcb2e06c46797f14a850943d1df3c0e15630f376b8f1c860cf4e26ae4e2acbb38947f1348f501665f719943510aa2c0ad091f336e635430408794e61feed SHA512 c3d0bc6de3cac8395d0a231f041437b4caf00a4678270ae447b2e76bba3a588a6913cc1df6ba438bf6dd361b48860c365e9d32af55575208bd0f4b705b0504f6
 DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.mod 31 BLAKE2B 8ba7e45848280b2365b9c8fafcffd70ac32c1c22bca0d2bccb965b98f1aba961faba0824e33941ba06e7330a7e89d6804860ce16e0c0d6dcff77ad4d9f8e68b6 SHA512 f82c53780113048de082df94ef28072fbd86dadd4531270567ee8cbf31295b2590973c83992c2271df2cc1abe0cad808e4d8c5f7857e3dfc94768db69327d2c4
 DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.zip 5551171 BLAKE2B 3a6ad27fe06908c831aabe57acc34e25cf2fb85750011d93ea2c77e78c6968c99aa5abc51e373a11ddfd27aae31073463f6c1ca576dc7e39c24bccdd4c06d32c SHA512 92662212b13315cb47d541e2f522c159829a31cf1a81070c9aa7c1a27b238a9cd2481306275267260b19a81a664ec7ce62ed79c21d24455abaf8da1d164b8037
+DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200820155224-be881fa6b91d.mod 31 BLAKE2B 8ba7e45848280b2365b9c8fafcffd70ac32c1c22bca0d2bccb965b98f1aba961faba0824e33941ba06e7330a7e89d6804860ce16e0c0d6dcff77ad4d9f8e68b6 SHA512 f82c53780113048de082df94ef28072fbd86dadd4531270567ee8cbf31295b2590973c83992c2271df2cc1abe0cad808e4d8c5f7857e3dfc94768db69327d2c4
+DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200820155224-be881fa6b91d.zip 5776997 BLAKE2B 688499f0a621a3aea26af0620a182677bd4e44250585d3898f2f984a4dfd7890a6817aec77c274eaf8f2ef6bdf7a5120a4e0ff8b90a42c9b7e2d82a2dbce014e SHA512 9a6e92ac17b114f65484e29dcb5f4b69a374898dbe9fc5596d82f9862f343542744255d2401765304cd950250e63247646669ec102c25d89fcbc076d4814ebcb
 DIST github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.mod 36 BLAKE2B 95acd323deda998f2943316c4e98a85606fb8cc21ab5bfb33e3560b8c68fdfb9656ea82fa6991d4a916bee00fea24e367b169475945b73cf28898964e2187a4f SHA512 869523d36b81db8518bea028adf347fcfa88359fb6249fbb98ba378f31ca2becf9f5332e429e1de403ebe272c273a1c8b1be68dddbdb040917f9135f0ef2c1b7
 DIST github.com%2Fapoydence%2Feachers%2F@v%2Fv0.0.0-20181020210610-23942921fe77.zip 9890 BLAKE2B 67b178726ad129d97976c14743e294db88c466ff5cdea9f03f171254d331c8b9b97b55ad88f36b1804394acfbba843d5169b4bacd4dd516ebe94784318329bbb SHA512 206b9cb993351d2cc2377f1d4f2be544f939e1f7c8fe19404db9688e8c8879851aad71c4df7aac2b7582f95fd53900bb805df2a0cbb4fa6b88225e94670509d9
+DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip 7144 BLAKE2B d223f96d7bdb87d77573fde857a61d518336b60ab04e2a3cafbbfde23ecd65511553d9bd6360b1a9c17b394f77c7cd37e3c74df827a65b0e79580e1695723652 SHA512 c3d4056c34241f73d9f79801ea6a6d03697f2a6f151ceb5239458cf50c715dab693ccc0b5593f51cde8e2fff5f4959c72ab4e95197be3f65cae8185b6cbda06d
 DIST github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod 34 BLAKE2B 2ee2c993fac070e463df0896b1eb4c2160acf22c1f404b58a17024f8b5f2630d2cd1ad6526c611de0b651cd0c7f0f687398fabea864e7e7b0cebeeb7676579e9 SHA512 75898dfee327b793e7f253f5555409433214a7fb0336f3c33122ae5b2ef66e22ac44970202f67ed5d94f2dc02701b8a0f62cd1d80f543d93d347d83ec26da8c8
@@ -142,6 +147,10 @@ DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 3
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
+DIST github.com%2Fbi-zone%2Fgo-winio%2F@v%2Fv0.4.15.mod 177 BLAKE2B f2d2eb41aaa0f3f47a75ab260a461e6df690c34e7e817ec61afc7854ae26bec641cddf4f4481b5b3b27394e303d1fb1c4a9864f4de2d6c01f33e3fa0521b05bc SHA512 584c9a707b6115caac28ff373974faa59d12531962997f9640a4172b020f72c5d527355f035449a767d65ce426fc9705c143a7bd8afb5058c9ece241c9ad5d1f
+DIST github.com%2Fbi-zone%2Fgo-winio%2F@v%2Fv0.4.15.zip 156507 BLAKE2B 82bee93825d78ba4066eabccffec19edd242e974300ba21adbeb2058147504f908d2ccdef0c182a5c2a06c52eaa129b3f148171704780a44041a6561a3e20c37 SHA512 76cb6ab0e66805530b43a77bf2de23dc0dd0d49f0347cd77dd4cec6e7464864559f5abcd59b1d4eb8b3afa8813605116ee7182b8347ba63ac120825eebfccc33
+DIST github.com%2Fblakerouse%2Fservice%2F@v%2Fv1.1.1-0.20200924160513-057808572ffa.mod 106 BLAKE2B 7f9ab0c53ac72de9df064e33ea99b5fc1f8d24b44aac63e36bae6fcb617b8d1503a9b145d6feb3e55ebadca0eea0a3ca17621099c19fb771b8cc7ff918d3972c SHA512 03864cc7246e33f3e39c496cdf962cd3c461a85f3f21e54894c408ba3d06e33ae9cff37e4ce9bba452477d0fa10b7e76c6343e55d2e90c95691eae8cf1bbc246
+DIST github.com%2Fblakerouse%2Fservice%2F@v%2Fv1.1.1-0.20200924160513-057808572ffa.zip 47075 BLAKE2B 2e1e1620bd5e27f10b4b15221a7351d8a47b28991a0bae80a25f54b9ef42faa2166750abdb24df67c8e466c846c3ee8d7e6eeb4fa83542df276aa42862dc13f5 SHA512 5178a9aac46cdb38ab045ab0a86f91c316327dff572fd10115dd7798a7056f89f722f1e4a338798fe547c2de926e466c0cbe671a9a67a11ba46f393878a8daad
 DIST github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.mod 32 BLAKE2B 8ee548cb83775c93076fbc084a29ca01d08006ff664daf6b27bfbc5afacdcf5f9629f01d6d7e7b55a8040c1b9d571e0588f69aae6a716c4d8a89fae1437fb91d SHA512 d010a67773f9276989547ca4231752d7875e8d55ee833e980c577c606a983bfaaf957ebfbe01039de24670bd9e6e120de33f21bd0d4dd187d6f6faf61e83d8c4
 DIST github.com%2Fblakesmith%2Far%2F@v%2Fv0.0.0-20150311145944-8bd4349a67f2.zip 10520 BLAKE2B c31da41d94e16b0a12100959bad891d1c481c1e6721561bd77fc404abad2d717bf458d138f78c403aaac5a44bca2ee4d0fccef8715f0471568061abeb186022d SHA512 db43f3c4560876fdfbae0e44696e7cb67630787227ea67dd93e63c55614d605254f8e8674c9f83d579124319e9d90be40012f74a8f59f9f8b1536010d4090e69
 DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.1.0+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
@@ -154,6 +163,8 @@ DIST github.com%2Fcavaliercoder%2Fbadio%2F@v%2Fv0.0.0-20160213150051-ce5280129e9
 DIST github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.mod 39 BLAKE2B 9baf15b0244b970775a5ec6f0eb0546ce6d5c8da261cf1fba3b964ede5f9bec43034a453e87c90ff242b7ee66e635ccdc8576fa96fdd6b37aeb05b1d9eed9afe SHA512 397b38c689516b6bf553ef0574e38eba57e77b2dbfae3700d792762d0ac30a966886fa2f10ef9de33a75e8481340674a148c2d0206530741c207358bd3de6735
 DIST github.com%2Fcavaliercoder%2Fgo-rpm%2F@v%2Fv0.0.0-20190131055624-7a9c54e3d83e.zip 334166 BLAKE2B f9a31a8ca288584364f66a95fa44f82482d9e25b15910107336061a8dae48f3a2d3fa6280bb4756c4dd658116d50224452a0228d5696df94666e1bc65b0eb246 SHA512 f11473eaf494e290c41d351b76b69f3152a2afd61ff748cdbb1bae23d4f507e2efb7b634c33e012023c9a1b775ab620f19b3c02b315d50f06c9dfca60cc178df
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
 DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
@@ -185,12 +196,16 @@ DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.m
 DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod 37 BLAKE2B 109f32f2dc537cfeff1699937e93eed980f34a37faa111ad3831be6dbbb1df965c56ef266deba48aa1390fd94bdedfda9ba3a51f4f6d9519ae24db6b99dfe1d4 SHA512 6485196f4703578401e82673647b49d58fe60d7f90c311294096504d3e11477c75fa50684f00c7b378b2566e6e8683cf18d99f2ac78043b077318a643fb11720
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.1-coreos.6.0.20180318001526-af9db2027c98.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.1-coreos.6.0.20180318001526-af9db2027c98.zip 111763 BLAKE2B 79366ccbda1a9a4346e5fc82cf44a7f37389603306ab9302ac71cec0613a0747c97b035ba5e26631f5818044435e39d3382184b4b8d48afd7e6af4cfe01f6206 SHA512 d770b2590f13c4bd880cd489a25913226983cdc1f07d48cbb76ff72dd472996b62419a35f4011cf0366ac98ef6c78b9c85bdabeb4c9c36cc6070108d107b6e9f
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod 33 BLAKE2B 1ce5b6fdaf9b07e47e53896873b9ee4e96fa51c66a7a5afb3f48f34bf1b28addc5a5faa14832c24232a048b5d2b5ec0fd9af57997f0360105479550670b7272e SHA512 4fddb273aae34ba148c277266e98d174e04f5e888a1f59d44a86f7ec80168fbee85f245cea2e2fca44b29cf83f7a417e43b885438d7e3231c89604bb9f0a30c6
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.zip 109838 BLAKE2B 82e02c44f4fa60aa7257b79e385af47e23508e260415f0f768e4f7aac6a5962c713488458a50f1bc98308446ee3f45de973d5240811dc5a113e5b9577f33bab3 SHA512 7acd6ca00d067e6a81fbb12697ae9d46fa9880834934065549bb23671153012a8596d4c7875705578ca58a259ff81b1165e45aa65c93406d2c324c61954ea4df
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod 91 BLAKE2B fad30507d91fca15291c8f13100206c9d9eae4f73ca4034e37de10d1494b42b03535540ce704582cd7a4be4ffa2685f778ac9cd3aa647d6c48d8e6fe33a345cb SHA512 54e3700ced7222d086eac5a73a5973147473e9d063a7a8dd719bff2dbe3d61d9e4cd7427f30c926a2289ef53948f158bc09e189d9714f0437d446f7c30d0cc6e
 DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip 114418 BLAKE2B 43e288a393932b03a27d91cd456cbef42c2611751d40e8a8e6c14d2b80f65990711a5be7d75e1f62b1eaef3d9eb8c9bcf3f51eb14a2436ca1dcb15b3b3a2ef16 SHA512 9df60d53633425f32d5bf594dd579ce61bee549c2672da2f7da39437031a8b0d27b7d3448adc6f9b20b230f48c355242ce8b01b0c5be25612165c53c73e10735
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip 57784 BLAKE2B 1f6e54681c062413577ca873cbbc251c2bb9df4de6339e1154d6b34aa146136ff9464629e419bea7f75afd9feb8b50bddee965160560b25dc5b4041e9d30072e SHA512 4e0f838a7752838dcdac70a96235bae7aee51242022ec2c27be99f4af7657ff5afda5b710be81e25539d2712e5644211689b556e9d8971897ab9f8bf1d3845dc
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
 DIST github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod 42 BLAKE2B 09381800dfdb8d9ee9032e2eb53d51bdef9c0bc48fbed60431654485afc510f1af8282d675101a49fca885004998003d73545269a4d12ab14fe1338d49a976c6 SHA512 4118f2e16a9e96f4d68e003b92189b9b17f58fc57700a98fe0feaeb893f406100c5574aca23d40a579d95a67b59e2cd6dfdb4883fde356a868e6bca640961376
 DIST github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip 624543 BLAKE2B b0d72f4b9e0eec70803fb534f2fa5e1044f89a5d97cea40ac6aa9398b74992cad76bce4c8153a1d0226fcc8fb6fd85fe7d8e098e611073daf3e7ac27e4b5a60e SHA512 149aa16651deba1db2399a721d726ac46160715ed3b940599e36ce7e6950a794b83127c05e20f1247714bcf9ead573b3813bcab06e5cb77a417bfca6930fae2e
@@ -202,17 +217,21 @@ DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
 DIST github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.mod 33 BLAKE2B d62553e4d76118ac802948696cd6a72992a097743d2a8e64045324bafea74d816d7195867e64710988ba8173597dfd851a9a261560e3f3238312cae434bf34be SHA512 c5a014d3183b67275c9df990c95ea812d0c6c9f2af2759bbaf9cc864884862b64d4a4a06e3965130404ac0d3abf84ad9f3358134b097cd6f12ad16b6fa9cb74c
 DIST github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.zip 70819 BLAKE2B fd5ae4da731b41134f50866b12577544634694ad45abbbc92c23d59eacfce23b0dc64fbe1284218fe15013e1fb7d4adbc8b30ebe325ddb01f40209e63e1d7f41 SHA512 2db3f8cb2b13ba66a1ffec69ec6d5c774eeae09bf562f3e4eb7264ddd7ea5e37cfbd3521a911a4efe6a6defc0db58c0802b375b091b9f9dcbba27ff9c4c87558
-DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20181014144952-4e0d7dc8888f.mod 40 BLAKE2B c010929388412995c2f94b2d5ccaa676a243b890bf41ef59250366dd3d7eca00b03ef6525ecd25a6a402da7acfef0c6b5875e4558a68a08066bb4e1cb65f3646 SHA512 b8dd88219c0e6b606247d416c25ac01e3592a162322610ae4a93423f2d83854c108d78a810e546232cbaea6be0f48618ca2f55d890b6a79aada85d9c9df92322
-DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20181014144952-4e0d7dc8888f.zip 528684 BLAKE2B d611ba9fab72a4c04b49f464ccd43a4622d79b746d5da3a15d44c545c4f7b25d217c7fab09812de87d1efcc43be50faeef2db7e89d60aef517d90c1ff844f1b4 SHA512 646dd4628e8d3c6ab3e716d160b611c3d82d508330792b994d28d5909d2449f537ba45c5ce728c1a94335593d47581f8fedf6fbeafe3f4f20b7a802da1d2f798
 DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.mod 182 BLAKE2B 27d2e8f155923769d6df395281d9d2967f2bee262faff767c586e851c1595d8c74db1f890809bce63cd9544c4dfcdbda89e518a25e1a8925ff78607940e2a374 SHA512 14925087284b332c5458fa81d0e92f2a33b4a59e98b93dc6c99e0943f03c13165e8dbe1a27fe5a4d78b62b3b3bdc84d634bc31f346a70301cdf7da7463c85f92
 DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.zip 570947 BLAKE2B 77503e5f0f669cc6b53ea75a0c227c125022c30af4cfd86389f4381a9cfbc3b15cca21ebf633218e4261ba0d8ad8c26735afcbb5eb57cc8380aebf7d4b0ec69a SHA512 f7c4bc9355f36826d1b0c384e20238c9c461933b4eae6455b1828687eb62137d98969998d181046e36bd348690e7df22633413a294aea73af0420bd242c0f93e
 DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod 40 BLAKE2B 3090a8e1737078a28e24c1a01f78a18ca2ab94c0cd297a9ab04f970ffe05a6db291561b893c345c1d4f023a0743adf0a769f58365251ec94e3925da9187aaf62 SHA512 de55ba427379e57d671a31a72b9295e8e7fbe3bc0b80d05e63ccd31c1fd7030e74fd39fb0347d87f10f19bed208df6317714b0d1028057fa40e633820d49a03a
 DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.mod 40 BLAKE2B 3090a8e1737078a28e24c1a01f78a18ca2ab94c0cd297a9ab04f970ffe05a6db291561b893c345c1d4f023a0743adf0a769f58365251ec94e3925da9187aaf62 SHA512 de55ba427379e57d671a31a72b9295e8e7fbe3bc0b80d05e63ccd31c1fd7030e74fd39fb0347d87f10f19bed208df6317714b0d1028057fa40e633820d49a03a
 DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.zip 6710 BLAKE2B 25a6519442463637a3592d4d45b9c7f691e51c4217662ae3c2789933dbf98a5a957b2d59b77e59b99f82cf494e753ce2b521ded79f17abfe061ef74bf64038ea SHA512 544cb0f6502ce883beb548f412c6b79394a84961a4d0faeb563438e32c3c4121fe623ae24b81109714eb58fb2f29fce90c20d227a03bb67396dc05fe927cf5d5
+DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.3-0.20201012072640-f5a7e0a1c83b.mod 723 BLAKE2B e3bd923966c67e9aade1ae14c37a585103d35f9e0644f3cf8fb0d8306b24bbf591e24626ef68954a930d4ac9898f0f63115ded9790eaf6323366abd9a186c9fe SHA512 959ed0ccede88ca2ace12a0014491e310d120c9aa10bc1097f7d3846e1118db6becabbdd15b887ca07e783a41e1811b2589c31ac104d628422f38d5f545fae6a
+DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.2007.3-0.20201012072640-f5a7e0a1c83b.zip 429582 BLAKE2B 9022c5ad4658392f0cf3f06bc46402a0b80c30f1745766aa5be6440bb4db2a234b0e4df1813cb6fab3277f904b79791202f37fa983d9d440fac57ef37fb2c5a4 SHA512 b957061b14fe7abad566071213dac12f9abdf0f655b47a5e2c7c998c0e9aa9aca3e49283a1c2250e1abe4fd8d9ad9e185d969c2a0a2fdd3e295fe9eb54002630
+DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.3-0.20200630154024-f66de99634de.mod 193 BLAKE2B 0938da2ee0a3bc0acc3416db8387be68292b8848b72cf3b44c28e11d6d456037f7ed998fe08fd142f42ccb447bd0f0a7cb75ff72e72d73a5649a85f7def42070 SHA512 7752f28d6ae3da6cd4f2b5d23ff373a4bd8b8b24879d9bde17bd22b1689aa5b87ccd1c206f4f70aaf5acfd89f4e1f11a04ed822266a576abc0a1f979cdce2911
+DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.3-0.20200630154024-f66de99634de.zip 276868 BLAKE2B ec236ded34552ba8b1959e75fc58f6b36ab82f9c99e3f23dcf241196441bb4e8c626826175d8f0726c3ac1f8856dcf5e4cad81d70369a54e597f66b8389968a7 SHA512 4940f6aacf5e1a640e30cce9cf8f3797d7811b80b9ff96696ff2eb1c4ff10f25e8090c396ded4bacdc3393289810db3d0e4ed1d6373fb4654336112ef854034f
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20160705203006-01aeca54ebda.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.1-0.20190620180102-5e25c22bd5d6+incompatible.zip 60258 BLAKE2B 833495fd32059bcc757746d77670009145512b327557e48abbb1be3f33d7f540fdf3d221b5cde015d0802a85823d9302e5afd0b10c730d7e7841814dd03336f0 SHA512 bd4fa1d2be064ce6e7a0e8ac3138e7324fa0567f5312806f92a7c9b1ab58aeec5546db054f8f0616ad011fa0022d43dcf9607e53b6b06ae6e30bdce8c5a87231
+DIST github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod 34 BLAKE2B 7db9f433942253e04513e9a7e88b2a76cecb28837e808c9fd2fa444f19bb75f1567358ccdb5537dc6caf0aebffa08898127dc93f8f464c838da838f7ed70615d SHA512 ee0f8fff193e70c23c830494ebc2bbd182c1882ba443baeb4a8ce03166f399765ab8e4ac85047306b27c03e84fd0980f93b5b5e29f94129569ec8021e8d127fa
+DIST github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.zip 31667 BLAKE2B 7114afb863d419c80d539e287e76ee6471163aa5fee433de95276174d1c1e9030097543afe97a6131356979bc88a14108679a98bca3cb8b38e833468e80d321d SHA512 f04577670a6649bfe5d40fb743df38fdb9499b3f584e38197eed2d958d4f3e77635e82c057aa643ab3268bb99e7478aaeccfc687be36b9723ccfea3551b45366
 DIST github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.mod 42 BLAKE2B c5cdcb203f51fc889bbf9214e6a59ee8c2650b79f19d0d44b3f24a82f08269595ed0810c5585a6c27f14505ed783821cf9656b8fa204a07f33ecf80c6357ca25 SHA512 11ff837ee4b6353e9b75961eb158281c328f36a7f99ceedecd791da0f351106440248e99b6aa5d8085b898f279e3c7181a13afd81a6e75a20ee6d29ab1c9c126
 DIST github.com%2Fdigitalocean%2Fgo-libvirt%2F@v%2Fv0.0.0-20180301200012-6075ea3c39a1.zip 122148 BLAKE2B 7afe3f03d5f50c3a1c8a6079f7c814dd5c00292e9f1cda855e94ded85e61710eb1f4edea8e07471f9086254a32fde91da521a3d0d60a4d5967c703db2d423cd3 SHA512 bbd2b9eb9965288eb15758d2539c80877d841bc8e28bafdd202ab7ec1807addffd2bbe6b5cf63076d64c0a61273c5564aed1ade83997e969d12bcb051515d231
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod 35 BLAKE2B 4e9e86f0f7f18e47c80b9f4a0abff3f07d47814a9c54b297a2419265fd91b16c2780e170ded80589dac290cc3262aad162911b789510703d973f3f891d5e0849 SHA512 6a786a38aae43d8a7532621bac8c4c053624f39573a37bd66fef9048a7eff36ea55778ac8a4bf3d18cc1e6faf352dc2365e6f819053359df9ac98129e16f422f
@@ -235,8 +254,8 @@ DIST github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6
 DIST github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.zip 9815 BLAKE2B d263cd677b17ac795fb6be116c662d36c44474029c96a2efdb17b2107c292f7f2240b2565f45ce1a92d1dfbf14bbf9ee5686ae1634b4b1839ce22ad2617e69e1 SHA512 651db3bc9d472dbe6814b7a94d564440ee43f6eb3cf72f94bcf7df266d998bebe334eeb3ec84ebb429825ade32f41f670da144e070fa4b2f9d265c4299f9c8d4
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip 26646 BLAKE2B 408dfc541d7bd0692010d6071f96db972dbf84b0e9dfe552db221cdcc4011f023dcfc12e7c9657696c9ad204c6587404f793b4785beb78d53462764a2da96c5b SHA512 fb53c8511a1538397edace6101699904f19e63b82143b56754ef2a62d457fd34f6bfa907d379964c427ad8b7d38fa9ad186bc66d4a103c7f118b8734324593ce
-DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
-DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.zip 17986 BLAKE2B dd2bcaa3f080dc5ed1b1da8d1f2ab7573577e5dce76e23d323310419bb0e3128003715bb023c4c4533e8e3297b795b30a95801cc68129f19844f433026ff8433 SHA512 64d611c7646011f9ad2f9ac423a9ba8154d9e6713611dff5481cf585c18c0a2bde3f32b26ce8647134f2e8338c08fe32b0dce4f3ff591a8a2b2601e29ea1f00d
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb778605fc05dc686b59a3ad82a6df9020017243cc84498e4113c7b18343507a0084cd67febc329fa6b44e675696f99f632cd282ead5bb06f93ff3bd50bea SHA512 88e19d0139de7de602272e14586a99eda26b2867ea60ef56b517d13b37c0d28b1ab62c05b2f9cf1a9b8dcc8e5afa9c915baf7a30b0f17c4fbd47d5c71d0a3965
 DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
 DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.zip 18643 BLAKE2B 193af083e7191c5003e7668f0f35ce83b40e04642f02337ff5194a60b654d0e9f0776355ced676f8c6482a2b006026380a989e9724b2c7d8a965c863daae8798 SHA512 a5093016b6559c7297cbbca1abd3b7e50ff34a9f57ddbc383a0141a04943a5e4784a54e44d0e722fe2ac011cb9d8bd4aa954b758ff1951fc99a8b7c5ad2a36a0
 DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
@@ -249,16 +268,22 @@ DIST github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.mod 3
 DIST github.com%2Felastic%2Fdhcp%2F@v%2Fv0.0.0-20200227161230-57ec251c7eb3.zip 134387 BLAKE2B 962a6a9bb3566ec9256379606fe9884a8ab52bf1122e0f6af74fc2a215c994faeb3e0b43c25e470ec3fba3c9ee9aec22d3d3fbf033bb0b78cce4e025cddb74d0 SHA512 f8af1e8159ab8081e86e876c9459fffdd9f21f6c95f5e3355b970ee42a3944a19054c88acf0fbf328e401f9c8d8e4db7bde49eb66096d82602eb808e220cfb4a
 DIST github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.mod 30 BLAKE2B 7c00577d618e4a93d80b3b221afdbe6b203f4b0ce389003669b2c276f8d652aa359fcb56876d67b8a6773be6c3161868f94267d64e82f75784e3bafc571dc33d SHA512 df2aba4b600100ebab1d00a73ccf181ded8a9e5acc8b96c466c26f7ba80596fcb9b71bfd94c229704bb078251dae6ffbf95f0ec71acc1baddff94deac845190e
 DIST github.com%2Felastic%2Fecs%2F@v%2Fv1.5.0.zip 334278 BLAKE2B 4eba81c0717adc3abd330d62991630fe7a4a72a9d58ecfca897d308f3b498f7276430195e5422397b5e0d75b9c04be305891a4ae13e45da05847b9e88a0d10ae SHA512 6d48986705fe6ef8741ab789f5cfc74da940fe670eda5d2680b9ea329460be39dcc90a4b7a693a07313a3b1a160dce50935c18c24e37a35c613b861c22141a2a
+DIST github.com%2Felastic%2Fecs%2F@v%2Fv1.6.0.mod 30 BLAKE2B 7c00577d618e4a93d80b3b221afdbe6b203f4b0ce389003669b2c276f8d652aa359fcb56876d67b8a6773be6c3161868f94267d64e82f75784e3bafc571dc33d SHA512 df2aba4b600100ebab1d00a73ccf181ded8a9e5acc8b96c466c26f7ba80596fcb9b71bfd94c229704bb078251dae6ffbf95f0ec71acc1baddff94deac845190e
+DIST github.com%2Felastic%2Fecs%2F@v%2Fv1.6.0.zip 624725 BLAKE2B 016354515fcf0305d369209aaba086b45c7066169aacd8f9d8bf1ce6cd0f1a78d15f3a1a6c0571318956e2e85d173c84be39a6093dc93673720da64dc082c40e SHA512 2e15a76bc85f93bfbc99e6cd5c705a47ad16d30e5736c372eca420e68450ebbe18e14f1940e5da9a294c2e6fdcd343725a99f38086c467eafb08df9d22ee19aa
 DIST github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20200709172729-d43b7ad5833a.mod 330 BLAKE2B d6e6237249764a791a9971235b9373a3e4896a588be5fd512a6c9d31fa132a0420483ba8446c78f3d9823dc2ccce8e5b13db711241472811f2078c4cb4b6a9df SHA512 73fa5a4b3c6d845c535e247e8fc9bb679a2e7bc2b6996c718b3050c86f553fdf0e6d8d7ecee4aa3e4a9b4a9b095b61af0c3cc4ca31c0c8bb70c9c569c3d1ebd8
 DIST github.com%2Felastic%2Felastic-agent-client%2Fv7%2F@v%2Fv7.0.0-20200709172729-d43b7ad5833a.zip 34605 BLAKE2B af8cecd1ee6b64bf493f2d2ef70aadec9f2f0c327ace6e34af58c0ab76a13f801e0a6bcb2d1678d863be11b1a6a87fd44b8deea7c1135783b0b292f75e446e31 SHA512 01807e806fa6767d3cc3a4b224fb811c4034491f35aed4566f6da852c675bd9313a18823042437135a340a09950ee831cfabb72966b7468781fc1a9c3d67c3af
 DIST github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.mod 35 BLAKE2B 1b0f99cb90c8988881f05a89516baa2ec76693a4cd324df4b64c1ece1687b22637bf6b14798cb27607949cd5034208530660f5812633dd1c814ec70d71c9cf14 SHA512 82fb5372af513fe5b90722d52d09f8eaf54483935a2b75bceab47415688fc1366b2b5fa6fd1299e791122dbe10b3fc8a1188b6ff6c8341ba386d03bb9ed9ffa5
 DIST github.com%2Felastic%2Ffsevents%2F@v%2Fv0.0.0-20181029231046-e1d381a4d270.zip 19393 BLAKE2B e28db25647c95c3c1d4b99f3c2938729a6bbd3d1030892389efc7d7278ea4fd3c18dfa22177e15bc2813872d799550910659a4299b495fc546424cf76d75ed49 SHA512 d301be6d49d508d89c1e640de88695493ad22db05a3b679b5689ea7140a52ec2d25638635745a0a06888c818043c3f5b40f59fa9e89eddf8362c4f813be53761
 DIST github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.3.mod 360 BLAKE2B f5688af3801d4924feb662c514095d90a03f81be10886651593526275ea2852544253018a9760855c9c5c5e3b7c0442b25a15dd2a750d8da007b04e50ed4894e SHA512 67c5d76c8b70386e01762d0842ed5638887a40a80575d21b1e1b10dd4df24525c1f6ea77d5c6096c9842f22817c9a49fcd14514bd5a238ed1ec3fbef79803838
 DIST github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.3.zip 56280 BLAKE2B a7bcfd957d321d54a6bbc5a3cdb19c4901bb01be0a043b28f1f82b80f56e325748a618b81ab477b20ad323d4f2b0f0b3d310ae694bb5687050c8cc5711b022b4 SHA512 312024d9ae4e62b3d4513c6463c42d2bf41e2d4b1d301ed13e8aa7fb677ea303393ee94ea6d90066608a39f6f2dbc1ac16228c68d7ea55a3e496039f5cc7fe3e
+DIST github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.4.mod 360 BLAKE2B f5688af3801d4924feb662c514095d90a03f81be10886651593526275ea2852544253018a9760855c9c5c5e3b7c0442b25a15dd2a750d8da007b04e50ed4894e SHA512 67c5d76c8b70386e01762d0842ed5638887a40a80575d21b1e1b10dd4df24525c1f6ea77d5c6096c9842f22817c9a49fcd14514bd5a238ed1ec3fbef79803838
+DIST github.com%2Felastic%2Fgo-concert%2F@v%2Fv0.0.4.zip 60182 BLAKE2B 67424bded241534aca60800f7724607df17450117f6050ca851e19b6ecc7d1d11beee8458c2d5773b06c882aefa509e889ec971b192f16ec81f00bda082e21c5 SHA512 2e4c699448e5c3899798debcb2ea759d62ed460a4a007d89abb9ce7ed363787c9526413b14dfb291394f31003ed0c49e9d5947c8990d403570a13384790f3ea2
 DIST github.com%2Felastic%2Fgo-libaudit%2F@v%2Fv0.4.0.mod 38 BLAKE2B d5bbebe1e345d5dcbb2b261d2b7fe76847a525f5a3001881782fb1a1cd2f803315b2af52a221a0d5aa75725c79c67d45287443a8ced59b156980abf0b4eaf965 SHA512 8de7f9e54f95a8628b77f91f991d661877c4d52fc8e8f74f606194d2dbe7003c92e3d9b960f99ecce3da9bcda42e49712a543f8232d67c8b387986bbd8fb13be
 DIST github.com%2Felastic%2Fgo-libaudit%2F@v%2Fv0.4.0.zip 198635 BLAKE2B 83f075fb88907c6287c82fba2e70297e2636db297ce4892b524c157705b3f301cf720c1661e8fce657a4ca921de8d761ca700a1c57ef51aecef8d641b8703b01 SHA512 ac95bf7f015348118d60347f8e8ea17ba234ed74db063f0b1d75477fc373d94aaf185847ffd730da89d53de512a7b551a8af136eccf95215b495b64fd67add96
 DIST github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.0-20200515221334-92371bef3fb8.mod 441 BLAKE2B 2e98c14f0b7966a38fbd830304fc931794972fb8a541807d803e6dadf83bbd3cc9a1f88624c259b39da6690cc54a393869f73c345bda3902cc63edfc47fdcfc5 SHA512 f9a55e11e92a6a70189c1cdebd4a4aafea8716ff4efa7d9b3c1c63ce8f6b1f2ee44d6278a79f1bfd5cfb6f746d818450a5ca65304fe3bedb0f1f138cca85247d
 DIST github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.0-20200515221334-92371bef3fb8.zip 231939 BLAKE2B f7e0b397504d5f15f91e2495b70c4e0fff2e960a86a5cbfd8c1bf06b288910a62d7de001476996c152d332e896ebaee0b72b07f24e55235bfb5ac4c5f507903b SHA512 5cc8234bb5a8561feeb08c0f14c734798d7aae18d36f4b5ac7908026532007ba44e9efca021b212bda58d76f21c3e60603d29cb900245af38dc16fdd5559fc30
+DIST github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.2.mod 364 BLAKE2B 3f8e5c96b96a659a18b7b47ecbacc8c688a9cb5216f8de10f233c84ad3474786f04e3a38f6f76d8bafef6c16ce279cdbf30d2b377a71b00d74aa6dfa6f3b1943 SHA512 57aaf368161836e49f07a5ed802d5ed0436ec9a6aa7847d06d51c5e501d7a9ad35ae7fe29df5117dad71f51efc1312c08f066f2ee563272c746f12a9b06fc880
+DIST github.com%2Felastic%2Fgo-libaudit%2Fv2%2F@v%2Fv2.0.2.zip 227123 BLAKE2B 81229f03825306f9374d19d8be2561223c0c1f1273d975f571e95a958bbc904f3bb63348879dda5677305adaf1e93fb56e7359183fb397f4aa0284870697adcc SHA512 282b063e127439a754e9cf356c6a24a86a1f99602e4c02046fb88c5cadc0cd1cdb080af9707c647231ff0daf527ea810e0d0f826c5368d9738c61c8642e40546
 DIST github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.2.1.mod 38 BLAKE2B 14a649bd9211c297419381656d05902bbd17e1cf2071fe7dc8643f7088680b8646da17ee760f01a3be0de91fa1bf10d986828bda0ac3fbb352f23e18544da963 SHA512 91f146dc460096d38ab213404c92b1cf8540a6e45d22c49a7d1ca903627c63a22d3e70e17cfb75d59b22f47530b8c8fc31d25386c4c4db03319f9b20740ebeed
 DIST github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.2.1.zip 40569 BLAKE2B c5011769af42cb3d2c1d60fefc7a7f27a436a18ef828c6c79a2d06661f7ea5d80ef90961f12d123b609f3d475d7d523a18904b50629a077ce0673a5c052715aa SHA512 fae11d9a5007de0c3e41533d31fe95b5ffec248e3890389e13d0235117b7393a1c255ca449432e92520ac292d46f27b2853168bfc9d93e67fc96d7491a4a2e7c
 DIST github.com%2Felastic%2Fgo-licenser%2F@v%2Fv0.3.1.mod 38 BLAKE2B 14a649bd9211c297419381656d05902bbd17e1cf2071fe7dc8643f7088680b8646da17ee760f01a3be0de91fa1bf10d986828bda0ac3fbb352f23e18544da963 SHA512 91f146dc460096d38ab213404c92b1cf8540a6e45d22c49a7d1ca903627c63a22d3e70e17cfb75d59b22f47530b8c8fc31d25386c4c4db03319f9b20740ebeed
@@ -283,7 +308,6 @@ DIST github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.zip 118316 BLAKE2B ec39114e
 DIST github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.mod 594 BLAKE2B 95c97799b1cb834b083daba37e0a06f3ff042e1be89b42e91d425b399615dec702b431b7b27253237c9934600991bb698f4554b61914dbd734480d83c09d7717 SHA512 2f7c2f22f8ed0282a9abaf27212cbe9175059dc2950b329b607ad4ca804f460abe211f5df2a8fe2766b9e44ac4d35d6dd95376c667c6dcb10deb571542c8a62c
 DIST github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.zip 192468 BLAKE2B f7503c158e40d3edd73996f9d3697a36c862d898f4468b070396c8a0a6f9065e78efdf12bf10f91bee7f780b0827ae5f03078a8fc2291d9b7f7100943dc883f4 SHA512 548cb0d77b8db42f42a996d4411b1b5bc6235ef1ed6ea114805679730938a3d396df7f7877ea95421103fb15c35d1278cc5568a40d61123727a75c1e03531dfc
 DIST github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.7.0.mod 34 BLAKE2B 50f8f3861aafb929932efbc0512810d203335399c6892df7ce8d11763c1d8ffabcf55332c338cc1105144a6d157add8b1fd5e91e63a93da31cf5391a7df3e906 SHA512 1fb3c5218cff09ffd4086cb739bd5c4273591b7389f0d56bde786876b0303c73db51ea83e69c5b4a54ba942e50697b9080d82794654e5e225ab2eef0b2fb57c5
-DIST github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.7.0.zip 116302 BLAKE2B 213d79a9121e87f2c15c9b94aa5560f7769103dff465fb101b698e0d2ed2ded6c889f16d3415fad8c82028f3d5f6f4e454f684411a4ecb2984654d112f989343 SHA512 6c003fc980913f10f301037126550cf69d3d86a22f82f6049aa106bd09800510d78fccca5f6cd642f9f936473fd3b2aa9ce617feeafcff34334324df505b42f4
 DIST github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.mod 34 BLAKE2B 50f8f3861aafb929932efbc0512810d203335399c6892df7ce8d11763c1d8ffabcf55332c338cc1105144a6d157add8b1fd5e91e63a93da31cf5391a7df3e906 SHA512 1fb3c5218cff09ffd4086cb739bd5c4273591b7389f0d56bde786876b0303c73db51ea83e69c5b4a54ba942e50697b9080d82794654e5e225ab2eef0b2fb57c5
 DIST github.com%2Felastic%2Fgo-ucfg%2F@v%2Fv0.8.3.zip 127483 BLAKE2B 7dc0995f7f98aa3d8f7f5c72e0fef19bb7512a595160dd7192196e68ea19fa83bc7bc841c8fc081191cd6a97c6e676c4668980f0824e9b15a846019a110ecf4f SHA512 cb63caaf24e1de41693c64864287b1e438c4d40e9696a0a9c1371fd46e446465af85ea71c3732fcd7d0077202c5aff613676b7540f30754f7965ff49096a6aae
 DIST github.com%2Felastic%2Fgo-windows%2F@v%2Fv1.0.0.mod 116 BLAKE2B 2d92651d2383c73f3bec3975e5234c1346dc707f31dc29f5bcfda4cb623aa037a0df5a2dce4bf2b5fbacc0dec8a6594dc1f5ecb8806dae8d46c3cd2b4ad45e90 SHA512 158fa7771a24db80b5aeebf68528b829654d71e56ef80b5cfdd8a01b43ca25dc76bb27d7bb56a44bd6e3fb39d43695ef8edcf95e0990a970b61b8dfe80e85c65
@@ -293,8 +317,6 @@ DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.mod 34 BLAKE2B 1e42e1bc3a6b6e
 DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.zip 107227 BLAKE2B 5e29f9ff6b523ac999a74aa4fe0952495a3a63edeb5894783b08056b16bbedcd122ff36f8658d5277711cc45dfb35481b8d3566d7fe4a864c9bc698e7e60c4f4 SHA512 65ebdd1324286abe1dd0dea6e8ca594b7a4ae3114e1847821dc0af545848c3de7c7d2140ff1f62cdaa40a3cb367297e7467b53faf319af58a9773c1600bfb8ed
 DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.mod 34 BLAKE2B 1e42e1bc3a6b6e07f1f79dfb4d4cce05f157733c04b0afd052abfd8ab4740c3dd13a79ce604d4e3c39e83a9bb030843916ab65ce1073dd4909c7152dbe7201f3 SHA512 4e38f6bf1be9c62070d87a9485670cf73dce37af642eb560ddda6724663da17d852465cef3e0c8f0664ca9d479ce30012393d8a375bcb3a593f47cb745ed59f1
 DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.6-0.20200715000138-f115143bb233.zip 111274 BLAKE2B f7d8f3c732b9349dc7c324b107764ef1aaa6fbad9668dc1d5b85edf914bfcd76795b7860436761a8a5aa9dc2d6df3a3ceb2653f33b643a02577e736e5afcac27 SHA512 cbe1480fd09a7c14eb5c977ca85f3268da634861075847ffe86bdd1338d1d3b87c3441e9ed00b02400179f2651016cc3b6d9d3396c1c980a47137752dbfa7543
-DIST github.com%2Felastic%2Fsarama%2F@v%2Fv0.0.0-20191122160421-355d120d0970.mod 1188 BLAKE2B bd52cd2d49c856181228f7d2500d6457befd145e5f5e69d1ee4e939c07cd436d4e94b1d6d7ec2cf7f371683daa69f89e06afd70f3a7d8205141cc934b61a695d SHA512 7afc6074fc64dd861b1fed922c2a89b7b75fd35a3b6af51c073152aa4097782f47f6b2c986b9e92e55c30e7bbff68ac176d478a6b1743df6e54b68c3715e7c7b
-DIST github.com%2Felastic%2Fsarama%2F@v%2Fv0.0.0-20191122160421-355d120d0970.zip 368799 BLAKE2B c5b3fe0346ad2c2978f13c5db9de073a91e70c7ea66e6c848946b6a9642e23668ce1d3de7f816de4d4f81d436ef7dfa2f84fae05d3258d727fbe678f8b779fe3 SHA512 f59e798714e5e5f02e50d44f6728b3bf464ff77704c5b67f8b704f11318d29ea5c883c78f5909e65a907ab23d036e2d64a63e6369d5dbaed565f27d8fae04517
 DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.mod 1375 BLAKE2B 2078c8e8bb7e18fc469ef77acbfefbd44e6d76c492bd18a8008adf28c5d1fae9cc60d4fc8503a7d66b16a74299e56f673ed6701b34d7a9840afa2fa61be0d2c6 SHA512 31a41e1f8a619aa9dd438be4dcc185d75984a1dd6d7efc5bfd37bf74f63be6a6fb2ca3b4d584bb66f343ca1693b59a2156745689fee29588395ab369fbe32391
 DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.zip 393905 BLAKE2B 91e13d3eaa5fbae1d48d5e02a64fcf2c12237eedb2f5a171795ddee5c1830b2e3006576d37f58468bcbae3fe65ee7a37b1ee8a4c1f78869d5d0b1f9c877e3fc5 SHA512 599747a3a5deac56741c09bd0655c7dea2a3e6e25c1c2d5a851472a6b5cec4bc599d9ed873d6f71fc27a1956ebbf9c30c84ab0d11954d3e02de7352839d2d2eb
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
@@ -315,8 +337,6 @@ DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.zip 11358 BLAKE2B 665fb79fe378c76e
 DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod 33 BLAKE2B 2c279a40bce4e61e5aad9d25a1c374b6c154586c296cfdfd56f52435c7739c8d9a8958e19d6da8026c2a03b728e0cb9bb512d5c094aa6111f9b10af24ab894ee SHA512 2bb0f125a91c8f92dc1cb5ec16441b27027585606a3862c216434b76324f3069941055c4bdc98372547543b095a4014155446de1be98264842504450121c941c
 DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod 36 BLAKE2B 0b3e2e38c2a6c708af475f5550f4e6b366b9218fb9e29b9ace6fd61775be5635b5dfb237170e5c4a84c82a4f62e3901ce8854cc5f9a81aeb1e2da6f788470e1a SHA512 88ca10cb6af255e2e0ff960df075cbaf39e8baeb3b65e35b9a8f48843520a4cefe410765d0890781dc0429aebaa183aeda2290fc0643b852b9ef269c009ecbd1
 DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip 6665 BLAKE2B f9bdacdd7f4cb7149fbf6297d3ab38c3a9527e0af158b933fbc673b96c5ffb684d6511b1679e03a142e4db5dafffc7b1e2edf24ac2d0f4e8faad32041e3e1165 SHA512 77f320b3a94a6da76051d6c15a7c31bfe9dd50b463ad9a354b0ccd4e24df3ea14ce026a1f509d2125f9603ff95db4ee001f9910fd6db05c9bca7b1b15ec304f2
-DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod 112 BLAKE2B d5d3a6674d915a64981d16e50519ddcb083e77a5bc0e2474fb1e2d718512edd48534c11e13c4acc7d403da5778cb6f04c275c8f208d14d54880cdceadbfff872 SHA512 b2b728fab00b8cfb86dcfb042631a37025bd981364c068990abca3ed57b3f47837ae71e568bb2a60a2c941aa2a35ff1bb24a336e786d20ff0bebb63384fee5a4
-DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.zip 36823 BLAKE2B 748629d0224bc4598ca2573286d49e8623ca17a9438cb525a8d080d14cf37549943418d170dc5b107e2a39271be21e1ffe2f9224b469b3eb82574a0c64218851 SHA512 1d451dc97018060ba5fee2dc1696807fb98aee809bc8cd2994bb83a35550edae819fb46cf17ecaf89fa8a22b277ae20b35c32c779640a47679e5ec965bca007c
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod 121 BLAKE2B 023fc722091ade6051165a9058ff74674f43aeea249b530be92b7f05534f0b0e738a7dade302f6733e29315fcfd34bd0d8c7554795b524e596a408e248051d12 SHA512 151f687b4d5c2b5a8fa26134332222105f40422530e49930b4533831fd5a0133ea7a8038f2d851196dd615b658729a10ec42d0a6efb15bc3abf55903bf42bd49
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip 43121 BLAKE2B ae8c0baab3324c9d60363b216e00ccd5e27b746ddd8a3b1b231f9f018dce8f3bacf5c2f9a8f1a3db97fce8db290d05f7c397141d278d585e0e44f0bea099549d SHA512 8f4610eba24604d46bcf1f9c4c7da0723a99f37224c298022823160d14469b85a911a6d18b8f084aa2730dd100721e52a8cd6bbe0215d72843daefe0f79fb141
 DIST github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.mod 34 BLAKE2B aacafc6177e1e87c8f4a17f295900d749608f722755d31a1939d1b601e4719984c0d1299fc4de9fe74c1109852009daf4641cb5c81629788a639eeb9314867c5 SHA512 c4b5fc4230e8e9c7631f577ee15414f7a72bfe27af524fd6bfad8c38a81426411dce35a191d840a9c69eeedfeacacd3f2a108c5eec35a3e30b0a7b262b15340a
@@ -373,7 +393,6 @@ DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip 2698974 BLAKE2B 5fcb1c66d3fa
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
-DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip 38604 BLAKE2B a7d16e6b3e1820db97600f17bef2076ec815b81d36c22c8ee927012e8df74bcfc6a3384b2abcffd974a1635068ffa5de9443b204c587df10c9593f830e1c3df8 SHA512 af7492e0d36fa2a876c6204a651d250193900badb819dc7db8c62141d7ee7253eab9d87393a131059587160a0a5f7d373017b2ea2170b4ca6d91e9a58175d88f
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip 39683 BLAKE2B cebd7b69e8f18547e77e07d49ca26fabd513b6bf95317553c5bcabac3b513dc1d7becc259118eadbad18ee4d45a1dffc3ec96864b80d87c0dc6885983bdbb3d4 SHA512 e7a8277f9b7d2e35d1e8586c580d03457ac1e755e1051fcda20ff9f819a6fb9c3cd1892be3a50d4cbf141b35d1c7b85b27bdc402eb45b700a37ce994be4e5b5e
@@ -405,7 +424,6 @@ DIST github.com%2Fgoogle%2Fflatbuffers%2F@v%2Fv1.7.2-0.20170925184458-7a6b2bf521
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
 DIST github.com%2Fgoogle%2Fgo-github%2Fv28%2F@v%2Fv28.1.1.mod 428 BLAKE2B e78c1cfae3615c6b7062d74c18a8695fa0f35af0b2dd545bf6f5f5d4ce5a3f334b7abf2a0526061b174b4ac0b458d59dbed25c00d4a63b71e25d4a98821ae524 SHA512 7d2a20a54c885207facafd3e6ab18698e102c9ec564daa2864e39ed887f88df20c6b37488185fc829685198ab628de978a7a99a0a07611d4ef6256f1a5ebc7c2
@@ -473,8 +491,6 @@ DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod 96 BLAKE2B ada026b
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip 17595 BLAKE2B 06dae93e8077ab6235d59b57646a162ff31e044624bab3b6ec86c7aaadf49c36b262b957704151db889c515c425630299d396d0b76919403eabf4a3e71098ef6 SHA512 aa4b145476a80d7be7959bf7d0a9a278765496dbf915d083fbc40c5b216a52126af9ba12cf09f9cc178ce53987822ed61c92e2a0295fa977f8a460262e857c30
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.mod 147 BLAKE2B a87a317948074210158c83c25aa1e287c613665f0008c6337a41cde6fb7e1a0758c38762d8467fa508e0178fee74781f1db49a05a388d46f8871700fa3c85c92 SHA512 7ff5a339ab0da7023d7548056aa96eaf1fa9a0a36f9deb098f99910a9a77fbab43137b6e305b35cfbc4ab9d50adabda10b53c279bc701ffdf97e928fd19c7888
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.6.6.zip 22283 BLAKE2B c4c50530c98e584d408da87abf3d41470211b02dd1fdbedc7f06671fd8bdb9176a286414c0530975b44651f2a263230d7c450e35ffd435aeca100795e895f0f5 SHA512 d3cc4de24a8fc43b1efffb2e18fa5879bf57f2220f4a890fa3e357a3c05111ac55a36aea22fcddec115d50b19d04a9d452d28d6c05a60c39be301b11d8391558
-DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
-DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip 8042 BLAKE2B 9ea2dd58a5d47047a84965e956e0d228e0c7f836c6b0111fca63ca2313c1721341ba31e7e741febc8f5b1053298116d69d6dc96f1497b59b343da59b57f7c3f9 SHA512 1afcd111ce5ec191a932e6f51f0aa9b05ffd3320793c022cc66766bf01431ee4b9cdd3e7a0544b6b1616fabeea262f54270660fb723de8ecebc8f919e7a94e34
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
@@ -483,6 +499,7 @@ DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f9343
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.2-0.20190520140433-59383c442f7d.zip 20402 BLAKE2B 26f21b533637539b48f4a7980f328b2b20e93beaf214d62e12615e1052e62bdaa81272e386ff3bd49c91d7767b843ce097651510f1c7c507ce27cb535e81b5a3 SHA512 721456556cc322e49c192d9060fdc63684a4992c8193e52c32cfd69dd9303f314bd2805a1048ab8483101ae96f58fe1760508c15a5180a5b2e03bb21cbef9423
+DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
 DIST github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.mod 103 BLAKE2B d57be1a4f6587f5834ee2d8f54afb7cae984e822f2ebd5f6a56bbc350059943157cb7ed6af5880b873012a6eebaee9466c113137fecc389efd350d94b160ae43 SHA512 abf4fff66be8027ed27b0133cddb7db63f332dfa6c530461ac09efac75bd63549a2ca43a945c118ffc0b406ece99cf98aa22a40d989d8e71a7f15134dcef3868
 DIST github.com%2Fhaya14busa%2Fgo-actions-toolkit%2F@v%2Fv0.0.0-20200105081403-ca0307860f01.zip 10647 BLAKE2B ba852c139ca23a6403f4545232aeb66f5c690889fe76ee0a6e822e67cd293ab9439937984129a744dd9dd641fedb26cc354837187ee196bc63c57f56cd1ee962 SHA512 5051501159bb22ab7cf1fca61fe6f513be712b687498695f5d3d82feefc7d3d6338adbc71affd8a9712b8dbfc51b48f84a3aadbd9d232acb1d9632829e4797c0
 DIST github.com%2Fhaya14busa%2Fgo-checkstyle%2F@v%2Fv0.0.0-20170303121022-5e9d09f51fa1.mod 43 BLAKE2B 2406c2d4f74ca49b59020819fcf3696ccbe70dce37d0d9167b9d13677c017efea2b94a95ba3855fe6be05c31f9fd3f4f08eb26d6876aafd4f315ea6ec070e902 SHA512 89a2cc13793ce063e5e087a0d50dd58ec0af29589b00db777ea9337713d57fc656a6e425edc2a85c7200e1cb92a240fe3b030eb2a3b5299ccdf86f80040c6e61
@@ -498,7 +515,6 @@ DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip 25340 BLAKE2B 3d0fcc2379f609
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
 DIST github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.mod 36 BLAKE2B 3face566779516d32818939bfc87f0c24ef4b03ec89330763cb2de2ab371a6a391eb5fbf24d9619a07719f160c4f6c403dd4fbe1c650764c5e0ff43a43051aa0 SHA512 fc1cd659d6210d91ef66189a759c3850b242b76267035f38959be2b2f35283b54a61334f4416b619ff017d39646433c5a13c6b181e53bdfb28fbc3f9c35f3dbd
-DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv0.0.0-20190328161633-dc7c13fece03.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
 DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
 DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip 31175 BLAKE2B 17e0ba33bedb9809d12ffefe034baf727e7c2a66aa19adeb87de3e3659c085f176fa48951f1afff4e5fe132c73d4520ac7061deb0e24d86520936e6ed6b63845 SHA512 d1717086c3d429838c88ad276d3bebda858fb4afafff46a204cf252685d9c7f1e2b15916f3cf7f8c03fd54e68d2d1c3ecb64e9d73975ebe9ae188039f0aa4570
 DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
@@ -523,7 +539,6 @@ DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip 131514 BLAKE2B 477f1ba843
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.zip 133348 BLAKE2B 1b5294c65a6864de4df7000935d365cffe1112d6f27848703cef467ae7f962a3c5c5ad22e5f67f25810a2ffcef5d4ea19b2445cbd67cf0f0372db0b1c6c162f1 SHA512 cdc9e1759d68c8c9a64cf6d1566a7d30bb90151d3a7ce3ddc9689627b53056be3915196cba74823d5f7d8c50fe05a9c6a96f8e7c26d2ed17bf7f1b64962fe050
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
-DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.zip 42656 BLAKE2B bc6a0b9ce81d8202304d3097e5193b5491a3626416fedf55af46770b8a2b9bdaae3e7854ab32ccaabcdcc0f362e1eb1d161eb141c3b7075f33dd0b668855b6c8 SHA512 b1e79df59686266c13a7f84457ab59900509c6dd5bdd2a343307ab2b19e10107f06c654803c698f1194da92a0c621c484ab2100cf8f3b9db6ec68b0022ac7262
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.zip 42083 BLAKE2B 5f9cc715c99fa4058551abcdabb96e2294cd50c79f49e8acd42b0e37cc990599a1eab827121b259b47d7af6fc62f1b75791c4916feafe6be08e2df3932e49fba SHA512 9f5d126347316b497910b30fa2905e6b6c119fa975adc6bd4f17f5a346cbe110c10f33a7df6ecc63e086c082f61ce493e4ca5efefbf2eb8d024f2a07cd80e093
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
@@ -536,9 +551,6 @@ DIST github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20190725054713-01f96b0aa
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
-DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.2.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
-DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.3-0.20191122130757-c099ac9f21dd.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
-DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.3-0.20191122130757-c099ac9f21dd.zip 15268424 BLAKE2B 948489d5e2c6235370c1bdaa1e105047dcc470e316734f148e1dce6b6baca421f215495e6dfd29105f478390599d4334e8078cc2b2933a67d3871ad5ad9acdb9 SHA512 4b5265db6d4383f085a67be3422bf3f18b1703a123e0d4329e44230d73a5fdbf8f46c606cefcaab880263f95bf07b6c3830d8b82cd906516b5c0d29a7d430bad
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.zip 16194359 BLAKE2B da3b081970f666c910de17fb8f959d1c52e7d92b64973b98954b816aef77629014d00eac2a064cbd32b4d4f40581cad8ffd37861c33fa8df31348cd21b320807 SHA512 2157dbd3094aaf49f560c066c6a84314141964ca72425187ff0647f03a033b33234530027879df08055dbff9d58ae365f467f5c1572d33cf0bce1edbe3910e16
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
@@ -563,8 +575,8 @@ DIST github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.mod 41 BLAKE2B 6269fdf51dccf032
 DIST github.com%2Fmagefile%2Fmage%2F@v%2Fv1.10.0.zip 8889874 BLAKE2B be8ffdaeeb4384ac5d68a1e8e009327e63a3a5fea4b22f4f0421916c0eda23ddcbfa5b550f4d8f3d37d75f5254dd9d00b95f0f57172903f0bd8e2f63fd75cf77 SHA512 24e0c406b185f7ef2cb5175f9c77dff18746ddd1ba96a441eb2b94d5cb62426c7a024c92d8c34a26f393726b545de26bc1f1ae7629e98ff3570f7632fe2c667f
 DIST github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.mod 41 BLAKE2B 6269fdf51dccf032b87cf8e7ea710c01933f0be0fea993963af14eb9274fa1a8bb078ad75f90279b4ba1b83d70035725c2f19f0241db615828231a2fa32c2cff SHA512 00bd89d63559cd13e21f6e60155e7c1c200848129dfbe4819a964efd14eb36141ee3dd9fd0c43fe28c7ff9f9255e8954e9d2145eb409f3e30b3474054737811c
 DIST github.com%2Fmagefile%2Fmage%2F@v%2Fv1.9.0.zip 8877180 BLAKE2B 47c23f5590437974a0c03fa730ff9b3217014d40cab7076e6eaff142941f95328652134b4ffceda1bac0e30f968733afef66d6f94132158c86eb069b99d8638e SHA512 7dc6a0e8a2f5d907136a894ae27aa5e9f96f0adce3a904632e635312b7b564e861f25765db18279d996ba0107d87c8277e279176888f0129f2bc2ab4c499be82
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
-DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.zip 91527 BLAKE2B 2515669359657f17a9e13026cfcfc5ca02efaf37223ba09166744c17cce8c1947fd6ae932c838d32840bd01f8201f9f3000cbe9ce59ba42b2efb89c093a24926 SHA512 57e01fc947548602c2d14559faadddab35e7f90c622ec8692143054d1f72a323e8401f671e7d075614223b8681461649db19f110517d6f2c5de35914100bee6d
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.mod 43 BLAKE2B 52ec55a10810ebe4083ca01c7a10daec67e5e9e370d24ae3a0140ab40801bd9b18fd09cee4f306c891b60c83049497bfc69ebc12420663fb5f6b39426002d759 SHA512 0b54c4dc34e54f09c3d9d4b63a4d6a22736250aa3caf1526220c11473f4bfb5b589fc1fe4cfd9d59d1a7c2f8cb60b3407353d41f9b31389200a96939cb95d925
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.1.zip 71751 BLAKE2B 828d4e00e138f755724170e8e13c8cc95b31d1701fee5903d54f54af0b6553427e5ea0b0ee39f2a078f6827bac43ba7245d6f6be13ef785df82807f854928fed SHA512 c8e29e95279ff183f5a3a4df25494349cac032ba191398809bf41aff746cb5a1f661e20659a257ae85bb58366b355287fbcb58798ceba0afa8991f6a729deb1a
 DIST github.com%2Fmarkbates%2Fpkger%2F@v%2Fv0.17.0.mod 126 BLAKE2B 54684aab4787776885bac06e7d05060fcefefa23e739a6c3c46588f1153808d45f2afe5843640ee083a59c134e10e212b90fa2910ba4949689cb38caba5e615e SHA512 38adb18d796530ea1384762053fe1668473fd00909a9eabf8cfb7384b9ff4cf9b843bb30f53b156047f1c39854d64a84163d507c96b35c1d8d950c781a7511fc
@@ -640,21 +652,29 @@ DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv1.0.0-rc9.zip 388333 BLAKE2B f6c
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
 DIST github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod 47 BLAKE2B 0eda9805fe0e1acdcc1e7b2693e72e39ea416cf57a108b1847491e1f15f8a7965c8aaa77baad1ae6148f39d36b1fc5fcf159b54111bee0d20bf2fe8edfdf85e2 SHA512 4e53e67b276ea3fe8a3977bbe72758bb2f844e22cdc3e23994176821cea51b10f5e802ca3db848a8b3d00a146c133a89271ee76158c478683b393682806400de
+DIST github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.2.0.mod 80 BLAKE2B 04718a62a0874dff2d0a305cd3cc4160048fc38b45316e9453279d2437e817884bdd666fd1af6031f7e3b9e782a00248e6e98d0f0eb28c7b5c436ca6bdd1134b SHA512 9528e3b28299cc17b8e93c9314f457c1f0350313db0919ea57ed3124e80ddc5f1348eede9e8f199758d2cc256905d43e38a476d4d4f7fb7a03fbd85282abf57c
+DIST github.com%2Fotiai10%2Fcopy%2F@v%2Fv1.2.0.zip 12137 BLAKE2B 35afe4c4d0eef8be2a40d763193438985c0abfd5e761a92ae866290e2ea3638ccb52cf5011adff014d509cecc5427be907ffe6fb2db5a12f940494e83fbf045d SHA512 df7b692ba9227e42e9f8bdf2511833aeb8127409fcc320bdb8ba81bf5e9e5d317e8fd46a634be0cf7bdfdda91044c554b27949f4186891621aa10333b9c6ad89
+DIST github.com%2Fotiai10%2Fcurr%2F@v%2Fv0.0.0-20150429015615-9b4961190c95.mod 31 BLAKE2B 2672a50a0d2433b86cac9329ec96a520f2d426b5e04356056bd1173a3e297696c4bb6d2ba30efe34b557afa6c7c973af7267ea8d1a9d939860fb8c438863b6a7 SHA512 851f7cc28e17fbb5889fb46b71283312b4e66755e6bb6093b2170348352a68ed0c7855fdeb576160ed659563f79bf9d5af843a8c47c07c8239d4edb75e07f498
+DIST github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.mod 80 BLAKE2B fb379c2984a53bfcc4c14a0a86655a7ea6a12d148aa2ce239c8c3497f6098b2f05af27cd1f8fdd8d5a04283b3b8a4234415c1472ae48ab6e65b5277fba9adcb2 SHA512 a8fb3d74f219262401918603b1944ce1d64a51f7e9cf89f4ea4aa58f9a2758637fe007741a1ca057ceecd59ebf2ad147082d00596fa35c8e4bb65f52906c0101
+DIST github.com%2Fotiai10%2Fcurr%2F@v%2Fv1.0.0.zip 3702 BLAKE2B 27380c5d62b0eae66290ef73076c73c1561c27950e48923a6156fa29119a7c2c28edd695ce1cef10de8dfaeb64f4409b3655fd7b5e404885f09d3abe9b228bda SHA512 09b0df5e622e14a79b579da7e9b1dafe05e02002b6021dfda8f6b928ebb03addd7755443ef2b2cdf42cf207d819d56e6aabed551a17e48f245b6a0f2d70a422f
+DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.0.mod 108 BLAKE2B 474e77997e73380c030b4809c8f282b643cb0da9bcd1e0b0a231aac20e8f3ec463df76824372300b199a1453ee90995e3d682ae1ac12bad05f1dbba4fc2ef517 SHA512 13789a725161311e33af6ced4e07d7b548ddaa069e34791d8c6b4f1bf29ca1653ea723f5da79953f2e2314a3d81239985882dfeb1700c3bab4a3579cf972eb4e
+DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.mod 80 BLAKE2B 7dde564f562e2e049893762d2ddc6653434fb32cee6c9aeb6f298e90d534bde43b79814d95a9a38070c6291184e590c144433b39f4c1f27a11e3211e3e7b81a6 SHA512 0291055b9568f02df1eaa6c5d3a4cf31447e864a89a25e741471a9c2aa34cc686535bc1987e3e827934f412f2892997f9336159f13bb8c3c915b940fee8c2e6c
+DIST github.com%2Fotiai10%2Fmint%2F@v%2Fv1.3.1.zip 9837 BLAKE2B 8a6545a58eea36974c18a22430b408a81b52b038b950ab15eafd1dbea3ab6c1a96c809e551e0992177b0196b9a022f87aa3398b07d93abad8a527aef8008cb13 SHA512 ed11e504b8ed5b55396a1b05384d471f713fe5a845bc0d74d8690d6bebe94996014043802d0a78976f4e9e0bb5c0cdc6d9582dd168d5fb233c95b55fe5724aac
 DIST github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod 34 BLAKE2B 24e5a5c0bd31053b54c98d3a593c6c82cc8a0136234a90981004ca7f40e1eeca392b56d80ede7407a49f8c666cfffa4407d0ba0d7c09a42dbe8a9773f1613d0c SHA512 a0744e73669284e544d60a9b3c9449ce074cae579583410ff0879571e0cc57a7784e30938a8dc56c08b8f5b87fb0c0df3ad477b0c3543f3bd221b6f3a2f282b9
 DIST github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip 10165 BLAKE2B 7208b851d5b38607aaf215d3076130dda5208b8c54a7ae8ceb8232011b2c802e8d3034ace2d91c2e5f1e085068ad8dcbe53eb653674255d3a727dca92cd14dd8 SHA512 0fe3bcb22a1a3485e64df4bb6fcfe619a8544bd1e245ca755a0a4b1db2fbaa39411f4fc2e5d3373538b66eec805a3df208103ef813ebd94494dabde52d5683da
 DIST github.com%2Fpelletier%2Fgo-buffruneio%2F@v%2Fv0.2.0.mod 42 BLAKE2B 26e88451ad5d521cc8f48a08c91f2fd3fe6dc2e2ea084cb0012f25d8399f0e43329de5e96fd741255d910cf5a2146d3568718249980876c816a67f79e8b3290e SHA512 9f82f0d4d467420830ab8fb80ff97215e5fb47653b48d88304a6effdecabfc735f55dba9959319014ba943b2cbd27394ce86ebfba8a6d068c9c3d368f6b0cdfe
+DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
 DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
-DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
-DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.zip 20567035 BLAKE2B fc4282618ff1d2d426080e969b1645fd4c8ca72464438fdd2a63feac6743ca15b0522ac6e2e069ebf5c0cbda2b43618253ecf17f271daafc61f03b2aee9f51df SHA512 7c218059eaeb85ef6313c5ea25c9c0118daae8d2795094a3046a020029aa53ce0a55b688fbc9b70999c8c1d93e1d6e11f4977b871e7b3f5cfd2b3aecbac4f97b
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.zip 20573196 BLAKE2B e04cea4ab317118a9a854ea34a7e907f5be268ece8ce552507b18151aef74a30d2a087a48ab1657eae38f79f015542fcc3cd9cac1237d4d2b1411fe2bfa97788 SHA512 5e9b1485713572250b69adf2b826eb40ff65851914452511df818dc1785063b2816d19397bea3d4d581c966d1c0c1aad27750e0ddb4fb0affb1b43f21c76ce47
 DIST github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.mod 38 BLAKE2B b26ee235ee877e67b605670a1a041cad6e320058c454816089083ae602be967006955b4f38f23927a495b09d2f71f3e3796a5269ab46587e3047d8150a6f3a57 SHA512 b32caefeba4ead78cb310946d4f8bda2d76eda17913aaf8cdffaa9db41300b5741a759be069f60def0e4ab1bfb1d6505bf3ca9375e80b77897e4419a933ccb11
 DIST github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.zip 5506 BLAKE2B 955d71140c6a3780dff928c4f1f27ad1f016ae2e467b773b77891350212c1b2f449d8872ccb7b2503a4c02cc020f78510ad612f02c99310db0f0c36223d423c9 SHA512 2d60ab410169bccd8196b5b352240232479ebef3fad2b1565208c33873eb6633cefabc7c091816d2b228caee64cca7900a26ef9409162913e0723dbaebd44aff
+DIST github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160517101806-924dca7d15f0.mod 38 BLAKE2B b26ee235ee877e67b605670a1a041cad6e320058c454816089083ae602be967006955b4f38f23927a495b09d2f71f3e3796a5269ab46587e3047d8150a6f3a57 SHA512 b32caefeba4ead78cb310946d4f8bda2d76eda17913aaf8cdffaa9db41300b5741a759be069f60def0e4ab1bfb1d6505bf3ca9375e80b77897e4419a933ccb11
+DIST github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160517101806-924dca7d15f0.zip 5750 BLAKE2B 06d678503e37d07155e3538f3b54a0a94011b27e25ceb60a7e8d2ab2de8ef089ea51a75fd09a8c927ef9e999f1abee04b931c5f7579d0a8f92978c0526ad909e SHA512 69c3192f5ab649c31f174b4caf9b72786e64779e6d1b746c80c73a95cee40df7bc08a3738b12c32e36694391b03bb46396edb630f08ec5a823b090695c12a3d5
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20170505043639-c605e284fe17.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
@@ -682,13 +702,9 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.zip 227473 BLAKE2B bdeb96bf
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
-DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.9-0.20191208103036-42f6e295b56f.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
-DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.9-0.20191208103036-42f6e295b56f.zip 218463 BLAKE2B 17a2a5d3116ab3240482ea280aa6eb7e374d72a519a918cb792a350376743213cdefc48d88989775ea97933bda903b0df89719ec0d0f4da18814f284e72002ad SHA512 0a7ee9a2ddc97eaa739e0b64b4b287e636484ba98dc285685448d1bb54a536e31acb69b25318f4ca8c767fbddef493d435685808799098be87c9c1169e6dca47
 DIST github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.mod 40 BLAKE2B 5927978be658cc322b87551a59f5462bcd7456070251d124d784ed592b145f39f95bd064cd031b5dfcd3992b8d65f75c06a941264fb70b55c74915da6af974de SHA512 c638601e225b1ef5a33abb3b252b9ad96db42d04cdbe92db8605ab5b616cd2eea41bac0bddd1ccc77ba43c9a6137b0ba22115bde85fa156a8204389b7dbb7444
 DIST github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.zip 1301042 BLAKE2B 1b9ddf847de05022e07b68a60e26449a278e51479ae000bf1d08282cbedde23a36d1ce95fe33dbaacba2bc467c1fb02d48c4843576deb5ef543065f5af78ec29 SHA512 1d2941eb7156171079280bbcbfdd7752d21d5ca97648981d5b4ff0535b88b5b2533cddd5f624afc5e18dfad86df7e6922079806860de6eed0187e4ae9f95b017
 DIST github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.6.mod 32 BLAKE2B fa3ddb522edba85e62f1f7913ef7230f7f4907bc350a0ee1cc570c73954774baa539b6110941697019d13198bc8cc01a7cb833a6235c8588f86351d4c5643943 SHA512 b9df57a2659d47107fd678dc36e262bc4c796c7ddf38cc6887423a645e4feef2f9d7cbf4070e8635114b754df57c3157c6b8734dc1631af02f848e599326f194
-DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
-DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.zip 57982 BLAKE2B 07c3ac2d98a119485695f6b96c4aae0bca36a305cd38e90f40afeae5746fcf0f78c0f389930b28184ab9ed6750746bea8939ffb8d569b0ef3552a3c3c0eada35 SHA512 0502f433987c5a02ae81f156f4b2916b6de0ac2f3e55a2117ccad7ecf94dc25a8bf952fd70bb7d37b82cc8302280c92f70b94606c8c2d125e505669a72e2e7b6
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
 DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.zip 58836 BLAKE2B bd86e85253270f67c6e52406532482d6ff8a702fb2f8bb4ccceaa41b3e3854f65c829e225b954275dc176e632112b4ef6ae7c326bf1c40c5ea16f829b2b9c770 SHA512 25f0432ea5260dfb79909b2f522de492b726f1a7d450d5ba90f56d3abd0202b712cbede6acc628eed08d23dd5eb1741724e3920c02b3299a7378eb3df8dccbfc
 DIST github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.mod 129 BLAKE2B 89da2797324d72bea586d45da407611d9997c997dbd892f18b5cdeaf1cf2d32caa2d566e71a963284feaf1958daa9f0ee7b6598f9d2286a554dd9c3237423f1f SHA512 7dfa7e8953f8e9cda777fcdf81323f5425fc50aa33dc627e63336ea91fcccb1678a28f58507394a49ec1ac2e6b68e94bd72172a8e237a98c6a2217505dc88078
@@ -697,6 +713,7 @@ DIST github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.mod 832 BLAKE2B e1e259107
 DIST github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.zip 182772 BLAKE2B 691f9d3460a63e047eaa7c1f294205f48dfd3a0ac5cdc3ea66f8b27676ba19c22a886e18f84cb456c637d0edd9896096b069aefc235aaa4d6cba05bd204321f1 SHA512 e5befbc265d7fe9368e5a16a956c293a9a669758e04d06185176f810d65479b6a7981afe9449d505b3abe8153268d02ac9ff4cad72bfebd9cf18e43ded1d09b7
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv1.2.0.mod 45 BLAKE2B 6fe371f17a31bcd132ac67cb50052f6f3874c9f62e2d67f48d52d241026fd21e58ca9abdc15fd53cb949f79e7d40dd0c289af3849da3d4d9ff75b491e8235c10 SHA512 ea2e9a81d7720b4e11129fbdd4772be224b6e1267157c29b9d33813b6f4ae905e43c3840cf1ade6ff5f73bd22c103430a0bc882355c16715e124b442652cd4da
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
 DIST github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.mod 35 BLAKE2B 33e37d84ef40609b75cf482bf1621f7a86960123cf4d164761c1a6d72695ea585ace3c1ae6671814275b0d525a09a7ac6aec67cde27331c50a02e21f2e874662 SHA512 b2567672a30edeacd02d0eaa3c81cb11925d81f08f460ca2de87d0a61a2e2b0d2918cebd650968892a6e0d6577bc4eabeb5d8ed57851d2eb41c67eebd24c6226
 DIST github.com%2Fsamuel%2Fgo-parser%2F@v%2Fv0.0.0-20130731160455-ca8abbf65d0e.zip 4339 BLAKE2B 01b0df404ab09d605fb61712123cf6f4d43373b1b19803a51c2ccc8ae3a054d065dad0649ee83dfe21473c46cf9fe99e39c1e35f0b5cbba13cb0549a37dce566 SHA512 264276b6431635d91b04413198b370ccaa5576b779d610b64d3250e6ea9b19b06ce4f5eb08c80fa312fe446334f103cbd8c35984d3efe1d5b17707df089b3df8
 DIST github.com%2Fsamuel%2Fgo-thrift%2F@v%2Fv0.0.0-20140522043831-2187045faa54.mod 35 BLAKE2B 3e8d8faa5b53ea2b126cd13bb5ab290fe59fee52c40f9ca1c57009129e49fbcb7f0a782d25f1237bf5c926fee61b641e9e49fa2b2f980515e9f07cee74c4e2a3 SHA512 20aba56ccf35eaabe5212a3e60120466dfc8b7d97062c4a4da170a18b1243797b8d295b22467008563671946891b26bb638a96a16c151e4221385ac6656aed81
@@ -726,10 +743,18 @@ DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0c
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip 1529663 BLAKE2B f5bac351e33600e56b635602a487b592e9d54623bffdccdf9c6d9ca8eff7f358c8a1de307c2ed6dcdad5c94b9d569ed7efc3eda22044a2ef8aedfba985d7578a SHA512 e3504b80d856f46158f6997bce909f8fd6345d5177b556ca63b63be5d74a7b108e1dd621483478f20ff03932551132a1a80578f3561819072952fafe81c23993
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip 9830 BLAKE2B c5d27e8b447082c0a1756354c0a414079fc3b03d0649cee8353490827ff50882a9321b89fdae4e341da1a4718f6db4c4a4c27e937c9bf31111085a449f56f282 SHA512 aff4d1c9bab0fd619496fd6948f05bc88e4147af2fb171c4ce4e44d81c114257abd55f92fee27c4b6d96fde21c6756735c32257de7b00bdb0356509cb4b97374
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip 139997 BLAKE2B c20d7292a69fd548bf0dbd62751dc08a41c66f120bd8b5142e96f498aafd208328ed4888d7ac59404b64dace96bcad210f64734e432f15ae63ce6d39dd308cf4 SHA512 1476716a98d5aa26c34af6d85eb93886cae211beac7cdc8f886d2030bf7f83802409aa56510ba09cbdb609dcd2faf87d3490c4e5392922e0e034edcd3d9fb1bf
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod 310 BLAKE2B 851f2542f28849f4f5c33155e5d9562aa9aa2645f1fb57e6300e2c6e98c39e0728e01a5e26d4a514435245662fccc55b8eca4eb2633a21057a6c4a5d80d24fd4 SHA512 dfde1474aedc5f36508bed07a01fdfd433967d2a6c0acadc6d985ce862da5e1cbec7ced13d55073512afbc2d925e6ad3e3cdee9511ad17b14ea8a159d8adf8e0
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip 151788 BLAKE2B 423089b53512bb0c6d09fa259a266d879e2fcc1db85939481475f71df2dd91db5794e4492ebdf61cc6f694501d94cfe8e761f986f857f62e328e596413403304 SHA512 cf0a047c617e014bfcd50dbdf466431efba7d32186027dcd714e0a63a483d4abbbba00716265309f10477f7739406fd3710fa137a4dd6fad4a9d3c4ff84c991e
+DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
@@ -737,11 +762,10 @@ DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf8009
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
 DIST github.com%2Fsrc-d%2Fgcfg%2F@v%2Fv1.4.0.mod 29 BLAKE2B b5d4003e44ee3e61a72146f100f7d669aac7047b096fdaf549194cde409e0ca927af590140e4344f57e77e2db5aa16e92055e3ef2edcb73c8616ddb0edf6c62c SHA512 59c1f5827727d54b89814acef7026a976343019b58d7c673b853382e661b72231e04e251c60377f8bfbaab0bd6768cb8144dc18f1fb207b6fbfd3d5534dea160
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.2-0.20180702103455-b8b73a35e983.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.2-0.20180702103455-b8b73a35e983.zip 43759 BLAKE2B e8e94e38cabf87136a09e900563fbf3bc35563788df16aaf34092ff94fa6f9e046a7f19dbf1d224970239ae7293c824b480569b6629446e0bccd5edc7a53639e SHA512 3f3aefa8b21ac5403b6fe6e142253383c4657bee4b57c98ec2b7a6bdf922244450a97ef0353ac60cad9ada75b612c3e135d76c3235246eaa87f30359a225c878
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip 42547 BLAKE2B af3f81b3947f0802a6542c60db0248aebac9521d75d0d991f76b5783f4eeb42f7902250cd22da1b8fcfc2f150342ffff53260276b7a6903c092febbe66f40ace SHA512 b21cdcb8683760280e515ae487e17b65b324b51dbdb36c6380ec0b272699297d388a34b1a6aac281b1aa149d85ca81640850e1fa0d84bf63f3dc67b794baa249
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
@@ -749,7 +773,6 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.5-0.20170601210322-f6abca593680
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip 92066 BLAKE2B bc321a8dde64189df65fef0a931a54a1c8dce62de17b011149c1f78a3db2c6bc50e0694c4dac2bb77291dda45fdaaca68901f5a6a584cf8b78117231c2a417ae SHA512 f40c1d8fc0c0edd78abec113f71601ccbc6a320e7eceb9ded2e6a047a05c9ad54bfdd7aea3f476fb10983b92e5d0fdf3cc716b93ad5a93793f40dc3d830c8d28
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
@@ -763,6 +786,11 @@ DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.mod 3
 DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.zip 665575 BLAKE2B dbc70781128df28ae9ac6b49f9994a0835a645df593233f7dc4e6cb8be23fe055cd7f1e1466c3a2568d311ffb851ccdac63f81b6e68db8f9a9462cbd2c67a99e SHA512 8f4fea74a9b399a1eb923ed7e724381e47b529ca1c6c041143a8f3f22936ff6f80bd7e15b29c85013da37c5add084ad3af687454e92bf492047c3f4e7dcd1660
 DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.mod 31 BLAKE2B f0a3620501ae28c986a7b1bb5ac6726a807f9b4173129036b72f1a44290fa6e5d59fc66d61d9fa554a4227a91c4d001733d341a7b2165b03a67e528c3b4af822 SHA512 ff7217008312f36684c8c655ea39e67d4efbaf44edbd73d15551649a3647a543fe4f493312c32f0e8f8a3ae9e23b3c9c0820767fa518e3a9dc2aa0cdd5930bbc
 DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20200626092518-2ab8e397a786.zip 665575 BLAKE2B 179c2f83888ca4f78103c151e527ff612fb0eb2ca0f5228db2cf0e93ba22374957f4bbad118f6917e2f1523de91c0f88429bd564c2112382d7a21ac1ec1b4afb SHA512 bae9fe03f2daf5b2ac1739967c4c298b5b638b23b9659b4acaa7c26673e091b780e9556f692c248a04f9a58befbb84343813f9d7544acb592cc8373427676961
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.8.mod 80 BLAKE2B 239ac891c92ef39240c17f3dbbfcaa7ae9683bdff05e8d67dde1e30597a131267a3d0589f7d2b52085f3947a59ae52a5252f3ee4305235f8d2665ee330cd7171 SHA512 84479e92ffb75572e88de028a7b8d990f0ba3de43c4aba03040a2518b35466684ddd60ecf5175835a113078c9640663b77e131ae9dbded5aec78f7799176d823
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.8.zip 8143 BLAKE2B bf74a5fd269af42fc3dacea4c999861993e22d5aeeccea442c1c142a6faa8f94492a60ce083e946d49308842c3797276dcb651ed0697fc582261ceb5cdd6a9ca SHA512 0590a985cf7f3b69fa213452d2bfc982c28918789efb58fb984af732edddfa3cb992222a5164ae88cc48d0f64648f41ae7a55afaf488d979c1cff238ee3b851a
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.8.mod 80 BLAKE2B 7beba8e666585a6dad81f461e24298b8087087429a2112be586d51d774f8f21e7d965394869383a93ed510316f83f83db6547937a9095db8c73f2c0020e22590 SHA512 541cc5adf1c71c2d92b505199fd94d13a7ee4fa4c2158bf562ab7e5249c1c1073444682d71a25f13c19a3835b970a8a525218d53623eb950c2389efa7e69c8e1
+DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.8.zip 314745 BLAKE2B 9e411504eff25262762069d8e2547e848d11c8daffc19a76cd1b92136cc6b8ca4f2d4ceedcabdb968c779005e83f6d89d5f40a075e22b8fd113c098e19757ba0 SHA512 24121e64d81cb3b5a265df493a6abc157bfd75410c46d6adbfc320b929d9f6ac545568db7aff32247bf7dfc39661c984abf7cd23ad64badc4e7ff9c6b141ca3f
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
 DIST github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200125202105-ffdc32ff5518.mod 78 BLAKE2B c50261cc483c6bd82c7a8641696349b4d490c01ef2481aa0c3b5788f9b1c64ecb0c6d75af90ed99dd6e0f2f7946866c81a35731d73224218d5a8057e75864c52 SHA512 66523469a357b8bb9d8b0cda3eedfd0701cf20936974f0a4078fccf2c1eae97eebc77f591a71a2c808ddc5b265500ea77927debb1f74ffe5966eb67c98efee8d
 DIST github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.mod 78 BLAKE2B c50261cc483c6bd82c7a8641696349b4d490c01ef2481aa0c3b5788f9b1c64ecb0c6d75af90ed99dd6e0f2f7946866c81a35731d73224218d5a8057e75864c52 SHA512 66523469a357b8bb9d8b0cda3eedfd0701cf20936974f0a4078fccf2c1eae97eebc77f591a71a2c808ddc5b265500ea77927debb1f74ffe5966eb67c98efee8d
@@ -775,8 +803,6 @@ DIST github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.mod 30
 DIST github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.zip 11941 BLAKE2B f64e153f3c62f9220f422f1b2e72b4eb77a3dcc009a99a93a2e985bdb8f134d298db36377b05e263ba8e059bbe0aaa9ee6e0ee0a54914f578d2a5ee76ddfeb3d SHA512 b6301d0eb0b0ec015068c9dbf2106109fb258c22010ef71db09bcbc84467fbec83363c3bfa369801f730da74a7779978a86834361d89e4fcee67db7853abfa97
 DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.mod 33 BLAKE2B aae9bb38eb370b22426bafe483e842d67975bc186f2f040df14d7b8778d0e0d972d8bc084a25e70826cfc4604eec043e26f4add6273db90c6d7ca8b956f9b71b SHA512 8ea785e6ca06a6751f2598f434303a54fb9219f66a824bba4552e67ffcef12e94ad0527c24f762169a33dd627a55110a087e1e54adfef512c1e5909cde28aceb
 DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.zip 12709 BLAKE2B 871db29f8e8319f5f06ee2846b0c3a3c052e727d4a023f9c094e276f7ddb3b75f9bf0c350008e12211e94fb5e230afa0f0faaa84c2e513fbb26ae2e6254fa92e SHA512 8ebbfa53cbc43de5dcf799e74e7ba57c8bf1d832ce9b085ddb051b12977c54c3f4ecf5acd894189e069d8fb920ba89e6acab4883f0a248cd51be8cba549545b9
-DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200106130147-61080ed7b22b.mod 33 BLAKE2B aae9bb38eb370b22426bafe483e842d67975bc186f2f040df14d7b8778d0e0d972d8bc084a25e70826cfc4604eec043e26f4add6273db90c6d7ca8b956f9b71b SHA512 8ea785e6ca06a6751f2598f434303a54fb9219f66a824bba4552e67ffcef12e94ad0527c24f762169a33dd627a55110a087e1e54adfef512c1e5909cde28aceb
-DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200106130147-61080ed7b22b.zip 16854 BLAKE2B c6c1ed2cc68e8ffb484b4b456b899e4f2135c8307396cb631cf5adadf0dfc8edfbcf90f8cd396e7e7087b7c82ef101afb23f67dcb2d15c6b2977d579add95459 SHA512 b9abcec3ed8b8fd669dda8b3382d18ef37f576b665d8fe1dc4b43922518223d3246c7affda5b28474b6a6577dcf1083211de50b049a7eab7d61e2b2d21005fab
 DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200125210132-c2e338f92f3a.mod 42 BLAKE2B 6c481463839f4b6f1e2d162413609f23091c4adb531bfba5eeed80b1c604fa3cc514c097abb72e7ea36a7a07f94fe22909f03fd1420ebe0197d7af7d6f9ee87f SHA512 4ef4c98060e06cde13e9efcd7aeeb47b03960850075f68f2e7d6f9d251f35ac783303a0ece1b8639e254d8c17a6d17a5652c5d5ae4d549be02c32d0eb884473c
 DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200125210132-c2e338f92f3a.zip 17736 BLAKE2B 2c358e3baa5bca3ea87e8db6574f4b8a907dde49d46e8fdb2860c834a165ba96f41e714b0b7bd430ba6dfe0502b0213029cd5c38b0b8b374c6fd2f0c2821966a SHA512 7511306054669300a1206af2cc6772d9c0258cd098274e540da274251c99f40225ab7c38b0d4d959e60bde6adc29608603f01f93e9edf71a21d891eac8c0fbe7
 DIST github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.mod 29 BLAKE2B 3edbe2c6139af3cab6c0ac32b935764c9442e84ce2c6861d4908741c2c060bc95292c7d24ef0c439397cc23ccc4817214dd802366aafd6941d9e8c9bb6470aae SHA512 406ab8978f9f53c5c35aedb7416a9dda857aec33d3e7ddad167528efba35034c7eedc235a18b533649a2544fd0d5410a6feb03223cd2be32c8bf3ba84c808708
@@ -801,59 +827,57 @@ DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7b
 DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
 DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
 DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.zip 139320 BLAKE2B 0f152a17ee3790bc11d4e4344d16406c494cf9fa563ca4a38a5d5ed6e9b6d0ce0cb95ecf5b13b5acbecae8604d6578265ec276b4d430aa7d25c0b0de496f979d SHA512 53b6fef3e9fc66824a6a6a4a1e66b803052a80b8c1127abcda8d27ba264cf8477035ffbf8b84d0433c697a3f683ae7c1fac64c5326d978de78395822714bdb47
+DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
 DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.mod 34 BLAKE2B 58672703644ac6739cc829047dc75265ef7c6c4ab2783595819e7f1c4edee8a4ca4b6820f5734dc387882b780dab7f786e03291af2edce3e1bf839dad060c22f SHA512 a93071d377a3b10b4220e71d7ad8bbcae0c55746f11f44f59deec7bc4216e19e4ceb375ee2c0d3ec8ae7f9e78be1a4b93eae6ecb6668936783c778ade75d6cc7
 DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.zip 182857 BLAKE2B 1f21c2074fb23a68e95cb4f4f6ed29760fceaf5b6333309ed83fc75ee29728fb388ebce43766c2ed4ad1b7cab83473f2369387b6963b0afbc1fccfe9a8d5479c SHA512 bb421f5858d73f3ac01df87418004575bfc64ee643a935ca44699ee1fd3b9a51f199896ef1a2c5afff52384385f9c0abc2b3d8f8a0f8ca591d255f5e10f03a4a
 DIST go.elastic.co%2Fapm%2F@v%2Fv1.7.2.mod 478 BLAKE2B 5f009a9e870f64c57c52e4e4ac40ca7ee95382fab969e6316f84c5de6bc48629edda4e588727b928399020028a687563fb4f69f6ac6222c20b97e60d34280e56 SHA512 fde518d1bc6c7f675decdf4f2421bb41e3d285269c611a774596e3c222666b0e7f4b2f7f1af39045c1665dfa0b9f4ec90a5e41b609ec8b69e2d7cead874aaa32
 DIST go.elastic.co%2Fapm%2F@v%2Fv1.7.2.zip 332338 BLAKE2B bcf39cd63231e14048fcb16ff54c1b1d8253982010a52b4112e3cbfbf9365dc16af5147c841462fa99eb58f93c4599d327c5f79442668342590e8d67d26911ab SHA512 ccf598af44dd7704f741b04d704ecb48ee0689ef4de8552eb6ae3060cc75fa65a42de6e054c3726e4e52b5b960dc4da374d4810146b3a6190e3c25c9ec828145
+DIST go.elastic.co%2Fapm%2F@v%2Fv1.8.1-0.20200909061013-2aef45b9cf4b.mod 478 BLAKE2B a1a8481977b8a647fc0f0e62e5deeda3e952c1f6a9e04ab42f39f5c299e79c11fce774518f92889c18987d3c6a671017f45a56201255f8fc842dc49705a8db93 SHA512 c192935ae0adebfbf29a0fd9c525ba4fc99cc02c93f2bbe5b67744529f1ac61f881eada89a8b246d65d180e22adf14c9e8546108df0868662f6857d0ba7d6ae9
+DIST go.elastic.co%2Fapm%2F@v%2Fv1.8.1-0.20200909061013-2aef45b9cf4b.zip 356468 BLAKE2B cd94e8f9fe74b5cbb2a56e703447b3a146a2ac8ca78155a207a12fb1d550dec41746e1a5de298b9bfa5fc5710cc6f3d5d36367c63eafde1c9bf1e65ca9d44620 SHA512 177976d554a2586502393d6e375974f1f9f15d6688a10351800e36817145936cbd6ed9427ceee5ca246f12a500d03e7327927c8bc39f972fc5c2851452e94fc1
 DIST go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.mod 319 BLAKE2B 8bdfeba2da6858dcedd306fcd21c68a68589d44da930b6f0a85a4de39c913838e5e24115a8778e9851361299ed1afe0f61fba9c3f21b7bd2430c131f4c4a72c5 SHA512 f03ce02f3e178d30f5e890c62e647bbe0788e1e42d09489664d5321513c3ea28f09fe99d2f51a1557c06b9aa446fc120eaa8fa3779309be6d4216b6be0cf39df
 DIST go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.zip 16390 BLAKE2B eb63085475105fb3c2749a1e90ed84f8bea36b8859cb7f0155b1d267867d950bbca7d45043ed11610d43b733f895203ed26393bce34d935184741ee4fe3e8164 SHA512 d72b3b404ad475b8e7c0ee59397bb631bf10e7d41262158dc19a33806b84d914fd4763c55e49d251d7341ee73d6332fc912359b9608f4114fde54c804f020f11
 DIST go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.mod 281 BLAKE2B 69b39708dbc3ba646836e44bdc85ef6d867663c97efb3e4a965678dc746fdc84d5bec5bb9fc809a28e340034a9d5a7bc34ca41c47ef7e37c2c061bc6ed0f9c3a SHA512 b23e7e60140bd80d6c46c744120a27d35189fc6ba97365a0d2bf827386390bdeba3e82b16e5d94fa824ddf0a21c329bbc2a113587ac253c27dcd26a816b6c24d
 DIST go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.zip 38649 BLAKE2B b6c9200c6f4dd65324bc7441b82212c8ea182ed0a7d36aa748cbbc790e7d755d4a286026c65e33a994d1a52f2e64556bc51a8f14f3963d6575429aa9f3a4dca1 SHA512 ad10ec85cc845d3b09ae7ebcebf6156ef302c9470371444f9311c53db0c93a08050a2da2374672853c109b2dbf7922412a349d2869aaa9cb309b7f60a0560bed
 DIST go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.mod 174 BLAKE2B 738d91b9cf4b7a927f67f24a52b5dd181e483fd8e71bd04add082e776a6ea3b4929925c30c865cdb4d553eb4e50d796f4e2a9581ed2959a5eec5982df5f101de SHA512 4ee49236e3bb1354ff8a09235d9bf75bcfdc53a4b1bd95fc4cb17ef327aab083815920ad84b2c03cd563ef24449f3433e9d8c0ca5abd53e66a90951c27be26f2
 DIST go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.zip 32631 BLAKE2B 55921402d674a684117290a4fea2921a10d8f7624bd0c6c451921139411ee2d0e57b920e39955868457a0d3f46dc94e289d0feaaa598d0a34665380dbebe1720 SHA512 9ca1324dfa639d6d58f772468edbc338d9a8d193240b89abb43e5891cd6ba226d0a74cca2bdd5f81cc9e47d4c0fa8dd6cc8d67f6dcd3c21b5dfd1c6b26fb7454
+DIST go.elastic.co%2Fecszap%2F@v%2Fv0.3.0.mod 174 BLAKE2B 738d91b9cf4b7a927f67f24a52b5dd181e483fd8e71bd04add082e776a6ea3b4929925c30c865cdb4d553eb4e50d796f4e2a9581ed2959a5eec5982df5f101de SHA512 4ee49236e3bb1354ff8a09235d9bf75bcfdc53a4b1bd95fc4cb17ef327aab083815920ad84b2c03cd563ef24449f3433e9d8c0ca5abd53e66a90951c27be26f2
+DIST go.elastic.co%2Fecszap%2F@v%2Fv0.3.0.zip 31250 BLAKE2B 8d5e7acf1d11d5a55ffbe5979f54858fe8a764cddead05f1e9e70cfa89619ba5bb6e957f37edc3254be608b5da61a16693f00026daf113adf9bfcfc397949f0b SHA512 d4726e1dd32104d07748fa9075bc65e388d9de08e88a7376601303d8cab86051388fca13f7c9aa9af0fccec0421b176b6bf58e7bd66b466458a9dd13e6dc97ca
 DIST go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.mod 68 BLAKE2B 38761b0b1593550d253ccb0876a8a5d2be2e71ac0ee33a9e4183d95044f57cd4404ee1cbb3f9aa995ff37d949c6ba8e8ce8708b398a79514ad3256da64e3ab2e SHA512 c15374592dc4ec4f13699ce4fcbbdd96ad6dc40d2c6be32d7dc244d04848d2db8305db96ef5fb0be6f2708778ab4da4557cb973720d9010dd8a276372fa8c981
 DIST go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.zip 13266 BLAKE2B 74f1d3b40705a460d08738d5bff9400540d637a05131e5864b4b0bc2f6bf377258dc8c412d2bd831465c55545fee2fd471ed85c2938cb80ae18b4e9958307765 SHA512 c549aab7779c5637002b7108983e9a63eccea277617f6186edeb3b3de9f4eebe3f32092d7ae008bf8897fa905348ff739e81854b73423595b06229f2a9dd16f1
+DIST go.elastic.co%2Ffastjson%2F@v%2Fv1.1.0.mod 137 BLAKE2B 7122047ee2ef3e3c3f06a710d24fdaea1ef3adf1e59c32d8b428ad69aeeef75d0dc0415d0762e3a245f046256a2bf8aa25e81160e9949d07214302b059c9a800 SHA512 6801ac1f4481482ad93f7ebd56a2fa094991323bbdfb7141d28a7c7027aaf4109c083b17b4b7fdda48d826f76d479cc5b4b75774d75d19ee6082681a725baf77
+DIST go.elastic.co%2Ffastjson%2F@v%2Fv1.1.0.zip 14077 BLAKE2B 33aa59e99ab1943bb688616033ffa928cd8e85cb35900d44c83b6c3c8547dc4daa1988511dddf41665a895bb101a7fe51f2236afae82afb153058c0c551aa512 SHA512 dd77f9cff3e5abc5139be6593702be71dafd8b45ba530e2d2696abc5faadbd5b105d1eb067b181d2bdde7668eab87e1997bcd44e3ad48fac61142a55da7a47d1
 DIST go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.mod 457 BLAKE2B 2d5cba129a8cf0ee454057069e5891cbe0c1db871758676632826c3e39684598427ae76ab503489fdecc4faa92d852adf251e7469bd8da5a7699fe10e1a283ae SHA512 32c9420c08c1e1759d84f2971631cf2748eef9c197522b47f88479dc5c6c72182a3697b71a4d78d701967e62a11d60f89c41fde9ff9b308418b5e99968553d88
 DIST go.elastic.co%2Fgo-licence-detector%2F@v%2Fv0.4.0.zip 11074271 BLAKE2B 895285abcbf08541a52e7b22faff6202402e7f4bb2ca0b31fcc824319a1029cf5ab72a2a07f2f6410de66f1254fc2f6da49d055a253ae4e084a4933628379b25 SHA512 199c9aa32be6a9c383317fb0384453619d16ab97c31bfb4192676911a1c7994f1477e3604801599b6457b82ffab8ea4a73a8f0c806d15d60e4f5db0be4d72406
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.mod 94 BLAKE2B 5014c2a8459f1f01661c7cac0a7d2ad7de372b3e2916d56d721fd454e459fc75d5b4f6249a73dc54b46b91df00b1ef5c3d47d099fa28429a6967427ec7bfb36a SHA512 d3cfb7a75e321d2a6fc145b727dea76002189ae2caa8dd3162e5e6903a1acbe5bd55be81d7f112c71b47e61351534ff991be30993632be9c9d7443111600fe39
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.4.zip 114084 BLAKE2B c47607a89d8fa027633c72c3d1527eb1ef4941436a4f809188a927185f4cd549ea3c7a1eebd277a8074e0f90da4103523f6bbb6cf2a8ebeb976212d664cadb41 SHA512 089d2ec9a7ef9342e654b97571cac4605c13c828c1e023565191cf3bcd09e830d756419aefdfa7aba61ef8dce3768ddd594b8c50845a732e389d5cd3276e12ab
 DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
 DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
-DIST go.opencensus.io%2F@v%2Fv0.22.0.zip 291484 BLAKE2B ca3bfc9c9864a2218ec373d78792ba0a40f4e2522bf3e0acd01b153eee43083cf8b124ae19b5fb0eaf7eef7cd59b2733b6c3ad847761518eeff2b183780c79cf SHA512 4fe718c3dd4c7bc0914b32844ae86ce281721f98b05797fb0a0fb51245129dfe1a74d2d04b419f4e0b7a31409b874e0e9d7939c8426af1efd92fdd5f12a52a98
 DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
 DIST go.opencensus.io%2F@v%2Fv0.22.2.zip 296264 BLAKE2B 0b0e20eb2f10b81748d55b843f8489ffb8147a8b17c063cb21fe505fcdb46feb9cc0830f3b3a91ea7034b1e7ba78df27b0b235b8500b8c1ade19f6837366aaa1 SHA512 c98a43e1bfc9f4bd1e54847dfd6b07e9af14efdbcd8d61b70c9f9701541ee2405f800b1e33cf115615a43030accb735a1235e2b7d81f54efd127e2fe5c992326
-DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.1.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
-DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.1.zip 14706 BLAKE2B d310973614a50f94f92344ea10e1bd50e29be5ef90f78a0b03fde6c962df670de8ad56968fca2aab816004906cfb8cc2aa73fa8dac508c8233e5f2c78ea1e701 SHA512 21f4182cd0872e15396ed08dcd7bd3307c2da40c6ac51be0a5e73571776487edf3b611be20ed6a1f745b7197f73a5d0517f34ede098f42f6db24cba8aac322e0
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip 18762 BLAKE2B a472638d7d9fa9cf5fa1ad2bf968c1eef4b2b3e8bb6fb53066a85a7139fc8621954ff21ae09aae6887803621dabfbf00069deccb9c208e39776052d13a9f0a6c SHA512 73bff83189e7a98b144cc407d4cb267277e68f00827f86d24d9b5586fff66691b6566ad2fce11525b11a5bc3b8f0ade753ea996c7468ea5bfbae682aabb2db95
 DIST go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.mod 312 BLAKE2B 16bf4900b2afadc331814e16a34fa8cae0cfdc78c7ea9704312f121e166c93b7811db3604f6c167fc526faefdd1eb0ffca1dd09581094bfea4847fe0f62ecd91 SHA512 8814a6b8138027c366f3ebeea9033a71019990faf1cb613d75a25498a3a74d61fa2ba662302254150370a49a2a6f56da5c54889d4465117cf8afed4ec6cd9f63
 DIST go.uber.org%2Fgoleak%2F@v%2Fv1.0.0.zip 24023 BLAKE2B 4e847da3c0de521f65e74beb03b24f9f3707abf1ccc6740b18e9109a28dd0300effc7ec181546b5cae7a8fdd5e5358b753d69e0a17ce5f18151e6e2c6c930ff9 SHA512 d8bb8553e96f2c7e4feb404db453a35c1ad42590f36a6e294f238282c8c02bbae2e8f524767341ac20ca6d864b58c46572c3e2236c24cb8d10c710528f18161e
-DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.1-0.20170829224307-fb7d312c2c04.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
-DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.1-0.20170829224307-fb7d312c2c04.zip 15327 BLAKE2B 539eb4089f20b1764b62d01e4162eae8c70b05b3072b6bc95c888152f1d7f2fd7d5539856cffa9f00b27b2e2e992ff44b23d01fa03174968e1c94108f17d9137 SHA512 e9a0808e740203e81eaddf9345b42267b8a61d995efac06739b5919a14338919a2b784f9ae45e1cfde84b3b0fe1467630f8dd4439ef60445f15a6a5e4d0467d3
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.zip 19365 BLAKE2B 7d71e90b68a4d6dd2412108b9484f782209f0c0a9531d1158fee4a9e9c377769ac1734a1254f762e055cbbe342ea9c053bd038826a11e327ed7e13a53de18da5 SHA512 6260dbe2a98d9c74cea2648187ce28280acbbb361a93ba75a8c53755c6521cb929ec05ae93046b3515a194133894111fb0717e9d04e00b1711c2520a62d8759d
 DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f
 DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip 27032 BLAKE2B 58b337663e7a5625521925deadcd0d686ccbaa7d04925852bee0ff1cf3ada22c078e9715930dd20858b16bf51632a4e4d7e76986b0092107bc07ad46d132840c SHA512 b0f1b10667e0e600a4ebca7b4cd9983a27c3ec5f2c54cd46eb055cc0a07504642bea7ccfd0e0f6e3d007422633506efe863817b7c7bc9d18eec3642c84b28f8c
 DIST go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod 221 BLAKE2B 586c82887d6cf6582837fb495a46030e1c582b58305fc70c7b88a29e570610e693a298fa7d4eac80bc86231c7fe6f6e27d3fdb5afe084363eb918692a1ccbc59 SHA512 2a7413f6f83e66456c340536502d855772e6de433ca4be1a9cd1572caf5fba7cafc7d377ef529324b5bd8af97830c9eae75768f7c45d4676b455e3959acc82c1
 DIST go.uber.org%2Fzap%2F@v%2Fv1.14.0.zip 223137 BLAKE2B 55b880703f2b061605954bca3ae21959663c88a8e88deb62373f38228da090a81511bbd0bdf24346e76feba4164b48ec892fc587bbb41de7807c52205db1642b SHA512 3021ddb93de155c5834da694c9528f4c8532c951acfd86b6431302461baf1e097210a7d9cdef8fdeb2a1745842bdeceba4e8d8feaa81dfb8884ba629718feb74
-DIST go.uber.org%2Fzap%2F@v%2Fv1.7.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
-DIST go.uber.org%2Fzap%2F@v%2Fv1.7.1.zip 201415 BLAKE2B 67ce98a69444d6b8050fc2e3b9d89cdaeda809fccc973f854ad4aa9bb26cdebef3e02c8884b2e066bae6eaf572c0af050e122733c2ab14463aecdf7cc0131db9 SHA512 bae6a0e1e42eb79ed1ebf14ac527970cca6820379174b12e71a7772dbe31e500d37e1a1e7c98b9cac05b1d0158cac3420f091e657e2017a0c48ef7510eb09e51
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181025213731-e84da0312774.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190404164418-38d8ce5564a5.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.zip 1859923 BLAKE2B 289c9b56814fd50a40a350f1e325381ab0789ec38e161eb7c64a988e6fa46dca70892de0b1fa21636d10ff7f8870160714d30d294781024c45782c5e6ff165e8 SHA512 f54cb2da01ee50f7e04fa3caecd06a794c70e9b58c6ac05fee6d09d7a8cf4f0d8ed129f981d457b8ae1ffc79316744b3e6d0ef8534e61fdc4127d41da8cf2700
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.zip 1863059 BLAKE2B ffa21e8af27abc68c144798d86da766b0c246f68c8a35dc94b29b31234e5b7c611651a1b1f79ea70d0fdf3fd54190df608a23f3a0931271e962ea28bd18fb0bc SHA512 0256e72c4734509cd52a04f4cb6e37837ea352fb649d716bd35befedfc825f531b1b07a0f1427cca08f379989c7a1e2a13c9a62de17fee09fb72e647cee367bd
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip 1871909 BLAKE2B fa2d419a5bdff43385f70e3c6e61f8c1b3528b6c4e21c3105f66dc358515b6336673188ff68b27a792be9ae69d77cd26c82b7e30605b974e4435634f961c7583 SHA512 de179d887c4ed6ebba0a1cdcfa67b8312b8b2dcd9bd04589d581c872f6fa7a8606ad1376dc6933dec41938781218a91f31fa27331d80cbda30542b8cd14c5af1
@@ -917,7 +941,6 @@ DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190130055435-99b60b757ec1.mod 233 B
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
-DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip 81912 BLAKE2B 647b2edcfc6109ea26a1844c259174eb37e3a97cbf12242716d4cc308b3918b5a0b104c9a5c2f3b4974bd94c28afa7ecaf40e71aae5fdd821cb1a5a15ec978e4 SHA512 62b95055b08c73a87c7ef69b2984eefd061e3f7d71eab8e05ce82a4ab1be2ce200aae7929da77a9ec49051b7c73bcc948fa4ee782afdfb8d74dc2d206636313b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20191202225959-858c2ad4c8b6.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip 84373 BLAKE2B 39bd0256afae566a53bb0b7b95adf0416653fd003bf5312c7a316a2d7c3e5d1fa25fd08bdbcdf75df45a56116fea54dcb1bf9b68b07d15d3a909e072f8f9fa06 SHA512 10a924e5fb556c2726795462c91fe7086472d6baab511ac21c1fb3c137e5a3e0db55f9ce8fe1952566d887225e3528ec8b747136f8984163acf71e869a0d8c58
@@ -936,11 +959,12 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190204203706-41f3e6584952.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -951,6 +975,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190529164535-6a60838ec259.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -966,6 +991,9 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.zip 1913169 BLAKE2B c50435879fb1df50f91b1f37dd92f6504047944d41797350f0871a581d5bf17cf474845d3b422fb219c56f7627f2fdb302059d68657bd7860ebc604861cfae72 SHA512 b732d79f0828b9a900595b8dc98377436dcdcc24e2d3d9fe0472a8170d477c0e2487bb4b8e2da4eb7ca9b19251e29ea3b38a9de777d03c069425897ac47e325e
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.zip 1916427 BLAKE2B e6030582f47eb0fc2049d9fbf73b03afae4d95a506988d9538d1f094a27ae63c20d5a5ce79d63f09cdd8c0bdf80e80c6de498960c0173e170dd31c8060f89f30 SHA512 62ce13928c6379717545387d68beba5106ef3b745ae7b458ea457889e5c6d186bf96dbbcf8cf4e81f9e6180260b8c60ca34a4bc58c434d7e9150d51fc72540b5
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip 1479123 BLAKE2B 45f0af63ffb886cbd78269a103067057346ab756631f228fc27b68459bdde97c84c100f99045e1a4a8d336513c4192b377048db8e09cefa703e94ca814d6eb07 SHA512 57783ce5463ce2a6a2d76d8ed3df08a23de896ca82e7456597a0fa55fe80bec64f899085fc727f0bf369495d1bca70a10e0f7071e7e66f6a5ecba1b4f42ffe54
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -1061,7 +1089,6 @@ DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip 59626 BLAKE2B 5fb595a1
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
 DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
@@ -1078,9 +1105,6 @@ DIST gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod 38 BLAKE2B d1cedc414de
 DIST gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip 7425 BLAKE2B e25afce5349dcf85fff01c6282db6db594626bb20a021e77330868d666cd283306b5efacf2f8d8cc9627380e81763a50477b4ffdf1c0a0f4a71f2b2ba7d8f4ba SHA512 1aac5cca82fd087586924f69e49ecd68c7401a46368fa980c2e1ddcd3e59e170d8e2dc067d96c235442db9fac53817b631c0ded1b75557217385a3888ab5833e
 DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod 40 BLAKE2B 3e77c43f0108e2eb7585bd5558385a198b301e2adc7f813cce7981d0979567808d015e60cfd7ac7c6a17e9c0a5d616642c4b9bec919cd5de8d2fd6f86dd00845 SHA512 c498fb321f358d43c35d98913d17242517c415fc3c26d497fd821f30e6c656ca9ba3ce3a73657c43c677d35eab70c90065a7f93dab73214502e604efbc44a180
 DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip 7069 BLAKE2B db430bd56c95cb5a40e95368be1f8b23ffa067e4f491ba6a641c12f78855bbd691268f60b4d57307aeede99671a23c437171a446a47ca6ebc1eeaf9defb0755d SHA512 4972724984d58b174b50c1ea81842bc5baa1fca3d74ea5163b6339c2f4a9fee1731eae3dd19f8cb67bca9465a762e44f856537bdc907bbf37394dfc656b2edbc
-DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.2.3.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
-DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
-DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.zip 55262753 BLAKE2B 42ecb6953d818d5b70bb6ca430ffbb5ee9d2e66feca01d89c41856b99c5d3738b031a1c743cd45860499ae6dd8c0fbe6e949c4954f969dc6bf20be39744f5afd SHA512 8d24dac1e8429af5d26697bb75407490f5a36860cfe5fcb4303c17e931c37454b17d51dd54d6b70112475704da0cdbcb851ed21e1303bde950768192749a822b
 DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
 DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.zip 55267516 BLAKE2B 75bf270c4214dae356f04ee97895e4811443e013fdb373233c9c7d312c346bdfc7bf74953fe95a8e420a32961f76176fce77246bd384d78512944f9983594748 SHA512 b48eb67302402a67fe0d343eafea34d93063e19b592f6cdb10835ad059c740a90e5f7cdd9eccb66c27d806a8bdf630d5d810681fab97666a953c898444840070
 DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod 33 BLAKE2B 0c256369010fa14f2dd95100b3f1b75357816012d226e52588c91c6615eb5b56459061d3bdc8201a84985136912c4d8e62dc281600cb53fd2e9e2a545eb3f35d SHA512 0513089b977716c7cb885b4edced551183b397858963f74f002a078920fd1e2178376261abad2c1c475e7de7ba262670de9d25e8a6e801b4c78385370cd0a489
@@ -1095,12 +1119,9 @@ DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE
 DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip 80160 BLAKE2B 7c19bcfee1136e9afaa54bb36a296e48c276e21517eead613313409f3ff85f4a961c1dca7926d3c4fd51feb0f537a85de905294d2a310276bb8177f27f3776c3 SHA512 a8fa21d2f84f8c6f28250e9ec7d678ae160963eaa0a373f345fe67804925b2647239a6117ad6f253f458f34ec9f62bc21e8f2071fc9dfe76dbd2a7ded1e1a0e0
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
@@ -1160,10 +1181,9 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.1-0.20190704183835-4cd0c284b15f.mod 106 BLAK
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.1-0.20190704183835-4cd0c284b15f.zip 21792 BLAKE2B 082463bc51b3020b4480b8fbbba799e6c3aa6311718702e0ab37c6fcab9a4cd094a27b16f02b63239f3ae4e47c654290dc6891abebbe096d4c68116156edcd85 SHA512 4a1b155130c566e2d7d6b19519c3916abeebfd53da0a45fb5e83f29acf432150679228963218cccf70329f777b4e6b1ca4a0d32a4757f5409e6b92636e4ddfd9
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
-EBUILD filebeat-6.8.12.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd2521334c42434e30ac0a29b7647930c9265dacafb517d681746e919db3ad67fa07f142bef3a7e302e826137957af5131 SHA512 7a8a32a3e8f1677c496df38b22764340f7ded39500a6dcd9f9c28fd82eaae0131e9d17ad43b4952744e9b486ad868ad779bd696af203bf1663c1d5143dbe5cf9
-EBUILD filebeat-7.3.2.ebuild 1497 BLAKE2B b130f2fa0916e4b37b238fb87ef6ab80f4d94bee5df788873537b9031a718c4300d3582d7fd070421f06a8b034b853d3b4a89353d572006160a660cf8882ee8d SHA512 900e496e61e21a2ccbc5eb657161c03021f0b95315d688ace1d4ef1c00b73d20f015aec5e562d7d3d72a139daf3b342501d2515d782635bbd64fd2752641a422
-EBUILD filebeat-7.6.1.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd2521334c42434e30ac0a29b7647930c9265dacafb517d681746e919db3ad67fa07f142bef3a7e302e826137957af5131 SHA512 7a8a32a3e8f1677c496df38b22764340f7ded39500a6dcd9f9c28fd82eaae0131e9d17ad43b4952744e9b486ad868ad779bd696af203bf1663c1d5143dbe5cf9
-EBUILD filebeat-7.7.0.ebuild 52042 BLAKE2B 6ee271360e4e29757e9b45afa6a8db0cef2c8ee9bcb75392408d9ccfd4f8c9bd4d4db7a8d897d3b794d1136235f4db7e8dd72de5f3da4ed1b93f25d6d64ad23f SHA512 2ef37ed61908f01ed4aab65f55befb7ddc2f4224ea703ea8f6d3e3991ae4fe5c473b363b73cf1935c4f597811479a1d486da0ed2858664add8a94dd8a4f8f1a6
+EBUILD filebeat-6.8.13.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd2521334c42434e30ac0a29b7647930c9265dacafb517d681746e919db3ad67fa07f142bef3a7e302e826137957af5131 SHA512 7a8a32a3e8f1677c496df38b22764340f7ded39500a6dcd9f9c28fd82eaae0131e9d17ad43b4952744e9b486ad868ad779bd696af203bf1663c1d5143dbe5cf9
+EBUILD filebeat-7.10.0.ebuild 56909 BLAKE2B 595e7681a5f2ad3e93220e36a93e67b567d512af7c33e8a725a5aec9f6c1c91d031ba8a758a0a8ece56a8405df881a8542c18547ede3cb2ab090dfaf003767e7 SHA512 b170ab66646578d55e94ad2832ca10b4cf52c2e449b4a552c254292be2ac94d4ec5aa35c8146d1c8c8249cedd3ba6dde083803146a5057ed25a14d2a3761d0d4
 EBUILD filebeat-7.8.1.ebuild 55905 BLAKE2B b50831f6da888a6204319de0eb870f9fc1cf08256b21f05b245e939388e40c0caaedd1ccb3ad2287b872a28c014b02c3637bf49b78ff0f995d512f29ce72560a SHA512 2ac4bffb8ce43de76dae510c1f49f395136a9318199200f09087ea93598e52073c506cc61b7c9803c641c8c6665e146906581548f87a10828956115085b74194
-EBUILD filebeat-7.9.1.ebuild 55141 BLAKE2B ceb892d7c4b4760490a59fb15a943d9e94c479ce13bc84f2faf87a5f983a8335b1477a0ffd3a5ff281bc26c3bb6311c03252933c7db92aad262b74d4738ae17a SHA512 6a79de1b6d1013eb4d2bfe8482bc370ce17a81f39c561f913bb3694e5dd50a752bea1775405b9cbdc7ae4d07f7c68579354134fcfaa0b1dc10f4006bed27a116
+EBUILD filebeat-7.9.2.ebuild 55141 BLAKE2B ceb892d7c4b4760490a59fb15a943d9e94c479ce13bc84f2faf87a5f983a8335b1477a0ffd3a5ff281bc26c3bb6311c03252933c7db92aad262b74d4738ae17a SHA512 6a79de1b6d1013eb4d2bfe8482bc370ce17a81f39c561f913bb3694e5dd50a752bea1775405b9cbdc7ae4d07f7c68579354134fcfaa0b1dc10f4006bed27a116
+EBUILD filebeat-7.9.3.ebuild 55141 BLAKE2B ceb892d7c4b4760490a59fb15a943d9e94c479ce13bc84f2faf87a5f983a8335b1477a0ffd3a5ff281bc26c3bb6311c03252933c7db92aad262b74d4738ae17a SHA512 6a79de1b6d1013eb4d2bfe8482bc370ce17a81f39c561f913bb3694e5dd50a752bea1775405b9cbdc7ae4d07f7c68579354134fcfaa0b1dc10f4006bed27a116
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-6.8.12.ebuild b/app-admin/filebeat/filebeat-6.8.13.ebuild
index 8836479b860d..8836479b860d 100644
--- a/app-admin/filebeat/filebeat-6.8.12.ebuild
+++ b/app-admin/filebeat/filebeat-6.8.13.ebuild
diff --git a/app-admin/filebeat/filebeat-7.10.0.ebuild b/app-admin/filebeat/filebeat-7.10.0.ebuild
new file mode 100644
index 000000000000..bdee18e6831c
--- /dev/null
+++ b/app-admin/filebeat/filebeat-7.10.0.ebuild
@@ -0,0 +1,1069 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f"
+	"4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f/go.mod"
+	"4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b"
+	"4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b/go.mod"
+	"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/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.51.0"
+	"cloud.google.com/go v0.51.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/datastore v1.0.0"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee"
+	"code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee/go.mod"
+	"code.cloudfoundry.org/go-loggregator v7.4.0+incompatible"
+	"code.cloudfoundry.org/go-loggregator v7.4.0+incompatible/go.mod"
+	"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f"
+	"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod"
+	"code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a"
+	"code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0"
+	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod"
+	"github.com/Azure/azure-event-hubs-go/v3 v3.1.2"
+	"github.com/Azure/azure-event-hubs-go/v3 v3.1.2/go.mod"
+	"github.com/Azure/azure-pipeline-go v0.1.8/go.mod"
+	"github.com/Azure/azure-pipeline-go v0.1.9/go.mod"
+	"github.com/Azure/azure-pipeline-go v0.2.1"
+	"github.com/Azure/azure-pipeline-go v0.2.1/go.mod"
+	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod"
+	"github.com/Azure/azure-storage-blob-go v0.6.0/go.mod"
+	"github.com/Azure/azure-storage-blob-go v0.8.0"
+	"github.com/Azure/azure-storage-blob-go v0.8.0/go.mod"
+	"github.com/Azure/go-amqp v0.12.6"
+	"github.com/Azure/go-amqp v0.12.6/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.4"
+	"github.com/Azure/go-autorest/autorest v0.9.4/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
+	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0"
+	"github.com/Azure/go-autorest/autorest/date v0.2.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/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0"
+	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.2.0"
+	"github.com/Azure/go-autorest/autorest/validation 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/DataDog/zstd v1.4.1"
+	"github.com/DataDog/zstd v1.4.1/go.mod"
+	"github.com/Masterminds/semver v1.4.2"
+	"github.com/Masterminds/semver v1.4.2/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.7"
+	"github.com/Microsoft/hcsshim v0.8.7/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6"
+	"github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6/go.mod"
+	"github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d"
+	"github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d/go.mod"
+	"github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41"
+	"github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41/go.mod"
+	"github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc"
+	"github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc/go.mod"
+	"github.com/akavel/rsrc v0.8.0"
+	"github.com/akavel/rsrc v0.8.0/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20"
+	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod"
+	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43"
+	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43/go.mod"
+	"github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod"
+	"github.com/antlr/antlr4 v0.0.0-20200820155224-be881fa6b91d"
+	"github.com/antlr/antlr4 v0.0.0-20200820155224-be881fa6b91d/go.mod"
+	"github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77"
+	"github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5"
+	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod"
+	"github.com/aws/aws-lambda-go v1.6.0"
+	"github.com/aws/aws-lambda-go v1.6.0/go.mod"
+	"github.com/aws/aws-sdk-go-v2 v0.9.0"
+	"github.com/aws/aws-sdk-go-v2 v0.9.0/go.mod"
+	"github.com/awslabs/goformation/v3 v3.1.0/go.mod"
+	"github.com/awslabs/goformation/v4 v4.1.0"
+	"github.com/awslabs/goformation/v4 v4.1.0/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bi-zone/go-winio v0.4.15"
+	"github.com/bi-zone/go-winio v0.4.15/go.mod"
+	"github.com/blakerouse/service v1.1.1-0.20200924160513-057808572ffa"
+	"github.com/blakerouse/service v1.1.1-0.20200924160513-057808572ffa/go.mod"
+	"github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2"
+	"github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod"
+	"github.com/blang/semver v3.1.0+incompatible/go.mod"
+	"github.com/bradleyfalzon/ghinstallation v1.1.0"
+	"github.com/bradleyfalzon/ghinstallation v1.1.0/go.mod"
+	"github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible"
+	"github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible/go.mod"
+	"github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e"
+	"github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e/go.mod"
+	"github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e"
+	"github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f"
+	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f/go.mod"
+	"github.com/cloudfoundry/noaa v2.1.0+incompatible"
+	"github.com/cloudfoundry/noaa v2.1.0+incompatible/go.mod"
+	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4"
+	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
+	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+	"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.3"
+	"github.com/containerd/containerd v1.3.3/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/fifo v0.0.0-20190816180239-bda0ff6ed73c"
+	"github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c/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-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/go-systemd/v22 v22.0.0"
+	"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea"
+	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cucumber/godog v0.8.1"
+	"github.com/cucumber/godog v0.8.1/go.mod"
+	"github.com/cyphar/filepath-securejoin v0.2.2"
+	"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892"
+	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/go.mod"
+	"github.com/devigned/tab v0.1.1/go.mod"
+	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2"
+	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2/go.mod"
+	"github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b"
+	"github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b/go.mod"
+	"github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de"
+	"github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible/go.mod"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
+	"github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1"
+	"github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf"
+	"github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf/go.mod"
+	"github.com/docker/distribution v2.7.1+incompatible"
+	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
+	"github.com/docker/engine v0.0.0-20191113042239-ea84732a7725"
+	"github.com/docker/engine v0.0.0-20191113042239-ea84732a7725/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.1"
+	"github.com/docker/go-metrics v0.0.1/go.mod"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6"
+	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dustin/go-humanize v1.0.0"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/eapache/go-resiliency v1.2.0"
+	"github.com/eapache/go-resiliency v1.2.0/go.mod"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+	"github.com/eapache/queue v1.1.0"
+	"github.com/eapache/queue v1.1.0/go.mod"
+	"github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2"
+	"github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod"
+	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3"
+	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod"
+	"github.com/elastic/ecs v1.6.0"
+	"github.com/elastic/ecs v1.6.0/go.mod"
+	"github.com/elastic/elastic-agent-client/v7 v7.0.0-20200709172729-d43b7ad5833a"
+	"github.com/elastic/elastic-agent-client/v7 v7.0.0-20200709172729-d43b7ad5833a/go.mod"
+	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270"
+	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270/go.mod"
+	"github.com/elastic/go-concert v0.0.4"
+	"github.com/elastic/go-concert v0.0.4/go.mod"
+	"github.com/elastic/go-libaudit/v2 v2.0.2"
+	"github.com/elastic/go-libaudit/v2 v2.0.2/go.mod"
+	"github.com/elastic/go-licenser v0.3.1"
+	"github.com/elastic/go-licenser v0.3.1/go.mod"
+	"github.com/elastic/go-lookslike v0.3.0"
+	"github.com/elastic/go-lookslike v0.3.0/go.mod"
+	"github.com/elastic/go-lumber v0.1.0"
+	"github.com/elastic/go-lumber v0.1.0/go.mod"
+	"github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595"
+	"github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595/go.mod"
+	"github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f"
+	"github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f/go.mod"
+	"github.com/elastic/go-seccomp-bpf v1.1.0"
+	"github.com/elastic/go-seccomp-bpf v1.1.0/go.mod"
+	"github.com/elastic/go-structform v0.0.7"
+	"github.com/elastic/go-structform v0.0.7/go.mod"
+	"github.com/elastic/go-sysinfo v1.1.1/go.mod"
+	"github.com/elastic/go-sysinfo v1.3.0"
+	"github.com/elastic/go-sysinfo v1.3.0/go.mod"
+	"github.com/elastic/go-txfile v0.0.7"
+	"github.com/elastic/go-txfile v0.0.7/go.mod"
+	"github.com/elastic/go-ucfg v0.7.0/go.mod"
+	"github.com/elastic/go-ucfg v0.8.3"
+	"github.com/elastic/go-ucfg v0.8.3/go.mod"
+	"github.com/elastic/go-windows v1.0.0/go.mod"
+	"github.com/elastic/go-windows v1.0.1"
+	"github.com/elastic/go-windows v1.0.1/go.mod"
+	"github.com/elastic/gosigar v0.10.6-0.20200715000138-f115143bb233"
+	"github.com/elastic/gosigar v0.10.6-0.20200715000138-f115143bb233/go.mod"
+	"github.com/elastic/sarama v1.19.1-0.20200629123429-0e7b69039eec"
+	"github.com/elastic/sarama v1.19.1-0.20200629123429-0e7b69039eec/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/fatih/color v1.5.0"
+	"github.com/fatih/color v1.5.0/go.mod"
+	"github.com/fortytw2/leaktest v1.3.0"
+	"github.com/fortytw2/leaktest v1.3.0/go.mod"
+	"github.com/frankban/quicktest v1.7.2"
+	"github.com/frankban/quicktest v1.7.2/go.mod"
+	"github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24"
+	"github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab"
+	"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
+	"github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647"
+	"github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible"
+	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.1"
+	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+	"github.com/go-stack/stack v1.8.0"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobuffalo/here v0.6.0"
+	"github.com/gobuffalo/here v0.6.0/go.mod"
+	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be"
+	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
+	"github.com/godbus/dbus/v5 v5.0.3"
+	"github.com/godbus/dbus/v5 v5.0.3/go.mod"
+	"github.com/godror/godror v0.10.4"
+	"github.com/godror/godror v0.10.4/go.mod"
+	"github.com/gofrs/flock v0.7.1/go.mod"
+	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b"
+	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b/go.mod"
+	"github.com/gofrs/uuid v3.3.0+incompatible"
+	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/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/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.2"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9"
+	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-github/v28 v28.1.1"
+	"github.com/google/go-github/v28 v28.1.1/go.mod"
+	"github.com/google/go-github/v29 v29.0.2"
+	"github.com/google/go-github/v29 v29.0.2/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.1.0"
+	"github.com/google/gofuzz v1.1.0/go.mod"
+	"github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0"
+	"github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/google/subcommands v1.0.1/go.mod"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f"
+	"github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/googleapis/gnostic v0.1.0/go.mod"
+	"github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985"
+	"github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a"
+	"github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a/go.mod"
+	"github.com/gorilla/mux v1.7.2"
+	"github.com/gorilla/mux v1.7.2/go.mod"
+	"github.com/gorilla/websocket v1.4.1"
+	"github.com/gorilla/websocket v1.4.1/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.13.0"
+	"github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod"
+	"github.com/h2non/filetype v1.0.12"
+	"github.com/h2non/filetype v1.0.12/go.mod"
+	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.9.2"
+	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.0"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.6.6"
+	"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.2"
+	"github.com/hashicorp/go-uuid v1.0.2/go.mod"
+	"github.com/hashicorp/go-version v1.0.0"
+	"github.com/hashicorp/go-version v1.0.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d"
+	"github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01"
+	"github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01/go.mod"
+	"github.com/haya14busa/go-checkstyle v0.0.0-20170303121022-5e9d09f51fa1/go.mod"
+	"github.com/haya14busa/secretbox v0.0.0-20180525171038-07c7ecf409f5/go.mod"
+	"github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95"
+	"github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.6"
+	"github.com/imdario/mergo v0.3.6/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jcmturner/gofork v1.0.0"
+	"github.com/jcmturner/gofork v1.0.0/go.mod"
+	"github.com/jessevdk/go-flags v1.4.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5"
+	"github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod"
+	"github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901"
+	"github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod"
+	"github.com/joho/godotenv v1.3.0"
+	"github.com/joho/godotenv v1.3.0/go.mod"
+	"github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca"
+	"github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca/go.mod"
+	"github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod"
+	"github.com/jpillora/backoff v1.0.0"
+	"github.com/jpillora/backoff v1.0.0/go.mod"
+	"github.com/json-iterator/go 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/jstemmer/go-junit-report v0.9.1"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/justinas/nosurf v1.1.0/go.mod"
+	"github.com/karrick/godirwalk v1.15.6"
+	"github.com/karrick/godirwalk v1.15.6/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.9.8"
+	"github.com/klauspost/compress v1.9.8/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01"
+	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01/go.mod"
+	"github.com/magefile/mage v1.9.0/go.mod"
+	"github.com/magefile/mage v1.10.0"
+	"github.com/magefile/mage v1.10.0/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/mailru/easyjson v0.7.1"
+	"github.com/mailru/easyjson v0.7.1/go.mod"
+	"github.com/markbates/pkger v0.17.0"
+	"github.com/markbates/pkger v0.17.0/go.mod"
+	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
+	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
+	"github.com/mattn/go-colorable v0.0.8"
+	"github.com/mattn/go-colorable v0.0.8/go.mod"
+	"github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
+	"github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe"
+	"github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe/go.mod"
+	"github.com/mattn/go-isatty v0.0.2"
+	"github.com/mattn/go-isatty v0.0.2/go.mod"
+	"github.com/mattn/go-shellwords v1.0.7"
+	"github.com/mattn/go-shellwords v1.0.7/go.mod"
+	"github.com/mattn/go-sqlite3 v1.9.0"
+	"github.com/mattn/go-sqlite3 v1.9.0/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
+	"github.com/miekg/dns v1.1.15"
+	"github.com/miekg/dns v1.1.15/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/gox v1.0.1"
+	"github.com/mitchellh/gox v1.0.1/go.mod"
+	"github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51"
+	"github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51/go.mod"
+	"github.com/mitchellh/iochan v1.0.0"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/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-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/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/oklog/ulid v1.3.1"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.5.0/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.11.0"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.2.0/go.mod"
+	"github.com/onsi/gomega v1.4.3/go.mod"
+	"github.com/onsi/gomega v1.7.0"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483"
+	"github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6"
+	"github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod"
+	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+	"github.com/opencontainers/runc v1.0.0-rc9"
+	"github.com/opencontainers/runc v1.0.0-rc9/go.mod"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+	"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+	"github.com/otiai10/copy v1.2.0"
+	"github.com/otiai10/copy v1.2.0/go.mod"
+	"github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod"
+	"github.com/otiai10/curr v1.0.0"
+	"github.com/otiai10/curr v1.0.0/go.mod"
+	"github.com/otiai10/mint v1.3.0/go.mod"
+	"github.com/otiai10/mint v1.3.1"
+	"github.com/otiai10/mint v1.3.1/go.mod"
+	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
+	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pierrec/lz4 v2.4.1+incompatible"
+	"github.com/pierrec/lz4 v2.4.1+incompatible/go.mod"
+	"github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0"
+	"github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20170505043639-c605e284fe17/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/poy/eachers v0.0.0-20181020210610-23942921fe77"
+	"github.com/poy/eachers v0.0.0-20181020210610-23942921fe77/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.1.0/go.mod"
+	"github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc"
+	"github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc/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.4.1/go.mod"
+	"github.com/prometheus/common v0.6.0/go.mod"
+	"github.com/prometheus/common v0.7.0"
+	"github.com/prometheus/common v0.7.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.3/go.mod"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/prometheus/procfs v0.0.11"
+	"github.com/prometheus/procfs v0.0.11/go.mod"
+	"github.com/prometheus/prometheus v2.5.0+incompatible"
+	"github.com/prometheus/prometheus v2.5.0+incompatible/go.mod"
+	"github.com/rakyll/statik v0.1.6/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod"
+	"github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd"
+	"github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd/go.mod"
+	"github.com/reviewdog/reviewdog v0.9.17"
+	"github.com/reviewdog/reviewdog v0.9.17/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e"
+	"github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e/go.mod"
+	"github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54"
+	"github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54/go.mod"
+	"github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b"
+	"github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod"
+	"github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod"
+	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522"
+	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522/go.mod"
+	"github.com/santhosh-tekuri/jsonschema v1.2.4"
+	"github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod"
+	"github.com/satori/go.uuid v1.2.0"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/sergi/go-diff v1.1.0"
+	"github.com/sergi/go-diff v1.1.0/go.mod"
+	"github.com/shirou/gopsutil v2.19.11+incompatible"
+	"github.com/shirou/gopsutil v2.19.11+incompatible/go.mod"
+	"github.com/shopspring/decimal v1.2.0"
+	"github.com/shopspring/decimal v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"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"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0"
+	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+	"github.com/spf13/cobra v0.0.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.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"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v1.1.5-0.20170601210322-f6abca593680/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.0/go.mod"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b"
+	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b/go.mod"
+	"github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786"
+	"github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786/go.mod"
+	"github.com/ugorji/go v1.1.8"
+	"github.com/ugorji/go v1.1.8/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/ugorji/go/codec v1.1.8"
+	"github.com/ugorji/go/codec v1.1.8/go.mod"
+	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797"
+	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797/go.mod"
+	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e"
+	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e/go.mod"
+	"github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230"
+	"github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230/go.mod"
+	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4"
+	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4/go.mod"
+	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec"
+	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec/go.mod"
+	"github.com/vbatts/tar-split v0.11.1/go.mod"
+	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41"
+	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41/go.mod"
+	"github.com/xanzy/go-gitlab v0.22.3"
+	"github.com/xanzy/go-gitlab v0.22.3/go.mod"
+	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
+	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
+	"github.com/xdg/stringprep v1.0.0"
+	"github.com/xdg/stringprep v1.0.0/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/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 v0.0.0-20181112162635-ac52e6811b56"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7"
+	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7/go.mod"
+	"go.elastic.co/apm v1.7.2/go.mod"
+	"go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b"
+	"go.elastic.co/apm v1.8.1-0.20200909061013-2aef45b9cf4b/go.mod"
+	"go.elastic.co/apm/module/apmelasticsearch v1.7.2"
+	"go.elastic.co/apm/module/apmelasticsearch v1.7.2/go.mod"
+	"go.elastic.co/apm/module/apmhttp v1.7.2"
+	"go.elastic.co/apm/module/apmhttp v1.7.2/go.mod"
+	"go.elastic.co/ecszap v0.3.0"
+	"go.elastic.co/ecszap v0.3.0/go.mod"
+	"go.elastic.co/fastjson v1.0.0/go.mod"
+	"go.elastic.co/fastjson v1.1.0"
+	"go.elastic.co/fastjson v1.1.0/go.mod"
+	"go.elastic.co/go-licence-detector v0.4.0"
+	"go.elastic.co/go-licence-detector v0.4.0/go.mod"
+	"go.etcd.io/bbolt v1.3.4"
+	"go.etcd.io/bbolt v1.3.4/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.uber.org/atomic v1.5.0"
+	"go.uber.org/atomic v1.5.0/go.mod"
+	"go.uber.org/goleak v1.0.0"
+	"go.uber.org/goleak v1.0.0/go.mod"
+	"go.uber.org/multierr v1.3.0"
+	"go.uber.org/multierr v1.3.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.14.0"
+	"go.uber.org/zap v1.14.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-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-20190325154230-a5d413f7728c/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
+	"golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37"
+	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/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/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.3.0"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod"
+	"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/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/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod"
+	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
+	"golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod"
+	"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
+	"golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod"
+	"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae"
+	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0"
+	"golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.15.0"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.2.0/go.mod"
+	"google.golang.org/appengine v1.3.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5"
+	"google.golang.org/appengine v1.6.5/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-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/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.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.24.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.29.1"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.23.0"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/jcmturner/aescts.v1 v1.0.1"
+	"gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
+	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
+	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
+	"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
+	"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
+	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0"
+	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod"
+	"gopkg.in/jcmturner/rpc.v1 v1.1.0"
+	"gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
+	"gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528"
+	"gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528/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.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gotest.tools v2.2.0+incompatible"
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"howett.net/plist v0.0.0-20181124034731-591f970eefbb"
+	"howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod"
+	"k8s.io/api v0.18.3"
+	"k8s.io/api v0.18.3/go.mod"
+	"k8s.io/apimachinery v0.18.3"
+	"k8s.io/apimachinery v0.18.3/go.mod"
+	"k8s.io/client-go v0.18.3"
+	"k8s.io/client-go v0.18.3/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.0/go.mod"
+	"k8s.io/klog v1.0.0"
+	"k8s.io/klog v1.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6"
+	"k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod"
+	"k8s.io/kubernetes v1.13.0/go.mod"
+	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
+	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.2.0"
+	"sigs.k8s.io/yaml v1.2.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+S="${WORKDIR}/beats-${PV}"
+
+src_prepare() {
+	default
+
+	# avoid Elastic license
+	rm -r x-pack || die
+
+	# use ${PV} instead of git commit id
+	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
+}
+
+src_compile() {
+	emake -C "${S}/filebeat"
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/filebeat/filebeat-7.3.2.ebuild b/app-admin/filebeat/filebeat-7.3.2.ebuild
deleted file mode 100644
index bd5e95bbdc95..000000000000
--- a/app-admin/filebeat/filebeat-7.3.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.12.9"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}
diff --git a/app-admin/filebeat/filebeat-7.6.1.ebuild b/app-admin/filebeat/filebeat-7.6.1.ebuild
deleted file mode 100644
index 8836479b860d..000000000000
--- a/app-admin/filebeat/filebeat-7.6.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.12.9"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}
diff --git a/app-admin/filebeat/filebeat-7.9.1.ebuild b/app-admin/filebeat/filebeat-7.9.2.ebuild
index d3785a811d9b..d3785a811d9b 100644
--- a/app-admin/filebeat/filebeat-7.9.1.ebuild
+++ b/app-admin/filebeat/filebeat-7.9.2.ebuild
diff --git a/app-admin/filebeat/filebeat-7.7.0.ebuild b/app-admin/filebeat/filebeat-7.9.3.ebuild
index c965a5c47dab..d3785a811d9b 100644
--- a/app-admin/filebeat/filebeat-7.7.0.ebuild
+++ b/app-admin/filebeat/filebeat-7.9.3.ebuild
@@ -54,10 +54,7 @@ EGO_SUM=(
 	"github.com/Azure/go-amqp v0.12.6/go.mod"
 	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
 	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
-	"github.com/Azure/go-autorest v12.2.0+incompatible"
-	"github.com/Azure/go-autorest v12.2.0+incompatible/go.mod"
 	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.3"
 	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
 	"github.com/Azure/go-autorest/autorest v0.9.4"
 	"github.com/Azure/go-autorest/autorest v0.9.4/go.mod"
@@ -98,6 +95,7 @@ EGO_SUM=(
 	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
 	"github.com/Shopify/toxiproxy v2.1.4+incompatible"
 	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+	"github.com/Sirupsen/logrus v1.0.1-0.20170608221441-85b1699d5056/go.mod"
 	"github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6"
 	"github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6/go.mod"
 	"github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d"
@@ -109,14 +107,22 @@ EGO_SUM=(
 	"github.com/akavel/rsrc v0.8.0"
 	"github.com/akavel/rsrc v0.8.0/go.mod"
 	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
 	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
 	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4"
 	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
 	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20"
 	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod"
 	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43"
 	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43/go.mod"
 	"github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod"
+	"github.com/antlr/antlr4 v0.0.0-20200326173327-a4c66dc863bb"
+	"github.com/antlr/antlr4 v0.0.0-20200326173327-a4c66dc863bb/go.mod"
+	"github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77"
+	"github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
 	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5"
 	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod"
 	"github.com/aws/aws-lambda-go v1.6.0"
@@ -150,8 +156,11 @@ EGO_SUM=(
 	"github.com/client9/misspell v0.3.4/go.mod"
 	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f"
 	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f/go.mod"
+	"github.com/cloudfoundry/noaa v2.1.0+incompatible"
+	"github.com/cloudfoundry/noaa v2.1.0+incompatible/go.mod"
 	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4"
 	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
 	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
 	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
 	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
@@ -168,26 +177,26 @@ EGO_SUM=(
 	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
 	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
 	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
-	"github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98"
-	"github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98/go.mod"
 	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
 	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
 	"github.com/coreos/go-systemd/v22 v22.0.0"
 	"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
 	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea"
 	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
-	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
+	"github.com/cucumber/godog v0.8.1"
+	"github.com/cucumber/godog v0.8.1/go.mod"
+	"github.com/cyphar/filepath-securejoin v0.2.2"
+	"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
 	"github.com/davecgh/go-spew v1.1.0/go.mod"
 	"github.com/davecgh/go-spew v1.1.1"
 	"github.com/davecgh/go-spew v1.1.1/go.mod"
 	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892"
 	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod"
-	"github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f"
-	"github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f/go.mod"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/go.mod"
 	"github.com/devigned/tab v0.1.1/go.mod"
 	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2"
 	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2/go.mod"
-	"github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
 	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
 	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible"
 	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible/go.mod"
@@ -207,13 +216,14 @@ EGO_SUM=(
 	"github.com/docker/go-metrics v0.0.1/go.mod"
 	"github.com/docker/go-units v0.4.0"
 	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
 	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
 	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6"
 	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6/go.mod"
 	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4"
 	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-	"github.com/eapache/go-resiliency v1.1.0"
-	"github.com/eapache/go-resiliency v1.1.0/go.mod"
+	"github.com/eapache/go-resiliency v1.2.0"
+	"github.com/eapache/go-resiliency v1.2.0/go.mod"
 	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21"
 	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
 	"github.com/eapache/queue v1.1.0"
@@ -224,12 +234,16 @@ EGO_SUM=(
 	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod"
 	"github.com/elastic/ecs v1.5.0"
 	"github.com/elastic/ecs v1.5.0/go.mod"
+	"github.com/elastic/elastic-agent-client/v7 v7.0.0-20200709172729-d43b7ad5833a"
+	"github.com/elastic/elastic-agent-client/v7 v7.0.0-20200709172729-d43b7ad5833a/go.mod"
 	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270"
 	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270/go.mod"
-	"github.com/elastic/go-libaudit v0.4.0"
-	"github.com/elastic/go-libaudit v0.4.0/go.mod"
-	"github.com/elastic/go-licenser v0.2.1"
-	"github.com/elastic/go-licenser v0.2.1/go.mod"
+	"github.com/elastic/go-concert v0.0.3"
+	"github.com/elastic/go-concert v0.0.3/go.mod"
+	"github.com/elastic/go-libaudit/v2 v2.0.0-20200515221334-92371bef3fb8"
+	"github.com/elastic/go-libaudit/v2 v2.0.0-20200515221334-92371bef3fb8/go.mod"
+	"github.com/elastic/go-licenser v0.3.1"
+	"github.com/elastic/go-licenser v0.3.1/go.mod"
 	"github.com/elastic/go-lookslike v0.3.0"
 	"github.com/elastic/go-lookslike v0.3.0/go.mod"
 	"github.com/elastic/go-lumber v0.1.0"
@@ -240,35 +254,38 @@ EGO_SUM=(
 	"github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f/go.mod"
 	"github.com/elastic/go-seccomp-bpf v1.1.0"
 	"github.com/elastic/go-seccomp-bpf v1.1.0/go.mod"
-	"github.com/elastic/go-structform v0.0.6"
-	"github.com/elastic/go-structform v0.0.6/go.mod"
+	"github.com/elastic/go-structform v0.0.7"
+	"github.com/elastic/go-structform v0.0.7/go.mod"
+	"github.com/elastic/go-sysinfo v1.1.1/go.mod"
 	"github.com/elastic/go-sysinfo v1.3.0"
 	"github.com/elastic/go-sysinfo v1.3.0/go.mod"
 	"github.com/elastic/go-txfile v0.0.7"
 	"github.com/elastic/go-txfile v0.0.7/go.mod"
-	"github.com/elastic/go-ucfg v0.7.0"
 	"github.com/elastic/go-ucfg v0.7.0/go.mod"
 	"github.com/elastic/go-ucfg v0.8.3"
 	"github.com/elastic/go-ucfg v0.8.3/go.mod"
 	"github.com/elastic/go-windows v1.0.0/go.mod"
 	"github.com/elastic/go-windows v1.0.1"
 	"github.com/elastic/go-windows v1.0.1/go.mod"
-	"github.com/elastic/gosigar v0.10.5"
-	"github.com/elastic/gosigar v0.10.5/go.mod"
-	"github.com/elastic/sarama v0.0.0-20191122160421-355d120d0970"
-	"github.com/elastic/sarama v0.0.0-20191122160421-355d120d0970/go.mod"
-	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/elastic/gosigar v0.10.6-0.20200715000138-f115143bb233"
+	"github.com/elastic/gosigar v0.10.6-0.20200715000138-f115143bb233/go.mod"
+	"github.com/elastic/sarama v1.19.1-0.20200629123429-0e7b69039eec"
+	"github.com/elastic/sarama v1.19.1-0.20200629123429-0e7b69039eec/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
 	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
 	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
 	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible"
 	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
 	"github.com/fatih/color v1.5.0"
 	"github.com/fatih/color v1.5.0/go.mod"
 	"github.com/fortytw2/leaktest v1.3.0"
 	"github.com/fortytw2/leaktest v1.3.0/go.mod"
-	"github.com/frankban/quicktest v1.4.1"
-	"github.com/frankban/quicktest v1.4.1/go.mod"
+	"github.com/frankban/quicktest v1.7.2"
+	"github.com/frankban/quicktest v1.7.2/go.mod"
 	"github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24"
 	"github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24/go.mod"
 	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
@@ -296,6 +313,8 @@ EGO_SUM=(
 	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
 	"github.com/go-stack/stack v1.8.0"
 	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobuffalo/here v0.6.0"
+	"github.com/gobuffalo/here v0.6.0/go.mod"
 	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be"
 	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be/go.mod"
 	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e"
@@ -307,17 +326,16 @@ EGO_SUM=(
 	"github.com/gofrs/flock v0.7.1/go.mod"
 	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b"
 	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b/go.mod"
-	"github.com/gofrs/uuid v3.2.0+incompatible"
-	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
-	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
-	"github.com/gogo/protobuf v1.0.0/go.mod"
+	"github.com/gofrs/uuid v3.3.0+incompatible"
+	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
 	"github.com/gogo/protobuf v1.1.1/go.mod"
 	"github.com/gogo/protobuf v1.2.1/go.mod"
 	"github.com/gogo/protobuf v1.3.1"
 	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
 	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
 	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903"
 	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
 	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
 	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
@@ -330,16 +348,22 @@ EGO_SUM=(
 	"github.com/golang/protobuf v1.3.1/go.mod"
 	"github.com/golang/protobuf v1.3.2"
 	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.2"
+	"github.com/golang/protobuf v1.4.2/go.mod"
 	"github.com/golang/snappy v0.0.1"
 	"github.com/golang/snappy v0.0.1/go.mod"
-	"github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod"
 	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
 	"github.com/google/btree v1.0.0/go.mod"
 	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9"
 	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9/go.mod"
 	"github.com/google/go-cmp v0.2.0/go.mod"
 	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1"
 	"github.com/google/go-cmp v0.3.1/go.mod"
 	"github.com/google/go-cmp v0.4.0"
 	"github.com/google/go-cmp v0.4.0/go.mod"
@@ -349,10 +373,12 @@ EGO_SUM=(
 	"github.com/google/go-github/v29 v29.0.2/go.mod"
 	"github.com/google/go-querystring v1.0.0"
 	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
 	"github.com/google/gofuzz v1.0.0"
 	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.1.0"
+	"github.com/google/gofuzz v1.1.0/go.mod"
+	"github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0"
+	"github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0/go.mod"
 	"github.com/google/martian v2.1.0+incompatible"
 	"github.com/google/martian v2.1.0+incompatible/go.mod"
 	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
@@ -360,18 +386,17 @@ EGO_SUM=(
 	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
 	"github.com/google/renameio v0.1.0/go.mod"
 	"github.com/google/subcommands v1.0.1/go.mod"
-	"github.com/google/uuid v1.0.0/go.mod"
 	"github.com/google/uuid v1.1.1/go.mod"
 	"github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f"
 	"github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f/go.mod"
 	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
 	"github.com/googleapis/gax-go/v2 v2.0.5"
 	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod"
 	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/googleapis/gnostic v0.1.0/go.mod"
 	"github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985"
 	"github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985/go.mod"
-	"github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
 	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
 	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
 	"github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a"
@@ -380,13 +405,26 @@ EGO_SUM=(
 	"github.com/gorilla/mux v1.7.2/go.mod"
 	"github.com/gorilla/websocket v1.4.1"
 	"github.com/gorilla/websocket v1.4.1/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
 	"github.com/grpc-ecosystem/grpc-gateway v1.13.0"
 	"github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod"
+	"github.com/h2non/filetype v1.0.12"
+	"github.com/h2non/filetype v1.0.12/go.mod"
+	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce"
 	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.9.2"
+	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
 	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.0"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.6.6"
+	"github.com/hashicorp/go-retryablehttp v0.6.6/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.2"
+	"github.com/hashicorp/go-uuid v1.0.2/go.mod"
 	"github.com/hashicorp/go-version v1.0.0"
 	"github.com/hashicorp/go-version v1.0.0/go.mod"
 	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
@@ -397,6 +435,8 @@ EGO_SUM=(
 	"github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01/go.mod"
 	"github.com/haya14busa/go-checkstyle v0.0.0-20170303121022-5e9d09f51fa1/go.mod"
 	"github.com/haya14busa/secretbox v0.0.0-20180525171038-07c7ecf409f5/go.mod"
+	"github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95"
+	"github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95/go.mod"
 	"github.com/hpcloud/tail v1.0.0"
 	"github.com/hpcloud/tail v1.0.0/go.mod"
 	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
@@ -405,7 +445,6 @@ EGO_SUM=(
 	"github.com/imdario/mergo v0.3.6/go.mod"
 	"github.com/inconshreveable/mousetrap v1.0.0"
 	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod"
 	"github.com/jcmturner/gofork v1.0.0"
 	"github.com/jcmturner/gofork v1.0.0/go.mod"
 	"github.com/jessevdk/go-flags v1.4.0/go.mod"
@@ -422,12 +461,11 @@ EGO_SUM=(
 	"github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod"
 	"github.com/jpillora/backoff v1.0.0"
 	"github.com/jpillora/backoff v1.0.0/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
 	"github.com/json-iterator/go v1.1.6/go.mod"
 	"github.com/json-iterator/go v1.1.7"
 	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024"
+	"github.com/json-iterator/go v1.1.8"
+	"github.com/json-iterator/go v1.1.8/go.mod"
 	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
 	"github.com/jstemmer/go-junit-report v0.9.1"
 	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
@@ -435,12 +473,13 @@ EGO_SUM=(
 	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
 	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
 	"github.com/justinas/nosurf v1.1.0/go.mod"
+	"github.com/karrick/godirwalk v1.15.6"
+	"github.com/karrick/godirwalk v1.15.6/go.mod"
 	"github.com/kisielk/errcheck v1.1.0/go.mod"
 	"github.com/kisielk/errcheck v1.2.0/go.mod"
 	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/klauspost/compress v1.8.2/go.mod"
-	"github.com/klauspost/compress v1.9.3-0.20191122130757-c099ac9f21dd"
-	"github.com/klauspost/compress v1.9.3-0.20191122130757-c099ac9f21dd/go.mod"
+	"github.com/klauspost/compress v1.9.8"
+	"github.com/klauspost/compress v1.9.8/go.mod"
 	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
 	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
 	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
@@ -448,6 +487,8 @@ EGO_SUM=(
 	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
 	"github.com/kr/pretty v0.1.0"
 	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0"
+	"github.com/kr/pretty v0.2.0/go.mod"
 	"github.com/kr/pty v1.1.1/go.mod"
 	"github.com/kr/text v0.1.0"
 	"github.com/kr/text v0.1.0/go.mod"
@@ -458,10 +499,13 @@ EGO_SUM=(
 	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01/go.mod"
 	"github.com/magefile/mage v1.9.0"
 	"github.com/magefile/mage v1.9.0/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a"
+	"github.com/magefile/mage v1.10.0"
+	"github.com/magefile/mage v1.10.0/go.mod"
 	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
 	"github.com/mailru/easyjson v0.7.1"
 	"github.com/mailru/easyjson v0.7.1/go.mod"
+	"github.com/markbates/pkger v0.17.0"
+	"github.com/markbates/pkger v0.17.0/go.mod"
 	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
 	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
 	"github.com/mattn/go-colorable v0.0.8"
@@ -493,7 +537,6 @@ EGO_SUM=(
 	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
 	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
 	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
 	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
 	"github.com/modern-go/reflect2 v1.0.1"
 	"github.com/modern-go/reflect2 v1.0.1/go.mod"
@@ -502,17 +545,18 @@ EGO_SUM=(
 	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
 	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
 	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/oklog/ulid v1.3.1"
+	"github.com/oklog/ulid v1.3.1/go.mod"
 	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
 	"github.com/onsi/ginkgo v1.5.0/go.mod"
 	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.8.0/go.mod"
 	"github.com/onsi/ginkgo v1.10.1"
 	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.11.0"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
 	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
 	"github.com/onsi/gomega v1.2.0/go.mod"
 	"github.com/onsi/gomega v1.4.3/go.mod"
-	"github.com/onsi/gomega v1.5.0/go.mod"
 	"github.com/onsi/gomega v1.7.0"
 	"github.com/onsi/gomega v1.7.0/go.mod"
 	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
@@ -531,19 +575,20 @@ EGO_SUM=(
 	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
 	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
 	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-	"github.com/pierrec/lz4 v2.2.6+incompatible"
-	"github.com/pierrec/lz4 v2.2.6+incompatible/go.mod"
+	"github.com/pierrec/lz4 v2.4.1+incompatible"
+	"github.com/pierrec/lz4 v2.4.1+incompatible/go.mod"
 	"github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338"
 	"github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338/go.mod"
 	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20170505043639-c605e284fe17/go.mod"
 	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
-	"github.com/pkg/errors v0.8.1"
 	"github.com/pkg/errors v0.8.1/go.mod"
 	"github.com/pkg/errors v0.9.1"
 	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
 	"github.com/pmezard/go-difflib v1.0.0"
 	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/poy/eachers v0.0.0-20181020210610-23942921fe77"
+	"github.com/poy/eachers v0.0.0-20181020210610-23942921fe77/go.mod"
 	"github.com/prometheus/client_golang v0.9.1/go.mod"
 	"github.com/prometheus/client_golang v1.0.0/go.mod"
 	"github.com/prometheus/client_golang v1.1.0/go.mod"
@@ -562,13 +607,13 @@ EGO_SUM=(
 	"github.com/prometheus/procfs v0.0.2/go.mod"
 	"github.com/prometheus/procfs v0.0.3/go.mod"
 	"github.com/prometheus/procfs v0.0.5/go.mod"
-	"github.com/prometheus/procfs v0.0.9-0.20191208103036-42f6e295b56f"
-	"github.com/prometheus/procfs v0.0.9-0.20191208103036-42f6e295b56f/go.mod"
+	"github.com/prometheus/procfs v0.0.11"
+	"github.com/prometheus/procfs v0.0.11/go.mod"
 	"github.com/prometheus/prometheus v2.5.0+incompatible"
 	"github.com/prometheus/prometheus v2.5.0+incompatible/go.mod"
 	"github.com/rakyll/statik v0.1.6/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a"
-	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563"
+	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod"
 	"github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd"
 	"github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd/go.mod"
 	"github.com/reviewdog/reviewdog v0.9.17"
@@ -584,8 +629,17 @@ EGO_SUM=(
 	"github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod"
 	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522"
 	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522/go.mod"
+	"github.com/santhosh-tekuri/jsonschema v1.2.4"
+	"github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod"
+	"github.com/satori/go.uuid v1.2.0"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/sergi/go-diff v1.1.0"
+	"github.com/sergi/go-diff v1.1.0/go.mod"
 	"github.com/shirou/gopsutil v2.19.11+incompatible"
 	"github.com/shirou/gopsutil v2.19.11+incompatible/go.mod"
+	"github.com/shopspring/decimal v1.2.0"
+	"github.com/shopspring/decimal v1.2.0/go.mod"
 	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
 	"github.com/sirupsen/logrus v1.2.0/go.mod"
 	"github.com/sirupsen/logrus v1.4.1/go.mod"
@@ -601,31 +655,38 @@ EGO_SUM=(
 	"github.com/spf13/cobra v0.0.3/go.mod"
 	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
 	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
-	"github.com/spf13/pflag v1.0.1/go.mod"
-	"github.com/spf13/pflag v1.0.3"
-	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
 	"github.com/stretchr/objx v0.1.0/go.mod"
 	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/objx v0.1.2-0.20180702103455-b8b73a35e983"
-	"github.com/stretchr/objx v0.1.2-0.20180702103455-b8b73a35e983/go.mod"
-	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
+	"github.com/stretchr/objx v0.2.0"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v1.1.5-0.20170601210322-f6abca593680/go.mod"
 	"github.com/stretchr/testify v1.2.2/go.mod"
 	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0"
 	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.5.0"
+	"github.com/stretchr/testify v1.5.0/go.mod"
+	"github.com/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
 	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
 	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b"
 	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b/go.mod"
-	"github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a"
-	"github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a/go.mod"
+	"github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786"
+	"github.com/tsg/gopacket v0.0.0-20200626092518-2ab8e397a786/go.mod"
 	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797"
+	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797/go.mod"
 	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e"
 	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e/go.mod"
+	"github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230"
 	"github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230/go.mod"
-	"github.com/urso/magetools v0.0.0-20200106130147-61080ed7b22b"
-	"github.com/urso/magetools v0.0.0-20200106130147-61080ed7b22b/go.mod"
 	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4"
 	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4/go.mod"
+	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec"
+	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec/go.mod"
 	"github.com/vbatts/tar-split v0.11.1/go.mod"
 	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41"
 	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41/go.mod"
@@ -645,29 +706,47 @@ EGO_SUM=(
 	"github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod"
 	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7"
 	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7/go.mod"
+	"go.elastic.co/apm v1.7.2"
+	"go.elastic.co/apm v1.7.2/go.mod"
+	"go.elastic.co/apm/module/apmelasticsearch v1.7.2"
+	"go.elastic.co/apm/module/apmelasticsearch v1.7.2/go.mod"
+	"go.elastic.co/apm/module/apmhttp v1.7.2"
+	"go.elastic.co/apm/module/apmhttp v1.7.2/go.mod"
+	"go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193"
+	"go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193/go.mod"
+	"go.elastic.co/fastjson v1.0.0"
+	"go.elastic.co/fastjson v1.0.0/go.mod"
+	"go.elastic.co/go-licence-detector v0.4.0"
+	"go.elastic.co/go-licence-detector v0.4.0/go.mod"
+	"go.etcd.io/bbolt v1.3.4"
+	"go.etcd.io/bbolt v1.3.4/go.mod"
 	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0"
 	"go.opencensus.io v0.22.0/go.mod"
 	"go.opencensus.io v0.22.2"
 	"go.opencensus.io v0.22.2/go.mod"
-	"go.uber.org/atomic v1.3.1"
-	"go.uber.org/atomic v1.3.1/go.mod"
-	"go.uber.org/multierr v1.1.1-0.20170829224307-fb7d312c2c04"
-	"go.uber.org/multierr v1.1.1-0.20170829224307-fb7d312c2c04/go.mod"
-	"go.uber.org/zap v1.7.1"
-	"go.uber.org/zap v1.7.1/go.mod"
+	"go.uber.org/atomic v1.5.0"
+	"go.uber.org/atomic v1.5.0/go.mod"
+	"go.uber.org/goleak v1.0.0"
+	"go.uber.org/goleak v1.0.0/go.mod"
+	"go.uber.org/multierr v1.3.0"
+	"go.uber.org/multierr v1.3.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.14.0"
+	"go.uber.org/zap v1.14.0/go.mod"
 	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
 	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
+	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
 	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
 	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
 	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
 	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413"
 	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-	"golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72"
 	"golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37"
+	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
 	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
 	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
 	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
@@ -682,13 +761,17 @@ EGO_SUM=(
 	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
 	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
 	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
 	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f"
 	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
 	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
 	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
 	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
 	"golang.org/x/mod v0.1.0/go.mod"
-	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.3.0"
+	"golang.org/x/mod v0.3.0/go.mod"
 	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
 	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
 	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
@@ -697,7 +780,6 @@ EGO_SUM=(
 	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
 	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
 	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
 	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
 	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
 	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
@@ -707,7 +789,9 @@ EGO_SUM=(
 	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
 	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
 	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
 	"golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
 	"golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod"
 	"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
 	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
@@ -718,8 +802,6 @@ EGO_SUM=(
 	"golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod"
 	"golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod"
 	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
 	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
 	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
 	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
@@ -731,65 +813,51 @@ EGO_SUM=(
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
 	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
 	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sys v0.0.0-20170608164803-0b25a408a500/go.mod"
 	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
 	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
 	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
 	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
 	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
 	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
 	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
 	"golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod"
 	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
 	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
 	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
 	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
 	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
+	"golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/go.mod"
 	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
 	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
 	"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
 	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
 	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
 	"golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod"
 	"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
 	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
 	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
 	"golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c"
 	"golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
 	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
 	"golang.org/x/text v0.3.0/go.mod"
 	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
 	"golang.org/x/text v0.3.2"
 	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
 	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
 	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
 	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
 	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
-	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
-	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
-	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
-	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4"
-	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0"
+	"golang.org/x/tools v0.0.0-20200602230032-c00d67ef29d0/go.mod"
 	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
 	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
 	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
@@ -824,30 +892,41 @@ EGO_SUM=(
 	"google.golang.org/grpc v1.21.1/go.mod"
 	"google.golang.org/grpc v1.23.0/go.mod"
 	"google.golang.org/grpc v1.24.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
 	"google.golang.org/grpc v1.26.0/go.mod"
 	"google.golang.org/grpc v1.27.1"
 	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.29.1"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.23.0"
+	"google.golang.org/protobuf v1.23.0/go.mod"
 	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
 	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
 	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
 	"gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
 	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
 	"gopkg.in/errgo.v2 v2.1.0/go.mod"
 	"gopkg.in/fsnotify.v1 v1.4.7"
 	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
 	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-	"gopkg.in/inf.v0 v0.9.0"
-	"gopkg.in/inf.v0 v0.9.0/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
 	"gopkg.in/jcmturner/aescts.v1 v1.0.1"
 	"gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
 	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
 	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
 	"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
 	"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.3.0"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.3.0/go.mod"
+	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0"
+	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod"
 	"gopkg.in/jcmturner/rpc.v1 v1.1.0"
 	"gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
 	"gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528"
@@ -855,13 +934,16 @@ EGO_SUM=(
 	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
 	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
 	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2"
 	"gopkg.in/yaml.v2 v2.2.2/go.mod"
 	"gopkg.in/yaml.v2 v2.2.3/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4"
 	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.7"
 	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0"
+	"gopkg.in/yaml.v2 v2.3.0/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
 	"gotest.tools v2.2.0+incompatible"
 	"gotest.tools v2.2.0+incompatible/go.mod"
 	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
@@ -872,31 +954,29 @@ EGO_SUM=(
 	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
 	"howett.net/plist v0.0.0-20181124034731-591f970eefbb"
 	"howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod"
-	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
-	"k8s.io/api v0.0.0-20190722141453-b90922c02518"
-	"k8s.io/api v0.0.0-20190722141453-b90922c02518/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8"
-	"k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8/go.mod"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
+	"k8s.io/api v0.18.3"
+	"k8s.io/api v0.18.3/go.mod"
+	"k8s.io/apimachinery v0.18.3"
+	"k8s.io/apimachinery v0.18.3/go.mod"
+	"k8s.io/client-go v0.18.3"
+	"k8s.io/client-go v0.18.3/go.mod"
 	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
 	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
 	"k8s.io/klog v0.3.0/go.mod"
-	"k8s.io/klog v0.3.1/go.mod"
-	"k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09"
-	"k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058/go.mod"
+	"k8s.io/klog v1.0.0"
+	"k8s.io/klog v1.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6"
+	"k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod"
 	"k8s.io/kubernetes v1.13.0/go.mod"
-	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
-	"k8s.io/utils v0.0.0-20190712204705-3dccf664f023"
-	"k8s.io/utils v0.0.0-20190712204705-3dccf664f023/go.mod"
+	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
+	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
 	"rsc.io/binaryregexp v0.2.0/go.mod"
-	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
 	"sigs.k8s.io/yaml v1.1.0/go.mod"
-	"sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f"
-	"sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f/go.mod"
+	"sigs.k8s.io/yaml v1.2.0"
+	"sigs.k8s.io/yaml v1.2.0/go.mod"
 )
 
 go-module_set_globals
diff --git a/app-admin/gixy/Manifest b/app-admin/gixy/Manifest
index d61ccaeaafbb..9401bb1bc04b 100644
--- a/app-admin/gixy/Manifest
+++ b/app-admin/gixy/Manifest
@@ -1,3 +1,3 @@
 DIST gixy-0.1.20.tar.gz 710691 BLAKE2B 09043925d950a9a35de4df91ef3c2f9e5ca4458227320555a109e50d0838fb10ae22d086cdfc39c0d76bcd051c1a7e1d5e291354cc457cff398be8d164cbfde6 SHA512 d666e758c2746c201a11b67b4b99cee1bd3406085eb1c0aa9ae520b72d3a1273e09e3475226a6e54fbfbcefe65b3be0fc877e66cbaa81f384f757767852bc08e
-EBUILD gixy-0.1.20.ebuild 990 BLAKE2B 5076dbd4ac98e26606d55657f9bb49c17c233d9b45345342bc8535d18e147a0a8c9703bef484aea3619438443177dbe8f10552845b761b063e1941f674c62d51 SHA512 da75000303949b8dc28ff459f4a89f9f73a4a96b15fe3dd954f5e1dbc16d39e52145d35e6eb48d845659c70ebf81d8253831fbcb0c6de9250fffdfc662dc8907
-MISC metadata.xml 248 BLAKE2B f2e59d4d05a017ebeeed31b36a72a279974f8fa64886873d23671f1fa91bcf3152acf9652624f2b1a2f5d9524bb24ec7dab734ce43e8cb6475ccfef67af40697 SHA512 c0d402a47544d8f31d1fc9f23fef5d84bf000f2a9a8a07c8b23899306818152aa71844f1d9310e0c32a354189be1f53ae8c89cde90464176ab9b861e62084822
+EBUILD gixy-0.1.20.ebuild 980 BLAKE2B 14aff0a139a851836f8271af89722375304c0a31170fc872a207d1df4d5a0d436feebe68b6af01cf35f811339c8738e1b67eb241206b50c8da3f8937e40852e7 SHA512 0712abf5905c28a4b5aaf3ba89570d7b880633b24af826fa8b122cdea862a3ea6a46d4abb70dfff9d1e1727262bbb632bfb62ba37b3728873219075b79b3a0fa
+MISC metadata.xml 444 BLAKE2B fb47b1ee17f4a0df89ce6505d6461407aa887b8f03142d3ba678e012eb3e391dab5df809f0ef3d5a8bbb6383ad346a545f89a41d8bac5efe8ed7c13910ba305d SHA512 eae18c9de90e1e4f50b4055962469484c9df3b3da127805222151cb10bca1953549a70e3611a464a97aed0bccc5f22945607d3a645a830c953e8fd1cb2f32915
diff --git a/app-admin/gixy/gixy-0.1.20.ebuild b/app-admin/gixy/gixy-0.1.20.ebuild
index cc686c970a01..59d45eafa340 100644
--- a/app-admin/gixy/gixy-0.1.20.ebuild
+++ b/app-admin/gixy/gixy-0.1.20.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
 DESCRIPTION="Nginx configuration static analyzer"
 HOMEPAGE="https://github.com/yandex/gixy"
 # Use GitHub source insted PyPi to get tarball with tests
-SRC_URI="https://github.com/yandex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/yandex/gixy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
@@ -24,7 +25,7 @@ RDEPEND=">=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
 	>=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		${RDEPEND}
diff --git a/app-admin/gixy/metadata.xml b/app-admin/gixy/metadata.xml
index ae702b778adb..cb7f678034e9 100644
--- a/app-admin/gixy/metadata.xml
+++ b/app-admin/gixy/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">yandex/gixy</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">yandex/gixy</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 2c51a3946b04..71bd136662f2 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,7 +1,10 @@
 AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5
 DIST glance-20.0.0.tar.gz 1961501 BLAKE2B 81ecbf1dccb1b7cbc33481825cd1de65556e9950ea8fca71565380df27c5ca967b001f811bede483b8b0e05ddf01dcb39ef4474d29d10e530d8b3cd0218dae32 SHA512 37497c5705040f3f667e0352fb620731feac91a729d77e5049feea6f4fef73cc58ef84bc6c12e84773c5013aa24a06fff8d9a56f079c716357c84823fa5690b1
 DIST glance-20.0.1.tar.gz 1959665 BLAKE2B 8d51a9e46361b2b4a1fd1642e14a6fb8bd2bc4eade58279b90eb676f49d7ac649897faf837852cdac318eab87b6daa396008c5f98c2f5aac2e2425e975014eec SHA512 19ee3313f465ff0c010389d72050ec72a4ec4dcaa075b1b0db2c7e591a9f598d9a552cc7f89b1c2bed6b2b83883783ae306fff429177d7d728c7b0a70481233d
+DIST glance-21.0.0.tar.gz 2032938 BLAKE2B 9da6353d95768c8f241e8ea42def5a7a457d88ddf92c4f881649f196a57ef232ddabcf4f6816256fbd1fcb21b6e7b46811c3bf7c9b9c587fc902d008cbaf525d SHA512 83d49f96a82de0093fe3991f5138febc403964f5af1012de6e63395b82a368e08b2b7d142a889244c4261d1d019336e69050e9149d40b88e1c175f7a561e4f5d
 EBUILD glance-20.0.0.ebuild 5110 BLAKE2B 1aaadeba8df184d7a23f179ac02064f06e28b022a9d3b96d68ffb5b11c065ae74d7050d5c4b731eb3bab47f8948be3be7d9ef7436bd2fa82fb38bf5fcc42829c SHA512 d105101112c923934a086ec5a3d0131b6dcca769d4cba336aa6aea1bf6ac81aa6653934aea1bd1b0218ae50208770dc1538005bd283ccdf60f2d188cbbbd96ab
-EBUILD glance-20.0.1.ebuild 5110 BLAKE2B 1aaadeba8df184d7a23f179ac02064f06e28b022a9d3b96d68ffb5b11c065ae74d7050d5c4b731eb3bab47f8948be3be7d9ef7436bd2fa82fb38bf5fcc42829c SHA512 d105101112c923934a086ec5a3d0131b6dcca769d4cba336aa6aea1bf6ac81aa6653934aea1bd1b0218ae50208770dc1538005bd283ccdf60f2d188cbbbd96ab
+EBUILD glance-20.0.1.ebuild 4944 BLAKE2B ad7aa3abddb652e1303ca822cc9a381c100c9dc88437c2d382643998fa93763c66bff0406b6af945e8557758923a672de21d3ce33c5781c878e8a3f43bd87864 SHA512 2170628269f01c90bd55ea59eba866faf1b1ab88a88ae8808e72f67813e9121a0a82610db1e29ae4f6a32575fd4daf8090c79b0228a7f3f72894118a8d4b2ade
 EBUILD glance-2020.1.9999.ebuild 5112 BLAKE2B f78acaba51de4c25635bc563cb287f28ed10d96a5726f2b749359c60c2a34232e5a1f1854c6593e0a48599e6255c2a718c55b790fef2f1789203fa60ed8a1cb3 SHA512 ddeac42331eed87d97247dd4714d3720930673706d5fd268fd0a38e4c581423e32ffebc460b2b6b2a3aa34fdb63dbdcf8ffce14daa5394c84aae16204dd721c3
+EBUILD glance-2020.2.9999.ebuild 4980 BLAKE2B ab065aba9f5bd64913a68ca382533f2224416fc60aaa8469299c502a8fbe0b762168a9a1d17d068c6138ec088c596e2a706b2bea77cc12f4a7167aab029c1f4b SHA512 8f0515e8fb4ec8991e3503ad599f6e4a8065f33c29e0e87c7f96ce793757f7290c021b1f2d4c421958eb416042bbd00acc85dfd3dec8561d9edfe4f2390c4632
+EBUILD glance-21.0.0.ebuild 4980 BLAKE2B ab065aba9f5bd64913a68ca382533f2224416fc60aaa8469299c502a8fbe0b762168a9a1d17d068c6138ec088c596e2a706b2bea77cc12f4a7167aab029c1f4b SHA512 8f0515e8fb4ec8991e3503ad599f6e4a8065f33c29e0e87c7f96ce793757f7290c021b1f2d4c421958eb416042bbd00acc85dfd3dec8561d9edfe4f2390c4632
 MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/glance-20.0.1.ebuild b/app-admin/glance/glance-20.0.1.ebuild
index 0440a12d652e..66d8600f144c 100644
--- a/app-admin/glance/glance-20.0.1.ebuild
+++ b/app-admin/glance/glance-20.0.1.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc mysql postgres +sqlite +swift"
+IUSE="mysql postgres +sqlite +swift"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
@@ -115,12 +115,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
-	if [ ! -z ${EGIT_BRANCH+x} ]; then
-		use doc && "${PYTHON}" setup.py build_sphinx
-	fi
-}
-
 python_install_all() {
 	distutils-r1_python_install_all
 
@@ -137,7 +131,6 @@ python_install_all() {
 	insopts -m 0640 -o glance -g glance
 	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
 
-	use doc && local HTML_DOCS=( doc/build/html/. )
 	distutils-r1_python_install_all
 	rm -r "${ED}"/usr/etc
 }
diff --git a/app-admin/glance/glance-2020.2.9999.ebuild b/app-admin/glance/glance-2020.2.9999.ebuild
new file mode 100644
index 000000000000..dd4a939849af
--- /dev/null
+++ b/app-admin/glance/glance-2020.2.9999.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/glance.git"
+	EGIT_BRANCH="stable/victoria"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+DEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.6.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/eventlet-0.25.1[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	!~dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-2.4.1[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
+	acct-user/glance
+	acct-group/glance
+"
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/glance.initd" glance-api
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+	distutils-r1_python_install_all
+	rm -r "${ED}"/usr/etc
+}
diff --git a/app-admin/glance/glance-21.0.0.ebuild b/app-admin/glance/glance-21.0.0.ebuild
new file mode 100644
index 000000000000..dd4a939849af
--- /dev/null
+++ b/app-admin/glance/glance-21.0.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/glance.git"
+	EGIT_BRANCH="stable/victoria"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+DEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.6.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/eventlet-0.25.1[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	!~dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-2.4.1[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-2.3.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
+	acct-user/glance
+	acct-group/glance
+"
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/glance.initd" glance-api
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+	distutils-r1_python_install_all
+	rm -r "${ED}"/usr/etc
+}
diff --git a/app-admin/gnome-abrt/Manifest b/app-admin/gnome-abrt/Manifest
index 8e44d22bfe92..ca7424b64dcd 100644
--- a/app-admin/gnome-abrt/Manifest
+++ b/app-admin/gnome-abrt/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-abrt-1.2.7.tar.gz 339961 BLAKE2B cdacc079c4661c364f13af3102e2231adbeaf4226ba937436f5ce3ae109f28b87c9424c6dfbc016b912599205386f92c32b036ca31adbea79b9a54d7f3a27c4a SHA512 57446b1c1c312f3a47ea3dd2a40ac1d4ec5392df3181eac73086675b65d45cad9a01fba5252d073970878ef97d7d272508bc5b86a56779543ffdc8d083fb5413
 DIST gnome-abrt-1.3.6.tar.gz 112255 BLAKE2B d0e87ef5543e84c246f9e98aac8f92984af9e8220357359ffa76f91e00bb35ccb9b60a00c8e0b00d3464ecfc9ddffaeb61fb15b57480066d957a2af44b49c3be SHA512 7bd15c9956d2e4bafce7d1ef73e930f679119fe8ccebda8a27171a5b3b1dfa90255c572e3a0c70606fe389d50079870399b89f61f683896d4ca6380a7d3f7cc2
-EBUILD gnome-abrt-1.2.7.ebuild 1301 BLAKE2B d98bb45e945c4945b831f5007e6a9b69aa4a03d8bee8e53b38dfef2bed5d95fd5b3c67c317f9fe4a78e71b806e58975b689325a710fcbfcdaf36f9ea95e1874b SHA512 3a0d1333af2f9e2adc55c0f1acba8bf856433c7f97e44dbc304588cba4151473faa10f322f98d29c474fafd5c47b50f7adaebfc89220183c10f6354fa3134703
 EBUILD gnome-abrt-1.3.6.ebuild 1158 BLAKE2B cad8b6ffd29eee5d8383512f316688cb6890e5d74c91413c7d44c076704e2422e5e7564e518f13577b48eb62a5b32c9f01df1c3fc3fc59e1d09ed729c6507aed SHA512 d035095657ef1449c146e87ef7b56836f180b2a4ecd33352343858a9d4cfa56fe91cec0254edc033d79998a4c78c37adadbc5930a76605cb92ebc6b7efbe199c
 MISC metadata.xml 333 BLAKE2B 7dfc442159eac1c4501c5bfaeec34615e2e8dd63b982759f30a0835143a1d5b661cce8e85868be70115c93c26f7ed70389b9f7ad6ae88f93b081f126c42beef3 SHA512 8c2e01101d19e3cd8ade5da1921864d2103eaa2f140c0eccb398e2567254d839311ba1384e25e0bea316345943c0649aee92aabb3ec2092d1a9e0728436fadc4
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild
deleted file mode 100644
index e068f001905b..000000000000
--- a/app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild
+++ /dev/null
@@ -1,60 +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 python-r1
-
-DESCRIPTION="A utility for viewing problems that have occurred with the system"
-HOMEPAGE="https://github.com/abrt/gnome-abrt"
-SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=x11-libs/gtk+-3.10.0:3
-	>=dev-libs/libreport-2.0.20[python,${PYTHON_USEDEP}]
-	>=app-admin/abrt-2.10.10-r1
-	>=dev-python/pygobject-3.29.1:3[${PYTHON_USEDEP}]
-	x11-libs/libX11
-	>=dev-python/pyxdg-0.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17
-"
-
-src_prepare() {
-	default
-	./gen-version > gnome-abrt-version || die
-	eautoreconf
-	python_copy_sources
-}
-
-src_configure() {
-	myeconfargs=(
-		--localstatedir="${EPREFIX}/var"
-		--with-nopylint
-	)
-
-	python_foreach_impl run_in_build_dir econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index 4d5ae89c1158..5351d02186c4 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -1,12 +1,9 @@
+AUX 1.10.1-jsonapi-version.patch 1055 BLAKE2B 54e21c85fdec63299e99379bfe6f19b9e8dea0224be0d7d20d67f9f975b8d87385bed2e2f0a34e4d47983adb7ef5534d878d35478c7b359ec0608ddec060311f SHA512 175fc703113559a876ac3474ba41c3ec9ea918060aa51947f42d4817762c9b362b6645f6ca1bc098ba6ddda369828d7e89a73f3e158c06ad6480c8f1ab62a931
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST filippo.io%2Fage%2F@v%2Fv1.0.0-beta4.mod 133 BLAKE2B 4140d5578e9738f5f0edff83413628bcf7506e8844873be8427ab9203cb9f76ee5074cd9586fbdf6195927a74bf476c1ac622f2d9e65c884e77a727979bd6791 SHA512 192ccd509f32ea420df41a82089c720228423e16e4bcba0d667f73d92c246086c0a354643bb85f68435b5231f91b7c3364b2eda0a865196f0d991b0ec3c8b5b7
 DIST filippo.io%2Fage%2F@v%2Fv1.0.0-beta4.zip 50964 BLAKE2B ec82c1c2cc70f7de63f8b3c83fcaf85c5f4f07b166fecb520e48ad4ef0aab865193311b2f6af650e840c0019d5915e7f7361931fcb569ba8873f5f6daeeda353 SHA512 22f86d62c7a6325a294db906d3733d0904e769e9a837d12821f856842b1adac58882d6a2141c972bb804bb1829b97deb7f93427dd460dbb2d137714f854b6475
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
-DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
-DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.zip 42823 BLAKE2B cb9b71b7dc0372ee4fed1c9c4c51abbd6cffa907f0eb5dd156475187256e5f8d007e667324edcecb3bbe51badf51c7d46643b89f30613670506c0aa5e76833a6 SHA512 b419a038368e290028a8e10066a95044d1b4aadfc3d33d396c05482f155dec4bd04f5a2277092761fa4433f4e25263a64b31524198dbe669526871ee540070d1
-DIST github.com%2F!proton!mail%2Fgo-appdir%2F@v%2Fv1.1.0.mod 39 BLAKE2B 696da67110d64d679050be21d91a8a6ccd196a4f9990c0e29bc202391852290bbf35ce0dc86a28c01edab0288234b03774e0d1484b8083d3e8017e79aa3ca1a7 SHA512 c68be8303533a91ba5c7d7b228c26a37db09e898d5c05071620779a49007e7b7a40a2f9de6a058ef2756afc9f599367e5e1add6ab31cd0f15184e786c0551b4b
-DIST github.com%2F!proton!mail%2Fgo-appdir%2F@v%2Fv1.1.0.zip 5168 BLAKE2B 682005c2c1a14084958dd0b0046cf270fccab44b6039c7dbc9268d575442b4884ed7278d11282d21b3ef91cf3101539f5e7a3e3bb00ffb3bbd9f8d8fbbf4caa9 SHA512 1240ae1e2d19804912fd96ea170fb37bc9a67570404bf88c708b2434af9ec50f0cffbd96aeaed571a25201960b3ae7ecb0b96f9959eb03148ae99996c8c48b1f
 DIST github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.mod 36 BLAKE2B a276a7a6f741d44088769d7f398dc149179e64f54b3c37a2698f9d6d399af81d3b193e5fc6ffd34f222c9664d3f00ef26f8cab6b319c87b9c0cb327fc499a8a6 SHA512 9f41a508d98b7131e46a5cca2211372985f8bd1ea9bd2327ca46262855593b990f0d76aceae6cc92f30cfd8590d74c77bf99cff870bff88aef422aa20c700d5b
 DIST github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.zip 5309 BLAKE2B 9edc07c07aaee14eaaf052da0084d0414011f087aec821dc8d3c51144fcdb04f39eda9912b243e20f26d00ef09a43df6aadc6bcfb30f75e85d692c3eed484eca SHA512 7e655c05f5f86243fd2ddbbb23b1001b8f3134733a9fc45a3f26ecda5dacf8de0dddd5053b92fe9071b67e7b7c0bede38736540fbbc13282b9c08b5bcec00166
 DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod 35 BLAKE2B 15461787708b56993bf7904db63ae2a711c78fe67157ff2adec29bcdce2f6c29b7ef5d997ed7a0123ab24b0f3069d3833405849924037ca4da8c05032725706a SHA512 49d95d7db5b42c6948c50dcbee20a5ec6b554e78f8ee4beec2303b318d6289a32be807084806bd17ee8e680e58c2693f753614fdb6788f424c9d7496790b20ba
@@ -34,23 +31,13 @@ DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac196496
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
-DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.2.mod 48 BLAKE2B 6d45c07a9caf59fe567db0a9ee6559e1b6bf9d0cf29319b92dd2fb20de10f60e478b6c90cf9c65c3761c33007c78ecceb6e75990bc118e59ba50e91e74abce81 SHA512 fd3c622c8677770dbd7f6afcea139839603f2d5cb74e3a8413964cf61f0b673f08b510d8b70ff8c17196f14cacf4a78d91622d0d7c410810cefcd26381aea47d
-DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.2.zip 2093 BLAKE2B a9962cf11c8ddb52f5627865a8f4cd19d283ffe70b0113ebcdcbf21ae6bca97be280b3f10393148ab3c78dc6e360c9a6ebfaa52a8506efce2b0b44697800d132 SHA512 73b1bebd953c1a196e4577d703eac245c82985fd30b9b87bba568e05b156f1b1ec97c5d4c30a18aa07fa9d41c8c2c24ffbb61dabd94645fcd28193326b60aa63
 DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.3.mod 48 BLAKE2B 6d45c07a9caf59fe567db0a9ee6559e1b6bf9d0cf29319b92dd2fb20de10f60e478b6c90cf9c65c3761c33007c78ecceb6e75990bc118e59ba50e91e74abce81 SHA512 fd3c622c8677770dbd7f6afcea139839603f2d5cb74e3a8413964cf61f0b673f08b510d8b70ff8c17196f14cacf4a78d91622d0d7c410810cefcd26381aea47d
 DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.3.zip 2957 BLAKE2B a0c29f8a47edebae63c9276f9e7f6420a865eaa82c6ad57c43312b974163ceb251b293eb37e03b50cee9b26bb72764cab1d1d1b2842a60b38f6f84455eb6a7b1 SHA512 f24d07d37bc5e59ef29b687ebdd9401f5f72ea049388cc808f62555873914e79cebcc88ce48265b4ec3945c5d5529abdca56a0581106fc5fc06514ff6f00f11c
-DIST github.com%2Fdoronbehar%2Fgocui%2F@v%2Fv0.4.2.mod 176 BLAKE2B 3c435505d80ca197dbb90ae2b806b2ab89d7f29dd012d454f30a8d4e1aeacc1f7fec04d18f3e5654abf6a635659dce5b2d9e606e428556afec94b2dfc8ea26d9 SHA512 a6cef71bb9131591837ea3bb0f8e46c56cde469a2c0f062481f036c00ce49b13d60b208c6c6c1cc4ab124305b1f62c26baa0336167a40e0a56a0543843cf9600
-DIST github.com%2Fdoronbehar%2Fgocui%2F@v%2Fv0.4.2.zip 46226 BLAKE2B 99ac5c2c5c69f77df602fbf62231f935434325e14b41338842fa487b8f564c115b70d4e2f553d16eee4438c4c35c40842fc54171840433890f1d681dcff84f0f SHA512 52c76c3cd9f1f0853c239bbdf8b372923da79cf92277b811adcc41014c27614385de8d10d2fd55cbf30e23f3d8a0e0a791395ee27efe693bdaea50b27360bece
-DIST github.com%2Fdoronbehar%2Ftermbox-go%2F@v%2Fv0.0.0-20191006141301-8c9470559e05.mod 40 BLAKE2B 2f3acd29af54ff6db117efcbd44997cfeed321dd21c1e4765921b4189f3eff653c585a2d289d0bcf367241826985367a30d33ead7dda1055fb927a2740128f1a SHA512 1f6bcb6beb3bafb41a251b0ecf912e0151d79ad1bcc70ece5a79667df7165f149ba6d57b2317ae8008fde4df098fe265d2601721d12805e50806cc7b7880e7dd
-DIST github.com%2Fdoronbehar%2Ftermbox-go%2F@v%2Fv0.0.0-20191006141301-8c9470559e05.zip 47173 BLAKE2B 3fda57610df0d4910bcbbbafe474c3135a83cacbcc2153289284242c3d11348dbea7075a8c88baf4f3a1bede52e5dd16f758326a7d2932c23af0fe67d59336d9 SHA512 09ecb725872e3195dd3ccf7568daa162d34bad4ec19cd65535a360f5b3222a07b1ed223708f6efd38dc930b4a43469a09c3914b803fd0dcb131becca58ff6fe5
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
-DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
-DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
-DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.mod 250 BLAKE2B 27970513f459c49bf9bccb001157a605c14e5546d6459e3f6e2bb3851cd8fcffefd12fb2f6f918c01a06c6aede2532656d809b80b46ef4dccb838fd40bef7930 SHA512 7fdc52fea1b91ab1c81f426948f7153c0c16cfcf1f79c64a695b62f5195f25468b08c4e1b2358ab834c94efd7b9ab9a2edddf1b00ee22ea5454b46cee19302df
-DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.zip 219885 BLAKE2B 1a8e3a5a8543b871d30c9fec272a50adac9755de8945cfc0ce553e7163e942d6a1ffd22b4e2de6d8e24785d906d86ec2f18afae04d27e3065115ca5436064e85 SHA512 69c17dbdf99d75b54ef71fa2c856a72b24a50cec0a34d8b99ce3bff01d32c6f325bb1e8dd747e3d448ba73fd5af66c1cc1f6042b0b12e292441234e7ed928658
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod 39 BLAKE2B 9884f8a07f2a84a159eb17ef62e9b17398b84bdea38fc37591af050dcebc2f56b83f851046c3333e604a7f954b7628c16b267c0c94807f7a41d5d2b797db0918 SHA512 c32a84bb302c9db3f31f714484131ee3ea96fa98b224b9cbf2c5fdd15100a24094e94b55175cf1fb0b6326128c2db8950677d8f6d281b49645b0c7b51b759093
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip 93044 BLAKE2B 2c3eb15f4f2792ae60e9712392db623ab2a662e1f2e319da7014c0e94b82452ce141a5c8d7656b02dce44d01cce06a58ac4d8b5bb29ab53a8e3b6d6c65c41582 SHA512 60dd4f9e8b60d72d65c7a35bea054ece6045a32dd033908daec3acbfcef17d6f85b6050c7bff53d49032eb08097e36588911e56622b81d3fb2ed2543187c3478
 DIST github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.mod 35 BLAKE2B 8e6a890bcd1d25cab5f07d335454e2251dfe47b7eb40adb1c8479f93bc2134adaa53f7c594caa5e790c06e634ff9789ea0e438b2382baf416be76b335aeea1a9 SHA512 ab41dcf4805fae3baccc64c61ef13ea3e4dad8e92807ca77bb0a8300968b498d5f2b05a0b1aa3269d38fe37391bed80eb7de5c626b90714a8ba490ee05b67682
@@ -113,16 +100,10 @@ DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod 98 BLAKE2B 074cd6d5ef6f25ec043afc4f23272f5fad1d7bf100e75122f85c49ee93fc3c6205c72a1e5b4227ca45f3267be1b2001e743b51e54ca5f11302c2610e93630858 SHA512 f7ddb2f6ef35b65ae4a9106e31cbbbd08a7d011d3d9d5827445bf35ec0243041c3e4881a850161134d62ff822610d3aeeab2941472dc7ff0d664edabf2ec4eb9
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.zip 442733 BLAKE2B 17af8168c2253f09f1ff15c5d78359bd8449c84027b10594eb5878fbba0ed2ecb250b34809693ab75869ab02d7677f874029e85ed352295896f9658293ecf4ea SHA512 b1515c6fce781a653025c41ef164ca2a625879b2f7ba1349c470cb9afab9b92b173a89513bf601ef7dcf53e0665010a12d44311f75c9282c244d58a154af781b
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip 442291 BLAKE2B 02ee4982a588e0fd1575206340bd97663147459664a2942edf151c4aec2bd20da83984c68c76e1c505c1ef930b77f934a8210f6c0ca106a0c0c91ff63733b92d SHA512 8e275955eb9e5034c155c6e469e2a3117bee30fbe42e8ae394f496b83f473a1568847707707716dd5a3c57dd0e0a4bb4f4cc9af04940218ce24420493e923f14
 DIST github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.mod 45 BLAKE2B ca27cda838147e1d68ba10649109192dd05cb2b100910f940579b6bd89b9ecfcbd186b7f6482edee593ff773360abc8ed8ad7c35deb5106fcf498d1394fede80 SHA512 ed4b221709e662bd34be729b9a409caa16ede1b3d82300b5acc45b61e2d28cbcf2baf23d61e61112a0f66c363adc8ed7662a9ff12f9fddebbd198529c101740c
 DIST github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.zip 292019 BLAKE2B 46a3c8f8023a8d1c5f22fe1fdb4bb959f48e9b890b81664a850625e00325ca7a60892166a7ebab0887e45dc4c294084f2dc15cf50aecf66abdcbab2b5ac6ad13 SHA512 5ba20536d8534cd4e95ba441d42db3828770146ff1ec3efeb31e56ff7a75cb528eeb0100f13ba7a3ef70df136ae7b06a0e10057b94fc8194ea188e8679ecfb48
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip 13682 BLAKE2B d7065d3799d84593a9f7f7d93b8c286b7673505bb292208ba0475573667831ecf1aca5236f4703f1bd4d43e41b7cb688a9abe7502181edc9a76305e2a5842ebf SHA512 60a5dfa6c733fa6f71f2b0fb16ee153b2905f940b5eb7e95ff0d04bd3537961467426a1f6064d079fb164190d6a8b3c4bdeece2bf643057f34f7f96e9842f54f
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
@@ -131,10 +112,6 @@ DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip 7430 BLAKE2B becaf402e397202c86c156c3a5b7ee8f785290ca134d87cb36106a9496d18b1b45e97d306c6280c7186976a18307a7ef04d6ffa29a2e6cc2a3dd378fb400ff44 SHA512 1a7efd886840455b37b44b4d0c048b457eae14e509a740455db995e84c98f8fe94449e7dd11c544ff241e784ebeedf0f60c87838adca21fed08146fa3adeeecd
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 22344 BLAKE2B 9dcfe0ef5fb4f7e493f29ed3e5edc8ef2744351a4e2a5b70f5a8931b503925ed58b5f5f58e3512fe5fb5fb8d2e7bd1598037f29dac4520e7d966f60ce5f2d307 SHA512 fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
 DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod 90 BLAKE2B e375688bb7c11de48d29d17c72a3e7675fd36d4c214bc39acd6d73386b007b51c34ff050b1b6ebf251f1f1cb98ce0022246ce7280a91f14d2136ee3e226f05c4 SHA512 aa292d2eb3045fa595c28c69fa87c329e6bfe29f2e88d5424b28a5b6270a869cc8455a88a6c076cdc5e6c76e36dd7d2d820ea7a8f3995c0af6374ab5c02ec735
 DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip 106445 BLAKE2B 5aa2489ac1b0c4dd5c1c633731c7db35a0e84afcfff3d4317025d16e6c7f62e9a06ee1c56072a26ad45716f90fece953dca9b0831bc004c4081eda012d32944f SHA512 431bfd66971e8936204d8bd9b02aafa25e4300b3a3d8d78f63dc8f6e5dd0b436e1987074b5bd52e856759477f6d154625b5f1c565146fad909ce510322721b79
 DIST github.com%2Fminio%2Fminio-go%2Fv6%2F@v%2Fv6.0.57.mod 518 BLAKE2B cab9e78c6c835ffe72bb26db0b47da1b364d93c1bc450ceef0d25fc7ba39e1cc5330d6e38dc955c0237e04c781e968569697ebe81867030407b7bc6efaab5e96 SHA512 d0e4dcf05a6ef0bae5c79290669ed2bb6d5ba6d1a2f99b03fd95f966197ba013da352f35a62348f315793f77d6ae1a23e5de7c2f69f6bacef4ac516aca8dfae8
@@ -155,8 +132,6 @@ DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81
 DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
 DIST github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.mod 112 BLAKE2B 50b4b6b4d07888fd6bbcc3d88b7f4b542bf2f3c61733319c918104f9f3a8cbbd9c8c2b724751ea2ee4bb09369dee4cf22dca0cd334733826ac882f270300f944 SHA512 bf10719acba9ec2fab1e504fc2a02f542b347cdc4b891237fb9cac81f5aa72882adc25bef2a4a9d43dc33c5d2dfe8f0398c698e65ba74352a8b498b7445e3aa6
 DIST github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.zip 11581 BLAKE2B 6faf8c5d4368c6456db989791fa327e341a791b601e6a561ef3081ffababa7dd0a97190c1e96888f41b1d6af8b9231db09434adad8471737d54b25f515260e7f SHA512 3bf633884ff896d94b70815ad990806ebcb89ab69e297bb3f07b8b186697216053b886eb2029df3769910df7be6f7c99b590606b0a02e5fa46aa5e68281cefb1
-DIST github.com%2Fmuesli%2Fgoprogressbar%2F@v%2Fv0.0.0-20190807022807-e540249d2ac1.mod 112 BLAKE2B 1dc44bd5ccdd4e327130d587d3c79204209dcdd52210365bb473cc35cb765b52ae7dcd4500539f97e53516789994613d4d20528a4e8fd43c80accb7d66983ffa SHA512 2eeb6ee54be862261bbce1fef101e855631d7dfc6933c710721a4b04fe189149ddc3b19c32c2e8f5ed1e94c11514556c06d8c7661a1d3b6d0982e986947453da
-DIST github.com%2Fmuesli%2Fgoprogressbar%2F@v%2Fv0.0.0-20190807022807-e540249d2ac1.zip 9869 BLAKE2B da2716aad7472147c432a5979bc5254474a7cd4961edb5f4643c96bcf9e19d35d6e7d47b62b61ec510594a5c93cca3e5b69c6f08d2f1f8b1666cd391de074797 SHA512 29fa8b4914ed77a6bd35b8c3b786a1f3e4773cda67621bbb5b0c31658defe5f8e77eeecb5e976a94dcbc709e03cef643db036c4888b9ab50e98876b8b0b56c65
 DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.mod 38 BLAKE2B e88cae8efddc7e87d193f1dfa70990188cf6997f38aaf0d22135aaed71abd543291661bf5628d0c3d7dc90e64fa0a7ee58e65db2af21bd160c7733b5971059e2 SHA512 96389bbcfe0ff698d1638ea020d8a6311f7caffce3c9d8ab1fb6da6870dc1685313803af2f79da15ad0d5fbc33e17eb883b2631a2d81fa70dd851fb7133b43da
 DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.zip 881205 BLAKE2B 29945db060d9c8d855f4ec068e1730050de56c0c446e1fa3996c3fc8d1e6d60562f8b29835e572e1db83e761f325cc1a29b1c1aac92528e832c398ad12522c7d SHA512 9995dc61d55f1235e5e7a0a232a0b7b7f34faaf983f21a64f9fc97f455b21326a8d04c3514a3f0e6b8e10a393fea5fc31dc9b3797f41bca07016a893d2e1bd40
 DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
@@ -176,8 +151,6 @@ DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip 55374 BLAKE2B 39f93770143cb7
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.5.0.mod 301 BLAKE2B 8898fe7003c9143aa51d94430241d950aa22446ba5b7fd087844593db1c99701dcbc9cb2dde3356d22867e72c654bb3e0b30ff2d9c376cb3ef434f70e788ea97 SHA512 7c1f73f33624409363131d5765917cdc40a8666c1d462d72a7206ce4cca74c9fe61738df4f4a48265a9d89faa0b04c3aa49b0e87d8a37ac4f53310fd04913bd9
-DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20191027152451-9434209cb086.mod 34 BLAKE2B fce952a243794343a8e85170c6ab3cc518a9080ea83d12effdeac8e42af930ebf247bd2b3ad5a234be26808eaacc3e5d38b913f9a36231fd1bd585c7816c8e08 SHA512 6e445bd52c07c412bbaf8770168707b5e01d8327b305df406a8fd72feb26502bec6c8ca0199f601a1c102f06882b8dc23f53a09ed265eaffc7a2ca76cf27049c
-DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20191027152451-9434209cb086.zip 46526 BLAKE2B 5b071b1f25998c6475082ae4609b6e88a44627468ce99c8ce5260f471a722caa977e20d385fdeaf7367aca848b48dc90aae4017c243c4540c7f35b6a96334acc SHA512 c66ecc4b694cebaa36a172550348e086eb161df7625230b2b50342f39760d47d595aab202f0ad700be1c3748a8f42919c189b66496f9c9ed3dd6fcb1013b0e03
 DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.mod 43 BLAKE2B 7190cd8561b8a4ec93fe2c1512a3207a5d0d81553ad9705b5c91eac8a72ba52d69ef728c3202134787f60b29bff5b9231bba009cb1cf116b1e86bce6e051e441 SHA512 f40e45d730137deb85788b5b5f63140d6e02b5af6892a10352e14599f9eaaf6315b10c8497568f965253b995fe7fa454101db5cd4a8378f0ad3eb10bad9e51ce
 DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.zip 47370 BLAKE2B 7c9d7c015d07c664f15e50b5f84add0149ac2ef72cf4a0aacb46aa5edf15f40b3d61efc95f4bba001bf67f8042a2a29da3a740888b55fad7581738e660435bca SHA512 fcab30f5f11cadfc0e443520d4fb01c567da10048d840588c90fd1f29a9b3adbc28a53beeb0675dd14cf1da0b70553f24b44f5790f98e3f7f4a9f4efeb6782d6
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
@@ -193,8 +166,6 @@ DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
 DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod 183 BLAKE2B 43fea991eaa4bf055a796d40ee3a72557fca99711c698b3ef2feec5d175ff6cd1af486f7e3b08c6f95b6035ea5a6c9bd76478264102ce85cb0bf08f22b841957 SHA512 4630a9172936eba1e550a8f6e95847faff6c2a3687900143cb8ad593df1b1f7f793969efb94dbf42a529074f6a4049554773157c3bc4eb7179f435d0af317c90
@@ -205,11 +176,7 @@ DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20200730060457-89a2a8a1fb0b.mod
 DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20200730060457-89a2a8a1fb0b.zip 1827540 BLAKE2B 0858b3c62e1a18ce64d7612cb716c0754678a9aee956af8fb51fd654f57d532bf5a0a5f4dd28cebcbceb9ffe7ee620a6d0b1a7744f65603069c02f6224d736c6 SHA512 f1469fbdaa90a0d341bc53bf77cb928d2bc80cb41267ec453aedff7d3f56a7b7597019a420b93fc86617ee0b9be584f31f7d4d2ddd66afbf051a9031c5f13c55
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.zip 1825995 BLAKE2B 043e1f926e0ae47ededfa2ced40e95fe6c564122b2e2a64ed631f3bd4dc52c8ccf5b5bd4641d17ed996875dc1e64ca8edcb6f02dca34be178e611cee74e4ce7d SHA512 a596a5c0e3ae5fcf366d84dddc7b884fb72d6dd89dbadc79f9ac2cea397f2795ba3ea5408cfcb75f248ddb18c9774ac7f55d0e355f1be1468812565c5403fa5c
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.zip 1874180 BLAKE2B 20899757b255a90730b8f62f656f6edd1f41539f3e6b5ff1034d274b0f47ca81b862072b9a619120befd2a3260e8b7f84aeb80b51aeb126d5f2ff5f3bb843ecb SHA512 e04eeee38e8ab6ce597d4a342c71823940cc227ce5eab7c245b7035c194ac1bcd33472f1f07ffd125dd3fed59e878fb95857ff93ce90dcd49d26bcbe77d22a64
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.zip 1876304 BLAKE2B fa57b9b35fbd6fc1e9c64a15e5f3545be4affa2bf773e375dc3658b4384a501de6e480e0b268d1f2c4eaebdd8f0cda71d42e7642472b4b89106bee11e58138d0 SHA512 cbffe21e7836f45412e5c7b2d07fb820b1c2f79e4708d1a3974eab3840460231083069fff4850499f2305326c4c5097b6b16754ba7ab3c39655ccf2218bad259
@@ -223,8 +190,6 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.zip 1500505 BLAKE2B aed582fa92d06c76e5c250a9eaf7645b4147d384422e263ecff6136b660dd2af8a40cdf539b9966059e754301afed01b3fcf59d2680ed88bc438d6297a44d7b3 SHA512 7cfa0dc01fa55ff83d10087ddc6358e2e7021d1a8a27393f5778607cf3dfe0c31363676e1663ab4ee485273e580d6f92a486ea62d5944892104f13cac5080b82
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
@@ -236,19 +201,14 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.zip 1471954 BLAKE2B 0ed87e29adaaf2e15dfa803fef857f82f73f5e45864a2d52a21e94a1436fd22773b5921c229472ccdb1e715c081f4865feffe618ddbf258a1ebdac5636386b84 SHA512 bf736828279ead6fabd59a1608870ed72ea610e32effb1c65015c925d214e81712f636ae60e39636dc7820e88a4e6a728f18b3f08b517d9c5877cb08f85bfa60
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200808120158-1030fc2bf1d9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200808120158-1030fc2bf1d9.zip 1484367 BLAKE2B a512590e02d5d2282e07b9385bb15d1285d529f0ade14159e6b2ff6b0a8e7a2ab01d2acc1a3b7308e4e937162a04b25a7efbddaeb3ac2449d574a4cb7f60d75e SHA512 46daf2fbf8c5d70abc5d6f4044865999004208adfb15f7db924d603980ccac5f87dd4264628dd65087837eec6c34c57528ad5376e019545523af4260f1c3b792
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -282,7 +242,6 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.m
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed16bde9e6ecc8fc7339578c719ed0ec73ee426caa75b672ff5fcc442ea7dfed7f737900c98d5a5afc014b9e44b1b7f0f8147edb4627f3b390814c2 SHA512 29073698d91f0bd9d37cba38102b19e6223ea362f6eb331bb186670a0549391eaf856855d2978f70861e775af0a1f678a7669754862c9247edb0a682992debc7
 DIST gopass-1.10.1.tar.gz 475921 BLAKE2B 5f62c099c36b0222ba0764a0b8290522201373b80141c8f5b90c17c979269d99d756a72aa04525d31641dab247b4e5a8ae6fe4f94e3c0489d27389c0d48a7060 SHA512 9bbaefe8642cd1eea94c5b4d582835c636ad511ab4e315997f5f2b0b74d9d0f3cd430182f84ce2cc36080f14b8cbf03c71a8f4a84f6365a6cdd5e6aaac90f7fc
-DIST gopass-1.9.2.tar.gz 420384 BLAKE2B ca8190fa65a74dccdb645741dfff0b9e30572bced4f8c6438e6bd23d97ed9d567b698bcceaece52a6cbbd4a9d9ef5051b24435d3933eb08498370faf7f39f227 SHA512 90be234718c4c26ee6e92565ce609d5f075d5e574827e15ff57a6d9e71f1933add7d76aa26b39602d5a72485890bfe8e158dc89213098377899d0f721aacf1d7
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
@@ -294,8 +253,6 @@ DIST gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.zip 64742 BLAKE2B 55c7f791bb3ba2d1af24dd07
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add43b21ffa058b58fef60e8efbf973b724273cda2496ef0c9b226ad14bfea17f141f077d3bd98dfe3dbcf3c2938fd64570abd662b2 SHA512 2a89b2bce856cc11f3b71edec9e538048acf07f6aabbe27236b663b284c086c5862f086734e58727e9db8912a113fea51f72dad1a45a9e85860764f9c27b19d2
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
@@ -310,7 +267,5 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLA
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.zip 23674 BLAKE2B 86c738bd62b56b84e8029cb3a963f882a8a735dba19566bacf07dae0a146d0a66917153999995c3f0a9fb9698d874f25c6207b8a90d8e12e82cfecbef343a9bd SHA512 169f87e5c57dbcc4d1a289481faca3c3889f0fe019f797374b86e001a3f2893db3e8180be2651c7cb541d30822fe357c7401d75f15303ee8f549227c9b3ec485
-EBUILD gopass-1.10.1-r1.ebuild 14549 BLAKE2B 2f52d13800e577b810d8f190677d1922ada7cb0f2e273e494fb2424cae94dc247cbb5f2855a9c26e25346138d61306e350f7ffd9a304be343e536be8f7d6430f SHA512 22142932956f8728ac26938a0c1d572e748e1679d1bd77d555a15bb8406b05461fd5c9437e97f0e4f52a5cfeadf8046b5cd220c31ad5ccdd95e225a3874f0a68
-EBUILD gopass-1.10.1.ebuild 14950 BLAKE2B 3276ea5b66337a52f89904b9faf4b9aade174f95a5f7bbdd0dc52345b6dd4414b1401d87cac166b41a01b9dcf4e2ccc53222fe1e8c86dffe55ea09b911fa8b62 SHA512 f01fc5ebeb50bbd7674930d57d8e2c52af2385d8cf9c72f764f91b3fbbaeec4d16612ef8d92ed7e0139d5623a3fd9b3c3bf1b30a48a354c3464d39bbeaeb83b6
-EBUILD gopass-1.9.2.ebuild 9007 BLAKE2B 6b6501f85898dc075dd7738adfba2422bd3251a8634a46ad27a5ac53427c3ce06763641f449c62f6e65caa0b757928f2ad3bf09cb387a554d1f20cbf2fcfd9ce SHA512 8c7e000d010c06a5299abc73b5aa3c100a14a8ed9167e76482bb24e5002e58c3777eb05a2ffde0bf9db4eea272c5a854758f07d86028bd45265315682f848b17
+EBUILD gopass-1.10.1-r2.ebuild 14602 BLAKE2B d85309b50dd5d7253791973284d97aefd06ad606e0b222c266b92422a932f23a99f6c5fb7625143e26ea604e526d0f033e24c590944e5491c1d97578dc23cf35 SHA512 16aae706053bed868f786ad0228fc7b845105db5d9d1630afbffd292b839a3c543dde30be2b906c1fedd18574ee13489df8e2d2d90b881c0fe4b2397789e8ec5
 MISC metadata.xml 327 BLAKE2B d3ea7ba02c3484c31b58d8c8e1b1b5a064eff597c42add7bcd720d818d90ae107a9f72292fafc6c059995118d96204e8f8f2ed82856dcc0e1061c2eca81aab54 SHA512 7c7bb9cd28275bb75bb0e71da2dee86f7a32340908e59359d330b03fd07ba8569226775101a92032b06fac1ba0327ca6cb57c5ecf6b6c3c1a0319b3259bda38c
diff --git a/app-admin/gopass/files/1.10.1-jsonapi-version.patch b/app-admin/gopass/files/1.10.1-jsonapi-version.patch
new file mode 100644
index 000000000000..c62964d51c6d
--- /dev/null
+++ b/app-admin/gopass/files/1.10.1-jsonapi-version.patch
@@ -0,0 +1,35 @@
+From aedb170ff514dd2222a3437e1fc5e3fdc6353a2d Mon Sep 17 00:00:00 2001
+From: Dominik Schulz <mail@dschulz.eu>
+Date: Wed, 2 Sep 2020 19:34:22 +0200
+Subject: [PATCH] Trim version prefix in jsonapi
+
+Fixes #1563
+
+RELEASE_NOTES=[BUGFIX] Trim version prefix in jsonapi
+
+Signed-off-by: Dominik Schulz <dominik.schulz@gauner.org>
+---
+ VERSION                       | 2 +-
+ cmd/gopass-jsonapi/jsonapi.go | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/VERSION b/VERSION
+index 29833cbc..4dae2985 100644
+--- a/VERSION
++++ b/VERSION
+@@ -1 +1 @@
+-v1.10.0
++1.10.1
+diff --git a/cmd/gopass-jsonapi/jsonapi.go b/cmd/gopass-jsonapi/jsonapi.go
+index b702a851..c4d9d21c 100644
+--- a/cmd/gopass-jsonapi/jsonapi.go
++++ b/cmd/gopass-jsonapi/jsonapi.go
+@@ -32,7 +32,7 @@ type jsonapiCLI struct {
+ func (s *jsonapiCLI) listen(c *cli.Context) error {
+ 	ctx := ctxutil.WithGlobalFlags(c)
+ 
+-	version, err := semver.Parse(c.App.Version)
++	version, err := semver.Parse(strings.TrimPrefix(c.App.Version, "v"))
+ 	if err != nil {
+ 		version = semver.Version{}
+ 	}
diff --git a/app-admin/gopass/gopass-1.10.1-r1.ebuild b/app-admin/gopass/gopass-1.10.1-r2.ebuild
index eeefb13349ba..7d75af30eb68 100644
--- a/app-admin/gopass/gopass-1.10.1-r1.ebuild
+++ b/app-admin/gopass/gopass-1.10.1-r2.ebuild
@@ -284,7 +284,7 @@ SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND=">=dev-lang/go-1.11"
 RDEPEND="
@@ -292,6 +292,8 @@ RDEPEND="
 	>=app-crypt/gnupg-2
 "
 
+PATCHES=( "${FILESDIR}/${PV}-jsonapi-version.patch" )
+
 src_install() {
 	emake install DESTDIR="${ED}/usr"
 	einstalldocs
diff --git a/app-admin/gopass/gopass-1.10.1.ebuild b/app-admin/gopass/gopass-1.10.1.ebuild
deleted file mode 100644
index 934fd1f58cad..000000000000
--- a/app-admin/gopass/gopass-1.10.1.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module bash-completion-r1
-
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"filippo.io/age v1.0.0-beta4"
-	"filippo.io/age v1.0.0-beta4/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/alecthomas/binary v0.0.0-20190922233330-fb1b1d9c299c"
-	"github.com/alecthomas/binary v0.0.0-20190922233330-fb1b1d9c299c/go.mod"
-	"github.com/atotto/clipboard v0.1.2"
-	"github.com/atotto/clipboard v0.1.2/go.mod"
-	"github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1"
-	"github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1/go.mod"
-	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b"
-	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b/go.mod"
-	"github.com/cenkalti/backoff v2.2.1+incompatible"
-	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/chzyer/logex v1.1.10"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/client9/misspell v0.3.4"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/creack/pty v1.1.9/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dominikschulz/github-releases v0.0.3"
-	"github.com/dominikschulz/github-releases v0.0.3/go.mod"
-	"github.com/dustin/go-humanize v1.0.0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/fatih/color v1.9.0"
-	"github.com/fatih/color v1.9.0/go.mod"
-	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722"
-	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722/go.mod"
-	"github.com/gokyle/twofactor v1.0.1"
-	"github.com/gokyle/twofactor v1.0.1/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-	"github.com/golang/protobuf v1.4.0"
-	"github.com/golang/protobuf v1.4.0/go.mod"
-	"github.com/golang/protobuf v1.4.1/go.mod"
-	"github.com/golang/protobuf v1.4.2"
-	"github.com/golang/protobuf v1.4.2/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-cmp v0.4.0"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/go-cmp v0.5.0"
-	"github.com/google/go-cmp v0.5.0/go.mod"
-	"github.com/google/go-cmp v0.5.1"
-	"github.com/google/go-cmp v0.5.1/go.mod"
-	"github.com/google/go-github v17.0.0+incompatible"
-	"github.com/google/go-github v17.0.0+incompatible/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-multierror v1.1.0"
-	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.4"
-	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad"
-	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad/go.mod"
-	"github.com/json-iterator/go v1.1.9"
-	"github.com/json-iterator/go v1.1.9/go.mod"
-	"github.com/json-iterator/go v1.1.10"
-	"github.com/json-iterator/go v1.1.10/go.mod"
-	"github.com/jtolds/gls v4.20.0+incompatible"
-	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
-	"github.com/klauspost/cpuid v1.2.3"
-	"github.com/klauspost/cpuid v1.2.3/go.mod"
-	"github.com/klauspost/cpuid v1.3.1"
-	"github.com/klauspost/cpuid v1.3.1/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kr/text v0.2.0"
-	"github.com/kr/text v0.2.0/go.mod"
-	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3"
-	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3/go.mod"
-	"github.com/mattn/go-colorable v0.1.4"
-	"github.com/mattn/go-colorable v0.1.4/go.mod"
-	"github.com/mattn/go-colorable v0.1.7"
-	"github.com/mattn/go-colorable v0.1.7/go.mod"
-	"github.com/mattn/go-isatty v0.0.8"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.11"
-	"github.com/mattn/go-isatty v0.0.11/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/minio/md5-simd v1.1.0"
-	"github.com/minio/md5-simd v1.1.0/go.mod"
-	"github.com/minio/minio-go/v6 v6.0.57"
-	"github.com/minio/minio-go/v6 v6.0.57/go.mod"
-	"github.com/minio/sha256-simd v0.1.1"
-	"github.com/minio/sha256-simd v0.1.1/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-ps v1.0.0"
-	"github.com/mitchellh/go-ps v1.0.0/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/muesli/crunchy v0.4.0"
-	"github.com/muesli/crunchy v0.4.0/go.mod"
-	"github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d"
-	"github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e"
-	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e/go.mod"
-	"github.com/sergi/go-diff v1.1.0"
-	"github.com/sergi/go-diff v1.1.0/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/sirupsen/logrus v1.5.0/go.mod"
-	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e"
-	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/assertions v1.0.0"
-	"github.com/smartystreets/assertions v1.0.0/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
-	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
-	"github.com/smartystreets/goconvey v1.6.4"
-	"github.com/smartystreets/goconvey v1.6.4/go.mod"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/stretchr/testify v1.6.1"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"github.com/urfave/cli/v2 v2.2.0"
-	"github.com/urfave/cli/v2 v2.2.0/go.mod"
-	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9"
-	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod"
-	"github.com/xrash/smetrics v0.0.0-20200730060457-89a2a8a1fb0b"
-	"github.com/xrash/smetrics v0.0.0-20200730060457-89a2a8a1fb0b/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
-	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de"
-	"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9"
-	"golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9/go.mod"
-	"golang.org/x/text v0.3.0"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.3"
-	"golang.org/x/text v0.3.3/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.27.0/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-	"google.golang.org/protobuf v1.21.0"
-	"google.golang.org/protobuf v1.21.0/go.mod"
-	"google.golang.org/protobuf v1.22.0/go.mod"
-	"google.golang.org/protobuf v1.23.0/go.mod"
-	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
-	"google.golang.org/protobuf v1.25.0"
-	"google.golang.org/protobuf v1.25.0/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
-	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
-	"gopkg.in/ini.v1 v1.42.0"
-	"gopkg.in/ini.v1 v1.42.0/go.mod"
-	"gopkg.in/ini.v1 v1.57.0"
-	"gopkg.in/ini.v1 v1.57.0/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.3.0"
-	"gopkg.in/yaml.v2 v2.3.0/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
-	"gotest.tools v2.2.0+incompatible"
-	"gotest.tools v2.2.0+incompatible/go.mod"
-	"gotest.tools/v3 v3.0.2"
-	"gotest.tools/v3 v3.0.2/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-	"rsc.io/qr v0.2.0"
-	"rsc.io/qr v0.2.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="a simple but powerful password manager for the terminal"
-HOMEPAGE="https://www.gopass.pw/"
-SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND=">=dev-lang/go-1.11"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
-
-src_install() {
-	dobin gopass
-
-	einstalldocs
-
-	# install fish completion
-	./gopass completion fish > "${T}"/${PN}.fish || die
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${T}"/${PN}.fish
-
-	# install bash completion
-	./gopass completion bash > "${T}"/${PN} || die
-	dobashcomp "${T}"/${PN}
-
-	# install zsh completion
-	./gopass completion zsh > "${T}"/${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins "${T}"/${PN}.zsh _${PN}
-}
diff --git a/app-admin/gopass/gopass-1.9.2.ebuild b/app-admin/gopass/gopass-1.9.2.ebuild
deleted file mode 100644
index 06f1fb2faf01..000000000000
--- a/app-admin/gopass/gopass-1.9.2.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module bash-completion-r1
-
-EGO_SUM=(
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/DATA-DOG/go-sqlmock v1.3.3"
-	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
-	"github.com/ProtonMail/go-appdir v1.1.0"
-	"github.com/ProtonMail/go-appdir v1.1.0/go.mod"
-	"github.com/alecthomas/binary v0.0.0-20190922233330-fb1b1d9c299c"
-	"github.com/alecthomas/binary v0.0.0-20190922233330-fb1b1d9c299c/go.mod"
-	"github.com/atotto/clipboard v0.1.2"
-	"github.com/atotto/clipboard v0.1.2/go.mod"
-	"github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1"
-	"github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1/go.mod"
-	"github.com/cenkalti/backoff v2.2.1+incompatible"
-	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/creack/pty v1.1.9/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dominikschulz/github-releases v0.0.2"
-	"github.com/dominikschulz/github-releases v0.0.2/go.mod"
-	"github.com/doronbehar/gocui v0.4.2"
-	"github.com/doronbehar/gocui v0.4.2/go.mod"
-	"github.com/doronbehar/termbox-go v0.0.0-20191006141301-8c9470559e05"
-	"github.com/doronbehar/termbox-go v0.0.0-20191006141301-8c9470559e05/go.mod"
-	"github.com/fatih/color v1.9.0"
-	"github.com/fatih/color v1.9.0/go.mod"
-	"github.com/gdamore/encoding v1.0.0"
-	"github.com/gdamore/encoding v1.0.0/go.mod"
-	"github.com/gdamore/tcell v1.3.0"
-	"github.com/gdamore/tcell v1.3.0/go.mod"
-	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722"
-	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722/go.mod"
-	"github.com/gokyle/twofactor v1.0.1"
-	"github.com/gokyle/twofactor v1.0.1/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-	"github.com/golang/protobuf v1.4.0"
-	"github.com/golang/protobuf v1.4.0/go.mod"
-	"github.com/google/go-cmp v0.3.0"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-cmp v0.4.0"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/go-github v17.0.0+incompatible"
-	"github.com/google/go-github v17.0.0+incompatible/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-multierror v1.1.0"
-	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.4"
-	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad"
-	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad/go.mod"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kr/text v0.2.0"
-	"github.com/kr/text v0.2.0/go.mod"
-	"github.com/lucasb-eyer/go-colorful v1.0.2"
-	"github.com/lucasb-eyer/go-colorful v1.0.2/go.mod"
-	"github.com/lucasb-eyer/go-colorful v1.0.3"
-	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
-	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3"
-	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3/go.mod"
-	"github.com/mattn/go-colorable v0.1.4"
-	"github.com/mattn/go-colorable v0.1.4/go.mod"
-	"github.com/mattn/go-colorable v0.1.6"
-	"github.com/mattn/go-colorable v0.1.6/go.mod"
-	"github.com/mattn/go-isatty v0.0.8"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.11"
-	"github.com/mattn/go-isatty v0.0.11/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.4"
-	"github.com/mattn/go-runewidth v0.0.4/go.mod"
-	"github.com/mattn/go-runewidth v0.0.9"
-	"github.com/mattn/go-runewidth v0.0.9/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-ps v1.0.0"
-	"github.com/mitchellh/go-ps v1.0.0/go.mod"
-	"github.com/muesli/crunchy v0.4.0"
-	"github.com/muesli/crunchy v0.4.0/go.mod"
-	"github.com/muesli/goprogressbar v0.0.0-20190807022807-e540249d2ac1"
-	"github.com/muesli/goprogressbar v0.0.0-20190807022807-e540249d2ac1/go.mod"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e"
-	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086"
-	"github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.5.1"
-	"github.com/stretchr/testify v1.5.1/go.mod"
-	"github.com/urfave/cli/v2 v2.2.0"
-	"github.com/urfave/cli/v2 v2.2.0/go.mod"
-	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9"
-	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4"
-	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
-	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5"
-	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20200421231249-e086a090c8fd"
-	"golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f"
-	"golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-	"google.golang.org/protobuf v1.21.0"
-	"google.golang.org/protobuf v1.21.0/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
-	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"rsc.io/qr v0.2.0"
-	"rsc.io/qr v0.2.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="a simple but powerful password manager for the terminal"
-HOMEPAGE="https://www.gopass.pw/"
-SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND=">=dev-lang/go-1.11"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
-
-src_install() {
-	dobin gopass
-
-	einstalldocs
-
-	# install fish completion
-	./gopass completion fish > "${T}"/${PN}.fish || die
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${T}"/${PN}.fish
-
-	# install bash completion
-	./gopass completion bash > "${T}"/${PN} || die
-	dobashcomp "${T}"/${PN}
-
-	# install zsh completion
-	./gopass completion zsh > "${T}"/${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins "${T}"/${PN}.zsh _${PN}
-}
diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index c56c05802879..ba1f25f6ca4b 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -1,5 +1,7 @@
 AUX graylog.confd 521 BLAKE2B b776c8c834358a426aab6e67b894ab3fc8e07b5d6d24f506312f41e76ea36bd39398d1eb424cf9f3fff633a26acb8af54dccd4a19642b55bf18d91fe92aff31c SHA512 3d8c3b6128f839809f14c7a1f2683ed5ac273efbabb1e0f50a2e9e90ef6c7cdc481bd84ef3372bf10f288b08f2b850a80d917838e057545851d3113c8f877512
-AUX graylog.initd 825 BLAKE2B bfcd79f71d996ca1761a79119f8ca29e531dbd9a40411c0c13b0628ebb8caea6c69e72adb3102369ffe41721acfef5ba2656689fd10ee0cae591291e9d20cd1e SHA512 e55477329fe5045b85451abd695d13cb6d67cf0b75f0f786503c6fba850d0cae9e853fb976dae35e65f570fda625bc8984714a0cdd6c23801c917184dc5a32f2
-DIST graylog-3.3.3.tgz 129284019 BLAKE2B 35c8dec3becd0cd513e435fec38c296e40a0c330304effb40e40f656702cd791c68ca9c814baf45671d7494d16d4478f9a0b3e44812c4814bea8dc1213f06793 SHA512 6e7445d1bac5addfe4e09f22ba2425859b44720105ba61ec2d819d12a8d693789f717d6fc1bdacb0ef1fe2e4583c405689a60ddd250e4fa17d1d10e70020f75c
-EBUILD graylog-3.3.3.ebuild 2255 BLAKE2B a8e39a5ba451672d598fa6317231e411e0127855252272d67fd90433b16801356cb08683fe0e709d331301251402822c9d22c8e5589f93dfcaabf8e31106a2c1 SHA512 7207cc432927cef54445fc5af8626fecb8679efb26d09dc7fa05149fec3c10e66799458f003069ed99ce65ee7a75c3d4b0427115b33701f2c47ba3ccb6c7f254
+AUX graylog.initd 836 BLAKE2B 936e5e3c811fb01bc80dde2bf8bf67dd75b6a4a20fdc7fabd53789fca977dccd7aa2664225d848e4b63819d15666e6913058ce0a769413c58784e891366bdc36 SHA512 a6d63077aac5d35621f355811bd6380b34eee952f34446faa26250c0e83a6649673550e51169103a6735fb0002f808fed0e8764459e129027700c3849b3cb0e5
+DIST graylog-3.3.8.tgz 129314297 BLAKE2B 21eaf45b396b11ad5c42efad790390b643505ac7ecc24332813784443ba3b5aeed911fae07beb270f598341d577469f9a5fdbe92101e64939e6646884b7f7fc8 SHA512 feda3dafc3af249e54e8240ea20a8fd4e96c80901b45842cf8ec4ee7a5b33646a391a19a23a06b0e5fb4bf29c0d1c8d7cb87f2ee169ef17ac5b38fbd00682ead
+DIST graylog-4.0.0.tgz 163267939 BLAKE2B 354cb24d4a0ac87378d94eeb2ed0f770a8d2acea9678677f795484edaa329cc0072d0151a0a53e5242a8e334ed6de81eedc8f17d0c61741729cabb96f62bf0c3 SHA512 426dc3ca393308b9d173f9956799f74b46bdb845f74f400555d388c4090777c7862d16bfd6c701a1fdec7a76a901fdd801f18fd19a73db80e855dd1fb44de4d4
+EBUILD graylog-3.3.8.ebuild 2235 BLAKE2B 3c5282354b4c1cd5281640baecbe4031ebc90e4abe2f2f6640964cb353bc19e4985d4f1657c1b1fc38cba18201de98120de1bda93c208e8bbad9e35a7375be0c SHA512 121c473f1039cc0010e0bda3624f366b49f7741424d57c983077b044fd2bf0895bb125cc97ee97fe4313dc1736a5c6714532705a5053e8e9c1bc5beb038e566a
+EBUILD graylog-4.0.0.ebuild 2088 BLAKE2B 2d49f39cce74b6afb1073f34d310687f8bca88f22fa09b9ff438f6cae5a14768f26ab725200c960407ad82972e3efc9ecf85ad1d2c896961cab4ed849ff7361c SHA512 8ac4ed61c0804ae112955ca94a9f32149b76872e9a736d8195db32384a4c21391fd28162240c69413702f7d06c36668e2d408a4e2a328d2e6806d3d0cd2e24df
 MISC metadata.xml 584 BLAKE2B d19e09582932c7986c85059766f2a845c0e85d214b9af6c61d9c26005e31c208a8ab59e6d82e5870162314c2cb4a9d3e852f12c02551d399c1eb3063449501bb SHA512 c32525442e20550c7e3b0ac8b74d896f35b2de1e87d57befb152047840bf4811c8df135f828b1c95505b4a348f25478cd7b2b186c36f93c6055086437f257505
diff --git a/app-admin/graylog/files/graylog.initd b/app-admin/graylog/files/graylog.initd
index d17267e9df22..2dc7024e28dd 100644
--- a/app-admin/graylog/files/graylog.initd
+++ b/app-admin/graylog/files/graylog.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/bin/java"
@@ -7,6 +7,7 @@ command_args="${JAVA_OPTS} -jar ${GRAYLOG_INSTALL_DIR}/graylog.jar server -f ${G
 command_background="true"
 command_user="${GRAYLOG_USER}:${GRAYLOG_GROUP}"
 pidfile="/run/${RC_SVCNAME}.pid"
+retry="30"
 
 output_log="${GRAYLOG_LOG_DIR}/graylog.stdout.log"
 error_log="${GRAYLOG_LOG_DIR}/graylog.stderr.log"
diff --git a/app-admin/graylog/graylog-3.3.3.ebuild b/app-admin/graylog/graylog-3.3.8.ebuild
index cda5c7e5b52d..d9a5d3883577 100644
--- a/app-admin/graylog/graylog-3.3.3.ebuild
+++ b/app-admin/graylog/graylog-3.3.8.ebuild
@@ -79,5 +79,5 @@ pkg_postinst() {
 	ewarn
 	ewarn "Graylog requires Java >= 8"
 	ewarn "Elasticsearch 5.x or 6.x (does NOT work with 7.x)"
-	ewarn "and MongoDB 3.6 or 4.0 (does NOT work with 4.2)"
+	ewarn "and MongoDB 3.6, 4.0 or 4.2"
 }
diff --git a/app-admin/graylog/graylog-4.0.0.ebuild b/app-admin/graylog/graylog-4.0.0.ebuild
new file mode 100644
index 000000000000..4112c68bb70e
--- /dev/null
+++ b/app-admin/graylog/graylog-4.0.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Free and open source log management"
+HOMEPAGE="https://www.graylog.org"
+SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="!app-admin/graylog2
+	acct-group/graylog
+	acct-user/graylog
+	>=virtual/jdk-1.8:*"
+
+DOCS=(
+	README.markdown UPGRADING.rst
+)
+
+GRAYLOG_DATA_DIR="/var/lib/graylog"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog"
+QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
+
+src_prepare() {
+	default
+
+	# Stick to architecture of build host
+	if ! use amd64; then
+		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
+	fi
+	if ! use ppc64; then
+		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
+	fi
+	if ! use x86; then
+		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
+	fi
+	# Currently unsupported platforms
+	# QA warning galore but testing/patches welcome
+	rm lib/sigar/libsigar-*freebsd*so \
+		lib/sigar/libsigar-*solaris*so \
+		lib/sigar/libsigar-*hpux*.sl \
+		lib/sigar/libsigar-*macosx*.dylib \
+		lib/sigar/libsigar-ia64-*.so \
+		lib/sigar/libsigar-ppc-*.so \
+		lib/sigar/libsigar-s390x*.so \
+		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
+
+	# gentoo specific paths
+	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
+		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
+		graylog.conf.example || die
+}
+
+src_install() {
+	default
+
+	insinto /etc/graylog
+	doins graylog.conf.example
+
+	insinto "${GRAYLOG_INSTALL_DIR}"
+	doins graylog.jar
+	doins -r lib plugin
+
+	keepdir "${GRAYLOG_DATA_DIR}"
+
+	newconfd "${FILESDIR}/graylog.confd" graylog
+	newinitd "${FILESDIR}/graylog.initd" graylog
+}
+
+pkg_postinst() {
+	ewarn "Graylog does not depend on need.net any more (#439092)."
+	ewarn
+	ewarn "Please configure rc_need according to your binding address in:"
+	ewarn "/etc/conf.d/graylog"
+}
diff --git a/app-admin/gtkdiskfree/Manifest b/app-admin/gtkdiskfree/Manifest
index fb93904fb058..c93395e0b1a5 100644
--- a/app-admin/gtkdiskfree/Manifest
+++ b/app-admin/gtkdiskfree/Manifest
@@ -4,5 +4,5 @@ DIST gtkdiskfree-2.0.3.tar.bz2 216189 BLAKE2B 146dae89b0f66328840f22bd7b9e8ad751
 DIST gtkdiskfree-bdda379b9109a226a37801505a19da91494144a6.tar.gz 318381 BLAKE2B 06fa325714dba0ec8ee319448286af791472d4aebdd7b94923fc102dfa0352f69247b941e91877c906b754a3b15c8c97d3b01281389274bc92ae23d1c4dfe858 SHA512 641aff62adb665ed6faa82925cc8941d894591e8209a46097b04a5feaba50a401144414edaaa1d97dd9c6b01fa6b4a057b3a5d96f9fd20318f85e535550ef2b7
 EBUILD gtkdiskfree-2.0.1-r1.ebuild 920 BLAKE2B 7ec5ce54e5a949d75ba8836162d2361340d1c115d028fce633815ce19b4aa8f0e3283f2e3b03e8b8069d498f4d6fad454151dd4505e18acf17f8620d359b3e02 SHA512 23d755ed23fcebe32e44de66bbdf92048eb80ca0e7060130c74ebd6444d944e1f906bf4f2b013c35f2545dbe69db8bd7976c00af3b23bce5eaf82cd13dfa03b3
 EBUILD gtkdiskfree-2.0.3.ebuild 606 BLAKE2B 7e437ee97362a5b8152cc036b8f92854efb9eaa3871f3a694795603b4375fa1e52f2eb70c5cfd8ce18b25606185d45dc74164e8b0d178d5c6ad2d1673f4c06f7 SHA512 b40217538674ee82af7902d25144acdfb4a3940aed487c2030687271e2107103fba230e611d57c23f6998c7194047b0707e0b98a7701bd843491221930da4962
-EBUILD gtkdiskfree-2.0.4_p20200224.ebuild 777 BLAKE2B a239f1826a2c35327434abcffc29d122da15fba97da653b651026a370100f0a733b621589cd5b37328ca145622cd89f07603f6b4d5e79ebb13ccf1a96ea268de SHA512 3dda832295c42d72cc29f00875111a0e20fb27c363101622f91f4ed2af994b4917a6b55f4236b1cf336f6d6ab89e11c59b49ece584fd9bbaaca1c22d941c6525
+EBUILD gtkdiskfree-2.0.4_p20200224.ebuild 775 BLAKE2B bfbc8fa6f36663e46239e49954c2e23de38a6a32aa88991f6a7f5b6322fe58112e490c71a610516f2ff2d7b6da9e58559df87f26660c6e698d30c93454374c63 SHA512 e3aac871b014e841241b7af30feefd40168feee5eb883c9090a5a5792ed3dc582c9de6db2078dedee77e28abd7b4c501cc7cc782d1783069429cf05868c0e338
 MISC metadata.xml 445 BLAKE2B f29d0cf84087c74f4b4c336209891779c2333b2c4838f359e230f3b2d5ab0bb8dcf20734ba7815a23a78fef03b4abb74a0ae40830d7fbd4ad94781c605f41ca1 SHA512 06d2091ac361b713e98ee2e2fdc4997ec9b2cb2e511ccad8fb686e94388448d4422961987c6bfe66241c5318f77b6c7d37032f0cb6129f2fc994a573f8cc53f9
diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224.ebuild
index cfaa632c8975..9eb08081906a 100644
--- a/app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224.ebuild
+++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk2"
 
 DEPEND="
diff --git a/app-admin/hardinfo/Manifest b/app-admin/hardinfo/Manifest
index 92098f9b9666..67d4d24571a1 100644
--- a/app-admin/hardinfo/Manifest
+++ b/app-admin/hardinfo/Manifest
@@ -1,3 +1,5 @@
 DIST hardinfo-0.5.2_pre20130823.tar.xz 280472 BLAKE2B d72883e7e57234b3328d03daf4d81cc478b383b51f4de08981792c42b3278ede81731ca831fbc285a594aa7f00f861c870aa6d784b7c282960f5541f04f9ce45 SHA512 e36bd4eec0090461de5fdb6c17dccf76937ee8fa9cb3411068fc568847f519023037999278bbb8b9a24608ed5b1d7fd2bebfe7115c631ccca1c35fa259cb20b1
+DIST hardinfo-0.6_alpha_pre20201116.tar.gz 1294614 BLAKE2B d585be00603a5da2873d0e15829039f3f5212e2ab294b71d7f53299d7eecdfbb2d46ee8d56913039bf03807cebe3f100f41ce6560a1a33fcd712eab59c2a92a9 SHA512 34ce849f2d1a9ea129502abfb186b43a0d8ddecc853d2edc3128389944a34efa3580c6d8a35b8fc40b55d64cc8f3c0d33b97f198a449ed0cacdbff2520853c1c
 EBUILD hardinfo-0.5.2_pre20130823.ebuild 512 BLAKE2B 207b8597c26c271345aca603bc0f807e95523a2b772c42e0a49f47723735e035703ccc48ec17cd2521871d0578a3868909dd67128729d3203041fc128201fd5b SHA512 9c9b051e7b25b4ad0b576688650ed51bb390a31a7b710014a5d39f63b4eb49e119ce600e46d2e9d0490490e86d235ba83ebee96c72d2c512a1611e3e6dc71569
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD hardinfo-0.6_alpha_pre20201116.ebuild 784 BLAKE2B f4204ed0fe7e009494d220429f97468fdad890d4749fda17bd57b4101212d17d3e8a7ea2bcc65450dc9f65de5177b38af0d2b8ab4fe8bad3c0080861b47b541e SHA512 e7897398661178bd5551aef19cbe88ed7635f8446df56e9a2d3321efb7200a506e718909a57c4a9ee82b8f44888bfee02668daea749bc9eb49315e58cb04d5a9
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116.ebuild b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116.ebuild
new file mode 100644
index 000000000000..4743177144f4
--- /dev/null
+++ b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+GIT_COMMIT="54b2e307af763ce87bc8c88e80785d8114bf38dd"
+
+DESCRIPTION="System information and benchmark tool for Linux systems"
+HOMEPAGE="https://github.com/lpereira/hardinfo"
+SRC_URI="https://github.com/lpereira/hardinfo/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib
+	net-libs/libsoup
+	sys-libs/zlib
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.0:3"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHARDINFO_GTK3=1
+		-DHARDINFO_DEBUG=$(usex debug 1 0)
+	)
+	cmake_src_configure
+}
diff --git a/app-admin/hardinfo/metadata.xml b/app-admin/hardinfo/metadata.xml
index 6f49eba8f496..7a38bb900964 100644
--- a/app-admin/hardinfo/metadata.xml
+++ b/app-admin/hardinfo/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 95563ebfd019..bb724c28ad78 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,3 +1,5 @@
 DIST hcloud-1.19.1.tar.xz 781068 BLAKE2B 74362fae9255121771a9e03f187ea6f101e71ed4ab226c218d33a335b740dc72d0df78e76d4c28e1b4760e1c76fe4dcba40f6a41db99cd0955ecb221d5314767 SHA512 24434de9396b30843698feff549163a23443f8536f3e2298edf23620f107dcf5287701c10aba10c4f6ecd61fa4b6a1a80661d9a330c3a4a11d1c986f750550ec
+DIST hcloud-1.20.0.tar.xz 790040 BLAKE2B ba0d62c8e817daadaa9eb891adb3f655a9ae33b05617449e26b09a3ba6b99a6b6f61df1cf29138a008a7ee58e45efdfe07c408af89efb1c2bd870d7340976bb8 SHA512 5dbb9060595e836ccde99984783954e894f74c098f911ae8c4cc1944d444fd28b6f722bb711d9b1ae245ddf3af8cca1939585ed778c8026fbf8c4201c2d15469
 EBUILD hcloud-1.19.1.ebuild 712 BLAKE2B 989221cd61ab4500042665da2679e7f611c9a7db8ce4f38ce81ee40be0d292c4be438846cf643bc056f3785889adba86765a6ee7845ec66cac15481933d9b8ce SHA512 761fa5b38c983a29cd12c069d1c79b141f88b077071351935b670c87e5534a96c9436c8dbd4479ef8401811539c2ab5124b62fc0eccb07a53a85980f9b6622a5
+EBUILD hcloud-1.20.0.ebuild 713 BLAKE2B 64b198fe517c5b6d22fb6024249e86236336cdb4cd7dda78f252cb3bad4af5e7f279358f8370d00fc4013b03331515ff8439aa82cf42f12cc05cafb532d07247 SHA512 dfdddb5e8356d7bfa8a641ea6f2e75747f0e0812a924f9b0e2517c5b6cf7f1e59769d336a37de8eba4eb03230746cc0bb15cab76e47957795a69ae465a96d978
 MISC metadata.xml 337 BLAKE2B b05bca1fb33b8d8d66798d3fa410b5a00bd63fc245d29c76d812415dcfd38d6e86187c5ea74500debdac3715b559289881b4bcb5cdb1dc4d1ffcde409d666b6b SHA512 e3b82ce2611ece38238d64baa5424f680c406cfa491037024af80dbb3b2e9e6737ab5756d732852b6749a132aee61701116515fd3fb52c597ceea255534c7f2a
diff --git a/app-admin/hcloud/hcloud-1.20.0.ebuild b/app-admin/hcloud/hcloud-1.20.0.ebuild
new file mode 100644
index 000000000000..bdb4bb4366ef
--- /dev/null
+++ b/app-admin/hcloud/hcloud-1.20.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A command-line interface for Hetzner Cloud"
+HOMEPAGE="https://github.com/hetznercloud/cli"
+SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+QA_FLAGS_IGNORED=".*"
+
+src_compile() {
+	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
+}
+
+src_test() {
+	# For upstream a simple test is run 'hcloud version'
+	./hcloud version
+	if [[ $? -ne 0 ]]
+	then
+		die "Test failed"
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index ebac4bc9f3cf..be5c963d0a05 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,4 +1,4 @@
-AUX hddgentoo.db 19694 BLAKE2B 93b96f7b1f036f3aecfcf12aac971376140ebc5606bb8ef92a64b6711f90ee0588ab0589b7471c5d7264324c864cb0bede1353f08125137a7415ede6e26d4aab SHA512 655e3e4c2b85766ef56660b1424e8dc50b48059f08b81d31ba4ff6770cdb3fbae3d47a34407ce481ec95bd6966152520f27d83453cd54fcbbe48347f16d35181
+AUX hddgentoo.db 19938 BLAKE2B b90214571f55f976b8676f9c2242edcdbd9c46b2295f64751e87b6e12f8a45eb8ad7338c6e7d17fc36c9389d9125766df141fe0cb84885864f2e31a16c5bc3e2 SHA512 6b13552ac390f3a23bf7d7b2db8b0f736a421c45ce862c634dbbbdf76e8476999760996b4d4ad02d99ae85f4bdebcb0d6176dbccbda5c02b8d35c81c17fe7d29
 AUX hddtemp-0.3_beta15-dontwake.patch 515 BLAKE2B 56061289e8d247a11a3172eebf3ed7f04f6b55b6021c9d79dbc41553828d4b265dc049ac139473dfd48c8e904d3cd4023405f9c787a21537872c6e2185395ee4 SHA512 ff5cfeb9fcd6a17ab3937212a85076fafa9abfde72a1b602ada09b5fb71f89a200e91398e9682a17034f630b90e57559e550c0f1565d12ca642af0c2e10a99e1
 AUX hddtemp-0.3_beta15-iconv.patch 780 BLAKE2B 568a920c7f43a53031212cf059148e618235292fdf6de157b4a3440a06e03c2be66f4e90c72d87da7ffd122fea4a0f37df56a8465966e58e8b142fa61c86e633 SHA512 53f988655d59dff675bb5a103b5688b1d564032350eb915c364e5aabd562d643e6fc9a9eb6bececba886d50b07162fb36d78702e1378f6cdb4a3f67f57209dce
 AUX hddtemp-0.3_beta15-nls.patch 414 BLAKE2B e488ab41496786676920b946e9aab4cf40c959f9799238da65586d0f3391060650ab2aca93b634519404b15279469579a573834e54bbcf170edb9c8284a72a15 SHA512 bbed2015e4a1ff44f0daa5591502d15cb02b9f3e7da8ab490d1ce761db823855c12d2889d9a5abf3924aecb522f9f27167e798ace3147c85ab50983457a480a6
@@ -10,5 +10,5 @@ AUX update-hddtemp.db 819 BLAKE2B 2322abe8bc4c4f49a4c16267783d9d7ee46666e1e11b70
 DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd05007f4b4b8d74eb378ba810ea9aad96951b7a9b3b0f872130677fca1f294d86f855327dcfa5a263c9f3c7d58fbbba502e SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d
 DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
 DIST hddtemp_0.3-beta15-53.diff.gz 52845 BLAKE2B ae4ef1f98ff39a39bdb49b2752f6f442c6ebe8ea6b0e8e743cc3ab9ef39d07abe8970648b841b3974cd814fdef72bc59cfe93c4b4d1cf2a85de1a0d94c4409b9 SHA512 1006ffa92f9973eb1da6444f8e8eed681e641efd17a52954b0e6c5041ecae13108af4ed89534ec4f2799685f96191769d3b168dbbb96085dc801150c7c547511
-EBUILD hddtemp-0.3_beta15-r28.ebuild 2714 BLAKE2B 2923e0f87f54d7b187b2eee9b4fb4271f986d4194030f302c4a47a18c78f3613966c01477cfab29ee1a3aa727f9f6b7e289b5a94567e2e041da60820ee24fb87 SHA512 0bfea95c93a64a78622b697b640eb6903ef60047c86f444f3804ddf3935bf17acf639fdbdb56dd90df86f28ba77b5d036e6be9a500c0df4b7b1bcd791fb3009b
+EBUILD hddtemp-0.3_beta15-r29.ebuild 2714 BLAKE2B 2923e0f87f54d7b187b2eee9b4fb4271f986d4194030f302c4a47a18c78f3613966c01477cfab29ee1a3aa727f9f6b7e289b5a94567e2e041da60820ee24fb87 SHA512 0bfea95c93a64a78622b697b640eb6903ef60047c86f444f3804ddf3935bf17acf639fdbdb56dd90df86f28ba77b5d036e6be9a500c0df4b7b1bcd791fb3009b
 MISC metadata.xml 260 BLAKE2B 41040f0f9342dec7a3993d99bd9fb49f624c8fc8a0be036b3c2e3f2f20d4182d23c5b98a5451f5d2d6906d749b7756b7ec10b1e135bfa7b1633234ebdae1370a SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3
diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db
index cdaf640a4560..82ab1d6fae7f 100644
--- a/app-admin/hddtemp/files/hddgentoo.db
+++ b/app-admin/hddtemp/files/hddgentoo.db
@@ -265,3 +265,7 @@
 "WDC WD(1|2|3|4|5|6)0EZRZ-00Z5HB0"				194 C "Western Digital Blue SATA3 5400RPM 64MB"
 "ST31000528AS"							194 C "Seagate Barracuda 7200.12 1TB SATA2 7200RPM 32MB"
 "HITACHI HTS727550A9E364"					194 C "Hitachi Travelstar 7K500 500GB SATA2 7200RPM 16MB"
+"ST2000DM008-2FR102"						194 C "Seagate Barracuda 2TB SATA3 7200RPM 256MB"
+"INTEL SSDSC2KW128G8"						190 C "Intel SSD 545s 128GB"
+"INTEL SSDSC2KW256G8"						190 C "Intel SSD 545s 256GB"
+"INTEL SSDSC2KW512G8"						190 C "Intel SSD 545s 512GB"
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r29.ebuild
index 0800b3b5237f..0800b3b5237f 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r29.ebuild
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 8bfdce311d8b..44978f51c91a 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -25,18 +25,17 @@ DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.4.1.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
 DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.4.1.zip 54053 BLAKE2B edbbafc09d77f9c148eea7b1a81aa59fbfd674be51dd514328899709cc5f19ebd41d93fed2c5dc1303680e667cba0472d46b882b669cf58f0caba70f7c85fe69 SHA512 81e8da102d3ee39631bf160bb44e6c6c9c59bb381f21293600cbbd93781120c1891178ffc513ecc41573d81e7000de8e365e7ee723a108ce8648e1854cb4887b
+DIST github.com%2F!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod 35 BLAKE2B 68297267e33add40ca12e681b6b4461ef8a3dd23eb205a365b13b158d0e055e3650fa9539eae43bbbf4ddb559c872b95ed541a3f4330a0ad3395089c4cb9c9f8 SHA512 73bd53e14c96c10e3288cd859b5d7758e6d2897369060b1581b6a4290e233877e408c9dc6350b763c2ab678a2e8f3e8f7f3bf563928b43ad37a48187ccc0ee7b
 DIST github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod 38 BLAKE2B 176ac3e371386c6a43148aabcf75084c43038decec0062e623c4a7baa194bf7c654f59cddf9f8b413209cbdc03372c790ea91d8f3f6e3d393ced5eff1e903100 SHA512 3057fdb8ea9b349e253361877f132c1808099cccff5eecfc8cb95274bfdf219a466c26ddaceded7867f0cf47f605728c417961d37a3f40695b720967c61973f8
 DIST github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip 5595 BLAKE2B 72d6d4e22f8aae9443e52fea0b8b01f704c7d58812c3a52ec4cccb2848f360f995e72b29fb393c333abe92e571e0b2e32a7e328e46e91d1a490b97d4d9ec93fc SHA512 258e6875c1a5c8b700cbb95bea37af6886766cc30b70aa5fd78cb18a92bbbf073ee918bac7699e0bb86c6cdbd4b25f5ba4aff8c95087ad845f8efc84f715c8d3
 DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod 38 BLAKE2B 6bb3112d9b8ba6f9cf4d0c4ee376da93bf21b139563a211c51ee44a302caf9670181cd27f7e21c6fd05bf87c9273daa726c942749ffb18b623d17c7170aba6b1 SHA512 a3c38d1db1472c71e1c47b936d47ac2ecfb49519c2e78dd453d234f1a6153bf007eb96fabe0be7dcbd868160a3869e854ec6776356b9011fe7ef51a634b30aad
 DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip 21259 BLAKE2B 6ebd8152517cfcd5e883bc56dbb3d347fce7ac09589e8ad5a96af8d39c5e18b284e616cb1a6f6641084a34c07e59d4ded65b600dcc9041c9af59d26afd368993 SHA512 5800ddecf3717ea31dd991068c785053b9c6cb5ffdbc97b681bcce4219634362acc7811eec766117f0087536abaf0eaa22b8d66a44103a1644e5907e3174dfae
-DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod 49 BLAKE2B 75301dd276a9f53c22d9d15f2ec4fa32cb90eeacabd9ddcc604d7f306d7e9481f9ed3f8f8bdfa5090951623f2ad2bdc671808dd8eae512bf911be30a6b93cc99 SHA512 7b9615ed8dbc53987e0370b5ff24bf62bfbf4cd3644859b735dd267826ce75177666106d8447a113dd508542086919336c82819385c92ee520082f6f6ada7ac9
-DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip 29035 BLAKE2B 44ceec916a8ed19a1e9bbc3b4b4f325e5b9fe1d55991553f30eac70b3ad3b93ae92b1f0487ed57354b40db1b5b1458885a127c5db92a27ee806b9f8f1498f3dc SHA512 3954271496e703d876e1bd9716ae1bdfcde08335cf20915aefa71c5ade8a836733f0635005d9eda8b01fb1991dbfd25d0df2aa71a1d52ae3677477eb34382aab
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.mod 49 BLAKE2B 75301dd276a9f53c22d9d15f2ec4fa32cb90eeacabd9ddcc604d7f306d7e9481f9ed3f8f8bdfa5090951623f2ad2bdc671808dd8eae512bf911be30a6b93cc99 SHA512 7b9615ed8dbc53987e0370b5ff24bf62bfbf4cd3644859b735dd267826ce75177666106d8447a113dd508542086919336c82819385c92ee520082f6f6ada7ac9
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.zip 29693 BLAKE2B b82bf12654737a5719056c9aa16c0a2fbb510fc0680844485c79b45c1d54c2254832f41517440f4ff37f3d7bf292f594dace50038e221ef790ded3ccd18bef24 SHA512 ac438522dffc4312f7b67ae0dabd8b640584f5c934682e316b212c106cd4046486bf9a29ea4a7f00afbae98288b95633acb2cacc5034da65372fc8fb9e15a505
 DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.1.0.mod 405 BLAKE2B 1fc7d2cd7fcc518aea753db768465f5a16c8ba91fdfe7857bd4e8ebc9dae9dfce8565fa6e5c97f2d68f8446797480a4d7239f9f34996cd0427fa01e4b11e0778 SHA512 c7dec4a7d2b69239d4e583bec5839b7611bbe03d2274740bde007bdf72afefcb1e6e189242b30c48b58bec88eaba888f68abfbbd2a0ed851e38698a81f27f54d
 DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.1.0.zip 67936 BLAKE2B 658935dd88446c8b33fb2bde13bc46975b49e98b50855149984485a4c1ac8b85211b43c428e7cc461dea615f784390f1439d338185833cce17b692e3e33b2b10 SHA512 04c1aa98bb863370b0075ed39dc999525ce7a6d8b1bc3bfa99e16ea02c6734889720cab7e7f820bee013bdcaaef57a3bc74d7cb02a1789e9892c5775d42bb01e
-DIST github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.2.0.mod 312 BLAKE2B 386d733f3af5e520c16a63340477323f079302c743c19488bc09b7e63ed83b1d290db14eee791d9a06c7a2cd897ae67b79e6c681256adcbb4531789531936d07 SHA512 eaec26ac7cce88c407435c5715327d93a31746f93f57a6071178c8a45271e32b82bc8a1ec0f754a8d9318e7ff6d1de2ea28f04ef0b29158695893f89fd6a09a8
-DIST github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.2.0.zip 43911 BLAKE2B f3ce7ee5e28e6f55e0b0a87019df0f10b7a440c4dd1a4e025c4eedc76c66f3cb490c1890952519dfee83f33901f352df96dee77f61796ada76aea78c7ecb1cd2 SHA512 96ec08b06cf74bc2ed135ff98eefeea449cd1be8fb5eb4baa59fb35dae5911e7bc496ca2be2fe97327f6725dfbe1a45af64fcbe63654ceffb93593821747ba2c
+DIST github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.4.0.mod 312 BLAKE2B 386d733f3af5e520c16a63340477323f079302c743c19488bc09b7e63ed83b1d290db14eee791d9a06c7a2cd897ae67b79e6c681256adcbb4531789531936d07 SHA512 eaec26ac7cce88c407435c5715327d93a31746f93f57a6071178c8a45271e32b82bc8a1ec0f754a8d9318e7ff6d1de2ea28f04ef0b29158695893f89fd6a09a8
+DIST github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.4.0.zip 45337 BLAKE2B d3c904ecf89444b71b06e63aaaa87b70ced1d086be7af6c11d11127cb77382a112606a771b886bf9af151ca858a67058cd1bab78eed95e1a775a6f48fd67fc98 SHA512 b62502e7467647470e4f743ca84ff7c3c0141cb93f8b1b06a6d4f6d649bb42696b64f6bb3ee0253ebdfa8ec367fb79a55fa0bad8c1543ea9f74a2e92da5d407d
 DIST github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.1.mod 34 BLAKE2B 3775b686ef0a7d190a38eb6cddc8a2c5d0dff7ffc656dc762ea8733def2abc81fdc3f990854a9e3e97cacdac3149be6a05f7b271cc7f8d63d11ac3512f2d64e8 SHA512 c5c6e7621f9018f117ead83e96a26b75c7f1c0bf2a71579bcdf494e1bc49553c4def4b4246f740970ed52851a66582695702c8fe2f619073e6422e593a350143
 DIST github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.1.zip 43440 BLAKE2B 951a9b49f65a2fb309b19a5847821e7422aa80319f64d15985327dcfd86b6ff63ae1459e9627bc8a49f43bf213438e550ddb227d6bd8f06a98e9035548ac4e66 SHA512 d718eeca2143133fceb3c2ffafb99ebfca5ce6323366ada07974f49daa82b200e5fbcbeff0fe518d052811d46809bb9e599752d497641dc5b76ea3dc8958bd74
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.15-0.20190919025122-fc70bd9a86b5.mod 177 BLAKE2B f2d2eb41aaa0f3f47a75ab260a461e6df690c34e7e817ec61afc7854ae26bec641cddf4f4481b5b3b27394e303d1fb1c4a9864f4de2d6c01f33e3fa0521b05bc SHA512 584c9a707b6115caac28ff373974faa59d12531962997f9640a4172b020f72c5d527355f035449a767d65ce426fc9705c143a7bd8afb5058c9ece241c9ad5d1f
@@ -54,21 +53,37 @@ DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad45
 DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20170810143723-de5bf2ad4578.zip 8169 BLAKE2B 61db06641c2c1db4102b72c097f63fae0bff296481556fa16e66ddd1808478aded29256befdc3d767b72f3abc91e376ae61656f8da2cfbfbb5ffbfe3fde20361 SHA512 9746be89f7fc5d50acd6376f77d43754e4a40d9da173a0b3226b78b1b1fab9afd859f15332ae5a429ce1e0e85227ceef05d94f2237c4969a8e6fc5e8454937e6
 DIST github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.mod 41 BLAKE2B 3f9f665454c79b0807b44cf10f69fb0e5c31364865412f19d8b146fc9a0b12d7e5a6282812c7ac70940470a3ed3f2cd9c2e6bca7eb51e43a4b14ad5e723d76f3 SHA512 f9f36e700dbfd7c997b79e527ec2a4d91e5ccf2f4bc7ad6a9298a9cbebe05263bcf8776bd2f3dd258f292790928a20cf45184e7af00140b2940af322897a59fc
 DIST github.com%2F!shopify%2Flogrus-bugsnag%2F@v%2Fv0.0.0-20171204204709-577dee27f20d.zip 4803 BLAKE2B c2e5890aabdd1cf027d6360bcadfc1cbe53a9501763eeb3860751fbe4b0619a2ecfbad313af5c4551fc7802309b7144ca3eef3a1a8776be84e256c19afcd96f9 SHA512 eb729e7e9e5f611c5e9b101d3d33b83886454c940219fafe1717b68e3f447a5968c0107626a7455c2d05914b341a4dff2b4f996d54c435f51e6b35842d7e1a47
+DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod 33 BLAKE2B 7013f44d03c22c21595c5369c52e1538a526891c9fc4cccac37373504f13c66d7c504552251f46632917739dfa1d6c3a15e15aec4dc03b9c69902b0bcfc8785c SHA512 db3271d8abd514934ce5d06fd20f7490db8368e57822a2379bbfd4ccb94e67354400d487d388a57467a5a16cec339cbae9488cecf82e41d85918639bedaa0a87
+DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B af7b84d9f1cd163555b32bcf960b28b64a5689a1c9694f430af310f5041cd967fcf0d6c1a6c4020478544d347e4ba5b2fd16a6ef54258d33314ee0ad9239752c SHA512 917ada7ac198a013d2b090dfc59a45bd2619dcb7227df1521ca38a0d822fab12ea8c158c526257fef4ef506af29d9fa678e8dc2a73fc13c8dfeb57b398801744
+DIST github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod 42 BLAKE2B 8afd8d85fc5969d9c4b82c26f852d82fcdb08677ccf0d54d8d65b89af3ed5897125aa0d1f5fa6adca14e8b47850da8d5a70b5b3fb2f42a83ee84576137a2fc6a SHA512 e25b80b5e74a374b055238fc017a8c64ea89180ca07417abe673ad5eb0b53c9489b9d93f638da5b5cec250fe9a478345093dd2d1bf0b82fdfffe938ec1aa874d
+DIST github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod 34 BLAKE2B 325996884246cd840e22801dc089388410afc2bd8ab7c5c1f4bac6aa6ac035f387e1b896a91702386edde85ba82efde16aa8d7bb55a7644fc3f530a36eabe89d SHA512 dcf507ac7e50307fec43fdc5e5dd93f0c8509ac99033500d1ff3414ac0a2419ddb10a688b17cd9d0035c36814a25ac68b771285ae21415eba7a55586b91fed7c
 DIST github.com%2Fagnivade%2Flevenshtein%2F@v%2Fv1.0.1.mod 39 BLAKE2B fb2e961ec1914554769b3294f08059e7d8d934938062fed87c404166ce6128f35bd8ab14243fe5e5923e20bf17e0d97937c94f699bf6b5a7839d23bd1d3da7d5 SHA512 2687e2246613ee595f475b33c7bb216a7d8776e415196e4a271e4725a2331e661f2d3128d23f0102f5dbcf2b76f5780e02d673b6336db186932bcfcad35380cc
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
 DIST github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod 33 BLAKE2B 5aced043cac582e67e8d3ddfef0a54dae0f7e4792dba23d7c6cb18fe687be98649a90e9aa46f591385003f945a2ffc192aca18bf1ef0516ac22fe1526d2e3b85 SHA512 8960a9c2dcaa7ab5225d3d10fbba4264032ff9bba80fd8efe2ecda6f9b925dab4db320a4650fba43c0d9c61d31005c6045eec4a650411bb549c60792f31c3b09
+DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
+DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
 DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
+DIST github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod 33 BLAKE2B c5557c9c02300d9fc6ecaac5694461cd440f5a1f5cf9ddcdb38e6fc51d9a55d9ca1e98bfabecb6c83fce81e87979e66e56c585760ef61fdf1866480c0e32eab3 SHA512 15b2cb1fba3e5103879548ffdad032ae30f0e723cfd26fa6bcf69afff14b18c2cf3373f511702b3690fbdb7040996c437f9cd0253bdfbf211b665ff14e97aafd
 DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
 DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
-DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200108200545-475eaeb16496.mod 50 BLAKE2B 365a971fcd7a5d7accf4e0d968df70dfc452ab1dcd8c39773177f1f0b5ad113ea377c4019cd86f5313e3f1168d63cc51e5cb8e2daa2ef4666d12dd30b89c691d SHA512 2ddaaa2f101d8f297f37bea4236aa9b86a0ce765abc576625460298db3231ad5207bc9313b6bf1eb85b96ffdbe4acca15feb945a4bf084e933901da52f3ed975
-DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200108200545-475eaeb16496.zip 65802 BLAKE2B 91a1eda1fbdd1b5b03a295078577df1e1fa3c4741aa9253118d8513a5386eddd737e2b092558068a57d1ff9d54b8ba460b69a4e94ff68b3384022c57d096169a SHA512 61dcffbce5ea982bd78d70a6f51b325d708ca8f9cadbcad34df7afb3dd9b0c824dd6c3abf62f22e060207379b325e1a496b73d177a0aadda6dd939e1f7717ae6
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200428143746-21a406dcc535.mod 50 BLAKE2B 365a971fcd7a5d7accf4e0d968df70dfc452ab1dcd8c39773177f1f0b5ad113ea377c4019cd86f5313e3f1168d63cc51e5cb8e2daa2ef4666d12dd30b89c691d SHA512 2ddaaa2f101d8f297f37bea4236aa9b86a0ce765abc576625460298db3231ad5207bc9313b6bf1eb85b96ffdbe4acca15feb945a4bf084e933901da52f3ed975
+DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20200428143746-21a406dcc535.zip 66047 BLAKE2B 69661c545752dd41ac8a78faf474228463f879a70a7ef7267cd274b8617fe301df4e661f0315f9a65d10f1b22fab21446ba2c62f3977cd69403c70cd5987a47e SHA512 0362545148de342b7a145a87add3cc6e145b7a1fa3b59b3446f20ba5d5d343270d20690ef1c7f7aa1e284d7134bdb5af9736b2cc1fd0536d846f6ec614491b8a
+DIST github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod 125 BLAKE2B bee4d59ba1392d0211558f6ce3511c887a474463f784cd92069df7be6de5281079d579613f0e5988ad1f3355bc8ccbecdae7f1fd551fb122f7a0e8ef11523e1d SHA512 7e6ec3815d053e7d49d2b0a3d4fdde6c6eeac6048ad0eb681da1305f6d9d5bb6671e31834ff6e5d840d9a7944efa52707d40fa737fa9ec3d3ed9d130b589f9c6
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.11.mod 145 BLAKE2B f28dde209c4d43940897c3dc758b088b19b38db865cba75b246477b497c1303301de7cfbfbea2a7eb1b124021967e4ead6dcfa8475ad240a7381bc7ec256b565 SHA512 00cbada20d24a2d08b1f06e0da060140820972c9718e707f0cce56ad62f1ab7344a969cefece18bee79f6b92dfc390e496d6a4af7c95eea0b66d27cc0f59f3f8
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.27.0.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
+DIST github.com%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod 444 BLAKE2B 330419975445f724ee7b9a3ef8395fc7a153f189012dbe70e982865f5f556c2ab0d41a3465ec5cfddad034f12f226f77fcee9e3c1024693a0f9b13ee26f18092 SHA512 bfdf66b04b9c41824815a5a2707acce5c3f74aecf15a510d45adc84b732367885a18920d3dc50d968d0bc5e8a4fe3d519f7212de80baad4656c6867357c8fca7
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20160804104726-4c0e84591b9a.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.zip 14678 BLAKE2B 3f95d78aa356a314f8da501f8085a880201766e184abb6c222c45e09c0c3b5e1e1eb7b89cc8ed46b77b09be8860fdf3e28525d9a451964ad64a96c6ee848a41d SHA512 be60a4c8059a9cb07ceb12e079b1224b6f871ecb1d7953906ab303cfe86d00cb979e203299f00fe828b2f6d2a3f5d55814c50809e9b872ab6d96db73f3771498
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
 DIST github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.mod 38 BLAKE2B f6ad4f22436471512ed4037c3f4c8dec4e0f7cb9191ddda23a2f5a5135785a6c5af99dd9005218bf196e0f48db755d040c894f6c5f2c1c338580597eca5eecd8 SHA512 05b70033a965ce6a70ea5fe7c635768c2c665942e04b17e47fba03b70cd977a8cbc292faacc3e10bd785523a43c61d42811c20513669592f308830863cfab56d
 DIST github.com%2Fbitly%2Fgo-simplejson%2F@v%2Fv0.5.0.zip 9009 BLAKE2B 5d6dbadcb0c94a610e600ab54c644c4169265fd251e1a083d8f4723289abd840982bf083c597cf32d5462388d2a3848f3c051001a5bcd605d2763386b727cfb8 SHA512 1551a4ab292ca95120abffd8ba4c53d4215a672539d969194f04c50cdde653afcdbfb7b0df8d7240a7846da7bca30b6760852a1df651cef37caae7603baf9d19
@@ -84,24 +99,36 @@ DIST github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.mod
 DIST github.com%2Fbugsnag%2Fosext%2F@v%2Fv0.0.0-20130617224835-0dd3f918b21b.zip 5230 BLAKE2B a79c3a7b0f0c5fb0d748cbc1e8a43b2e42363806751cd75467fc7d6bf25eb33cb85397922e7375bb94a7c2b2acb2852fdb3ac48e9414ac5d1f2e8e564e0b3b5a SHA512 82c4071ed1780ceb814914e8dcc0504332afe1a43b1e9de37e3a1af41a10158fbe7d579e55e7e523881250134d75b18ad2b31067a96624882a7b13a30d63be51
 DIST github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.mod 36 BLAKE2B 8937677f3b8473d8d71c79e9d3e420bae0476de69d366765ba5f9a4c42d14a8cd18a49f4ad2911673c80276bdd47dbf019a62fc0aaadbffa72647cac046c362d SHA512 b23603768dd8994a9b735ae81f119d2ac2e33a1b54e6328044f92ebf03f905210e54692752076413dc45217b0a400870a5da8ebd75856bf6b74272d0a301484e
 DIST github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.zip 10717 BLAKE2B f9f27c5b0479bc3b8e2ecf43dd56589233d91b834d9cd5ba708511946eab4db7710128bc58c9c0806f37b70f2264ad69e390c95810bae0a06b0087a69d49f5bd SHA512 ce51acc14cfffcd82d965ff0b5984e75b19cbed8f5f3e8363a61ae813d12caca3c881bcc9c66ac9d8078498ce068790ead04bb12e9b765747023db45a1fc3d10
+DIST github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod 122 BLAKE2B 47d561554f8fc26402a1aff96895741d9d50e201237346d2d147eff3e5977f356a3dbadee8c8b3c492bba7f6be33d48ad89dbd8a02e710dd96a4b29b1f3c1fd6 SHA512 1f9d455792a66a48351a4ca57810d37306ff60474da6e8e308f983fcaca4326f6f64bab9c677900e014271b52333d1588e287493c2fa853bc7fa40717556a670
+DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
 DIST github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod 38 BLAKE2B d8a847320562a5d1158e868d3ade028d83059898bad409051f8a342843ec21d8df4305b50b35b7ba7fddad63b53f38c5689f4f7053cfa510a2b222a043880748 SHA512 b3a401f05d85f8d687fa8387b475211ec627c7d2c80f5fe1b5a4d97a41df7707d0cc0dab634bcab246f43058f204f10b45ee4cea5f61d8e7cb88c4ba8f085dd4
+DIST github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod 32 BLAKE2B 5483978ddce5f57e08f1358c34e5ea6b26a234e017b2e3a9af91296de3c79756f73f8cd9629b7d04c88e2135f30781cd0f43fbf9eceacebf26f141bb297f376a SHA512 865b4cc3ac91138e9b4581be778685f89bb93cdaf2372bb7b5db6227e249a2be89d5d14c89bd0e874e01d744aafc08b30b3ccee18a472981bed0e7740d892da0
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
 DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
+DIST github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod 40 BLAKE2B 58aa150182b5b43107154bd337eb024049bc2c7e2d26cf4344c97d554e03d4175862ecbd1b65527aecc85b9824c474c3e5a49eacaad18e253cec50785963b18c SHA512 8a0be9bb45924e5d384fa68dc2e990a4705b46e8878558d4db10fb794c8e20b13ec54831e7387cf425613f3f33b5952702deed074bee5818fed3fb9cff7b4259
 DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.mod 411 BLAKE2B aaed1a7526861470d053cfa204fe5af2ba4ebca024322c8007d3660acce6fdca03264a12ca0bedcb6fe1f0cc5c78de920f8e8e19a36b12e1604cc3274bb88733 SHA512 32f6adadbc5dc2c9a57c698ba76fa4fd83637e67f58da55c6a22d4faad9f705fef7a472c2b2b2b94b2bba2b839b85856254fac4681dc9770893afa940bc734a5
 DIST github.com%2Fcontainerd%2Fcgroups%2F@v%2Fv0.0.0-20190919134610-bf292b21730f.zip 75084 BLAKE2B 873262c8f3527814f7d3210753cb811f625126cafe63016e5bb3ac9df34217143e55f11f7ca0f63b51c95b17859eddfb25ac24daf75fb9f19898d264fb71d9fb SHA512 cf73ed0a23c1a392935706058d4d0fc24f077b775d31e6f56d81cedfa259be9b0203a8ddfb3f31bfcb07951b02c3c7ab74e8ea8f601ca75befc6afadb321f37e
 DIST github.com%2Fcontainerd%2Fconsole%2F@v%2Fv0.0.0-20180822173158-c12b1e7919c1.mod 37 BLAKE2B 7037e2b6c6f7927a37d8298f91976232fac6e1723d9ffda59b2c01bf81c24acaf124fceeddd8791b6a6bb1e81b03e1bd5ba88ec9613784462a235bdfdea76498 SHA512 3d4ac776b750aac30718ecb1a3efdb383cf39d0838ca60db5ba266152baa1dcbee739a8f384965b5b8d39b9d9b18561ac317eb8c64c61076986db66bc10bc1dc
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.0-beta.2.0.20190828155532-0293cbd26c69.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
 DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.2.zip 1650463 BLAKE2B 8958a1e2bf03007734564896962be34189c6b56d1674a771819e6bee9ede0cb78601ca9f5888ec88b251b9d1bdab2e70190d0203b7694b4b30545003813b45c9 SHA512 5a355ead5a6996bd85e4c45d026371cce836a9379de65adf7f39596d9332c51f5cfdacfec66ed7e8efe7a49532b927a0ee53359f52178aa6df24787a0fc11068
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.4.mod 40 BLAKE2B 5aab68428b3a2f13611b2994bc4ffa44a6d2863ce69d937f0fc36553d9850723ecbbc6ecc373ec7e4fa084edcf6387c828a9ab1c5266bd19ae84c86f529b8070 SHA512 2be7fea972fe99bd4406e4bf4770acc363ee0a5c88d3cdde9e273754c22a7c986509de5078dedc96e79aaaacf93c3ef101b787179b855ab592bb232f0274092c
+DIST github.com%2Fcontainerd%2Fcontainerd%2F@v%2Fv1.3.4.zip 1657791 BLAKE2B 83aa19fc8b02156f5252cec37e9dadac646eb55cbdc197403a98d06011920f4488a14594de529d96ad2a7f18f3e4fe1209a38408b1153c0d0dbedcb25264d457 SHA512 ca3c6a696bd41750a96f9f292024e0acafc822f0fdc899ed1adc5433915ff260e6d37f9f77aaf50a20ccc655e12e2a84ea59f1f1f5d25513aff581a7010fabfe
 DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20190426062206-aaeac12a7ffc.mod 40 BLAKE2B d99a912436af30ef3f5fd53f6348367016633170289e08c271f0148a47db1f9c5ac5da362fcc3f6fa5a7e7977377299adcffe63e9c3315c45ec173d55248006c SHA512 442fc394b0be5c87d2b9edc858f47d52b1027acf1fade259879bac7c598e51692199cba7d4e175f21f772193f1570e47e82d6c6c6fa160e253eb49b09cbca793
 DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.mod 1000 BLAKE2B 595d0a4ca474b1143bfaff75d8bb1089953f1b68da5b593966f85461b5a20ea0a8ebefe6340ae8747b12e9fda5a13dff135e751262f4efbf7142993938a103a8 SHA512 b6ec25dca49d545033cf2e97f7907e4709103e1bd76b341a27511c25df44788246d9788281d2f2636bfc7b4f39ac7fb25fc1de293917bd68ebaec92babea8557
 DIST github.com%2Fcontainerd%2Fcontinuity%2F@v%2Fv0.0.0-20200107194136-26c1120b8d41.zip 137748 BLAKE2B 6ccbe78dd7b1773d54ffb28aaede1b1a10ced9228c4ba511be4b5c20940f7d8551dea187254c9aea915b4f3095ea415bae6ea7bc3df00f36966e29ef8309560a SHA512 38f840756874baeca822de082893f9a5774b29164f9b798660adbc99122f8c4d42be0e0538bf5d1c4c428ee2f2f2af5592b9eba4e2b5f01a74f4e8b591212592
 DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.mod 34 BLAKE2B 24e82d551cc42b7a7c8c830ff4941074686a06dfc753202e49bdf1c7d5f7b960d0ddcf73f618585b6dc925cde9cbf123196fc4b45cba6bff79a16500f49c178e SHA512 9ae770f38dd2c9560c8c3e858890a835ed848d5434a289d889c312d681af748b11471efa47739b08ccc12beb6e9050d2f1104ac6299a50a83344f496af516761
+DIST github.com%2Fcontainerd%2Ffifo%2F@v%2Fv0.0.0-20190226154929-a9fb20d87448.zip 19817 BLAKE2B 893120aab7fcb30eca0e5d18efedcc0672e9f87c6c17872082f32726e204bbd5cbb4541f4e4beff8896011b588611ae44b893c7e7c47a38bb5b05ec6e5df041d SHA512 3b7b019d079590caa6f7b8f8250c01cc3d6b8635db7bf05074038b102e6633b480ec4046b5573a35de4484d6d2bbaaf90f911da984fc9c0dc3860cc0a0c35785
 DIST github.com%2Fcontainerd%2Fgo-runc%2F@v%2Fv0.0.0-20180907222934-5a6d9f37cfa3.mod 37 BLAKE2B b3d06413bdfc072eba71c8b51cb7aaf27ca29ba736959bd0fc9ef2de8fe3dbf3f194cdff7d030aa259c8e78fcc9003dee040be0d1b858a677d9e306c89a3542b SHA512 62de290e5234d6bd82d9a865d1ff592736f075130d1c29e9d9f2544ca3f9514c4a81ce1a726cf8fc8be8404e8ca41a88958dac755174ef2c20ec9b455d0cbc50
 DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.mod 35 BLAKE2B e2c6e0700e40d563dc690884628fa22b6dd56872a63ada54374c07cd6328aa332b6df2396300090da5c9f7ac730b6b9bd60dbc776557c4614d5ab3ce003579f2 SHA512 93f981daaa62351a480595cfb2feffad6c34770cf89f35399d777096fc524cafa50d0dd3f56231ae41b15e56061ab83f0f6829190730dbfc7f9fcd594af7b054
+DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.zip 41898 BLAKE2B cd4f482597c3ee359dcdb1de184a59a9f766ce096b90cc0dbc2a1ab030d15e897fe4afd0c4af6e69a8e1511416f2a07bce0ae322108382bffb6ee87e9fe72714 SHA512 8471467090dea9cc10365118d2894b2e8ba4fa6370cb582d069330344de8ad64093324b1845ea92701e1ba98656ea820c074a41fc2cccc6a357cb0e3ae85bd79
 DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod 37 BLAKE2B 109f32f2dc537cfeff1699937e93eed980f34a37faa111ad3831be6dbbb1df965c56ef266deba48aa1390fd94bdedfda9ba3a51f4f6d9519ae24db6b99dfe1d4 SHA512 6485196f4703578401e82673647b49d58fe60d7f90c311294096504d3e11477c75fa50684f00c7b378b2566e6e8683cf18d99f2ac78043b077318a643fb11720
+DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.zip 9069 BLAKE2B 65b34ace1b0655929a00f648d5574406440dd840e4ab182b188d754e131dcadb6eadb07971840e867aca65a2efa8ce01c89c20ba76d35654a58e7adbbd3b867b SHA512 cc7e018805824fcff055bf5fac93253b6194a12a421f1e1795de114edf863d865d6eb416ea92ce3ab66fb627b5470a6e721911c059733a27c6eea487f89d3f15
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
 DIST github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod 33 BLAKE2B 1ce5b6fdaf9b07e47e53896873b9ee4e96fa51c66a7a5afb3f48f34bf1b28addc5a5faa14832c24232a048b5d2b5ec0fd9af57997f0360105479550670b7272e SHA512 4fddb273aae34ba148c277266e98d174e04f5e888a1f59d44a86f7ec80168fbee85f245cea2e2fca44b29cf83f7a417e43b885438d7e3231c89604bb9f0a30c6
@@ -115,6 +142,7 @@ DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod 29
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip 8850 BLAKE2B 9053d9c01c92faa257ed0623eb06b27e7d9d93ff9c155ce862183bdb9da6483d57873290eb5bc7bf8f906d7b18dd29d856a7cfabec69b84a2f5400f6e43c616c SHA512 9d35a6f2ccc2b51fb2561891311d5ab33737ba76c61f190fa6b4276eadee8b09d008b2c925fb8dd5bf9202bf3e1ec944c0b5026b080d2adf050fbe8e88a74def
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
@@ -155,16 +183,22 @@ DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.
 DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip 44017 BLAKE2B 598c6308995ba7e6874f08c56f5453d4f3b68146ee29fcf7677571cc07d39a8bd4b78fe2d7d706e57571f00807476be399b08104a0a8bc3b75cc8da6528747f0 SHA512 bad8443888a33c8ba1a18cf07b09d7401067b6924a2a076a00efcdf959a5d720c2040d011d0ba6d6f0b0844b9605928d9798e57a0ac39bf08c0856cccac317cc
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
-DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
-DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.zip 123357 BLAKE2B f90cde27ee435ad6c035c1f5d5e5269730bf04c3328ac75e05f10d4023455e73b1a6bee17685393bfd32ca14e4887eadfba2d882bd0d84ad7a3a9575f7b31dfa SHA512 18c021a4cff23572c12fab0f163cd775c9cc046d5216e37d18ac461ea113e1032d504c8877c240bb3d1461665f926dca9b42015991688fe99389a55e2e2ae797
+DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
+DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
+DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0
+DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod 33 BLAKE2B 52211e27792f060734989af8b47b48f3f9edbdc94b49917d715bd8853a3f05ac714cfbf752d3171b4c223a8787497df16e1ee46b07203a6d2c4cae3540c66af1 SHA512 ddf8e796d04c0741342eae18ad343861ad7a76d030a5dd9a27b1a68b2944a0f94ec21b1513640179c73c16d79ac309b8552dae42d6e45bc0f03d33269666bbf6
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip 127557 BLAKE2B 1747b001bc860fda3bef9158f85863e56c8751834dda8160e80075efd64079059cd088e6e31c3e951db81823cbd33f4787e55b5afca96795707d20b00d09d2da SHA512 d64c47cb432cdddd39ecbd6f53a431ab34eb1f17e95264302b8708832166f847d81dc650e9a61475389b33e0b5b08f8f7402258d1ae927f4fdbc2cd098326e31
 DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
 DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
 DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.9.5+incompatible.zip 111939 BLAKE2B a433cec67d0b6c92b0f65df570585252d52b9f2c324ac0bd50eb0d5c66d07d2c882b05e964bc55a37f7da33d3caa4314c412278b0070f827ef1fcec26f91ab64 SHA512 76a4e22da8f3a310cbb6d1460ab5c7a8cc4ff869c43eed060f062577e0632a11e722b7c8bfcb2ab22b2164d488e9725c4628fefaa97a840fa894260e8901c240
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod 46 BLAKE2B 26844d83faf5b29bc13a3a48ccf6a3648324503647617e8ff13baeabe4d95ebc0e4f2ca5014b553148964625323dc1a11bbc0a4fb5357be97770a3b6cf808bc5 SHA512 5ec3e01429b0c86caa7ee04de7fd70505cacce1ed540081ce4c40143c8776cbb75443dbaa47642da02e263c02c7e3557d6425c3cb60f03a5bc296a1cc3b6541d
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20200808040245-162e5629780b.mod 126 BLAKE2B 61e87b28d4944577f9d4ddd90a56194bc3b08ea52d7bb27a2991926011388454940d96afa4b1d0bddf83cad681f3e790430083db30a3c20458116ebc4c77da9e SHA512 4a813d480584ba75859dac812d08c85ee007a15d520041fbe66b1d97b8b7c7fd56f95fe2748e072a101c718c5e4850395e3537a077d36f81503eeb39b7eded44
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20200808040245-162e5629780b.zip 21007 BLAKE2B ac5a830362e89bb45791da44f8ffdf692b2756374b421671171aab034f18f6b6c720aa5582e831a16f769b3abf1d3cbe85d1326de371ec16bf23934d2aaf6781 SHA512 a2eb9b733c8ebd4279e236d1d4cfc84e51d3c3d302beb4b9448071c3e44c01f0d9376381987432488a4014ce13d20bcee20e3af4f24a924e98e2ec627c73a4b3
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip 17890 BLAKE2B 78d64a15d328529200d05e6830ae69d4976e1d61df1f335e18e32614b64727b88f008e0369292b15ba633c0d3e687f6baf4520667f22cb9baf8f3140ff9274c9 SHA512 c83ecf63153e35f4fcdf9a35528a3dc2205ead882053682e2ce8d35f1c57bbf60aed92277b2e599bc25da96c1ec3563d7f20505aaa17e78ae5e484b20c921164
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.5.0+incompatible.zip 18363 BLAKE2B 489ff272e19922758a7fb1b4718b0f409514f24999ff4e49b75c301c532ee8f0cb3892cacb98dcca51f58ed27761d270a433eeffa0a6be5ef9ce6540aacb5c03 SHA512 1ef2ae9897702e9eb32b2ccbf6717ebd92f647ba6874de1e4f1fd8ab668ee14e098b592d6f8b9320e5358f090bcc7e39e6c708c572771f05245b9d4a679b98b1
 DIST github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce2651d.mod 39 BLAKE2B 7045e72ec933bc321a8d41526812f0f7daa1961fddb7c5a569a4b104f8bbc853b171ccc52aed36807c71f188130a5810a49458a3807d2c38949f625017421520 SHA512 2b1644078068dbd74ed69be1be7ff08e3acac8fd53ab723ef2f9f2243b70fe60c9dd427cefaaa5364a93fc8890f8c906fa8d818847ef0b9b4edd9892f2d2b2ae
@@ -172,6 +206,8 @@ DIST github.com%2Fexponent-io%2Fjsonpath%2F@v%2Fv0.0.0-20151013193312-d6023ce265
 DIST github.com%2Ffatih%2Fcamelcase%2F@v%2Fv1.0.0.mod 34 BLAKE2B 85d050ce327c96665aac0e7954761b42f6d30256c4620a15a171ae3a92abf4ed45d026973d9d74fc07b90617885d2c002e45cac9a38f03f12018d86c091981fd SHA512 547267e05f39979e80906176e520bc4e74e48f9f96ffcd9d862f974972eb8238b28ed0a0ac891e3e0ebd6d635de98192a38534155fed9eaf44ba0b94c5ff1d9d
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
+DIST github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod 33 BLAKE2B 69d161a91f7a47f08054ac8715154885a3615d8366b32d226a08f3bc975f6c87d168006620ab53fff5ca938232f06ac9eccb1b7c0621c91f9d7368b38cf29bf4 SHA512 9376e6913b3d764bcf0de41f4d6cffec4da5a8d387488cf531113e1597371b838fc398020bc85fdbb0583fcd9fbc2fbcb23b246c3d8147a6c606bee3f0974882
+DIST github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod 32 BLAKE2B a4dc1d6fd70150916e3bab8b310fe7ba5c26aacb90241b18ddb51f2608ebcf4e82f29495e663181f5a7b1f0f09e0659607eae17850dd0bd3ea8dbdc0f4fa6ad1 SHA512 1e3cd7f2ca465a9930734e27984262e81d563551917c8af55c521f15cfbf56a423ef918fbd282b4947c81a65ffa1c17294d4cc83aae639d9432dd3a52fbe8e83
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
 DIST github.com%2Fgaryburd%2Fredigo%2F@v%2Fv0.0.0-20150301180006-535138d7bcd7.mod 34 BLAKE2B aacafc6177e1e87c8f4a17f295900d749608f722755d31a1939d1b601e4719984c0d1299fc4de9fe74c1109852009daf4641cb5c81629788a639eeb9314867c5 SHA512 c4b5fc4230e8e9c7631f577ee15414f7a72bfe27af524fd6bfad8c38a81426411dce35a191d840a9c69eeedfeacacd3f2a108c5eec35a3e30b0a7b262b15340a
@@ -182,9 +218,12 @@ DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc
 DIST github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20180905125535-1ca0a4f7cbcb.mod 33 BLAKE2B 8921f64dbb125d824bd11b0328613a447ba831d76ed34d028ebb193fb88097931b256568306d16e17e7506631e870349ec1fde283f9dc94137a8bcce03751349 SHA512 de23a4c4a97845b7eeb623a981716ac97271668fde4e120c5545d260d4d3cc17217d39113f4704ca0edd41713f8e54989284c5b2a09a1afc2897d34c38277a3b
 DIST github.com%2Fglobalsign%2Fmgo%2F@v%2Fv0.0.0-20181015135952-eeefdecb41b8.mod 33 BLAKE2B 8921f64dbb125d824bd11b0328613a447ba831d76ed34d028ebb193fb88097931b256568306d16e17e7506631e870349ec1fde283f9dc94137a8bcce03751349 SHA512 de23a4c4a97845b7eeb623a981716ac97271668fde4e120c5545d260d4d3cc17217d39113f4704ca0edd41713f8e54989284c5b2a09a1afc2897d34c38277a3b
 DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.25.4.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod 2670 BLAKE2B 211a6d7642da991f148a7998fd35875f316a143c62337214ff428b4eecc7dee7db044e42f337edf531edc70b9aa99f46e349821864a63d384c7d050e414a608a SHA512 fdfed8273d2014838eaed6d4d2b0d92ae905fd796a0fec6c5a0eb27d15ec31c72e1e79973d909a1ac01df1a2e5afac99bf17d5cc7d08f507474c8e8e7ea88ef8
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod 44 BLAKE2B 0122d72cea88331beb9500849a0936a966e7a48abdd2e76363151bbb124e35481e7248fd896523eba3c51c5f4575dbc13304c2471477757c1eb2f8fb2eee9cc1 SHA512 bfebb8d865586729abcb0dcf4c19a8938f06f9b502c78bed92d01c18d1d037f7df44cc1a1fbd4ca094b1835b8aefbd48fb5988e2884656ca44be0aa83206aadd
 DIST github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod 31 BLAKE2B d141d98fd2673b422369b754fbd430a465f08bcdb07fbbf1ed626304ecd0843255fd2e909fc395b04c7adec18a15dea65ede0c64689be98b7491729d13363db7 SHA512 45bbb63ae2dda8c2ea63c9e38405b379708326c3f2e7963e3589ea53d06fd3bdce1613b5a0c1ef66f9c6ddc21374b1669218bd6b3210918df0a4b205116f3e14
 DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.0.0-20180825180245-b006789cd277.mod 38 BLAKE2B f973673320ec56ab6d8ebff0f6a789a40d5f861736377298de042f2cddf926994bc99611e4757c4cfc34b3dd515609ab9b5dc2b0501d1929d8580b115beda0fb SHA512 23b05bf2f58a7e584e301622fe71160f6d8ef32236c48b2ab9f6afec79cad5afcdf7dfa729073f7b29f1f94fc181c86197de2f05f9e80624411802f55f137c50
 DIST github.com%2Fgo-openapi%2Fanalysis%2F@v%2Fv0.17.0.mod 277 BLAKE2B 10729c6eed12e23e12e34c03ae63b5adbfa0f8abab95bcd750a534de50ce0b59e6082c53d64ac4fa84a075bb81fc1ea596f124b51ef44008fae5debeaee108b5 SHA512 9006a6e1ee363f5705d3113efb82e2317b624ae637391ba0d561fc9bfb0ad389e1741c9ef5fba2ba5025c3f2d3241be01bc62f4c9dfd97c389e673c95c372c4f
@@ -249,9 +288,12 @@ DIST github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.7.1.zip 112274 BLAKE2B b38ce7
 DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod 30 BLAKE2B c4b58079c7f353b01123ed35c24b8c9dc43139a9c87b12fd90cb99e41b97d6e2ce646710b261dedd2a6c9572ee42e677be0ffb43cbb8cb55b99d1eb92ac68f4b SHA512 e0a6df51284e6b2faa2ae12bbc2c53c649fc503427f0651fefe99cd852a012a76a9c5d967cd1a088e1b3270f9b68abc39f56a6d823c5913fa025b771145f80c6
 DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip 50402 BLAKE2B 361f6199022b22ba47eb17a7d85a670c4843cc4269df2587e8d9fcd1083525308b74f0a164dd1a59aec04b473da7eaf003bd005b92558126f282600b3cd4e262 SHA512 87e7c1792bb3a5ba1c78ea5844c0083abcc10f60d19019bcb763cac5aa7dd7625903e074228562207e836803a83bfb086148d886edc6d24e5fae7fc6d8abf11a
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod 39 BLAKE2B 9884f8a07f2a84a159eb17ef62e9b17398b84bdea38fc37591af050dcebc2f56b83f851046c3333e604a7f954b7628c16b267c0c94807f7a41d5d2b797db0918 SHA512 c32a84bb302c9db3f31f714484131ee3ea96fa98b224b9cbf2c5fdd15100a24094e94b55175cf1fb0b6326128c2db8950677d8f6d281b49645b0c7b51b759093
+DIST github.com%2Fgodror%2Fgodror%2F@v%2Fv0.13.3.mod 265 BLAKE2B 0c35804e140597208249f6c44fdf85a69ca3657db095e99ea69a46db794bc9f4b1c036afb98cc2bb0083b3c585a3fcdfdd2a6fa0762be059d2d77430890c3496 SHA512 f6212b0f7750a77d4d70cccb317ad0679f2758fbc228c574975c2675181f0b665baea33b6d1bb5a1652f563dc857fbe99485c715983f34d786e42e1f32260fa2
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.7.1.zip 11234 BLAKE2B d806e8bf8671c1e1adf0dc95ea61efdba9a53ffd1e4b2cdd469030964c7137a51cc77ed65b2788ff4a692ab6ca46572f30e20b6b8c7887eb304c07d8f835fadc SHA512 bacd8f76999947d61c25839c38fa102b4cd7c2998573727309032db6ea47019147f51d2c03d38744e739b2e26afe0ad49c330e936649ad848d332ab1d04c3bca
+DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod 34 BLAKE2B 92cad2efe22c009b9447a03343841c211ee06e0a78939c6ecf3e367dbd50c725562f6c09705f8fdf8131a9264a814d6822d3724a15682f446ed869b97febe388 SHA512 38d3341ba73f1537bc4df9c5a3938d1e0effb065122b4b1ebb3277a33c3e70674b28a32ffe8a79ee8b6a353233c6ead616b7749244a3af10306bcaac678aca8a
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip 2698974 BLAKE2B 5fcb1c66d3fa55efca631fe5def383ec089fab784cad7d6a031ea390463a0c552f5fc4698f7648d271f40fb0ae3eee525f149347bb409c951d15d86b7f560e16 SHA512 c7e2170eda176da203ca64e402c11489c1fd183afd3359742e373927ff228d62e445f5dfc001a471303e1708862998c125ad4c2db86919596297b11cae4aee9e
@@ -261,6 +303,8 @@ DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip 38604 BLAKE2B a7d16e6b3e1820db97600f17bef2076ec815b81d36c22c8ee927012e8df74bcfc6a3384b2abcffd974a1635068ffa5de9443b204c587df10c9593f830e1c3df8 SHA512 af7492e0d36fa2a876c6204a651d250193900badb819dc7db8c62141d7ee7253eab9d87393a131059587160a0a5f7d373017b2ea2170b4ca6d91e9a58175d88f
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.zip 39653 BLAKE2B c84bb2352695575c56a32eb0e7a8d93818b15625d850ff662039e5650f78dcb06a093203d0987d00a2271ad02e811182cc7fabff7f8b5d5475ff2628d18bcb13 SHA512 050f33b3dd4053885c46c07e7f56cf45d6addd908549ca5ed98036aa14e964a7ff4c30e08887979a69f25df85af131491fc80a62c36d038b1f3af5b3b06756dd
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.zip 39652 BLAKE2B c4c9dd2930eb417b8c6bf129489c3f067b5d127ed0194808d8e7594b477fd13ef20154508126708fc69cf855ee298cd4e9031bc34d3ab8025d2b2fc67ea21f78 SHA512 e23a4491896904321a371bb972437a0b55df33fe7fc31170967d6b4c0ccf917e34f94753112d4623518875ccb4e4da2e58cad54e0a821dc4e07528021a814b3e
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
@@ -268,6 +312,7 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e8
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod 35 BLAKE2B d6addf74aa6a2ad97c1792946aea166c48bbcf35fbc582a9dfeabbdba68992106b7cc7b2515ccf002f44bc74c0f0655089e3110e39fc312a683b1c364318279a SHA512 33a68d466b4aee3c41e6d70766e90fc7b7b8e904acb360d1a5e15236832ca47e5f45393a7f5c486893f6a8ca04af4ca4ced27b064c15a5189217141a325972a8
 DIST github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod 35 BLAKE2B 2266c9ec6e2058e41afcb70dfe33ef7bd1d4c0dd3ef6af9dd85d9f86ac0c5ebcf231c21d66a0c34d6e5930e1de410ad482f7774a42398aac213eb0146c2a00ef SHA512 17790f178fd61969fa03eaca0c0a546ccb8215016d44bcec8105cba39a188c855b5f90c7d6c01fece401167daac2b662405532ac3b38e0a167a2629e6d52a01f
 DIST github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.mod 33 BLAKE2B 1f96bc7ad16794099334f84bd7b7760ae7eb94a4b32186b2d408e3bb424d19b22b3eff38a817c6ab845ea7c39555305bb940f2b9b9e83b342eb4169f2237d207 SHA512 5a17ebee3e4ae0212aa83c4923932996988a3a693d0ece14fdf1aca4193452ca43cfaf4bb6dcb78c3c7b996300ac285c503ac18b098b95445bb26b7c25cfd25d
@@ -277,6 +322,7 @@ DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
@@ -285,6 +331,7 @@ DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod 41 BLAKE2B 32370943a480c1366
 DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip 16936 BLAKE2B 04270e67b679a158d5675c41f8b92803ec49d9d29f4e8725345c307d7cfc97a4876b30f6518eadff651a38af46440e184294ea48757dcf53ace35f44d36801f4 SHA512 c94aacb755ae942dc487c9e8f79f01016cc31fb118f6f340a58eb4f458de5735b2533af6ec513cb4512a05e270cca73faf46c5f3f621a0b76a79d0606000d3bc
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f
@@ -296,10 +343,14 @@ DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.zip 537340 BLAKE2B 6c20d515
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod 201 BLAKE2B bc1972ace31333e12a0462701bcd8aa135ebda6f8619d3f98e4db0bd037ab854873c68c2503812fad3773f1bb1937aba7ca4b2af50e8eb2c13cea5aaefa7f573 SHA512 a1e237b3f47807afcbe3eed728821d15da81c78e20562ded5a8cdad18d498a670cc4e1c10821374fef8661afb7ec7e41f27b4dab8db2912db7edbcdc642815cb
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.zip 1719536 BLAKE2B 0df6f7e2df2152bfe6ac0e7065a8c2a2638cc82ca532509cecf5f102e16c1463ad38ac75d324eb38f12106e4cd950d647805dd246860f05f1168ff7c92c1c1af SHA512 ef4d868f6c9f92cfcb5bf7d53e02ebe04e14fdc11ca22e7297d88652b660f6667d491035da7a9a1dcb25654add04852e968f9b7633d5c363534c63db58dce8bd
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
 DIST github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.mod 35 BLAKE2B 549faba95b001f14aa66c628d300b6b0e496c92cbd87ed5814b4dbddd422df6d5d7a38af10ea061e512df4129189d221bca001f2b23ce7bbd13fa0b7152bbf4b SHA512 b4c8a43e739f69430d5004c01d083be6f65a70301adc0cbe824955a3b7b50dd2b6033fe8db18419390cb577f89533e9b0399a169f1b10ea39fb2f0c0e3cc47a9
 DIST github.com%2Fgorilla%2Fhandlers%2F@v%2Fv0.0.0-20150720190736-60c7bfde3e33.zip 16013 BLAKE2B 135b733b0c0d29a5c63e5851c02b97e39ad1d6431f736d75fb0cce19e792e0ac54cef4a5bd5db56a6a0664a2c7e288df2fdcd89346d43296bb758ef9e0609e32 SHA512 1c0c619431c127891f3fa398932babd87305114ff67abdfa36c846480fc89e85c0928ad20d28a6f937a4e4dcd1af670117fcc52b123d424ca83a9e166f101264
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.2.zip 52079 BLAKE2B c04668f509f8b3bb85f90304bbd60ab871c2dedb9ae91a363e692951d6be27fbca226016aac4dd7eb345face0f8d318fdeb99a68b7f0db6c41759a09aca905b7 SHA512 187e2308e2a487929d71144596f7e0dea1d4e85369eb2ec94e79bfcdd895b3355d0a9ff75f68d0e915f9c45e4140549d1a470f48dbf588a43c472b635c744b28
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip 54002 BLAKE2B 8f6fc685cc85f850ecc0b7dfd63c37a23dfb6d0b43107ac749365b10f254f8d6cbb16462848e317d91410af8524bbb1c7856eac54c7e94ab6a92d813434b9c40 SHA512 8f82d0b2d7e881b7533e6755448c01a8e32db5bd117d61afd9456387ec87761b58ffad050c4b5051ec4853096c0f11fcc5b87be21c4062ddb3d365e23405123c
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
 DIST github.com%2Fgosuri%2Fuitable%2F@v%2Fv0.0.4.mod 33 BLAKE2B 445c2c65e596b5a43fec1c259e7f0a0d16be0b7a4af3f8b294f3aaa5b70b5dfa3bd799f6f9f77fa47dbec93181db36a1d3ea795bde3261e21e3780f083203880 SHA512 c33959643b21f71c73a081ce30fc6a3e3a8dc5a5175046748a9a55bd2171682dc6314f2fe680901271f968279e1389f041b8ccab0c2b6df5584ae6b903208588
@@ -311,29 +362,45 @@ DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.2019011809
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod 449 BLAKE2B b4fd520f53e935f4e33630427d57ba97a516afc5c20d4b4c62d06cefa9f77c6f2a043afacf95c9e496e8ff573c8feaa638987ffe014d4432555725a9c9f920dd SHA512 ef9f64ec39004adc78f354ecd2c614f0c76cde23549fbbd778b458699f4aa104972fb2e5c270e7e223fff6354c309873c4c3611c8d746d2045f2a69dac861830
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod 42 BLAKE2B adaf8e14cd6696bc97bedcada70988d2508d8bf28e94a8b528067359665aac351ec7b7f38ca1a89ceb0c18c3c7935e30af4df20102563c9372b34b0cf54d41bb SHA512 da70feb8b6a17512c3761ce6f13653ea47bfcb4af69b471a3bfde9b79901d0f24ede05c10d35f3e051df54e1e636a848be5d00194ef5e9b85bf7915d6b27dd0e
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
+DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
-DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.mod 33 BLAKE2B 1001759c50e0b825975577d6b7752503eb891aacc3d3a5642a3f338fa90091ae6de3cc81d2d7270ca7fa0ad40e01cc53bb433dfd079cf419904a1ba910014bef SHA512 3f1f76283ecc9d917de9b7061becf780dff161774eab48319d9094f08f51b7e4d82a4a068fb543ef766ba73d26346de29c6a69ac31e83f43186924aabf5b3bb4
-DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.zip 23295 BLAKE2B 7509d0d278fb0e01c8a83013382c335d0974007ed7c7637248b1bb161cc75fc9eaa8e89766acca3f11f0749413388ceb07dc11ebe894545cac98726894855928 SHA512 9201c976a637124fda2853aa9963613653165f96d9a6a4d8f100ccadc692686b168355769e643e840c0f3e44944e5ccfefc18c58157f38ab6b8acaf3f4b29953
 DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.mod 43 BLAKE2B ea72fa407faa556d4164e25aac2a8093cfdd8efdff6f68f9ebb277ddca3aa7efe0df0f22546a36fe6858c22dc638869cadcde024e32d0a930e0cf12ef5b17c7b SHA512 f6d3531d393904144d7c84cb254becfa2dad42f8695ce32e3f44789abe89d60019f01543936a64ae1728f8d395dd96bace969282e3cd9f8a9eda8085d3d1475d
 DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.zip 24521 BLAKE2B 6fbe5fc8d03415b09b19029c9df95e8a3169c4d4181a988167a104b91f81b5d359779c9f3b51e71dbea191c8f4bdd70fa11d0f47235a10056725f0a6c97303e3 SHA512 20e6207e6ab0e5bd23e4e496c19573345228e0abc804db1a17dab11dfc2c9926200fba671292a63f09b88b91905d867d817506a7bda25c261b3c4002cab9e961
+DIST github.com%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod 29 BLAKE2B 7cd37a0dd89dc331943531c8477a4773980f42e0c135a159bcee3ae6bd82aa8f15c4d67e7fa60878a35c7fcb69d647738095087775e18c540059fff6f4dc192a SHA512 28dafc16202503db863783e4701ab30b34c71b4435a4859329fa635c0915f0ca408dcd8c73217e0751f879400845d8136e171bde5d0cf6b7fa7ec4ae3ea97f69
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
-DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
-DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip 26261 BLAKE2B 65c5f6b4f0e2af1076e279c5d3f61f7d6b8654b8a7537aa291693a784886dc68da0c40b480d881c41bc46ffb28364b90d22d88b17cd82ac8380d5ecd9777414c SHA512 448dfe08b2a5f7f2f1e9868274be4dcf7d2f2ae495994d16c74924f8059742204547ef2abfb73428afac3938e5f477a9db51b29bc76fbda32e01b67419af46af
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip 28698 BLAKE2B 76fa171ec22419b864bf42855bc0286059dbb93de9e174f8693e132679c762346b1e7ade3616404a20b8b161336d1cb2ccda1c7366a1b8d9e329a82d4c2775f5 SHA512 6dbdd7d3f35f7b6fb1088c28dc1d05bad04fc46d907273acb55e991c708e7b06f5b2db86ae2d6669f0720c3bc95816971ec4b39e897e714344817a83d9ed4583
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod 46 BLAKE2B 825c65ce0e045d5c764d3ccae81a25c6224c44656bb8ceb93f39d06a0c8d766ce7562e5ea1ceed903a5d1ad4c035e27ee84b4311548d024e108a5cd6ca142508 SHA512 324450602d8234231b0cf40b07e8936948487354b8f6e92012f3e65ba3c646b0993e4722d3867a12d0bd3749c8dd6fca4a1118393e2ca682170e500b3d54e5fd
+DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
 DIST github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.0.mod 145 BLAKE2B f260c703eec27a229b5bf30176cfdd57dace844cf14b184d9289cf197092ce4bb5d4c878dfaa54bbe3ce23e9c28eeb35b94376001f4085e2f05d3c977b48d4c7 SHA512 b529b6f0312bf2be99646e11a339a97885716f44408714cf2c4343d5c5cf114dfe454fdfe75e9d5ddd9e0ce8c3ba451ba0d3729eb27616246c0bb72aae6d29c5
 DIST github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.0.zip 60383 BLAKE2B f114ffe3ef1bf6e7090ab57c4ea9591682fcad6d150b3d235534b4186580e3f66f5b4244fa47e8d62b9cb1a317bdf558962512a6c562858a1a0d2570bcdc97c1 SHA512 ec6e5e98ea9d968c27878fe0da8b7a566920202eabc53607e91c06e1bccf6044bb33d890d2c5c7c03ca2051ee1b0b28c043c77acdafbfa1ffbc232569634ed6b
 DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod 32 BLAKE2B 108af2b21e180487fb535381cee881222cd34895f1b3d78561bee6bdfee40e7b9681c74345d10881fbe519fc496181b85eb880b5ec411e13b24926a39ae8a512 SHA512 5b3e66c42da78c7df031089cc05aabe56671eeda4617683a1e9857677108cd0dec00332f5b05f29923b1314fa1d1c88e57fac1b653808cadf5a3cde93daab03e
@@ -352,6 +419,8 @@ DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f123
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip 3968 BLAKE2B 223cfe3604cb674a11d4558b8f5a35e2eb41cf11d536e2e2cbdccd6a3c6bed8abf66f450774b39e7247493ea8a382906617c5f297fda02a272b18eef8dcbcf47 SHA512 16c4bf83b78541d2d684113926813ce4cc91f3f13f34dc2cf8d643661dc9f21a988b8382d2c058e138fc87c1ca197e8f694b07595959e917c82bd6ca9101a5ec
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip 3966 BLAKE2B b638ca22c4f9df8cce5b84837e4f72b009c1ead300c08807b8268d26f04d6cc5476d9af56f676d8f4ac046c78c333614670e0853bee13de3439b5d89b96bfbb0 SHA512 ff98f8c05d8e23fca69ee5ed780e728f9d1779ab55cecd16bff890a91d14af81ae7a0304f34b3e04fbcbbb61e3c97c044dd9c190bd8359f3b19bdd31f8a37329
 DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
@@ -365,11 +434,14 @@ DIST github.com%2Flann%2Fps%2F@v%2Fv0.0.0-20150810152359-62de8c46ede0.mod 26 BLA
 DIST github.com%2Flann%2Fps%2F@v%2Fv0.0.0-20150810152359-62de8c46ede0.zip 7157 BLAKE2B 914975b5aaddf896cbe00547422fc3698665fdb8c50baf1a8f0f244f908f25d0fdedf4769aacdfb9b662180bc4365e09ac9117525d10bb039bfbe83de86df293 SHA512 be7bb138627087e0070b260c37d4ba7dc4448cb55ef8f610af35b067568b4b305e32141b0c73687b04fd5cbac508e6b3ba11f6ef60063ce563a03da5dcd70ef3
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
-DIST github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
-DIST github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip 114746 BLAKE2B 19f9157f1a163b5dfd9e5a2b09d92873c8ac191aade266d1706aff1624f3bb0d87fe7cfe0c00c4c02a7cb649a98d931d1f95ab547961778117b61909982d0231 SHA512 3da4292db7b32b1422a7c85497cd4f8e27b532dbd7570e41b17f9388f9377912cd9c8fc6c205bc504f652f7b3c6945ea21f125c14c5bde97dd4a629e327ef516
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.7.0.mod 34 BLAKE2B 1f70e2e8670ecb572e36b3697429bbe82bb3372aa977eb116270674c689b66d2195dff69887c8555bd886a67a07bf1bf5d43c2eeca0bbc51b6613183378eabef SHA512 f0f38407ddaf1cddb83a07d7435e78dc4bd789761325b68d689a6e571e8d28ae352717a7aebabf4b63918fac9fb792f6b7ecb0db4898b563706e1fad9c30e13a
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.7.0.zip 118248 BLAKE2B dfb22b271b3d13a80426011af9eba01ca5bb8331a7bb51a86f9091e051685a9c29598a1921e3ac688561a33d1fd2cb7dc05bde1d448918f5b587923b3c1b9d4d SHA512 28d66049239d7e1cddfa7248d3da097e51bc8daded19218b7a93b1b87d79a3ead11c710bbeca675128a130dc89ae27a5fb88fb2e63a8d435f25d401c9fbbf148
 DIST github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod 36 BLAKE2B 16dded88c0f04a1444be329ce01bc4e336b1205b962021589dd7f8d999285da6517a4a332f585e129250cbf7387157e713f0a6703dc0b316c4581e7782dc199f SHA512 7c71255a224e45b30037823ae51ac2805b91238b6e9e5cfe295d822428af95760718e2c955f15ad672011d317516657a568b412dc2e184f068d1bc18c2eaca47
 DIST github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip 14370 BLAKE2B f420806544c85e8956e5588873c10e604c75f6a830510a1e163fc278ce802de4b444a15b01522249749abd4ae77510cee97eb7f4e391e22c9f4469bc705a97e7 SHA512 b535bf7bba884b24e7a97c82b12a48954a4b5b7510c3383d37bdee5963457d3122ed648f91432f9259e6606927fc2e9fedd56902ec20223c8478c2a0650b3b8c
+DIST github.com%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod 267 BLAKE2B d2298b42ba1b8aed99658a846dd1ff5cadf5403411766efaa880ecd043a56703ac1089ea5edb04b391d710d99f9b1a1471628043be868fededf189130bf852e4 SHA512 76b19a140339b43774f3df87d1de97dd4bbdbf5939f523fe39faca051dd2a4b9e719dc147a0a2f931fd30871c30eb6a628d58bded12271e04f6de5d9dbab497d
+DIST github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod 414 BLAKE2B c0bcdf3e0a6f510eb3649030349e26c3d78608af9ea46150e891c17463491da92c544562b60cfaf35b8e6e11cba5b43bcfe0a8bbc3e3cf7832ba6114ba8cd9ae SHA512 1ca2109c477bea717b8f66a2d57c35373adea2fcaf4223d85770be21833824334e4f9010c1257db95e345d1fcab540c96a40e9abd7bb51cd993559c224e79500
 DIST github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod 35 BLAKE2B 9177d5e73b349b57f364f3bd14e835a38cb33ae37d914454aafca908004c23c3902eebd21e9841f93b9728dc40d061a78aaca599e1edc1df0c941fdc1e972791 SHA512 f91dfedfb737f905f20c50323be91dc990ef172727da91efea0fbf25de48f1f4fa8e288032ecd89af0fea177b905be7986ebd1cdc7e64853fe7fbcef8fee436f
+DIST github.com%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod 43 BLAKE2B f49107f68b9d73c573cfe976efad9dfb5b4555aecc4b15eb4b1592d1ced4cd1cd09f1d2483e7476f8732dd1404a07d9d9a35df84c944cbe21b46409dc5802265 SHA512 f4286a907eaf928904461716aaec3d5e58a826f2f50c6568f70aacd2f14c9d226bb633ebf9fbc8e492961ca23f459be0c49b1ddc644fadcb7e90e99818fb03bd
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
 DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20180823135443-60711f1a8329.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
@@ -384,6 +456,7 @@ DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip 10606 BLAKE2B d9aed9969
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip 7026 BLAKE2B 3cebbd0bdebcd1d32b7fc618b7190b7813876a1df010d1c3ca3800c41acd64b6537e4b3e4d4a574e3eb736822a27eda7bb2fffa197063baf9a347a820573883f SHA512 829b0596279218a2fad36695fa42036f265ce79903a0f5aad27495dfc7c6a33e8bad32010e59f4dc6853f1e38fd9e9f635ca2f56adaf5ea47e4914f2a892d251
+DIST github.com%2Fmattn%2Fgo-oci8%2F@v%2Fv0.0.7.mod 41 BLAKE2B 129ed36bfa9feb6301439c50064a8e3f3fd3b783a2f4b194e424236f8548564d675c6e30fdfed1a1ccfd1bc3d6b3a4d32bee13461e7b201b937c7a3632a2bd80 SHA512 ae6781d3cf113f60d49858826191e466204b309a687ce0bb53dc4436a8ef6096269d29dc51b3ac766eef6f9e91e8e27f72bedb1db3178a41b7d8177b90d62067
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 22344 BLAKE2B 9dcfe0ef5fb4f7e493f29ed3e5edc8ef2744351a4e2a5b70f5a8931b503925ed58b5f5f58e3512fe5fb5fb8d2e7bd1598037f29dac4520e7d966f60ce5f2d307 SHA512 fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
@@ -394,12 +467,18 @@ DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.12.0.zip 2344176 BLAKE2B 5e5fedab
 DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod 35 BLAKE2B dfade1d4d17af2380cb103ad9a0c91ce0eb7e570f9ab98d32c8d74a9056b1ba89c44c6fbceb4a2d5e5d45bb552a18e5845b1c40d8d1efbe5a9aa87e4af0ae2cd SHA512 c929334b82e3174b98a22bcc58dffd1291e3bcea6c5f789ab36296353cafe0b09640ba7015ff559acdaef58a9212b0367bada54aa89f563c6dd4773f3220c04e
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
 DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod 91 BLAKE2B 22854387f9c0bc85c6f4b7b9c5ce8a774c10c6be0c43ec6d188b6ff2f2e394ffdedcdd1bc0b8ba0e31fa3c418cc9339a78a798beeb355032a0724b284573c38a SHA512 8858ec62f3bcef65224ee7d66bbc16c080b2ed16609c46c5c6b6d983b9f7eef9e020a2ae78a16d0226c0f02c609ec5da92565861c02a81494cd6060dd56d005b
 DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip 11210 BLAKE2B a469026ecf6a1ee2f2d56091fd90f00857cf5e57164ead9e53c15af03d10a8b737a1d2b2fc336e3e972af014dacf8f1321ee1fa1cc9dab93790fb6d03ae195ed SHA512 30b1a531823403a911d9f877352218890bbea15d82390b4561ebaa4bab09f493d49181ea5c34078c18df31b1896165e80c4862b450ef5858ed8af55b2a0c42eb
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
 DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod 40 BLAKE2B 089a3d8f85648feb04c692c4e108e1e843217ef67fb3d5c00ffec847c06eeae55a9432c206753cb220595441da76b635f33a9812ca92f04959b4e7dd08644abb SHA512 e8e4f318e3cc6d203ccc62c0b47af2aebee3fb99680cd6bd24af023442154ffa9c3d4bcf9064af5220f01d3cee71e7c600e465e3651ae0d7d15e2abee1caed27
 DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip 3587 BLAKE2B afcc45c660601467eb2d23942c845c71f5e61277308f9ed56fd86794f2577f9c61f0fe00b6d04d348e16e94616484cc4156ca2cd017eb25dcb5e985958a47cad SHA512 d08d8446d425286a94cdef1eaf227eb61d942e95499c5d4b5dc83b5e0b7a9a50eab2734016a8f57414acb8db8ca159b55900159f6c6ca67a51bee10c3a2d4356
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod 32 BLAKE2B d511476a16a86c50db84dbacb40afb4b30ac3f72c4fd5a8b20fdd8bc6de1c46592bd16b24f77bd037dcb23ba86cd217fa740b59a784c6fff0fea1720d2045695 SHA512 451fbf9129c151784d97cfe6af29d27a277b6821411cfa5b23e6730ba0f5d5a830054eb6ed660dd2192c16abd54d5999be5b80e39bbac3499c3198311d01ec1f
+DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.mod 34 BLAKE2B 420449db437a4343e47d666ed912d5c57298ec80d13265f293c3a2294624cdbbce9fa319e47ee530da73bdc06d48d80b4a590a03fa1d741f089ab302cadf071d SHA512 ded99f470ac6900d2627d6cefffc4adcd64946cc036657a805f90145aa83fe05478df9eb994059cd8d9613c75f3009221ab0405bcf7e14b00d5d950e09f3e354
 DIST github.com%2Fmitchellh%2Fosext%2F@v%2Fv0.0.0-20151018003038-5e2d6d41470f.zip 5590 BLAKE2B 578bbdeba2204a0acc470957c0d886e7a9efd2d5114a9a514044ca3f60267703a95f777a2ebd34a6e90c0349c3d3d38adce6f4ef2a001d68e1fda318eee05a05 SHA512 926263c71d04ddbb5f152b42e65985e6fae8e3bb33a35ef034a1c8f7dbb866a309d1705dee43d2af8eb9499d34d21f27a6d8c4579c13833af41e4a0176a4f299
@@ -417,7 +496,16 @@ DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.
 DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20191010083416-a7dc8b61c822.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a
 DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
 DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod 34 BLAKE2B 315fe4d5620c1d1c92df3fd382560ac2cf164aa17a741c1a74fc25807819de811705467227923fee7f804c6b6e96606c87b4adb11a6b722f367b543c2792cda0 SHA512 b1c163d7a6a139eeee1457fa07933f01eaf6d2ff24d10385e75f87b443a95fe1b08e9e144d3c18eb6a77d34e8521cc6dbd486fefe908e60452c5a80f654c551a
+DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod 71 BLAKE2B 01b34bcadbbfc83fd26f11a51b23b66f59212c6c9f9f669ddff2d19c7d563df24839933473705b86c235cc143732398d11f0ce2af1979cebc7594a742e325019 SHA512 8df11664ca01688c0fb0648e6943c13fe0c892ddd94cdf88da039470449726ecec8b0eaf69f0e41f277e9248502325093e698a8f949a7fb2ed9b59fa28bfa4a0
+DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod 71 BLAKE2B 329c114697ca9dc1dc69c4fcffbf488631b0a9648533db756495778f7ceb6de109798fc9c7e473c3cdfec6a049d6e21acb10ba6b1e2ec11cc2c2a99c03f7da81 SHA512 8745b75071b79f3dea777d3eec1e0f74cdefe5b202c8075994f7e68ba8e9bb87afb70d494fbf55944b12182d480da1c1f45c9f057c789b82ec2da81eff6079a2
+DIST github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod 341 BLAKE2B 96093120c73925e7a1705fee52cb06904bdb530d8f730f6ca7832ab0646a7762e012019020ba01d3781765cd3ec849bcfac3b6e903f2dcd53104c87bf845ba73 SHA512 b555bd66ca72fd51b16a45f9e21cea01a748c44c5dca1ff248efdb5dcd36b61a7a5527f3afa9d50415f6cac56d998aa8590f65e7c0a7f90888fb174fde83067e
+DIST github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod 143 BLAKE2B 946454f6ede7f2a46621597850fa560fdfa9b6a08a53c0aa95652fc08178dcfea523a57fc8030e5fa101128d697794f5a3bac20a3d92fd436f960975c3b18d63 SHA512 9937550a5df4b906c0e3af1777b64d119f6adc98f73738c2a8d376d665baa7bd4d0e97da7d93f0622325d80f84c3fa374d72e706bd945e50006b10f8ccce6a4e
+DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod 96 BLAKE2B 071f4237c2606c161d8fc6160c818259807572f1e41dec9b753653b9dfcf4bab8c2c7d201f35d803ed876b99da693d15c1f5ac4075b556bfcf78e9fbec4d2dae SHA512 eb91e385e6161b3bc7e3e2e337519c1435a368fd98a26880cb37f3d52bdaaf23d7b07e1c7430592d0c960050a08c3f94e0a18576da214e50fe7047f2324b0ea0
+DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod 96 BLAKE2B 071f4237c2606c161d8fc6160c818259807572f1e41dec9b753653b9dfcf4bab8c2c7d201f35d803ed876b99da693d15c1f5ac4075b556bfcf78e9fbec4d2dae SHA512 eb91e385e6161b3bc7e3e2e337519c1435a368fd98a26880cb37f3d52bdaaf23d7b07e1c7430592d0c960050a08c3f94e0a18576da214e50fe7047f2324b0ea0
+DIST github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod 31 BLAKE2B 294aaa7492b6b42b366e5130e12ca72a84223fe02b4f01281ccbe3ba68dc5b515428ce95a9b575219b4688a42aaeb1a5e0dfa3bc06a1db47b8afdda282cbb991 SHA512 918b829894cfd626c011f7ff13934a2c1c12c3482ed61652ec2c59f5b94a0e8c8510e3bef4f5cbfae977df177f8eb9a123738d7382a6a6e2f8cc582d50eb10c9
 DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod 28 BLAKE2B 57fb6c274af3e1f296bbb2c4b81cf52ecd31af71afac9be2f77ca58c67831ecac4eb2f4f8819c510f3e2982d9a5ffdfbb5f384db878b37b531e59e06e0093a31 SHA512 2f4794d0c8dfff16f1fa252eb5e3396e2cc5479c96b5e4af9ec01931387790e51273d4a308fb2813a699a54a3cbf6b3adb5e92d831d3032120cb5f19698bfd19
+DIST github.com%2Foklog%2Foklog%2F@v%2Fv0.3.2.mod 30 BLAKE2B cccdd5811f1be90eb22900329526d699cb97bd2bca45cf30d8b2eb7fa1f2539f107b3f5ac4a93b4c38c44abf88d2957fb3e625d93544d9e726ed4b2f7a01a9fe SHA512 cc0a9caf1e57dcd87dc0757fb61c2b503e72195e089d758278323ceb46d06871dfc15508669ac95a470386987c6410cf72d0729140d36d9a445a038ea79155a9
+DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod 28 BLAKE2B d1f2187d0457fbf3087b388af0e41fa8c7a6c1d54c9f22fb631a144f42adf679bd372b5fc45f8d6f33d7e3cfbd57c1b7da2c4e969ae32185281390db58e9acbd SHA512 41e5c366b775318a4162bea00a6fa4e3d5a23c2ddb5c2707e4a4fb77c42855ce407429a7cf9c8e506bc79493ad5c56423c70dab081187ea6c94fbdaa0d5040d7
 DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.1.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
@@ -428,13 +516,18 @@ DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.zip 243243 BLAKE2B ab663a1a0cbe33
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip 245650 BLAKE2B f917c3c8b6076add4a4cb59fcb1561b21785e9c7cd910c96f7decaeaf4f2c988566ef656925cf91842cb4218142d13f0487721c23dfd85bbdce1f847e12f1551 SHA512 bad04a31aa648777f437f3a7516549992962ef1c660694c02aee62508540c553a2ea36370b917d29a8e4510cc171d94590721c447e8878b562f55a7b0ca78f23
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.zip 157659 BLAKE2B 2e4a53ddeea8a6076af3dbc356f34d898c0189871a6328f00f0690479ca34d2efdb670a3c0a67c19a4d34684f25145d4bda7ea9a9cee1e26cc6d941a274ecbb9 SHA512 279292e468d786f0f94b627b00b7eda5049dfa9be7423ed5c26e80fc2c020787f5feceb7571654d903787089c0fba05f49539eed958f97238065924d6eccc003
+DIST github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod 32 BLAKE2B 0037f79655226dae67faa11b27847001c422534de854283b8124640e72f9209ddda65f4fd601cd35399c0d6705b65131b94c8bf8dd8a15c2bdbaa0c4404b58fb SHA512 76f6ad85ef60c0972b9193af3395e586b8da352614049125ea6b39ebddaed94fe3b6a5deccb8a4d33890f292795d2c44a3563fc420106bf24589a1d838f35649
 DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20170106003457-a6d0ee40d420.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
 DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv0.0.0-20180430190053-c9281466c8b2.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
 DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.mod 43 BLAKE2B 42ef42def0f24844eed6bfc710d0c5070a2bee3a4f5aa8b0ec68f862840385f035fdf6b7206d7e15a94ca419af29f7fc86358aa6fdd1a014f71f5acbebc4c182 SHA512 2fcb2cf84eb579794ba81bc9f79090999b3fded538a1649fee55d1e973425a775dcfba008a11ec1ba873bfbd3c2ce13abcd99fcbd9b0ca67fd35925896bca588
 DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0-rc1.zip 27125 BLAKE2B ace23a65113f48afafaf52d19231b51238dba82a08a85dc615a0037b037530f3fa3bba1af1ad885eed9ca453aeaa0e2585d2f1b94cecdccccf2e32d36a86f11b SHA512 95dd5f43096dcde7c21338e393977b2d8ff3389b9c9b24ffc11df2cffc73b26f3f16a6406b10281add7d6d952ce2276639ba94929491be7792a2cb8f40746bee
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.mod 52 BLAKE2B 451e6b2dce76ac1525c48f536a0f9fc9ae773978ca7b9356bd75473e075877d0127217cbb5695f1fe406295c02a7a9d5424f2f7d4520505d0119834c11645785 SHA512 708918e1cabb5710f63858f35ef5bb197666b2ab8220ee48b47575b77805e44b083dc7577ad3bcf9414fd801653c21be9582086ca73fbd9c5589380a7450a400
+DIST github.com%2Fopencontainers%2Fgo-digest%2F@v%2Fv1.0.0.zip 34573 BLAKE2B 156844533eaaa6410ac116ec0bddc68ac155aebafc017c51e6fdbfe0425a02dc878e8515795e9300b6ddeef776aafabb60ad0c420a1acb9b0fbcfa1fc0f84905 SHA512 be04251b483e39b4cf503ee442344d3ac1eabcc7c41acb56c25d65ee35eea414f798f159fc168ecf5594b15b9d5349c96cb9741a6c5202cab4bfeb104353a9a1
 DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.0.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b
 DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.mod 44 BLAKE2B e60ef6b775d320cbbd7d0d655e4a0d855f79c0f563ff3aaf0cf0a13485005c800680cb95535d57342c6f23a69da021089f7cb4d3caa3021852e1462126137887 SHA512 e7d3276e531b754a441e94acc632d7322837cc2320ced66e3e91e3512164ff84428a4665493bb3a7cf7e1057e82097bc54d0b811738b1e967b9c248b907d777b
 DIST github.com%2Fopencontainers%2Fimage-spec%2F@v%2Fv1.0.1.zip 170576 BLAKE2B 52c16c643c1e621cb967bfcfa1e1209b564dd81bbf1b0427cd5c02b85160c444fcbe2ad9563bd491f040df2c4c6b9cc35f6ec83f671fc00e3cd5f40c8ca3af25 SHA512 04aa87f93002428f1ab79190ea584b23363126390dbdd6c05064646e7c5c3710da712b730f8da194bd83c7b95f260eb1773fd8c1c9daa9f41891a765e6a21742
@@ -442,59 +535,89 @@ DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.0.0-20190115041553-12f6a991201
 DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.mod 38 BLAKE2B 3b83f93aa086dfd3028fedf54552dacb3d904867e62704526f679f2f0da0df8cbc73ffaa4e0164718c850d638d4a4d3d9d036be176be94b430d13da25e19217c SHA512 9aa2622003271b0763bcf11c8c7e39d5a5259deb17b7463451ceb13a9fd46a8786ea9a31936e22919ac8b871458952224687fef8dc87286ea25294945371c9f6
 DIST github.com%2Fopencontainers%2Frunc%2F@v%2Fv0.1.1.zip 694339 BLAKE2B da9cfa292adc9167553fd21003e400688b39685e2cf12fee1742d2c35356ca8834d894572085eb53a98648fed8008dbf0f6a10652f32e75e17f75634c1b22e59 SHA512 021fc09bba8907755a610acd87f9f345caa55c865b631e57d53c82d9ebd65a437844203d84bfb2f10c884a61fe507a41d299a13e3cb213eedee7f328d41d0859
 DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.mod 46 BLAKE2B b950a3627aa8b0625601e8e2ed393660f8529b63e02167e08c9890d22be7f6d6e72ed571ac4b80702e44a7caf7e1a9647e9742d8c18938d1de37631e7475d56c SHA512 bc65703ed85e23c1b8c2e4a1e1838deb91729a396e28e551cba9970ee06aab653da4ef43fce22615cdd8389efa6228e5cc04a8e749c99457bf192208b882e3e2
+DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv0.1.2-0.20190507144316-5b71a03e2700.zip 87865 BLAKE2B c37d94188f90072c911d1fa43b3e100ca7fe8f488927dc147d53b8a3891933b4f04d47cadf24a591f78e1e9b4c59a19ef19fa2c288a0f2662581ab759a1e117c SHA512 8ee018add2420aff661da6df2be8035e90abd7c79f19dd84e45b6032050d97491714b58f1f31f2382ad0a13c558cf24de9a024b536743f6f9fbdc97d1e88cbed
 DIST github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod 47 BLAKE2B 0eda9805fe0e1acdcc1e7b2693e72e39ea416cf57a108b1847491e1f15f8a7965c8aaa77baad1ae6148f39d36b1fc5fcf159b54111bee0d20bf2fe8edfdf85e2 SHA512 4e53e67b276ea3fe8a3977bbe72758bb2f844e22cdc3e23994176821cea51b10f5e802ca3db848a8b3d00a146c133a89271ee76158c478683b393682806400de
+DIST github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod 45 BLAKE2B 4a11e9a4a24eb8e0603b2e708591792b76e8523cfe113df480a67bbe95169d1b1e30ff8267ed6530684369a445f2d15f433f258a7c36b7b03381154ca90e1ae0 SHA512 33ab2af09dda0c6ad1d7b3f85dee520f18971c9c0e161d260f04b08ff3cce9b0633fd09b90c46aa5770a783ab7fe6871e6f8a5a0ed90bf56d555bf325beaf46f
+DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
+DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
+DIST github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod 50 BLAKE2B 45544c1be596ddeb8fa01c80e7d96799912343c885784b18c114716ffdcbeaa05a772d819b9a762b7f155045be1ab3409d423c173356c6fb61b9dbf810c606e9 SHA512 edf1afd7200a64b2feecdcb8f1007e58444ab9737bc0e9d4cea67cf286116fb0ebd4d9b9ae10786bf71265d9b813b175f78deb0b416346736c9a7e39d741b6c8
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod 1010 BLAKE2B 6bef0142218537a9452ead65865ba25d9bd2c9773cd87e199a72ec57c7de0143088044bb79e23c2d7a29d4275713efaeab457d8fe2b519006883b0c15f11e24d SHA512 10181677125b9bccfca933fa3ccc84c81381548b0bcbbf1c7423822f13902eca3907e06d9cff462126b4795b8ecba9fd0525e4dd9f90962697829b99dbc20bc7
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod 1033 BLAKE2B a6a88217fc248fb358f71cea9af2fe5a4346d51927e75317792cda9e00896e20f70ac060618bb1a648a05c5d214482a2cdd4a4ed5c5685ba583fb17b7d7d9a10 SHA512 44a8be7c11b9055ee26d0386c31f27d24d7d82b5be2594842a5338007f9d7a0d2bf835a5a2ed20c3dd78a0f8188f7e1d2d2b072acae0346d170612d38df4e761
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod 1033 BLAKE2B a6a88217fc248fb358f71cea9af2fe5a4346d51927e75317792cda9e00896e20f70ac060618bb1a648a05c5d214482a2cdd4a4ed5c5685ba583fb17b7d7d9a10 SHA512 44a8be7c11b9055ee26d0386c31f27d24d7d82b5be2594842a5338007f9d7a0d2bf835a5a2ed20c3dd78a0f8188f7e1d2d2b072acae0346d170612d38df4e761
+DIST github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod 369 BLAKE2B 96cb4a6ca9813f733a4a86753a406716bdffb636c0df7a43227c6eb5f950cf9fc8d1510a02a6ac9f75198609e377a6f4c3af16650527345d9a2d369ff6792d39 SHA512 cee2d00b0b1b1c3d09c27566af4f47243360366597b3b101656cbeb4293ee3e36c38ed046d193bc28dedfc86d36a9d24343c2b0e4f231aa74b7528e1c302617a
+DIST github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod 42 BLAKE2B 96c6dbda3f5479e2687e4dd71f0bda96d8f25d2edf4665e5e4b742c942fea4db9d879cb039442672cd9aea2d1667091355d745156911bdc21a3344fae5e52752 SHA512 64c2746a75d99c6637221fd8244cc1a07c805f055f4a1f3c1408e3b6c96471343caf438ae1b797c424d59660777011201f47f262ac7210aa81d37c6c3f28bcdd
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
 DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod 70 BLAKE2B a94864739ead6676f2defd1020645bb86b8b77600037227aee95fe3e82070c31814fd055dad1fa16ce1a00f64f32be96a97968259ef43f70f20e8a55cb9943eb SHA512 aa2a52cf55149c10f76a8e535dc75ff9bc18b4f2515a31e8720a26a5f501459c736dc73548d2e37f348f27b78974bf0a3b18080df972eec26222fd8afbbcfabd
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
+DIST github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod 43 BLAKE2B 22517b91de93a0e72290dc3599ff8b4fd4fe2807e175e3778c0cb6977db6c02857b9a331e2e07b21851fbf35eefaadb2e05f36c2bda3c2381f22e23d4f24b89e SHA512 b2a58daf4ac906cb34db04bd3815766a74ff25c40c4f4b70edbefac0d3368f1a26ccbff3a5ea910c399ecad0213a2eecca174827caeabe3027e0c99fce53bb23
 DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
 DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip 22487 BLAKE2B 93907f2e048ce0d8be7636d9ddbfb61f051c6142402f725609692a1644cfb4b504ebc36efeb36ef1e70463b54c809b7c71b9596705a0b0e1dc5f7a52252be5cb SHA512 1619cb9a2613384fa025772cba512f24c29947945bf1d85e476a52be8f5711d4bcb670750dae0554741de3c9190f70ea2a2c60e6b04e5e5fe4bb653269f5a849
 DIST github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.mod 34 BLAKE2B 9fd28cfb3820a52a553cfd20da7dcb35c93c98d0271e08ef1e56427c83c7e8e50d11ccb7555dc88d584c1388e7e7e78e6309826e3b374d3fa7932288f3f9b2dd SHA512 113a623f9bf38e0597c7e759f5faa2dbc1da66d3325235ed3f1e8d29b70646e133d00a6532e4a6acd15ba063aeb669ed276ae06ae8b8190a2da51a173f8189f4
 DIST github.com%2Fphayes%2Ffreeport%2F@v%2Fv0.0.0-20180830031419-95f893ade6f2.zip 5056 BLAKE2B 1cacca25661d62ac399839ab5c2520046e8f4ab0388f020e9425506487719d9b5b9655d8cf44a381f00bbee5d3f4041cff3678c14ec2fc29899057c6f3f62417 SHA512 dc9a34f7aa4da759c2d90f79b6cf9d9797859112eaa2400295ff7b8a224b42a2825f78ee359a9fccad9321b141aee1ad1b707dd20bba5fa06e7a4356a0f8f9a1
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod 69 BLAKE2B e3c2bc67965f266f7449c37a9cb421a8a5464cb18b54ec9c81223c81b3e19890e4b628e3d14a7904a6de4e8a83b53a21c01ae32f774fb583a8739eabd00daaeb SHA512 7b303db4973d7804f48fc036bd427a8258d34aac8a8ec95252e6602c7053be4428b5e15642263913686c3207cda00316132ec668bbaeb2748e093b1f359a1620
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1-0.20171018195549-f15c970de5b7.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
+DIST github.com%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod 30 BLAKE2B f5ef9d146a30ae9c67d2f7e86eef366821045d1f7b6442681377ec8d4528e315b661373ce82bedce6dcc74bb3dd9b7b2e5d59c6d5fe6aae8302a09656bd61b04 SHA512 a8742602593700ae7d9d1bb18e567d5784239e9b158b2c9ffc0c16e1212013bb9fe49c4bdfd58fd2e61e1752b5bd0390fd6910d66e5ea8917450a3e41609d54e
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
 DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
 DIST github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod 39 BLAKE2B f2e759320f64fa232673f4f5326c688510df6d43523a08df1b4b7524f92e294bf196c13049fb36feb846916a66b4baf7969cc0200b7109467b1f468dd6ab61cd SHA512 c0602d22e7cb8f1a20a354cafe61518a84a1499f793cdbb4e1d258d62b4f83a2c2a72e6cda49894eb2885ff524baaa47c542937c68bf338c76de5953aa468436
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod 443 BLAKE2B 2bc1a0ca986dd17787cbf528312efc6e721d3d9a46126b90537b7cae6681192e74afc83f3b64f8835314a0608a3f146e3fb74afc3339bb7b009d16ba04208cbe SHA512 e45c711b58e0453c63b899faabfb662fe743085dbc82782ef730ef6797fd8d372208d4fa887168ac920d6b1d15f7f65fc9a3fbff25a4474915d858411a7adee8
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.zip 200972 BLAKE2B 6b6aa2cc4006f6671b0f54def912df6ff1aba7b69bd08c1950f7415032e2de383af556cd793f991989f1542cab5d7bc8a73894504c2f3b757a23007ba76b21b6 SHA512 c01081549c9e62a75d99ff37fb4bf3e620dd9e6a22a049c1b0b1b53604086ba68a5c366a7373423354b25cf7298c642956db7eca4b04be4b9431fe24ec8da125
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod 375 BLAKE2B fdacadbb6c23350ffa04e625324420df9b523d9fe5bccd8bd1d8f6d592d7ef5a2b4620c1d16c78bbbbbba2716f3edd015cc16ae5b0c3c31e5959ed12143ff3b2 SHA512 e98ebe9ff7f5f5c893ce7a54c12b3d5b86ae1f99a5117875bfb78aa2b59d9e9a95bd54e45e1a16e8bdfa79f38192626f49366a0ea4e36a25681e7448b544b144
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.zip 206553 BLAKE2B f0372ca13eb04b6151ec827549c17f299cd630546647067671dbeecd736ff36038724a3eedd6b6ba1c387543da7d8484a8bc560ff634d062b0625e84a19e9cb0 SHA512 60c005a561261f70c098f0493bf09c3c02a617398482b3bc24c81ef1913a3727467034aa6a3d14038d57de56aaa46587a5cb127e097a15877f38c252b2d0860e
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20171117100541-99fa1f4be8e5.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.zip 69219 BLAKE2B 6ecc62f2f3ae4622ba6e19c51f7ff7ca3bafcadcb38cb7a9d79dfcc2ddd7183d79dca8e0d6b534f5a2dc508c21e0fb349310b4feaac35c1f7b1166c3febd1228 SHA512 934c3e50ebdc1ea65ccfd4de1e2e0f0ebdece54be1cccaffa5e325c667ab22bae84a7fc7ead1066e75094697a86452fdc36fab57b955f42337708de32e7eec32
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip 13785 BLAKE2B 2cd44410ea7af88683792807b0f2c31b0943d8664a4be050f2e422095ef3674e6d42f4b9b6a76083e13bc9f44be1578cb06a7389b4a4b201b5a88e756b40193c SHA512 db2396362357b6d5e99b21bd4aa8d8dc193dd2676a8f437c62eafae849a56a53875bce7411d58ad78e4fe36445b72ee1a34360b174a23ca84de911f5df189354
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180110214958-89604d197083.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip 151692 BLAKE2B 89c5a1012d53a62b773c2c3e9a20426564f01e70abd39ea67cc76abc00f38e6f1443ccb31c0ad89920cff80ad94c5f7e72c5d67eb3aa44e047c0bea758be242b SHA512 121a4e3ffbf959722b4333b5e449dd54b6a84548bb580e429b21fc6fdb6a494456ea55208a039f7be6dc7b7fedcf0c6183edd0dd727cd7ebe0ec517a8e999c85
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod 857 BLAKE2B 4c4486d3772ba9c4ecb347940a8e6c84d650847e5e1d9f2a0165569bf062c2a2060cd01c8325221a0c59da8864881c35bcc1532acb0b52f617a02a28f4ebcce9 SHA512 17deca5d2ce10cfeaa0f8e0b1d83317023f4c9841149f9b989cedbc9ea2cdd2d05b2dec1a6323f6202290c7920a68d35da1d4b064892072fb056ba3a767129d2
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip 153651 BLAKE2B ebff467e946cc220ee1bca6fb5507030a080b34be93ae6e5bcef4ef4c9069d19ceb542af6770a620bbf79b65f970898eb536d928d5140cb1de7a57c9f2cd5a57 SHA512 c90a315ff9dc3c8f4e0f1e392a2e23789417e291e5794a506b94d04c5591da529bd379158f9d4d02e9336e4c2336d0d8c68c2db59e89a7b390e11f212a92113f
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20180125133057-cb4147076ac7.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.zip 188550 BLAKE2B 6163258786861881f6a7b621f8578e8dbe3eccecee396c3564a88686cfe72584e234f593847ee5cb4fed6a6a1009f1f14da8238f967ce5d68ff919410d25d8df SHA512 42a764174dc4a56c6e27b0e83004f042b3fba397039a923310b8bdfc658ec24096395f27bbd69e8275c1d0f0ea45ed68c2015ffdcc74b6186c6d1497f0ea1e6a
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip 210499 BLAKE2B c21ca6fdd64535b648cacfb74fa2d23d05d493703cb7b775ec014a9efcf3e07557e0276901db2c309174f12800c6e2f438fadc5054f0ca233c65d3523937bebb SHA512 f9f9fe1e114a4e2fe4d27a836d3989b838b1bad72cbc1652570d26ac9253cc26aab01ca28c949b2c4441a7cb17e87c1689d21588093836873350d7342e8d543b
 DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
+DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.2.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.4.0.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.4.0.zip 189937 BLAKE2B f8cfa55e9ea1d32d20233241b8cb7ee4eb5174da429afcf6cd2c38f752d7d729dc4a6805878c3d75cc0a4413ab79d934e6b99e2aaa113f05c85e3255e6e9d28c SHA512 b25f0ebe504900b3df828340c68ebd40c6f2fee71528a0cfa99f03f5fd5d3afe96dbc6fd23a3ef92b431162be133455ded65f1825627c971d7d68833e11d1d2a
-DIST github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20200212082348-64f95ea68aa3.mod 541 BLAKE2B 8fa6af798e820e8f6cfb87c74d71cd69f8b857658d27e8ada17d7065fd62fcae447199b7ad8c4b75aa36e3fdca0b53f11183ae8af3c0a1fedacf4629be4cafe4 SHA512 9a9b22523a458c61d66c7813993983592bd8f4f1030796688a0f4302cd85b4bda4b0088678504af74989f9b5a281c367c272e2a32c32da530725193fa8464749
-DIST github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20200212082348-64f95ea68aa3.zip 46530 BLAKE2B bd4a11025c5125d13b880679816bf7b30df1c98335234d9f144de449651ed8b5c248ea095fd0c0cd6accf7c0ce9d2abb13fb29b2f1d87edd87af27046677e1a0 SHA512 5dfed30da87fe9d1fc92d146ee70815f3a3486aaf703c12a0a52df2380d52789efabae2780d17a0ef6e1c462b28fe635ab5b6a79fc2f18fc0dc230e292cf3e9e
+DIST github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20200616145509-8d140a17f351.mod 608 BLAKE2B 225d030bba5ff53c57e95d7e2c775b3d16466c08e81f060be847fa49975caae2166b432b630e8055a2f88823e4f560f27eeac6b542c3a13c3bdff199e621907b SHA512 44ca26fb2c8f8cde49d4f259d3fa8785310d883274a5be10268ed290fa08091a6aa18811ea68b7b79534d4d44ff351b8c119fcb2a748fe9c7109ecb42d86a256
+DIST github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20200616145509-8d140a17f351.zip 59141 BLAKE2B 0d8380cd4b3f10ab2d1d4e81a379991374199a39e22003dba897de2ee1362a110ac4df162a205228a9325b8ceddb1bbade4204d5cc0dc969ef70ee4e4fc28a8f SHA512 5bb4a557571ac3562caa2131a9e2b440290cdce5e2a99ce0d34d7eeb3e6bdd242f38e8e3ab7d12fe24674f37dca2e82d860ef5c02003f509ff1dec1503f16d6e
 DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
 DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip 105716 BLAKE2B d8a15d43cda9d636577a114fa0cbe0c570146402a5e0bfe94bb4b49f1b5d42dc6f30d9f29682721c28c63d261f9bc6fcdd6094bbedd81ace7bd2ef657ed97405 SHA512 7cc5f41055137124a3d330e3686860b3294c668b514fe19b21edd6f571ee4f3d895dacad4ef6e333aabd3a872f2bb3ba50ffbf19636d7f1bb462d97026713322
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod 38 BLAKE2B ce3c91e2fcd6c3748acf0e0f6355a0af01db3c7b36a793fc07b94b1072133f7f25f4c49473bb27007ba2de7233454a3728f24eacecda76388570810e62a5d161 SHA512 54235e8bcd2f98cfbfdfe187ee4b2cc7d0efe155710474100709b1a8c2e55cc2e24a16559857fb9edf484a0b76debbcef69d5c182efe52594c9858a37b6b10f0
 DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
@@ -503,9 +626,13 @@ DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod 337 BLAKE2B 41471db637c5c0363cd36be6d16a6228671ce9658ef71103ad2122a2cd8cfc13c30b87bf2b34df7ba9d6c1fff1ac821462fbb86b622c274cf26a1e3ecb7fd2e9 SHA512 29a4efc27c658b047fbfc6eb2ae311753b01fe878cc733e2fdfd83f5791b3e30ab50b08addd300dff37e7880f6b57662ac0cb0f4b98df2c5a5a9f7d555bc98a5
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod 301 BLAKE2B 5322be7914862368eba07f521c046dbd7580edafd47ac633116b8c9f4b61526d0d63df11ba6894223590a1ffcf4bf478c394a335c305010ca9fc18107d4e61b7 SHA512 8fe5a437a5f3f8c1ce0aff067ee261a946d946d7640aa5acf7c34b9c8c4ee65128a6421aa38bbb1feeba1339b356952ad58b4bad98f1c89ac455d94e86684a8c
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip 65802 BLAKE2B e0487985824efba7ee61c5a73df7b591d625dcda32f833ae276191cd82bec8f3db30cc2ba217d80cb56af1436b8954fcd22ed3f861c6c7fcb4a94818357bbde3 SHA512 abd13a98d10b6c996918712443edacf97ba5fcb9ece7615f59458a583130f68920dd313533ff0d8c84c6011fd2c4d221783b1250e3250b569a6ead9d7c02f7a7
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod 86 BLAKE2B 93d8710c720a6abfda7ce2f81229f4ba96088d4563b163f02fbe05c962e698f1ab1771ddc8a0296e8eab22a1e65f64258a5b3ad459f53de0d662e1ef3ca9edf9 SHA512 de0d160e304d1e1341fb3d3769ad300b61879ef491b3a293ebd1874ca259dc3fe95a3bd3f41b04e382cac8391174a54175e08b8422f243563e845208cac15070
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
@@ -528,16 +655,23 @@ DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod 2018 BLAKE2B 516407d1afeaeb665c558a4babcaa35aff28dd9b41298d04b904378159f1978a924323195e4c160cb9cb992c264558c7ae4f07ec157dd8c65fb98853a3cdc53f SHA512 fda6d22c26332038895ea2f2c62458baebededb0df883728dc9a127c10102b9bfd3e8128dfee194d909d645ea652f3ccd5ef737a8cb7ceadab71864b21de117b
+DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod 42 BLAKE2B 528d17f9ad90612c6004aa88eb138daac467c3cd82e8f9a990e64ec956a9e50ebface9db66bb7800f74e7923a647999a9332d871f08d78a7eb09883e0fc6c811 SHA512 c5b104556b88e433f61bc94d0b61fabaa86fc25f3089a03f1360fe61b2b3487a5f2c6c3086eb08298d48cc05860652b58075c51d2767c2c4f2a698069b7dcbdb
+DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod 42 BLAKE2B 528d17f9ad90612c6004aa88eb138daac467c3cd82e8f9a990e64ec956a9e50ebface9db66bb7800f74e7923a647999a9332d871f08d78a7eb09883e0fc6c811 SHA512 c5b104556b88e433f61bc94d0b61fabaa86fc25f3089a03f1360fe61b2b3487a5f2c6c3086eb08298d48cc05860652b58075c51d2767c2c4f2a698069b7dcbdb
+DIST github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod 34 BLAKE2B 8362ffab206b4889b3d3c3842042d4504d5e040313b40a66022477a6edb32b377f4756a8c783c1950f1ea60e4ed0f9b616408908e44e571fa340c75639f50e5b SHA512 20d2c6658f5ad6e033e9532ddf6944e168fd2296acf434999967932ada1f80b6ef2e4f433dc033f745168be3e77c07931d9ae95c7f48c9a01eea2f6c2a7a9855
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip 42547 BLAKE2B af3f81b3947f0802a6542c60db0248aebac9521d75d0d991f76b5783f4eeb42f7902250cd22da1b8fcfc2f150342ffff53260276b7a6903c092febbe66f40ace SHA512 b21cdcb8683760280e515ae487e17b65b324b51dbdb36c6380ec0b272699297d388a34b1a6aac281b1aa149d85ca81640850e1fa0d84bf63f3dc67b794baa249
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
 DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
+DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.zip 13782 BLAKE2B d42812a3e09804f960c218536a90c9794ff524c0fe68816703ff635a72c1b9c1e762d4d7dbac9c5ef4f71bda8486d7b495b2d7a648b5bf75b1206ae9c2863808 SHA512 aa2e336ca6b25eca491e8afcb30ddcb9f1bb7e658bf9dbcb6cccbb0dbd098a5d3f2250b3dfb21ec9b3fab9b0d7b22d818e2a5befa14821d2c12f9b07e4253d61
 DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
@@ -545,14 +679,15 @@ DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252
 DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
+DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.22.1.mod 180 BLAKE2B 5d858ca40ba2af791726707bdab12d76aebc9f9c9ea79e49a6125308b079cb945d6ed06ca2425116f19604651eb56f29b3ec8d79fd9f38ed044e745c9b73ddb6 SHA512 b5431ec3fbdaf9efda016ea275ff597106916f5d5781b2ca82e075e42da98f6c5d34a00410fe65ac3a3e64b3ac0e1ab02e68579effc426ccc5ee19a583c44d2c
 DIST github.com%2Fvektah%2Fgqlparser%2F@v%2Fv1.1.2.mod 311 BLAKE2B b7d3826a21681cf937eccbb37e11a505f6eccaaf1b82ab8f8b00cf433ab3478f1e2f87f5812fdbb6587e9700e2e8840e9eae935f7a51a257e957b468bfa3484c SHA512 41546de4beb8bce00d5adb8213b5d0440f4917eb0090d9a81fdbde098675c6ad1166f4f2383fe0c526f8069b2f5fa88d93f6fe95642b96a044e49475375b329b
 DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod 40 BLAKE2B bd8fe364e43fdad423aa574d01229ce91e9b3211cbe3a0234070805150d960d3c0fc0c6ec229e7ce5b4079906f2595a2b5f50a8da7bbe9bd906a72a6a7a7434b SHA512 cdd8a665fc41a4b04c59e869b021d5a9b793b9a441c320a234bf2a13be67af9aa60378c58991161f73d83c184039a52fc3f11cd121490996737f0508e277e1cc
 DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.zip 9425 BLAKE2B b18ec4a4e021332404866950e4839e8b00db652a3bc196fee5f7ea928085d25b44584baa3b8e65f5a26edc4a84450152fb40c8eb11dabe82641c2f569d6de126 SHA512 41675a07bc201e97344136fb7afab6afc3974a7d4252068311c5f24968f6a46b979e763865e61586c5d3c8f2478a046915e62b5a7829785c703d180f4c2af58f
 DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod 42 BLAKE2B c2d6fb272d8ae4e541c98023713bcf0b7f47f334d09ad7f9f375ed13eb14d27ee2995745782ecea40d31a561e28702fddeae4b5e32750726c7188118d741cf82 SHA512 14c839017eebd5dcf49dd3495a1ef6421d522389a2943c010d7869d214f757fe7d19d6ac3482fb3d8cbaaeb3977c5c311523aba90e9f7909fb1ba593ba57ae8a
 DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip 8632 BLAKE2B db207b3c4a00178e3a2fd24a1c453ff54e8714792d5ae2ab324bebf8efdac9bf1492e3c1f6360a99459c4e88970395bc74dddc4611acec4478ce8a287dc872f9 SHA512 84eca639af26023555a96ac40edc73c5607712c4cbb42f9e9ea80c5e63c3a145e43e10d920891bb7553ddf39ada40f3b7e8cdb72891ac363a609964a3067eceb
 DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20180618132009-1d523034197f.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
-DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.1.0.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
-DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.1.0.zip 135372 BLAKE2B dfc1aafbf120f1ed5fdba1cc29b868e62c8c3224330e5457397ab503c505ba8a55c11512999d64a5efc9aba295eee4890945787a41c5cbcccce1fb1900b2f2a2 SHA512 e2b62ad55de3ceacadbc129977ded7ae141f36d42c499e0427bf020ba681191a9128a6852eb22659a3adaddb765b897bf122bbd7112b4d8abbad95f7bd72a873
+DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.mod 240 BLAKE2B 0177599cd72c2547b6ab045588b64eab43cfe222a27ba0852f535300f41b39123916b3e1e0a222eda9ba72a29316e610617707246834e2b56a5a7fa23d4d3345 SHA512 d01fd1c1874dc5d24d9435452bbc641d2b6f199580abf24030be4d6465a68f6ae1f5afc4c83ea8ff9366649341ca167397dbbe1e6c8988c3117e2082338711b1
+DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv1.2.0.zip 138176 BLAKE2B b8e4a71e4d9b39de77936d971c532e591f529edeae89f47b66b671f42da6e07cf4121d2810bc0625e04619499a50609c5ccba7b8fb7f568d93cae27aaf7830bd SHA512 cb6d1b8b17ed8a8ad025e99f54ba05ad9b025d750b40ab53a0a9446dd7323465cf66585c1b1879ff9318b65c693c95ff41f4de0b77c99aa778f82125cedc58d8
 DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
 DIST github.com%2Fxlab%2Fhandysort%2F@v%2Fv0.0.0-20150421192137-fb3537ed64a1.mod 33 BLAKE2B 6f03d324264d6508bec7b0d2075be3243927963f196b7f394ecaee719e93d0c01e52599e6be1776cdf8eaebb12ec16eb2af426ed1295111ba137fa76a022303d SHA512 2d1cc625394c148f83dd01d72770770eed383ec6797cdb2470d2f7e5d7f9c5cde07aaf003cb46dfe12547491aef79c119582777ffbb9482dbc5667828fd426f2
 DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3d0a77.mod 40 BLAKE2B 844d63d9c10c55eb74504d88d5e6e85641f2c4bdbbc9b4f6728cd6b1e750d1eb333e91b6eadac635a80abf328c9423fa106b18337e89dc592876cd3f04a803e2 SHA512 daffe8f4148becee3a32c90ad21454cd48255409f3edff8681ea2074623c8aa02cbb4620b7ba52aabe4ac3c24a5f256b56fd71de1da45dcd7e4e8376699a422a
@@ -677,43 +812,62 @@ DIST go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod 2182 BLAKE2
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.1.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.1.2.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
+DIST go.opencensus.io%2F@v%2Fv0.20.1.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
+DIST go.opencensus.io%2F@v%2Fv0.20.2.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
 DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
 DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
 DIST go.opencensus.io%2F@v%2Fv0.22.0.zip 291484 BLAKE2B ca3bfc9c9864a2218ec373d78792ba0a40f4e2522bf3e0acd01b153eee43083cf8b124ae19b5fb0eaf7eef7cd59b2733b6c3ad847761518eeff2b183780c79cf SHA512 4fe718c3dd4c7bc0914b32844ae86ce281721f98b05797fb0a0fb51245129dfe1a74d2d04b419f4e0b7a31409b874e0e9d7939c8426af1efd92fdd5f12a52a98
+DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
+DIST go.opencensus.io%2F@v%2Fv0.22.2.zip 296264 BLAKE2B 0b0e20eb2f10b81748d55b843f8489ffb8147a8b17c063cb21fe505fcdb46feb9cc0830f3b3a91ea7034b1e7ba78df27b0b235b8500b8c1ade19f6837366aaa1 SHA512 c98a43e1bfc9f4bd1e54847dfd6b07e9af14efdbcd8d61b70c9f9701541ee2405f800b1e33cf115615a43030accb735a1235e2b7d81f54efd127e2fe5c992326
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
+DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f
 DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
+DIST go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod 221 BLAKE2B 586c82887d6cf6582837fb495a46030e1c582b58305fc70c7b88a29e570610e693a298fa7d4eac80bc86231c7fe6f6e27d3fdb5afe084363eb918692a1ccbc59 SHA512 2a7413f6f83e66456c340536502d855772e6de433ca4be1a9cd1572caf5fba7cafc7d377ef529324b5bd8af97830c9eae75768f7c45d4676b455e3959acc82c1
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190320223903-b7391e95e576.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190621222207-cc06ce4a13d4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.zip 1859245 BLAKE2B e33051036e462284bf672b92f35863014e4740917c856eaf5aeaea6530dc5ff77fcbac4d797aeb8131cd013bac525e502e582f7139ccea4d3c226fdcff83ba0b SHA512 7c0734618d52ac2f0e2fe9245fc15208d13f05e6ab3e89b4a76bbb94e2895376f3d5a7d71d36a020c8861a0ed94a344a534f4d3b6bd9003d153e4e4b80abaf05
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip 1867651 BLAKE2B 7e9654d95bf03c5462d4d6420e676bd4a0e8769c5cb7954797a66c89298ed16063581391294b7c3e7c1e735ba0cfe3b60e899fbd2821b98179b2669740271a68 SHA512 a0560b1c03857faee4e6f6d959d042258f30bea2bb86af07c701a21c7a6d7e44a8929acd3e42503daed070c3597abede768af32814e252441f85823f330e573f
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.zip 1872925 BLAKE2B 8f054f595a831d9b947dee796666fa7885b107ce8892adb04daa2f9035493917e658251ea699f05177b51a8d5ea35b503d9480eecd9cb7dcc842a48d7346e23e SHA512 dfdbcfb5bca3a5e7931f21065b91d7673938f7b6b9a9602bce78a723cb12b580a44f5d716695e27ea9dbb79bff91881ddf4301a980ffcb492f26065444904691
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
 DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
+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-20170114055629-f2499483f923.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181005035420-146acd28ed58.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190320064053-1272bf9dcd53.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
@@ -744,8 +898,10 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190209173611-3b5209105503.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -757,11 +913,14 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.zip 1837462 BLAKE2B ae87037c165e15d3a17fb2c37b59faec2af12dc9653ab4bc504f8a283679d7599704980971e8d0d43235b723f67fa8ae3d5f6005dba6073930f4731859f17416 SHA512 a5fd196d6476e16cc864616cfeb62d29a96e1132e181a261940639918fb4a8452cd473878bd8fad8ce5b269d3466657b5aa2e7771e02591f999e98eb81b55957
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.zip 1867555 BLAKE2B 88d89694c8bb9e902e96293be8201438741eea890f444a93764359288aa9e20a275bc5876be2bc1b02dca9c929134efc8ba3b783e3d91cea8b837c97405fb9d4 SHA512 1c3a28e9c6651261a4f0f57ab7884b6183fc2c0de60dc94cf3815043a1af0531bf0c1142e9666fc309016a65259c51e799b35f3ac300ae2e6ce52504c89c71cc
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.zip 1914335 BLAKE2B f8ce8e4fe5abba2f3e750a752e863563f76a964fb385cf75d923e2a0d882231f1337471efeea6df83c3830085f8a35cd535f149aa61c670c01c7ef9c7ef492fd SHA512 42c694e39947304cc0bb0977a0667eb115799566b069e3b011d29a6e72a0324e1f8e93aec6282d58e2ded9a6aa77e016390c3202bd8a9bfa646af7f6d7030e26
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -771,7 +930,10 @@ DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAK
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 11671 BLAKE2B 0a73cd55380594ca4bac71bee0207b51979e62407ec3c828f975e8091a20e2b9a6cc331dea88cf0ff44ff3a6c7d1cfd2844651acd1d957c0d725de525a58985f SHA512 ccd129fd4ce8e4067d0ad4b164cd8c4fb7ba65d5022bb656dfdb50dd2d467152bb83760f3d94c465b6d4c29c29931c8be6c697e1634ccbab4eb3a53edca7dc4a
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip 11971 BLAKE2B 7b29c746b75b42c23fca353b8299a4feaf69556ce1395872470e891835a8dec88a4e4c3b64ba6dcb4b5512aafb9bb44cc38c68915a0f6702f1027cda89d03d81 SHA512 58cb42ebeb88c06e049caf8c609e95243e7bdba51057de7d7301885aa904111dbe85962b5faef216ae45aa73f371b5de6516800a6f5765219cfde3fb06372afe
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -784,14 +946,21 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLA
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190614205625-5aca471b1d59.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191004055002-72853e10c5a3.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200103221440-774c71fcf114.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
 DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20160322025152-9bf6e6e569ff.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
+DIST google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod 506 BLAKE2B 106ba1eae2f79ddc10b69e21988215a1be000c5b32a4bd8315d473748780be8785e89ce269f1560dc23a8afcb199c8a0428aefdf8035991051021443c17fd206 SHA512 37d49dd9c576465cc9dec58fab5cd9c0fa84ab472d46c961e64f34fcda27f88c45925da72368268f857db22bc9cd1378c6595933ee33ed5a6253f62c221ca6ef
 DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.2.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.5.mod 171 BLAKE2B 09b1ead1721eaa1dab7106f0206fd6f1c1509ddd07f70d7a23f73a1c047b9b33b41bae2519d2ba7e5c6ca632a9082483080dbffe0af3c371934f2ceab9ad334c SHA512 f99bba4e696291aae951ea3865a1cbaf0ba2df7cde4f86e942b2e5f5a4dfc6dfde95c74e52ff31ba69f2aa2a838d21843343b2203c732279eede5936b92d7c8c
@@ -801,12 +970,16 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip 7435365 BLAKE2B 7698ddb8160d66abd158a526a71371ffc975215c78fcb187171399c0a7f68b840b2e3d9b9ff631bd57d4e5aab7afb782acd137d41b68cfe8a7dcde60b7564249 SHA512 ad0e0016a55319377b549a55cead8f3d39916dbc2acd22ef7b9a93eb455e52f58ea46e306838a908054e6438b1f2006d1a74fe0dbeee9f3fba9e727fdd42deae
 DIST google.golang.org%2Fgrpc%2F@v%2Fv0.0.0-20160317175043-d3ddb4469d5a.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod 832 BLAKE2B 9de27394e05cf42e762a8b7ed42b6715244ea1086acd7c44f71b04bc0dc23c31ab236e6474fea423953eb3001dcaa357938daad1d54debfb5d52bdecc1de6bda SHA512 ac90f3fc374cc1ac7706146efaa8488a59634a209c30bf87453fa150bf8849870db2ec04e854438d59911ea35930a5dd8f40f5d5954786d0e0565907fc42f711
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.0.mod 979 BLAKE2B cac1528e7af91a98ad2e1fcaee0892547eac67d1d6ce29473c1114eb2c373acebad87008124924adc3f1a98cc4a2911c1679cd7f24f025ffe0d4902d123a6639 SHA512 558a4f5d7910813809d7edead3f7e2300936a262e289905dc1e33ba293d89d9bb590ae0f8b00bedc1e30288257ac66d7edc2d3f3f657d2d31ffaef7ff0e24f92
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.22.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
@@ -822,6 +995,7 @@ DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod 31 BLAKE2B 1a4baffd98c621737
 DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
+DIST gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod 24 BLAKE2B 2e460175791185a1eeaec63e12c62c4151b0dd57c9f1e21a2849d834d762c928c843b59a0ec9a2000e8bcf6e86a4c3cea4895c40b99451148e9e4ccd95ffa815 SHA512 cb839ecb3ad2ea4ac9f449a9a0a71dddd03b6988321ccd655cad1d66e042fe2618c635a8ce5ee6a96c5944a12053ef658fc13e54aeb69a5649523f5cd0252252
 DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod 50 BLAKE2B c715a977e733670d4047cc0f62fd485ce2af214d87e799cdea97015f64ee66488e1f68f4aec8e8ab139cd70574a0dd5f54b7bcedad09b8890ad098bcb01d7f5f SHA512 2d48fa45b7183412ac358a60c0af0b3c2f77d5c461f6bf4ba5d7a162195d49076870e739ac6c59e95d41dae2002370f52faf183fd6ca7999d60374866fa3ebdc
 DIST gopkg.in%2Fgorp.v1%2F@v%2Fv1.7.2.mod 24 BLAKE2B 9588790fb20149d89a8c642c78b290ec899213f9c17c823720783faffa7c5efe49deb8c34ee4e33516266c673be5e3a735ef541d30a5e3bf1f61d97f2e86438a SHA512 8d9f15ab56fae617fbbea6ec487691eac23cfe91a7da046fb1d9be206c5a0c88ce541148012a970fd9059d1663c4b37318f86665676c0f4fab5e92d2627a7598
 DIST gopkg.in%2Fgorp.v1%2F@v%2Fv1.7.2.zip 39742 BLAKE2B f7a98d3ae247b3ad78565361121aa4c8511b64abdfbe070b3e4c706f27721ded5cbcc22b275c89aae3267b8fe96f03dad01dd8aa6800bf644ac07767db9b2c83 SHA512 3dd995952e9a692756220126a4ef767142e90c7b91810ffd6c5a0821f180498201a6d080ced7fd85f842cbd42fc0d13bcd9e0f19fa6a762dcf46bdc7c659c5de
@@ -832,6 +1006,7 @@ DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.2.2.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
+DIST gopkg.in%2Fwarnings.v0%2F@v%2Fv0.1.2.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
@@ -839,41 +1014,61 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
+DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
 DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
 DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47b24b347ee4758fac8c11e3f627788c03d6568af129acb5b911b08857ab77a619bf571986ee90dd1c6c6aa12fd8e6e26d395a64bb7513a8b SHA512 66a13fedc358399644b869ac4b39a295c6c15d642e074ec66ff042e1b109f9603bc941ff25aaf7d9bc700f6c2fb1f60bf2a637a471e26ae037d822f0f1e2c518
 DIST helm-2.16.1.tar.gz 1283836 BLAKE2B f0a2cfb05adea2b0a98341962753e777e9329b669ca32a84ce0ed9b823df48f7884c6809d1625dd8cdfbf50efea31081c3c0400f0af65a67ab0fbf1afa3deba1 SHA512 eed2da36ba72da61c121d2cc2d4dc4ef2163f926579b2189b8b8113ba70102d0f63e48729e08b260fb3877d0fe1e0d6ed7eb8e9c67605d7d4a3bcdf7b33c2544
-DIST helm-2.16.7.tar.gz 1287743 BLAKE2B fc04e25699489a18703ea1fcf8d63ec4b657098a06f36cc13e5f02696706654203a6a2b075799e3354c7bd7ccb507d538ece14a6a2b7be304a3eed0aa64984ad SHA512 6fc04395e966be8282e576675860f3dddbba812cd23ef30a5bd0997db226887e209a8ffc27c94e4728bfd07a6a0fe4a2a5a24bcd81bd2981c45ddc1adb192087
 DIST helm-2.16.9.tar.gz 1289259 BLAKE2B e633445c51e762762916e10df15f9b5d28f5e9e1dd84bd30c041a37aa4e06b5427657ffc9c62fef27e194694d98335c601cf855f980b1a89b4a44048ae13b0c2 SHA512 a30a153419ffc3bb7f7bc3f17d7a29ecc9789a392e2117c03050345a73439c2c0f1dc53b40f67ef762497e08912da0b21b95f24d548efd5615ff1aaeca08a101
-DIST helm-3.2.4.tar.gz 622121 BLAKE2B f676dc80accc3be8e1332c86ae2263bce00b68723953e9783e62b493489bc844e87ae7b2eb6b0a3319babb6e0b128e0aea2a276a9d983566da202c243312c158 SHA512 57634ce225943b369bc25d372ec1355d7d54a37a790913586d8fc01e2955bc7da92f767e125410276b1e8e7579059f6730ccc24dd04488f62f3dbd5cae75f9fe
+DIST helm-3.3.4.tar.gz 635362 BLAKE2B 41c6bb96532ef23738c7f5defa08ad819a9bdfd57d2270e150f5e728f0c5db6358edd318febe4d348c5a50b1018519c48a96403f1e0442897294dcf45d7df3a9 SHA512 9ec2aa5f6c30f9e705c812be77bac2815586ffd430d1316d343ade1048efc84abac603bb0185b6dcfc66029a8a5398c3de945830ca39d2415c62c4b7ea0c678a
+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
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
-DIST k8s.io%2Fapi%2F@v%2Fv0.18.0.mod 475 BLAKE2B ac30820fa8c3fe58d2b98ae9e46505c68ed009b27a25eeb23edc1fca76e8e37c2b0dc695ffa7eaf5147242781649551c2edad150997a7bc499ccf84f0b5f03c5 SHA512 7ef5f5b32ec02042c913ddcbd433dbc5c5fdcf5a4747509031ef5920a58a1bc7f1708e966624ea887ac96c919f7693a669cb4fb392c74e6a0458eec8e17f37d8
-DIST k8s.io%2Fapi%2F@v%2Fv0.18.0.zip 3442466 BLAKE2B c5a0a38eb9883ab1d6663c7606229110bdd7a875cc7861c4ffa11fbf2924bd72cfa520cf4425931149d99ed3e5e36679a076a8cabd4fda238d6cebf96d95a12a SHA512 8d8f54fd006a897d322b389c1e533c7102344810bd0a3a839199879414fdcaf111a9ac94ddb8947db828ffe9bc63b740a30cf338a9cd9ece216b8995dec47d6b
-DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.mod 1527 BLAKE2B 83aeb7da9e70f337f4778a7ead4b5a24745baf5836ff75e5e2848f08bbb4abe1f5a0f3a0446f569d7927425c5f773dea642edb757f295ba3d5ebaf40766db42b SHA512 e4c696fc06d257cd8f3457e59cec1567b27399bb684c8dd67ef37a751aae5eaf47ec4f250f0905a6cc23ba6579a1af5f48da8d33e08166d3e905055078aa8403
-DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.zip 604196 BLAKE2B 90e8387d1eeccf4ca979b3c66699ae0fad8b5d3dd35db60922e295dda3f2b765789e4584f9a99a5f5b8f2384e10663543a5c81860797740e92c926d3a7508fbc SHA512 b8a1ee8b2572fa4c67b4dfd7145fe87914a69a80a3f084bd576050e8a2a30ce0dc325109dffb999663e8acb23a9b72ea0399dcd1795fa69c29f7befae0fc0663
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.mod 1605 BLAKE2B 7863e328cd5985db939aedbc154aa73c9fabbaa3554d21e6cce2bf02c6c07251f0fdc7c330cd9cc0b7470c6646145ad2f50ecb229b774f56ca6161a11a865fbc SHA512 7bf3281763e6aea61c2b1e83e97c74b3cb20151bb35ec5b6061a3de2a12025c488abd560e68ad90b8bb6a238a493973ea0caf016c24bff5b2ca739faed9ef0fe
-DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.zip 782249 BLAKE2B 86edcb0aa2b8d3d56da1a9a597506e4d7a78ab4be10cd1e7c8b8186e05e36d94e7a9139c167f8255600a3dc2e48d2382423ca6e253c8fef836a1e1a3c6073804 SHA512 819dfab278769ec74f1db24daa293bb443b4fd1d473b0016a499b167baf18affc3dc02b48601997c43ad555d8394545b75d0c76a12dfaa6a33a9621e32865a7f
-DIST k8s.io%2Fapiserver%2F@v%2Fv0.18.0.mod 2631 BLAKE2B 66d2b46bba152f0cfc006aa81e6225ce6ee2eb846431046db0e9a56e9af6b883d1797b7c43d11cb47aadb27235c23d758c0c98de7a95d2f9598bc20f7333211c SHA512 d2859003d1c2a2bc2844f8904e66f648d39a09e2847dd411ee68b6004ddc3e8e65d75c5af805a614a02167a8d1dfdb8c31b66f7985d1b1811c535060623a1ebe
-DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.0.mod 1291 BLAKE2B abb1bd080a36998bd0f48f77a40f119a4c55b5e396a9daf5c8ebe5ff5b29f5b1e105a186aee71f39ecfc1c18baceb3ea33beb2cbf86c7e323420b48dac5b62a0 SHA512 d4f79849dbce635e8f80031fb406c0f4c52d5c8a9c2896d40c3d3463d069d6c3a62de422203a41acfd8f325595aae77450e90138e5fdf7c812dd1746ac3691cf
-DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.0.zip 463302 BLAKE2B 760bf8cba810832e43ac24d4379b3568fc353120fc1f410aeab0556925089a737410125a5e5591910297a8d5ab87dd075c537e009d4fd785481db3dafa3da23d SHA512 c8b4c133f5912a02aa839f802fabc5c11d0b0ad1c1b4ceb702a67da8db25c2594e022eb45e11249ce0455712e5acfdab9720eba5486ef456f9b37ce1d37d38d4
-DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.0.mod 1591 BLAKE2B f6f6b7dad0d604859d7e8f62b9ad93199d1696e19498f945eb8faa3d2733b34b5e599272e27bf817229a59ea7da9dc973c00a5763a8b23aa6a3633d0d5b214a3 SHA512 f454f2667824023ca333652f78d6da7d3760061d26faafd221a464660a2eae54958c69f4f4b66ba5f8aedf48de14c91e092bfbcd64a2861f8c72192984376bb5
-DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.0.zip 2145216 BLAKE2B c153c76422e1c41413f98aedd72861f92dc5e0386da4f420d36b0c62f504dab4ba50b6f1609cb6c825863a7db2c0cdba0569ec5d16c922a5b659ca11f44a92db SHA512 7c3987914c2fe141ad9b50b876bbecf8ce6128d14a956b98a2e3938f447930b83420faef7020270c0d51d77ae0a42861e1b93e6a825c7b87f52aa189da88492d
-DIST k8s.io%2Fcode-generator%2F@v%2Fv0.18.0.mod 1051 BLAKE2B 28c44c1ea38f4bb77ab538784e40af90093dd6e9cdc9dc8babc5bbc6322f6aa3483f97cea03c0fc9a3abfb95e64573e8f17959c6cecf5915b361ca7e30a25cfd SHA512 b3dc9fcd96c9996eeec0decdf5e7ae12c33bfa8d87e94b14566aca3a492bafdb509bfa619f1e977c7f1f8f051d63a0003c2abdfebef15b14f5c4c78812344a59
-DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.0.mod 898 BLAKE2B 6cc9e5252b2e886ec23d67511e7f17d0097b564a2a35547d5c0c03c603f1485787c6a1bc3a5aba7d6b91c5377191987d7947a6181587be97319e4969c5ab5123 SHA512 743600f77e0d833d652c2affa3c0e6bf7f20dd429a914220762f044cd6d7460e8d7ee23af29b84f5bf0f1b0d17e6c3f8cc0853d31dbfb6ea64e78f5d7a6eaff5
-DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.0.zip 146593 BLAKE2B 125f77ab92e623c0deee825aa1f7a411ef680a4d9386a6696177228288821add27caec82483e335905de0722b8bc5c030fa32805a4d22194607a39368ae7776c SHA512 62273c50136a4c1c8b7ebf2d4510440ee58ed9f18d90cb34e8ff1e8c6808f83542f2e70060546b6ca9a3003953b2d4f0c7adbdc0007709c31ff14ccdf8d6a7e7
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
+DIST k8s.io%2Fapi%2F@v%2Fv0.18.4.mod 475 BLAKE2B 81712330f911caf684e74b06cecc63648144a0d2bc91950a2adc13b1f9e56552cedcd9f2c5037e07cafd731148208c4831f22d2cbc2e6cb2a18523a786362dd2 SHA512 7f587e1cec889ebd84aff04e12427d02b9857ac21b30f94840767213b2c4c57a31f7541892b1f30ddcb924ebe01aea18560b7f0ad30f2abbf1d30ca83e2b1226
+DIST k8s.io%2Fapi%2F@v%2Fv0.18.4.zip 3442467 BLAKE2B 0188403b1591d893a24680bd011d7655e7a6c604a8e949d8156a68a3d4285567ba1de4d6da2b34b6f9cf90204a3c0c1d5c014004852bedef9eeaf1f941a4a91d SHA512 6986f62c1cb18c63d7b7c2cce8d835766f4f8390a678e8ae536a1e0a99cf52ce822dc92368291405a4a1943451d1b08bf13b62dd3cc45d131bb309f6d7b3bc12
+DIST k8s.io%2Fapi%2F@v%2Fv0.18.8.mod 475 BLAKE2B 7df31be842b72773c82d8035fd6b233c1f273fa93087bfae4266900bf8fa689cacd62f235a183e41d9e02840384ae29ed7d7efe08cc678ce2d9e16df58bacc16 SHA512 0e91630eaea0bc95248354f0ba7baa28eb645eaf86d76c8ba508c51eb6a536a61c9c2593deedfd5ef8546de9a45b555038cf841b4d26e3c1173089b094ce2c6a
+DIST k8s.io%2Fapi%2F@v%2Fv0.18.8.zip 3442597 BLAKE2B ad167088f4423903c75e820cb37ab19549d3388dc7ecc803bd63ab223f02ffa8b84704cde1b83855b6a217979cc7ad59fb16e95f42b35c89030483fdc1f12c6d SHA512 937cb52c1c5d95a0f47cf6e3ac5a01e51991a8ecfd80352aead38e8d924234f35d5fb6b577be8f340f9f7b070f9f1fb9583d93d85eb3faf7bf33f4555910373c
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.4.mod 1543 BLAKE2B 8b5e7767dacb9d2307101bdda72033a9e51a0792d9307ea774d5d7f35d47ca086885824b059091e9cc2562d82875bf0a4715f02af51af6c58bcd8ca67895ea45 SHA512 3ead818938e51b764c54ab2c47cb2120bdaab68941fea5d7a23959014ec636f8c239f10a45b5a74b74501f2ebc686761442ec005abac667eebf777de06ba3a2e
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.4.zip 604313 BLAKE2B ab486857e6e979d5cd760a78f82f794ac40f389788b2f13bbf866c35da46dfb6cb428e85fb1ecc23c609a294612191b3d77329a1119cb06ac4f7ca9e4677fffe SHA512 57c7e0af981be6c5ca086f133b736c8115306a8198730589c16de7cf56661dc805b736be3b5e8c5155e01a7fa0a3b960c522ee5e867adfdbf973e1cffe81bc6b
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.8.mod 1543 BLAKE2B 5c29896f1e76958abadbfd7b0ca85376ec5592c2d217bbe078a4d6a96969d8335e259cf8962d7d709de2a738b9258c5d43e23809c526fc99692e8f196995c613 SHA512 e43b1bb4ebeb2c41d1fe8e82e73b71e071e08204b7374f1a3179264b962570da7d75a147e45c41cbe1cf2578d4d72d39e6cf98c6a3e4ba926d6cb0cbf5869238
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.8.zip 604397 BLAKE2B 0cd2b5acb7cafc6e37e6972b127fbdaaa9bec14d734ab0e0a205481c590f15496c7271c28208e830ce5abab91ddf7b49dd1d8826a20746063070ee9be024472c SHA512 8465ab9e7995ee316df99d6e9330ba17724303eda0786c587adb5ac058604961daa78d72a6a11b480cc98f610c64baa6a8da300aa5089b29ba088ff337ac4af0
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.4.mod 1621 BLAKE2B d900a46836b5db1e3fdfc0cdae750be578f87c9ff2628d15d6438efd04966aa45937d0b7cc1ecec59d3fbe5881a324d2483b8a1794a14fa7d099a75084ad7e8e SHA512 dfb42b8cf1147f96a726a745be420a2e3279f53b72accef3766da6d591d0f217fa620af2d2cf9982d848bfd97a150182d60ac58304ff59b7c8b3ce3b31459137
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.4.zip 782976 BLAKE2B 2fc2d707f3591c1d8967c79b16e4ba28baa808d9bc7648371f846c3b27f7b0ac477c0fcdaf136a7315ba3dce128ae598f7c15a48f43592986d9711ef6881f62c SHA512 5f3e21eed6f05db299a30f8f204e2a4ca98e62166c9b232066e8f34ef263f222564a1e2a2a07ed8600ae0ca41a8f9d90678cccf6258377d4f679d60583d2a084
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.8.mod 1636 BLAKE2B 39389c6a705f0959a6661a1732962bcaa47e39c88e1365265d65745f40afe28bc8fcfbda2f756c3cd801f56e54acdb3fbaee31267ddab1823f8121304b146f25 SHA512 cfac07e354564a8d737dcaf549aa47c9b96293a867f25f9a9774451435e5504392872a7be93e441d256c73ae2075b822f0cc1bffafced0af62f4cb5169e913f6
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.8.zip 783417 BLAKE2B 51655fb7fc8e4a759e5cd48d5763aff29bb3f31bb19163ffeef099d345e20b6aa07e90f416f8d39350b82a1d1101a6a92b8b9b7ca64929e0ba8cf27beb4c457d SHA512 80877134b8cdaef32951c832d2a2d4c287003b0c3c816ae6538739d29f86d204a6fb0543ec9b3f2c06de79c7b347e3b4eba58ae08705fb1ba474d5653a21d5d3
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.18.4.mod 2647 BLAKE2B 60bc4bd15addde6f39f3eb29675363680412eb7b59523b7399bef716f97f3749159b34a47115a7cab2a8b0bd5bf79dad6b30a2acd973f1ad8c59056add9bd941 SHA512 2e05b765d5ae7b59c00939e38803373ac32d9e7f883ebe59b00d37e6524bffa7eb3bb25e9068def69f656b475ac428e5ffcf01546529bcc927d8c92cc889a4f3
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.18.8.mod 2662 BLAKE2B c9a6e7dce4ebfdc7d2221266e4901d59214ae2bdb805f89e301e61975ac38c0e330c46d3b035d2b651905c923077dcb015f71ac23790ffbdd91a7b8d91d52246 SHA512 991f184242d84c5d78fcca49067076a84358c1e2290d3c9786f218cc56bb44a59a9cc7a58560edfe9b07fe8696f5749b3f0b095b0f13079dca7fb9f9b88b5758
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.4.mod 1307 BLAKE2B f525f1fea05b26ef69ba1265bc5ed3979ddeeed48486069b7256f1c06f96427ad11d8ff2bc4e118b3e4bf8969d44909ea4643249c40ab6628ba2e3b877797ebe SHA512 a77a071d74ee0fad326c1c8ddc090250566dd472ed1089c9159af10ddbb1b4309f2ac45f8b66484c2b8242b73413ff9d547cc50d12a9bda00d7d314a9c1a84d1
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.4.zip 463311 BLAKE2B dd723eefbed0139db31caaad4da657a6b8461b95d8573746ecd58b657458f2d132167d31b136145b6981181f05d6b46f78cbafd446a15223c0096bee0240cec5 SHA512 ef139627071ff1ec06cf5923c57f008a2a74347064e380e1a04015e3ed6a55f7e1f219d2ad83612e769c48f7946630ec84c939fe69c6943d64385ce03a8cf0e0
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.8.mod 1322 BLAKE2B 9b8ce22015f21a78737be48c71083efe074107e7b18037aa63a1f208f0f14d3c26922776ea709626fde54f34a7c3a0071271374b7d48fe2c7fa1f70c7fedbcf8 SHA512 764a74b8ea1912963dd7b4373cfcc0f8ab54700416578e5df9184bb672c1770aa4b8185c2909c999a0669416483bd6da1ac6b1e3c05c4197617d93da15c81246
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.8.zip 463410 BLAKE2B 0f0c4331e87e7bebc8fc4d6e6b39ab0262113c06ba99523fd6bbb15e9359055dc1d1091b446122cb9e0fa396a1152b32db2a08c37f8e9dd9d22a3d8a17fb93c0 SHA512 4e9295f3831fb8b45a2db0b5d4cb48be5ab49d492eb3046ffedf9601c3aa5967612d94bc09e1be8cde31422e9c3a1c2a04aafe818112f05d92329d47437283ea
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.4.mod 1591 BLAKE2B 2d7c4d51da9090c8ea2507639f519946375fc3e63de1fc451f699c83799c76f43f85b3992ed44b0a5a9e42bd85b9d559b68abb3a41950de9e9012f4a281d6a87 SHA512 2e4fdcd447d6abd2ce5145d9b157267ccce27b52a83e7e31188fc25cae6e853c7beed3a70345ce0a21ce65f13d0644b3432d796e822f9276a49847758abb31b3
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.4.zip 2145721 BLAKE2B 72ada14492290c2ec710330b0fa45e470112d1e666eea75a968a34755438eac46775dd3bba2d31c0a90b3ec4a8e7660c095e32f503d4113b4ffb113d7bcb85ef SHA512 b938bbea89a9aff0596b26d24922e03f16bce963fe61ed612495bd2a0c40cdea72cbbc53b42045f8b5a007d9c4ed95e40f1c26b5de69d72afc50081bed8d501a
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.8.mod 1606 BLAKE2B 18042cd13fb92c6ec2324434c8cd21d77bdade496eb928b30354d3484c8da81e3babe1738d6ce805b8a09a4c275db9573d2e0b9ab15135260089b3646849ee9a SHA512 218fb1280d6188c581174f1d99c21755afa2ecdc07f520b5a87b7e836041cbb1ce2a2576af89c5e6164b3984bfa2fe3b04d77555a58b8be3eb718e2fb3f266b6
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.8.zip 2146391 BLAKE2B 680b2547daa7236b244fd1784f3cd0483edb15743fd9a01946a44444cc499638429ab3836fa74a4eed51924402fad43198798becc39ddc45895ed203f2503fd1 SHA512 5c3347234f3a5110ae80c9264f9310f85435d885cf70534a18b632d64e9d7f62b4a7195e52d039f9ea23d32c8bc945c11af0e07d4776ad89464f9d6af5b9fd64
+DIST k8s.io%2Fcode-generator%2F@v%2Fv0.18.4.mod 1067 BLAKE2B d3133c2596ababee5cb774ede5881feb974f36d62d58be14e04e2d3652b29d9f0fdcc50373c0fa1068cdd2911dca89183615fb8eee8e181ad45e403d5846565c SHA512 c34e945b634e8cecd22b140b8cf244648a5fc40057950839ead1fa609ae9e1228ddf94bda68c09f79f3e84d0df137e101fdf800b5ac65a57a208d6030225d621
+DIST k8s.io%2Fcode-generator%2F@v%2Fv0.18.8.mod 1067 BLAKE2B d3133c2596ababee5cb774ede5881feb974f36d62d58be14e04e2d3652b29d9f0fdcc50373c0fa1068cdd2911dca89183615fb8eee8e181ad45e403d5846565c SHA512 c34e945b634e8cecd22b140b8cf244648a5fc40057950839ead1fa609ae9e1228ddf94bda68c09f79f3e84d0df137e101fdf800b5ac65a57a208d6030225d621
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.4.mod 898 BLAKE2B a0dd888b5fa55c00f88a97e00aad35febd63729d182bcc402d631fadfb585c9fc7fe25b24e0ea85085b37b69a54383de9bbb90f7acdabd25c2840b2ef44094a7 SHA512 73cd415b8468c8c5aab4881a535ed71a4b57ababe633e7902b3d46205adb3486e5930b87b7528f418a0387d0ec2ce01d346db9dc75d74b52cf9d8fa89d4e59f5
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.4.zip 146591 BLAKE2B 8d169a6ee42fe3b0e5c12eac7fc7ea0ff765b68fefeacd140a5409fc6e675963749a8c2073ab11043ca2e6aa6f7e5e60cfc2f091894fb2026eee18a6705488b7 SHA512 e33270544be0696ac4d8c1d800620bba711f639bee7fdc91b86d064f6d2203036d1346ee3823badbe2b65274634553dc4358d9c0a77f67e6939f036fd2ebfe70
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.8.mod 898 BLAKE2B 8e9c10e3836abcb150ed5fc6a196f4479f3b5e49648d2395b18b27473f8581bd4b2a04e1ec56a07fd71e17e74a21f94dce919257652dd232c0e48afa14823aa1 SHA512 bc3f0dbc319926f412587a16c3317b105b7381ee506afcf1e96c332c48437e14ee2d744a7505b1df6194dbc69b8234bdfebdb799fac28fb81deeedf9882b5098
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.8.zip 146723 BLAKE2B 70e43fbf3452551c6cc3bd19f5851147ce3af128d56b5911964dad8df561f9b3bad427a5dce20a65964117367434d7436271717ee91cb0683d1260b4c553d0c7 SHA512 f468feeab442f4348db2b41a994642c6337f88cc404204ac06398068666e61dfb8164ffb1cb81f04a77fa02b5593aa49d89791832a37b2f3425927e6c50b78dc
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
 DIST k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
 DIST k8s.io%2Fklog%2F@v%2Fv0.3.0.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
 DIST k8s.io%2Fklog%2F@v%2Fv1.0.0.mod 68 BLAKE2B f745a62a974a42d1692705de032c8c651477ec71f32b0515adc02360e5a3de6c7d65f5d97960e78da06e99b0843c312a09701c08c6a5c112af832e3cd2e43649 SHA512 cfee3f10c26fafe7cbc510ff8cba479dfacedf1d95b4e25b75978656862067524b4b9f5e889455f2d74eacf07df7895fe266415a05b9502a759baf2e4bd3884a
 DIST k8s.io%2Fklog%2F@v%2Fv1.0.0.zip 39827 BLAKE2B 441907426e07ed46aeeb6314c615fceedd43bf1b21b07a31960b23e1cf31dc400f1d7f0304cd5c13db8c2d54aaec47d05425798508978cb25c7d05aa3fcf2fa4 SHA512 b28b559a8a6e46b206ac005497d2e061645a81a3dc4b4f2c2a9f84065aae024dfbe7c64e9a446f72f7f88b5dea31d0ee725b273fb79877e24fb27906e1500c2b
-DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.mod 1743 BLAKE2B 1f2f1c417b102908c388ebdabbe4686f756287951943eac396b07d8be7fa905a6d362442a2f99d5411aa19b27df038e699ec1264648e9c948126835df0f1a767 SHA512 6444514b3858974b4517ef18bbf82366363e2032e53a8a88db6bf2cda4105271ed672a49cac0d01aefe7f006cb69a8e8deebc077a91063571dd1b20fdf09b21c
-DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.zip 826029 BLAKE2B 454d5c68dc5b2216ff9d38302a817349ed84e2a74e52cc115695d37e6d6b0425af6163b52a96b370a09a6034dffde3ebb362d6f112c2f8b8d0d59a90f9933a17 SHA512 5e4f061796cd04e9dccb2f43c292922363d670a2be8362bbc11b5cc4c658847585a552525ae604b909ab159f447bfbeea71b91c871b01374c749f75d117c3dc1
-DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.0.mod 2674 BLAKE2B 7ebcbe7a21230135fffa57633be6d3cb2f356200a371a94f5f653c4385c837416cf669774e7f9180f2f151bc957e17516bb14817fa3886620754ec23f2d4d1ed SHA512 189bffb0111bab15210d225304dc9973b78eda60d056bf3c5972df8ab453d506ef41161e2e3db27787212a59d8cca1d7d4a1d80069c19dc93f10e3ed98e8dcf9
-DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.0.zip 3312721 BLAKE2B fa4ea05eb33293ee93fd8eec7601134f5ccb840b8f78f8dd2d5a95f639848a4f9dc8380241b1cffa49fbd9622b2105c3ff3bad42675b5f7fbb410dcab3c69b69 SHA512 a3eb4055d63f7dba025b85760e0201e9219480bab6be003851ea3630b075c35511605e080dec3bdba371f27278e79193590c0ce712e4eac8df86486e285dd7d3
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod 1743 BLAKE2B 1f2f1c417b102908c388ebdabbe4686f756287951943eac396b07d8be7fa905a6d362442a2f99d5411aa19b27df038e699ec1264648e9c948126835df0f1a767 SHA512 6444514b3858974b4517ef18bbf82366363e2032e53a8a88db6bf2cda4105271ed672a49cac0d01aefe7f006cb69a8e8deebc077a91063571dd1b20fdf09b21c
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.zip 833867 BLAKE2B 964d8c0f8d94aaaf19ce5aef5ecfa512da1db391158f2bb0b42ef16b6e356b443d7e76368879bfae0ae31e5fe7e0cd2e56458461521c0c5bd38d4e5f2cb8b876 SHA512 fb555892a68bd723dfc63da35d9e754fbe5b157b398d924956ba41d7f81b5bc14988ff979c32bf48c1e019c316d414374bf57673f7236f5e26c6898f071ee46e
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.4.mod 2690 BLAKE2B 51b292196f86e2cd34e971e217a723d0c14a770769a98789a5293182b817660c107035266c8920931c0c8d965d3c34612d023bcea688130e5796edc8e05eeedd SHA512 97de40e1362e5ee4e1356e7a00445e965676232d21756e17f589fa185db51865b6430c1c593ac4006d533f0f29e8597dc9011a3d9570df5f625a61c87406cedb
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.4.zip 3312836 BLAKE2B 06ab8f4f119eefdb757406a177415a7f6c229cfb97c887f07e656f0e4d1c6ec3c69b35424a99beaa76d6c665e2fdecc6ecd8fe0b846e98ceef44f6dc65e002c6 SHA512 7b3133ca89b38ce895f59de319fe673938bc33acb57a915e877b87e46d206fec750efeb8378a37fe922dd975a5f2d3cda90551182d227491ca921ccb061c8f86
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.8.mod 2705 BLAKE2B 176cdc6687ad797a87c0450b060ec9ef962df79fa7e46b19a00ce768d1c5d7772b164309e6e592619d51a2f36aad55f9415a818adb74704de62f58247133abd3 SHA512 fed0a74b4c7ae8557eb07eeec0ac875dba856353b97c3c38fc2ff90b2dc4f1ae9c87f44b4b75a61fed069b1cf73d7ed5754bca2a971d6d4b99f1b03357324fa0
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.8.zip 3312938 BLAKE2B 6e8c2c20306706b3f9685f4e4f244c64cc2224f723117dbd5409609058b2596bda9246ecaefdee63ebd8084ab62426bae84bd808ef7736e5b9474e37d835ace8 SHA512 2baf6a76216c2e8261c5413c3170ca174515c18e0d3e4ef02f32618a61518f51c78e7026d99b6b5cb1f8af90adb35342ade05ce3c7897d1a8d9bf2f02d6e5146
 DIST k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod 25 BLAKE2B 4060536d51fac9854215957b1108a158adb0b3aeb8bfc659eca1140efdcf79cffe378db6f3cb1f4a4b68aa36468b7d5631e993d5a089eb839bd03b6b608496be SHA512 2349b7dbe8409836cc70d97c5b336f518b809f5731baf05ce68d957c9970895a9b7f89caf09763794cf13824ee29410b3a6e431b2da7f64610895c44b86c4d2d
-DIST k8s.io%2Fmetrics%2F@v%2Fv0.18.0.mod 692 BLAKE2B 76478ff05c62c6946518a3ddb372257c396362b4637dee49165e1c0f77e5e2a8d9a0acb81a530474c8b558d5d0766db67307d9ec37f999aed7d43f793ba46c31 SHA512 2ba79ee78ccd463ae3901b57f5c54ab88302c7cf8784173874b0cc6f0df9dbbc6834db5aba21934b140add4e7c961645112af66b1796fc731a8aa06d37391885
+DIST k8s.io%2Fmetrics%2F@v%2Fv0.18.4.mod 692 BLAKE2B 0d75dc7a0df4f86c3499fcd3838043ec3206281b43393cf210fc91f29d6516ff7313fd2e42713dcb04afd45ec16f2ed58e73becaef147b41d1d6ec71da20b477 SHA512 39d689b3b0edd309c042862e2f8c852f5320111c28c651a3f7e34ecb498970b26eade8e15738815fe6d11f16af87a7b33383855675ebd15d198384d11d3833e9
+DIST k8s.io%2Fmetrics%2F@v%2Fv0.18.8.mod 692 BLAKE2B 1ef91337ee3abc8206e7118df4ba9d25add0b70a75073f65a7a0686e4653abb45aea53f270765039dc0236f4312ab10c7d71f9fcec50662abcfce6a6ec0e20c1 SHA512 032530a5611bde524d7f1fab3548830c45696e306f5a2c8189f9d8f005b9bf0cbafc6da38ccb1b2083be3257e2398afc785a0b6f498b07e75263440eeb84bd30
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip 147166 BLAKE2B a9d5897231997c8184aba7c58d6b31fa8413d7c94e48f52fb59f171f537d0e9a047055a5e717e411c7f0dbc63bf1794c2a425c278724eeb73de59e7bbd8d2ee0 SHA512 49641d1a253a5469d9dec1e104b5ecbd7033e28f8ab08c351edea432687fb1bf902d9fbf3ea2ef217b82ab06ca3f2453a1dccf03468d38281c847e19477641df
 DIST sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.7.mod 172 BLAKE2B 76dc350439e69f75cfc082d93ee6649320fa8e311933db45425d4489f0ea21aeb8c1342b13e86d1a40c092788592e3d31e55cb550f05a3079fb60dc87f2a739f SHA512 ab153a98f7ccba57905e02e1bebc462ef2e3a86b459c0cbf8d346a2aa8eb044fd474ad2a267dfa2421d1b31d51d6db6f1ba9739cfcef8ee8c02bef554a39a40e
@@ -886,9 +1081,9 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
+DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod 20 BLAKE2B 9817a2968dcdd45e9e5d40b93cb54e6002d0aa6613f241bd77d448b3173b639f58a88d25899734be39a822473b4aac69ad947878006d5bb266a13f24637b0082 SHA512 b052661c1a3c2599fa350578cde2899166b39b71c65a6414ca7ea33e8d5186e85895ebd948819313781041d06fac3292cb08ad12447060df3860a86402344c24
 EBUILD helm-2.16.1.ebuild 10055 BLAKE2B 6a0279e082cd74eafb01b4fc77b97a62ddd2e6ce44969db65d053a507f081583501b05afe6220e86dae5b037700ba410a4c67e3c1fa92472360c774f7fd05ee4 SHA512 78f9aeb398ce93c64fb558be4edd3fb9cb55d42f2658cdf57f0bd8fcccb4269007c1d952494a50a655cd57d4b7a89690df9a48485c77876ddf438600d4153b6a
-EBUILD helm-2.16.7.ebuild 10056 BLAKE2B e29a8a1186299115249d6b9adcd9a28150fa2348b37f24f2ef2806ed36fec668095dfb0f823029bc4ce1844ae54730a7febff27fe4146f85992a9b1964e223b1 SHA512 a5153becd363133eb0b28bbedaab64794634756abfadbe5ed1a0e90ecd2b5445eebf8a45d0898846edb063b27b1cfb7c9c115b33d12e63f9d1aa36670cbd83d2
 EBUILD helm-2.16.9.ebuild 10053 BLAKE2B 2afbc8dde7c233bb7dc93759e8f95d166fec1bad1b25d6f2da43ce3ce6d004c518d9b241f18a4c4c3fd9d5322dc4ea0801e612a4614c47969348d0d3d33904e5 SHA512 d305a121a6dcd2e609b5b51ed26a8676912be2576502ce32e6a3c242a2b45b1978cdb2eefc715e1d8c1e5e1cffe131dc94590d9eef6a0e2eff5a9ea18f2522b4
-EBUILD helm-3.2.4.ebuild 43316 BLAKE2B 48427880dec41160461298495d6a1263b28a4e419f34031e580ed5a05066f1376086ad312841f4a911b2bf891f71daff957e29f05678375e4715f0f675dd19a1 SHA512 4a6bec3ad4282fe7a1f1c6cb5a7349342bf8d114cb4dc3d7f3ab2439b3d4e5e66197c5e84d62c7c1c906fc4b880198c3c2c3da385a3bbfbbc3caf316666bc5b8
+EBUILD helm-3.3.4.ebuild 53769 BLAKE2B a43abc89b94f837cb83beddd4fb1efa8e0ea75f8daf972142aa898767075f72d2db90e653ee149a9ebdf43834b8caeb2883c927733df136c8ae1c3377ba9550d SHA512 e8f01ab1ac529e8a67f67146ab906b4162c3799e1dad1503cedca12fb82a84297df063293f10fd62997d554414d551df414ceefc0a2f56fcd66b0fc5b772bcfa
 MISC metadata.xml 322 BLAKE2B b452dfaecaf6b32e7fc334ddb00444d739a618898f8e0d6905e8b3191acc7f0fc5e3929345405d86f9ab56e8ad80fbcd1dd46a0ea3ff5aaa2bb9f56407d10234 SHA512 ef4bb714213346e60a2a39833d0ab1987e10d2b34460a053b479775163e8778021ef3da63a8f5fede055281298dab88309a796cf3ad650c2d3ddeb17a7b0b4be
diff --git a/app-admin/helm/helm-2.16.7.ebuild b/app-admin/helm/helm-2.16.7.ebuild
deleted file mode 100644
index b5d0d64fefcf..000000000000
--- a/app-admin/helm/helm-2.16.7.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="k8s.io/helm"
-
-MY_PV=${PV/_rc/-rc.}
-
-EGO_VENDOR=(
-"cloud.google.com/go 8c41231e01b2085512d98153bcffb847ff9b4b9f github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
-"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
-"github.com/Azure/go-autorest 69b4126ece6b5257e2f9b0017007d2334153655f"
-"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
-"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
-"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
-"github.com/cpuguy83/go-md2man 7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19"
-"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
-"github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73"
-"github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
-"github.com/docker/distribution 2461543d988979529609e8cb6fca9ca190dc48da"
-"github.com/docker/docker be7ac8be2ae072032a4005e8f232be3fc57e4127"
-"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
-"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135"
-"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
-"github.com/fatih/color 3f9d52f7176a6927daacff70a3e8d1dc2025c53e"
-"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577"
-"github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d23f618feb6dbb"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
-"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
-"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
-"github.com/gogo/protobuf 65acae22fc9d1fe290b33faa2bd64cdc20a463a0"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
-"github.com/golang/protobuf 6c65a5562fc06764971b7c5d05c76c75e84bdbf7"
-"github.com/google/btree 4030bb1f1f0c35b30ca7009e9ebd06849dd45306"
-"github.com/google/go-cmp 6f77996f0c42f7b84e5a2b252227263f93432e9b"
-"github.com/google/gofuzz f140a6486e521aad38f5917de355cbf147cc0496"
-"github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c74f71af0538a4"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud c2d73b246b48e239d3f03c455905e06fe26e33c3"
-"github.com/gosuri/uitable 2cf933346b8370a3a3d8867ef5cf54b2129d8ecf"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/grpc-ecosystem/go-grpc-prometheus 6af20e3a5340d5e6bde20c8a7a78699efe19ac0a"
-"github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"
-"github.com/huandu/xstrings f02667b379e2fb5916c3cda2cf31e0eb885d79f8"
-"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
-"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-"github.com/jmoiron/sqlx d161d7a76b5661016ad0b085869f77fd410f3e6a"
-"github.com/json-iterator/go 27518f6661eba504be5a7a9a9f6d9460d892ade3"
-"github.com/konsorten/go-windows-terminal-sequences 5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"
-"github.com/lib/pq f91d3411e481ed313eeab65ebfe9076466c39d01"
-"github.com/liggitt/tabwriter 89fcab3d43de07060e4fd4c1547430ed57e87f24"
-"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
-"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
-"github.com/Masterminds/goutils 41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"
-"github.com/Masterminds/semver 805c489aa98f412e79eb308a37996bf9d8b1c91e"
-"github.com/Masterminds/sprig e4c0945838d570720d876a6ad9b4568ed32317b4"
-"github.com/Masterminds/vcs f94282d8632a0620f79f0c6ff0e82604e8c5c85b"
-"github.com/mattn/go-colorable 98ec13f34aabf44cc914c65a1cfb7b9bc815aef1"
-"github.com/mattn/go-isatty 0e9ddb7c0c0aef74fa25eaba4141e6b5ab7aca2a"
-"github.com/mattn/go-runewidth 9d4e0701ab53d89eeb2f46b282d1cd71f458f0bf"
-"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
-"github.com/mitchellh/copystructure 9a1b6f44e8da0e0e374624fb0a825a231b00c537"
-"github.com/mitchellh/go-wordwrap 9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"
-"github.com/mitchellh/reflectwalk 3e2c75dfad4fbf904b58782a80fd595c760ad185"
-"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
-"github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
-"github.com/opencontainers/go-digest 279bed98673dd5bef374d3b6e4b09e2af76183bf"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/pkg/errors 27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"
-"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
-"github.com/prometheus/client_model 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"
-"github.com/prometheus/common 4724e9255275ce38f7179b2478abeae4e28c904f"
-"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/rubenv/sql-migrate 9355dd04f4b3dc9ed604623307307a3491a627bc"
-"github.com/russross/blackfriday 05f3235734ad95d0016f6a23902f06461fcf567a"
-"github.com/sirupsen/logrus 839c75faf7f98a33d445d181f3018b5c3409a45e"
-"github.com/spf13/cobra f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5"
-"github.com/spf13/pflag 2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab"
-"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
-"golang.org/x/crypto e84da0312774c21d64ee2317962ef669b27ffb41 github.com/golang/crypto"
-"golang.org/x/net cdfb69ac37fc6fa907650654115ebebb3aae2087 github.com/golang/net"
-"golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
-"golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e github.com/golang/sync"
-"golang.org/x/sys b90733256f2e882e81d52f9126de08df5615afd9 github.com/golang/sys"
-"golang.org/x/text e6919f6577db79269a6443b9dc46d18f2238fb5d github.com/golang/text"
-"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
-"google.golang.org/appengine 54a98f90d1c46b7731eb8fb305d2a321c30ef610 github.com/golang/appengine"
-"google.golang.org/genproto 919d9bdd9fe6f1a5dd95ce5d5e4cdb8fd3c516d0 github.com/google/go-genproto"
-"google.golang.org/grpc a02b0774206b209466313a0b525d2c738fe407eb github.com/grpc/grpc-go"
-"gopkg.in/gorp.v1 6a667da9c028871f98598d85413e3fc4c6daa52e github.com/go-gorp/gorp"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/square/go-jose.v2 e94fb177d3668d35ab39c61cbb2f311550557e83 github.com/square/go-jose"
-"gopkg.in/yaml.v2 f221b8435cfb71e54062f6c6e99e9ade30b124d5 github.com/go-yaml/yaml"
-"k8s.io/api 35e52d86657aba06859dd22099bfa14faf1effb2 github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver 5357c4baaf6562e4d37c9afc9fef99bd16d76a9f github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery a2eda9f80ab8a454a81bdde16d62a1afe5f931c0 github.com/kubernetes/apimachinery"
-"k8s.io/apiserver 5190913f932d82e562d4eb91d0f3d7a063bdbc07 github.com/kubernetes/apiserver"
-"k8s.io/client-go bec269661e48cb1e5fbb0d037f356ffe9e9978a0 github.com/kubernetes/client-go"
-"k8s.io/cli-runtime 74ad18325ed51ea6de9ee19bae59156bad18ecd2 github.com/kubernetes/cli-runtime"
-"k8s.io/component-base 039242c015a9f5eeaccea3ea17c6973b9c27166a github.com/kubernetes/component-base"
-"k8s.io/klog 3ca30a56d8a775276f9cdae009ba326fdc05af7f github.com/kubernetes/klog"
-"k8s.io/kube-openapi 743ec37842bffe49dd4221d9026f30fb1d5adbc4 github.com/kubernetes/kube-openapi"
-"k8s.io/kubectl 2ed914427d51f6fd865e0db43d72b2f22610cf32 github.com/kubernetes/kubectl"
-"k8s.io/kubernetes c97fe5036ef3df2967d086711e6c0c405941e14b github.com/kubernetes/kubernetes"
-"k8s.io/utils 581e00157fb1a0435d4fac54a52d1ca1e481d60e github.com/kubernetes/utils"
-"sigs.k8s.io/kustomize a6f65144121d1955266b0cd836ce954c04122dc8 github.com/kubernetes-sigs/kustomize"
-"sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 github.com/kubernetes-sigs/yaml"
-"vbom.ml/util efcd4e0f97874370259c7d93e12aad57911dea81 github.com/fvbommel/util"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-GIT_COMMIT="bbdfe5e7803a12bbdf97e94cd847859890cf4050"
-
-ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Package Manager"
-HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
-		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
-		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
-		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
-
-	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
-	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
-	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
-	popd || die
-	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} bin/tiller
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/app-admin/helm/helm-3.2.4.ebuild b/app-admin/helm/helm-3.3.4.ebuild
index b6e9df7e0270..d3db7c00e7e1 100644
--- a/app-admin/helm/helm-3.2.4.ebuild
+++ b/app-admin/helm/helm-3.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit bash-completion-r1 go-module
-GIT_COMMIT=0ad800ef43d3b826f31a5ad8dfbb4fe05d143688
+GIT_COMMIT=a61ce5633af99708171414353ed49547cf05013d
 MY_PV=${PV/_rc/-rc.}
 
 DESCRIPTION="Kubernetes Package Manager"
@@ -37,18 +37,17 @@ EGO_SUM=(
 	"github.com/BurntSushi/toml v0.3.1/go.mod"
 	"github.com/DATA-DOG/go-sqlmock v1.4.1"
 	"github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod"
+	"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/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/semver/v3 v3.1.0"
 	"github.com/Masterminds/semver/v3 v3.1.0/go.mod"
 	"github.com/Masterminds/sprig/v3 v3.1.0"
 	"github.com/Masterminds/sprig/v3 v3.1.0/go.mod"
-	"github.com/Masterminds/squirrel v1.2.0"
-	"github.com/Masterminds/squirrel v1.2.0/go.mod"
+	"github.com/Masterminds/squirrel v1.4.0"
+	"github.com/Masterminds/squirrel v1.4.0/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"
@@ -66,21 +65,37 @@ EGO_SUM=(
 	"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/Shopify/sarama v1.19.0/go.mod"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+	"github.com/VividCortex/gohistogram v1.0.0/go.mod"
+	"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/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/template v0.0.0-20190718012654-fb15b899a751/go.mod"
 	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
 	"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+	"github.com/apache/thrift v0.12.0/go.mod"
+	"github.com/apache/thrift v0.13.0/go.mod"
+	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
 	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
 	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/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/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535"
+	"github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod"
+	"github.com/aws/aws-lambda-go v1.13.3/go.mod"
 	"github.com/aws/aws-sdk-go v1.15.11/go.mod"
+	"github.com/aws/aws-sdk-go v1.27.0/go.mod"
+	"github.com/aws/aws-sdk-go-v2 v0.18.0/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/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/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"
@@ -96,23 +111,35 @@ EGO_SUM=(
 	"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/casbin/casbin/v2 v2.1.2/go.mod"
+	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
 	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
 	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
 	"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod"
+	"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
 	"github.com/client9/misspell v0.3.4/go.mod"
 	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/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/containerd v1.3.4"
+	"github.com/containerd/containerd v1.3.4/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"
 	"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"
 	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd"
 	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
 	"github.com/coreos/bbolt v1.3.2/go.mod"
 	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
@@ -127,6 +154,7 @@ EGO_SUM=(
 	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
 	"github.com/cpuguy83/go-md2man v1.0.10"
 	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
 	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
 	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
 	"github.com/creack/pty v1.1.7/go.mod"
@@ -167,15 +195,21 @@ EGO_SUM=(
 	"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/eapache/go-resiliency v1.1.0/go.mod"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+	"github.com/eapache/queue v1.1.0/go.mod"
+	"github.com/edsrzf/mmap-go v1.0.0/go.mod"
 	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
 	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
 	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
 	"github.com/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.6.9/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 v0.0.0-20200808040245-162e5629780b"
+	"github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible"
 	"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"
@@ -184,6 +218,8 @@ EGO_SUM=(
 	"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/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
+	"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/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"
@@ -195,8 +231,11 @@ EGO_SUM=(
 	"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-kit/kit v0.9.0/go.mod"
+	"github.com/go-kit/kit v0.10.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-logfmt/logfmt v0.5.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"
@@ -261,9 +300,12 @@ EGO_SUM=(
 	"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/godror/godror v0.13.3/go.mod"
 	"github.com/gofrs/flock v0.7.1"
 	"github.com/gofrs/flock v0.7.1/go.mod"
+	"github.com/gogo/googleapis v1.1.0/go.mod"
 	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.0/go.mod"
 	"github.com/gogo/protobuf v1.2.1/go.mod"
 	"github.com/gogo/protobuf v1.3.1"
 	"github.com/gogo/protobuf v1.3.1/go.mod"
@@ -274,6 +316,8 @@ EGO_SUM=(
 	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
 	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef"
 	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/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"
@@ -281,6 +325,7 @@ EGO_SUM=(
 	"github.com/golang/protobuf v1.3.1/go.mod"
 	"github.com/golang/protobuf v1.3.2"
 	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/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"
@@ -289,6 +334,7 @@ EGO_SUM=(
 	"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.3.1/go.mod"
 	"github.com/google/go-cmp v0.4.0"
 	"github.com/google/go-cmp v0.4.0/go.mod"
 	"github.com/google/gofuzz v1.0.0"
@@ -297,6 +343,7 @@ EGO_SUM=(
 	"github.com/google/gofuzz v1.1.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/renameio v0.1.0/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"
@@ -308,10 +355,14 @@ EGO_SUM=(
 	"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/context v1.1.1/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.6.2/go.mod"
 	"github.com/gorilla/mux v1.7.2"
 	"github.com/gorilla/mux v1.7.2/go.mod"
+	"github.com/gorilla/mux v1.7.3"
+	"github.com/gorilla/mux v1.7.3/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"
@@ -323,29 +374,45 @@ EGO_SUM=(
 	"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/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/hashicorp/consul/api v1.3.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
 	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
 	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
 	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
 	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/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/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/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/huandu/xstrings v1.3.1"
 	"github.com/huandu/xstrings v1.3.1/go.mod"
+	"github.com/hudl/fargo v1.3.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/imdario/mergo v0.3.8"
 	"github.com/imdario/mergo v0.3.8/go.mod"
 	"github.com/inconshreveable/mousetrap v1.0.0"
 	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
+	"github.com/jessevdk/go-flags v1.4.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/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
 	"github.com/jmoiron/sqlx v1.2.0"
 	"github.com/jmoiron/sqlx v1.2.0/go.mod"
 	"github.com/joho/godotenv v1.3.0"
@@ -364,6 +431,8 @@ EGO_SUM=(
 	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
 	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
 	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/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"
@@ -377,11 +446,14 @@ EGO_SUM=(
 	"github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod"
 	"github.com/lib/pq v1.0.0/go.mod"
 	"github.com/lib/pq v1.2.0/go.mod"
-	"github.com/lib/pq v1.3.0"
-	"github.com/lib/pq v1.3.0/go.mod"
+	"github.com/lib/pq v1.7.0"
+	"github.com/lib/pq v1.7.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/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
+	"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
 	"github.com/lithammer/dedent v1.1.0/go.mod"
+	"github.com/lyft/protoc-gen-validate v0.0.13/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"
@@ -396,6 +468,7 @@ EGO_SUM=(
 	"github.com/mattn/go-isatty v0.0.3/go.mod"
 	"github.com/mattn/go-isatty v0.0.4"
 	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-oci8 v0.0.7/go.mod"
 	"github.com/mattn/go-runewidth v0.0.2/go.mod"
 	"github.com/mattn/go-runewidth v0.0.4"
 	"github.com/mattn/go-runewidth v0.0.4/go.mod"
@@ -406,12 +479,18 @@ EGO_SUM=(
 	"github.com/mattn/go-sqlite3 v1.12.0/go.mod"
 	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
 	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.14/go.mod"
 	"github.com/mitchellh/cli v1.0.0/go.mod"
 	"github.com/mitchellh/copystructure v1.0.0"
 	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
 	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
 	"github.com/mitchellh/go-wordwrap v1.0.0"
 	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/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"
@@ -429,84 +508,128 @@ EGO_SUM=(
 	"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/nats-io/jwt v0.3.0/go.mod"
+	"github.com/nats-io/jwt v0.3.2/go.mod"
+	"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
+	"github.com/nats-io/nats.go v1.9.1/go.mod"
+	"github.com/nats-io/nkeys v0.1.0/go.mod"
+	"github.com/nats-io/nkeys v0.1.3/go.mod"
+	"github.com/nats-io/nuid v1.0.1/go.mod"
 	"github.com/ncw/swift v1.0.47/go.mod"
+	"github.com/oklog/oklog v0.3.2/go.mod"
+	"github.com/oklog/run v1.0.0/go.mod"
 	"github.com/oklog/ulid v1.3.1/go.mod"
 	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
 	"github.com/olekukonko/tablewriter v0.0.1/go.mod"
 	"github.com/olekukonko/tablewriter v0.0.2/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.7.0/go.mod"
 	"github.com/onsi/ginkgo v1.10.1"
 	"github.com/onsi/ginkgo v1.10.1/go.mod"
 	"github.com/onsi/ginkgo v1.11.0"
 	"github.com/onsi/ginkgo v1.11.0/go.mod"
 	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.4.3/go.mod"
 	"github.com/onsi/gomega v1.7.0"
 	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/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/go-digest v1.0.0"
+	"github.com/opencontainers/go-digest v1.0.0/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"
 	"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/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
+	"github.com/opentracing/basictracer-go v1.0.0/go.mod"
+	"github.com/opentracing/opentracing-go v1.0.2/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
+	"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
+	"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
+	"github.com/pact-foundation/pact-go v1.0.4/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
 	"github.com/pborman/uuid v1.2.0/go.mod"
 	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/performancecopilot/speed v3.0.0+incompatible/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/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
+	"github.com/pierrec/lz4 v2.0.5+incompatible/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/pkg/profile v1.2.1/go.mod"
 	"github.com/pmezard/go-difflib v1.0.0"
 	"github.com/pmezard/go-difflib v1.0.0/go.mod"
 	"github.com/posener/complete v1.1.1/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 v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
 	"github.com/prometheus/client_golang v0.9.3/go.mod"
 	"github.com/prometheus/client_golang v1.0.0"
 	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.3.0"
+	"github.com/prometheus/client_golang v1.3.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-20190115171406-56726106282f/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/client_model v0.1.0/go.mod"
 	"github.com/prometheus/client_model v0.2.0"
 	"github.com/prometheus/client_model v0.2.0/go.mod"
 	"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
 	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.2.0/go.mod"
 	"github.com/prometheus/common v0.4.0/go.mod"
 	"github.com/prometheus/common v0.4.1"
 	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.7.0"
+	"github.com/prometheus/common v0.7.0/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.0-20190117184657-bf6a532e95b1/go.mod"
 	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/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/prometheus/procfs v0.0.8"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
 	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
 	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
 	"github.com/rogpeppe/go-internal v1.1.0/go.mod"
 	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
 	"github.com/rogpeppe/go-internal v1.3.2/go.mod"
 	"github.com/rogpeppe/go-internal v1.4.0"
 	"github.com/rogpeppe/go-internal v1.4.0/go.mod"
-	"github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3"
-	"github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3/go.mod"
+	"github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351"
+	"github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351/go.mod"
 	"github.com/russross/blackfriday v1.5.2"
 	"github.com/russross/blackfriday v1.5.2/go.mod"
 	"github.com/russross/blackfriday/v2 v2.0.1"
 	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
 	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
 	"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"
@@ -515,9 +638,13 @@ EGO_SUM=(
 	"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/sirupsen/logrus v1.6.0"
+	"github.com/sirupsen/logrus v1.6.0/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/smartystreets/goconvey v1.6.4/go.mod"
 	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/sony/gobreaker v0.4.1/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/afero v1.2.2/go.mod"
@@ -540,8 +667,12 @@ EGO_SUM=(
 	"github.com/spf13/pflag v1.0.5/go.mod"
 	"github.com/spf13/viper v1.3.2/go.mod"
 	"github.com/spf13/viper v1.4.0/go.mod"
+	"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
+	"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
+	"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/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"
 	"github.com/stretchr/objx v0.2.0/go.mod"
 	"github.com/stretchr/testify v1.2.2/go.mod"
 	"github.com/stretchr/testify v1.3.0/go.mod"
@@ -549,6 +680,9 @@ EGO_SUM=(
 	"github.com/stretchr/testify v1.4.0/go.mod"
 	"github.com/stretchr/testify v1.5.1"
 	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8"
 	"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"
@@ -557,14 +691,15 @@ EGO_SUM=(
 	"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/urfave/cli v1.22.1/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/xeipuuv/gojsonschema v1.2.0"
+	"github.com/xeipuuv/gojsonschema v1.2.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"
@@ -582,43 +717,62 @@ EGO_SUM=(
 	"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.20.1/go.mod"
+	"go.opencensus.io v0.20.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.opencensus.io v0.22.2"
+	"go.opencensus.io v0.22.2/go.mod"
 	"go.uber.org/atomic v1.3.2/go.mod"
 	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/atomic v1.5.0/go.mod"
 	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/multierr v1.3.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
 	"go.uber.org/zap v1.10.0/go.mod"
+	"go.uber.org/zap v1.13.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-20181029021203-45a5f77698d3/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-20190325154230-a5d413f7728c/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/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-20190621222207-cc06ce4a13d4/go.mod"
-	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/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/crypto v0.0.0-20200220183623-bac4c82f6975"
 	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
 	"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904"
 	"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
 	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
 	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
 	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
 	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
 	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/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-20181023162649-9b4f9f5ad519/go.mod"
 	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
 	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
 	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/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"
@@ -649,8 +803,10 @@ EGO_SUM=(
 	"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-20181026203630-95b1ffbd15a5/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-20181122145206-62eef0e2fa9b/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"
@@ -662,11 +818,14 @@ EGO_SUM=(
 	"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/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-20190726091711-fc99dfbffb4e/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/sys v0.0.0-20191022100944-742c48ecaeb7"
 	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
+	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f"
+	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/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"
@@ -676,7 +835,10 @@ EGO_SUM=(
 	"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/time v0.0.0-20191024005414-555d28b269f0"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
 	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/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"
@@ -689,14 +851,21 @@ EGO_SUM=(
 	"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-20190621195816-6e04913cbbac/go.mod"
 	"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod"
 	"golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod"
+	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
+	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+	"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
 	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
 	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
 	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
 	"google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod"
+	"google.golang.org/api v0.3.1/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.2.0/go.mod"
 	"google.golang.org/appengine v1.4.0/go.mod"
 	"google.golang.org/appengine v1.5.0/go.mod"
 	"google.golang.org/appengine v1.6.5"
@@ -706,12 +875,16 @@ EGO_SUM=(
 	"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-20190530194941-fb225487d101/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.17.0/go.mod"
 	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.0/go.mod"
 	"google.golang.org/grpc v1.20.1/go.mod"
 	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.22.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.26.0/go.mod"
@@ -727,6 +900,7 @@ EGO_SUM=(
 	"gopkg.in/errgo.v2 v2.1.0/go.mod"
 	"gopkg.in/fsnotify.v1 v1.4.7"
 	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gcfg.v1 v1.2.3/go.mod"
 	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
 	"gopkg.in/gorp.v1 v1.7.2"
 	"gopkg.in/gorp.v1 v1.7.2/go.mod"
@@ -737,6 +911,7 @@ EGO_SUM=(
 	"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/warnings.v0 v0.1.2/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"
@@ -744,37 +919,58 @@ EGO_SUM=(
 	"gopkg.in/yaml.v2 v2.2.5/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-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
 	"gotest.tools v2.2.0+incompatible"
 	"gotest.tools v2.2.0+incompatible/go.mod"
+	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/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.18.0"
-	"k8s.io/api v0.18.0/go.mod"
-	"k8s.io/apiextensions-apiserver v0.18.0"
-	"k8s.io/apiextensions-apiserver v0.18.0/go.mod"
-	"k8s.io/apimachinery v0.18.0"
-	"k8s.io/apimachinery v0.18.0/go.mod"
-	"k8s.io/apiserver v0.18.0/go.mod"
-	"k8s.io/cli-runtime v0.18.0"
-	"k8s.io/cli-runtime v0.18.0/go.mod"
-	"k8s.io/client-go v0.18.0"
-	"k8s.io/client-go v0.18.0/go.mod"
-	"k8s.io/code-generator v0.18.0/go.mod"
-	"k8s.io/component-base v0.18.0"
-	"k8s.io/component-base v0.18.0/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"k8s.io/api v0.18.4"
+	"k8s.io/api v0.18.4/go.mod"
+	"k8s.io/api v0.18.8"
+	"k8s.io/api v0.18.8/go.mod"
+	"k8s.io/apiextensions-apiserver v0.18.4"
+	"k8s.io/apiextensions-apiserver v0.18.4/go.mod"
+	"k8s.io/apiextensions-apiserver v0.18.8"
+	"k8s.io/apiextensions-apiserver v0.18.8/go.mod"
+	"k8s.io/apimachinery v0.18.4"
+	"k8s.io/apimachinery v0.18.4/go.mod"
+	"k8s.io/apimachinery v0.18.8"
+	"k8s.io/apimachinery v0.18.8/go.mod"
+	"k8s.io/apiserver v0.18.4/go.mod"
+	"k8s.io/apiserver v0.18.8/go.mod"
+	"k8s.io/cli-runtime v0.18.4"
+	"k8s.io/cli-runtime v0.18.4/go.mod"
+	"k8s.io/cli-runtime v0.18.8"
+	"k8s.io/cli-runtime v0.18.8/go.mod"
+	"k8s.io/client-go v0.18.4"
+	"k8s.io/client-go v0.18.4/go.mod"
+	"k8s.io/client-go v0.18.8"
+	"k8s.io/client-go v0.18.8/go.mod"
+	"k8s.io/code-generator v0.18.4/go.mod"
+	"k8s.io/code-generator v0.18.8/go.mod"
+	"k8s.io/component-base v0.18.4"
+	"k8s.io/component-base v0.18.4/go.mod"
+	"k8s.io/component-base v0.18.8"
+	"k8s.io/component-base v0.18.8/go.mod"
 	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
 	"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/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-20200121204235-bf4fb3bd569c"
-	"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod"
-	"k8s.io/kubectl v0.18.0"
-	"k8s.io/kubectl v0.18.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6"
+	"k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod"
+	"k8s.io/kubectl v0.18.4"
+	"k8s.io/kubectl v0.18.4/go.mod"
+	"k8s.io/kubectl v0.18.8"
+	"k8s.io/kubectl v0.18.8/go.mod"
 	"k8s.io/kubernetes v1.13.0/go.mod"
-	"k8s.io/metrics v0.18.0/go.mod"
+	"k8s.io/metrics v0.18.4/go.mod"
+	"k8s.io/metrics v0.18.8/go.mod"
 	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
 	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
 	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod"
@@ -787,6 +983,7 @@ EGO_SUM=(
 	"sigs.k8s.io/yaml v1.1.0/go.mod"
 	"sigs.k8s.io/yaml v1.2.0"
 	"sigs.k8s.io/yaml v1.2.0/go.mod"
+	"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
 	"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod"
 	)
 go-module_set_globals
@@ -795,7 +992,7 @@ SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RESTRICT+=" test"
 
@@ -818,7 +1015,7 @@ src_compile() {
 		GOFLAGS="${GOFLAGS}" \
 		GIT_SHA=${GIT_COMMIT} \
 		GIT_COMMIT=${GIT_COMMIT:0:7} \
-		GIT_TAG=v${PV} \
+		GIT_TAG=v${MY_PV} \
 		GIT_DIRTY=clean \
 		build
 	bin/${PN} completion bash > ${PN}.bash || die
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 0c961cfdcdb2..38c031847d71 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,9 +1,5 @@
 AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45dadb5824f369a454a1126cb61293d55f86f9f01fb659932729dbc205a522aab32343dd87b74662927d60edc50750af602a959cc9 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae
 AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb
-DIST KeePass-2.44-Source.zip 5182922 BLAKE2B 092d1b982d748ea1b13f26fe5423a491855cb491c80cae7632429d488f80fd730df5d2f1613bab528d55a3aadcf0cb4f4055a637d2b14b68a468e4baf9ab1837 SHA512 ef2ca69e40c0787b63fc30a2b222dd77fd9f0addf8593511dcd0a47580cc8de5e0900c7d4e6f77c0e5a49d1728286cf1b5856cdc65ef175e4acfdd1ffc54b55e
-DIST KeePass-2.45-Source.zip 5011684 BLAKE2B cf7fafb2666f2e0005533e441f1855006aa64aca69b4829fa66117da88f92e6aa65d58b303a099221e796a500bc5abab5c3d0654e6fa53c3fe6f36d3cb18e381 SHA512 3f9b14e57fce047f8d8ae7c289fffd954545c5638fa20392e7864301073452a4353f487832730fb600e1729b1333360c1bce7e66fc8629788e666418a2afbf9a
 DIST KeePass-2.46-Source.zip 5054069 BLAKE2B 81567ab4589e53ae5cc1b75fa42cc61d9d0f390edfa8f8d860dd118a95185a8d2ca417b30b29e2b544b1d4eeeb0069fab2f0be7900fd4d7fb87d41c417b99876 SHA512 ca045cb7363092f948d72243991fe398836b13183cc2685477d7ce5dd629213b5803b4216134c7ba6451726b79ca43d1e93a1934c9cbff46293fa916b9348219
-EBUILD keepass-2.44.ebuild 3228 BLAKE2B 58d0e7a54ee7aace849c916e08b45bd6e1e5e838982f54efaccecea3279eee65aefcbbe6a3291828bbb769f938b09ea5a644b4a85667f2420bda90a2743e1c7d SHA512 ea1e5e8addbf66756fe812bddc29d4c8da359bb68f03ba1322f517a36d6839e4e7972628676108efb23ffcec64a42266f848854c55a79a8f7a971a2ac904633c
-EBUILD keepass-2.45.ebuild 3229 BLAKE2B 804f64ae148cb8fc30a9278b9dd1e90e2e9fbc966432e708bdfe3210f4bbd7863ab4fce8f4131d788525331777a3991b02ebe1202e4365414dd57370987a4b6e SHA512 12fa7978a687562145af54e3730ab832f50f732b56b3c76927e3286cf1fb24c0f7dac3ba2ac984560c56449b3845c073ac99aba457d5b51bda1eccd14ed5a6e2
-EBUILD keepass-2.46.ebuild 3230 BLAKE2B 9e3c55cb5220c18d7044de21d21cd96a1ad5f145ecf627d1db444ed5a187bc97aad27332c1e7a841c8153ae86eec2dc50f48a00567e681714b3354fc81b1c965 SHA512 b1c53ec9a3f97156823bb6c9265f0fa89b7c000a943557dfe3ba5a19eeec36657d537340692eeaccbf61b3af8508785b78cc0615595775b1e9074a285d53605a
+EBUILD keepass-2.46.ebuild 3228 BLAKE2B 58d0e7a54ee7aace849c916e08b45bd6e1e5e838982f54efaccecea3279eee65aefcbbe6a3291828bbb769f938b09ea5a644b4a85667f2420bda90a2743e1c7d SHA512 ea1e5e8addbf66756fe812bddc29d4c8da359bb68f03ba1322f517a36d6839e4e7972628676108efb23ffcec64a42266f848854c55a79a8f7a971a2ac904633c
 MISC metadata.xml 651 BLAKE2B 058fa70fb6ce35fb52464a84cf506ad117343a1376a40b003c4f55bdf94369136276d8bbb67f30490eb73cba4df6b03d78e8c2a65cf8141dd6cf64654c9b6358 SHA512 6251f546e631decbc7692ab00900d722031ce638f3d878771a2bcfebedba8e1fee9b3e54dfd4c3ae3c711006099fc5a772555ea7cc018d012de164755ba8b52c
diff --git a/app-admin/keepass/keepass-2.44.ebuild b/app-admin/keepass/keepass-2.44.ebuild
deleted file mode 100644
index a42724fe8584..000000000000
--- a/app-admin/keepass/keepass-2.44.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils xdg-utils
-
-MY_PN="KeePass"
-DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="https://keepass.info/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aot"
-
-COMMON_DEPEND="dev-lang/mono"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-dotnet/libgdiplus[cairo]
-"
-
-S="${WORKDIR}"
-PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
-
-# bug #687052
-# file generated by mono --aot where *FLAGS don't make sense
-QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so"
-
-src_prepare() {
-	# KeePass looks for some XSL files in the same folder as the executable,
-	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
-	# This XSL file will not be upstreamed since the KeePass creator said that
-	# including this patch would break the Portable USB version of KeePass
-	# (which keeps/looks for xsl files in its own folder)
-	default
-
-	# Switch into build dir so the mono prepration script works correctly
-	pushd Build || die
-	source PrepMonoDev.sh || die
-	popd || die
-}
-
-src_compile() {
-	export MONO_REGISTRY_PATH=/dev/null # bug 659808
-
-	# Build with Release target
-	xbuild /target:KeePass /property:Configuration=Release || die
-
-	# Run Ahead Of Time compiler on the binary
-	if use aot; then
-		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
-		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
-	fi
-}
-
-src_install() {
-	# Wrapper script to launch mono
-	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
-
-	# Some XSL files
-	insinto "/usr/share/${PN}/XSL"
-	doins Ext/XSL/*
-
-	insinto "/usr/$(get_libdir)/${PN}"
-	exeinto "/usr/$(get_libdir)/${PN}"
-
-	doins Ext/KeePass.exe.config
-
-	# Default configuration, simply says to use user-specific configuration
-	doins Ext/KeePass.config.xml
-
-	# The actual executable
-	doexe Build/KeePass/Release/KeePass.exe
-
-	# Copy the AOT compilation result
-	if use aot; then
-		doexe Build/KeePass/Release/KeePass.exe.so
-	fi
-
-	# Prepare the icons
-	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
-	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
-
-	# Create a desktop entry and associate it with the KeePass mime type
-	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
-
-	# MIME descriptor for .kdbx files
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-
-	# sed, because patching this really sucks
-	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if ! has_version x11-misc/xdotool ; then
-		elog "Optional dependencies:"
-		elog "	x11-misc/xdotool (enables autotype/autofill)"
-	fi
-
-	elog "Some systems may experience issues with copy and paste operations."
-	elog "If you encounter this, please install x11-misc/xsel."
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-admin/keepass/keepass-2.45.ebuild b/app-admin/keepass/keepass-2.45.ebuild
deleted file mode 100644
index cc9a5d395e36..000000000000
--- a/app-admin/keepass/keepass-2.45.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils xdg-utils
-
-MY_PN="KeePass"
-DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="https://keepass.info/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="aot"
-
-COMMON_DEPEND="dev-lang/mono"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-dotnet/libgdiplus[cairo]
-"
-
-S="${WORKDIR}"
-PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
-
-# bug #687052
-# file generated by mono --aot where *FLAGS don't make sense
-QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so"
-
-src_prepare() {
-	# KeePass looks for some XSL files in the same folder as the executable,
-	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
-	# This XSL file will not be upstreamed since the KeePass creator said that
-	# including this patch would break the Portable USB version of KeePass
-	# (which keeps/looks for xsl files in its own folder)
-	default
-
-	# Switch into build dir so the mono prepration script works correctly
-	pushd Build || die
-	source PrepMonoDev.sh || die
-	popd || die
-}
-
-src_compile() {
-	export MONO_REGISTRY_PATH=/dev/null # bug 659808
-
-	# Build with Release target
-	xbuild /target:KeePass /property:Configuration=Release || die
-
-	# Run Ahead Of Time compiler on the binary
-	if use aot; then
-		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
-		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
-	fi
-}
-
-src_install() {
-	# Wrapper script to launch mono
-	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
-
-	# Some XSL files
-	insinto "/usr/share/${PN}/XSL"
-	doins Ext/XSL/*
-
-	insinto "/usr/$(get_libdir)/${PN}"
-	exeinto "/usr/$(get_libdir)/${PN}"
-
-	doins Ext/KeePass.exe.config
-
-	# Default configuration, simply says to use user-specific configuration
-	doins Ext/KeePass.config.xml
-
-	# The actual executable
-	doexe Build/KeePass/Release/KeePass.exe
-
-	# Copy the AOT compilation result
-	if use aot; then
-		doexe Build/KeePass/Release/KeePass.exe.so
-	fi
-
-	# Prepare the icons
-	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
-	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
-
-	# Create a desktop entry and associate it with the KeePass mime type
-	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
-
-	# MIME descriptor for .kdbx files
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-
-	# sed, because patching this really sucks
-	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if ! has_version x11-misc/xdotool ; then
-		elog "Optional dependencies:"
-		elog "	x11-misc/xdotool (enables autotype/autofill)"
-	fi
-
-	elog "Some systems may experience issues with copy and paste operations."
-	elog "If you encounter this, please install x11-misc/xsel."
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-admin/keepass/keepass-2.46.ebuild b/app-admin/keepass/keepass-2.46.ebuild
index db354f613661..a42724fe8584 100644
--- a/app-admin/keepass/keepass-2.46.ebuild
+++ b/app-admin/keepass/keepass-2.46.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="aot"
 
 COMMON_DEPEND="dev-lang/mono"
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 9537d7cef712..8961e36f6acd 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,9 +1,6 @@
-AUX keepassxc-2.5.2-ccache_switch.patch 2274 BLAKE2B 640bd0bdbd56aa93a3f7d70b4827b50639bcf6cea1cb0339ec78b91cbd4ab7c364bd36353ccc02e88b438566ecbad6545124bf5fd89c2c8e766c723e278ba1c9 SHA512 5b43fe2e5dea3ff3626ae4b75faa8aa4666a2703d08a30c4a18fd2b1079a73ad033d8788f05e28b860f51ef42e9f1a65253319b9d8fe0c34ec058b9ffb59dfea
-DIST keepassxc-2.5.4-src.tar.xz 6839396 BLAKE2B 5f7f415cab73c2665e3dff94c2bde039096b04a6e8e8a6ff4fe40d31cf4c6ff789f72d8c4c18ae0325c6db570933110a65348c4c359acadd2c89617435ffd6bd SHA512 8a70363dd579b95ccb05cb846aa34a5ed89de4305f3bef9e518e5986fe7f0313cb1daaa347f5b2267002f3fff4b71c87f5bb9073f6e6879d2556a2f0e4791dd3
-DIST keepassxc-2.6.0-src.tar.xz 5628800 BLAKE2B 9872b9fa5f809e2d2e6ed4a233ca248d19ada1c495f4c8febdfa765565963a01a5ede97d1f3830a39a6dc1063f88cb77b9b216776767111686288284aae63399 SHA512 c1ddf81f965f5521db8b8acb2fe3950c7b185ca459c440c9118f3d6350eeff6f15bb488f9e3bd034bdf80c515f0753c041e3af083d62e179cd16df7bb8326e17
 DIST keepassxc-2.6.1-src.tar.xz 5715948 BLAKE2B 5490757fd939b572f2f281dc6ecfcd6afc7f9a5b2ebf3cc0c8ae4a95bb982ad755a9363f6133fb0f4ac2a2b5e0a6c66a7dba954911cb5baf70d447fc8d6089bf SHA512 9fb2d01d80e2b61c847c0544c280c1f3bfca671268e2dbbe78e0f3c1264f38125a3767ceb4591261f3586cd71f4fff47ecc6eacaecf1e707cea5e8907542313a
-EBUILD keepassxc-2.5.4.ebuild 2190 BLAKE2B 4e23b212cf03f1a5c8bc18dc63313ea5224bf76efc29f360cf013af90e9fc745b04754170f5e88bacf4bc5c4600203dc9b706a2412d07e4e21b172f96822319a SHA512 9080c0202fd22e83ab38741edc4ab3061e4a24d2a3735ce03c4194faa8588ea719221296e663079a007f3f49e757ef7efcd7e206341e542054d937f3908d73ab
-EBUILD keepassxc-2.6.0.ebuild 2064 BLAKE2B 21546c5edd6287bd30a39d2a491ce1b0f010a12e77a8453bcad8d3f5e565786aed48669004230dd4625e71c7485961532394da98e1ac99d534311a3a8a012417 SHA512 1899b53dca25d584f71badaefdee9087191fd30f0f1fa97169b0e9e1b0667fbf21dee4b09b5437ce91ac70dd182ac80cf6c47ec757f2dea02b8ecb952ef74323
-EBUILD keepassxc-2.6.1.ebuild 2071 BLAKE2B 21dbc2b6d71fa3bba8a250d2b20a21eb4fa2f135ab34cbea1090d91a1525a75594dd5cbb62e97b2845e3953e73a6b54acef7dd06201c958a78193d98e1edf794 SHA512 67b9d96a95486662ff5d83d3980381949b5611b608c998b1cdec5ddd3f8e5b9bec353eb50b6f264f10d97c41a1d4572a2304645904612df4a9e306275ebecf28
-EBUILD keepassxc-9999.ebuild 2064 BLAKE2B 21546c5edd6287bd30a39d2a491ce1b0f010a12e77a8453bcad8d3f5e565786aed48669004230dd4625e71c7485961532394da98e1ac99d534311a3a8a012417 SHA512 1899b53dca25d584f71badaefdee9087191fd30f0f1fa97169b0e9e1b0667fbf21dee4b09b5437ce91ac70dd182ac80cf6c47ec757f2dea02b8ecb952ef74323
+DIST keepassxc-2.6.2-src.tar.xz 5720788 BLAKE2B c6bcc0af594c3b697d8e74752edb0389c80c72008bd57dcc36d9606462ea4bc9c6012a9f3f31702a9c0f88004fdc66f1ee4fbebd8a501227f4579ea8f3f1078f SHA512 b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1
+EBUILD keepassxc-2.6.1.ebuild 2063 BLAKE2B a42e9515621416fe81b1724db430fa5d601fedd7de2830acf9d9993c9486206bd76d13c5f10c3040e7fd37b518f543ea03173cc2a64c36eab10bce13c0d628dc SHA512 c699ed6e099a04e8a3748ecf6b586ffc4ba1f46dcf5644bb89fb3ad37b8506e47cc1e41fd7d98a0689fbaa80fb6c08ecde1db2cffc868199b124a8ba76a307fe
+EBUILD keepassxc-2.6.2.ebuild 2065 BLAKE2B 80d76cb75cead9572075d8068567f280dc5dd6f940654b121e57379aac666a1513ba8026de0583f9a0a14f12a30394c488c803280154e3ad05d0a5b0d880091e SHA512 0d250a23c3c98683a6592ce9f39a9cb200e2053ee8852fabe1e11c04df9c14618c27b7d7fc589f2983c2bf198a0c8c435f932f330c532c936a433bd9e8ce8245
+EBUILD keepassxc-9999.ebuild 2065 BLAKE2B 80d76cb75cead9572075d8068567f280dc5dd6f940654b121e57379aac666a1513ba8026de0583f9a0a14f12a30394c488c803280154e3ad05d0a5b0d880091e SHA512 0d250a23c3c98683a6592ce9f39a9cb200e2053ee8852fabe1e11c04df9c14618c27b7d7fc589f2983c2bf198a0c8c435f932f330c532c936a433bd9e8ce8245
 MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e
diff --git a/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch b/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch
deleted file mode 100644
index 57d8b3d714ca..000000000000
--- a/app-admin/keepassxc/files/keepassxc-2.5.2-ccache_switch.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ae471bea14c8e05bcf368168649399b116a69992 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 7 Jan 2020 17:44:08 -0500
-Subject: [PATCH] CMakeLists.txt: Do not unconditionally use ccache
-
-This causes build failures in Gentoo because we don't allow access to ccache files if ccache is not enabled for build.
-
-Fix this by adding a WITH_CCACHE cmake option and change behavior so that cmake fails if WITH_CCACHE is enabled but ccache program cannot be found.
-
-Gentoo-bug: https://bugs.gentoo.org/704560
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- CMakeLists.txt | 19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2f9b5bfe..1c5746c59 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,13 +27,6 @@ string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
- 
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
- 
--# Use the Compiler Cache (ccache) if it is installed
--# (install with: sudo apt get ccache)
--find_program (CCACHE_FOUND ccache)
--if (CCACHE_FOUND)
--    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
--endif (CCACHE_FOUND)
--
- # Support Visual Studio Code
- include(CMakeToolsHelpers OPTIONAL)
- include(FeatureSummary)
-@@ -48,6 +41,7 @@ option(WITH_DEV_BUILD "Use only for development. Disables/warns about deprecated
- option(WITH_ASAN "Enable address sanitizer checks (Linux / macOS only)" OFF)
- option(WITH_COVERAGE "Use to build with coverage tests (GCC only)." OFF)
- option(WITH_APP_BUNDLE "Enable Application Bundle for macOS" ON)
-+option(WITH_CCACHE "Use ccache for build" OFF)
- 
- set(WITH_XC_ALL OFF CACHE BOOL "Build in all available plugins")
- 
-@@ -65,6 +59,17 @@ if(APPLE)
-     option(WITH_XC_TOUCHID "Include TouchID support for macOS." OFF)
- endif()
- 
-+if(WITH_CCACHE)
-+    # Use the Compiler Cache (ccache) program
-+    # (install with: sudo apt get ccache)
-+    find_program (CCACHE_FOUND ccache)
-+    if(CCACHE_FOUND)
-+        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-+    else()
-+        message(FATAL_ERROR "ccache requested but cannot be found.")
-+    endif()
-+endif()
-+
- if(WITH_XC_ALL)
-     # Enable all options (except update check)
-     set(WITH_XC_AUTOTYPE ON)
diff --git a/app-admin/keepassxc/keepassxc-2.5.4.ebuild b/app-admin/keepassxc/keepassxc-2.5.4.ebuild
deleted file mode 100644
index 80d797e0a239..000000000000
--- a/app-admin/keepassxc/keepassxc-2.5.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
-	if [[ "${PV}" == *_beta* ]] ; then
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${P/_/-}"
-	else
-		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="amd64 ~arm64 x86"
-	fi
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser ccache debug keeshare +network test yubikey"
-
-RDEPEND="
-	app-crypt/argon2:=
-	dev-libs/libgcrypt:=
-	>=dev-libs/libsodium-1.0.12:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-gfx/qrencode:=
-	sys-libs/readline:0=
-	sys-libs/zlib:=
-	autotype? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXtst
-	)
-	keeshare? ( dev-libs/quazip )
-	yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-"
-BDEPEND="
-	ccache? ( dev-util/ccache )
-"
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
-	x11-misc/xsel
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.2-ccache_switch.patch"
-)
-
-src_prepare() {
-	 use test || \
-		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
-	 cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CCACHE="$(usex ccache)"
-		-DWITH_GUI_TESTS=OFF
-		-DWITH_TESTS="$(usex test)"
-		-DWITH_XC_AUTOTYPE="$(usex autotype)"
-		-DWITH_XC_BROWSER="$(usex browser)"
-		-DWITH_XC_FDOSECRETS=ON
-		-DWITH_XC_KEESHARE="$(usex keeshare)"
-		-DWITH_XC_NETWORKING="$(usex network)"
-		-DWITH_XC_SSHAGENT=ON
-		-DWITH_XC_UPDATECHECK=OFF
-		-DWITH_XC_YUBIKEY="$(usex yubikey)"
-	)
-	if [[ "${PV}" == *_beta* ]] ; then
-		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
-	fi
-	cmake_src_configure
-}
diff --git a/app-admin/keepassxc/keepassxc-2.6.1.ebuild b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
index e4de2a185bfc..d85bd1e36b75 100644
--- a/app-admin/keepassxc/keepassxc-2.6.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then
 	else
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+		KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	fi
 else
 	inherit git-r3
@@ -24,7 +24,7 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser ccache debug keeshare +network test yubikey"
+IUSE="autotype browser ccache keeshare +network test yubikey"
 
 RDEPEND="
 	app-crypt/argon2:=
diff --git a/app-admin/keepassxc/keepassxc-2.6.0.ebuild b/app-admin/keepassxc/keepassxc-2.6.2.ebuild
index a6d25729d322..0511c16e1277 100644
--- a/app-admin/keepassxc/keepassxc-2.6.0.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.2.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then
 	else
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~arm64 ~x86"
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	fi
 else
 	inherit git-r3
@@ -24,7 +24,7 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser ccache debug keeshare +network test yubikey"
+IUSE="autotype browser ccache keeshare +network test yubikey"
 
 RDEPEND="
 	app-crypt/argon2:=
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index a6d25729d322..0511c16e1277 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then
 	else
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~arm64 ~x86"
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	fi
 else
 	inherit git-r3
@@ -24,7 +24,7 @@ fi
 
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
-IUSE="autotype browser ccache debug keeshare +network test yubikey"
+IUSE="autotype browser ccache keeshare +network test yubikey"
 
 RDEPEND="
 	app-crypt/argon2:=
diff --git a/app-admin/killproc/Manifest b/app-admin/killproc/Manifest
index 6e1e5a03f925..8a0965c216c8 100644
--- a/app-admin/killproc/Manifest
+++ b/app-admin/killproc/Manifest
@@ -2,4 +2,4 @@ AUX killproc-2.13-argz.patch 195 BLAKE2B c4d91eba1d2d2a5638384fff6d103babad55061
 AUX killproc-2.13-makefile.patch 1212 BLAKE2B 3a7d96e7e96b33b19493c68163119c01bbe104d9328c4aba5663d837d7b5c65b31a87178ccdc6a56c6d47b4b71bba03541e9ce07ed4e5734d3bd8484bcb71190 SHA512 c471361ca0fb4e4cb3d2e74c29115cf441b6129c2cbf54540ee7af40e818f1b6df169344c5f44ae8d9a1769aa0bf26bc00d5c6348546e9e37dff5e505b767e68
 DIST killproc-2.13.tar.gz 37953 BLAKE2B 57ee8eab39810a1cc9a0d7a4e53d4912e6288b7b4c41d05fd3b6a241e90dbb2b220792d7bd07691d11cc4ceb264d682ed3c59dda2eb751f777e9caec6c82fd6f SHA512 2ba8daa10d78c7e6df80f6fc5bff24807571bd8bcecf4674c1dac180da5c462b326c1fd45e31b4974937d47871b48c9e5b215a7b323e65d98fe0a66b171e9d2d
 EBUILD killproc-2.13-r1.ebuild 676 BLAKE2B 1e52cde853317c0206b6aa55600ba7cf0e21dacbc3392606e3623652c6f8debd82dce27b93d80cc379d4032700b8f37a676f089bdf97023cbf91e403cb274765 SHA512 97d39d7de4580bae79c090ad957993f04ff046a27c832abe3044f0614f3eb3a064ba9757d0b9a7b3daa3afe71964dbc303554d6d4451b43637fc01e84b826a3f
-MISC metadata.xml 237 BLAKE2B 43fdb41b8b9fc4c7870059f296014f77cf77fe08cef7092da23a2a7a2e09c8cc2fb5476e73a0b9781f3b7b108a11aeb1fd88ba22bea203523aa3ea0f769412ee SHA512 ec2a39c9baa1516733bfbe39044a2fb2b9742b0ddb1b1eebab2ce7cd1027f92ef9c2c48a3e0f7362ea897160818f214542f82bdf8ba7b2a5034c0c5090f137e8
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/killproc/metadata.xml b/app-admin/killproc/metadata.xml
index 1f15fbbf8995..6f49eba8f496 100644
--- a/app-admin/killproc/metadata.xml
+++ b/app-admin/killproc/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">                         
-  <email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-admin/kpcli/Manifest b/app-admin/kpcli/Manifest
index 8bf190a941f0..db78925692e7 100644
--- a/app-admin/kpcli/Manifest
+++ b/app-admin/kpcli/Manifest
@@ -1,5 +1,3 @@
-DIST kpcli-3.4.pl 211243 BLAKE2B 4880d832554de1956e033bba2e2021b9dc0b77202585663b0f4ad2acca520bcb430ac974bbea00c21aa37c2c8e8fa8c5cf2e8131542c20ecc3c6b0ac6dd85d9a SHA512 1ec9ea46f769a6891700565a51c592fd4809a0f3bc1d2088ca694233b276652506b470328b8b840cd0876b945faad27a16a5685d8655868cd20760f24619ffaf
-DIST kpcli-3.5.pl 223904 BLAKE2B 1d2a497c0225980eabf0c95d9fa2e89e7d94e4422f97744fb325d41393b80ecaf423b67666014c2c41076b9b2e85c41e761e72b3b89800b405d26b67f49f9afc SHA512 d9454d47cd90e647ec0695b9a571c64c389569a676e1d172fd6b6a6dfd1170ca63bb23ca2c00dc35e93984fad409864c13d5562484a1a513a152008b27cf9c0b
-EBUILD kpcli-3.4.ebuild 961 BLAKE2B 7977700e35b9de9a1aca2f8b78d70fe24dffd24bcb5129cb1973f79cd57a432fd8543018824f7d5fc747ee7886db2a2237649389b2eee38dfed10aa55d0ffedb SHA512 095dc8d271e2ae90b6910eaff98e290febfca02a7586fd44e5badd8c924b2f02ef80796983f285d6c7cc547c3cfbb4cf084e256850cad08e23fc6a8b7fb86ad7
-EBUILD kpcli-3.5.ebuild 1140 BLAKE2B 07eb14c737947896db21c4858e9dfdcacd87f6f5937b2e3183445a0437d1671b96213b77a736830ec433be84c1ceb806cc2090c66f3be4d590cedddb5ea754f9 SHA512 46b3fa3048af8f7bad8354fa874dcb53d2c736694c8d2626eac221f66fc137d203d1fb76d429c303e4dc751026c566737066539631a339d1a348cbf7ec85fab2
+DIST kpcli-3.6.pl 232478 BLAKE2B 2c7ea808e840954d2661d7c89dbc7cd7f955d2bfba2c70034d95f480bdfbce8e5e3533105aa4f78c2c4386c1414ca78d678e0487571d93e23381e697054a7c01 SHA512 12c7fdeb613451d1bfcbed18fdec0b555a1ec2ce28ffd7969313a9a5acac582d1c019ea660a550ab2a28d947c5d14a63fcdea252757291aeb44ceae63c205b0f
+EBUILD kpcli-3.6.ebuild 1138 BLAKE2B 2e139080e14df2068de38a194adbb2711f2b7264505348f210ea58ab07ea740ffad9e0586a12a7a9f875283e1d30774645272f2b8e62e2af5afb5ee52e042a5c SHA512 0f5137139de8dd5ace39d8919ca46e29eba7444545dd1e8b50cd5f5db6a7d009cc7f1e0de7b8ffc7e3c485b2fb183115f8bd949c26b66904e5d8511f2ee520e7
 MISC metadata.xml 476 BLAKE2B 49c33b8c9713bf01f667d60e72900e99139ff425e1c10e74736bdeff840e66d7a507aa079ca334639abb9e8ef1899aa3ed37114cbf196f9309124d54ea13b774 SHA512 35280ba9f2eafc0e28b098ce0af3ec9fec17fbb956068b873516c0a28539c4d05cfecfdf71477a9fb78cf3238ad7363dc128ad149e91619485624959b780805b
diff --git a/app-admin/kpcli/kpcli-3.4.ebuild b/app-admin/kpcli/kpcli-3.4.ebuild
deleted file mode 100644
index d12d84ae8359..000000000000
--- a/app-admin/kpcli/kpcli-3.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit optfeature
-
-DESCRIPTION="A command line interface to KeePass database files"
-HOMEPAGE="http://kpcli.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/project/kpcli/${P}.pl"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-lang/perl
-	dev-perl/Clone
-	dev-perl/Crypt-Rijndael
-	dev-perl/TermReadKey
-	dev-perl/Sort-Naturally
-	dev-perl/Term-ShellUI
-	dev-perl/File-KeePass
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	virtual/perl-Digest-MD5
-	virtual/perl-Digest-SHA
-	virtual/perl-Data-Dumper
-	virtual/perl-Term-ANSIColor
-	virtual/perl-Time-Piece
-	virtual/perl-Carp"
-
-src_unpack() {
-	mkdir "${S}" || die
-	cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin kpcli
-}
-
-pkg_postinst() {
-	optfeature "X clipboard support" "dev-perl/Capture-Tiny dev-perl/Clipboard"
-}
diff --git a/app-admin/kpcli/kpcli-3.5.ebuild b/app-admin/kpcli/kpcli-3.6.ebuild
index 73dabd93e84a..d274b38218b7 100644
--- a/app-admin/kpcli/kpcli-3.5.ebuild
+++ b/app-admin/kpcli/kpcli-3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/kpcli/${P}.pl"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-perl/Clone
 	dev-perl/Crypt-Rijndael
diff --git a/app-admin/kubectx/Manifest b/app-admin/kubectx/Manifest
index 81d22a304167..015d2c630627 100644
--- a/app-admin/kubectx/Manifest
+++ b/app-admin/kubectx/Manifest
@@ -226,13 +226,11 @@ DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod 2088 BL
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20191114184206-e782cd3c129f.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.mod 167 BLAKE2B 2a61747d367153284e7e614a82f98c8913693f3b51174c24b7f25d8e9d236418c4da9e6b33c7cdb7b4350314373037e1e7121ad7c0ca5fbc9a3b4b711a078a98 SHA512 1117d2493d40a111a749b0033c92876773242b86da0b437ba063e5da21289102d784479b0c757ad8ce50de4b1d8a2f6956afe3b2656977bd76bfab9f97c1d8a9
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200414100711-2df71ebbae66.zip 151304 BLAKE2B 4641e10e54dc01533f56c100dff3cd2040c5e8f2f0799c57677302ab606513baca4648388c864c0ce6769b7774d7326534d2638b97cc045514b0f057966e3b37 SHA512 488bcd931431778593f50e78cd421149590f317f953b7bbe61205c2af9e8a1e41c4c56780895b6d4fcd30936461a6fce2876f9a88d5da9da528950fa2900fdac
-DIST kubectx-0.9.0.tar.gz 510570 BLAKE2B c8126686c10755d69132f3dfaeae39ea115210426f552116305a1c97d98207de7ee81829ef4e5b04fc20ad07750103fc48abf2182a489832fcfec6357d596e51 SHA512 ac9b5258c23d07ee1ab1d3017645bb0588c7da8537c63b330b01039fb86164af41d2e37adb1e0619acf49e4265ee1ad4ed1d4a59e7ec878f78aa75e6da0dd829
 DIST kubectx-0.9.1.tar.gz 512901 BLAKE2B b6d79d5cc7a1a4b55e76f9402d97629bf5ca5e97ab8c42d492640108019e8cc7011cb27422e327e6abbed9a59f684c634378871d7c7145618280a0588bc228ec SHA512 f9872bb2a0a354d6e4b07715dea434482fb61f34914354d0d458e723d87b41e09eb94fb302185631700aad09a29268e00925016fa1b2d4c80f30402f35b6e6e4
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.zip 113591 BLAKE2B 48dc385dfb491334ddc6da2544979d139421be19fe2398ac9ca9fd9488f820da66fe9c22dd8fb7f1995b431bd17d963aaa304937e605c667c63361150feea5ed SHA512 9d61710361110d7739e705b05320a3cef7c7caf6cee358c01e695e66eaf8c5bd144fecf34142f24065c3a87eeef51fd75bcb24644f4e082fbdbca81e211d497e
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
-EBUILD kubectx-0.9.0.ebuild 13134 BLAKE2B bee19b9cd74568d88a280b2570647dd29c0953d581542334fcdf414fd33f153fb28129ba21403f5f1cf8f177de356deba0608af3001893dd105fcb881d63dc20 SHA512 fa680582870bd205eed5944b310238a6c4a64bed1d730ca022480d56e2fa81fca2f65fee5148e7b77b89eefb3bb17fad64eb67c26776d4879148558a2d702d31
 EBUILD kubectx-0.9.1.ebuild 13091 BLAKE2B 6c9fa962495142742733e5c899260b312a211ad3c7639df032ec64406e21d876bf408427dcb406754f7410e9095a76fa73f50e2da23440816fafba0745438400 SHA512 b8c647112190d66de933ea06f84ec5d6de87b76df6c2ae4c9dc1662df863445f935b3dac0f6b6eeeff4fe0385c33dad5a80c72ae1781e2e353d086bdf74985de
 MISC metadata.xml 327 BLAKE2B e462ef7a6a2528e6aa07cb87e79740c516a3f893ee10036f9248165c7d449837941daef9a48d345223cf284e6a1da4e989bd6433d45a08cdcc07437ed729b414 SHA512 0176426d1534cbf29dd2181002b1417a7103f9d7d816d5ffd8a2e6e0f94217442fbf3d9e06f45196645edc92c6d70097f3eb4adbbe54b64d8e5229c0721ef310
diff --git a/app-admin/kubectx/kubectx-0.9.0.ebuild b/app-admin/kubectx/kubectx-0.9.0.ebuild
deleted file mode 100644
index 637687359277..000000000000
--- a/app-admin/kubectx/kubectx-0.9.0.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl"
-HOMEPAGE="https://github.com/ahmetb/kubectx"
-
-EGO_SUM=(
-	"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"
-	"facette.io/natsort v0.0.0-20181210072756-2cd4dd1e2dcb"
-	"facette.io/natsort v0.0.0-20181210072756-2cd4dd1e2dcb/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/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/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-	"github.com/client9/misspell v0.3.4/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/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-	"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/evanphx/json-patch v4.2.0+incompatible/go.mod"
-	"github.com/fatih/color v1.9.0"
-	"github.com/fatih/color v1.9.0/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-	"github.com/go-logr/logr v0.1.0/go.mod"
-	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/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/go.mod"
-	"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.2"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/btree v1.0.0/go.mod"
-	"github.com/google/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/go.mod"
-	"github.com/google/gofuzz v1.1.0"
-	"github.com/google/gofuzz v1.1.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.1.1/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-	"github.com/googleapis/gnostic v0.1.0"
-	"github.com/googleapis/gnostic v0.1.0/go.mod"
-	"github.com/gophercloud/gophercloud v0.1.0"
-	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/imdario/mergo v0.3.5/go.mod"
-	"github.com/imdario/mergo v0.3.9"
-	"github.com/imdario/mergo v0.3.9/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/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/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/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/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-	"github.com/mattn/go-colorable v0.1.4"
-	"github.com/mattn/go-colorable v0.1.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.11"
-	"github.com/mattn/go-isatty v0.0.11/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/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/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/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/go.mod"
-	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-	"github.com/onsi/gomega v1.7.0/go.mod"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible/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/spf13/afero v1.2.2/go.mod"
-	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/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"
-	"go.opencensus.io v0.21.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586"
-	"golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/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-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-20190404232315-eb5bcb51f2a3/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/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
-	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/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/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-20180909124046-d0be0721c37e/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-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/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-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1"
-	"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"google.golang.org/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/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/grpc v1.19.0/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/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/inf.v0 v0.9.1"
-	"gopkg.in/inf.v0 v0.9.1/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/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-20200313102051-9f266ea9e77c"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"k8s.io/api v0.17.0"
-	"k8s.io/api v0.17.0/go.mod"
-	"k8s.io/apimachinery v0.17.0"
-	"k8s.io/apimachinery v0.17.0/go.mod"
-	"k8s.io/client-go v0.17.0"
-	"k8s.io/client-go v0.17.0/go.mod"
-	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-	"k8s.io/klog v0.3.0/go.mod"
-	"k8s.io/klog v1.0.0"
-	"k8s.io/klog v1.0.0/go.mod"
-	"k8s.io/klog/v2 v2.0.0/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod"
-	"k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod"
-	"k8s.io/utils v0.0.0-20200414100711-2df71ebbae66"
-	"k8s.io/utils v0.0.0-20200414100711-2df71ebbae66/go.mod"
-	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e"
-	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-	"sigs.k8s.io/yaml v1.2.0"
-	"sigs.k8s.io/yaml v1.2.0/go.mod"
-	)
-go-module_set_globals
-SRC_URI="https://github.com/ahmetb/kubectx/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-cluster/kubernetes[kubectl]"
-
-src_compile() {
-	GOBIN="${S}"/bin \
-		go install ./cmd/kube{ctx,ns} || die
-}
-
-src_install() {
-	dobin bin/*
-
-	insinto /usr/share/zsh/site-functions
-	newins completion/kubectx.zsh _kubectx
-	newins completion/kubens.zsh _kubens
-
-	newbashcomp completion/kubectx.bash kubectx
-	newbashcomp completion/kubens.bash kubens
-}
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index 3388431c9b1e..d0b9dd59030b 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,3 +1,3 @@
 DIST lib_users-0.14.tar.gz 25746 BLAKE2B 4aa2dbbd7c53be13f79988a62c7997f0787ea9b773fc57681a021ff75ba9ff0988ac3032b21150c4e4958849a6195df09d388b6341e1ac139f34ce9555786233 SHA512 533c6e8f486e58d0fd22aea9a30adf91c3a8340a8a3719f6374ddfa8120d402c8202ab8ceb0e78aedd46e3e5875795392ed40497a66d51de5c2ca6a275a1a777
 EBUILD lib_users-0.14.ebuild 1083 BLAKE2B 5e608ced91811120eca6df4b41a3219424979fc226c352591a801e02f05edf519d91662784c869f762ddbf14c07cb9a4f2455b444386c2034e9245429afcf5eb SHA512 2c9f43b21d8dee25dd014c31a48b4a9303301c8b22745f5c7d9cd76ea622b93f200a9e31cec41a719ddbf0ee3193235bb436e1e2ba96847f4b63a870dce68847
-MISC metadata.xml 454 BLAKE2B c545fd1db330988ad139de08b1890cfd9d6aac98947b954fb761515d314d8ebb941829e7767fe4fad6beb41caf3409111505d1a6378c852f15907933678ddd48 SHA512 c897ea5b6bed9fcc8715380a1b2756f376a095925a2c99a78ce6729cc9839683f40ce53f5faf0fb784169db5ef9162f1659ea6f24304bcc7cd47f90d49ec97dd
+MISC metadata.xml 343 BLAKE2B 546650c71c7021908ec1f5ff61a835329bd7c9c870e9690565f9dd5dcfa2791c78334c3b7186cafb92f0f7b3900c44f37113062918346054bb11c4f54cb109d6 SHA512 890e9d42b29b85f62feae7d61cab7a0468a56df75fc0909bc0d5d0704bfe8052f9e524293011046fc2c8511378d3abb9928afa69ef35c51b79a4effae8ef9ebf
diff --git a/app-admin/lib_users/metadata.xml b/app-admin/lib_users/metadata.xml
index 3497f56287b0..90fbd3a73070 100644
--- a/app-admin/lib_users/metadata.xml
+++ b/app-admin/lib_users/metadata.xml
@@ -1,11 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>jer@gentoo.org</email>
-    <name>Jeroen Roovers</name>
-  </maintainer>
-  <maintainer type="person">
     <email>klausman@gentoo.org</email>
     <name>Tobias Klausman</name>
   </maintainer>
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 28bc9910128e..315a146f04f9 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,24 +1,21 @@
 AUX agent.conf.sample 409 BLAKE2B c97d35ccecedf47c234e2cb1b3bc20b5aea9254bed08f06e744f44e3567eaa88d232f487a8c185375fc8ba4ad9cc9b15f750649286f1e1c4431d732dc5847550 SHA512 fd9a5fc56d7329113b589f71de030e02c0e1d5575b4ac9fe340fdde6d65d44bc0408f67cc36b6ddb248beb22cb7059727a99f5dc5d92ba2f59816a023a915fd0
 AUX logstash-plugin.eselect 1768 BLAKE2B 539246fb1c6e00fa0928af146d3c32ef69f61e3d419ebba97e688ba151fc34b1cb4a77180c36cd02348616a5069d4c013302270c0127fbe7e836e3f866569d1d SHA512 c80c0f2942643dbdb56c21d2ae0679ac92fb5c84b4f51cb426108c1030434fb32bcadc7131bdaabfe34a458e2bf35965c4acccfb42b99c790a26c2b9ae2a24eb
 AUX logstash.confd-r2 767 BLAKE2B fa251570a13b2bc2d0779e0f00549f40bc957f211be0f4164829f7bf731221e5adabdb27341c703f1ea67b19455e8832f5d822fd41ffc64994007201690feff6 SHA512 83eecf30baa160041f33fd3dafce317c1692efaf676d0fdc9bee04965eafb15f1e01d07a09607d345665f6bebc4db90d17a0abd1c7fd4962d6926ac069f16768
-AUX logstash.initd-r2 1989 BLAKE2B efa16227a2cf1a42f1f9e27e110dae64c7eb6547e22e89a71b3394fe587e0f83468e361d335e28b15a1507959dc26c019ae8ac9bc110f1b8a6896ceb7f3ceecc SHA512 77c69600f22d31e7e08c2d953c99bea8a24ad83c7abdd578526b850ca37c963a91cfd245b70e4ddb8d405135230fbc641768de2dc4dad096a0db3d40313acb2f
+AUX logstash.initd-r2 2000 BLAKE2B b3c01476099afdb3a1d442580f22e536054fd3ed6089ac2f37aab3b5c94f2a95f1d08706bfba819d92eec2ba24fc4ab199eab6ed3aa4f96449cd935e17cbfb7f SHA512 e6bfda9e434c5282d885c4bd0262ed5d27368c7b23eab5fcdd1c9ed6cd86679d1ac677c90f8634bb9d1c75c4f4dae1c568f63bf3d5ad82a84c01f3a1dd1cd857
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
-DIST logstash-6.8.11.tar.gz 176909941 BLAKE2B f3a7085b179215982df87433523735dab35832ae73a41b8b98a66dacc95bd79985f14f78699902c3b7153ff7c11d21ea3f150899095790ad888bdfbb2eaa6fda SHA512 0ebb938784a4a4ea8c1e1691d1953d69605860b6b61fb818d73054b4488fd4c43914c369b468948633ea52d2c8c4f0bfe0e610912cb8c7436b15c5ac5a7047d6
-DIST logstash-6.8.12.tar.gz 176911027 BLAKE2B 03f95452c3823863e78a24c7bdf2709cc4041b19f94c96e747d6398576aef2f3d3cefed311301ca40eef8c6cd8ce4ac2b042a08d664b7e7f83a0df226bef90db SHA512 4070e813ab39b884f05197b9c8c983770af93bfc52bb7f31dd5eb375d509b31f56a5aca5b8a7011acb4fa506d991bef8567e6f4b2f0ee72cfce67089c80bcb47
-DIST logstash-7.6.2.tar.gz 172679447 BLAKE2B afeaab06178669559ff532cf72575f8063d07f95f2401060d33e0a99c87bb9e0c251e45634b9723efe456892ac19586accc89cf7272163e48eeaef438632b777 SHA512 c86dcf36cd0d578467c7013234040d5ea100f08ef69a185f6aa86c87dfa46936282abf10d0f495ffe649274136b735d17ab513ef3401205140c2d98bd9f91238
-DIST logstash-7.7.0.tar.gz 166451553 BLAKE2B 30b732f1ef516b275246b0e14212b0b00b78502e0b4e78211b3bfdd77e2190639ed8c35f775dae7817b0b43a446d34941b968e8a0785302c337a326a507fc607 SHA512 970740adc47551d7967b9841cc39d15f2cbdcd46c2fee1f84b5688fac266fdcd2202cbb10d3a10cf3768606f693ed2e4fc79e91d293a3295083718bafaa7bc9d
+DIST logstash-6.8.13.tar.gz 176911221 BLAKE2B 644dc67dea638e2e2307e807bf2f08e9758db4f8b1a01deb13585b925ceeaaaafba0e573f125c095603b5c7e5329ae82677472c72f53af9d26d792de31c896ed SHA512 f253b566e8f67063bea6dd183ca495d7b53b0062566278e0937af71763fb0b3339ef90c7620edd3370719faa2c49a162e1757141fa60b7136e9d9c3d83657d32
+DIST logstash-7.10.0-linux-x86_64.tar.gz 351102587 BLAKE2B 47f8d84d4d42a313e9c2b17fbf3b0aaf3a22145b3ba27a5f6a272e9698c4a21ef061752010ee8c37539373c033eca910ba21f799e87a9f155141a1bd09cbf3e5 SHA512 f9484bb2e3511ee172fc96b7cd0649a5ecc581f31672f54690e03d0efae65e0dda091143db3486a671012b5c7382bd40d8aa18ca39768fdc88f4c7a4e5b373ff
 DIST logstash-7.8.1.tar.gz 159599529 BLAKE2B c7ba03fc106add6ee0b956de1c3a1ed221c2571087aeedec178d65be3cc83a10f7a4eb35898fc441ffd1c27322668d8e95344a5509cc703b4788d76422a5a1f1 SHA512 7ad6d380e92e90fad2a058a24571b85a49d5ed81835837c12dfa2f4ae4c776483de39b099ed6852ca7f4bab833cd5aba44d28df3048557dfc4a52d4c5486e276
-DIST logstash-7.9.1.tar.gz 158473271 BLAKE2B deeaccb5dd1c9acc52ee395e699fa67d816dfb4144068409f375c20a161837d07f4b0ad269f044076104bc57d84d2decf2bbb4bce17c00737afb74186e706ebb SHA512 d7e359523f4a7deba095d6a1a71f141c29ecc4cf58cdd5f81ea5af80d30be9716b1a9c824d4fc000cafc9457cf7d587d346fd8b1d0d04411a7fd8d280054671d
-DIST logstash-oss-6.8.11.tar.gz 176779121 BLAKE2B 2b3f62fd78a5ffcea07954c4e9b90fc7df10b933a327ac5400d73eb6c4ecd1013049d04b6cecd014b17ff6361a4be0ee535112267cce71cf8c9dc95b551ed6f6 SHA512 4e0d6ebaa620ebb0039687859f28e8620e5604d8452ad1338b2a670cec3153e521f4c3bdc3a78e10b843c1356e73c96065c1c624efc2baa9b2277fa1f8cabaa9
-DIST logstash-oss-6.8.12.tar.gz 176780408 BLAKE2B 4a58efc6e12b6f390022f8d4fb3f4cb3abb4af486eadd65bed840d9a0e8bf0a02659d23d7de6e0cf7068f9e3e20f65cc4e62a39350f60e1f7b3af56e3bcc3859 SHA512 2782b029a2e4880282518ed591a9dd2ee7fd6e6aca15289067f3f45922e0b1fd6adb036b4cc5d256d9aaf8d8cf06bb4ff59cfae6519fac549b6b7f36700f7c94
-DIST logstash-oss-7.6.2.tar.gz 172501347 BLAKE2B 2a83d7617c8e13a0b736ed0023a164d2191102f49e7d7174bf3ea9c56370c51e4fd760f7bb3aba97f1b9bd2ec122ba22e00dec9ac9636f7b79128c6bb2da548e SHA512 c425a9748964ef38fc58f67778cd88fc367df91087362353cfee316e54528e4a23407e1fc53d628008fd4c829b427061758112f10e7805cec88c0a1f0a966d2a
-DIST logstash-oss-7.7.0.tar.gz 166272505 BLAKE2B a12b065874e03ae985c590b8bcbaabf4d2ee6d0ce3ca1f5d60b0874074996e7f8c40bad4fd242e26e74c11741620103e41bdeade2f60f6fabe97652d1c9fbb1e SHA512 a455fcf5c9a44c326ae581f9390ddf206064e6e6b3801cca312cef91e8d33086f8a6598ed68f81f2cfc6d8d66783632b983bef7c8a4ad0f24e929827ec137da4
+DIST logstash-7.9.2.tar.gz 158690951 BLAKE2B a50d959d0d032896b64f2957f299efead1ef51cda77c440f612500ba7193bc8cc81b092c59513dc70a412cf813920df4da5cadff5a494136c5d284d5b9060f34 SHA512 54ec3f58f6fea9d8dee9cbe8eaf755bb9f5d26858082f6594f6fe5f006af6e3f2ee2d5899ada71ef4ad6856d27c0c91ad7a0769aea16c09a8cf6ab234ffc939e
+DIST logstash-7.9.3.tar.gz 158711139 BLAKE2B 5a5426e3ee41e3f985318e7356a3b13df1042b887a627824e9d14a73839e648ea6291333921902320b20cc3e474a15d9b1f4c76bfcfdc0b6aaa08ed098df0ae4 SHA512 f4bfc97203bcad589d3682a4dfd8f7e6172efa958775541b128f43b151cedf4065b1eab012d60a8aa5005dbb504e4c3638a26492c30fba3ba5b271ad17876f25
+DIST logstash-oss-6.8.13.tar.gz 176780212 BLAKE2B 68a5f262023f75525e8b8f98d279920011a0a4cbb34c7297c51f3e45034ab12ca2e2f57b2bb22453107e24fdbca65f16f73a69776fbfd321ea87c6fd1b8d0292 SHA512 0919c8f7bbf39ac9cb41d0065267eb39ba359393e629bf360d6795a68efc9444ab99c7287c533b53efe9ec74fbe403ebe5e5e178b42c48b92d79281a3a5f2045
+DIST logstash-oss-7.10.0-linux-x86_64.tar.gz 350920148 BLAKE2B 77f2a8668a7b3e46224da7383b34ebe632360d833a5f99d010afe94e48d5f3ac2431fb1f220bdf28b9bdb1a8639f9f64db07862bf24c4f340caba2403d60ac0c SHA512 b9deffe41ef051c851b6a456cebcf66cd2a17de6f49dcac8cdb29189ebbcac0ee286b9973456fa8a37bebbf7ba34295cd192f1f5c9dbbdde7da71fde126c230e
 DIST logstash-oss-7.8.1.tar.gz 159415077 BLAKE2B b6dd108679d813cf4ba0d0426ea8acfb460cdcfeec052359a6ce79f194fe4631349973ce1bc726fe7356264211608328204332c74e49ba0aa92e626571789142 SHA512 60d964c0b1f6afebcd41a8036e2dbbee62ca15365c840a5664406428c6b692588ea9343a600ba12d4355ff46ae60a08d42c61c5f33bb7590ce119e15fa1a32e4
-DIST logstash-oss-7.9.1.tar.gz 158289592 BLAKE2B 91d89b4375e51721a5d3181b916cdac33b65e4a020bdec57b3bece9b25595e1588366c69c9e07e4c25b148b4ed2703eef936d1924fac7387fb25cf750226f089 SHA512 ddd6c0db8b59b9ad719a69f04eea81e0261061b5a26569819d4c9306c6f3a63acf575bf50e5f22b17e9b44ed8750d83762b41b866a25b2a2e283b5186c9cdf61
-EBUILD logstash-bin-6.8.11.ebuild 2099 BLAKE2B f5902b9254e045789a41627c84b5a4e340268eedb1a96a266e20279a9d718ef28279e59b63320fc1d35b2e701acb5ce61a925687cd479d46a74981e92d744618 SHA512 74f8b2a81f63e5d41b373e5cb08f99560afa4f59133bfcd7955907105457ea94cf84fe07f5501e011bb2b69d388207e160057c79ec206589e7d195626fab75bb
-EBUILD logstash-bin-6.8.12.ebuild 2099 BLAKE2B f5902b9254e045789a41627c84b5a4e340268eedb1a96a266e20279a9d718ef28279e59b63320fc1d35b2e701acb5ce61a925687cd479d46a74981e92d744618 SHA512 74f8b2a81f63e5d41b373e5cb08f99560afa4f59133bfcd7955907105457ea94cf84fe07f5501e011bb2b69d388207e160057c79ec206589e7d195626fab75bb
-EBUILD logstash-bin-7.6.2.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
-EBUILD logstash-bin-7.7.0.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
+DIST logstash-oss-7.9.2.tar.gz 158510234 BLAKE2B 568f5ba0ebe2baf75211af2e4c859ec5496e28149a060d7688606b56a7972924f0a163914f1c085bc2600694bfc7363fa5300785457f64f3210b97e1074c7210 SHA512 dbd83299a5b3ec76f3e4b235d0b6aff9aad2ab395412b570e3ef82c2ba761a1899a7009b117af9b13b623c00579f323751da7b54c613047efa2558394a19387d
+DIST logstash-oss-7.9.3.tar.gz 158530838 BLAKE2B 0a37f05a42848e6d99ac6741f7fa92a73794d292ad72f793754805d45bdff940163875046258148f71cf953ce40be8747d201d0782de0cf60f2ed16db0136b29 SHA512 13d7a2e417d061b838c8be8a2a874f5964fd32c70cb437ab4bab7c4f8a17882b7874dabe53ba6a588250e56557e972b6d1f5be7970debbfbd893d4532705e6f2
+EBUILD logstash-bin-6.8.13.ebuild 2099 BLAKE2B f5902b9254e045789a41627c84b5a4e340268eedb1a96a266e20279a9d718ef28279e59b63320fc1d35b2e701acb5ce61a925687cd479d46a74981e92d744618 SHA512 74f8b2a81f63e5d41b373e5cb08f99560afa4f59133bfcd7955907105457ea94cf84fe07f5501e011bb2b69d388207e160057c79ec206589e7d195626fab75bb
+EBUILD logstash-bin-7.10.0-r1.ebuild 2504 BLAKE2B 9e4e24079755eb80b22734c42fa02545dd31d781399dedb61d03ed6ab29635b5c2890f99c391bd7d9521cd7845bcc51518d0af5c53c186e6e476a7599949f89b SHA512 e40cbc468ea8039f2e196c1f29117c5685e2d21bc85e90518b1361584025e40b927833a0c95492cb9ed32862b374463ddf332ba3bd960a928802d8ca1e4f2e16
 EBUILD logstash-bin-7.8.1.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
-EBUILD logstash-bin-7.9.1.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
+EBUILD logstash-bin-7.9.2.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
+EBUILD logstash-bin-7.9.3.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/files/logstash.initd-r2 b/app-admin/logstash-bin/files/logstash.initd-r2
index e05c837ae709..e76f00ff9a3f 100644
--- a/app-admin/logstash-bin/files/logstash.initd-r2
+++ b/app-admin/logstash-bin/files/logstash.initd-r2
@@ -21,6 +21,7 @@ command="${LS_INSTALL_DIR}/bin/logstash"
 command_args="--path.data ${LS_DATA_DIR} --path.logs ${LS_LOG_DIR} --path.settings ${LS_SETTINGS_DIR} ${LS_OPTS}"
 command_background="true"
 pidfile="/run/${RC_SVCNAME}.pid"
+retry="30"
 
 start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
 	--chdir ${LS_HOME}
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild
deleted file mode 100644
index 08167fb02874..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
-	acct-user/logstash
-	virtual/jre:1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.11.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.13.ebuild
index 08167fb02874..08167fb02874 100644
--- a/app-admin/logstash-bin/logstash-bin-6.8.11.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.8.13.ebuild
diff --git a/app-admin/logstash-bin/logstash-bin-7.6.2.ebuild b/app-admin/logstash-bin/logstash-bin-7.10.0-r1.ebuild
index 9e7d19873de3..2003a547d375 100644
--- a/app-admin/logstash-bin/logstash-bin-7.6.2.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.10.0-r1.ebuild
@@ -10,8 +10,8 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Tool for managing events and logs"
 HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
 
 # source: LICENSE.txt and NOTICE.txt
 LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
@@ -28,6 +28,21 @@ RDEPEND="acct-group/logstash
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	default
+
+	local d
+	for d in aarch64-Linux arm-Linux Darwin i386-Linux i386-SunOS \
+		i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \
+		ppc-AIX sparcv9-Linux sparcv9-SunOS x86_64-DragonFlyBSD \
+		x86_64-FreeBSD x86_64-OpenBSD x86_64-SunOS x86_64-Windows; do
+			rm -r vendor/jruby/lib/jni/$d || die
+	done
+
+	# remove bundled java
+	rm -r jdk || die
+}
+
 src_install() {
 	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
 	keepdir "/var/log/${MY_PN}"
diff --git a/app-admin/logstash-bin/logstash-bin-7.9.1.ebuild b/app-admin/logstash-bin/logstash-bin-7.9.2.ebuild
index f47057329667..f47057329667 100644
--- a/app-admin/logstash-bin/logstash-bin-7.9.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.9.2.ebuild
diff --git a/app-admin/logstash-bin/logstash-bin-7.7.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.9.3.ebuild
index 9e7d19873de3..f47057329667 100644
--- a/app-admin/logstash-bin/logstash-bin-7.7.0.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.9.3.ebuild
@@ -28,6 +28,22 @@ RDEPEND="acct-group/logstash
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	default
+
+	rm vendor/jruby/lib/jni/aarch64-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/arm-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/i386-SunOS/libjffi-1.2.so \
+		vendor/jruby/lib/jni/mips64el-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/ppc64-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/ppc64le-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/sparcv9-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/sparcv9-SunOS/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-DragonFlyBSD/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-FreeBSD/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-SunOS/libjffi-1.2.so || die
+}
+
 src_install() {
 	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
 	keepdir "/var/log/${MY_PN}"
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 1c2a88e56135..877beb910d3d 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -2,10 +2,7 @@ AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 BLAKE2B 5952e26c668fb71f712fc70b3
 AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de41215890cb4b6431ad694c2684f498d13287e385119304a816270f470ff26529967701c92bfc845a8aac698a0aa0f67271 SHA512 cda86c3e74f56fcd9d8771b26ca91c32ccc33e6bcd6dd0fcf856c14096daa619257d237e1e187e7820d6a0a0553ae6fd9ec160ea59e237b4e05ebca4e6656e20
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
 AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84e914a82cce16782b2c9dfdc83123d609cabd4e9e60eb38a9e43fe7a22a2afca8f53c3dc8e65ac87 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75
-DIST mcelog-170.tar.gz 312911 BLAKE2B bab27c60fca937442a0f07929eaedd392c3e8de3e5f705f717d787652b6c0fa91e42169b835ea2527729c487773c7baabfceeebd3fd58d64a853ff17d8fdd8a8 SHA512 f5d29bde88cd3925c0e629850adce7f1040ecc4703c45427424f5d56f28a0add1fb24538e5c4e0749743c92479d3ea6da583c23bb41eb6a8d899626d818cb6a4
-DIST mcelog-172.tar.gz 313103 BLAKE2B f3acf5a5ebd1db92f7cddfa0e8a848bd6fbd361932ae52400c26f5aeaf7727f6dfd278ab7c1282229d9208474add124401a4665a4febe0debffad7818bcf6223 SHA512 adfde12b9f6f21ec6276c55d3554a3cdbf156e44df2f85c28d9d608418fa57b3f4a0bfcbacd13e92b77eddc1efdaeacfe3c89d203b8cbd3757f35fe419806547
 DIST mcelog-173.tar.gz 313098 BLAKE2B f9ddcd85294bdcb1d9e8e888040af94e5e17f4902efb47788b69737bb3408e59014481f822ea083947725f75b7db21250f4c645e7b409a6c23ce7a9ce3708a62 SHA512 fd83828d19f889e3cbb2ffda8fca95f3097644161bfe2ede1fd7600718fa56d343cd985b831eb643dc613a453730e07847de0f05fb14b4a03a8dcd73281199e8
-EBUILD mcelog-170.ebuild 1367 BLAKE2B 420ec47206fdc6484a7aafc47005ff34a82bd689da636958c99df79fd884fc25f353aee6a63a3673c4357d0f6e5716309251704a26865766d0ea8d135cbc2c15 SHA512 7f980c2058ea1a07c2934a2cc49b8bdb083b6a4fd3a6c1eaf2a9889fbc845f36a6f6c3b27a6b69162badf71824d219bcad047265f77b064a15cb3ad8ffd4a6cb
-EBUILD mcelog-172.ebuild 1369 BLAKE2B 28898352135feee6b52597bc287a9662dedcda130127b27d504641117f102422da9c41cc6dbdc70bebbe50f8c43f63ef997199406c4618e9ac1a58a985d74e33 SHA512 ed1b2bc475a69db7772e5ee18b56766ca7cb4776f09fa14ff7baefd369127be5167ccf56e038d6e793277a0928b1f8b25437ab7b6aa103ef1608acc15450dc21
-EBUILD mcelog-173.ebuild 1369 BLAKE2B 28898352135feee6b52597bc287a9662dedcda130127b27d504641117f102422da9c41cc6dbdc70bebbe50f8c43f63ef997199406c4618e9ac1a58a985d74e33 SHA512 ed1b2bc475a69db7772e5ee18b56766ca7cb4776f09fa14ff7baefd369127be5167ccf56e038d6e793277a0928b1f8b25437ab7b6aa103ef1608acc15450dc21
+EBUILD mcelog-173-r1.ebuild 1355 BLAKE2B d32de6e201a3ee97eaa06415d566997f4c24338e1a2dea9272e5f0332c8f76763eeba629226a4badd3eacadc5fdec416fd6c4b92b4cf8756d5b4c788ffe66eb5 SHA512 ca12be8dc570c15e99ce174f88deaa3c5eb798b4a1a4ac8f1885ca112d2c88816b3111da05f613fb88198780f0fc3c0b350af33b0f7399cbfadd89237a37aa18
+EBUILD mcelog-173.ebuild 1367 BLAKE2B 420ec47206fdc6484a7aafc47005ff34a82bd689da636958c99df79fd884fc25f353aee6a63a3673c4357d0f6e5716309251704a26865766d0ea8d135cbc2c15 SHA512 7f980c2058ea1a07c2934a2cc49b8bdb083b6a4fd3a6c1eaf2a9889fbc845f36a6f6c3b27a6b69162badf71824d219bcad047265f77b064a15cb3ad8ffd4a6cb
 MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/mcelog-170.ebuild b/app-admin/mcelog/mcelog-170.ebuild
deleted file mode 100644
index c298cf562247..000000000000
--- a/app-admin/mcelog/mcelog-170.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~X86_MCE"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	insinto /etc/cron.daily
-	newins ${PN}.cron ${PN}
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodoc *.pdf
-}
-
-pkg_postinst() {
-	einfo "The default configuration set is now installed in /etc/${PN}"
-	einfo "you might want to edit those files."
-	einfo
-	einfo "A sample cronjob is installed into /etc/cron.daily"
-	einfo "without executable bit (system service is the preferred method now)"
-}
diff --git a/app-admin/mcelog/mcelog-172.ebuild b/app-admin/mcelog/mcelog-173-r1.ebuild
index e0b67a2d755e..53cb223fe5d2 100644
--- a/app-admin/mcelog/mcelog-172.ebuild
+++ b/app-admin/mcelog/mcelog-173-r1.ebuild
@@ -44,7 +44,7 @@ src_install() {
 	newins ${PN}.logrotate ${PN}
 
 	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dounit ${PN}.service
 
 	dodoc *.pdf
 }
diff --git a/app-admin/mcelog/mcelog-173.ebuild b/app-admin/mcelog/mcelog-173.ebuild
index e0b67a2d755e..c298cf562247 100644
--- a/app-admin/mcelog/mcelog-173.ebuild
+++ b/app-admin/mcelog/mcelog-173.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 3ca6afb055e0..9be336735c05 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,16 +1,22 @@
+DIST mongo-tools-100.2.0.tar.gz 27401773 BLAKE2B 359747ffe9e53e9ac62fa70517bd5e64c6b082076b9d54e325200cabbd9e3f7ab3aa9f96f7a84c60b044082e505e2ca4d6bdeac6f0b1ca0bfaa03583603a7962 SHA512 1b093482d3abfbd354ff6010f270836a13842fc6ff33126effb4e843beefeabc233bb610b423cac8ce8718366e7aa7411679e4cd5125d44a235f244f5ea49da5
 DIST mongo-tools-3.6.13.tar.gz 4990848 BLAKE2B 022ddf214869c3a3e545aa9572f77f0adc21c0dbd6ea6ad9e083633c2e972b7ef77c0bda4354dbde9fd0e23c6dd02a7de8873d4b2c2a3e4423ea6f8e1c23ed52 SHA512 fac21c4841bfecba11a7765bb6c36d1fa19d4dd94f6f4168fa767fc11dc8b3caf04a5029becd09eba01dd694274e9cc22da8566ce878769e5c3c97016c162432
 DIST mongo-tools-3.6.17.tar.gz 4991196 BLAKE2B 53e86b3513aa74ad174801cea987d574c5248f438cb0a9419c2352c04333eae2f92214b11c59ee8688ad7235dc7a4586c39cc27450c654b1fc0e2eec2e4e22e2 SHA512 ea7a010097fdfe7807daf9352519b808b4a7b614b793ee2ac27495207bcf1cf8b4151fecd525946a0d6b8aa9332c205f437d5141b16efb613810963f502061be
 DIST mongo-tools-4.0.12.tar.gz 11134652 BLAKE2B d3c9703046dc577b85cefe1185678e0029411ddd44d0648f9b09fc3ab41e3661891d18afd83bf1a148dc4c9208895f444c115948e515e09dfa3062e89d98fc24 SHA512 068d8c456386caddcce23fa8917ffecdc9b5c39fb6794c5cd1d9099be1f127ecf680b006055581dc3d90507072a87788b46be7410f0dbede42da64c664b77ced
 DIST mongo-tools-4.0.16.tar.gz 11139827 BLAKE2B 550acfd7e4434b178170dfd94c65668cb7dd37d128235c63a10f72802e3119f33d5cd2138bfd5b957f6d3813f1d9aff49218c4e122c0cd454b4ea7a969c84d4e SHA512 a75831d9fd0b596bfb7354cbc05d1ecf6871d5a7230a858b09b94d5001d18069c9cbe89c9500e9c1a16fc5186fa7a1ac59c605156666a3f1a2d7c81115a47c16
 DIST mongo-tools-4.0.19.tar.gz 11139649 BLAKE2B 7e730138fce671e18a0ebe929b98eff1c0ce2c364ceef7d6868c380242689411c545ac321aebd609dcfe9f8d5b7d35cf37973a978f35a50cc44902b2dbad7134 SHA512 2639cb27a5a27e405bddf9817f409af244d643a9091f7e5ddff4876966af55b6710b0fe158c351df9aea10f3da0b87d224bfb2c962f4ca2cfe41f804cb16749c
+DIST mongo-tools-4.0.20.tar.gz 11139655 BLAKE2B e3ea8ad500af3a023674bbdb9084fea854338fc3791f833acb77bfdd3e3a15fbe361162021e8ec85917a8b3e1992fb4fd6a109ad40489c01788835bce359d2a0 SHA512 a9413d79a3c3219e6f48c5dcd927f2cd24d138e5215b5e7fca92276b072b17c3c7a3528b9112450e1346405345f426ce0fb4324bed5167ed817750b3955e4262
+DIST mongo-tools-4.2.10.tar.gz 15026566 BLAKE2B 28dfef83ca4f3e16b4adbfeb26499cdfda64fe66de2906f56e7cdb56a9be01dd896c858c581aa4347235ca83a6e3a2836e6184ae6587b9d707934c699b561fe6 SHA512 5e937811d9c1146a7b5f2fd743e5d05f4f2a571972c34760e7911d240cc3ea1a0a5ccd451874b7cf635bc603e6bc1e7e8d4aa4b20c17abc77fde78cb4aa25934
 DIST mongo-tools-4.2.3.tar.gz 15020325 BLAKE2B 8501a3ec6e947112ec561ce62f2ea568984f8ac911a7aff3cb8c08c1f29d2cfc64cf7f4b6a24ba73ae0f9b2b5853480f4fbed51c98fdc8c83cd433ea65e21dba SHA512 772719b450f8b656c22ac0126fee1e0fa58b5320c94ac6414b1d9af13e6437393c2482f2e386f4a73c84a2d1bfe0ea88df117a6a7ae87f4884477505cf662585
 DIST mongo-tools-4.2.6.tar.gz 15016596 BLAKE2B 5ee37bf21ea05ec5ba2764c935c1dd3632753e772a01f854dc8a9949620e9a41fe95ba658a0efae0332ed2c059561e39e681f672cf5f4302a7f92c364cfab4b6 SHA512 e91bfba4b015f80d35b6c2ca766c599c5eedea113d6415ec0aef433d46b5e5fe06956481a063e26908a45fdcee4002125ea01a29fa3ea9a541a9210d25625f8e
 DIST mongo-tools-4.2.8.tar.gz 15021497 BLAKE2B e066c299462167754e0752079f35fef25b387eb1df0631ff0e0b783a8a14c4b68c6ed126ec3429f63de87b87b9fdde6a2645badd53ac1386befc7175a61a999e SHA512 c0fca14c60e5f399934f4dfad5be832684d2c1a1145967a4c395b246774f73f71e506bff902a634b7f08f7133304c09f14eb56a1a6fc8585608f537e59d9c899
+EBUILD mongo-tools-100.2.0.ebuild 1383 BLAKE2B 8ecf9efa840b8e6242a36f34aff6f0ebb3cba25905fd488f34477c26133b7a33ef1d4bb0e10734d4faaa856980226533c5c4d0a58a56908b603ee18a4986048d SHA512 17960c5882da9cee65ba4338d9466e94fac20b61b01be65b5cb8bc2318f23a1f9e758ebf300e68809e7095ff12eedc185677ceded5173bd46a726d2e29440e28
 EBUILD mongo-tools-3.6.13.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-3.6.17.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
 EBUILD mongo-tools-4.0.12.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-4.0.16.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
 EBUILD mongo-tools-4.0.19.ebuild 1612 BLAKE2B 388fce2721c6febaf554a4eaf68d3ec2def017e01b0a88ff7acb039b06dfd90081776dd1628ea4c51612b55e5fd113176c1b87fd9dd8d14991bcb8e6b21e462d SHA512 123c899168d48b40b75cabf913ad76eea8bad3f0537101a312988191d4cf6cb07b3f5b14232d92bac2785d92d1229ae2209c1f96843c845cde6967dcf9ef4c95
+EBUILD mongo-tools-4.0.20.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
+EBUILD mongo-tools-4.2.10.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
 EBUILD mongo-tools-4.2.3.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
 EBUILD mongo-tools-4.2.6.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
 EBUILD mongo-tools-4.2.8.ebuild 1619 BLAKE2B 1faf21c01243af30bbc274c99995ea875579473f53485d8100b487d1934880c495d9cb276e346646ecdad476a56284e90646cc83ac1dc47a1ce0cba7bf670f98 SHA512 91811cd08ce9d3e3577ccd0ba845ba9880e6bf681dc14925fb5a43a750914b4e1732d578ff64335ad935665548ddacfa59bc0fc22abed2d053cec0e6da1af939
diff --git a/app-admin/mongo-tools/mongo-tools-100.2.0.ebuild b/app-admin/mongo-tools/mongo-tools-100.2.0.ebuild
new file mode 100644
index 000000000000..a60bc8a3e1af
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-100.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${P} "${S}" || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop; do
+		echo "Building $i"
+		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.20.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.20.ebuild
new file mode 100644
index 000000000000..86f626904b91
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.0.20.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# allow building with go 1.12 #678924
+	sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-4.2.10.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.10.ebuild
new file mode 100644
index 000000000000..7d8cc9a0ebc2
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.2.10.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# allow building with go 1.12 #678924
+	sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 8f6123b08721..3fbc432acdf0 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -4,7 +4,9 @@ AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e436052025236
 DIST monit-5.25.3.tar.gz 1355925 BLAKE2B f1c4775ad82ccea262fa5d9c3c9396e634cb3742c59ff9d8b3c87552501ee749a829932570b8d2836fe77a14fb42fea2ee42cab1aa355ca09df6dccda9aa5f51 SHA512 9030b8e6a02eeaf497382f14f7cf855a96599ab060130f077208edd5db35fee1b74f9166df4deff87b4a1954c8d4fff83b5465166938a3f8aea8d4d4c0371e90
 DIST monit-5.26.0.tar.gz 1371327 BLAKE2B eb130c36ad9df0b042fc241fde540ea12945ff1d63d14925da8435e88586141f5ebc116ad5a540a4fbfa507e0101d4cf4ef8a4435fd638f39d5472ba0d6e12d5 SHA512 ae5bfc9f2e8cf2d2efa7a121f3bb865dc5b66b647e23e005349799f3f4384dfa1534ed88d0767ca41dac4cea2674fb82cfb51098129d350b470143df548c6900
 DIST monit-5.27.0.tar.gz 1455341 BLAKE2B a2eeab81dacf506cdb336ba5e116f18d947b206ab791b4ee9f3ec54dcbbb973c31074f5a46bf32397fa4306cc6b11eca80b4c92770ae412baf1b610483e8259f SHA512 34461572ad809917f13672613bd37546ec2b5ebaf5a93a52d669c7c67b102a592ed5e88012feb53c9fe310ea9437a169f8822eac06d7b6f42a1801f710365785
+DIST monit-5.27.1.tar.gz 1459360 BLAKE2B ef8030112c401ab08653692c702f2ec6d34c11605c2f6fbb5310f8e08d7fb238cf1b2d0271358b7160e05ad8dae3931d458329c422ae826681c11fe46fac01b4 SHA512 1e71a529a920a37576242a99fe8067d9b88f64136b111c152527aca4aa5d3cac3c32c1f58a793a56361b8e286f025bfb1f063f4c38d25ebafc7927fbf9170673
 EBUILD monit-5.25.3.ebuild 1204 BLAKE2B b1afff4ec33ccbea3c8e06de97e756590706a54492bac64da87b5a40278ed835806cbccbe9b2b7869e443b83f00f9b6cdf6d78e6929d5683916cf11756c3da7f SHA512 02a0b6d37182baf77a2cb835664ea0d8faf3a473647d234ffc2a62df313d564ec491d9682808161bf4da62aa558fa03293a1b8eea017840acb52298bcfe1834d
 EBUILD monit-5.26.0.ebuild 1207 BLAKE2B aa074c71f4eb188e69feb148663344e15c8ab1e818c960018d59abd21ea5713eb148cdb9c796b996b00aca20f9a4e46ab3ce75f90465d35fb2cd7901a18b9858 SHA512 add86722d2fa2a539c6ac3c4758731e0b72d279d8c56f9634880507e1db0e364a2c4b66ef7d23a60c6a56550bb5fc15d0f8d99a16aa11cd81890093eb368fcf9
-EBUILD monit-5.27.0.ebuild 1192 BLAKE2B 3bb5eafa0f9ec5b07b6ebe724202c9f428a2a7829159161f19f5a20ae1fe6d17b8e08c7f76607c04a8299243fd46b210b04b089cf1eb4f6edff039b6b0bebdea SHA512 9c00a54951e7f0df825e7768d7b1d9de686cbb5e506fdd4a30a9f6a35219e55b85826cea9fa671930111c0507a2766b0635791d628dd0c1d1b503adc65f1d10b
+EBUILD monit-5.27.0.ebuild 1189 BLAKE2B 6d26a251a2971408adb9801306041c873741e6d2f8b785a050764c40fc7d1076881aeffac520c102e1c3138a945f23abc1b62d83bb6c6b8cc4ddb615511de277 SHA512 9ad4ca52585b0e2b20407b7a901e6fbb8dc0aeac56e6f9fb4c47b2453f745c88d416f5cbbe8b80c75d67c7b06fd99b68616736eb9f28328db18261bbb965581d
+EBUILD monit-5.27.1.ebuild 1189 BLAKE2B 6d26a251a2971408adb9801306041c873741e6d2f8b785a050764c40fc7d1076881aeffac520c102e1c3138a945f23abc1b62d83bb6c6b8cc4ddb615511de277 SHA512 9ad4ca52585b0e2b20407b7a901e6fbb8dc0aeac56e6f9fb4c47b2453f745c88d416f5cbbe8b80c75d67c7b06fd99b68616736eb9f28328db18261bbb965581d
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-admin/monit/monit-5.27.0.ebuild b/app-admin/monit/monit-5.27.0.ebuild
index 6de7d5744764..b5d4e9fca1a3 100644
--- a/app-admin/monit/monit-5.27.0.ebuild
+++ b/app-admin/monit/monit-5.27.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
 IUSE="ipv6 libressl pam ssl"
 
 RDEPEND="
diff --git a/app-admin/monit/monit-5.27.1.ebuild b/app-admin/monit/monit-5.27.1.ebuild
new file mode 100644
index 000000000000..b5d4e9fca1a3
--- /dev/null
+++ b/app-admin/monit/monit-5.27.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 pam systemd
+
+DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
+IUSE="ipv6 libressl pam ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	pam? ( sys-libs/pam )"
+BDEPEND="
+	sys-devel/flex
+	sys-devel/bison
+"
+
+src_prepare() {
+	default
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with ipv6)
+		$(use_with pam)
+		$(use_with ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc; insopts -m600; doins monitrc
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+
+	dobashcomp system/bash/monit
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/ngxtop/Manifest b/app-admin/ngxtop/Manifest
index 76fd5f3fb1e0..ec4670132e05 100644
--- a/app-admin/ngxtop/Manifest
+++ b/app-admin/ngxtop/Manifest
@@ -1,4 +1,5 @@
 AUX ngxtop-0.0.2-py3.patch 1816 BLAKE2B 1f19b6143bc5eab4786043d1641f17a370cc07b72c3e61329e9b3255fb6a0c66d00d94b371aae5e0d5747e99964a102d7ea630a235ebad4df0cd3ff015917c95 SHA512 47127c5ba26d0d6319ca74f21370bf01ce3a74676066bf7476f862de8165c2d62d90e5cad1cb2369e5743db4fa51090e8bdf59da04f9dcfafec62edc44122f8f
 DIST ngxtop-0.0.3_pre141201.tar.xz 9012 BLAKE2B 9e8a7d2c3aadb302e0923fc7cb5b0219a56489993fdcf83fb7b38ba67036f2b5cae7e5bba2c9efc81d858c58b0f1e25f17fa8cc600e77f76b45aafd9d5a3354e SHA512 ce0c6d027eacfe553752a4a66b7d5823de45ef847d4db1a50d9677126a1d574c22e17b5a60f073bf74eb93d56d15d88d6201353324b201b77c1dd5bede6d7cde
+EBUILD ngxtop-0.0.3_pre141201-r1.ebuild 749 BLAKE2B 728b286c2f5a51f3c6f21434766c6f03ae13de4c355f55b2ba35606595c3e9361545176f157312c6c878798ddacfa8b1510a243c1a73eb57ab32befdf753bf68 SHA512 047ab67573bad0f456a8125b81756e5a075b47a6d666c2b2827f6783105be7baeb7fe29c0dca1619f34672907d60f514c8da47c7ad897cbbe6fa870d836ad1f4
 EBUILD ngxtop-0.0.3_pre141201.ebuild 717 BLAKE2B fd1b649f65855e48ec25e68f7280be86a3bec07dddd127dfd9da7e1be6a81123a17e785120a31fefe8f9e5a9aaefd7361d7562d194c84c4175d9ebf6c34f99f8 SHA512 d72758a338d6596ccff321136bf8373aa3e08e7843058e747f7ccc05ace5e08f6d8f96c5d98cde6f1b37b8216e234ae7c31dc2da50e1312df1d54883fc31c2f3
 MISC metadata.xml 461 BLAKE2B f806664e2adbfc73592f38096aa760947d80503bbc57896ea67a6981d2dc5f96ba33b3c52ccbbc9b89cdf8396be58e02c72fca1da540e50234f56230e1af974e SHA512 ad2119f295b8c26f57142a89ca52ca6fc33b8fd1cbb8fc8b03a838f4515035a58144c661c64afb53a032cbcb385d13fd5d6cdb8c63d5e098210f506e406e0382
diff --git a/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r1.ebuild b/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r1.ebuild
new file mode 100644
index 000000000000..a38a287da511
--- /dev/null
+++ b/app-admin/ngxtop/ngxtop-0.0.3_pre141201-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="real-time metrics for nginx server (and others)"
+HOMEPAGE="https://github.com/lebinh/ngxtop"
+#SRC_URI="https://github.com/lebinh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/tabulate[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.0.2-py3.patch )
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index af28f4de4eb8..32500526021f 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,6 +1,4 @@
 AUX passwordsafe-1.06_beta-system-gtest.patch 2962 BLAKE2B 1ef77391d355364e55da568c2686c1988916da9eadc312c37d01016df3449535b88b503dfd3aeac2bf3c8e613141552bb1d97f5f5a733becc33f3c565a610940 SHA512 2fc6745b84ad810a550c2b221aca4cd10f87d4bc77282cb31b3d3070b61a3958c126ce0d3da4eaf550d80be470ca4c5aefaeb863caaf2f9fb285bf844f5705bb
-DIST passwordsafe-1.08_beta.tar.gz 14409047 BLAKE2B 029568b435d4cc19f3a95364355546afb99c13bbee0e83c248d57f47e472da714b95be00658ec2bba161b8eab6f0d94bf2856a2198d29673987e5c0cddf69aaf SHA512 7c37a91c71c1a79ea2cac87ec310d08df7491affd02c073d674bbedbabf25c1a1fb807376dae378dc4395b2146f6eaae059a0b14e0d1ba369cfa91a2d29060a4
-DIST passwordsafe-1.11.0.tar.gz 14538095 BLAKE2B c37e965968b7e2e694dfa9a9a9193dc9bb10f5b67446ce5db070be864c211f4af06e9c412fa1489f15151741fd1a1ec01d07d3dca4633effa284541e5d081268 SHA512 b6ac36911e24a89f51c8f2efaa381af516e826137a5b131a0258c00d9ff3be07b818ca23b3d49e8dee9913aa8fc73faedf2a70494c72c3b22cc518a9c215e5c5
-EBUILD passwordsafe-1.08_beta.ebuild 2280 BLAKE2B 8868affd34cee8695bc69ca3a2fe29d4b84ba1da30ac03bf38acc0985a4ddc0d387a774150a6808ec814bbb49d96d988afcd0e42c989245484262b3edd7ed13e SHA512 f6db9cd2bbb29b1430f6600e7640e2ee4846fd107b8c28a607901c2d6a8031d1fee9e3adeb5ee973d1fafecf273904c3355e1a66c32019ec5e93675589993d4c
-EBUILD passwordsafe-1.11.0.ebuild 1954 BLAKE2B 7963630f9fdbe48dab3011995c9ee7a2f7bc6dc1f6e04bfc7be42906bf2b7a3a154f7ba1823a87627dbae0cc2b5bb9a634d27f0e0e2e116c3e75e8481d844293 SHA512 5d1b41d11705aa67d10e2073989fea4917ae2dd525360b3a486f687e846de7d6480e6bd665ed014b2e6a2c31f0e81fba23eabb6732d9df502de02356fe3394e8
-MISC metadata.xml 842 BLAKE2B 719428e2e9a43317cbf00f6a0433719fce586a53b03374d011fe11e1a09664593d6a93f86ed7c77b6025496a5c7ae72304b910a4f0a15efb6c378418b2c6408a SHA512 da19977d8e8791ea0f274e17069201e6f2f2c7661e9c313906d674e9e44d964de36a30edb506c8c308a01b8094c6f455253ac449e3fdb3be7f75357c78234c66
+DIST passwordsafe-1.12.0.tar.gz 14937705 BLAKE2B 523e4496ffb99f8a53e62252117d43b771af867b3505f3a5b8c8f1119e8365f0661090e410a832abca89e2ce35816d2046d4bff0ba1e0f06c52c01eaac9051b2 SHA512 c20cb754a2174e3b3ab61edf99f2a31c333144550103fac50cc26cea89669fa3574db3bdd59996fcd87b83c7bf6dd1e9d2b087c17615183cd7111f151be5a94a
+EBUILD passwordsafe-1.12.0.ebuild 1954 BLAKE2B 7963630f9fdbe48dab3011995c9ee7a2f7bc6dc1f6e04bfc7be42906bf2b7a3a154f7ba1823a87627dbae0cc2b5bb9a634d27f0e0e2e116c3e75e8481d844293 SHA512 5d1b41d11705aa67d10e2073989fea4917ae2dd525360b3a486f687e846de7d6480e6bd665ed014b2e6a2c31f0e81fba23eabb6732d9df502de02356fe3394e8
+MISC metadata.xml 683 BLAKE2B 9db2240d92f852ed50085280e3ddb947261ed7aaa9ed04784cbdf71c8e29ae79e1730cae298bcbcb75f82ebb69bab96695ba1a519487c92da399e1c7a98014a4 SHA512 12f06658b68b46cec87fe6842a8b94cd3c35b9e1d81e4aa447ec488358dcd37f5b3779c87d9fe0e4271f5f7e69550aa44cb815653acd502e10446e1842899e82
diff --git a/app-admin/passwordsafe/metadata.xml b/app-admin/passwordsafe/metadata.xml
index 24e655194eb3..ef0e2e070d7d 100644
--- a/app-admin/passwordsafe/metadata.xml
+++ b/app-admin/passwordsafe/metadata.xml
@@ -10,11 +10,9 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="minimal">Avoid collision with <pkg>app-misc/pwsafe</pkg></flag>
 		<flag name="qr">Enable QR code password display</flag>
 		<flag name="yubikey">Enable support for Yubikey</flag>
 		<flag name="xml">Enable XML import support</flag>
-		<flag name="xvkbd">Install <pkg>x11-misc/xvkbd</pkg> on-screen keyboard</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">pwsafe/pwsafe</remote-id>
diff --git a/app-admin/passwordsafe/passwordsafe-1.08_beta.ebuild b/app-admin/passwordsafe/passwordsafe-1.08_beta.ebuild
deleted file mode 100644
index fe48f7cee17a..000000000000
--- a/app-admin/passwordsafe/passwordsafe-1.08_beta.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit desktop flag-o-matic wxwidgets cmake-utils
-
-MY_PV="${PV/_beta/BETA}"
-DESCRIPTION="Password manager with wxGTK based frontend"
-HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/"
-SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libressl minimal test qr yubikey +xml xvkbd"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="xml? ( dev-libs/xerces-c )
-	qr? ( media-gfx/qrencode )
-	net-misc/curl
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-apps/util-linux
-	x11-libs/libXt
-	x11-libs/libXtst
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	!minimal? ( !!app-misc/pwsafe )
-	yubikey? ( sys-auth/ykpers )"
-RDEPEND="${COMMON_DEPEND}
-	xvkbd? ( x11-misc/xvkbd )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/zip
-	sys-devel/gettext
-	test? ( dev-cpp/gtest )"
-
-S=${WORKDIR}/pwsafe-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.06_beta-system-gtest.patch"
-)
-
-pkg_pretend() {
-	einfo "Checking for -std=c++11 support in compiler"
-	test-flags-CXX -std=c++11 > /dev/null || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# binary name pwsafe is in use by app-misc/pwsafe, we use passwordsafe
-	# instead. Perform required changes in linking files
-	sed -i install/desktop/pwsafe.desktop -e "s/pwsafe/${PN}/g" || die
-	sed -i docs/pwsafe.1 \
-		-e 's/PWSAFE/PASSWORDSAFE/' \
-		-e "s/^.B pwsafe/.B ${PN}/" || die
-}
-
-src_configure() {
-	need-wxwidgets unicode
-
-	local mycmakeargs=(
-		-DNO_QR=$(usex !qr)
-		-DNO_GTEST=$(usex !test)
-		-DSYSTEM_GTEST=ON
-		-DXML_XERCESC=$(usex xml)
-		-DNO_YUBI=$(usex !yubikey)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	pushd "${BUILD_DIR}" || die
-	if use minimal; then
-		newbin pwsafe ${PN}
-	else
-		dobin pwsafe
-		dosym pwsafe /usr/bin/${PN}
-	fi
-	insinto /usr/share/locale
-	doins -r src/ui/wxWidgets/I18N/mos/*
-
-	insinto /usr/share/${PN}/help
-	doins help/*.zip
-
-	popd || die
-
-	newman docs/pwsafe.1 ${PN}.1
-
-	dodoc README.md README.LINUX.* docs/{ReleaseNotes.txt,ChangeLog.txt}
-
-	insinto /usr/share/${PN}
-	doins -r xml
-
-	newicon install/graphics/pwsafe.png ${PN}.png
-	newmenu install/desktop/pwsafe.desktop ${PN}.desktop
-}
diff --git a/app-admin/passwordsafe/passwordsafe-1.11.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.12.0.ebuild
index a8f86f8a1e5c..a8f86f8a1e5c 100644
--- a/app-admin/passwordsafe/passwordsafe-1.11.0.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.12.0.ebuild
diff --git a/app-admin/prelude-manager/Manifest b/app-admin/prelude-manager/Manifest
index 598465460fa9..8bef2d20c797 100644
--- a/app-admin/prelude-manager/Manifest
+++ b/app-admin/prelude-manager/Manifest
@@ -9,8 +9,10 @@ DIST prelude-manager-3.0.0.tar.gz 1286459 BLAKE2B 0909b0d7501909de51cd580b6ce22a
 DIST prelude-manager-4.0.0.tar.gz 1353116 BLAKE2B 20aaa28797a67fd310807735bb08f0c21c3bd95950598a86c45144ee2474785aef0c7d569732c817509ae8ae52ffce5f43f3c071931f2960578681f91a8c9504 SHA512 793ed37c71eb4884cbbb49b11c7388ee291a35252255458ceadb4ce10d1392e8bad423f95e31bff4550a9cf1d04139e43729352554fd847048b6c8d14f813a8a
 DIST prelude-manager-4.1.1.tar.gz 1415847 BLAKE2B 7cea7209a680a38cf597a9678f3ac9a31b00187e4597e1aeed91bbe57a55981279e8399ee8c90a044e40873e595ca648736fa79090420d9bcd72b82588f7bb5e SHA512 4e9d09b56eb7ec55144caa06a04e458bf0462d8c0064a34aac5aa0fb96a30fbefe5a4956185b606ec58fc410e4cbcac8721e521b3396303b3bff88808042a966
 DIST prelude-manager-5.1.0.tar.gz 1510054 BLAKE2B 88ef666a76c58af1a8164c033b7e9c1ea869a18a66cb489d8c7fdbf1fa331006e7844aea4386ea3185902afd108af5eb1b46ee17686032de460d8c5b336fd658 SHA512 1f0e993f9bf684ec65a741db3cdaf537dc47bc2f77652a37c194db422dd5da2aa33b78d3ee454c78b28b44c022eacc7246ee99187b0b8779c12f3a67320d89a3
+DIST prelude-manager-5.2.0.tar.gz 1564874 BLAKE2B cd00aca6a533cdb47e311c4a8eed17d514f39de3b1c5a4b334b8e8c8c2d318b36d1fc843bf36be0383da2ae5f4e41a936fc70ad92d5b55ab56e9a34c36fc1dae SHA512 49f8fd10c7f3c5c816e6bc49ce8d47abfe56b4b0a1d8a564774f67ef5f0e3058c62ef9c88ca709b1fe2961ed832269fe811ddf57d4118879fa561970561507d6
 EBUILD prelude-manager-3.0.0.ebuild 1354 BLAKE2B 6ddb8d34247ffa5054ab97fe051c3af6ca8b800bc304174262b09cdfdff8a16d356465442dd660f09d7afe0854a16cd441e1be5abd0eeaf77366ec11738ed328 SHA512 e3e2da070356f2fe020d1319e0319fbdc5ba09ff5cdac56c82d21766a11be9e97ee625879f4869fc91064a067a622391a9e61867e4e87fe256205a87b48bedbb
 EBUILD prelude-manager-4.0.0.ebuild 1253 BLAKE2B 8d9e17b92b16090bb437fe53389598128f249e2b4f16c8da6724f370df5bab1aea34c1824b024839bc0f3a573a56d19bc54c31cdf0744b54c581fcdefeb76d97 SHA512 3a0d79d24de4d97ba73be7cdf62f4d2d158225cdf35945e51de3854b7465a23eddc9315204a303c833e73a8965826ea18cf09951aa79697bfdc9523f0149025f
 EBUILD prelude-manager-4.1.1.ebuild 1278 BLAKE2B 3538573a5a36d1431f4c9c593422dcc9e9a594505021b8a1188c91a23a5de92e22185447b12aa7bdb33f55697ed2badc959837e5f6298ee9c0e51db8a49d16f7 SHA512 2bbe1ea323fde66ca5aee4ced72631cef58b345c852c09c5e9e21bda7d1cd8b71b460006ebc15b93e69c4128a7577b0abc4434248235ec4fff3e3b7f148ee8c8
 EBUILD prelude-manager-5.1.0.ebuild 1339 BLAKE2B 57be54a7db85f50c9e861d3efd14a865e0d3c3d9f4883cd9e7b25fbc8a3dbbf442f9b42a89e92c3c733897c76842a2b0133d51360ea60a3733d3824a16e32264 SHA512 e0929694e95f1dc710ed7954adfaef1235d37d36889b13c223776f820416c3f0fb61b71084959bc5405a581f093e2c92649efbec88ecb065af9788e587c88656
+EBUILD prelude-manager-5.2.0.ebuild 1521 BLAKE2B 90329e6f955ff5e35b3f1d6139d27e1991b5db842323d48e0fc3b8f6897a3c3738f374a0089ce6dfda3ee68d4e17b9dad776b481e3fb22b31478515515c16ad8 SHA512 54cb983f67b3cf1b6934b22986437be8fb716220640d3a29e671f9a7845f1dcebe4f17c9e2bfae9e45aed241cd68aac4e248f81d85247a14c349bc69726bce81
 MISC metadata.xml 1037 BLAKE2B 2e4a2d969eac348834aa8f78859b7b4456585ab11985c6083640a6cc0d32269952a78063b5aa11c6228d9c67e04b50b58247b5c2787f7d484390721af0de4ef5 SHA512 d18f203c6feadc632fee701cc7563c60d10febf11873fd9a6498cdaa47c2fa44b1a7ca50d5f6af99f3cc678fb88442c8e71d7eb0185b9972585c2d52371d9c34
diff --git a/app-admin/prelude-manager/prelude-manager-5.2.0.ebuild b/app-admin/prelude-manager/prelude-manager-5.2.0.ebuild
new file mode 100644
index 000000000000..91cd740fef68
--- /dev/null
+++ b/app-admin/prelude-manager/prelude-manager-5.2.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd tmpfiles
+
+DESCRIPTION="Bus communication for all Prelude modules"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/5.2.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbx geoip snmp tcpwrapper xml"
+
+RDEPEND="net-libs/gnutls:=
+	>=dev-libs/libprelude-5.2.0
+	<dev-libs/libprelude-6
+	dbx? (
+		>=dev-libs/libpreludedb-5.2.0
+		<dev-libs/libpreludedb-6
+	)
+	geoip? ( dev-libs/libmaxminddb )
+	snmp? ( net-analyzer/net-snmp )
+	tcpwrapper? ( sys-apps/tcp-wrappers )
+	xml? ( dev-libs/libxml2 )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-run.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		$(use_with dbx libpreludedb-prefix)
+		$(use_enable geoip libmaxminddb)
+		$(use_enable snmp snmp)
+		$(use_with tcpwrapper libwrap)
+		$(usex xml '' '--without-xml-prefix')
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -rv "${ED}/run" || die "rm failed"
+	keepdir /var/spool/prelude-manager{,/failover,/scheduler}
+	keepdir /var/spool/prelude/prelude-manager{,/failover,/scheduler}
+
+	find "${D}" -name '*.la' -delete || die
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
+
+pkg_postinst() {
+	tmpfiles_process "${PN}.conf"
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index da9c48fe284b..e6f48a994278 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,9 +1,12 @@
 AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
 AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
+AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf454a5163bae5cfa2b7af1a212b2e5bfcb4693c7291d5306e47e574d3c937aaedd02625dc954a9e SHA512 df93f7dbcf61eee9f42f4a0c2fa0e2dfc806ac737ba98329cee158e04150c9bf346abd9364b2a6824df4bb862e676be7b2c23f5947ef5aa589df745ac5c5cd03
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_6.15.0-1stretch_amd64.deb 22581842 BLAKE2B 19c45427e56a41f6030836129a7fb2824ea47f1000745a8c74b0968c61f719d3cef9a0e02f51009b8e91c4ad66445c074ccc203754bb13d82007316a3d053c60 SHA512 4ec7e04fb6bab697bfccd369740a57f735476a4614dbfa1f7c893901f5ffb9d6ce3d79886b6e035805b1a8f2c3de3e0b9b468b08909881df6022c9700c7a2768
 DIST puppet-agent_6.15.0-1stretch_i386.deb 22917002 BLAKE2B 5bab2b6cdde11a46e64996074e8db50d48d004b601c0d08ddfde9c8dec0c0f62da1176b9148d084f0250b582460606b7cd0a97291d157a186b7a97dee4184c51 SHA512 89e676491f7b7b44c9c747b129166db7b025adf76d9911d12d7d026aa8d04de293d3d1c638ca309ee8ed45a37c49b4ab0076ea0c711ac0e43f4297084446784f
 DIST puppet-agent_6.18.0-1focal_amd64.deb 22258752 BLAKE2B 547d06b16b2c95ec9be72bd82e1aa0a4a4b511075da73f29ebecdef32ca4ed9b965a38a7c071d9bcc8c444b6974159df97f020878c0e4a20d1f50ff23d4c1129 SHA512 00f0cfd96176f5311f0bab14016ab88da03ecc10fd9e2bf28fc2d9a399600c56a97e23095694be5382005fef0df1c4fe3ff0d1aec3a46d85f74c729a3c62476a
+DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
 EBUILD puppet-agent-6.15.0.ebuild 2016 BLAKE2B 4f4382314410a9401868382b65e5ce627e9c706120dc21a537b71b390bd56480988b36e51f000303542d8711f2aebd47860605e8f52087c895e9453d2992a84a SHA512 45a7eaf2fbd6c66b672943192a92826ee10da6f0ba3a4d8cdc6c9ad2103d2fa534587dc31f5505bc8c9a23474e604ac58af0b328723668cd772a1e75fe6d0d5f
 EBUILD puppet-agent-6.18.0.ebuild 2067 BLAKE2B fbaa5ddfc2c3085a877a0adb546a8ced6242fcfeffa180cee4588dd6ac0f35ef15b58869f1b22dbc4d92b2344780ad64ae9ef41fa6a46f71bc50fd2f89031ea5 SHA512 154315c97b9ec493d6923e066df73d58a33e6f0c7bc33162d8fcb5b5eb86df3ebd7af93d9cc8a0463d6d19f7650209610fe391a5b530b7b57e147738cc567d9e
+EBUILD puppet-agent-6.19.1-r1.ebuild 2063 BLAKE2B 046b9954bf6619f55a664eb77b6552fd23a8d6d8a0da3dc9f9f395d570bd852fc3222bfc92debce028b49919e2fce63115d8c84c4957c75e49ebf5857b33c1d5 SHA512 8d78af238e593ddd88498d4994afa6565c8d5e9dcbc4baf4e05238ed591847ad97b3eb452c1a4d688d8d9d64aad274826349c28797bad960f12ebe39be1c304b
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/files/puppet.initd2 b/app-admin/puppet-agent/files/puppet.initd2
new file mode 100644
index 000000000000..90ebd0481701
--- /dev/null
+++ b/app-admin/puppet-agent/files/puppet.initd2
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PUPPET_PID_DIR="${PUPPET_PID_DIR:-/run/puppet}"
+
+pidfile="${PUPPET_PID_DIR}/puppet.pid"
+PUPPET_LOG_DIR="/var/log/puppetlabs/puppet"
+
+command="/usr/bin/puppet"
+extra_started_commands="reload"
+
+command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}"
+
+depend() {
+	need localmount
+	use dns logger puppetserver netmount nfsmount
+}
+
+start_pre() {
+	checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
+	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+}
+
+reload() {
+	ebegin "Reloading $RC_SVCNAME"
+  start-stop-daemon --signal HUP --pidfile "${pidfile}"
+  eend $?
+}
diff --git a/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild b/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild
new file mode 100644
index 000000000000..7537a83b6293
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils systemd unpacker
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what
+	acct-user/puppet
+	acct-group/puppet"
+
+DEPEND="
+	${CDEPEND}
+	app-admin/augeas"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/libselinux
+	sys-libs/glibc
+	sys-libs/readline:0/8
+	sys-libs/libxcrypt
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd2" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index e5cd955308c3..f2d9abf39228 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,8 +6,12 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd SHA512 996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3
 DIST puppet-5.5.21.tar.gz 2997149 BLAKE2B b42fd79132ce0aab02724c7aa38fc39a216df38266b9ee8078b433860b675f36b3c4da0d13d8fb456069250e6cb6470686c83581bc6b57801a44375f829be195 SHA512 b33191c104cb58fc842d065c3cf7dec8ce723ddc9b273c930f56692e252eb6c51bc3b0442db6500cf015fe24ec3eb133428aa09d845ca92b05de2da39bce8bfd
+DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
 DIST puppet-6.18.0.tar.gz 2911742 BLAKE2B 75ecb14a0cf96c1c54d09f88f91984805834288a166e74c5b9648d5f9ad60a6c279100f32f148659772a22fc01d21345bf765ed47518bfa9bd81d06c17587efd SHA512 a14994aea502fbc78219967e2d711952b580df1e7befeab2d254a73f28036c6c7923d167a20bc61c9abe76000f93dcd3cba92b3353540e2a26fc27b10b06efe1
+DIST puppet-6.19.1.tar.gz 2917976 BLAKE2B 06019b465699494c3c5045d8d3f617046583f8bb5ebff4e72991bcf5f1ca76b4e00f56af79bbcd7ab849439fc5e627840ef08b92f586441c0cb0bb3d51805f7f SHA512 4e8a3c8d46b6aa67c31da4b510dfc32a187937af213efb9f2f0b6625b29995cdfa8cbca384ad857c19e47ae4878127564756a809c2afdff4883038249395ff01
 EBUILD puppet-5.5.19-r1.ebuild 3692 BLAKE2B 7aa03944368b7395b4c587230a39536db28d0a46352bd5c6f7ec457ca29a3e6d9a3672a9b74591d3382909dc4f9ecf6ec73853ad5722b26becafb5c1a1264912 SHA512 6012739c4d92cf576ea482f99e9d560633103116b40be7df8cc3a9e89f9efeef3e02317dbbed1207a91c5372ef7702d723c37207488ecd6ececad5d0df6de9a2
 EBUILD puppet-5.5.21.ebuild 3757 BLAKE2B 84bc423625d9ec703ef345fd0bbc44241e5abcd4c964290778a84a636e30a7b87153bb5c450a7b9e61f488279f28553969eb777deebb6ef22c923929b28f3b2c SHA512 cd1be53da064ad5641de2d4566f36f9733201c92ea68b3d36b416a8f786075d148a9a7f48eb1a67eca3567016f381bbc86c2a4dd6f4e3919befed2ae0bb75196
+EBUILD puppet-5.5.22.ebuild 3753 BLAKE2B 2d11b58b85a6a4a5c0568bb1b016c28fbf9fbc4a1c1b79f49c42698e855a4b59953ce02547ba00e9f17758009eb46d47c1cca130ac24461ab9733b12d44629e0 SHA512 ae360fba14e816e4e1f3ce5900e83a0a488e04933565b87ad69b52d2f24f15d217f06e18e0f341e656044f8fd5bee7de0c55beae45f76962ac4095fd6ff19451
 EBUILD puppet-6.18.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
+EBUILD puppet-6.19.1.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-5.5.22.ebuild b/app-admin/puppet/puppet-5.5.22.ebuild
new file mode 100644
index 000000000000..357fe27c4d21
--- /dev/null
+++ b/app-admin/puppet/puppet-5.5.22.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="https://puppet.com/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/hiera-3.2.1:0
+	=dev-ruby/facter-3*
+	>=dev-ruby/fast_gettext-1.1.2:0
+	>=dev-ruby/locale-2.1:0
+	>=dev-ruby/multi_json-1.10:0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0
+	acct-user/puppet
+	acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# fix systemd path
+	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
+}
diff --git a/app-admin/puppet/puppet-6.19.1.ebuild b/app-admin/puppet/puppet-6.19.1.ebuild
new file mode 100644
index 000000000000..11fd2d3c5085
--- /dev/null
+++ b/app-admin/puppet/puppet-6.19.1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils ruby-fakegem eapi7-ver
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	dev-ruby/concurrent-ruby
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0
+	acct-user/puppet
+	acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+	elog "not already done so."
+	elog
+}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 2916e3f75536..e3a7a9e87069 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,5 +1,7 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
 DIST puppetdb-6.12.0.tar.gz 46375914 BLAKE2B 7d1a884881e9aa324b0d2a8cd49bf47e4014ff6bc23e94c76c27b3736c75f3cdcead76aea159de17ce1255381e32bb126f9cbf55297f64454fcca6ffd7f28b46 SHA512 040f8653c422e312857f82a8f040a33128f49c7900978a22b9ae672172ec41d2037e323de5aad3c50a630058b6b95c025bae05b3ea923e2321e94f97390998dc
+DIST puppetdb-6.13.0.tar.gz 46400373 BLAKE2B 2e3cdd4e7a3e84e11f23031dba3aadf5be885e118938a0a52140e612b4006a0fd4e97f162322c80731b2bfb63dcff2d73d5b2cd0882f7aabcb69fe30aa05151b SHA512 4d16ce44666634e88c538b06f6b2e91cf9786646134a6302a80ea941e3f73168b0f4981cecdb125cac881c0233c835893e9385004461b67e7d8635865f14aee9
 EBUILD puppetdb-6.12.0.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
+EBUILD puppetdb-6.13.0.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.13.0.ebuild b/app-admin/puppetdb/puppetdb-6.13.0.ebuild
new file mode 100644
index 000000000000..784885ac312f
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-6.13.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+="acct-user/puppetdb
+	acct-group/puppetdb"
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 8d8a9e6d7bc2..632305b17342 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,5 +1,7 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-6.13.0.tar.gz 61890579 BLAKE2B be514b3c41dcc018715e949f1f1c86317499baa22fa70e5f7e8df89211b566651ab4de469afadf14fcd1dbc9b1d0b0c21452c313f74052eb8d65bbd591231194 SHA512 ab67ebf94c37a50999a5597e1ceeadf606296c2b6e557bd6ee2bb99ac44b7c8fe8df892f4e3bccb9f0e3822fc480f61a27d6799b7dfc8df12e058c7074d589f9
+DIST puppetserver-6.14.0.tar.gz 61960111 BLAKE2B 760fb2114aef78f1d96d41023f43f162eccd14ee0fa50f8ce4c7954450087dc395d9a9347629a968d99193ba6964b11a2650513c229b48159df67e9f9d63f541 SHA512 5d66b57a0f3c64ff889c33ccf94077a0ab142b84ca17faffaf4b885ba4794a52afb1b227f101eced36655999ac402913363897a3823a387f3c48948d38471c43
 EBUILD puppetserver-6.13.0.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
+EBUILD puppetserver-6.14.0.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
 MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-6.14.0.ebuild b/app-admin/puppetserver/puppetserver-6.14.0.ebuild
new file mode 100644
index 000000000000..5385eacc0c94
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-6.14.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="amd64 x86"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+	acct-group/puppet"
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	dodir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+	insopts -m 0644
+	insinto /usr/lib/tmpfiles.d
+	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index 0d36516a629d..43172061efde 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -1,4 +1,4 @@
 AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
 EBUILD pwgen-2.08.ebuild 603 BLAKE2B 4bc7868765359098329840304c6e818365e85b5b633be37fd05dfe1c0503ca054fdebee7ac70d92070d5ce624f747d3d8857aa6069a22069be61ab8503b0a9b4 SHA512 f57c8b922e6b47ad8406a2be7dd39d4298bd3667f93a51881516ff14bbda3a0d4c4b8759c05e56dedd7843ceaf8cf11feb3c8435c95738ddb2eee5800046470e
-MISC metadata.xml 765 BLAKE2B 133e60da10e57e53ea3013d7615aae83d8d38bf18b8e92c1a081d43524551180e2654233e0a2b2207dd11f31114cd221f33fa5eb4c1486c87ea0bd031c613f2f SHA512 5a6e7e1b7e8fc44e9f39e5d0f349a27360d94778522131c749748690fd6db5278a5a9354242b2030bdfc8db7890e340621a1d939364bd40d3d96b018cc6e443f
+MISC metadata.xml 770 BLAKE2B 7c31186239b8def87453795145d9a04b86e584736503bb02a5a2802bffb514d410c5db3ef7025551a63d7fb4d7dc8a054d5ffe81472be48a2d82fca637b9dd2a SHA512 c1cab2c493bb0df17ad27b77c3f66845ad8a51da548cf6c1f6572a2bda1ba7728c32ad8acb0ef54dc2b84c0d9540efd109e0e74fa48d87b3d0f2a3bc09a0d9ee
diff --git a/app-admin/pwgen/metadata.xml b/app-admin/pwgen/metadata.xml
index 22f8ea147c80..82573aaa4a7d 100644
--- a/app-admin/pwgen/metadata.xml
+++ b/app-admin/pwgen/metadata.xml
@@ -10,8 +10,8 @@
 		<name>Jason Zaman</name>
 	</maintainer>
 	<maintainer type="project">
-		<email>livecd@gentoo.org</email>
-		<name>Gentoo LiveCD Project</name>
+		<email>releng@gentoo.org</email>
+		<name>Gentoo Release Engineering</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index a050303fa349..8519494f33b6 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,3 +1,3 @@
-DIST r10k-3.4.1.gem 210944 BLAKE2B 7e4df4786a332264738f3483b9f2e14739cde2a9c1cf33788692ecf6f783b956856cefeb603f3d29338104bc9a89b0a6773e922189a412e01131cf7c77b58823 SHA512 b8d214cd6b6bc9ce00b9de22c706213be4c480cdf293b4fb47c0ff0e0dafcb3e16fe2b1ceb8d3abd22810630c4163919ded80ff697dff728b165821de61502f8
-EBUILD r10k-3.4.1.ebuild 914 BLAKE2B b2df4ff18feb0f68ab6be748a223b0a4e0380d5705bc0417b8a41ff460a8461594036d0a2a2930f26373eba200ebb185be3db66d71dfca323fe9abdf98f7f739 SHA512 39a8f6aba1f05d293ba913e5cbfc35a81d8b30175f5cc06f7c6ee7928ef00b007c2380bacc1fb35fa855b297499b48af3ace7ff1a4c00e2870be5625717f780b
+DIST r10k-3.7.0.gem 217600 BLAKE2B 03af5829d027cf4e84c6a04a3977a4fe97c030c1668f6b77792553fbb23265684232215b4fad1b48282bf55fcc14afe65906ca745722bf14436d27a294b47cc6 SHA512 31d96b69db34e79439a25b83bae73011b81b0e2eb412f944fc68ef4d087f4715ba30e3821c2a12b79fadf01b95a6922bc7cb5c0ed1c3f6ae8e29785d180925ad
+EBUILD r10k-3.7.0-r2.ebuild 1089 BLAKE2B 901a5b11a1fbe624686de01eb2378425c62c298792fa79c66526c63be22f45171e1e3953a3059bbd69a386688202b913f554e036740b22a1bbf81fd2420abdf6 SHA512 c509c0c1fc108f4a702e4386917389c4d0f6b8e82d5911e8bbf1a927681f312f1caec1acaaffbc631b7e1fbafce337c2930d4ce26c9f37c2417f9c4962b89c7e
 MISC metadata.xml 582 BLAKE2B e3b514385b7b851b3ce037de51024108005224c75fba470db28fe6e4d6b3632ace21a8e829198e0b22d1ba0e76b1a5c01df10426ea497ec3b00e20e578608d2d SHA512 fb8913a9f806ac0b2035dc788ee78536fff96ffb635454f668d7836d8ba849fea158e628da12743c1844b658961866b3d64e8faf700c7e373065045175785536
diff --git a/app-admin/r10k/r10k-3.4.1.ebuild b/app-admin/r10k/r10k-3.7.0-r2.ebuild
index ab8b11160cc8..0d4f8948a754 100644
--- a/app-admin/r10k/r10k-3.4.1.ebuild
+++ b/app-admin/r10k/r10k-3.7.0-r2.ebuild
@@ -9,6 +9,7 @@ RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL=locales
 
 inherit ruby-fakegem
 
@@ -21,9 +22,11 @@ KEYWORDS="~amd64"
 IUSE="+git"
 
 ruby_add_rdepend "
-	~dev-ruby/colored-1.2
+	~dev-ruby/colored2-3.1.2
 	>=dev-ruby/cri-2.15.10:0
 	>=dev-ruby/gettext-setup-0.24:0
+	>=dev-ruby/fast_gettext-1.1:0
+	>=dev-ruby/ruby-gettext-3.0.2:0
 	~dev-ruby/log4r-1.1.10
 	>=dev-ruby/multi_json-1.10:0
 	=dev-ruby/puppet_forge-2.3*
@@ -36,7 +39,10 @@ ruby_add_bdepend "test? (
 RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
 
 all_ruby_prepare() {
-	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -e '/s.files/d' \
+		-e '/fast_gettext/ s/1.1.0/1.1/' \
+		-e "/gettext/ s/'< 3.3.0'//" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	# Avoid specs for unpackaged rugget git provider
 	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
diff --git a/app-admin/radmind/Manifest b/app-admin/radmind/Manifest
index d786c001f1a3..937d9e3a3274 100644
--- a/app-admin/radmind/Manifest
+++ b/app-admin/radmind/Manifest
@@ -1,5 +1,5 @@
 AUX radmind-1.14.1-glibc225.patch 709 BLAKE2B 48890c31f0b2f4a8945f8cbf9c02cf842744949be10355f3f2b6aee0f56bfe9847b7293524151c72a5ed93e1fa1ca1957261c8b7d000668e4d10fed8bd5154b8 SHA512 faba25648305e3c5374f37037cf61f22bc2e6d1a3f40395e988f00f6c2335cd22fe962d0a9a6ae3ccfd879afb05965916f8f333fb677e89e7b7080f5c977a3b0
 AUX radmind-1.7.0-gentoo.patch 850 BLAKE2B 3ad977b414913caa868e6bb967f73fb0920c2a59fe91f22617f27aec89a7750e0b3b67cf8eaa383d3b3a5326f1033346b507ec46bfdb48fafda0a1551da549e5 SHA512 9eb98ce293fa9c1dae22ec596353deae2e9262427ead062890ef7848fb5fdff1e061b4bacef681465eee2b17d06c371b01c12e547538e0b9385ebfffb9b46a72
 DIST radmind-1.15.1.tar.gz 449653 BLAKE2B 8a516ede28d561a60f7c51424c6e48ea030dd571528fd3422fab3b23b4448ee898d408136c4845ebe9c5f9088fb425ed67b341f4d1721747a415183687e6daa6 SHA512 3dd9477d00083cf9912e2143adff52f9bc127665ff6705bc200b7323e53390fb76ac125733596ba309905fca3db062c7b1bc1d1372b77a3044c3794bacb96e6c
-EBUILD radmind-1.15.1.ebuild 729 BLAKE2B 59e1e182c895135aee7ab58c129b1a493ec75a1a910080a95c834f60424a2d740afb5c80f7b4fc9a30e5766472581d272323b3873a780bf308a8fa9c226d8460 SHA512 0323b67915a069a79e716a4a147e72abe76e652ff58aec1a9b683e243c9645ddc41ee781961b603e83c2a81dbbf29fe15e7368eb41f6c38631b506dba8dec133
+EBUILD radmind-1.15.1.ebuild 805 BLAKE2B 031c240289284afe3fb43b771e8aaf2c97a6ae4d877744920f7049abb5ffc59cc11eeedc5195b497fcc410e5b46bb860d52c45d4533adfbabc7ef305a252be06 SHA512 07e7321e62b14200c44e4191406de5b8373f9afb8bc0ca4dd2c1974c18b22a64b0a280c6a9b83a2282b20cdf5173ffcc7c407160c7428bae605b22bb74fba8a6
 MISC metadata.xml 404 BLAKE2B 365cee5ab102123ebee500dc96ba31bc9b47b9e415c1a6b5f682adc011d62f460a09174888f444ecdd6136b86843a55aa64ab15dd9e7af00ffa628099b87b261 SHA512 cac73072027c59e6e34a3eee8cb602d72601306e5f1d8d4b4214d12b900320f0f7cc7f4a8f0a6590e2f6286799d0f96d3edf5c14d85b4f586ae9ad1293138577
diff --git a/app-admin/radmind/radmind-1.15.1.ebuild b/app-admin/radmind/radmind-1.15.1.ebuild
index 3d2decf2a3d7..96807f42abc2 100644
--- a/app-admin/radmind/radmind-1.15.1.ebuild
+++ b/app-admin/radmind/radmind-1.15.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit flag-o-matic
+
 DESCRIPTION="Command-line tools and server to remotely administer multiple Unix filesystems"
 HOMEPAGE="https://github.com/Radmind https://sourceforge.net/projects/radmind/"
 SRC_URI="https://github.com/voretaq7/radmind/releases/download/${P}/${P}.tar.gz"
@@ -25,6 +27,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.14.1-glibc225.patch
 )
 
+src_configure() {
+	append-cflags -fcommon
+	default
+}
+
 src_install() {
 	default
 	keepdir /var/radmind/{cert,client,postapply,preapply}
diff --git a/app-admin/recursos/Manifest b/app-admin/recursos/Manifest
deleted file mode 100644
index c1e47f92feb7..000000000000
--- a/app-admin/recursos/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST recursos-2.0.tbz2 29480 BLAKE2B d7b5a4954349d6e2c940634057d4f47623ba91c62874ec4fac881060fe4687ecc606672d478717d06967f66d4cd0b65baf49fccd17984eb030b0b37eaf6a6a4f SHA512 391bd253b62cbc2afbf054baa368bef5f7847624889188829557244f132bf484d4d4652a8c524da95ae3b39909fbdc37796eb325839bcd5e8982f7dcb6cd89e4
-EBUILD recursos-2.0-r1.ebuild 1345 BLAKE2B 0587497ecbb7b4ebd3aaad19963312ac31d7a13b47bf807e6915c4278f7409e6132d4dbd2444f9386272f32597d69fd49a2d30d3791f89128d2ce46d0a3cde3f SHA512 e888a9380a30d0233e5462409e150e5ef6e8ffe82f08c3c0bd5e1ae87dfabf44a32fa9171d7d5b80e524d4a2237f0587864a82ac5d68094cfc4376503e01788e
-MISC metadata.xml 343 BLAKE2B 271d06ca6fc2950630d47ed10426768fb786a16a97d81fabc08733ee8dea9b9323700cb0997f3b118d13589b89fb901b444bfd8c128f07c418a36df3322c7ea3 SHA512 c22fa6dbdbf662e83e78a9aba6a66c72e4649cb11bf0261aaef8f068e14db18b96546a7271fbab3e5ed7caf3fbde6eba2a91affa44141e26e4c7546ba37d1635
diff --git a/app-admin/recursos/metadata.xml b/app-admin/recursos/metadata.xml
deleted file mode 100644
index 06396fb885b9..000000000000
--- a/app-admin/recursos/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		A set of script to extrac usefull info about your system and report it
-		in plain text or html. It can generate Grpahs using rrdtools.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-admin/recursos/recursos-2.0-r1.ebuild b/app-admin/recursos/recursos-2.0-r1.ebuild
deleted file mode 100644
index 7da26bdf3a76..000000000000
--- a/app-admin/recursos/recursos-2.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Script to create html and text report about your system"
-HOMEPAGE="http://www.josealberto.org"
-SRC_URI="mirror://gentoo/${P}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash
-	net-analyzer/rrdtool[graph]
-	virtual/imagemagick-tools"
-
-S=${WORKDIR}/r2
-
-src_install() {
-	WWWDIR="/var/www/localhost/htdocs/R2"
-
-	insinto /etc
-	doins recursos2.conf
-
-	dobin R2createrrd.sh R2generarrd.sh R2updaterrd.sh Recursos2.sh
-
-	dodir ${WWWDIR}
-	insinto ${WWWDIR}
-	doins R2/*.html
-
-	dodir ${WWWDIR}/common
-	insinto ${WWWDIR}/common
-	doins R2/common/*
-
-	dodir ${WWWDIR}/rrd/mini
-}
-
-pkg_postinst() {
-	elog "Fist you must configure /etc/recursos2.conf"
-	elog "Then follow these steps:"
-	elog
-	elog "1. Run R2createrrd.sh"
-	elog
-	elog "2. Add crontab jobs (this is an example):"
-	elog "*/2 * * * *     root    /usr/bin/R2updaterrd.sh"
-	elog "*/5 * * * *     root    /usr/bin/R2generarrd.sh"
-	elog "*/10 * * * *    root    /usr/bin/Recursos2.sh \ "
-	elog "    title general system disks net \ "
-	elog "    > /var/www/localhost/htdocs/recursos.html"
-	elog
-	elog "You can use Recursos2.sh to extract info about your system"
-	elog "in html or plain text and mail the file or whatever."
-	elog
-}
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index 86588a3c666b..85147b219752 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -1,5 +1,9 @@
 DIST restart-services-0.15.2.tgz 23688 BLAKE2B e043b872d55109ad176a6437006cf581a993e72e460bb034625ed612f9ceca85ef91a20e90f23bcecc964caa527cfa4bc39d97c52487b7bf92eec21dc2e35c48 SHA512 afe7c96aabf61d664460d5d68447df09b3d9a54098887727db796821220f5ddd5a3b5030d995d5a6c3128e4a2b8494b9a0a3b86b5c805d56c0e201058ad04327
 DIST restart-services-0.16.0.tgz 24531 BLAKE2B fea233755d214a502096551226078a7fe15a75ccf937bbf8a75c78b7a294b5977da453f54f37e3d7e65f131e49e018bf08bec6245a3aa46ec6c3bec94019f5ad SHA512 57b3514132c02839cafbfd9152445a6482cf3591e22d18436a4d894061b59d2495863a912a87495559e9945a39715e7e798dca44dafd52c26b5412d749f37cc2
+DIST restart-services-0.16.1.tgz 24569 BLAKE2B 210ffebf321d9524ee3176ac8d56e2579c9e1686bd11d484be02600aab70347c522d5e7f8826b103ebd37f3e21c11130e0717f033ac0af3e938c4cece1a036bb SHA512 d4657120860ec26a2d9e6cdd935d720dac2bff50131fc9e8efd69b4768a5fd9afa4ee24b367a002122f3e1b335e9c99cc6b41c801c0285252e6f5e701d027de1
+DIST restart-services-0.17.0.tgz 25643 BLAKE2B 5999e12e38207d00266928504da05c00482c8297b7fee634f302f09cfa09e206bcf9d5a558d2a91e5de1d97318025fa995fbc3a61f0d0e74b8dfb1af3db8670b SHA512 c11ca431fbbc6899ab268e8979049144448479d953ed7373cc7483cca2c03cd4041a1ca1e47c0e810f91a18a43aa32cc305a4ea791e8b992246f972e0fbb19ab
 EBUILD restart-services-0.15.2.ebuild 1791 BLAKE2B dd068050b6902dae67edf63b00afc64e65b53225d14e7a201da6cee76dbed62af643625a7ed10a4021481f4e3a0a31f8534972ba6132cd468262af73947042c2 SHA512 74dc54132343203ab53b13d1649bd9e4b3a28d31040e5c54f32707b94267cb0d29873d48e3a3e00d70a7763a6f57d841518602c405599f575e359b5fa9f1e999
 EBUILD restart-services-0.16.0.ebuild 1793 BLAKE2B 7cba407e822b45ea90c5cc88ad767d232d4195f5e4b8d217237833f36679081ab7bf367d96d406e02adad4722a23d8826ee958bf6af70248e5d8156fd9951b66 SHA512 d958bd1e77eb7b68d89a55e34716d0f4f4dd2b1af407a3449d8d859484770747bd05ad9668c5e1ecc32636d8e63c692480a9d4316b8f8e5d25caa3740d1ec109
+EBUILD restart-services-0.16.1.ebuild 1793 BLAKE2B 7cba407e822b45ea90c5cc88ad767d232d4195f5e4b8d217237833f36679081ab7bf367d96d406e02adad4722a23d8826ee958bf6af70248e5d8156fd9951b66 SHA512 d958bd1e77eb7b68d89a55e34716d0f4f4dd2b1af407a3449d8d859484770747bd05ad9668c5e1ecc32636d8e63c692480a9d4316b8f8e5d25caa3740d1ec109
+EBUILD restart-services-0.17.0.ebuild 1829 BLAKE2B a692552031775ff91d9f721ee8649ff9dd106cee766d909f638ed20e3b8baa77074f7f99423b7fbc7593c27cf822f87ce1d29f780c21f2c7083744c718ddf8a0 SHA512 0f251462164af0b305b7c4d7aa97f2482891b63d3231f19d9eee948d632c8cc5cd94efdd17ed05404ef8f7072ff2c4690a2dda1549aa24be99f53ce533b67a45
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/app-admin/restart-services/restart-services-0.16.1.ebuild b/app-admin/restart-services/restart-services-0.16.1.ebuild
new file mode 100644
index 000000000000..874ac8f35520
--- /dev/null
+++ b/app-admin/restart-services/restart-services-0.16.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tool to manage OpenRC services that need to be restarted"
+HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/"
+SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-admin/lib_users
+	sys-apps/openrc
+	app-portage/portage-utils
+"
+
+src_install() {
+	dosbin restart-services
+	doman restart-services.1
+	keepdir /etc/restart-services.d
+	insinto /etc
+	doins restart-services.conf
+	dodoc README CHANGES
+
+	sed -i 's/^#include/include/' "${D}"/etc/restart-services.conf
+	cat>"${D}"/etc/restart-services.d/00-local.conf<<-EOF
+	# You may put your local changes here or in any other *.conf file
+	# in this directory so you can leave /etc/restart-services.conf as is.
+	# Example:
+	# *extend* SV_ALWAYS to match 'myservice'
+	# SV_ALWAYS+=( myservice )
+	EOF
+}
+
+pkg_postinst() {
+	local MAJOR MINOR
+	# migrate config data for versions < 0.13.2
+	if [[ $REPLACING_VERSIONS ]]; then
+		MAJOR=${REPLACING_VERSIONS%%.*}
+		MINOR=${REPLACING_VERSIONS%.*}
+		MINOR=${MINOR#*.}
+
+		if [[ $MAJOR -eq 0 && $MINOR -lt 14 ]]; then
+			einfo "Checking for old config"
+			if [[ -f /etc/restart_services.conf ]]; then
+				ewarn "Old config file found: /etc/restart_services.conf"
+				ewarn "It will be ignored so please migrate settings to a file in"
+				ewarn "/etc/restart-services.d/ and/or remove /etc/restart_services.conf"
+			fi
+			if [[ -d /etc/restart_services.d ]]; then
+				ewarn "Old config directory found: /etc/restart_services.d"
+				ewarn "It will be ignored so please migrate files to /etc/restart-services.d"
+				ewarn "and/or remove /etc/restart_services.d"
+			fi
+			einfo "done"
+		fi
+	fi
+}
diff --git a/app-admin/restart-services/restart-services-0.17.0.ebuild b/app-admin/restart-services/restart-services-0.17.0.ebuild
new file mode 100644
index 000000000000..8ea339b4acfe
--- /dev/null
+++ b/app-admin/restart-services/restart-services-0.17.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tool to manage OpenRC and systemd services that need to be restarted"
+HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/"
+SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-admin/lib_users
+	|| ( sys-apps/openrc sys-apps/systemd )
+	app-portage/portage-utils
+"
+
+src_install() {
+	dosbin restart-services
+	doman restart-services.1
+	keepdir /etc/restart-services.d
+	insinto /etc
+	doins restart-services.conf
+	dodoc README CHANGES
+
+	sed -i 's/^#include/include/' "${D}"/etc/restart-services.conf
+	cat>"${D}"/etc/restart-services.d/00-local.conf<<-EOF
+	# You may put your local changes here or in any other *.conf file
+	# in this directory so you can leave /etc/restart-services.conf as is.
+	# Example:
+	# *extend* SV_ALWAYS to match 'myservice'
+	# SV_ALWAYS+=( myservice )
+	EOF
+}
+
+pkg_postinst() {
+	local MAJOR MINOR
+	# migrate config data for versions < 0.13.2
+	if [[ $REPLACING_VERSIONS ]]; then
+		MAJOR=${REPLACING_VERSIONS%%.*}
+		MINOR=${REPLACING_VERSIONS%.*}
+		MINOR=${MINOR#*.}
+
+		if [[ $MAJOR -eq 0 && $MINOR -lt 14 ]]; then
+			einfo "Checking for old config"
+			if [[ -f /etc/restart_services.conf ]]; then
+				ewarn "Old config file found: /etc/restart_services.conf"
+				ewarn "It will be ignored so please migrate settings to a file in"
+				ewarn "/etc/restart-services.d/ and/or remove /etc/restart_services.conf"
+			fi
+			if [[ -d /etc/restart_services.d ]]; then
+				ewarn "Old config directory found: /etc/restart_services.d"
+				ewarn "It will be ignored so please migrate files to /etc/restart-services.d"
+				ewarn "and/or remove /etc/restart_services.d"
+			fi
+			einfo "done"
+		fi
+	fi
+}
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index bd9fad330746..a5fd75843032 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -1,6 +1,6 @@
-DIST Rex-1.12.1.tar.gz 339065 BLAKE2B fd026e66a4e1cf6d4c8b15f7fcba0525a3e98346464170f27d5ef7bb54f1decd7450d87d9f23bee8378df4647eacf512c06a8d051bb76021cbcae472e2c2012d SHA512 774452511d97106bb6586324ff4e8642b05be628c80f3adbba7fd82558c82236878e969512bab398e26a1a7a271a7614108761bd0fb888a2122167806796bad1
-DIST Rex-1.12.2.tar.gz 343716 BLAKE2B bb546298305e2e210ea67a21c948f364d3c0ee5947c8d716606fc81cfd07c4b1eea9e6ce8fd3fd49a0cffd33a964e0d328f60d570fa18fa3452b334a7882b279 SHA512 867942eec63ba71b591b93d6c0af794605f86571ef6d1be473989314cb7fc7d4e8d906ef25e30ea56beeaefe953c884661d9b769452587a3d4892de10163b6c7
-EBUILD rex-1.12.1.ebuild 5372 BLAKE2B 2513d45fb2417fceeea5827fb68cfd69e3148105a488c3f0787179300855ff061e08d497772d55cbbdf1e0d5ad8ef4e1b79ed6feb7faf06b51972a5b9b3cfc8f SHA512 550ec06456643c3f784d29e5aedcb8d4a2903fcd6af76b48f5a1a34758dcb1f2a87284945a0b02eb06b8dbbd2ff2d9ca8043484dd4b7f6333cb27690b2885046
-EBUILD rex-1.12.2.ebuild 5560 BLAKE2B 42d1fcd35a8d980cd0e8c7353f106301dd844d28871a8558f9b785463822a26d53263211b5757385c483a4ffc9bbd8ea65bdd0b584501766f967cd3c4b46a09b SHA512 15516145dfab507ded82ad6e31392c5e61fba04857507ef6b4793948281ddf83e0ad5615d058960123bca7f01bab5d86514cffb99acac44f806077a5613c78c4
-EBUILD rex-9999.ebuild 5560 BLAKE2B 42d1fcd35a8d980cd0e8c7353f106301dd844d28871a8558f9b785463822a26d53263211b5757385c483a4ffc9bbd8ea65bdd0b584501766f967cd3c4b46a09b SHA512 15516145dfab507ded82ad6e31392c5e61fba04857507ef6b4793948281ddf83e0ad5615d058960123bca7f01bab5d86514cffb99acac44f806077a5613c78c4
-MISC metadata.xml 24205 BLAKE2B 76aa5370179f64adaaf79cb730a4cc53deb191a27e97b10cbb26efd804572eb79d67d9abdb09c5e62d08d73d969848286516a2176099237feba2a5c855cd263d SHA512 a6cae05b4f46b10502da5acc2905f622b61a30329c300483cea39348e92d182d190dd61433c551a1948d4ac6a281b9f91c47b759f425055970e8c5a6349b8693
+DIST Rex-1.13.0.tar.gz 344412 BLAKE2B 220e3dff378bdf5c607f2be94952a68f4c3e72ab362518566e16be55a837cef64f12af8f487e1f26bec04e3b5b4781d1d8eecc6aa347a666c2eb616595371919 SHA512 9e717decbe27a630e83c8194418783cb38c63fedb7f8c4a437395ebc3db21a45cc2057bcb6b2bc689255ab8f579908ad7158031e3a019886634fae3f6e6fb511
+DIST Rex-1.13.1.tar.gz 347483 BLAKE2B bab66dffa3e0c0ae6b54bb8a76adfff0858797370389d5329169e5a7a2e6091a5d866feae14c5764b9d87bf920ff9ee5951cc69be4311c9c362e49f58f24659f SHA512 d68bf98e83a04a28d904db683e3cc0984f019ffc6be589f261b4bc44300b753c03e751b87936d9d831bf6456bdcff916cc2a84c0a1a6c11e20c47bf2533575fc
+EBUILD rex-1.13.0.ebuild 5603 BLAKE2B 0bdaeba2e9c23198835992dae76ae5064ca2d0d83ddf481f408940116011526e375c4920079ac7e53f10e902df1f23895cf8f515baebc81822531919fdccc2d3 SHA512 c9923b0ca7a82452d4ab0c03a7adece5f10530b3a0987027fc6d2ebecda9d41d688ebdc8986ee97491e79eea2108f0e7c28097a178dc137bc4bdcb1ec454a882
+EBUILD rex-1.13.1.ebuild 5612 BLAKE2B ccad3f5764782e88973c8af6d550ba6b5a6db2d9bb6dc41f29586dc25a9c79fe54bfa2165415254857f5777481e85d61fc17793671fcf77a03a6efde607e0435 SHA512 d35cf84e0c9daddc735a3b601f095579cf3b5ff78813467fb220ec2dcd1774bb0b931bea0db2dd594da625f66f79d070cd5b76336423fac4d2187d33272330a4
+EBUILD rex-9999.ebuild 6371 BLAKE2B 7f7ef17335afed00083c0af58cf8cf78d1329cd0fe500615b665a45b921324a32384f82c7c60e3080964da99d8d074fa62f2f54c1cb65ddf2b32bc6aefddab3b SHA512 726f0d3b7299a0061272f55c237482b031cd54b5c018ac77fa5094de6ddd5071ef14a38046056dbd77431ca61f7027b48707458c6b73fe54b1b47b5843ecca8b
+MISC metadata.xml 24088 BLAKE2B d2e5585dba575134baf0dea274a0e351c6cdede45df9bad91ba57b3dc93435bddcd04c5cc0267e1f6ae84ba2c8a9d87f4d1883b1e4930fe69616228682a183db SHA512 bbdaafa209da031a836ea1ee2bfe7c8df0cdc76d49c745e36e03d6edc71e557d7fb8b4ef4b5ee6710039adca93182f183d16dd977d61c6c876e1da44536346c7
diff --git a/app-admin/rex/metadata.xml b/app-admin/rex/metadata.xml
index a1b89deccc29..ca2406f144a2 100644
--- a/app-admin/rex/metadata.xml
+++ b/app-admin/rex/metadata.xml
@@ -13,10 +13,6 @@
 		<email>kentnl@gentoo.org</email>
 		<name>Kent Fredric</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">RexOps/Rex</remote-id>
 		<remote-id type="cpan">Rex</remote-id>
diff --git a/app-admin/rex/rex-1.12.2.ebuild b/app-admin/rex/rex-1.13.0.ebuild
index d832e4f2b87a..b8623b485c3c 100644
--- a/app-admin/rex/rex-1.12.2.ebuild
+++ b/app-admin/rex/rex-1.13.0.ebuild
@@ -121,8 +121,9 @@ dzil_src_prep() {
 	# so that the final [d]elete deletes the next line too. Can be expanded for each
 	# line, ie: {N;N;N;d} deletes 3 lines after the match as well as the match.
 	sed -e '/^\[Test::Kwalitee\]/d' \
-		-e '/^\[Test::Perl::Critic\]/d' \
 		-e '/^\[PodSyntaxTests\]/d' \
+		-e '/^Perl::Critic::Freenode =/d' \
+		-e '/^Perl::Critic::TooMuchCode =/d' \
 		-e '/^Test::Kwalitee =/d' \
 		-e '/^Test::PerlTidy =/d' \
 		-e '/^Test::Pod =/d' \
diff --git a/app-admin/rex/rex-1.12.1.ebuild b/app-admin/rex/rex-1.13.1.ebuild
index d8e8649d2bd7..6a9496d529c0 100644
--- a/app-admin/rex/rex-1.12.1.ebuild
+++ b/app-admin/rex/rex-1.13.1.ebuild
@@ -23,13 +23,14 @@ inherit bash-completion-r1 perl-module ${VCS_ECLASS}
 DESCRIPTION="(R)?ex, the friendly automation framework"
 
 SLOT="0"
-IUSE="test"
+IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
 DZIL_DEPENDS="
 	dev-perl/Dist-Zilla
 	dev-perl/Dist-Zilla-Plugin-CheckExtraTests
 	dev-perl/Dist-Zilla-Plugin-ContributorsFile
+	dev-perl/Dist-Zilla-Plugin-Git
 	dev-perl/Dist-Zilla-Plugin-Git-Contributors
 	dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome
 	dev-perl/Dist-Zilla-Plugin-Meta-Contributors
@@ -41,14 +42,18 @@ DZIL_DEPENDS="
 	dev-perl/Software-License
 "
 RDEPEND="
+	!minimal? (
+		dev-perl/DBI
+		dev-perl/Expect
+		dev-perl/IPC-Shareable
+		dev-perl/XML-LibXML
+	)
 	virtual/perl-Carp
 	virtual/perl-Data-Dumper
 	dev-perl/Data-Validate-IP
-	dev-perl/DBI
 	dev-perl/Devel-Caller
 	dev-perl/Digest-HMAC
 	virtual/perl-Digest-MD5
-	dev-perl/Expect
 	virtual/perl-Exporter
 	virtual/perl-File-Spec
 	dev-perl/HTTP-Message
@@ -56,9 +61,7 @@ RDEPEND="
 	virtual/perl-IO
 	dev-perl/IO-String
 	dev-perl/IO-Tty
-	dev-perl/IPC-Shareable
 	dev-perl/JSON-MaybeXS
-	dev-perl/List-MoreUtils
 	virtual/perl-MIME-Base64
 	dev-perl/Net-OpenSSH
 	dev-perl/Net-SFTP-Foreign
@@ -73,7 +76,6 @@ RDEPEND="
 	virtual/perl-Text-Tabs+Wrap
 	virtual/perl-Time-HiRes
 	dev-perl/URI
-	dev-perl/XML-LibXML
 	dev-perl/XML-Simple
 	dev-perl/libwww-perl
 	dev-perl/YAML
@@ -82,12 +84,15 @@ RDEPEND="
 
 BDEPEND="
 	${RDEPEND}
+	>=virtual/perl-CPAN-Meta-Requirements-2.120.620
 	>=virtual/perl-ExtUtils-MakeMaker-7.110.100
 	>=dev-perl/File-ShareDir-Install-0.60.0
+	virtual/perl-Module-Metadata
 	test? (
 		virtual/perl-File-Temp
 		dev-perl/Test-Deep
-		>=dev-perl/Test-UseAllModules-0.150.0
+		dev-perl/Test-Output
+		dev-perl/Test-UseAllModules
 		virtual/perl-autodie
 	)
 "
@@ -115,18 +120,20 @@ dzil_src_prep() {
 	# so that the final [d]elete deletes the next line too. Can be expanded for each
 	# line, ie: {N;N;N;d} deletes 3 lines after the match as well as the match.
 	sed -e '/^\[Test::Kwalitee\]/d' \
-		-e '/^\[Test::Perl::Critic\]/d' \
 		-e '/^\[PodSyntaxTests\]/d' \
+		-e '/^Perl::Critic::Freenode =/d' \
+		-e '/^Perl::Critic::TooMuchCode =/d' \
 		-e '/^Test::Kwalitee =/d' \
 		-e '/^Test::PerlTidy =/d' \
 		-e '/^Test::Pod =/d' \
 		-e '/^\[Test::CPAN::Changes\]/{N;d}' \
+		-e '/^\[OptionalFeature/,/^$/d' \
 		-e '/^\[Test::MinimumVersion\]/{N;d}' \
 		-i dist.ini || die "Can't patch dist.ini"
 }
 dzil_env_setup() {
 	# NextRelease noise :(
-	mkdir -p ~/.dzil/
+	mkdir -p ~/.dzil/ || die "mkdir -p ~/.dzil/ failed"
 	local user="$(whoami)"
 	local host="$(hostname)"
 	printf '[%%User]\nname = %s\nemail = %s' "${user}" "${user}@${host}" >> ~/.dzil/config.ini
diff --git a/app-admin/rex/rex-9999.ebuild b/app-admin/rex/rex-9999.ebuild
index d832e4f2b87a..6942c13d2e55 100644
--- a/app-admin/rex/rex-9999.ebuild
+++ b/app-admin/rex/rex-9999.ebuild
@@ -62,11 +62,10 @@ RDEPEND="
 	dev-perl/IO-String
 	dev-perl/IO-Tty
 	dev-perl/JSON-MaybeXS
-	dev-perl/List-MoreUtils
 	virtual/perl-MIME-Base64
 	dev-perl/Net-OpenSSH
 	dev-perl/Net-SFTP-Foreign
-	virtual/perl-Scalar-List-Utils
+	>=virtual/perl-Scalar-List-Utils-1.450.0
 	dev-perl/Parallel-ForkManager
 	dev-perl/Sort-Naturally
 	dev-perl/String-Escape
@@ -82,7 +81,7 @@ RDEPEND="
 	dev-perl/YAML
 	virtual/perl-version
 "
-
+# NB: would add test? !minimal? Test-mysqld, but I can't get that to work
 BDEPEND="
 	${RDEPEND}
 	>=virtual/perl-CPAN-Meta-Requirements-2.120.620
@@ -90,6 +89,9 @@ BDEPEND="
 	>=dev-perl/File-ShareDir-Install-0.60.0
 	virtual/perl-Module-Metadata
 	test? (
+		!minimal? (
+			dev-perl/File-LibMagic
+		)
 		virtual/perl-File-Temp
 		dev-perl/Test-Deep
 		dev-perl/Test-Output
@@ -121,8 +123,9 @@ dzil_src_prep() {
 	# so that the final [d]elete deletes the next line too. Can be expanded for each
 	# line, ie: {N;N;N;d} deletes 3 lines after the match as well as the match.
 	sed -e '/^\[Test::Kwalitee\]/d' \
-		-e '/^\[Test::Perl::Critic\]/d' \
 		-e '/^\[PodSyntaxTests\]/d' \
+		-e '/^Perl::Critic::Freenode =/d' \
+		-e '/^Perl::Critic::TooMuchCode =/d' \
 		-e '/^Test::Kwalitee =/d' \
 		-e '/^Test::PerlTidy =/d' \
 		-e '/^Test::Pod =/d' \
@@ -130,10 +133,16 @@ dzil_src_prep() {
 		-e '/^\[OptionalFeature/,/^$/d' \
 		-e '/^\[Test::MinimumVersion\]/{N;d}' \
 		-i dist.ini || die "Can't patch dist.ini"
+
+	# Removals/additons have to be tracked by git or dzil build fails
+	# Spurious warning during src_prepare
+	git rm -f xt/author/critic-progressive.t || die "Can't rm author/critic-progressive.t"
+	# Spurious warning during src_prepare
+	git rm -f xt/author/perltidy.t || die "Can't rm author/perltidy.t"
 }
 dzil_env_setup() {
 	# NextRelease noise :(
-	mkdir -p ~/.dzil/
+	mkdir -p ~/.dzil/ || die "mkdir -p ~/.dzil/ failed"
 	local user="$(whoami)"
 	local host="$(hostname)"
 	printf '[%%User]\nname = %s\nemail = %s' "${user}" "${user}@${host}" >> ~/.dzil/config.ini
@@ -146,7 +155,7 @@ dzil_to_distdir() {
 
 	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
 
-	dzil_src_prep
+	S="${dzil_root}" dzil_src_prep
 	dzil_env_setup
 
 	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
@@ -190,6 +199,13 @@ src_prepare() {
 		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
 	fi
 	cd "${S}" || die "Can't enter build dir"
+
+	# If you DIY installed Test::mysqld, but didn't patch
+	# it to handle the fact on Gentoo, mysql_install_db is NOT in PATH
+	# tests fail. So this test is patched out if mysql_install_db is not in PATH
+	if perl_has_module "Test::mysqld" && ! type -P mysql_install_db >/dev/null; then
+		perl_rm_files "t/db.t"
+	fi
 	perl-module_src_prepare
 }
 
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 1f3d3602608b..2c90128f597d 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -8,10 +8,13 @@ AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b
 DIST rsyslog-8.2004.0.tar.gz 3002704 BLAKE2B b5049448e0d09e048a45f067b5f8de453721ac5d63233f251e6e24fe2a722469cb19a91e83aa405ffc21245942b824e0a28ecd4e6df431517c8775e7a322bcd3 SHA512 1d7fac65cc97975a6765a55732d413e892502e53566c6fb7c1bfc0107b173eae77dd04c0c9a7471296dff998ceb2fd5a2374368a5a8528f8eb0a89d1915b0214
 DIST rsyslog-8.2006.0.tar.gz 3047140 BLAKE2B 00599341ae579b4d56388c27dd0f2b61dd8b335cfcbc130607d11f692b8b9943b36b377d0aeaed36966960dcd095cc22d03f6ebb4afb69abfac3011d58653f25 SHA512 576a2cfa21e89352de2750f0832bd84348822cc84ce67e1b51bf6a162414bdc7f5ac8320c503454789a576172060efc734c26fa305a7ce849c2ebb95dfb85a09
 DIST rsyslog-8.2008.0.tar.gz 3051049 BLAKE2B abf9b7ec81cf62841c448f22c7aff45bc85ea6cdc7552e74295aac752c86380039bb28836e78e35e6eba3d0a062a0ae99ea22ba3d6e978175411a43ec9af6f9a SHA512 a077832de7076ac5e7d4c8f33edd044d0c18fd171a697ef68c1cd0f81f1938b3f008cddc1a61084181de512b643c15004744f0e79e6a44e9d239cec3d35f74fe
+DIST rsyslog-8.2010.0.tar.gz 3097606 BLAKE2B 06bfd54edc2126567ff9a460c272583d388a16a4db6f56603c8b9d2dd54bf4fe3b3b402eb4a9523b68e9d3a7602759fad57b35351d7cadab0b7f02771db5c40c SHA512 e3c8ed6b631053e38abfe8ce183a1544d04a0207dc988d36f5141a7ea8c987915f4c0429ccd094b7e374c277b7ee5b50e65e7205c156af01ffe9bdf8338831c8
 DIST rsyslog-doc-8.2004.0.tar.gz 8323570 BLAKE2B 76b6acc7614f1cbe0a4f99a2a27ff44e2706d1a570afb7d92c628154d49bde5b00a7a4ae1c7d9639f67270f3080a6637cbebb14eaa43484655b322def11b367f SHA512 1a95b334bfe4c2a1d4844983cf32e44205ec6b7cabf1a6914a9ebb335d3d8f78655caf2a55a8cf444352af7d9ae92daa09e8fdf36e520554ed4807a4ed5fd393
 DIST rsyslog-doc-8.2006.0.tar.gz 8365252 BLAKE2B f7c6a2e153e84193b48481c9b7417170794fae0873bf9924eb6d4276f07955c2fecc78660a432dc82e23f6b3b575c81c157109a6f819ff57bda220411db36047 SHA512 03d16caef4fa77613eccd682247c1ce58b8c0ef794145c10f18da7bffad437b6b8231eb85cc0986f46b5795b6b24802b19ce0f59bec169ec67c9627e45266df7
 DIST rsyslog-doc-8.2008.0.tar.gz 8378149 BLAKE2B 0f6bc116a03821899d33c7960e517725487b89ea2aabc7f5d0fbd4962d82a06558737bcee67af02105006c670ec736eb5ba0b7811b25a1e627a99555121b2999 SHA512 5b8bed19017c65469eb8ea7725ef162595b30f520605f37447498ab69b5cfe8f939cee7e7915ecbf3c025871408fd7af6d45ba960a83096f83a397df4cefef09
+DIST rsyslog-doc-8.2010.0.tar.gz 8428326 BLAKE2B ee8eb2bdbb1f6c7122559b63ddc1ae6ac7fbfb23d661410feb39d7ddce332851e785bb447fb67dd2de8ff62e91fe865fbf7dec8bf62d7fe51181e3c6bbbe64db SHA512 072fb05a0117dc0970a4e5e302abbaf5dc065c2a0962c4160e7efb86fedad89a2caa546cd2bf4af07b7f5e2fa5267cf02889d911f7a6916725e6aea1760ab253
 EBUILD rsyslog-8.2004.0.ebuild 12621 BLAKE2B 253e27ebb4dd77748707be57581c480aaece89f2df6ef6a470ff39364abeb737f0acb218bf0ae678c37645149c67616799bd9cae6a149723eb96c15f19c41822 SHA512 904958441dfb287afaf43efc4d6b8feaa481171d2bedb312102d68da67d9dc80e97aa26fda1a130db1825b9dcf6c619691e97c9284725036e644e74bececa95b
 EBUILD rsyslog-8.2006.0.ebuild 12550 BLAKE2B 7823b49926d0b1f648181f60629d707f69f8b84350a189f2bad57266ba5d717b3d8d1ee14afec139b3f4d1f610998eda74c23c5de770a7ade7116474f4238217 SHA512 180285602372bbf5b6c5eb1efb3312ce435e7fcedf2c4168004e2775dc8159c59bbd00d8712c378268cd11b37e68da6ccd74261f73dfc69f53fa57a730351835
-EBUILD rsyslog-8.2008.0.ebuild 12550 BLAKE2B 7823b49926d0b1f648181f60629d707f69f8b84350a189f2bad57266ba5d717b3d8d1ee14afec139b3f4d1f610998eda74c23c5de770a7ade7116474f4238217 SHA512 180285602372bbf5b6c5eb1efb3312ce435e7fcedf2c4168004e2775dc8159c59bbd00d8712c378268cd11b37e68da6ccd74261f73dfc69f53fa57a730351835
-MISC metadata.xml 3874 BLAKE2B c09a57dcbd88bda6c510ca741e1ee8c5207e5906843fe3ae21c8dd6575c7b104dae74e79e5a27c8bf9f0348673f5c33eb6c4b12fafbb1ba64f1a9f81bd374eaa SHA512 2f7a72017376018aa5d864deb33675d51ab50cd8481dffb7f1421b83d4e07f19a86a90705dbb6191686fc650284e2bcbe30ed0af07082b57eef46dd615778868
+EBUILD rsyslog-8.2008.0.ebuild 12548 BLAKE2B 12912f550cc3b9eced70856a531d537273103e655d4fda67d178ee23788f96273268e8c40df36f6358a404ef1e36f858b4e97e0a1a58385a07c26dc3f1c97b33 SHA512 ea70a9b31e5f53418e144555b858e375ffcc36e9cc7b9dd903c6155d3edcd17c4e69db1962d7f440544e0708bed085e01201f4cc59695646326713342c2fd46f
+EBUILD rsyslog-8.2010.0.ebuild 12887 BLAKE2B 592f765f2dadf2fb3276ffbc8e784429c1bf3c1269bf94c726884130ea590ef3102e86287c6e63cc0558043043c494694db9506cd871de8ace9e387ebb9aed9b SHA512 f8f1a023062f9f9db098f615d4b5b5d55df384db83af944dfa676a3865a9b93e194ae359da21e42c8e048ef6e7730f349192c9884dde050ac85418c3ea3583f7
+MISC metadata.xml 4070 BLAKE2B 3fde04df2bf0b93058d14787780f7f78b5014cdaa303101ef0fb637d1f0b165e453885ae307f137d98052719f992cd1a3f46da2f923bc97030ba629801190d5d SHA512 df868d04339eade02eb55b218f43c85c9efe2bf70cadf2ec1d59dc9f0d546ba9dbcd9ac5e3f9cbad05a8f4629ce5979668aba1fb8b027c51c7f8468b2e9b732a
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index 44991a3a81a8..8edddd33ee54 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -12,6 +12,8 @@
 		<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
 		<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
 		<flag name="gnutls">Build the GnuTLS network stream driver (requires <pkg>net-libs/gnutls</pkg>)</flag>
+		<flag name="imhttp">Build the http input module (requires <pkg>www-servers/civetweb</pkg>)</flag>
+		<flag name="impcap">Build the pcap input module (requires <pkg>net-libs/libpcap</pkg>)</flag>
 		<flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
 		<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
 		<flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag>
diff --git a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
index 7b351b3a3072..73a46f56b7d8 100644
--- a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~hppa x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
diff --git a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
new file mode 100644
index 000000000000..6ab89acda633
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
@@ -0,0 +1,481 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+
+IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
+IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
+IUSE+=" systemd test usertools +uuid xxhash zeromq"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	imhttp? ( www-servers/civetweb )
+	impcap? ( net-libs/libpcap )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-4:=[drafts]
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-libs/liblogging-1.0.1[stdlog]
+	)"
+
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	BDEPEND+=" >=sys-devel/bison-2.4.3"
+	BDEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without depedencies
+		--enable-imbatchreport
+		--enable-imdiag
+		--enable-imfile
+		--enable-improg
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmtaghostname
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmdb2diag
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable imhttp)
+		$(use_enable impcap)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/${PN}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/${PN}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	if ! hash certtool &>/dev/null; then
+		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest
index ddbdac998aa5..d226cf5ab8b4 100644
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@@ -1,4 +1,3 @@
-AUX mysql_check.patch 937 BLAKE2B 26cfacf66fdc336c8ed3dec23776c30797bac1382b40fe0955f9640b314b3f1e9b035b677f3d8f0aa6ba706a135f759be2d7ae9505dcc654f176638da77a97f2 SHA512 3de16b396e85f658cf10b775795a0ea1adaf609dd26900d6cb27c055a2402b820c8b8c7bf80696bc3186c8435c6ad71b05f593b8f055b237915a06168c60761b
 AUX sagan-1.0.0-liblognorm-json-c.patch 2840 BLAKE2B 569957ec95bf5fc5bb1e844ba1d5f6a1c68415bd877551dbef03c62afbe66cde528fc4a2b80c3ca5faa92a3e97d2824a0e77b54add21e4a8092f6022b3e4c273 SHA512 1aa092351d317c373416a98ca6bbab19a070e43d0d4b82fe6dd1ac5a7cbb67741247ca2655e905a682ef5527fbf139c70a469a960be1dfdaa05c643a9749a4e9
 AUX sagan.confd 239 BLAKE2B 2ca76c1bd5bdb7b29f007a4d93602f020f76b10d6e4313e138e09b49de0b0c6796bc729f32e88831881bdcd52637bfb3a8e42481d89a09648a2833a000570ace SHA512 7ee746984d3bb3361e3155860d54e307f9b94b9e3f98c09c29b4259cd37d7aefe969b5b942c04048328ec23265a2689b22403c32e3552b8062201aca2ef3ac34
 AUX sagan.init 432 BLAKE2B 561344909a8f6610504f91bf72ba6fa89ac03fdacacd3189372f466b690b3421c3f1a8ce4750b747c53613c75f9b61696ec7b3c490597eb0eca36ebece23a26e SHA512 c5ec82e48ac33785a0e63deb6b2079e97a2f9b5f96682ccbf646b4deae5782cbceb5756b17fdff7af8cafd4e561e298d842c4c4f4aa5229ccc58f5f0fc06e6f7
diff --git a/app-admin/sagan/files/mysql_check.patch b/app-admin/sagan/files/mysql_check.patch
deleted file mode 100644
index 37f7d61fa0c8..000000000000
--- a/app-admin/sagan/files/mysql_check.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure.in b/configure.ac
-rename from configure.in
-rename to configure.ac
---- a/configure.in
-+++ b/configure.ac
-@@ -215,13 +215,17 @@
- AC_CHECK_LIB(pthread, main,,AC_MSG_ERROR(Sagan needs pthreads!))
- AC_CHECK_LIB(m, main,,AC_MSG_ERROR(Sagan needs libm!))
- 
-+save_LIBS=$LIBS
- if test "$MYSQL" = "yes"; then
- 	AC_MSG_RESULT([------- MySQL support is enabled -------])
-+	AC_CHECK_PROGS(MYSQL_CONFIG, mysql_config)
- 	AC_CHECK_HEADER([mysql/mysql.h])
- 	AC_CHECK_HEADER([mysql/errmsg.h])
--	AC_CHECK_LIB(mysqlclient_r, main,,AC_MSG_ERROR(The MySQL library libmysqlclient_r is missing!
--If you're not interested in MySQL support use the --disable-mysql flag.))
--	fi
-+	LIBS=$(mysql_config --libs)
-+	AC_CHECK_LIB(mysqlclient, main,,AC_MSG_ERROR(The MySQL library libmysqlclient is missing!))
-+fi
-+LIBS="$save_LIBS $LIBS"
-+
- 
- if test "$POSTGRES" = "yes"; then
-        AC_MSG_RESULT([------- PostgreSQL support is enabled -------])
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 3283a88b84b8..b953fc56ef67 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -16,19 +16,23 @@ AUX salt-3000.2-py38-logwarn.patch 4875 BLAKE2B f0ced7bad98983296561d223405d5120
 AUX salt-3000.2-py38.patch 1739 BLAKE2B 49591845a247f3e9fc092229950518b6ccb10035bc961a6193358a4be5b84b1e3d6fae69a5763b85966b1e115e8cf38378e2e88c66c3e10699ef47587aa3e7d7 SHA512 4a537c0e45c3287ddc71b91637b4b7f1d54e0dd4e524e91f39cabad08dda14ce5d2467c1f87bc81a098c36f0da1312b8e627189e0574d0ccecab064cba19acb9
 AUX salt-3000.2-tests.patch 587 BLAKE2B 5eb647ffd159bc56ce823c80fb384e7cd33e79c46baa3e607a772c6de1e8019c53908a2eb5111dd770b638c8088b76bee6c17f8cea9e17f3f7b8d3ab93568839 SHA512 ef6c1cd995a03d49ac2aaf65b516f0dc1ac9764e32392c67febdfd31d23ca178bb4f29a903b4d67f8792fe0fb903c03596cbfd1c1223e993189de890aa41b0c3
 AUX salt-3001.1-tests.patch 7149 BLAKE2B 3e5de0decdec9bc2ed1a6fcf2dd04c0c554f2b11a8bda45a797e811a332782eec9303ee8c81aca4f2fe646c392c63f151c0af6a3ef18db370914a2aa06afc485 SHA512 661f2ef797b1b338e43c33af80fbad0e2af9b22439b3bdf0ad6fda0b632961426a787dbf8e592c5a9b73c84af3a466c128eff15a519b83af2e9a74e0216ea014
+AUX salt-3002-dont-realpath-on-tmpdir.patch 1808 BLAKE2B 2ce464fef827cb98490b8a2c4aecbdaaa8bd53b3aef1acc96496bde162a0102064a400dff768c2cd5faddfe33a433922c5295b30dfef38e68841ebfe1a119644 SHA512 ce002f4fdf0d1e75cfbe9c2d3a6c98e08c21b0c436c500b70a0405c4ee10a1b1849446fab47dd681c71c9a847587fe97537de095768ecf650df9b53f3778ca62
+AUX salt-3002-tests.patch 1125 BLAKE2B 345c094c38a1b62190587062a86da4e0a516988fb2bbf98c295da87f0abd456cfc8f25c11fe10a1c4571d4eb25390c6d89b0e300bd2ae6d82212d1685af8ed30 SHA512 7f9d6f8c4a5d34381c516c72d77de6613ed646fb88f89b7c4180afebb0bf0ee34a99ed02a7e8d7a6836a61c01653fe97a13c8caa18898a507a03091cff8e9d30
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
 AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0
 AUX syndic-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
 AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4e887c1e6487682efce7f5b75d3bcf366ef706a9fb1578dce537ac5b50324239378cecbd0715ad5d SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef
-DIST salt-2019.2.5.tar.gz 14574347 BLAKE2B d456dd493e79640260f3ad3c964fdaaa26dd7bdc8d5676bd70f9dd143647c62b63aba2052e7f223041b7dd6859cd923398ad22f9d2d1302b8f18b4c69fe7aafb SHA512 95445dff498bea2bc8e3f32749131302481166c8591f11a5f76a7786c3286cb608049a743bc4878c8fbd4e4d22d4949f243f57f1e53725e7076d39aea5ceea20
+DIST salt-2019.2.7.tar.gz 14576515 BLAKE2B 4b2476c874a806de8664abd7852d5f856fc1946cc021d3ec8d206f69ec3cd809fe156d4d916d00304c36aad1dfab3a60309eb87d21ce7bb9afc7e8ea77ac23aa SHA512 e9a0d1ada0172239a31c6a8a628e71367aba072c06fe5420f4b864b9c67da89edd03f95abd46fd9ae414c2262b4e7e5c7f53c606f9f3f58e4c84129f2ed43c9e
 DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
-DIST salt-3000.2.tar.gz 15231513 BLAKE2B 2090d0f52f953a42f1685ad190750e9c76ad6e862a3272444fef063a7605f69a6c542f04165a41fb9cdaa126a878cc133d4857faa70edc5eac4bf49bdde937ab SHA512 88e8876ed8cd18e942c2194686cda68f40fa49e69e317ca488bf58e095bcf6cdf8771d93eba7960038941cc5863e13a4eea4dad5256c12da7cd8288a2c61f59d
-DIST salt-3000.3.tar.gz 15237557 BLAKE2B ab51e07f56f9e02c47da58fad95c9482ea70e0685996a78e34382eadb3a9a3dace63ef65d643a9de284ea00c34785eae631d033f32e00e59eb3639514459af33 SHA512 a4697da9a2f7d484b72145e8b83f6d9032369f87e2e7119a9d51f59b989488285406543f79142fc686c41c144f5878eefba37927137581c892c88f03fc3a8208
-DIST salt-3001.1.tar.gz 14556156 BLAKE2B 3088955a07b6ff95588f5b6235e0bae9cea366e957e026bacd228af9f1ed500f88f7fb543833f2398d64fe7e4546f0f29d7c65362464097bf89424174e76c954 SHA512 d59b6c3580d3379192f36e462385c74b53b0b385e63b3db7734003d0a71df8f88593a59eeccd86b1dc15800e46d050094e7a88f2636673770ddc952d0110ca29
-EBUILD salt-2019.2.5-r1.ebuild 4910 BLAKE2B 67e56a9029c3157a31525c8ea41a957b82a3d2c846ae68756c8ea67261d6ea6346a98bbafd785fe519640ceef2e3495e58b0ec262858be30016eba10f1392567 SHA512 75e9eb392f3619b714a0ba43d64c5e08c51f512e71d98f1be763cb443d1c8a6c429ef5c2d272c162db34f3e274aebdf2f0c4866a32925232d134b9f91a4765ef
-EBUILD salt-3000.2-r4.ebuild 6321 BLAKE2B ddaa02503b5d8301697bae784a4901348eec72152e9d91d21eff82640d3609b093aa2acd818554d96edf86921cfcdbf9cc39b3e0f9292fff919f903919a6c250 SHA512 6b405a1bd5234500907b8da8865ec0aa2583efe7700fb3f09776297a4592352fe13ab199ff1fd9bf50421e2f11b363b804f41823d6fbf8d993d56bf6a1d07ed6
-EBUILD salt-3000.3.ebuild 6323 BLAKE2B 8b051bae3bb397bb25bcfe341730b5c0670ca011fad15f268d9c9b33a27f9fc1c95cad659e797b1d5bca75ad9fd09d3667d7d2d7e43a1880955a70c4f40559d4 SHA512 76d5b24985a68a6c4f67c937a71c3bcbf89407ec9ceb0f40bc92cc8196d53830a3ac4000457dc2a5b9660d59a7d6fed79d646e521bcc6ddc9bb29b172eca130c
-EBUILD salt-3001.1-r2.ebuild 5998 BLAKE2B 1fff765f1d003ccfda9061db9a2bd7d3a30d28b954308ff989eede8ab6c41fac72868523b1ed271f936f0ffdf2c7009f89373ecb49164a7a13bb65f574976ec8 SHA512 e9f94f0233f7f3df4a6b7f556942b63e4203f6ae5456d77cbe0b5dbc9a56666cbbd6e2984d77c8ae421f71c4c5cee6d513b48136869802266b0182e7104ec65f
+DIST salt-3000.5.tar.gz 15229450 BLAKE2B 135e9b9dcc461ac898231ce46e6a1359e6d60a43822320950bc0b83057f768dadf55320dd73df72d5bc917f324eef4661e6f75d8eb8e84aef958bd2df8924cfc SHA512 2579f65c24d22d77132057bd8cf37040d7d149624745dd68b4c44318be786580dcc34bf563f90d7de9ef5b726b2453bef4d8639bc8fbd9c5e691500520335317
+DIST salt-3001.3.tar.gz 14553356 BLAKE2B 50d073d39826fb15cb424df3e55c2308dd18391c13a5c4a3fb01c1e1ecd8636dd45fdf34b1937563d069e51141fc40f48f77eaec6b1e1d6f9802418e611b20b1 SHA512 a3c0f019fbe1f1edac11af291667f06597dbf4badeb0026107dcab4937efcb306ca6d3ba20195ff9fea5ee7a995db1c3a79236de3e990fc809c305e7f05e1c9d
+DIST salt-3002.1.tar.gz 15753988 BLAKE2B d084dc650b8bc92b4ebdb145a41a39bfbd034064fad65e364260eca84d7105fb645ad8f6cea2cc1b6affb1abf21a9858ab6fb526eaf4ecd8f76c70d1384c7edc SHA512 8fc02d0b47dad60f96eb4442b0e8a31f04d796f12b845c8142135593af4c7ea9c2d9335a3f520f8858951f87b0e8cc6be70d383fde2d93a6d529e077bcc87114
+DIST salt-3002.2.tar.gz 15765855 BLAKE2B b26895ababc8551e01baa806c5a0e41dab9a379e47d2289b5c3c529ef762c69631d7ed8b32339ec66c3929c5883782131eb56d1bfbcc743829c4f0199a900ca1 SHA512 0f617a07475347b1bb0d1c6059de541e102103182820dfd6f64f4c281d660e68358eb1ab7171a637e16cef9fea2517c8356df9c449f9bbc92538aa86c316f652
+EBUILD salt-2019.2.7.ebuild 4910 BLAKE2B 67e56a9029c3157a31525c8ea41a957b82a3d2c846ae68756c8ea67261d6ea6346a98bbafd785fe519640ceef2e3495e58b0ec262858be30016eba10f1392567 SHA512 75e9eb392f3619b714a0ba43d64c5e08c51f512e71d98f1be763cb443d1c8a6c429ef5c2d272c162db34f3e274aebdf2f0c4866a32925232d134b9f91a4765ef
+EBUILD salt-3000.5.ebuild 6321 BLAKE2B ddaa02503b5d8301697bae784a4901348eec72152e9d91d21eff82640d3609b093aa2acd818554d96edf86921cfcdbf9cc39b3e0f9292fff919f903919a6c250 SHA512 6b405a1bd5234500907b8da8865ec0aa2583efe7700fb3f09776297a4592352fe13ab199ff1fd9bf50421e2f11b363b804f41823d6fbf8d993d56bf6a1d07ed6
+EBUILD salt-3001.3.ebuild 5998 BLAKE2B 271ed69190cc3582ef29fc731693e5fc97ec4984d60735fc9e77f082c9a848a44934d00e7161b7f53cb7c8e4f3c92f52f09a0dceb5ac6deb8a5e1c46c9c45932 SHA512 dff46b7448eb7a1a2b11dc2018d1f46813dd1f23643b78d2e32ebfe658b88e658807b0f2b3838a0fbf08d353f64195dc67ff9c282861ac55a2763116515aa7d6
+EBUILD salt-3002.1.ebuild 5956 BLAKE2B 3471c7185550aa6719893059d435c17a2f33252afc3634b81dfbe42a5c43cbe9676473d6e36d9b1c5853da9521d2cae0686da44578b8262d6bbabb79201962b9 SHA512 af287ce3fbe3b070753fa7e63d99283a25f3ca776a854c052890c5638f70de1147758ceeb73c89dfa1f903adf27500a46ce268a786c9e4fd95c115a652de764a
+EBUILD salt-3002.2.ebuild 5956 BLAKE2B 3471c7185550aa6719893059d435c17a2f33252afc3634b81dfbe42a5c43cbe9676473d6e36d9b1c5853da9521d2cae0686da44578b8262d6bbabb79201962b9 SHA512 af287ce3fbe3b070753fa7e63d99283a25f3ca776a854c052890c5638f70de1147758ceeb73c89dfa1f903adf27500a46ce268a786c9e4fd95c115a652de764a
 MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5
diff --git a/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch b/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch
new file mode 100644
index 000000000000..5ef68dcd1803
--- /dev/null
+++ b/app-admin/salt/files/salt-3002-dont-realpath-on-tmpdir.patch
@@ -0,0 +1,38 @@
+diff --git a/tests/integration/files/file/base/_modules/runtests_helpers.py b/tests/integration/files/file/base/_modules/runtests_helpers.py
+index 3ee0e2da5f..5b462f0a9e 100644
+--- a/tests/integration/files/file/base/_modules/runtests_helpers.py
++++ b/tests/integration/files/file/base/_modules/runtests_helpers.py
+@@ -18,7 +18,7 @@ try:
+     from tests.support.runtests import RUNTIME_VARS
+ except ImportError:
+     # Salt SSH Tests
+-    SYS_TMP_DIR = os.path.realpath(
++    SYS_TMP_DIR = os.path.abspath(
+         # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
+         # for unix sockets: ``error: AF_UNIX path too long``
+         # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
+diff --git a/tests/support/paths.py b/tests/support/paths.py
+index 5f28904858..26245fadf9 100644
+--- a/tests/support/paths.py
++++ b/tests/support/paths.py
+@@ -48,14 +48,12 @@ if TESTS_DIR not in sys.path:
+     sys.path.insert(1, TESTS_DIR)
+ 
+ SYS_TMP_DIR = os.path.abspath(
+-    os.path.realpath(
+-        # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
+-        # for unix sockets: ``error: AF_UNIX path too long``
+-        # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
+-        os.environ.get("TMPDIR", tempfile.gettempdir())
+-        if not sys.platform.startswith("darwin")
+-        else "/tmp"
+-    )
++    # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
++    # for unix sockets: ``error: AF_UNIX path too long``
++    # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
++    os.environ.get("TMPDIR", tempfile.gettempdir())
++    if not sys.platform.startswith("darwin")
++    else "/tmp"
+ )
+ TMP = os.path.join(SYS_TMP_DIR, "salt-tests-tmpdir")
+ TMP_ROOT_DIR = os.path.join(TMP, "rootdir")
diff --git a/app-admin/salt/files/salt-3002-tests.patch b/app-admin/salt/files/salt-3002-tests.patch
new file mode 100644
index 000000000000..88e1ce590568
--- /dev/null
+++ b/app-admin/salt/files/salt-3002-tests.patch
@@ -0,0 +1,27 @@
+diff --git a/tests/unit/utils/test_verify.py b/tests/unit/utils/test_verify.py
+index 5662cf621b..16aa6d08da 100644
+--- a/tests/unit/utils/test_verify.py
++++ b/tests/unit/utils/test_verify.py
+@@ -329,6 +329,7 @@ class TestVerifyLog(TestCase):
+         self.assertTrue(os.path.exists(path))
+ 
+ 
++@skipIf(True, "skipping since temp dir is a symlink")
+ class TestCleanPath(TestCase):
+     """
+     salt.utils.clean_path works as expected
+@@ -394,12 +395,14 @@ class TestCleanPathLink(TestCase):
+     def tearDown(self):
+         shutil.rmtree(self.tmpdir)
+ 
++    @skipIf(True, "skipping since temp dir is a symlink")
+     def test_clean_path_symlinked_src(self):
+         test_path = os.path.join(self.from_path, "test")
+         expect_path = os.path.join(self.to_path, "test")
+         ret = clean_path(self.from_path, test_path)
+         assert ret == expect_path, "{} is not {}".format(ret, expect_path)
+ 
++    @skipIf(True, "skipping since temp dir is a symlink")
+     def test_clean_path_symlinked_tgt(self):
+         test_path = os.path.join(self.to_path, "test")
+         expect_path = os.path.join(self.to_path, "test")
diff --git a/app-admin/salt/salt-2019.2.5-r1.ebuild b/app-admin/salt/salt-2019.2.7.ebuild
index e39bedf18983..e39bedf18983 100644
--- a/app-admin/salt/salt-2019.2.5-r1.ebuild
+++ b/app-admin/salt/salt-2019.2.7.ebuild
diff --git a/app-admin/salt/salt-3000.2-r4.ebuild b/app-admin/salt/salt-3000.5.ebuild
index 648c82a92c41..648c82a92c41 100644
--- a/app-admin/salt/salt-3000.2-r4.ebuild
+++ b/app-admin/salt/salt-3000.5.ebuild
diff --git a/app-admin/salt/salt-3001.1-r2.ebuild b/app-admin/salt/salt-3001.3.ebuild
index e5a0fb3ec15b..1e5f20dbb506 100644
--- a/app-admin/salt/salt-3001.1-r2.ebuild
+++ b/app-admin/salt/salt-3001.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{7..8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit systemd distutils-r1
 
 DESCRIPTION="Salt is a remote execution and configuration manager"
diff --git a/app-admin/salt/salt-3000.3.ebuild b/app-admin/salt/salt-3002.1.ebuild
index 380351911ba9..59838e3e5792 100644
--- a/app-admin/salt/salt-3000.3.ebuild
+++ b/app-admin/salt/salt-3002.1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit systemd distutils-r1
 
 DESCRIPTION="Salt is a remote execution and configuration manager"
@@ -16,8 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_BRANCH="develop"
 	SRC_URI=""
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-		https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -29,16 +28,18 @@ IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
 
 RDEPEND="
 	sys-apps/pciutils
-	dev-python/distro[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5[${PYTHON_USEDEP}]
-	<dev-python/msgpack-1.0[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
+	dev-python/pycryptodomex[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
 	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
 	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
 	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
@@ -84,12 +85,10 @@ BDEPEND="
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}]
 		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
+		>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
 	)"
 
 DOCS=( README.rst AUTHORS )
@@ -99,27 +98,17 @@ REQUIRED_USE="|| ( raet zeromq )
 RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
-	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
 	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
-	"${FILESDIR}/salt-3000.1-tests.patch"
-	"${FILESDIR}/salt-3000.2-tests.patch"
-
-	# https://github.com/saltstack/salt/pull/55410
-	"${FILESDIR}/salt-3000.2-py38.patch"
-
-	# https://github.com/saltstack/salt/pull/55900
-	"${FILESDIR}/salt-3000.2-py38-abc.patch"
-
-	# misc py38 fixups
-	"${WORKDIR}/salt-3000.2-py38-misc.patch"
-	"${FILESDIR}/salt-3000.2-py38-logwarn.patch"
+	"${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch"
+	"${FILESDIR}/salt-3002-tests.patch"
 )
 
-python_prepare() {
+python_prepare_all() {
 	# remove tests with external dependencies that may not be available
 	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
 	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
 	rm tests/unit/states/test_boto_vpc.py || die
+	rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
 
 	# tests that require network access
 	rm tests/unit/{states,modules}/test_zcbuildout.py || die
@@ -127,13 +116,14 @@ python_prepare() {
 	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
 	find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die
 
+	distutils-r1_python_prepare_all
+}
+
+python_prepare() {
 	einfo "Fixing collections.abc warnings for ${EPYTHON}"
 	local abc
 	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
 	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
-
-	# allow the use of the renamed msgpack
-	sed -i '/^msgpack/d' requirements/base.txt || die
 }
 
 python_install_all() {
diff --git a/app-admin/salt/salt-3002.2.ebuild b/app-admin/salt/salt-3002.2.ebuild
new file mode 100644
index 000000000000..59838e3e5792
--- /dev/null
+++ b/app-admin/salt/salt-3002.2.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax"
+
+RDEPEND="
+	sys-apps/pciutils
+	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
+	dev-python/pycryptodomex[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_7)
+	)
+	openssl? (
+		dev-libs/openssl:0=[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	nova? (
+		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_7)
+	)
+	neutron? (
+		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_7)
+	)
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )
+	test? ( cheetah genshi )"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch"
+	"${FILESDIR}/salt-3002-tests.patch"
+)
+
+python_prepare_all() {
+	# remove tests with external dependencies that may not be available
+	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+	rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
+
+	# tests that require network access
+	rm tests/unit/{states,modules}/test_zcbuildout.py || die
+
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+	einfo "Fixing collections.abc warnings for ${EPYTHON}"
+	local abc
+	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
+	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose \
+			|| die "testing failed with ${EPYTHON}"
+	)
+}
+
+pkg_postinst() {
+	if use python_targets_python3_8; then
+		if use nova; then
+			ewarn "Salt's nova functionality will not work with python3.8 since"
+			ewarn "dev-python/python-novaclient does not support it yet"
+		fi
+		if use neutron; then
+			ewarn "Salt's neutron functionality will not work with python3.8 since"
+			ewarn "dev-python/python-neutronclient does not support it yet"
+		fi
+		if use libvirt; then
+			ewarn "Salt's libvirt functionality will not work with python3.8 since"
+			ewarn "dev-python/libvirt-python does not support it yet"
+		fi
+	fi
+}
diff --git a/app-admin/selint/Manifest b/app-admin/selint/Manifest
new file mode 100644
index 000000000000..aacb85723b5d
--- /dev/null
+++ b/app-admin/selint/Manifest
@@ -0,0 +1,4 @@
+DIST selint-1.1.0.tar.gz 283926 BLAKE2B 0908f8830ce4b569c54e8c025dd92c39af59172fee0b8061f5b8cdaf61222979a78c3726a5647af9161ce7e4a7ddd5bee64772afecd2024368afa76294b3d317 SHA512 3af358e0f42a285a0360ce2b4db9014ef1e4f0b792623007f88cf510799080975d9e44817e8911bbd32b141704a7fd11e1b4d8f91e124d0fa91c38f71a978c91
+EBUILD selint-1.1.0.ebuild 777 BLAKE2B 01aefb1c3a19bee5325c75b318000d99f159bf23edc1e399c769c3eda57c7361a6ac87e3837ae79573f588450710b72183ad1b51158817b068a4852eaac7420b SHA512 495108a5bd26315c85f092b0880e3703b1207e45770a59a0cbdeaa68d3c8fbdffd508b229776587d71d4841721c75af919967fa02e27df9af82a87ede9784cbb
+EBUILD selint-9999.ebuild 777 BLAKE2B 01aefb1c3a19bee5325c75b318000d99f159bf23edc1e399c769c3eda57c7361a6ac87e3837ae79573f588450710b72183ad1b51158817b068a4852eaac7420b SHA512 495108a5bd26315c85f092b0880e3703b1207e45770a59a0cbdeaa68d3c8fbdffd508b229776587d71d4841721c75af919967fa02e27df9af82a87ede9784cbb
+MISC metadata.xml 335 BLAKE2B ab88b7d7fedc27d0ba41b77fc133a0ad8b42aa295bb5b64c5bb4924d8081cb1ac3480b07d7c8a04ff8da1c49f47983e33a63cef3de08baac4cb448d656ec6cb9 SHA512 e94ae02402e90d9475fd328454223fa95714c3292877a9cc31e98c393f59dde7ddd9be34afe8b2f2d318105794ca3faa7617166d123259d147115619b14d7d12
diff --git a/app-admin/selint/metadata.xml b/app-admin/selint/metadata.xml
new file mode 100644
index 000000000000..80f8686d2a8d
--- /dev/null
+++ b/app-admin/selint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">TresysTechnology/selint</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/selint/selint-1.1.0.ebuild b/app-admin/selint/selint-1.1.0.ebuild
new file mode 100644
index 000000000000..592cb7fbdf8f
--- /dev/null
+++ b/app-admin/selint/selint-1.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/TresysTechnology/selint.git"
+else
+	SRC_URI="https://github.com/TresysTechnology/selint/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/confuse:=
+	dev-libs/uthash"
+
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_with test check)
+}
diff --git a/app-admin/selint/selint-9999.ebuild b/app-admin/selint/selint-9999.ebuild
new file mode 100644
index 000000000000..592cb7fbdf8f
--- /dev/null
+++ b/app-admin/selint/selint-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/TresysTechnology/selint.git"
+else
+	SRC_URI="https://github.com/TresysTechnology/selint/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/confuse:=
+	dev-libs/uthash"
+
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )"
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_with test check)
+}
diff --git a/app-admin/spectre-meltdown-checker/Manifest b/app-admin/spectre-meltdown-checker/Manifest
index 1e586f424dbb..5236e892c1e2 100644
--- a/app-admin/spectre-meltdown-checker/Manifest
+++ b/app-admin/spectre-meltdown-checker/Manifest
@@ -3,10 +3,12 @@ DIST spectre-meltdown-checker-0.40.tar.gz 52463 BLAKE2B d0cbaf695bea41bf918900d1
 DIST spectre-meltdown-checker-0.41.tar.gz 56170 BLAKE2B 07ec1a56dd13c15463696d136652f67d771d71be5ff39ed0024ab69b5dc84b1bef0c695771b0966c89e7311a9c894e2f7b9ddb8ad2c4120da183948b63044c2c SHA512 4391098cd969a211ed77e386e79df3ea2c2482bc1817e9b037720922cbd845457c4192e1de7b0a62ec971c3b6c551240cf2ef29191fadce1698256af43737b26
 DIST spectre-meltdown-checker-0.42.tar.gz 57491 BLAKE2B b13fdf74e0b63db1dd1aaa6bc154ab2717ee4a3ca601d7c6fb18578e42d03545010fe74cb72fe17ccc8c2ff949d47af49704cd8bd7431b5ec3cf1d7fbd288d49 SHA512 721e9287ce367648e367850b94866a6465b92561a0c2f1699599ef333921fda988979db02004b2c83ec9c808f625f793d43eacdd84d44a9d1eba59b2b300174c
 DIST spectre-meltdown-checker-0.43.tar.gz 51651 BLAKE2B f94ad2d144709511738a0149ed133da1e46a57546eaf0a702e1713c66529155b6fe3772911099bd0228fb295a04cacbe4ea39998555c139cddb1bb4b2beff1fc SHA512 68ca476025e5862466ca5e12e6950a538b84f36e08dfb0650ab6d13b6e94762dda8a49d9f5e20d0ee585103199ed0ddaa9dcf7cd72378156a7e1e6c87f70afda
+DIST spectre-meltdown-checker-0.44.tar.gz 54325 BLAKE2B 120c7a6fd9e4df27daf605f8c9d62fb999f164578c02499651d19e48ca9af88fbc09338f85b6e05a2b139ac7d83193768f337651e276af7099fdee22bf1c5354 SHA512 05ac99cee08cd52f8ec2c8066fe9bb090310eed9b668008d0a58ffc4ecc0df72a5bf198492dd3c19f9b85e31102a9ca7aab2e4a9a93c7f5f0ea447053e664804
 EBUILD spectre-meltdown-checker-0.39.ebuild 609 BLAKE2B 36d1843107f84dd5e36b3f3548f64a6d34675ff83709430b7209ce817c362c7608a538439cec26d20c6507b556e822ea6e57ca9cc1260641092c55ed4b1c8005 SHA512 f1464c0b9ea01606833459688a90621b573c40ec598c39ec1bc4e41e48f8a5264345b82212d9332f09792a6cba1314f8bff2e519f982dbaf0a7b59e3b355dbef
 EBUILD spectre-meltdown-checker-0.40.ebuild 611 BLAKE2B be71069f07922e8bfe1ee4627a6483c22ad886807cfd95cd67151d45e38456c0e132ef2572ab0b2b4220c21ba76a5e2aeb7dcf1db4e745f5a7d24a9b9442e0be SHA512 9e9852fb0268f890061528c0e550f63b023aa966025b1d8dcde83e24f3de768eefd806aa90ec97c5e36b69e614b03c0218c2443d9d2af1b54da3d95b83536b13
 EBUILD spectre-meltdown-checker-0.41.ebuild 611 BLAKE2B 205796938c2b38c3dd99c7799cbf564be38be6ed377250e4f3e72da525ae80ce1966f53d6e4ea283496854923be899e9b01376f7ea952b6ec498b9f52ecec2cc SHA512 8f9b0362c498942079455927ac26dbefcdec549f216e1c250e0fd9531ff81ba1274f9142eb325bb0e0d3a5b6b8b006ced06714b9a0724f8be3904c137226fba7
 EBUILD spectre-meltdown-checker-0.42.ebuild 613 BLAKE2B 845c9882ebe3ea93f8658fe713845e4cab942fdd59a7d1888e4cc6a424defcaf4eee2a347169dce54b7ecd0f485c8310ddd6aa5b9ac260de3f213d9fb7347294 SHA512 af555d0e399c9cc9e100cb06e91821e74779286460262f87cf5bd0cd5832562fa6cad0a2f8bf80e01cfddd59a0722a4b2c5e3ed55d6bcc4207deb26e1e1577f2
 EBUILD spectre-meltdown-checker-0.43.ebuild 609 BLAKE2B 39958953adb67698958b6ad7334ff6e37576594e59f64d41ef287966d038015c5d4e7a2ff10be4d62babf968529492c09c214d1e848c43eaf83082d43c246194 SHA512 1dd5edea334b02a82be54de5ba33f24cf3634729dacc43044c8a69f61a72621b838a86a5e70a8dc552ea8e12b24bda12d14cc037353d19bbcd1c08e99402f791
+EBUILD spectre-meltdown-checker-0.44.ebuild 613 BLAKE2B 65a891d05a92303b23fa28da7d21ab0abd266bb71c13122d691d44449ad3202c9ff2f902300af83944da71dabe9db38e95f9809a72fb10ca341e71f6efc4deac SHA512 3cc924bd61d455ddede052b8ec88ca0709d342447259089e8f97f0de297f826db124a22a7efc2bbc9450f89e6e82b15dc5d340c4eac06f8f249240f7e1532946
 EBUILD spectre-meltdown-checker-9999.ebuild 616 BLAKE2B 1a0cd1b4cf550568a77bb037cd600cd9a54f4ff0eccd267a98b6849c1bfbee97ba967c78f6566a1b6349d50d4936b243714cec8b2e2d87509d3da9dee1048f18 SHA512 2c09e4d7b49095e2e1bd2a19fb26745898409295338167f5e8a77164b207984234b18c08916add448b7f31e6a2ae789ebc9bf955cf623e4678038d58fcaf572f
 MISC metadata.xml 345 BLAKE2B 07f3a6efa5ff3dd3f5dad5ae3b4dffa1286648795a31075bf64ad2bdf25e8b712d6aef5de0aa48a31cc059d528fe4b8165b71725e6e3b6a40e5b2aae9242f5d2 SHA512 7229e00a28686eb602be0a9d0bfa4124acd1dfa73edb5e7975d5ead0bfa5e7d64888a0eb6e1c3c3828f48d2081d29b7bacb48375d75ebb780f2e94915f858661
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.44.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.44.ebuild
new file mode 100644
index 000000000000..470cde322653
--- /dev/null
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.44.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
+else
+	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
+HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+src_install() {
+	default
+	newbin spectre-meltdown-checker.sh spectre-meltdown-checker
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index a79bac69264f..deaef1ca5e94 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,6 @@
-AUX sudo-1.9.2-glibc-2.32.patch 10057 BLAKE2B 2027bbef7db5f4a523959e9456ebe625028f55607a22869bcc7deb9ec3787d28d3955fc0a0670976c557f070fa31a56bb167d1c6618f955163a240f852c5a4f6 SHA512 de7147130e923ce083637231f5e5a6dcf41cdd1a2bf901754b573239898d144938ebaaa55a8b1cd44138f313bfa59de6b8eac5d18ecb7c61e501dc0213f144b6
-DIST sudo-1.9.2.tar.gz 3890859 BLAKE2B 879917b8045c999a17ef36006732509aa546ee6bb04de77191fb637aa0420d54f9e51ec69b697c22119d638393e9c84efcc1ca5e6e8ee5f0c08bb1ca07f3acea SHA512 20afdf2604b1c93395157382b24f225cd1ff88d3a892362e2d69fecd240c4e7171f05032c08be1778cd1dea6e460025e4241f57272fac0ea3550e220b6d73d21
 DIST sudo-1.9.3p1.tar.gz 3958071 BLAKE2B b681c120faa5dc7f25e27c1be423d68cea70f63dcdfea2183fd386a34dec0376555453399d3f8886c66c6507343648d40b59a058710432154061b210df2a704c SHA512 3ad13fd03e5b371fd6bf7909731ffc11431d2182a744b654f7e5d4b810e47955d49bc78f551afe13ec56acbce694139c33a15bc022cea41b17af5496b8b7f89f
-EBUILD sudo-1.9.2-r1.ebuild 7013 BLAKE2B db8445fef0e42c472efeae9210c773b89145b2a578a6705ab77b8dcfe56ce976e5f0a747bb3884dbd8741facc6ba7051517315a644cfbfc01a90958b271e336e SHA512 e76ff722a7dea45b23f7144fce001c05ce1fa12348ca8ec0e586160b69dacc99e9bc8b877962b525b94255517f7d1d862590e1a73cd436791f7b8985dc17a7a8
-EBUILD sudo-1.9.2.ebuild 6922 BLAKE2B ca1543dde3d569c92ea36d494ac8c11eb9c6fccfaf1c34696cbf7e37e8f88009c9805fccf658423fe6898493289383d3dfb1562a6a99e8f17fab9b4d7e84c76c SHA512 8559891753c2ee5679edefffb878a21be2c861fd07427a760d79e6aecbfa0cabba3a8ab8a1bcd56b5c1e1ca5d454c657360ef00ad1de9f0c868d32627a3a9ddc
-EBUILD sudo-1.9.3_p1.ebuild 6931 BLAKE2B 3e606d2d8186da9b882969e864f90c34bb0b473589abd9e114550fe945a60076e159262085cb3766d14ba061806334ceba3665b2fc37f22e2f589c819335c9f6 SHA512 ff619dd0a8d6842a2bae2cf564cf58797c3ce63bb3acd1fbfe14ebfd511018ea8c3fe993002ed1278fda4403f9e413198c19a69623f0e6548dfb6597c554f357
-EBUILD sudo-9999.ebuild 6821 BLAKE2B 6ec4c8325e4275d902df02e971ca9b3e87a24b312cabcec7909c8ce94c4662aabada79fe550305603ad92151483bb3ba02a92b1ac49807ed0ba6fa7b14da0f12 SHA512 92536adcffa6e1c62e701d7a00a9032a60d559aa114d196e9851f198321ea8d027e9f7caf598f9d0eae2182362520a3c1ba62117d13b8e8b8ed6c5d9f212e7ac
+DIST sudo-1.9.4rc2.tar.gz 3990607 BLAKE2B 46318341a7b14dda0f3765343fa4c0fd026ed6f127da8dc205adc1f2103ce444854114ca6c571801d267a31aa92802bdd2351d09f847949765b55df84cbe8b1b SHA512 0f16a73139c9a80352f8be3ed696116f05c0e36930998b4dbe9a452933b2b784cf49d6a5486a49f25d4244ae6a71d49880d200c5c7f3fce2a8ff857b9ee96cf7
+EBUILD sudo-1.9.3_p1.ebuild 6892 BLAKE2B 3ad32318e45533045e40e7d4ad282b5a218c9531d98dda7a6d92bc0568ee874e020f4497811e7e2dad677d8d14962d2e5aadb014d5d1e01a4559fda16867e39f SHA512 34803aae1dd4a8aaa696b7b4c72d69d9dbe08a25072aac9b8a2a3f9e47eed84a9273c2cc6f1c496477a88b8df74e5587cf8761906970d574ea140fd0a41ca639
+EBUILD sudo-1.9.4_rc2.ebuild 6901 BLAKE2B 57b94080303df4d32651aab3cd4be8601f59ff13138eb6b8941854255942422d338e47047ff98b1ec9c86863e77f2e1b36901ed001daf715f23b15ae65264709 SHA512 ecb146a12fe3ea3d32ef237e0e67a99d3eadd6ad99997c327eb31027b0f45aa6dbed9dec03ed5c39c62ddd1131762fdc708899e76b2a867416dc0997c1f0727e
+EBUILD sudo-9999.ebuild 6901 BLAKE2B 57b94080303df4d32651aab3cd4be8601f59ff13138eb6b8941854255942422d338e47047ff98b1ec9c86863e77f2e1b36901ed001daf715f23b15ae65264709 SHA512 ecb146a12fe3ea3d32ef237e0e67a99d3eadd6ad99997c327eb31027b0f45aa6dbed9dec03ed5c39c62ddd1131762fdc708899e76b2a867416dc0997c1f0727e
 MISC metadata.xml 1161 BLAKE2B 0c501bf06edca82993ece857f9f7565f99da15df36c916bc9dc57e78bccf2b247c382e97dd6c97cc7f5375e1a0513c1a30ecbf097516e96319fd1797257fb117 SHA512 d6bc9cf11ea1bd28c19bfe167580556af517d92c958d63cd7872ab5076840eca39a7ab3d1f56e84fc0fcfb675d7a89c23ccdd3629f665c45232be1140eb950ac
diff --git a/app-admin/sudo/files/sudo-1.9.2-glibc-2.32.patch b/app-admin/sudo/files/sudo-1.9.2-glibc-2.32.patch
deleted file mode 100644
index 6134fe736d00..000000000000
--- a/app-admin/sudo/files/sudo-1.9.2-glibc-2.32.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-
-# HG changeset patch
-# User Todd C. Miller <Todd.Miller@sudo.ws>
-# Date 1598395693 21600
-# Node ID e30482f26924b07775d87ae591e54ad72e794d5e
-# Parent  1ede927d99b3cb06ba514c9fd2fd7fa9a014a1b2
-Use sigabbrev_np(3) to access signal abbreviations if supported.
-glibc-2.32 has removed sys_sigabbrev[], we can use sigabbrev_np(3) instead.
-
-diff -r 1ede927d99b3 -r e30482f26924 config.h.in
---- a/config.h.in	Mon Aug 17 19:37:09 2020 -0600
-+++ b/config.h.in	Tue Aug 25 16:48:13 2020 -0600
-@@ -740,6 +740,9 @@
- /* Define to 1 if you have the `sig2str' function. */
- #undef HAVE_SIG2STR
- 
-+/* Define to 1 if you have the `sigabbrev_np' function. */
-+#undef HAVE_SIGABBREV_NP
-+
- /* Define to 1 if you use S/Key. */
- #undef HAVE_SKEY
- 
-diff -r 1ede927d99b3 -r e30482f26924 configure
---- a/configure	Mon Aug 17 19:37:09 2020 -0600
-+++ b/configure	Tue Aug 25 16:48:13 2020 -0600
-@@ -23687,9 +23687,21 @@
- 
- 
- if test x"${ac_cv_func_sig2str}${ac_cv_func_str2sig}" != x"yesyes"; then
--    COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }strsig_test"
--    HAVE_SIGNAME="false"
--    ac_fn_c_check_decl "$LINENO" "sys_signame" "ac_cv_have_decl_sys_signame" "
-+    for ac_func in sigabbrev_np
-+do :
-+  ac_fn_c_check_func "$LINENO" "sigabbrev_np" "ac_cv_func_sigabbrev_np"
-+if test "x$ac_cv_func_sigabbrev_np" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_SIGABBREV_NP 1
-+_ACEOF
-+
-+fi
-+done
-+
-+    if test x"${ac_cv_func_sigabbrev_np}" != x"yes"; then
-+	COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }strsig_test"
-+	HAVE_SIGNAME="false"
-+	ac_fn_c_check_decl "$LINENO" "sys_signame" "ac_cv_have_decl_sys_signame" "
- $ac_includes_default
- #include <signal.h>
- 
-@@ -23705,7 +23717,7 @@
- _ACEOF
- if test $ac_have_decl = 1; then :
- 
--	HAVE_SIGNAME="true"
-+	    HAVE_SIGNAME="true"
- 
- fi
- ac_fn_c_check_decl "$LINENO" "_sys_signame" "ac_cv_have_decl__sys_signame" "
-@@ -23724,7 +23736,7 @@
- _ACEOF
- if test $ac_have_decl = 1; then :
- 
--	HAVE_SIGNAME="true"
-+	    HAVE_SIGNAME="true"
- 
- fi
- ac_fn_c_check_decl "$LINENO" "sys_sigabbrev" "ac_cv_have_decl_sys_sigabbrev" "
-@@ -23743,12 +23755,12 @@
- _ACEOF
- if test $ac_have_decl = 1; then :
- 
--	HAVE_SIGNAME="true"
--
--fi
--
--    if test "$HAVE_SIGNAME" != "true"; then
--	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for undeclared sys_sigabbrev" >&5
-+	    HAVE_SIGNAME="true"
-+
-+fi
-+
-+	if test "$HAVE_SIGNAME" != "true"; then
-+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for undeclared sys_sigabbrev" >&5
- $as_echo_n "checking for undeclared sys_sigabbrev... " >&6; }
- if ${sudo_cv_var_sys_sigabbrev+:} false; then :
-   $as_echo_n "(cached) " >&6
-@@ -23777,17 +23789,18 @@
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sudo_cv_var_sys_sigabbrev" >&5
- $as_echo "$sudo_cv_var_sys_sigabbrev" >&6; }
--	if test "$sudo_cv_var_sys_sigabbrev" = yes; then
--	    $as_echo "#define HAVE_SYS_SIGABBREV 1" >>confdefs.h
--
--	else
--	    case " $LIBOBJS " in
-+	    if test "$sudo_cv_var_sys_sigabbrev" = yes; then
-+		$as_echo "#define HAVE_SYS_SIGABBREV 1" >>confdefs.h
-+
-+	    else
-+		case " $LIBOBJS " in
-   *" signame.$ac_objext "* ) ;;
-   *) LIBOBJS="$LIBOBJS signame.$ac_objext"
-  ;;
- esac
- 
--	    SIGNAME=signame.lo
-+		SIGNAME=signame.lo
-+	    fi
- 	fi
-     fi
- fi
-diff -r 1ede927d99b3 -r e30482f26924 configure.ac
---- a/configure.ac	Mon Aug 17 19:37:09 2020 -0600
-+++ b/configure.ac	Tue Aug 25 16:48:13 2020 -0600
-@@ -3498,29 +3498,32 @@
- dnl Also enable unit tests for sig2str() and str2sig().
- dnl
- if test x"${ac_cv_func_sig2str}${ac_cv_func_str2sig}" != x"yesyes"; then
--    COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }strsig_test"
--    HAVE_SIGNAME="false"
--    AC_CHECK_DECLS([sys_signame, _sys_signame, sys_sigabbrev], [
--	HAVE_SIGNAME="true"
--    ], [ ], [
-+    AC_CHECK_FUNCS([sigabbrev_np])
-+    if test x"${ac_cv_func_sigabbrev_np}" != x"yes"; then
-+	COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }strsig_test"
-+	HAVE_SIGNAME="false"
-+	AC_CHECK_DECLS([sys_signame, _sys_signame, sys_sigabbrev], [
-+	    HAVE_SIGNAME="true"
-+	], [ ], [
- AC_INCLUDES_DEFAULT
- #include <signal.h>
--    ])
--    if test "$HAVE_SIGNAME" != "true"; then
--	AC_CACHE_CHECK([for undeclared sys_sigabbrev],
--	    [sudo_cv_var_sys_sigabbrev],
--	    [AC_LINK_IFELSE(
--		[AC_LANG_PROGRAM([[extern char **sys_sigabbrev;]], [[return sys_sigabbrev[1];]])],
--		    [sudo_cv_var_sys_sigabbrev=yes],
--		    [sudo_cv_var_sys_sigabbrev=no]
--		)
--	    ]
--	)
--	if test "$sudo_cv_var_sys_sigabbrev" = yes; then
--	    AC_DEFINE(HAVE_SYS_SIGABBREV)
--	else
--	    AC_LIBOBJ(signame)
--	    SIGNAME=signame.lo
-+	])
-+	if test "$HAVE_SIGNAME" != "true"; then
-+	    AC_CACHE_CHECK([for undeclared sys_sigabbrev],
-+		[sudo_cv_var_sys_sigabbrev],
-+		[AC_LINK_IFELSE(
-+		    [AC_LANG_PROGRAM([[extern char **sys_sigabbrev;]], [[return sys_sigabbrev[1];]])],
-+			[sudo_cv_var_sys_sigabbrev=yes],
-+			[sudo_cv_var_sys_sigabbrev=no]
-+		    )
-+		]
-+	    )
-+	    if test "$sudo_cv_var_sys_sigabbrev" = yes; then
-+		AC_DEFINE(HAVE_SYS_SIGABBREV)
-+	    else
-+		AC_LIBOBJ(signame)
-+		SIGNAME=signame.lo
-+	    fi
- 	fi
-     fi
- fi
-diff -r 1ede927d99b3 -r e30482f26924 lib/util/sig2str.c
---- a/lib/util/sig2str.c	Mon Aug 17 19:37:09 2020 -0600
-+++ b/lib/util/sig2str.c	Tue Aug 25 16:48:13 2020 -0600
-@@ -1,7 +1,7 @@
- /*
-  * SPDX-License-Identifier: ISC
-  *
-- * Copyright (c) 2012-2015, 2017-2019 Todd C. Miller <Todd.Miller@sudo.ws>
-+ * Copyright (c) 2012-2015, 2017-2020 Todd C. Miller <Todd.Miller@sudo.ws>
-  *
-  * Permission to use, copy, modify, and distribute this software for any
-  * purpose with or without fee is hereby granted, provided that the above
-@@ -32,20 +32,24 @@
- #include <unistd.h>
- 
- #include "sudo_compat.h"
-+#include "sudo_util.h"
- 
--#if defined(HAVE_DECL_SYS_SIGNAME) && HAVE_DECL_SYS_SIGNAME == 1
--#  define sudo_sys_signame	sys_signame
--#elif defined(HAVE_DECL__SYS_SIGNAME) && HAVE_DECL__SYS_SIGNAME == 1
--#  define sudo_sys_signame	_sys_signame
--#elif defined(HAVE_DECL_SYS_SIGABBREV) && HAVE_DECL_SYS_SIGABBREV == 1
--#  define sudo_sys_signame	sys_sigabbrev
--#else
--# ifdef HAVE_SYS_SIGABBREV
--   /* sys_sigabbrev is not declared by glibc */
--#  define sudo_sys_signame	sys_sigabbrev
-+#if !defined(HAVE_SIGABBREV_NP)
-+# if defined(HAVE_DECL_SYS_SIGNAME) && HAVE_DECL_SYS_SIGNAME == 1
-+#   define sigabbrev_np(_x)	sys_signame[(_x)]
-+# elif defined(HAVE_DECL__SYS_SIGNAME) && HAVE_DECL__SYS_SIGNAME == 1
-+#   define sigabbrev_np(_x)	_sys_signame[(_x)]
-+# elif defined(HAVE_SYS_SIGABBREV)
-+#   define sigabbrev_np(_x)	sys_sigabbrev[(_x)]
-+#  if defined(HAVE_DECL_SYS_SIGABBREV) && HAVE_DECL_SYS_SIGABBREV == 0
-+    /* sys_sigabbrev is not declared by glibc */
-+    extern const char *const sys_sigabbrev[NSIG];
-+#  endif
-+# else
-+#   define sigabbrev_np(_x)	sudo_sys_signame[(_x)]
-+    extern const char *const sudo_sys_signame[NSIG];
- # endif
--extern const char *const sudo_sys_signame[NSIG];
--#endif
-+#endif /* !HAVE_SIGABBREV_NP */
- 
- /*
-  * Translate signal number to name.
-@@ -77,15 +81,18 @@
- 	return 0;
-     }
- #endif
--    if (signo > 0 && signo < NSIG && sudo_sys_signame[signo] != NULL) {
--	strlcpy(signame, sudo_sys_signame[signo], SIG2STR_MAX);
--	/* Make sure we always return an upper case signame. */
--	if (islower((unsigned char)signame[0])) {
--	    int i;
--	    for (i = 0; signame[i] != '\0'; i++)
--		signame[i] = toupper((unsigned char)signame[i]);
-+    if (signo > 0 && signo < NSIG) {
-+	const char *cp = sigabbrev_np(signo);
-+	if (cp != NULL) {
-+	    strlcpy(signame, cp, SIG2STR_MAX);
-+	    /* Make sure we always return an upper case signame. */
-+	    if (islower((unsigned char)signame[0])) {
-+		int i;
-+		for (i = 0; signame[i] != '\0'; i++)
-+		    signame[i] = toupper((unsigned char)signame[i]);
-+	    }
-+	    return 0;
- 	}
--	return 0;
-     }
-     errno = EINVAL;
-     return -1;
-diff -r 1ede927d99b3 -r e30482f26924 lib/util/str2sig.c
---- a/lib/util/str2sig.c	Mon Aug 17 19:37:09 2020 -0600
-+++ b/lib/util/str2sig.c	Tue Aug 25 16:48:13 2020 -0600
-@@ -1,7 +1,7 @@
- /*
-  * SPDX-License-Identifier: ISC
-  *
-- * Copyright (c) 2019 Todd C. Miller <Todd.Miller@sudo.ws>
-+ * Copyright (c) 2019-2020 Todd C. Miller <Todd.Miller@sudo.ws>
-  *
-  * Permission to use, copy, modify, and distribute this software for any
-  * purpose with or without fee is hereby granted, provided that the above
-@@ -37,19 +37,22 @@
- #include "sudo_compat.h"
- #include "sudo_util.h"
- 
--#if defined(HAVE_DECL_SYS_SIGNAME) && HAVE_DECL_SYS_SIGNAME == 1
--#  define sudo_sys_signame	sys_signame
--#elif defined(HAVE_DECL__SYS_SIGNAME) && HAVE_DECL__SYS_SIGNAME == 1
--#  define sudo_sys_signame	_sys_signame
--#elif defined(HAVE_DECL_SYS_SIGABBREV) && HAVE_DECL_SYS_SIGABBREV == 1
--#  define sudo_sys_signame	sys_sigabbrev
--#else
--# ifdef HAVE_SYS_SIGABBREV
--   /* sys_sigabbrev is not declared by glibc */
--#  define sudo_sys_signame	sys_sigabbrev
-+#if !defined(HAVE_SIGABBREV_NP)
-+# if defined(HAVE_DECL_SYS_SIGNAME) && HAVE_DECL_SYS_SIGNAME == 1
-+#   define sigabbrev_np(_x)	sys_signame[(_x)]
-+# elif defined(HAVE_DECL__SYS_SIGNAME) && HAVE_DECL__SYS_SIGNAME == 1
-+#   define sigabbrev_np(_x)	_sys_signame[(_x)]
-+# elif defined(HAVE_SYS_SIGABBREV)
-+#   define sigabbrev_np(_x)	sys_sigabbrev[(_x)]
-+#  if defined(HAVE_DECL_SYS_SIGABBREV) && HAVE_DECL_SYS_SIGABBREV == 0
-+    /* sys_sigabbrev is not declared by glibc */
-+    extern const char *const sys_sigabbrev[NSIG];
-+#  endif
-+# else
-+#   define sigabbrev_np(_x)	sudo_sys_signame[(_x)]
-+    extern const char *const sudo_sys_signame[NSIG];
- # endif
--extern const char *const sudo_sys_signame[NSIG];
--#endif
-+#endif /* !HAVE_SIGABBREV_NP */
- 
- /*
-  * Many systems use aliases for source backward compatibility.
-@@ -154,11 +157,11 @@
- 	}
-     }
- 
--    /* Check sys_signame[]. */
-     for (signo = 1; signo < NSIG; signo++) {
--	if (sudo_sys_signame[signo] != NULL) {
-+	const char *cp = sigabbrev_np(signo);
-+	if (cp != NULL) {
- 	    /* On macOS sys_signame[] may contain lower-case names. */
--	    if (strcasecmp(signame, sudo_sys_signame[signo]) == 0) {
-+	    if (strcasecmp(signame, cp) == 0) {
- 		*result = signo;
- 		return 0;
- 	    }
-
diff --git a/app-admin/sudo/sudo-1.9.2.ebuild b/app-admin/sudo/sudo-1.9.2.ebuild
deleted file mode 100644
index ff902d2d4e1d..000000000000
--- a/app-admin/sudo/sudo-1.9.2.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam multilib libtool systemd tmpfiles
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} == "9999" ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
-	uri_prefix=
-	case ${P} in
-		*_beta*|*_rc*) uri_prefix=beta/ ;;
-	esac
-
-	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris"
-	fi
-fi
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
-
-DEPEND="
-	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:= )
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1
-		sasl? (
-			dev-libs/cyrus-sasl
-			net-nds/openldap[sasl]
-		)
-	)
-	pam? ( sys-libs/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	sssd? ( sys-auth/sssd[sudo] )
-"
-RDEPEND="
-	${DEPEND}
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	selinux? ( sec-policy/selinux-sudo )
-	sendmail? ( virtual/mta )
-"
-BDEPEND="
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	pam? ( !skey )
-	skey? ( !pam )
-"
-
-REQUIRED_USE="?? ( gcrypt ssl )"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-set_secure_path() {
-	# FIXME: secure_path is a compile time setting. using PATH or
-	# ROOTPATH is not perfect, env-update may invalidate this, but until it
-	# is available as a sudoers setting this will have to do.
-	einfo "Setting secure_path ..."
-
-	# first extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
-		echo "${ROOTPATH}")
-		case "${SECURE_PATH}" in
-			*/usr/sbin*) ;;
-			*) SECURE_PATH=$(unset PATH;
-				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-				;;
-		esac
-	if [[ -z ${SECURE_PATH} ]] ; then
-		ewarn "	Failed to detect SECURE_PATH, please report this"
-	fi
-
-	# then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:${thisp}
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
-	# finally, strip gcc paths #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${SECURE_PATH} ; do
-			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
-			newpath+=:${thisp}
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-
-	einfo "... done"
-}
-
-src_configure() {
-	local SECURE_PATH
-	set_secure_path
-
-	# audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	myeconfargs=(
-		# requires some python eclass
-		--disable-python
-		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
-		--enable-zlib=system
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/run/sudo
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable sasl)
-		$(use_enable ssl openssl)
-		$(use_with ldap)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with pam)
-		$(use_with pam pam-login)
-		$(use_with secure-path secure-path "${SECURE_PATH}")
-		$(use_with selinux)
-		$(use_with sendmail)
-		$(use_with skey)
-		$(use_with sssd)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		if use sasl ; then
-			cat <<-EOF >> "${T}"/ldap.conf.sudo
-
-			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
-			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
-			EOF
-		fi
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins doc/schema.OpenLDAP sudo.schema
-	fi
-
-	pamd_mimic system-auth sudo auth account session
-	pamd_mimic system-auth sudo-i auth account session
-
-	keepdir /var/db/sudo/lectured
-	fperms 0700 /var/db/sudo/lectured
-	fperms 0711 /var/db/sudo #652958
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED}"/run || die
-
-	find "${ED}" -type f -name "*.la" -delete || die #697812
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	#652958
-	local sudo_db="${EROOT}/var/db/sudo"
-	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
-		chmod 711 "${sudo_db}" || die
-	fi
-
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in /etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.9.3_p1.ebuild b/app-admin/sudo/sudo-1.9.3_p1.ebuild
index d0873828489a..32639cb05df9 100644
--- a/app-admin/sudo/sudo-1.9.3_p1.ebuild
+++ b/app-admin/sudo/sudo-1.9.3_p1.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris"
 	fi
 fi
 
@@ -68,12 +68,10 @@ BDEPEND="
 S="${WORKDIR}/${MY_P}"
 
 REQUIRED_USE="
-	pam? ( !skey )
-	skey? ( !pam )
+	?? ( pam skey )
+	?? ( gcrypt ssl )
 "
 
-REQUIRED_USE="?? ( gcrypt ssl )"
-
 MAKEOPTS+=" SAMPLES="
 
 src_prepare() {
diff --git a/app-admin/sudo/sudo-1.9.2-r1.ebuild b/app-admin/sudo/sudo-1.9.4_rc2.ebuild
index 1f1f6e60dd34..84770ae1b432 100644
--- a/app-admin/sudo/sudo-1.9.2-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.4_rc2.ebuild
@@ -68,16 +68,12 @@ BDEPEND="
 S="${WORKDIR}/${MY_P}"
 
 REQUIRED_USE="
-	pam? ( !skey )
-	skey? ( !pam )
+	?? ( pam skey )
+	?? ( gcrypt ssl )
 "
 
-REQUIRED_USE="?? ( gcrypt ssl )"
-
 MAKEOPTS+=" SAMPLES="
 
-PATCHES=( "${FILESDIR}/${P}-glibc-2.32.patch" )  # drop for releases after 1.9.2
-
 src_prepare() {
 	default
 	elibtoolize
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 7d0daa6f3504..84770ae1b432 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit pam multilib libtool tmpfiles
+inherit pam multilib libtool systemd tmpfiles
 
 MY_P="${P/_/}"
 MY_P="${MY_P/beta/b}"
@@ -49,7 +49,7 @@ DEPEND="
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	sssd? ( sys-auth/sssd[sudo(+)] )
+	sssd? ( sys-auth/sssd[sudo] )
 "
 RDEPEND="
 	${DEPEND}
@@ -62,13 +62,14 @@ RDEPEND="
 "
 BDEPEND="
 	sys-devel/bison
+	virtual/pkgconfig
 "
 
 S="${WORKDIR}/${MY_P}"
 
 REQUIRED_USE="
-	pam? ( !skey )
-	skey? ( !pam )
+	?? ( pam skey )
+	?? ( gcrypt ssl )
 "
 
 MAKEOPTS+=" SAMPLES="
@@ -198,6 +199,7 @@ src_install() {
 	fi
 
 	pamd_mimic system-auth sudo auth account session
+	pamd_mimic system-auth sudo-i auth account session
 
 	keepdir /var/db/sudo/lectured
 	fperms 0700 /var/db/sudo/lectured
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index daa195e8802b..843b2e2d686d 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -8,14 +8,12 @@ AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530
 AUX syslog-ng.logrotate.hardened.in 1662 BLAKE2B 488ab7e26b081267bdeecd91013ce5118e79dca89567789be9b85f8712a0f8f11005c2459eb334ab5bdfab08c780063e7025a242330367f710717a79352e0d96 SHA512 1c19837570da6c77d49252303abe0ac91280c500bd82c1eab45c4c1534b83d758782dd576b12006bdd738508892d4b898ba29c0969aba536b333ab9b99e6bd83
 AUX syslog-ng.logrotate.in 237 BLAKE2B dd2851749f3f56b2099442610fcd85cbfd50a52a8c1ae60726b312ea845f3f0b20e436a4e11a377b9faecb1fa3f0febc008ae262e56018775b82d923ba5f2340 SHA512 4e59f8537579caa249ebe12c53946266633972ac6805b7ccd684a5749deeb897783a4e74570ceec15311edb3531aa4278bba468058227ab4c664a697cc604376
 AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a007d8f4978e1bbd4ce1f1e8f9daefb60c586aa58756d7d98ca59a869ae8e3f4addac732b6086ba5 SHA512 9e21637b684a48093d00ad9b5d4dbb79178ea8cc280cb03dbce235193e916bf3bd10b091a901cf13842f1c080b707a36efe8833bbde9d2721245598a3fe038df
-DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B e4f7e47f1939fb07d204c4721ff558a606cf6c6ee072278ff7c9bc1db7406e6abf058ac8a96bd4df0b867272bdbc5401528d47c94e60d90ff5ebb1aaec49e223 SHA512 4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f
-DIST syslog-ng-3.24.1.tar.gz 4909513 BLAKE2B 4b8d05899f9767784b6d24008d55808bee0af4a29883b2cb67031d23f4937632ba00f2ed7a9e969984ebec2785243a9e60811c4c2ccb3c6188c66a71af004f36 SHA512 b5326193e20db16763d3e187292bf683ebb77032b800a6e54a4ce2dd3864dda48b3d0ffc4d442eff0261117ac7a76d7927f4c8d0d96fc59ce29b46da6bd052d5
-DIST syslog-ng-3.25.1.tar.gz 4938596 BLAKE2B bfcbd19b5a06c7ea15899bb919564661043bc7ab87bed147f77ab1aed153d70522aba9a42ab7dfa66d3b52a5f8432954b8a00594f428ddeb202979c5b9260da3 SHA512 79e09f1ba11080179c572016ce27328a28d479e68e663d39fb16624c03dc37d8439020ede922f78680e31e21629a6c13a4671464a31213c1dcf6acd2c5cd4b13
 DIST syslog-ng-3.26.1.tar.gz 5040993 BLAKE2B 235971547c8febe61191014d971b9e5d71560f51ebc3a74fbae1c95b86653f1de8d0b99788f5b00cc75926dc67e7a80f650e9d2d12f191a4400c5b8edbbd01b7 SHA512 2cf6a8bd70addec3bef0888539f4a4686c30655698835d0c211ea929a0cae91a6f3dc9903f29fe717fd9d48b5cdc9918796f196ca84af6f5733bedff09ffab5a
 DIST syslog-ng-3.28.1.tar.gz 5149671 BLAKE2B bfc33f2a595cb4fbcc5a69b60d283673922873434b21ca8ce9685a0f54b355f162b11242704419349a561f412573c84df30a49a4dc0cc95699e98720e3e65247 SHA512 d70b435a6c9d1d0d22ecebc051dc294b6e7f841159edabf229c772c40342a28014ea1599b2277f0514236f545bac63c9879988fd85d634e9ab4fe4f079c984cb
-EBUILD syslog-ng-3.22.1.ebuild 4936 BLAKE2B 04f1a6919c18f56ac8a3bc7603deb39b6b8813211f459c893006d9accad4df75fc594cbd1fd95ecb86fc913e324db31014be9732ffca8a86137effef2f33ecf8 SHA512 f693d5c9a4171ae85c4a37d595ff613dcda4966bbdbcf47b3bee41022320f1d18e54ed2cd5931000b485cdce85cdc557418f683739efc12728623084dfa62acb
-EBUILD syslog-ng-3.24.1.ebuild 4883 BLAKE2B e48c762ee8d64e1519444632f9db25561cda743e2312726efdfd1f5c931e735a6fa0a6b361d408681c1a2fe5dd34b1549115d0d09b6293097c87603282668d65 SHA512 6e37630522517a83d80fcf97c644c6a434d439b76d53ec267ecf460f11c245b438d0d7439299f8c8260ef88007f96383f06d8e61c1e5469b750c2bfc25592ef4
-EBUILD syslog-ng-3.25.1.ebuild 4909 BLAKE2B 2023e42d14273f411e66e33b5ae3213126ec3de11c24ced371db5e6f5da2bd5b08a535981031db30ca9b753e718956f1dac8fc0ca79f63102f631d0158c4988e SHA512 5f104319d94922cd0e25db9dad30a897243eb271215ed5dab2a6bb05d21c33a69cf60f00713a63115a3ddde9ff79b4f59c1912bb1a5bb7f970e6189df872b63c
+DIST syslog-ng-3.29.1.tar.gz 5111614 BLAKE2B 1dba62290d6354d0cda7d43783327a19f69e05963c6d2e75f42c61c30984d49d28f1c6474e68ccdd806f38022bf6799e69e12f2444da391b2bccb736ca597c72 SHA512 c8ec6527cab9e46effe23aaa1306b5bde1e13c3e62a092a62af630a744cc41e81d861e6e2ebfbaad8a9199d3b75ba4ac5fb4b4215d03f80a41f57a2e7a074a49
+DIST syslog-ng-3.30.1.tar.gz 5707042 BLAKE2B 3e6ee58b3732ae4863de43c7d22799a74074e94dbbf735368c09c11382b641a5554a4a25ad836b4ac25c8a4f64781dbfb1d9ddd6961ba3aa70c4213cfec81bfd SHA512 ac7ed4978c6db9464add30aa7aeb71a646f841593b02884c8d4ad34c0508c8d3243bcbe6ee98e81c04698895305334eadd9e624ba71e510c14d79155723efb52
 EBUILD syslog-ng-3.26.1-r1.ebuild 4912 BLAKE2B 223a987f7a8ff45cdccfa8fc752cecec828844cabbeaff8b676a7fdd7ca4e178e1fd54165b282b164c19f8557da173dcfcab394ef1401bce834b292591e441aa SHA512 3d5e94841c6faef3231bfc8eeda15acce308b009973eafaac20af4d1eba121f657e5512635665f9c015f5d4c11a50d21e1e660ff13546d5cb4541c27613df758
-EBUILD syslog-ng-3.28.1-r2.ebuild 4902 BLAKE2B 4bc2a472ae0a8050f55024545c3e072048480fb9cef36086a8a8e921474cd41bfa424c9840056e69951dc045a71974a024949f1529d8e3b189a4d817dd922e7f SHA512 652b65723665818e0731cfc506d3c0f71e82dfb6b7f64157e33ce64b98d57631bca0a7fc95118cb655b0e3f5d3053a08fb29a0ccd8075ae7b65d77a3dc2d7556
+EBUILD syslog-ng-3.28.1-r2.ebuild 4905 BLAKE2B a51992106f832abbfdcf876ba3472693e7d13594194b0fa165df8f593f32f6422d3fd8271808d41980350ffc5a50765eaaeaf1109aff4543e4fc9a426c6055f9 SHA512 3407603658ae6dd0869377921b383dfbff9a5e2b1d01cb5cd571254eb095c69f04acb01112ac3d40c137523fb0a2e4a45ae69e0aa4e29d828a2a107574a6bae3
+EBUILD syslog-ng-3.29.1.ebuild 4905 BLAKE2B a51992106f832abbfdcf876ba3472693e7d13594194b0fa165df8f593f32f6422d3fd8271808d41980350ffc5a50765eaaeaf1109aff4543e4fc9a426c6055f9 SHA512 3407603658ae6dd0869377921b383dfbff9a5e2b1d01cb5cd571254eb095c69f04acb01112ac3d40c137523fb0a2e4a45ae69e0aa4e29d828a2a107574a6bae3
+EBUILD syslog-ng-3.30.1.ebuild 4905 BLAKE2B a51992106f832abbfdcf876ba3472693e7d13594194b0fa165df8f593f32f6422d3fd8271808d41980350ffc5a50765eaaeaf1109aff4543e4fc9a426c6055f9 SHA512 3407603658ae6dd0869377921b383dfbff9a5e2b1d01cb5cd571254eb095c69f04acb01112ac3d40c137523fb0a2e4a45ae69e0aa4e29d828a2a107574a6bae3
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
deleted file mode 100644
index 2c03b8605793..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
+++ /dev/null
@@ -1,171 +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 python-single-r1 systemd
-
-MY_PV_MM=$(ver_cut 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# unit tests require https://github.com/Snaipe/Criterion with additional deps
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.10.1:2
-	>=dev-libs/ivykis-0.42.4
-	>=dev-libs/libpcre-6.1:=
-	!dev-libs/eventlog
-	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
-	caps? ( sys-libs/libcap )
-	dbi? ( >=dev-db/libdbi-0.9.0 )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
-	geoip2? ( dev-libs/libmaxminddb:= )
-	http? ( net-misc/curl )
-	json? ( >=dev-libs/json-c-0.9:= )
-	kafka? ( >=dev-libs/librdkafka-1.0.0:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-	spoof-source? ( net-libs/libnet:1.1= )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
-	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
-	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local f
-
-	use python && python_fix_shebang .
-
-	# remove bundled libs
-	rm -r lib/ivykis || die
-
-	# drop scl modules requiring json
-	if use !json; then
-		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
-	fi
-
-	# drop scl modules requiring http
-	if use !http; then
-		sed -i -r '/slack|telegram/d' scl/Makefile.am || die
-	fi
-
-	# use gentoo default path
-	if use systemd; then
-		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
-			-i contrib/systemd/syslog-ng@default || die
-	fi
-
-	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
-		sed \
-			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
-				"/etc/init.d/syslog-ng reload")#g" \
-			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	for f in syslog-ng.conf.gentoo.hardened.in \
-			syslog-ng.conf.gentoo.in; do
-		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-docs
-		--disable-java
-		--disable-java-modules
-		--disable-riemann
-		--enable-manpages
-		--localstatedir=/var/lib/syslog-ng
-		--sysconfdir=/etc/syslog-ng
-		--with-embedded-crypto
-		--with-ivykis=system
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng
-		--with-pidfile-dir=/var/run
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_enable amqp)
-		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
-		$(use_enable caps linux-caps)
-		$(use_enable dbi sql)
-		$(use_enable geoip)
-		$(use_enable geoip2)
-		$(use_enable http)
-		$(use_enable ipv6)
-		$(use_enable json)
-		$(use_enable kafka)
-		$(use_enable mongodb)
-		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
-		$(use_enable pacct)
-		$(use_enable python)
-		$(use_enable redis)
-		$(use_enable smtp)
-		$(use_enable snmp snmp-dest)
-		$(use_enable spoof-source)
-		$(use_enable systemd)
-		$(use_enable tcpd tcp-wrapper)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	# Install default configuration
-	insinto /etc/default
-	doins contrib/systemd/syslog-ng@default
-
-	insinto /etc/syslog-ng
-	newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
-
-	insinto /etc/logrotate.d
-	newins "${T}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
-	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
-	find "${D}" -name '*.la' -delete || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	# bug #355257
-	if ! has_version app-admin/logrotate ; then
-		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-		elog "for logrotate to use."
-	fi
-
-	if use systemd; then
-		ewarn "The service file for systemd has changed to support multiple instances."
-		ewarn "To start the default instance issue:"
-		ewarn "# systemctl start syslog-ng@default"
-	fi
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild b/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild
index 464779f524ff..a9abc617c791 100644
--- a/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	redis? ( >=dev-libs/hiredis-0.11.0:= )
 	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
+	snmp? ( net-analyzer/net-snmp:0= )
 	spoof-source? ( net-libs/libnet:1.1= )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
diff --git a/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.29.1.ebuild
index 5a0dfd96064e..a9abc617c791 100644
--- a/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.29.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
@@ -34,7 +34,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	redis? ( >=dev-libs/hiredis-0.11.0:= )
 	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
+	snmp? ( net-analyzer/net-snmp:0= )
 	spoof-source? ( net-libs/libnet:1.1= )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -49,8 +49,9 @@ BDEPEND="
 DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
 	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
 	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
-
-PATCHES=( "${FILESDIR}/patches/${PN}-fno-common.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -125,7 +126,7 @@ src_configure() {
 		$(use_enable python)
 		$(use_enable redis)
 		$(use_enable smtp)
-		$(use_enable snmp snmp-dest)
+		$(use_enable snmp afsnmp)
 		$(use_enable spoof-source)
 		$(use_enable systemd)
 		$(use_enable tcpd tcp-wrapper)
diff --git a/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
index 900f50cb7f4f..a9abc617c791 100644
--- a/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
@@ -14,10 +14,9 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# unit tests require https://github.com/Snaipe/Criterion with additional deps
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.10.1:2
@@ -35,13 +34,14 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	redis? ( >=dev-libs/hiredis-0.11.0:= )
 	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
+	snmp? ( net-analyzer/net-snmp:0= )
 	spoof-source? ( net-libs/libnet:1.1= )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/criterion )"
 BDEPEND="
 	sys-devel/flex
 	virtual/pkgconfig"
@@ -49,6 +49,9 @@ BDEPEND="
 DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
 	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
 	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -123,7 +126,7 @@ src_configure() {
 		$(use_enable python)
 		$(use_enable redis)
 		$(use_enable smtp)
-		$(use_enable snmp snmp-dest)
+		$(use_enable snmp afsnmp)
 		$(use_enable spoof-source)
 		$(use_enable systemd)
 		$(use_enable tcpd tcp-wrapper)
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 70b67860619a..7191b878e945 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -5,9 +5,10 @@ DIST sysstat-12.2.1.tar.gz 1227707 BLAKE2B 566382d83a0230517d22e2630a9cb1aa631d7
 DIST sysstat-12.2.2.tar.gz 1227793 BLAKE2B 7dcfe904aa60e9c61af516e718668a3f8fb9e4274c51a2c9d44b5e56dc6cf27ffb18d44641970f75abe1c1f8a2c5df8b7a7874da8745757f937ccc2ffbfa03d4 SHA512 82f4fb1e78a26275bdc6f6939dd2c75d7822e930992e74c1eaeda65c0e873d88e777a7f315c7b073aaacb6956281b2119448af2ca22ae6e7f1d20c370b01e3e4
 DIST sysstat-12.2.3.tar.gz 1227666 BLAKE2B e78cba586eb8e5f5a971f608ee0df39a20e3af9f02db1778c52bbb09eb4565e29ffb79d68ed00af0142ccbf1120b97825c638b323b53e0b210c96bf808db4aa1 SHA512 d837193b59840b1b1a87f927a4416ba4c688f3b470be00e9ab013b62b2f11e7b963ef4cf521bc42a0a041ea8923e176922ee5b6df56c0612b6646054b048f067
 DIST sysstat-12.4.0.tar.gz 1375207 BLAKE2B 66a9c15bb4e3b349158c9f7ab37d00c77844f0fd654df1b613141d906d3c89477e581d7143c77ba6952dd2cc7296f0611bc99aeec8e55e8090a488d5a286ee8b SHA512 156cb38bc4cedb68278d9054ce5b477cbdc84d2480ca302988c0fb5427b9f1f823f0939f2bc1c91fa7657b00b29d02d1f58aeafd342eef83b07d79c3f4141be4
+DIST sysstat-12.4.1.tar.gz 1377429 BLAKE2B 878d20575f5397adf10f64ad935b1c08709f6149f875975377c0a9f9b741f9bf352d0dd92ae31c0e7544c2e59e2058fab9ec5be95bfe9d070048661a7ba3bbfa SHA512 203e77095bddeb3797a65ed9e51cab90beaae7f579624c3f55d6903d45b9395d2134ea8e773a572710fd837fd26fb5437dccad63a913536b916f659207256d98
 EBUILD sysstat-12.2.1.ebuild 1697 BLAKE2B 324b3f29cd5f16aa49906899800e10654e2dbe44cae89fe636b24a966fb7492563f3b55fd3c19f84cadc15a64a3f56a797848d69ddd96ab286d66554bdf6e856 SHA512 16e7d56294fe96c2145787ea8727ad41e55a3f567046c4fd6c36f41b62d516f9777b16d2c52e0308cf46eade70239336255b7e355762b2ac72478bd1f9088c04
 EBUILD sysstat-12.2.2.ebuild 1704 BLAKE2B 3d5e89a9fedf962c45e9b89648cc43241271aba8aa4998c8f21e82fe9f9d156aefe68abfc216b8de9cd427f792d8571ff352eadc8febadd4a46b5f2fd190ae91 SHA512 1d69d5199688fe2b764a160c994bfe208cbd5129c187a89b8526c6ffd10f64d499465ff0341d6d8c903dfe8f1e71f22b83948d5cbd7a04859a3db6ad049b92e6
 EBUILD sysstat-12.2.3.ebuild 1704 BLAKE2B 3d5e89a9fedf962c45e9b89648cc43241271aba8aa4998c8f21e82fe9f9d156aefe68abfc216b8de9cd427f792d8571ff352eadc8febadd4a46b5f2fd190ae91 SHA512 1d69d5199688fe2b764a160c994bfe208cbd5129c187a89b8526c6ffd10f64d499465ff0341d6d8c903dfe8f1e71f22b83948d5cbd7a04859a3db6ad049b92e6
 EBUILD sysstat-12.4.0.ebuild 1793 BLAKE2B 0f4ba0a7003a1d84d742d9c274cd45fd057eb0652ca318ab528924b395469ce24f44aa7d480861a1d2c05d98305fee5a184f6e34d9e061c1e307832fde5f6f4a SHA512 551c7a81c035a788aec9ea9fdf70f475e88d21cd95be2b062ed26a70911d048027066e7caa0945689ff6ee106f96aa6ff48bd5b346f75fc26fd21f4979b2e7f2
-EBUILD sysstat-999999.ebuild 1610 BLAKE2B beb0eb130dc39e72ddefb7016fb81a5ce0629baed38c1ccf23ff9ea97f8995097be44eb00635d21455bb0b1e6c9933f40ad7c17c2a6199d031520c638377aa4c SHA512 8212abdf2a37f4b0a92b09485c4a197d9673a8f524fbb07bc4dc5c4f32e754fbf697dc0219c707b3f4cc5a5472792296c7a31aac58ec11b044f9eabcf6676f70
-MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
+EBUILD sysstat-12.4.1.ebuild 1892 BLAKE2B bf8a743873f7ca68be1f4a3fc0b00bc6cd2835cfbe7aaabcb0bb8a5b803c125919ce4a38d9b1eb07bc641daef2943d9574c7af9225dc7974a9f319471cf6322b SHA512 638db560f95991be44c4b19d6c2b63b5faf738db344a1927c89da2bb9cbe400cedd122408a0ffc3554fda9d18c020cfea8dc7719b44128d3ff68f05d6d102bc1
+MISC metadata.xml 362 BLAKE2B feda4d7de32dd65f3f8d0c2b263e88f88d4601db855e600299b15cf3fa735deca9d5fceef6bd444341e9779c88e83142bd1f4126c9e69efc57c0865a74246824 SHA512 7fd37cdf3ba90f14371aa39016cb5a84fe0fba0e5798ef98757db29dd2915554d30369c2d171f8013dca8183aac9a8fcfd4df67dd336aa1393aa5f984a14ae30
diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml
index a8fb43312942..50a898b9e1ca 100644
--- a/app-admin/sysstat/metadata.xml
+++ b/app-admin/sysstat/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<use>
+		<flag name="dcron">Adjust cronjobs to work properly under <pkg>sys-process/dcron</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/app-admin/sysstat/sysstat-999999.ebuild b/app-admin/sysstat/sysstat-12.4.1.ebuild
index c59bf0c9f963..82b41029b0a2 100644
--- a/app-admin/sysstat/sysstat-999999.ebuild
+++ b/app-admin/sysstat/sysstat-12.4.1.ebuild
@@ -2,16 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils flag-o-matic git-r3 systemd toolchain-funcs
+inherit eutils flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-EGIT_REPO_URI="https://github.com/sysstat/sysstat"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="debug nls lm-sensors selinux static"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="dcron debug nls lm-sensors selinux static systemd"
 
 CDEPEND="
 	nls? ( virtual/libintl )
@@ -23,13 +23,15 @@ DEPEND="
 "
 RDEPEND="
 	${CDEPEND}
+	!dcron? ( !sys-process/dcron )
 	selinux? ( sec-policy/selinux-sysstat )
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
 	"${FILESDIR}"/${PN}-11.7.3-flags.patch
 )
 
+REQUIRED_USE="dcron? ( !systemd )"
+
 src_prepare() {
 	if use nls; then
 		strip-linguas -i nls/
@@ -43,6 +45,7 @@ src_prepare() {
 		done
 	fi
 
+	use dcron && { sed -i 's/@CRON_OWNER@ //g' cron/sysstat.crond.in || die ; }
 	default
 }
 
@@ -53,9 +56,11 @@ src_configure() {
 	sa_lib_dir=/usr/lib/sa \
 		conf_dir=/etc \
 		econf \
+			$(use_enable !systemd use-crond) \
 			$(use_enable lm-sensors sensors) \
 			$(use_enable nls) \
 			$(usex debug --enable-debuginfo '') \
+			--disable-compress-manpg \
 			--enable-copy-only \
 			--enable-documentation \
 			--enable-install-cron \
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index e89af61b335c..3fe4ff42d7db 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,5 +1,7 @@
-AUX system-config-printer-1.5.12-check-for-null.patch 2048 BLAKE2B e6a87f6ae92cd29f3fa4900be4df2bcfb54892a87346a24baabe8fa4ea779d69a259bab7f25f7121d90b7599c15721044fe530b80654160501631857b332d705 SHA512 4a640793f89b637620c12d99ddc53b7ed87ba5cfc19bf90a3c8f7c2938bb17deba540bfe4312556fe253be52f087340d6b2a794c305c78443515a4f6c1eceace
+AUX system-config-printer-1.5.12-check-for-null.patch 1818 BLAKE2B 92d18f4d02a6d225009d671834de72a8c5413745d0ce15b0f0807b82ecd71f576280f89aff1c91570825d85eaac6a51b564e74063ff631c790989f5761f533c4 SHA512 ddf3e079ec303453b415365658f2b1b868a0ce09784241e7015935c53ade7b3a6927f26b92925fcbd6021d11ab5187a663e6ee7325cf42d14df70cb4a876d3b8
 AUX system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch 2206 BLAKE2B 82195b83923cf84bd33ea141f0e7443d16b3540845fe867251f77e53324b255a076ad7d14f4e29690ef139fd1a53f832968927d03e8885648d377ab466305667 SHA512 d093a81ec6d92f242b18d5f5bc1fb96d36797fe85dfd2a7c7edf99138a3bf392543a350fde4e051e97d7640cb14323a7754029d4a082adde3d7f2d89f1262a1f
 DIST system-config-printer-1.5.12.tar.xz 955756 BLAKE2B 766cc7307382a7b0ab65387650f1568fd5108dae2693dfc93684c6593e28837d513e4c823bf4e07c3ba2123eea8aba0649135020318f06f38633b9837683d7f7 SHA512 c8b0702dcdf99c4e8a19274dd4a3f82d9263bd5f51d0c19edf7d71fb13095f57a35e643ddbe161ffb5805e72bf7da0cb6a3de44a554854390ac05d8e56644c32
+DIST system-config-printer-1.5.13.tar.xz 974532 BLAKE2B 44e748d2fc20edefe58e1c8dd3781aff28af93e57356a9969e051813bf4f04f72c4e895b587e86614df6fb4984a4d610e8e1a1e17777801ae8912b6904679c72 SHA512 f4fbc1b20b35aa5b33bafdffc8a7490cc3c55e0b33bd9e925f1d3e01532c0a7bb87f80a04dd6da6fc492edd9fea74bacb0ce16ff64ceac622722fe1f9a77a6b7
 EBUILD system-config-printer-1.5.12-r1.ebuild 2088 BLAKE2B 18263b2bafaf63afd0de6cca23e2a784dd1255092047b35add616b734fe2716ac5a6182710f15366794685856d872f2a564aa27560f71118136fa3187b22a7c8 SHA512 9cb001ec8d26c2fd22f3ad9163d87e09f9563fbf86eeac6d9f181f9fc3eeba68b54fff0374fd2d9e886a38b4e710abe750bdb14097f4dc138dbcd3f0e1ecac40
+EBUILD system-config-printer-1.5.13.ebuild 1944 BLAKE2B 1fd5d8c0120a56e7ebf0b2c46ffef49336d2cf9d59fd22a6ac2cf6142312542a86c3c33c0f45098a057dfc503353d98bf44e6c27dc62fd941f3ca3a0adfcaf32 SHA512 5f097d792d83f0fe137483ebc2e9c912d933937d3315a2970d77732c7d06780a2b1164f01166b10f2281279fa4813487a83c7a7dd4c817b51a646e719d75d6e1
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/files/system-config-printer-1.5.12-check-for-null.patch b/app-admin/system-config-printer/files/system-config-printer-1.5.12-check-for-null.patch
index 1c03bbd193fc..b0df809c9398 100644
--- a/app-admin/system-config-printer/files/system-config-printer-1.5.12-check-for-null.patch
+++ b/app-admin/system-config-printer/files/system-config-printer-1.5.12-check-for-null.patch
@@ -1,58 +1,46 @@
-From cf9903466c1a2d18a701f3b5e8c7e03483e1244d Mon Sep 17 00:00:00 2001
-From: Zdenek Dohnal <zdohnal@redhat.com>
-Date: Mon, 14 Oct 2019 16:39:28 +0200
-Subject: [PATCH] udev-configure-printer: Add checks for NULL
-
----
- NEWS                          |  1 +
- udev/udev-configure-printer.c | 12 +++++++++---
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index f4b774e5c..0b53aa8ef 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,5 +1,6 @@
- 1.5.13 changes
- --------------
-+- add checks for NULL in udev-configure-printer (Fedora #1761097)
+From cf9903466c1a2d18a701f3b5e8c7e03483e1244d Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Mon, 14 Oct 2019 16:39:28 +0200
+Subject: [PATCH] udev-configure-printer: Add checks for NULL
+
+---
+ udev/udev-configure-printer.c | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
+index 83092fc21..d753bbeaf 100644
+--- a/udev/udev-configure-printer.c
++++ b/udev/udev-configure-printer.c
+@@ -1411,7 +1411,7 @@ for_each_matching_queue (struct device_uris *device_uris,
+       const char *printer_state_message = NULL;
+       int state = 0;
+       size_t i, l;
+-      char *this_device_uri_n, *device_uri_n;
++      char *this_device_uri_n = NULL, *device_uri_n = NULL;
+       const char *ps1, *ps2, *pi1, *pi2;
  
- 1.5.12 changes
- --------------
-diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
-index 83092fc21..d753bbeaf 100644
---- a/udev/udev-configure-printer.c
-+++ b/udev/udev-configure-printer.c
-@@ -1411,7 +1411,7 @@ for_each_matching_queue (struct device_uris *device_uris,
-       const char *printer_state_message = NULL;
-       int state = 0;
-       size_t i, l;
--      char *this_device_uri_n, *device_uri_n;
-+      char *this_device_uri_n = NULL, *device_uri_n = NULL;
-       const char *ps1, *ps2, *pi1, *pi2;
- 
-       while (attr && ippGetGroupTag (attr) != IPP_TAG_PRINTER)
-@@ -1448,6 +1448,8 @@ for_each_matching_queue (struct device_uris *device_uris,
-       for (i = 0; i < device_uris->n_uris; i++)
- 	{
- 	  device_uri_n = normalize_device_uri(device_uris->uri[i]);
-+          if (this_device_uri_n == NULL || device_uri_n == NULL)
-+            goto skip;
- 	  /* As for the same device different URIs can come out when the
- 	     device is accessed via the usblp kernel module or via low-
- 	     level USB (libusb) we cannot simply compare URIs, must
-@@ -1512,8 +1514,12 @@ for_each_matching_queue (struct device_uris *device_uris,
-       firstqueue = 0;
- 
-     skip:
--      free(device_uri_n);
--      free(this_device_uri_n);
-+      if (device_uri_n != NULL)
-+        free(device_uri_n);
-+        device_uri_n = NULL;
-+      if (this_device_uri_n != NULL)
-+        free(this_device_uri_n);
-+        this_device_uri_n = NULL;
-       if (!attr)
- 	break;
-     }
+       while (attr && ippGetGroupTag (attr) != IPP_TAG_PRINTER)
+@@ -1448,6 +1448,8 @@ for_each_matching_queue (struct device_uris *device_uris,
+       for (i = 0; i < device_uris->n_uris; i++)
+ 	{
+ 	  device_uri_n = normalize_device_uri(device_uris->uri[i]);
++          if (this_device_uri_n == NULL || device_uri_n == NULL)
++            goto skip;
+ 	  /* As for the same device different URIs can come out when the
+ 	     device is accessed via the usblp kernel module or via low-
+ 	     level USB (libusb) we cannot simply compare URIs, must
+@@ -1512,8 +1514,12 @@ for_each_matching_queue (struct device_uris *device_uris,
+       firstqueue = 0;
+ 
+     skip:
+-      free(device_uri_n);
+-      free(this_device_uri_n);
++      if (device_uri_n != NULL)
++        free(device_uri_n);
++        device_uri_n = NULL;
++      if (this_device_uri_n != NULL)
++        free(this_device_uri_n);
++        this_device_uri_n = NULL;
+       if (!attr)
+ 	break;
+     }
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.13.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.13.ebuild
new file mode 100644
index 000000000000..7a2b5f729de7
--- /dev/null
+++ b/app-admin/system-config-printer/system-config-printer-1.5.13.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+inherit python-single-r1 systemd xdg
+
+DESCRIPTION="Graphical user interface for CUPS administration"
+HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
+SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="gnome-keyring policykit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# Additional unhandled dependencies
+# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
+# python samba client: smbc
+# selinux: needed for troubleshooting
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2
+	net-print/cups[dbus]
+	virtual/libusb:1
+	>=virtual/udev-172
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/xmlto-0.0.22
+	dev-perl/XML-Parser
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycups[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/urllib3[${PYTHON_MULTI_USEDEP}]
+	')
+	gnome-keyring? ( app-crypt/libsecret[introspection] )
+	policykit? ( net-print/cups-pk-helper )
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-nls
+		--with-desktop-vendor=Gentoo
+		--with-udev-rules
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_fix_shebang "${ED}"
+	python_optimize
+}
diff --git a/app-admin/systemdgenie/Manifest b/app-admin/systemdgenie/Manifest
index 488d08057029..5be13d957049 100644
--- a/app-admin/systemdgenie/Manifest
+++ b/app-admin/systemdgenie/Manifest
@@ -1,3 +1,3 @@
 DIST systemdgenie-0.99.0.tar.xz 29104 BLAKE2B f2da14ae035fa04bd775dedb8bdd7fe41612c019a47fe02e1994a7304677970193ba54aacbb7d0fd8e31832eb01ae1f12b8dc7a869b0c6529dcd18b1fece2b52 SHA512 9600ffa05737bbf8d7deaece3fc78392dbb4228aa2f001ca3e34fb6390c1a9104884f61eec90ae204550a8cee0281b92f34f64652f9881967430fb695f6bb3f4
-EBUILD systemdgenie-0.99.0.ebuild 836 BLAKE2B 169cc0c2598fc61134ab30a02199c5021e48494a6cc686fe2d313ca4cb02c25123726c130a013ee91886b5daab4f9408a2cc8b4df72ed401ea0d8148437799f6 SHA512 667baefafebaf605acc560aaaacb317b14b38b3ec1cfe5ccd324014a6816de535d564a9e09c4c1636e6b34e65db0ed1546a8537ce3357caa9988397d71f72fc5
+EBUILD systemdgenie-0.99.0.ebuild 843 BLAKE2B a61c824c19c3eae2165343132d3d268b4c73b81eb3295c47235f6e6cdf0d64dfbd7153bfa512a83f23a0f4c712c4a323735af882b4de37d79a031789ab6b875f SHA512 89c4bbb6c4abcab7f0e8fc95f28f10e7b242b7bb6c1144cc99d5ef05c0352c475823df96ebc5c82339e94c9ffe942f399dfee70f7542720b26b9781ced762c4d
 MISC metadata.xml 686 BLAKE2B 30d737327ef735c3b38e8c5940372dd1004d15206aeda7a1c18b7088fb0b0d31bf4c740ec2cbf9747f10d86c2c594af695a3f5e6e1a9b4aee2c42af198682358 SHA512 cf49cfa73a7798aa4a5c568df4afc5fdf3d66c43b9df5569ae38f4d590aefe6161e78e8314be92dbd4366d1413258a6a55c24e9783f1df870ad27a2f2c87cb9d
diff --git a/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild b/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
index a046365f747b..379964f0857a 100644
--- a/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
+++ b/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64"
 fi
 
 DESCRIPTION="Systemd managment utility"
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index e07b2c8f6294..98552cf205e8 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -791,6 +791,10 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
 DIST terraform-0.12.28.tar.gz 10637713 BLAKE2B 218d8316c004c363bce39f1e4547cdf4a6d73cfd1b1c0e3810b5759ea509ddd6307f2694f9673c1b6b8668c1a869bc04a81be600a38c5d2c5868e2e1962a231f SHA512 cadd2a5527b4c4ee6dd0385d962435e15ac72f99bc0d3e8193f78a49a474e491dab73f9280c77f37f34e516873b12a7f1af23cd437cb2f9d0afb2bef9966c836
 DIST terraform-0.13.3.tar.gz 12801673 BLAKE2B 2e966dc17195acf500690a60cb98e6643578c7ebc214669982dbe9e5bdfdabe58af1a82b778503fcaef7df47ff2da0a1f09e0b8dd969c9ff413c16fbdba27778 SHA512 64ee5e74e592265e47778dbc5ad2decc61f5e79514c26782128931be180131ef2ab611dbf4cf46875419157b2957b54688ed4026a80812faf3678cb26c2d7f27
+DIST terraform-0.13.4.tar.gz 12800024 BLAKE2B af158e318c335d750e4fdefa4ce18e150202aeadf26f389ef27dd83669946957799e9e3f38e6cba0bc48ab96721109fb408b01493e733159c15a57ba6a767e96 SHA512 e02cb2a9967a923b918e64acd2ffa6f8a8a03676e5207d238a6cf215f4e5cb0e1db3ac9760792187757a8f18d9d23cbfd44c1ce5d6d5bacf70786ef473824dc3
+DIST terraform-0.13.5.tar.gz 12802967 BLAKE2B a70c3209a17e75c8c5f68deacade8e7b1b85c68d1d978933ab1fa32d6b64b2298f9ea5fe11fdc040ba40c7b73480d6da4020b58602e9a5f963ef0dd287540ed7 SHA512 d8af93023275b5aa50ef0dbb66fcc834593ad598300a1c38bfcf2b9bd43bc84eab81a5e63bef29701b2a078019e4b7223cae2a846ef7680a6105b5f90790b41c
 EBUILD terraform-0.12.28.ebuild 33302 BLAKE2B 9ca5f33aa00c5eacbb82d25fc06cc6a90d16474fe85e0e087dd91edac361188ffcf853b21fd543d07a2836c3d2b6cf47c0c367406c533fb19c5c9ecedc4ef230 SHA512 e521a4cc67ca85de383eb06e2bdace2acf1adba81a66999a744436ce42314c20a9aec78a79795a3c88ee0234e7eb481ffa3778b998692c26ad7783b01ae20bf2
 EBUILD terraform-0.13.3.ebuild 39681 BLAKE2B ea27dcb2cdfa1f12cc7fc362fdd5535d34c71a1694d9f04ae9bba66db61ed7f0b5fc6b3dec689ce34211305db5ffd4df503f2608f8f52f0310a3370d2bc18911 SHA512 e383c04ab131872fed9ac88419902305ad2d464209a390bf643c93646400e01dc21e7d068e92188a333528defa72d563780d1bf8c5f188e111a7aae99cb9498b
+EBUILD terraform-0.13.4.ebuild 39681 BLAKE2B ea27dcb2cdfa1f12cc7fc362fdd5535d34c71a1694d9f04ae9bba66db61ed7f0b5fc6b3dec689ce34211305db5ffd4df503f2608f8f52f0310a3370d2bc18911 SHA512 e383c04ab131872fed9ac88419902305ad2d464209a390bf643c93646400e01dc21e7d068e92188a333528defa72d563780d1bf8c5f188e111a7aae99cb9498b
+EBUILD terraform-0.13.5.ebuild 39681 BLAKE2B ea27dcb2cdfa1f12cc7fc362fdd5535d34c71a1694d9f04ae9bba66db61ed7f0b5fc6b3dec689ce34211305db5ffd4df503f2608f8f52f0310a3370d2bc18911 SHA512 e383c04ab131872fed9ac88419902305ad2d464209a390bf643c93646400e01dc21e7d068e92188a333528defa72d563780d1bf8c5f188e111a7aae99cb9498b
 MISC metadata.xml 1074 BLAKE2B f14c6ede900b616f5a5514adc9735d25fa834dc879712ab79b68fe15a927cb3e8e77a7b30ee8af3b44551be9ec2368476757c4ec5e5b44fcd266367b485fc8bc SHA512 2e28b3de2b512246ddfb76b547151683c4202620992f9453747b4869db1a16d92996cbf810bf82f09e6895ddc7b23ecc2e0ecaf43d9c3ba9e8a2fb53baa995dc
diff --git a/app-admin/terraform/terraform-0.13.4.ebuild b/app-admin/terraform/terraform-0.13.4.ebuild
new file mode 100644
index 000000000000..b9df790c598c
--- /dev/null
+++ b/app-admin/terraform/terraform-0.13.4.ebuild
@@ -0,0 +1,736 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"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/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest v11.1.2+incompatible/go.mod"
+	"github.com/Azure/go-autorest v14.2.0+incompatible"
+	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.3"
+	"github.com/Azure/go-autorest/autorest v0.11.3/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.0"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.0"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.0"
+	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.6.0"
+	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4"
+	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d/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/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+	"github.com/agext/levenshtein v1.2.1/go.mod"
+	"github.com/agext/levenshtein v1.2.2"
+	"github.com/agext/levenshtein v1.2.2/go.mod"
+	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412"
+	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/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/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
+	"github.com/apparentlymart/go-cidr v1.1.0"
+	"github.com/apparentlymart/go-cidr v1.1.0/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod"
+	"github.com/apparentlymart/go-textseg v1.0.0"
+	"github.com/apparentlymart/go-textseg v1.0.0/go.mod"
+	"github.com/apparentlymart/go-textseg/v12 v12.0.0"
+	"github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod"
+	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13"
+	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod"
+	"github.com/apparentlymart/go-versions v1.0.0"
+	"github.com/apparentlymart/go-versions v1.0.0/go.mod"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
+	"github.com/aws/aws-sdk-go v1.31.9"
+	"github.com/aws/aws-sdk-go v1.31.9/go.mod"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bmatcuk/doublestar v1.1.5"
+	"github.com/bmatcuk/doublestar v1.1.5/go.mod"
+	"github.com/boltdb/bolt v1.3.1"
+	"github.com/boltdb/bolt v1.3.1/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cheggaaa/pb v1.0.27/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/coreos/bbolt v1.3.0"
+	"github.com/coreos/bbolt v1.3.0/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/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/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dylanmei/iso8601 v0.1.0"
+	"github.com/dylanmei/iso8601 v0.1.0/go.mod"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod"
+	"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/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 v0.0.0-20190203023257-5858425f7550/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/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 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/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/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.1/go.mod"
+	"github.com/go-test/deep v1.0.3"
+	"github.com/go-test/deep v1.0.3/go.mod"
+	"github.com/gofrs/uuid v3.2.0+incompatible"
+	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
+	"github.com/gofrs/uuid v3.3.0+incompatible"
+	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
+	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/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/go.mod"
+	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7"
+	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.1.0/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/go.mod"
+	"github.com/golang/protobuf v1.3.4"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+	"github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"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.3.1"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/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/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/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.0.0-20190126172459-c818fa66e4c8/go.mod"
+	"github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod"
+	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5"
+	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5/go.mod"
+	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d"
+	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/websocket v1.4.0"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5"
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
+	"github.com/hashicorp/aws-sdk-go-base v0.6.0"
+	"github.com/hashicorp/aws-sdk-go-base v0.6.0/go.mod"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-azure-helpers v0.12.0"
+	"github.com/hashicorp/go-azure-helpers v0.12.0/go.mod"
+	"github.com/hashicorp/go-checkpoint v0.5.0"
+	"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02"
+	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod"
+	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+	"github.com/hashicorp/go-hclog v0.9.2"
+	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.4"
+	"github.com/hashicorp/go-msgpack v0.5.4/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-plugin v1.3.0"
+	"github.com/hashicorp/go-plugin v1.3.0/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.2"
+	"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-safetemp v1.0.0"
+	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
+	"github.com/hashicorp/go-slug v0.4.1"
+	"github.com/hashicorp/go-slug v0.4.1/go.mod"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod"
+	"github.com/hashicorp/go-tfe v0.8.1"
+	"github.com/hashicorp/go-tfe v0.8.1/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.0.0/go.mod"
+	"github.com/hashicorp/go-version v1.1.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.0"
+	"github.com/hashicorp/go-version v1.2.0/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 v0.0.0-20170504190234-a4b07c25de5f"
+	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.0.0/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.6.0"
+	"github.com/hashicorp/hcl/v2 v2.6.0/go.mod"
+	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590"
+	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590/go.mod"
+	"github.com/hashicorp/memberlist v0.1.0"
+	"github.com/hashicorp/memberlist v0.1.0/go.mod"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod"
+	"github.com/hashicorp/vault v0.10.4"
+	"github.com/hashicorp/vault v0.10.4/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.9"
+	"github.com/imdario/mergo v0.3.9/go.mod"
+	"github.com/jhump/protoreflect v1.6.0"
+	"github.com/jhump/protoreflect v1.6.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.3.0"
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
+	"github.com/json-iterator/go v1.1.7"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jtolds/gls v4.2.1+incompatible"
+	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
+	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba"
+	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/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/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/lib/pq v1.0.0"
+	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
+	"github.com/likexian/gokit v0.20.15"
+	"github.com/likexian/gokit v0.20.15/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9"
+	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786"
+	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod"
+	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88"
+	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.1"
+	"github.com/mattn/go-colorable v0.1.1/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.5"
+	"github.com/mattn/go-isatty v0.0.5/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-shellwords v1.0.4"
+	"github.com/mattn/go-shellwords v1.0.4/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.8"
+	"github.com/miekg/dns v1.0.8/go.mod"
+	"github.com/mitchellh/cli v1.0.0"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod"
+	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/gox v1.0.1"
+	"github.com/mitchellh/gox v1.0.1/go.mod"
+	"github.com/mitchellh/iochan v1.0.0"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/panicwrap v1.0.0"
+	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
+	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51"
+	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.1"
+	"github.com/mitchellh/reflectwalk v1.0.1/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/mozillazg/go-httpheader v0.2.1"
+	"github.com/mozillazg/go-httpheader v0.2.1/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
+	"github.com/oklog/run v1.0.0"
+	"github.com/oklog/run v1.0.0/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.8.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
+	"github.com/onsi/gomega v1.5.0/go.mod"
+	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db"
+	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
+	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
+	"github.com/pkg/errors v0.8.0/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/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.1"
+	"github.com/posener/complete v1.2.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/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.2.0"
+	"github.com/prometheus/common v0.2.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/satori/go.uuid v1.2.0"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
+	"github.com/soheilhy/cmux v0.1.4"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spf13/afero v1.2.2"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.2/go.mod"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/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.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
+	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod"
+	"github.com/tombuildsstuff/giovanni v0.12.0"
+	"github.com/tombuildsstuff/giovanni v0.12.0/go.mod"
+	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5"
+	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod"
+	"github.com/ulikunitz/xz v0.5.5"
+	"github.com/ulikunitz/xz v0.5.5/go.mod"
+	"github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
+	"github.com/vmihailenco/msgpack v4.0.1+incompatible"
+	"github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod"
+	"github.com/xanzy/ssh-agent v0.2.1"
+	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
+	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18"
+	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod"
+	"github.com/zclconf/go-cty v1.0.0/go.mod"
+	"github.com/zclconf/go-cty v1.1.0/go.mod"
+	"github.com/zclconf/go-cty v1.2.0/go.mod"
+	"github.com/zclconf/go-cty v1.5.1"
+	"github.com/zclconf/go-cty v1.5.1/go.mod"
+	"github.com/zclconf/go-cty-yaml v1.0.2"
+	"github.com/zclconf/go-cty-yaml v1.0.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.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/multierr v1.1.0"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.9.1"
+	"go.uber.org/zap v1.9.1/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
+	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/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/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mod v0.2.0"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180811021610-c39426892332/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-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-20190125091013-d26f9f9a57f3/go.mod"
+	"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod"
+	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod"
+	"golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9"
+	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/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-20190402181905-9f3314589c9a/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/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/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/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-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9"
+	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371"
+	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0"
+	"google.golang.org/api v0.9.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/go.mod"
+	"google.golang.org/appengine v1.6.1"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/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-20190801165951-fa694d86fc64/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 v1.8.0/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.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.27.1"
+	"google.golang.org/grpc v1.27.1/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-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/inf.v0 v0.9.0"
+	"gopkg.in/inf.v0 v0.9.0/go.mod"
+	"gopkg.in/ini.v1 v1.42.0"
+	"gopkg.in/ini.v1 v1.42.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"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/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/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-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711"
+	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
+	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
+	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655"
+	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod"
+	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
+	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.1/go.mod"
+	"k8s.io/klog v0.4.0"
+	"k8s.io/klog v0.4.0/go.mod"
+	"k8s.io/klog/v2 v2.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
+	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4"
+	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/yaml v1.1.0"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	go build \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/terraform
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
diff --git a/app-admin/terraform/terraform-0.13.5.ebuild b/app-admin/terraform/terraform-0.13.5.ebuild
new file mode 100644
index 000000000000..b9df790c598c
--- /dev/null
+++ b/app-admin/terraform/terraform-0.13.5.ebuild
@@ -0,0 +1,736 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+	"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/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest v11.1.2+incompatible/go.mod"
+	"github.com/Azure/go-autorest v14.2.0+incompatible"
+	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.11.3"
+	"github.com/Azure/go-autorest/autorest v0.11.3/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.0"
+	"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0"
+	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0"
+	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.0"
+	"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.2.0"
+	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.6.0"
+	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4"
+	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
+	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d"
+	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d/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/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
+	"github.com/agext/levenshtein v1.2.1/go.mod"
+	"github.com/agext/levenshtein v1.2.2"
+	"github.com/agext/levenshtein v1.2.2/go.mod"
+	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412"
+	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/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/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a"
+	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70"
+	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible"
+	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e"
+	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
+	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
+	"github.com/apparentlymart/go-cidr v1.1.0"
+	"github.com/apparentlymart/go-cidr v1.1.0/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0"
+	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod"
+	"github.com/apparentlymart/go-textseg v1.0.0"
+	"github.com/apparentlymart/go-textseg v1.0.0/go.mod"
+	"github.com/apparentlymart/go-textseg/v12 v12.0.0"
+	"github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod"
+	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13"
+	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod"
+	"github.com/apparentlymart/go-versions v1.0.0"
+	"github.com/apparentlymart/go-versions v1.0.0/go.mod"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
+	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
+	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/armon/go-radix v1.0.0"
+	"github.com/armon/go-radix v1.0.0/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
+	"github.com/aws/aws-sdk-go v1.31.9"
+	"github.com/aws/aws-sdk-go v1.31.9/go.mod"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
+	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
+	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bmatcuk/doublestar v1.1.5"
+	"github.com/bmatcuk/doublestar v1.1.5/go.mod"
+	"github.com/boltdb/bolt v1.3.1"
+	"github.com/boltdb/bolt v1.3.1/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cheggaaa/pb v1.0.27/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/coreos/bbolt v1.3.0"
+	"github.com/coreos/bbolt v1.3.0/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/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/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dylanmei/iso8601 v0.1.0"
+	"github.com/dylanmei/iso8601 v0.1.0/go.mod"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1"
+	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod"
+	"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/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 v0.0.0-20190203023257-5858425f7550/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/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 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/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/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.1/go.mod"
+	"github.com/go-test/deep v1.0.3"
+	"github.com/go-test/deep v1.0.3/go.mod"
+	"github.com/gofrs/uuid v3.2.0+incompatible"
+	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
+	"github.com/gofrs/uuid v3.3.0+incompatible"
+	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
+	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/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/go.mod"
+	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7"
+	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.1.0/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/go.mod"
+	"github.com/golang/protobuf v1.3.4"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+	"github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"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.3.1"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
+	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/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/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/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.0.0-20190126172459-c818fa66e4c8/go.mod"
+	"github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod"
+	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5"
+	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5/go.mod"
+	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d"
+	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/websocket v1.4.0"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5"
+	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
+	"github.com/hashicorp/aws-sdk-go-base v0.6.0"
+	"github.com/hashicorp/aws-sdk-go-base v0.6.0/go.mod"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
+	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-azure-helpers v0.12.0"
+	"github.com/hashicorp/go-azure-helpers v0.12.0/go.mod"
+	"github.com/hashicorp/go-checkpoint v0.5.0"
+	"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02"
+	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod"
+	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+	"github.com/hashicorp/go-hclog v0.9.2"
+	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa"
+	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.4"
+	"github.com/hashicorp/go-msgpack v0.5.4/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-plugin v1.3.0"
+	"github.com/hashicorp/go-plugin v1.3.0/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.2"
+	"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-safetemp v1.0.0"
+	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
+	"github.com/hashicorp/go-slug v0.4.1"
+	"github.com/hashicorp/go-slug v0.4.1/go.mod"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86"
+	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod"
+	"github.com/hashicorp/go-tfe v0.8.1"
+	"github.com/hashicorp/go-tfe v0.8.1/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+	"github.com/hashicorp/go-uuid v1.0.1"
+	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+	"github.com/hashicorp/go-version v1.0.0/go.mod"
+	"github.com/hashicorp/go-version v1.1.0/go.mod"
+	"github.com/hashicorp/go-version v1.2.0"
+	"github.com/hashicorp/go-version v1.2.0/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 v0.0.0-20170504190234-a4b07c25de5f"
+	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.0.0/go.mod"
+	"github.com/hashicorp/hcl/v2 v2.6.0"
+	"github.com/hashicorp/hcl/v2 v2.6.0/go.mod"
+	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590"
+	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590/go.mod"
+	"github.com/hashicorp/memberlist v0.1.0"
+	"github.com/hashicorp/memberlist v0.1.0/go.mod"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb"
+	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7"
+	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596"
+	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod"
+	"github.com/hashicorp/vault v0.10.4"
+	"github.com/hashicorp/vault v0.10.4/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb"
+	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
+	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.9"
+	"github.com/imdario/mergo v0.3.9/go.mod"
+	"github.com/jhump/protoreflect v1.6.0"
+	"github.com/jhump/protoreflect v1.6.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.3.0"
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
+	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
+	"github.com/json-iterator/go v1.1.7"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jtolds/gls v4.2.1+incompatible"
+	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
+	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
+	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba"
+	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/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/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/lib/pq v1.0.0"
+	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
+	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
+	"github.com/likexian/gokit v0.20.15"
+	"github.com/likexian/gokit v0.20.15/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
+	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
+	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9"
+	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
+	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786"
+	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod"
+	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88"
+	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.1"
+	"github.com/mattn/go-colorable v0.1.1/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.5"
+	"github.com/mattn/go-isatty v0.0.5/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-shellwords v1.0.4"
+	"github.com/mattn/go-shellwords v1.0.4/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/miekg/dns v1.0.8"
+	"github.com/miekg/dns v1.0.8/go.mod"
+	"github.com/mitchellh/cli v1.0.0"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
+	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb"
+	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod"
+	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/gox v1.0.1"
+	"github.com/mitchellh/gox v1.0.1/go.mod"
+	"github.com/mitchellh/iochan v1.0.0"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/panicwrap v1.0.0"
+	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
+	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51"
+	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.1"
+	"github.com/mitchellh/reflectwalk v1.0.1/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/mozillazg/go-httpheader v0.2.1"
+	"github.com/mozillazg/go-httpheader v0.2.1/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
+	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
+	"github.com/oklog/run v1.0.0"
+	"github.com/oklog/run v1.0.0/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.8.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
+	"github.com/onsi/gomega v1.5.0/go.mod"
+	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db"
+	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
+	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
+	"github.com/pkg/errors v0.8.0/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/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.1"
+	"github.com/posener/complete v1.2.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/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.2.0"
+	"github.com/prometheus/common v0.2.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/satori/go.uuid v1.2.0"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.2.0"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
+	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
+	"github.com/soheilhy/cmux v0.1.4"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spf13/afero v1.2.2"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.2/go.mod"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/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.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
+	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c"
+	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod"
+	"github.com/tombuildsstuff/giovanni v0.12.0"
+	"github.com/tombuildsstuff/giovanni v0.12.0/go.mod"
+	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5"
+	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod"
+	"github.com/ulikunitz/xz v0.5.5"
+	"github.com/ulikunitz/xz v0.5.5/go.mod"
+	"github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
+	"github.com/vmihailenco/msgpack v4.0.1+incompatible"
+	"github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod"
+	"github.com/xanzy/ssh-agent v0.2.1"
+	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
+	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18"
+	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
+	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod"
+	"github.com/zclconf/go-cty v1.0.0/go.mod"
+	"github.com/zclconf/go-cty v1.1.0/go.mod"
+	"github.com/zclconf/go-cty v1.2.0/go.mod"
+	"github.com/zclconf/go-cty v1.5.1"
+	"github.com/zclconf/go-cty v1.5.1/go.mod"
+	"github.com/zclconf/go-cty-yaml v1.0.2"
+	"github.com/zclconf/go-cty-yaml v1.0.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.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/multierr v1.1.0"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.9.1"
+	"go.uber.org/zap v1.9.1/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
+	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/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/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mod v0.2.0"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180811021610-c39426892332/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-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-20190125091013-d26f9f9a57f3/go.mod"
+	"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod"
+	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod"
+	"golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9"
+	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/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-20190402181905-9f3314589c9a/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/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/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/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-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9"
+	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371"
+	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0"
+	"google.golang.org/api v0.9.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/go.mod"
+	"google.golang.org/appengine v1.6.1"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/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-20190801165951-fa694d86fc64/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 v1.8.0/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.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.27.1"
+	"google.golang.org/grpc v1.27.1/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-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/inf.v0 v0.9.0"
+	"gopkg.in/inf.v0 v0.9.0/go.mod"
+	"gopkg.in/ini.v1 v1.42.0"
+	"gopkg.in/ini.v1 v1.42.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"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/go.mod"
+	"gopkg.in/yaml.v2 v2.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/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-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711"
+	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
+	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
+	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655"
+	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod"
+	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
+	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.1/go.mod"
+	"k8s.io/klog v0.4.0"
+	"k8s.io/klog v0.4.0/go.mod"
+	"k8s.io/klog/v2 v2.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
+	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
+	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4"
+	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+	"sigs.k8s.io/yaml v1.1.0"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	go build \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/terraform
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 7b26cf9c425b..2a6c4fd23535 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,19 +3,16 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 573 BLAKE2B 444541b8912910cf6b5d038e466e18baebb7dfd2905d802217baf9e861bb7f2a3e032716545c74e269782aa420fbd052745322576b4bcb8c4cf53ba07471b261 SHA512 11124e6fc656977c20b55b578e30fd76b8f6905760c2f17f93b960a317975f1914c6bd8d4ffd3741ba405bfe5aa0cecb68067f8ce52b2df9015863d31f9a7aad
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
-DIST vault-1.4.2-webui.tar.xz 1208924 BLAKE2B 5177afc91e7bc774b7d78e5e344d7c8310a13a592c57768ac6a0c8e12ef6e7ac8b6dbc975e5e9131888478a7fb18ad9ef1ee9b1da43c2899fcf636e99d049078 SHA512 ab462bebfa38102e354938e9b8c6990b6bb19b29dd0da96d65f290394a987d89063800247c1d751a8f7ba7c3fa6645aab9383a5455444244adb5f40528408b17
-DIST vault-1.4.2.tar.gz 33158384 BLAKE2B 263f20419c210b83448907b1e95464fb139f52f4f7347eb01803b5aa487797c191f1e61a9fb77321f776ea70feb83a741f10c79400fdd471b790fe37a6404a9c SHA512 d4f2a426a4c0531cca0d3812c2e29ebc5ebbd6da2897d3ee57fe57d4dfde0395f30713cfe21600b4dd51fdc90bf2a10527957b04c8215bd185bd502267f93503
-DIST vault-1.4.3-webui.tar.xz 1212168 BLAKE2B d068d3218462b2e2eda9eec623a0438a3c7f6a894713ccfa3260a4b1ed53bf0791760f2ad9ac6071ae5227e7c44e5c9b675d7a1cc8ecb7052b322d8415f79955 SHA512 5542a170d853a52bbe05b4bfab7014305c6fa68e7fc2ea24df5f508905c7db8cf8a0f65b8f91c209563779a22044959d615f05d26a12df2b8ef1f749b8af450e
-DIST vault-1.4.3.tar.gz 33169383 BLAKE2B 78adde5dfe68fbb51b43abc7f12fe96df7df6b7f5a7fc0af35439184a3f1ce03a71e445fe735e692953a68e039093f9eb65265ee9aae786e4ef9b8f0ca81c030 SHA512 638bdeaaee122263d8f8c44b6db48b0f10869dd6f2cd6d35bcefb96e8b25dde4596a4a41f287d065f0cece01c5e75f9a4ae220864dddc381365fe57faeb2efe2
 DIST vault-1.4.5-webui.tar.xz 1239532 BLAKE2B fe861cdf9ea833010f6b8b2ffa403fb8095456cc9038f19edefe44fbbdd418bf4c3ec129b1436296c78914d75964dbb6dcaf3077cad45a3cf905a54a42e7e82d SHA512 d0fe0878b6f30a63e7156644c7a53bd8bf0008355e6bf9b79b8a4acd4a094ab43914e2b7ca63f48f3b31433dd36b1091ebbfb9afe8002e51c18dcf217292b521
 DIST vault-1.4.5.tar.gz 33272136 BLAKE2B 3e0f3b11b975b1e563883d43f392dc998dc21ad057859c4aaad3dc67133e3a2dd9e3d1ab5b46f07d981738bdccaa5ced477ace6e057579815c13557cd74f30eb SHA512 5b709ef857d6c64a1332b1c01b13f525491e21e958a7e1441fa817067a8016e8d78d7f71043c2b24d75141becea18063d97cfb5dd7a337130d6d8ef58a76d062
-DIST vault-1.5.0-webui.tar.xz 1237556 BLAKE2B 2647d9733a6a20b61f5884b15dd46d048705c3fe5dcfb9f4c8c2fa71303d17c9b69d2f08a42ec171e863affd45632c0407d4db4cb6bb229ba780860dfbf05449 SHA512 b5164f7525c94752f3f6a17ba6c738eb42e05f33682b790b49c322882964dfdb68abf28d0f30836759383ff6777cc5d5061699fc2a5d2a7a3706b5423ccca378
-DIST vault-1.5.0.tar.gz 34940170 BLAKE2B cbc4b25bbb6881415c63be41970429e4413e3f70fc9aa3dfb3c54136719c7166896475d77a11d33d3e388344d863a19d63836f2ed3e20cc42db98ee2b57ba9a4 SHA512 245d5ea837f561d6c3832a0cb28d851dabe908fac2be7e53d3fd466689778d67b2cd5d9ea8c297f8daceb003c571a9768254a7e27d1fbeb1a376ac75e3c6edfb
-DIST vault-1.5.2-webui.tar.xz 1242056 BLAKE2B 7ec3bf3c30170bad5e09168bd75ebccf5664a6500bbfdcbf8fab8abb2bc78472a0614e602d4521ecf998547a9e5f86f27f265324b9220db84c724f7add52b64a SHA512 04fb481936bd0ce8e60865962a5b6726f2ab82bc56d25c888f7cf7d920174cbb7916255fd38a701709c1d56a00f8216a22f884c2456c26f510075fc0ad9d41f8
-DIST vault-1.5.2.tar.gz 35118624 BLAKE2B 96e9f3070ffea0d1c513004ad02558363a5c51da2e8211e664fadefc004cf65c8da6489c3a95573a9a1712ece9355966298efc122b350f9c6df79f1fd9cc2ec3 SHA512 be2c5eb530687fe199762195960fc497badbae933d57ac2861f88c05991e967e2512a5de90e3ce9ce14a094a25da18eb482da59360b6d6de594e91d75bff09c6
-EBUILD vault-1.4.2-r1.ebuild 1857 BLAKE2B 3bfa96148412f6c7e2979f8e86baeb100e4e0e42fa2ddc9251c4a4017c18b639583fd51cc360b4c31db25d8641a82058a11572c47a2eeca3d92068e44cd00d1a SHA512 29726e334b3abc150235ba6bc72770bd82e8a0f9225f018ded55fbf08366b90d989d1457ac57e882321ae5209d82a102526924db0e44c9598534587772dcd338
-EBUILD vault-1.4.3.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
-EBUILD vault-1.4.5.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
-EBUILD vault-1.5.0.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
-EBUILD vault-1.5.2.ebuild 1880 BLAKE2B 723b98ca4b9f724ef36ce105b516830feafd49d642b06498d69701f1f9b322e98d663ce80192d86f6229933e0928c6d7d825adae89b21c5bc074a207da85ceef SHA512 f044c61a12b406443b977ddf79a7ef005f406755d344e62c9cd8b9de9f7382ab630be6f4c54cd8dbcba650572fe18d01fe0a6a14134c76cb7cb50cf7491141b4
+DIST vault-1.4.7-webui.tar.xz 1236924 BLAKE2B 83ab6f4494708f0738aed4f7226d5e634d01268da6b672c6ef1340559eccfdbb2a74baaa9a67cb3287290bd1ef332e325ba365280999f7db86e1694ec1731788 SHA512 634128a0a46c01d671c3c766eb4f84a58802f0cf0ade297f34e9d84eedb8d8dfbbbd4ad0eae6a28e33acb0b161f123a692b8b98a25918da8337cbce380c5f94b
+DIST vault-1.4.7.tar.gz 33265037 BLAKE2B 11cd3d1bd2321a6240a31f326666e0725b1bd3104a4cb050ecc78c9fc6bac1db1a79799e3a4b212468556a54e1f431e61f18115d2c86ddd0b229ae0f5ad06726 SHA512 a7af7780756df02a465a60989e3aba382116e0846cc48ab81d7b272133c31b7c47f60eed4ec5ad47ad0a80247baee7087a1554fcaf189a60a1edb807a268c3a4
+DIST vault-1.5.5-webui.tar.xz 1239480 BLAKE2B d1f9d98c2a6ece03f994c08c1e842343f713bdcde981c55ea75049f3cc51f4989a9187786190ff138a9c8ef264a7a9a26428f8a7d916b4b2c0554da85e48ae4d SHA512 a9516605ec262ad44cb8ae61308a70a5cfa0458b8bb2e80d49c4e28711db5a7ad18ef2bcf0e9756b9da6534f1d47ed8bcfc6c7c734042aa8d9b0e9851059fa9d
+DIST vault-1.5.5.tar.gz 35123385 BLAKE2B 428d509378cd912d2ef13630a0fd4ff4df89a7144b30291cecd3c62e91b10a67210c7ae79e5459d7da5d9c635ae2634d3edd99614c40cce744d93713804c407b SHA512 de19be6b9fdaf06ce2debc7784ef1a6dff00ced7811a110b58348d61b304ed2c850d957605a47abfa0cc7568488b3b0920437ace7891a69d470e98b44c0f9fae
+DIST vault-1.6.0-webui.tar.xz 1272792 BLAKE2B cef45043b7ca26de774e17a994f35a3c52b796c94b75b9377300f8755bb4c0d8814147d740e07be8d5dd5f909051adf7fb05be29b1ca1e1db349a0c3977ec034 SHA512 3b13687f7f0f475513152544ae423914520d0bcd9c0ea4295277f326002048707adfdf5ac405561ddb415affb842952409d6586ef19c7faca37d87aee973337a
+DIST vault-1.6.0.tar.gz 38888893 BLAKE2B e6da6ba813625a2a00553181e5d16bb52510856d9ad4e1538b824b5f87b2beb6c8d19f60b274e68d9521210c72dbd93cb63ba73175d079b43b03b48fefd1e1be SHA512 f9a99c29de585031c00b7f0a2125f61df1cb0a15ab0aa04e3cca950bdd23a4055dd3764561594730e62a1b3ae4d13e66df30032bf2b1000063edc4f772a8146d
+EBUILD vault-1.4.5.ebuild 1857 BLAKE2B 3bfa96148412f6c7e2979f8e86baeb100e4e0e42fa2ddc9251c4a4017c18b639583fd51cc360b4c31db25d8641a82058a11572c47a2eeca3d92068e44cd00d1a SHA512 29726e334b3abc150235ba6bc72770bd82e8a0f9225f018ded55fbf08366b90d989d1457ac57e882321ae5209d82a102526924db0e44c9598534587772dcd338
+EBUILD vault-1.4.7.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
+EBUILD vault-1.5.5.ebuild 1880 BLAKE2B 723b98ca4b9f724ef36ce105b516830feafd49d642b06498d69701f1f9b322e98d663ce80192d86f6229933e0928c6d7d825adae89b21c5bc074a207da85ceef SHA512 f044c61a12b406443b977ddf79a7ef005f406755d344e62c9cd8b9de9f7382ab630be6f4c54cd8dbcba650572fe18d01fe0a6a14134c76cb7cb50cf7491141b4
+EBUILD vault-1.6.0.ebuild 1880 BLAKE2B 5d28f6333392f64f9ca59e3208f48e535164608cf3af0b46472a94f986989e9461b784e21506f7c14c9ec7563eb08e9fca4b7933e0e9886b5d6f74a2a6e99317 SHA512 238539a783c20b69f3c3b8f160ca9e9f48c69ff3bad4b175784544b505125d25f8947f28825eddbd30722b8a732f970b4c10d353373f061c4da1c80184e06bcd
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.4.2-r1.ebuild b/app-admin/vault/vault-1.4.2-r1.ebuild
deleted file mode 100644
index 671178b25133..000000000000
--- a/app-admin/vault/vault-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+webui"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-i Makefile || die
-	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
-		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
-			die "mv failed"
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOFLAGS="-mod=vendor" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-	go-module_pkg_postinst
-}
diff --git a/app-admin/vault/vault-1.4.5.ebuild b/app-admin/vault/vault-1.4.5.ebuild
index d7f0e36a12fb..671178b25133 100644
--- a/app-admin/vault/vault-1.4.5.ebuild
+++ b/app-admin/vault/vault-1.4.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+webui"
 
 BDEPEND="dev-go/gox"
diff --git a/app-admin/vault/vault-1.4.3.ebuild b/app-admin/vault/vault-1.4.7.ebuild
index d7f0e36a12fb..d7f0e36a12fb 100644
--- a/app-admin/vault/vault-1.4.3.ebuild
+++ b/app-admin/vault/vault-1.4.7.ebuild
diff --git a/app-admin/vault/vault-1.5.2.ebuild b/app-admin/vault/vault-1.5.5.ebuild
index 03db71b29ae1..03db71b29ae1 100644
--- a/app-admin/vault/vault-1.5.2.ebuild
+++ b/app-admin/vault/vault-1.5.5.ebuild
diff --git a/app-admin/vault/vault-1.5.0.ebuild b/app-admin/vault/vault-1.6.0.ebuild
index d7f0e36a12fb..d339b69b89e5 100644
--- a/app-admin/vault/vault-1.5.0.ebuild
+++ b/app-admin/vault/vault-1.6.0.ebuild
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+webui"
 
-BDEPEND="dev-go/gox"
+BDEPEND="dev-go/gox
+	>=dev-lang/go-1.15.3"
 COMMON_DEPEND="acct-group/vault
 	acct-user/vault"
 	DEPEND="${COMMON_DEPEND}"
diff --git a/app-admin/whowatch/Manifest b/app-admin/whowatch/Manifest
index e07d881ea2db..7ab1376c7186 100644
--- a/app-admin/whowatch/Manifest
+++ b/app-admin/whowatch/Manifest
@@ -5,4 +5,4 @@ DIST whowatch-1.8.6.tar.gz 141801 BLAKE2B d52ae8304d25c570873c65cc3b91d8fe227bf7
 EBUILD whowatch-1.8.5.ebuild 694 BLAKE2B 493fb8d1b96c927eca5059ca1bafa7073f85ec8a5e334dc4341cbdf35cda3e5572128dd03adc2442c08843902f55d75f6e5d985e3fdacf7b0ce8261cb94833ca SHA512 2c3ceebdbbec7055dd7bcea688a3cea207b4545672f05eb8a2996a181b96dd87cdbb6f53cb3b479f1e9a15954bfd2b5d580926ed3bc3b95072d1cb9ec5185a83
 EBUILD whowatch-1.8.6.ebuild 701 BLAKE2B 2d29e4bdf883c54ef2ea612a9b671c52e408d2dda55785381b5a415e88e78bd6d94d43144b0426663f9c86372c293223eea7b5efa31907d9d85312e53e451596 SHA512 db468c93d217b0d65035f049206b7856946fe90947f5589c084529d1905e86a5eef1f531945b2241b261ad95879d2a19598bd19e92fd8d6714b896a9b9ca3bdb
 EBUILD whowatch-99999.ebuild 706 BLAKE2B 7c6480a13f7c487834c052629eeee1c65ad8c7b49282de552950311c755e97ed8449425b5a14c208701bfc0ee347d0b20d714d688e5abe77aaf2fc793b6c6a64 SHA512 af518f0ded883887df7deabe14e46e1ff810bcdffcc80f6ce0cc4a5769ca2766f5ee92815e8c1d30c2faf62246bc0c0920e5a07ba2257ac4aca98b26fbeee605
-MISC metadata.xml 388 BLAKE2B d26eb0308267a387313561d328a2663f0345fce18d558e42b3e1b787bdef2e09a352558285621882b1def719b358b98d3314c6f8371049faf152dd565653df6b SHA512 6f9e4b4105915444690434f721d6fcfdc78fff506927a854c13a67d06d81293361f44f19c55fb78e32daa9b70a07410f844924f94a251cbd0aa71adefd9de5f3
+MISC metadata.xml 395 BLAKE2B b4b6abf62f666718c7de245623bc83e45f6c4ebdca0d7098ef3a78f815c795b77aa9dda12472222d765c3dca7089f200e2322032d5f45f2bd3f420a7a60b4530 SHA512 40b5ae67d115fa52bf3f528dd6f270e008a85cbfee5d918916894b4d552d5819303a7361d7965f8ff7b47aee9844d99d87689805e9aaceaa8e6344ce3cd419b7
diff --git a/app-admin/whowatch/metadata.xml b/app-admin/whowatch/metadata.xml
index 740b2bc5107f..17e34c59b9bb 100644
--- a/app-admin/whowatch/metadata.xml
+++ b/app-admin/whowatch/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
 	</maintainer>
 	<longdescription>
 		A interactive who program that displays information about the users currently logged into the machine.
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /app-admin
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)