gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /app-admin
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
146 files changed, 5509 insertions, 1672 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 3e41ef842f1f..201a087055e5 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index b4f812718347..029b39de0fea 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -1,9 +1,9 @@
 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.12.0.tar.gz 6799338 BLAKE2B 57a9b3fac4a4a5f55630be0573b26d4ae2d921d4f09d6566339a77f314c413c1a9e242f882fe20befabf30a58e7df21395edcf1b0d560bfeadf8e854bff6a705 SHA512 3567332399cd9708505a6d05c9388c7da5c14c7432e6fd40e5e76b6bcea8859c17b3b6c52a96ce54740e3682d75d8bf77dbc5fede80bd4fc6f72c60014f9cded
 DIST abrt-2.14.0.tar.gz 6102393 BLAKE2B 6bba45604406c1f2f84d778475acc6b5db3747f292fcb74a881703491b2d92adda3cc88d6ed741087c1ed2f88a68cdc4858f3640b506a6be650ea4d1d1f2bfd3 SHA512 26cf04ef6f52da445e825d5f1074186c4c77d1b093174bb6f7b0a8fa6175e265fcaf56fa4a977851a2352f9fd004425bc397e35a91f6f8e78f37564cd492c571
 DIST abrt-2.14.1.tar.gz 6113024 BLAKE2B ddceda689fa51b04a0c201fe560c31ba5c8233c1f75c878b391b0b61cff241e6c2ce5b1829faa6e5f286c3c5efe96941c823234affe94b59fdd2aa3d7cd33cc3 SHA512 24126a54778b7e612c8b950321686bdee7ce15a16e79c8d967f8126c89f7da7060270fc0929cfabfc35100d069b0a626c3380833a3f62614cea6b00a44238ec3
-EBUILD abrt-2.12.0-r2.ebuild 3156 BLAKE2B d8c356d44d0e384c7bab4b74e3c1aa3646b521157e3e68a20b391367f6c9323bd93cc7e2f69c9cfc87268cd51e1ca19c35c714f73eeb116df02b6f096dfb5d16 SHA512 da60bf5c5c78617311738965f06bb4842c31493e245c064de95ff433479c01c68e8c16ed74965458ca21f58017b98e399ef103b45f0520def678c219abee862d
+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.12.0-r2.ebuild b/app-admin/abrt/abrt-2.14.2.ebuild
index 097383a5b464..1071f21d2393 100644
--- a/app-admin/abrt/abrt-2.12.0-r2.ebuild
+++ b/app-admin/abrt/abrt-2.14.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
 
-inherit autotools gnome2-utils python-single-r1 systemd user
+inherit autotools python-single-r1 systemd xdg-utils
 
 DESCRIPTION="Automatic bug detection and reporting tool"
 HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
@@ -12,57 +12,58 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="debug selinux"
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-COMMON_DEPEND="${PYTHON_DEPS}
+DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.56:2
-	>=dev-libs/libreport-2.10.0[python]
+	>=dev-libs/libreport-2.13.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="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
+	acct-user/abrt
+	acct-group/abrt
 	app-arch/cpio
-	app-arch/rpm
+	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-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-		dev-python/argh[${PYTHON_MULTI_USEDEP}]
-		dev-python/humanize[${PYTHON_MULTI_USEDEP}]
+			dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
+			dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+			dev-python/argh[${PYTHON_MULTI_USEDEP}]
+			dev-python/humanize[${PYTHON_MULTI_USEDEP}]
 	')
 "
-DEPEND="${COMMON_DEPEND}
+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
-	$(python_gen_cond_dep '
-		dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
-	')
 "
 
-RESTRICT="test" # tests *may* be broken due to all the RHEL crap.  explore later.
-
 pkg_setup() {
 	python-single-r1_pkg_setup
-
-	enewgroup abrt
-	enewuser abrt -1 -1 -1 abrt
 }
 
 src_prepare() {
+	python_fix_shebang .
 	default
 
 	# Install under proper directory
@@ -71,6 +72,10 @@ src_prepare() {
 	# 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' \
@@ -87,13 +92,10 @@ src_configure() {
 		# package breaks due to not finding libreport-web with bodhi plugin enabled
 		--without-rpm
 		$(usex selinux "" "--without-selinux")
-		--without-python2
-		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
 		--with-python3
 		--without-pythondoc
 		# package breaks due to no sphinx-build-3
-		--without-pythontests
-		# kill tests for now until they can be explored.
+		$(use_with test pythontests)
 	)
 
 	econf "${myeconfargs[@]}"
@@ -101,7 +103,7 @@ src_configure() {
 
 src_install() {
 	default
-	python_optimize #661706
+	python_optimize
 
 	keepdir /var/run/abrt
 	# /var/spool/abrt is created by dev-libs/libreport
@@ -119,9 +121,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index b348d0068b57..07691833a1ea 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,8 +1,6 @@
-DIST ansible-2.9.10.tar.gz 14237929 BLAKE2B 52230b18efa94dbcbd6e4fba3d0915e2375fc8de7412944eaeefc054f50ea888a1aeb86b688a7ae97184b1a8a10180e67a7004d48906235ce4e1b83976d10e9a SHA512 c0d5e26491f52d1eb8d1c3755903bb6a8d50634df5fb50a970076d49d99cfda424fa60c258a6a5821e01c435a8ef077d46ced4b2f8c4f4a8d381737e6f14afb4
-DIST ansible-2.9.7.tar.gz 14215538 BLAKE2B b3882c359d0e71446c81b4f4592a08447656c22ed70358d7eddf36f4a84811d97f047afcdfd57f67664a130cee5c1231a106fc5b77b52cfab8b1be868ee03f81 SHA512 ce029441bcafdc5b44c9fda69f183d4defea84ead5628164caf87306cb97efec68c11b2cce728e90f28290640c320549486a6b4e823710f638d1d2e7c35675a4
-DIST ansible-2.9.9.tar.gz 14222889 BLAKE2B bcacd9271aa0275cff8090819ee5c2832c7b59a287d976ced7e4dad52b5af85350baa1de30f56fdbb92e237c1dd3a9f6ff86cd1af5cb20167331b3f846649d4a SHA512 327c5ece277096f71f10fec2b33a8d2c94ee59b0e22b15bb5ca449da2331b8158239bdbc8e3afd093af358a787f410c7c2e0942010de65a8d9c8719cf83e4abd
-EBUILD ansible-2.9.10.ebuild 1713 BLAKE2B a888274e71e059297c58d463de427aa3cc2c04ebf1bc272f98830cefe96c2a2dfeca7e3d5bf26b9724f1840631c586fab0753caf2d799e18dc94f23cdb63acdc SHA512 4582bd23813d31dee689dabd84f020e20249582dd8c51e7aa4221bbe21237e92ae5c48305e6bb0380dfafa754ff3cd56ff243a1e1ce93ffd9f89786e8fa42ce4
-EBUILD ansible-2.9.7.ebuild 1711 BLAKE2B 1697739493cf880bc2b0374ca2afc1e4fae28d0740afd9f237ad2507a3f69e7c837ccabdaf9cae2f66ba99536da0bcc83f6b5b364a63d41e89395c2e43d6add7 SHA512 719e35eba96cc4ef0d4558a508f553b63efe60151bed4e69671247b21f789090e34e75380a7267ac40639b75920cf3054ba6aeeee891adac98bec1d0c2243538
-EBUILD ansible-2.9.9.ebuild 1711 BLAKE2B 1697739493cf880bc2b0374ca2afc1e4fae28d0740afd9f237ad2507a3f69e7c837ccabdaf9cae2f66ba99536da0bcc83f6b5b364a63d41e89395c2e43d6add7 SHA512 719e35eba96cc4ef0d4558a508f553b63efe60151bed4e69671247b21f789090e34e75380a7267ac40639b75920cf3054ba6aeeee891adac98bec1d0c2243538
+DIST ansible-2.9.12.tar.gz 14260349 BLAKE2B 6d7fdc82489df755196b890b39c166e9639c94e4238b4bf33686a3ab17fcc92c6b3a05f80e1276795b966aaa318ec7d9003099950102c014adb1a5d730928633 SHA512 6c05c49e363d4d68516dfea448cead3e2c281d1288c9467a0b6dd083504f303df694ed1c5957ae6582b28acc937d12d13333254328e13bac430b9b7fa4354f23
+DIST ansible-base-2.10.0.tar.gz 5775091 BLAKE2B 2a087b1a9d675c5218e8700f5b455ff280a5dc6e66b575a47755b9936c54594300e3c22acadbe14acfd335c3be788e3d63f6ad3c5c51650cbc036c77ceec41ef SHA512 f9e9631f9ce77e55b06d01814422cbc0ca170e3fbbbd5886e4f87065b68b4d7eefe1c782f6dce14241cc548192c7b06ef778446636be02a342d4bd112000126e
+EBUILD ansible-2.10.0.ebuild 1883 BLAKE2B 0760346b3069ef22ef95fdedc724d4a184093dcde221df1222b29bec1012386d1a25f79e5c04aee920d0248b021a64c7ca392923afb624ef2df1d3ef61da60dc SHA512 4945d7b0263547f492b4f428aab8972f18fc7c1b540ed3b3f8f5c0c0cd3911120fd7fff9949e6eff6478eeda46de09f511b854f9617ab76b14764b4a31b0a7bf
+EBUILD ansible-2.9.12.ebuild 1711 BLAKE2B 1697739493cf880bc2b0374ca2afc1e4fae28d0740afd9f237ad2507a3f69e7c837ccabdaf9cae2f66ba99536da0bcc83f6b5b364a63d41e89395c2e43d6add7 SHA512 719e35eba96cc4ef0d4558a508f553b63efe60151bed4e69671247b21f789090e34e75380a7267ac40639b75920cf3054ba6aeeee891adac98bec1d0c2243538
 EBUILD ansible-9999.ebuild 1697 BLAKE2B da48c9b97787143e815cc768b5aebbf7bf005ac8a8562a3420f4d4594214e601e90cab78a447017de45b7217952c5c2b0922e37c2e7770b2e786632089230b22 SHA512 0276bdacbfef27725a2714d8cc56d05c2c64d2b37fcbe77d7cbeebaf30828364a7ecf86ea960327d01ae1e3202387777b32d5903152b405036c2541bc38c7f9f
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.9.10.ebuild b/app-admin/ansible/ansible-2.10.0.ebuild
index 8c8b3a948043..79e643cf99f7 100644
--- a/app-admin/ansible/ansible-2.9.10.ebuild
+++ b/app-admin/ansible/ansible-2.10.0.ebuild
@@ -9,7 +9,8 @@ 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"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}-base/${PN}-base-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-base-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -48,6 +49,12 @@ DEPEND="
 		dev-vcs/git
 	)"
 
+python_compile() {
+	# disable version checks on upgrade
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
 python_compile_all() {
 	if use doc; then
 		cd docs/docsite || die
diff --git a/app-admin/ansible/ansible-2.9.7.ebuild b/app-admin/ansible/ansible-2.9.12.ebuild
index 2a5dea9c0317..2a5dea9c0317 100644
--- a/app-admin/ansible/ansible-2.9.7.ebuild
+++ b/app-admin/ansible/ansible-2.9.12.ebuild
diff --git a/app-admin/ansible/ansible-2.9.9.ebuild b/app-admin/ansible/ansible-2.9.9.ebuild
deleted file mode 100644
index 2a5dea9c0317..000000000000
--- a/app-admin/ansible/ansible-2.9.9.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-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
-"
-DEPEND="
-	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
-
-	dodoc -r examples
-}
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index f7a71c808a45..0bea201a2a68 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,6 +1,8 @@
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
 DIST httpd-2.4.43.tar.bz2 7155865 BLAKE2B cd85c7e25500f8f1b4bd6ac5f715718a61bf548dfaf36408a970d27bacbfce256e4dda255ba5b62f89e117c335d0568d6207c93e5fb0d2b1ee84dba4ce0d4bd7 SHA512 16cfeecc8f6fab6eca478065a384bdf1872f7ac42206b0bc2bcac6c0d9c576f392c07107201f39e0601dec1bbafcb33d66153544de4d87d79b9a52094d334b64
+DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
 EBUILD apache-tools-2.4.41.ebuild 2552 BLAKE2B bc670330d77922c330dbd5daffe6377d71e4842ad61825de0bb34a2c9f77767ce540fc2372fbb91eb1ab83e9b01f469b87bb4667393fccb4a939b4099b600100 SHA512 26bae9a18cd88d274412a224be8e07c15685da56024b0c747d0c738a6d17e2f132032d2867e9f6530470d39ccabe2922406455c722a30105653b5ff2ae9a9ada
 EBUILD apache-tools-2.4.43.ebuild 2552 BLAKE2B bc670330d77922c330dbd5daffe6377d71e4842ad61825de0bb34a2c9f77767ce540fc2372fbb91eb1ab83e9b01f469b87bb4667393fccb4a939b4099b600100 SHA512 26bae9a18cd88d274412a224be8e07c15685da56024b0c747d0c738a6d17e2f132032d2867e9f6530470d39ccabe2922406455c722a30105653b5ff2ae9a9ada
+EBUILD apache-tools-2.4.46.ebuild 2554 BLAKE2B 78297e86ce8f19f484ce11d7179b179f1189dae623f9c8d201472591f74a751413419488a3d2c5879f7d62ebda5ee1ee42e4436abc0c48360bb806beb605629a SHA512 87e205c16d0fb2447d8f8fdac179b4c1e44fef6e3b4a4e40b386dbc4f00ef5eeb8d53de60b8f51a448b285a3fb286576141a83df2344eddde00d585fbaba5fd9
 MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122
diff --git a/app-admin/apache-tools/apache-tools-2.4.46.ebuild b/app-admin/apache-tools/apache-tools-2.4.46.ebuild
new file mode 100644
index 000000000000..20fff9b868cf
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.46.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="libressl ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+	dev-libs/apr-util:1=
+	dev-libs/expat
+	dev-libs/libpcre
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre-config || die
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+		--sbindir="${EPREFIX}"/usr/sbin
+		--with-perl="${EPREFIX}"/usr/bin/perl
+		--with-expat="${EPREFIX}"/usr
+		--with-z="${EPREFIX}"/usr
+		--with-apr="${SYSROOT}${EPREFIX}"/usr
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
+		--with-pcre="${T}"/pcre-config
+		$(use_enable ssl)
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	)
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+	econf "${myeconfargs[@]}"
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl ; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index 7893af8146d9..4a53ac0c40f9 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -3,4 +3,4 @@ AUX apg-2.3.0b-crypt_password.patch 844 BLAKE2B c87ccb6002eac2c363a5b35dc033badf
 AUX apg-glibc-2.4.patch 260 BLAKE2B b30c414ed89f22eb7dc2d0e3b115dbbc0845aba06f2a9dc0dea61fb36d9ccfa231d56959e7f02b3f1fb337654eec5cf2bd60c53ce24e112470c9fc9b9c225680 SHA512 27463b291aee051a4a149664cfd3dea524a34cd88d5cb90c5b4891fe0722aad9993cfd10df555455890ea631d8844d566d23cbb3812f8cb2859e131ea4c42114
 DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
 EBUILD apg-2.3.0b-r7.ebuild 1239 BLAKE2B 2a055b82dfe3a78baa04b03cbce4c9bc73c43373e54f52cb41e3b9f886c5d3e40cd687df0603193426b57cb0012336ff41bff0d9f22be25455fb884b2e4585f1 SHA512 ebc9adc8af01ebd0109ef693ca63c6a374fd458980c602cbb6556b913059708ae10dd2c78b9fcd8ffed2833d0da559ff7a0c88de6953662f287589ecb902f83d
-MISC metadata.xml 357 BLAKE2B 168ac61b9681a0f5c0697af69d05daf92d438808c944105bbd4cecedcae25c5710752197844862ec99c6193d8356930db5d4e8ed658e6d6b5d5b1c59e043cdd3 SHA512 b133aed60a72264fcca6e9f9e85a99e8c5ac08b2eee2f97ff985ae1610c14c6ed9ba3bc5553939c0dfefa91452e60255a9d127a60100f116688906de704e0fb5
+MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
index 5a5329bfe18c..585b0dc75dda 100644
--- a/app-admin/apg/metadata.xml
+++ b/app-admin/apg/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>DuPol@gmx.de</email>
-		<name>Dustin Polke</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
+	<!-- maintainer-needed -->
+	</pkgmetadata>
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 1f99094e5453..11c75e2f2bca 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,4 +1,4 @@
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
-DIST calamares-3.2.20.tar.gz 3246752 BLAKE2B 11bc23da8f035a0399f54c1f0f9e11806b0e3b77ad9f57c694c15de077ad37d3f282d29d0b4c010f19372e78d14af2cf9c58b95b03d6d867ea6c0c104e701fab SHA512 473422eca83007ce0d82e09d637b73c114fffab338ece8269d37a4496d786eeef5e75b06b60ec51fb85bbd145984d37f0a586edd9c5d58e23abde665b8370c7c
-EBUILD calamares-3.2.20.ebuild 2194 BLAKE2B 3c9bf74a167dff378a09cdf6f882b98e065a23645025a316f9012ad61b7f3560ba9fa557fc9f9462aa3d91995e0a39ec9a2065ea6b7c66d2df50b0b648fa9bcf SHA512 2a35274fbc2a11ad86ef4020422e82f007d65bac58c9e906a0168e5b24307665ca8e695325dfa6767d9f3f75b32ac7599b8a93099ec4bf263261bea8ef8483ab
+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
diff --git a/app-admin/calamares/calamares-3.2.20.ebuild b/app-admin/calamares/calamares-3.2.28.3.ebuild
index 8ad695ecfb23..8ad695ecfb23 100644
--- a/app-admin/calamares/calamares-3.2.20.ebuild
+++ b/app-admin/calamares/calamares-3.2.28.3.ebuild
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
index 78bcf3632f5c..e500933cc6a7 100644
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@@ -8,6 +8,7 @@ DIST checksec-2.1.0.tar.gz 200384 BLAKE2B 6e954f574c632da1aee629aecd7ded6286879b
 DIST checksec-2.2.0.tar.gz 2241197 BLAKE2B 33e76d1e74188f0944cbce2fcec3daab5a3bbef28802f36252a5bd8de33c96497cafbce0bbe91ce0bb2ccedf9aae1904224b5f68e31772723523179e76b69070 SHA512 a77e5f798ab651c509e0a75c6ca13e556ba354149acbd2e32d54f7a3318fef5f8a05bdb537374868836d5bf3c4d4e86e8354d6202dd1ba0e45a221e2d8688544
 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
 EBUILD checksec-1.11.1.ebuild 757 BLAKE2B cb3a4bb1505399b4b6b8f13e5237bb17f74d153a088d782427e2e8c53b2422f740455dca99ff29de6bf3fccaff2b1c8b1bea7ba760d08fadf8eb99bfee9f6150 SHA512 5669162f5f0d7e6c679bbf4cbb374d71c18452c7ac59451d5a4d39979f14dee9cebb91d63a37b61e38ea09d62e6931c3c48e853219dca6109c1cba32aceba52c
 EBUILD checksec-1.7.5.ebuild 761 BLAKE2B 928d7f91b7ac04ac04a9bcfaa14f8ea781eaaf2be75182d7b8d0f3cf63e0bdf9178d03da87732da11286ba172e2368eb5fa490021c3d5d71f3419d426b7b911d SHA512 5a15da1104314647688e68017189e1b661f0efd58d3a7ad5a788ab2cdda79249dce9c07e9db48d775ace6d8fb8679f2cb6669c1f16758f9c6e736e9eca2d57ba
 EBUILD checksec-1.8.0.ebuild 763 BLAKE2B 3456a3d42a58795e00cf46689bc60a99357dfec5a8ea7c43841584c10d4fe8bceb3d3c0e3a4965cd38e7c718b6c716a36cdbf895635a458122aaa34324f13600 SHA512 dd2af6317e19baef0e21112b6a64783dd1ccffaf2f0f2d80acf802b4ee14b021be23548375c9c86c8a073da38bbe4f1c58c533cb5b16cf60e082f8164dc84738
@@ -17,4 +18,5 @@ EBUILD checksec-2.1.0.ebuild 757 BLAKE2B f638f3ec54f7d6f7ed1d6b5affb2cc8801ea616
 EBUILD checksec-2.2.0.ebuild 759 BLAKE2B 114f4b61410767dcbe0828b48bc6e67b047ce0fa0293b51da79e19870f654a20ca11ccef4abd684fc1f7ab992a0491ac46c634104d514e7752c77eca9975a00b SHA512 d8eaaaa60e82cfc7d063cd1f20441abfc16ad9caf9ea0b3a67a81aa0fc910817ec4d1ba0411c2bb051fab7ce458d544d0cbdfccc046163a2fb59beece440d10b
 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
 MISC metadata.xml 334 BLAKE2B 96b933c9475a18c3957d46b58c41162e396f27ff7c53eaf4ba5be2a24e22e8a136a0814cce5c0d3c113e5d18a286fdd34a1b3cd46e509a7eec986f82d7d8ea9c SHA512 dd9373f93f165e576bd930ae4a49019d0c53359c4ef288c5d1ed5fc1033b82afff7d0421551eb9518bbfb3f25bc7cdab09cf89b1e0bd9c1ffe0137432d70b716
diff --git a/app-admin/checksec/checksec-2.2.3.ebuild b/app-admin/checksec/checksec-2.2.3.ebuild
new file mode 100644
index 000000000000..558196dd1179
--- /dev/null
+++ b/app-admin/checksec/checksec-2.2.3.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/conky/Manifest b/app-admin/conky/Manifest
index 0faec4789aa5..580294a6300d 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -2,8 +2,12 @@ AUX conky-1.10.8-clang.patch 773 BLAKE2B 1e1920093c8cea54190d2907f1966b66aae343f
 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
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
 DIST conky-1.11.5.tar.gz 2400965 BLAKE2B 06b6817ed3cb4bb638b5fa7f9a5f8544c9d274560dbef2bc8f8c10ed681b83d0ab27988f60bed70cd0c13cd4947a2bd9b70ad66c38dbb6f516f5d57165ef5765 SHA512 71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be
-EBUILD conky-1.10.8-r9.ebuild 4799 BLAKE2B 1d04ea102b5c4549d4d12ae4df521ee849378570f2ad1a0d2c582c44c2bf5c7bf4bf039a25ce661f85faa31c42b2d3188ff35336f46178c4e39e3b8067b9cd05 SHA512 8c90589918231188cb0b5c102bc177e8f2a14137a6e102539eb5d6d9a661f8f7dc0a3a00f5f2c94552ead1559c68fbe3897a527df4c1ac8fc7cf708db91a5422
-EBUILD conky-1.11.5.ebuild 4648 BLAKE2B d4f51731070dfdb03e7d1ba3772e60140c1c47cb4cdaf5d74e52bfecf6f4a5f00dfd1a9f98696a06f36c5c8053789e3b7f043939374e1b0c15a083cd054aae63 SHA512 05e8520a2545c16291024397600abb550e83407191001aaacfbcec499db585b0cff4f0728e87cd6ae3020211331001ef896a5ed7bdd31042d0bc984c8083a9de
+DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
+EBUILD conky-1.10.8-r10.ebuild 4820 BLAKE2B 8900e0e3752030f9e6f5e4af8f8d0670afec4f2dea2eb10c7f7b1db8ee3662349307d347a432dd0856ca097415bfff753a13694ff6092152ea909097b2cc3ae9 SHA512 564e081243c567097107f06ed79ef8adadbb7ecf8a4c4a13ac6d33ce550769b971c34a7b8565ce750ba046fd643fe4ae84434fb0b0ad7407432596e84afa1402
+EBUILD conky-1.10.8-r9.ebuild 4775 BLAKE2B d26874074e404db1402fe0f524173c1e3f3dd3933fac5079057f39fd8d31de1072fe7addb11f3a8f766286d3241158db43639e825418caa731e304d66b10663b SHA512 68543176a72084c976383b7898a06dce3b1048066d1e2a22e814d43bcc690dd119cee5aaa94bf173b0e723bb04cacfbf5aa0b7da18ad9bbb051b59e064dd8dcb
+EBUILD conky-1.11.5.ebuild 4624 BLAKE2B 13d0ece3795f69587deec1f07f1f2030ae54e358fcaf2a34307f74945070f15746d88ad38a21a85d958c6cbddc439e41c6bccb0bf1e1f2c3fc68b011f2acaa7d SHA512 02feb735ef9f20febea1ecd1f61d53c292e952c5040afaaa9000a7ae337b96afb4c91b97971ec21e1b023dbc272fc95412774a9b6fcbf52a3215f9bfa2a9b43d
+EBUILD conky-1.11.6.ebuild 4624 BLAKE2B 13d0ece3795f69587deec1f07f1f2030ae54e358fcaf2a34307f74945070f15746d88ad38a21a85d958c6cbddc439e41c6bccb0bf1e1f2c3fc68b011f2acaa7d SHA512 02feb735ef9f20febea1ecd1f61d53c292e952c5040afaaa9000a7ae337b96afb4c91b97971ec21e1b023dbc272fc95412774a9b6fcbf52a3215f9bfa2a9b43d
 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
new file mode 100644
index 000000000000..d84975354f05
--- /dev/null
+++ b/app-admin/conky/conky-1.10.8-r10.ebuild
@@ -0,0 +1,186 @@
+# 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
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
+	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
+	weather-metar webserver wifi X xmms2"
+
+COMMON_DEPEND="
+	X? (
+		imlib? ( media-libs/imlib2[X] )
+		lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
+		lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] )
+		lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg )
+		nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+		x11-libs/libXfixes
+		x11-libs/libXext
+		xmms2? ( media-sound/xmms2 )
+	)
+	cmus? ( media-sound/cmus )
+	curl? ( net-misc/curl )
+	eve? ( net-misc/curl dev-libs/libxml2 )
+	ical? ( dev-libs/libical:= )
+	iconv? ( virtual/libiconv )
+	irc? ( net-libs/libircclient )
+	mysql? ( dev-db/mysql-connector-c )
+	ncurses? ( sys-libs/ncurses:= )
+	pulseaudio? ( media-sound/pulseaudio )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+	systemd? ( sys-apps/systemd )
+	wifi? ( net-wireless/wireless-tools )
+	weather-metar? ( net-misc/curl )
+	webserver? ( net-libs/libmicrohttpd )
+	|| ( dev-lang/lua:0 dev-lang/lua:5.1 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	nano-syntax? ( app-editors/nano )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-text/docbook2X
+"
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-use-pkgconfig.patch
+	"${FILESDIR}"/${P}-libical-3.patch
+	"${FILESDIR}"/${P}-portmon.patch
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-virtual-sinks.patch
+)
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
+To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT}/usr/share/doc/${PF}/html.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+	use ipv6 && linux-info_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
+		cmake/ConkyPlatformChecks.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs
+
+	if use X; then
+		mycmakeargs=(
+			-DBUILD_X11=ON
+			-DOWN_WINDOW=ON
+			-DBUILD_XDAMAGE=ON
+			-DBUILD_XINERAMA=ON
+			-DBUILD_XDBE=ON
+			-DBUILD_XFT=$(usex truetype)
+			-DBUILD_IMLIB2=$(usex imlib)
+			-DBUILD_XSHAPE=ON
+			-DBUILD_ARGB=ON
+			-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
+			-DBUILD_NVIDIA=$(usex nvidia)
+			-DBUILD_XMMS2=$(usex xmms2)
+		)
+	else
+		mycmakeargs=(
+			-DBUILD_X11=OFF
+			-DBUILD_NVIDIA=OFF
+			-DBUILD_LUA_CAIRO=OFF
+			-DBUILD_LUA_IMLIB2=OFF
+			-DBUILD_LUA_RSVG=OFF
+			-DBUILD_XMMS2=OFF
+		)
+	fi
+
+	mycmakeargs+=(
+		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_CURL=$(usex curl)
+		-DBUILD_EVE=$(usex eve)
+		-DBUILD_HDDTEMP=$(usex hddtemp)
+		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_ICAL=$(usex ical)
+		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IPV6=$(usex ipv6)
+		-DBUILD_IRC=$(usex irc)
+		-DBUILD_MATH=$(usex math)
+		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MPD=$(usex mpd)
+		-DBUILD_MYSQL=$(usex mysql)
+		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_PORT_MONITORS=$(usex portmon)
+		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_RSS=$(usex rss)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_IBM=$(usex thinkpad)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_WEATHER_METAR=$(usex weather-metar)
+		-DBUILD_WLAN=$(usex wifi)
+		-DBUILD_BUILTIN_CONFIG=ON
+		-DBUILD_OLD_CONFIG=ON
+		-DBUILD_I18N=ON
+		-DMAINTAINER_MODE=ON
+		-DRELEASE=ON
+		-DBUILD_AUDACIOUS=OFF
+		-DBUILD_BMPX=OFF
+		-DDOC_PATH=/usr/share/doc/${PF}
+	)
+
+	cmake_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
+}
diff --git a/app-admin/conky/conky-1.10.8-r9.ebuild b/app-admin/conky/conky-1.10.8-r9.ebuild
index ce6929a54952..647b0da5a8bb 100644
--- a/app-admin/conky/conky-1.10.8-r9.ebuild
+++ b/app-admin/conky/conky-1.10.8-r9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils linux-info readme.gentoo-r1
+inherit cmake linux-info readme.gentoo-r1
 
 DESCRIPTION="An advanced, highly configurable system monitor for X"
 HOMEPAGE="https://github.com/brndnmtthws/conky"
@@ -87,7 +87,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
 		cmake/ConkyPlatformChecks.cmake || die
@@ -158,11 +158,11 @@ src_configure() {
 		-DDOC_PATH=/usr/share/doc/${PF}
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/ftdetect
diff --git a/app-admin/conky/conky-1.11.5.ebuild b/app-admin/conky/conky-1.11.5.ebuild
index a52ce080d2f9..fcd0a6637700 100644
--- a/app-admin/conky/conky-1.11.5.ebuild
+++ b/app-admin/conky/conky-1.11.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils linux-info readme.gentoo-r1 xdg
+inherit cmake linux-info readme.gentoo-r1 xdg
 
 DESCRIPTION="An advanced, highly configurable system monitor for X"
 HOMEPAGE="https://github.com/brndnmtthws/conky"
@@ -88,7 +88,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	xdg_environment_reset
 
@@ -155,11 +155,11 @@ src_configure() {
 		-DRELEASE=ON
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/ftdetect
diff --git a/app-admin/conky/conky-1.11.6.ebuild b/app-admin/conky/conky-1.11.6.ebuild
new file mode 100644
index 000000000000..fcd0a6637700
--- /dev/null
+++ b/app-admin/conky/conky-1.11.6.ebuild
@@ -0,0 +1,184 @@
+# 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-virtual-sinks.patch b/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch
new file mode 100644
index 000000000000..c0198ccc4ecf
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch
@@ -0,0 +1,49 @@
+From 8221ba62045012abf8a4443de20f17a0a8fc1288 Mon Sep 17 00:00:00 2001
+From: Jan Seeger <jan.seeger@thenybble.de>
+Date: Wed, 5 Aug 2020 15:39:20 +0200
+Subject: Fixed crash on virtual sinks.
+
+Taken from upstream commits
+https://github.com/brndnmtthws/conky/commit/ddf8a0f58f3110e31ec4c44ecff838d2b231f6f3 and
+https://github.com/brndnmtthws/conky/commit/2a7226d89331f7d5d0abf0b9aff6d75435dd3a2d.
+
+Signed-off-by: Jan Seeger <jan.seeger@thenybble.de>
+---
+ src/pulseaudio.cc | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/pulseaudio.cc b/src/pulseaudio.cc
+index 93226c1b..af814bd6 100644
+--- a/src/pulseaudio.cc
++++ b/src/pulseaudio.cc
+@@ -53,8 +53,13 @@ void pa_sink_info_callback(pa_context *c, const pa_sink_info *i, int eol, void *
+         pdr->sink_mute = i->mute;
+         pdr->sink_card = i->card;
+         pdr->sink_index = i->index;
+-        pdr->sink_active_port_name.assign(i->active_port->name);
+-        pdr->sink_active_port_description.assign(i->active_port->description);
++		if (i->active_port != nullptr) {
++			pdr->sink_active_port_name.assign(i->active_port->name);
++			pdr->sink_active_port_description.assign(i->active_port->description);
++		} else {
++			pdr->sink_active_port_name.erase();
++			pdr->sink_active_port_name.erase();
++		}
+         pdr->sink_volume = round_to_int(100.0f * (float)pa_cvolume_avg(&(i->volume)) / (float)PA_VOLUME_NORM);
+         pa_threaded_mainloop_signal(pulseaudio->mainloop, 0);
+     }
+@@ -224,9 +229,10 @@ void init_pulseaudio(struct text_object *obj) {
+         return;
+     }
+ 
+-    if(pulseaudio->result.sink_card!=(uint32_t)-1)
++    if(pulseaudio->result.sink_card!=(uint32_t)-1) {
+         PULSEAUDIO_WAIT(pa_context_get_card_info_by_index(pulseaudio->context, pulseaudio->result.sink_card,
+                                                           pa_card_info_callback, &pulseaudio->result));
++	}
+ 
+ 	// get notification when something changes in PA
+     pa_context_set_subscribe_callback(pulseaudio->context, subscribe_cb, &pulseaudio->result);
+-- 
+2.26.2
+
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 51dec70370df..e2964ac70ee6 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -10,10 +10,13 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip 2508208 BLAKE2B d17c22f3d8e3f0b52b
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip 2721920 BLAKE2B f3fde8f5cc53496dc314bcae822a415cf00950da0a03b968de00685371e7a2e84ffa304fb176e791c85c930728859687e768ff785829f0751ae919546bd3326d SHA512 8981a08b1ba0226854567b0977d8a349abe2b58420421ab1dccdaf9c98e7657cb2140ad1a38767d25cb54249b61f162ecd51d401374a29f7368a550b19196595
-DIST consul-1.7.2.tar.gz 22755052 BLAKE2B d863ac756f487004d0c1361bf470c1202bc2e2d1364414d4aad16dc313c7bb5021c45b1c8080ded707d67120ac009afcfc0bba37ccc99eb474049e57779f3db1 SHA512 d13d7750c745aeeb2577ed334bfef1ac8a4e0c6f671a6705c0b8978217d071ebcf32455c0bfc83a77fd03caef68a6e256d95b48d5406deaaaba263f1a97b23c2
-DIST consul-1.7.3.tar.gz 22785232 BLAKE2B fde414c0f76dcd2aa267114a6ebe12f57e5165d67a581fbc2fa1eda6a50e67ff81f993c5e9898975e21a66942526a0460f47a0fc5f90062fa345dfbef5a77ca1 SHA512 6cbc4f3fce613b3f8ac220038cd013ce14801ccc6c999b12e42f2149277f845531932243b063fbd83d92b84ed75000c47636f7883bd04079c0b82c642e021c01
 DIST consul-1.7.4.tar.gz 22787889 BLAKE2B cb7a813beac2fd752858046d5a92f898662ea986f09d660c65173eb68e7523e9f1c6a8fc267275b2170490dc1e897d9c8d0df57dd898e58f0197e835c759919a SHA512 50466c6ded9d46ade57df252cda3cfc24ff321c13455d789dc7ea300ba037386aca73c6a47be9c5817985ff9678e04daa3295aff5ae83c97afa297451456bc4b
+DIST consul-1.7.6.tar.gz 22797398 BLAKE2B 12ed9d4730d0b4392a60431c7975d42a1d151df75ee734f3c71210d51839e1be67b7662141b02f8a1b96da0914221ce5c4a8a2bfc08bb44a4d40e55a88213aac SHA512 5d6f65090d3dbcb6d64fa91af4d0885223caa80055c47ebda3e9444f254f2bc6eaf8c2ab9d148dabcbc3d1447b1841277ad2aca12d32ea290d8b22d96d3d885e
+DIST consul-1.7.7.tar.gz 22797355 BLAKE2B 659fec61fa9933c19d49c406a13305f2e33c064d9ff1df3d2c3dc28ca7f2e98be02aabcc110f741a2819022c6199d42284c8002c12594798be544295d7a2a23b SHA512 9a97ee452bac2cdf4cf9dbdab3b7b769f38d0d8082b419dbcc5b11a6041945f62ec7bbbd15f11e49c117215ff2ea6b986d754dbb50806631d6a0771741965d4f
 DIST consul-1.8.0.tar.gz 24065255 BLAKE2B 2e6dd72d5cfb235b5574fdadee9dde44c602604409ffe023d7032d56e7285a82efa51df26bee09ac07116daa87738867fc6fb8052339c35011962f3a178f68c7 SHA512 29f678bfe9012304f5eb49a47c2f2e799268bb4e98262d38b21de88a8bbd51d7035bc0eac8fb72d0a78526e1c2f83d34e897023476871198c543cb9ac43308f1
+DIST consul-1.8.1.tar.gz 24233215 BLAKE2B 55647f845165cced83df395c98df78706245f7a01de26b2e9eeb31576c66612c476b4c4d38811c10b2c4a827408ab77dcabf2682a9e70dee7c050a0b330f25f2 SHA512 4a1839949e2428ae8c1565c1230feec4bf9f737fd0fcd164c1d1f5960ea30a809c8d97bbcf628f19a12dedab444c3cb08eee28671929e611e5d508b7363586bf
+DIST consul-1.8.2.tar.gz 24237536 BLAKE2B d2983601564f5196903f3e60390f0d2095333f4ebce7fcf9ca0bdf0d4bf4dd8d3ccbeedd5665ad875065a2b6d7d34edd907dac3738e6c492b33aaffb7d9aabaf SHA512 c222d0989390fb256a07365844aa42aa7672087d29cb86b4fd486fc7ffd9a59ff35eac9ff5dca761194011d127489e38aa70d04232a8299c7b325d4d1d322cf2
+DIST consul-1.8.3.tar.gz 24240809 BLAKE2B ac3740541e37dd0546e719a359b3943ddd5c330b2c7e35dead1a8c849a434e935566edb1898d15a95892b35509885e02ba406d0bbeb4969e96146386c8b7e760 SHA512 841c21319b8937d1bccfc49c254db4d040368e678884c12fa67e8918e36c030c855c2b10fa7e372125c86345f0c6623fe7de54a4e657334db4a305752b7fd369
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip 16060635 BLAKE2B 6c358031305d8c8245b52bc58ed08cea5cb07c3e80cb3043f369ac6faf893a95d66c31fec38f07fe9029f53239c509bc060cfdebda8ac8d5ae556dfa0d6851e3 SHA512 bfd8f9859e519d6e45f2324e3907f88a1e661ca597f8bb3b7ae772246ba9972e09d0883abc887346fed55928f5d8422cf4212e32377e9900137cd63f0f9a93b8
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
@@ -50,8 +53,11 @@ DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip 9362 BLAKE2B a
 DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod 53 BLAKE2B 6fab3fdcfa8f595bbd52845b0b4f7b0e47df93fc624820a661b38bff1d51e0a57c89b678e0cf271ac6575b6a77c48d3ca93d5307d6cad98b35f79f1142a27795 SHA512 b1f9bd825933cac8ecd5416f86748f26e5cde3fe87266e35ee794cd1f59ce0fa81c0e62169e838e70afa71b0680a89fd8f2beafb3c1411eceadf48a154a08f9d
 DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip 6278 BLAKE2B 1c42d23c77848911af642fd38f79aab655056e731f015a62374a23cdaade84b53f61b80f65f9416bd4f0e4b72a0b42203b56d659d30a44bb244a6ed5ed1869eb SHA512 f1a334ef91dd9410c57efbeece2ebef6ea326485e790e47de67efc9495d3e252cd7e981bd9da3f94f2f7e35c1bad9a8d5153e671a9b81758ad0584883c916155
 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!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7
 DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip 27548 BLAKE2B ef103ac58733cbf5daa09f5c67cfa3e9256c96b884b63cc039cd644da9f039d78a5047b6473a43bf88c421b3e6a7d8faf5b8b845adb99fdfd7c8558a7b67336f SHA512 689c6ae1c9872dff6f065f1123b8027e77006080a3596359495c6466c6254e85250882e6086b8f9e526ab94c25509c0cc22350c9cc0778a3214eb746474cb0a7
+DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7
+DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.zip 34337 BLAKE2B 7caec3639ca080f2da9fe83a9d7d68d7038d5f926bace22c149a52b0c1b09e97a9c37c1c408a77add3391412249f74687ccb8237376122ae307e899df1e09e04 SHA512 f16a6a25abaef19382e50de8c791947ef9d65ed69c275bb20b38aa72c03e6b161b5db1974908c223cb62d393eeda0d9317f6ca9ab1db2fc5f7db5e967e3d730d
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod 37 BLAKE2B 21cbcf43ce9e4dc3485c260f4b20ae34fa1aa41676ccdc1f4bd28fdbd9402db8c1f77d4c644e5044a0f2cc44e06a6109791f6d6cc4620b32e1d2c36426df65a5 SHA512 752909cad98e7eafe9ff00951c27d955242d3d76c99c3e52427987f1c81720af76ad1da5e4d67e31bc192822b7de299edeb2077b248c0f070b6adfde4e9b8ec2
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip 97335 BLAKE2B 691e694645968e97b76dd4a58c58492b59a6caf782d340d5a129dfcdc11fb8dc0ffff8f1c751ac484459cd6bc369404eafb4f551198f6e7fdfe612ddf2ac33e3 SHA512 a237b10fad4da7a4571191cee1f1ac77597d73211c8feec5bfc69293640a707b9370d7360e3e4f2ef3d7dbfabd74ccf63de032c9faa4ffa3c0b0c00d6de787c8
 DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod 38 BLAKE2B 3f0ac051b31c84f5e98663c1e6245a4e2bde2be5c0be61ec80764d753bef5479251bbad3cedf6fb998d1a4a4e66a80beeafa6f3291ed45f46d643f7be109004a SHA512 aa1f503fe0c19002da21ae30df5393c15f2b2243ff415493420204d11032a562d5d40047705b1644d031523881dbbf284d3c56ce8106a2a969d2610504426762
@@ -65,7 +71,9 @@ DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a
 DIST github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod 31 BLAKE2B 6ff35fdee07deeeee5ac0412b923e2a76ffb19646b121dcfa6b3bda5400b9813375f7659a42b8141ffa6c29e79a4f1009a946ad3bcbe943889f20550bba73627 SHA512 975a6684c6f7eebaec8a757656fb51a4bd9e7ebedce12bca267fd69ae505bd81fd6296fcec6a3b45973f841982defb9311e405aa349b2c7e664384ca05a920f0
 DIST github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip 7070 BLAKE2B 8a387a04a8d6cf7d548f2032820a02dfa7f0a078f3ad04b97643ff46ca3436776692d620e5424f51504519551a8c4e48135e37e47eb73bfa7f7de254ab9c9838 SHA512 05b98a368bd2a312fcc487a5d17cd051318f2234a570ef416464206193e62fd1a43169a150a5194f7416692771fc53132fc5352f05872cf95fc1e9402cea21ee
 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%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip 3902 BLAKE2B 8662340cd5095c6ccf535a54e79af09fe46640ba0b119b44a29052ad012519d9b5886bd4ea81f4946d0c4573f63538b450ee864a48d8c04e1c9e7358c2588e8a SHA512 c73ff22440aa8f5825b7e6820c270582d5512cc096e69b6ee034ed67ec3eb87b3266b82eacf37b985e872a693256be6f377814d3cc604180ea939b42971ebe80
 DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
@@ -73,6 +81,10 @@ DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.m
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip 37264 BLAKE2B 13a34ae8ce6866da183bb7f9f5dcdb702ffe846a3c5e789e99f6e112a1e64b1dbbe8777727e5678b4bdcac75ec32ddc52ff303b95b5ee3fd22423eaab44809c2 SHA512 e1b8ad2c09c16599c6e5053f871df9f66698c7a632276c1e68c80c9737216751939b7b7024449ed63da0a292688b4d7a441d64512aa4bd8684e418f4e5da4446
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod 582 BLAKE2B 92aab40d86d733eb8f751fb23e40621b5b3bbfbd8b1d194bc6e689b6df763b4030aa83ab78654dc8e536274af6de247b8fc7e4e35e6cbf2f6fb5532291deec6b SHA512 aa43d2e262a603661ac3dc7aef111aea6e348e11c5384840d2be06224a6c2c580fcc0e3c6645a0d48b48826b0aff92562f0c6504eae980ff5610d2ffd2255d88
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip 41353 BLAKE2B 850ec7d356246c8b47c8594aaba8db95d979ca7fb50b383ec02c6802faf089bb170ea7e86f7e1fe8f95fbed4208c6f39c307871d74b8052de5ccd9d6ae29d49e SHA512 b533a51ecc7709cb74da88cd3dea70b3605e75a88b93d16aca5aafa100352002f5b1c1c6d9c33d6c93ce74663d27b7cf82c8fa8db7aadca4d42e8a7f6354f78e
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.zip 44404 BLAKE2B d1706e84ea1345f4e4b76abe2455a85f798dca31fc628a83545f15aed99b2174bf07b2f62bfff7a4baf6c250e0c8d8009991194ac80a7cfeee73c9ef78d07340 SHA512 3f51d990b087a3762eb6895c8afc118a62af946f889a9f4bae0dc74b33bfa43c7a8e7ee50e97013871d67914a7f1986e500501ca7462547af301526f427f2853
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip 44812 BLAKE2B ba556ac48b565838fd1686825e0bf8417d0473cdd1d0c9f28ce88cbda83b9e61bdfc9cc8b86351d0ad1d57b2aeb978800200bb023d9cd1bdbd013237e1813d92 SHA512 6a71cedd6356d9e17ffa7af4e005a7d17f1c004b6b68f487ac75b13668d22f18c06ea0c0e4c9b62d5d60b27054a3afa0e73d4adbab6ad46ede4b4387500c27d4
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip 7271 BLAKE2B 4590233953ed1577a41ef4425403585d5cf9d0bf770bc00d38de4601015911eb56f695145beb53739ba7a64ae0113686fae54842a61504005f5f1a519e98ff53 SHA512 6936a577297949e1a146e3efdbe88e9c81205ccac46974f092846bcfbd533a2c8f0f161bc74da60d7a0d8aa6c5d2b1591fa294320c3e97854626407f0f838423
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
@@ -83,16 +95,25 @@ DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 3
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 15013 BLAKE2B daecbcbb12a60a1423c4f419db44a0d63108fe622cf843593abb16fd75dcea703b3cf56f1c13433959eccbfb2a9bd5640f837f4be3296220366438dd7ed04f86 SHA512 44ccb3d6134742a80ac15830613c169d1b0d43e6ce40c2f2fdea07203bec134e1ba80dc57c6d14a007014ea141dca311b3ebe61b12d2181311665a9ffe83ca39
 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%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip 9262 BLAKE2B 50feca006319c5a8d957976be1c02a0a6a7247441fa0e903b1a03de85859f2afd0c93cf8599f60974686f47bdb7f0c94e58c6ec01ffa3fc33cf5d04da3bfd08d SHA512 0e52838ad73009c795d6a43d7d52d082b0ec134e0f07015fa51caab7d1dd141b19df7807a7ab146312848567f8635966c6ce7ac22b934a630e0131383caef9cf
 DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f
 DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip 99852 BLAKE2B 9151e6475685ff3b550d1ae1291778a01793f691a3ddb007d64fa49f02ee85927c834ad709dee5fcba0f071630cd62504a65fd4344d4ea5b9fb713787bf6b725 SHA512 837cbbdb0a91efd765e697e01bc64f0206897d6363b303c96ba53062d674623b19d8c86d96a867529f1dfd6689240e18ae7c25dee268542d46e2877dcbf83848
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip 210929 BLAKE2B 7b1c57ae92e16ffa7370b069f7037dca01e73cbe8cc5723c092139779bdbae2c5a4483d623ec2b62322818bf324f2ef41e27b03a9b9ed82bafc5a1cdcc6f18b0 SHA512 4dbdefde602fa13bb1f0ab9dc6e947dc158defd284753b51bbddf9e52410dac5429e145637f155bb8703cfe8723fd2f5e4ec7898552d4a2956c8dfa01d4946cb
 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%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod 51 BLAKE2B 3d0af1f8d7979de88067539579b73ce3d5d81a477ff042831692c738e9b4c99de13a3beb20fde003df06145e26d472621a2ff2857fd584aa1527df3730fc5efd SHA512 d1c83d2dbd4e242bfa9d8b9b58cddbd4a1ad112d1f5d1ca757fc31c6a31bf460d08cc3c9bf14c977fa74d2099ec83d5e45c05fd6121f800e26da6a837d862ccd
 DIST github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip 148431 BLAKE2B dc5c356b179df55561c4b673f7c9b4e7eac70388410f3ead0c3a23165450d12154cdcf44eae51550e8e5f0dcfa92fa4df0439a320feabf8b00a6aa6afc134401 SHA512 51705b4747969ed96b7233c2c0159e8a81c6be1bd35b68e3058fcd9440185df30105293d9b936388aabf9bfefe9670cd930c608ad4058e0285f9b7d2d86352a4
 DIST github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod 47 BLAKE2B ef512f7530c4c3fc3319129afa2fdb655d40af9aca697d22e4470528cc41ef9dd5ffea2258792d0efc7e1e5de2de2fe760651df84c3d39989c4d96b58e85371c SHA512 027b177fb04d5bcfaa0e524e6682b639bd91f7aad9ba14e22cc1b4f352e2c3bcd4d93348ed013cd839eccdb01449db40170243e7895c2cfa3f6980279faf39e3
 DIST github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip 10851 BLAKE2B a0ea711e6fae09612c3911f4526816c7decd163860d5c8bd6c7cb55d4fe30c485d735bc76b817125a8bed9388e17e48fd595dabed55e26b5d7b685f5fb9bf485 SHA512 2908d5b1f9beb4fed31923fdf77ab83d7c992245c4bd08b7655ba3fef1ac0ccefab66fa4c7b06f67a7960e16069f611cb44ff1d9a675bdd2750934349752a030
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.mod 170 BLAKE2B c8f3e464fd2cb8f38cf999a300b44307a1e3d40101460176aaac8467ec7d371f08c69ebbcae7ad8086a48a02a0dd7fc4b1cda1bbd7b5199c4b76f1ff0492d7b3 SHA512 4cb0a4f9d5f74f3115a10661469cafa88044a8ed2de959b26054441714080fe8d639485b69df02e0f91fa9040db259fbef8281971c28a67953a5abe5b7220ccf
+DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20200313221541-5f7e5dd04533.zip 26805 BLAKE2B f68c71bbb38278547c7a368add92e11804104997d345c14a2cb312ebcdb18e65182fd80ba1ab3dfb3582c846950928ce4283c754d6a3103d6616da0e144704da SHA512 7620504cccb3bb0f0b008b6e75c6a0d956c3cab12c4e811f51212553ec611a5410ee5ad09393df0c82c62b0c6ef786649ad879208d004730f1f0419628b241be
 DIST github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod 34 BLAKE2B 21714162b9a8fd9c535eb49321b31d8c574339b2f548a64d4c224323f87e795b5412d502499e83917a1395dabcc9e2455f5e786ae2c3f204688d5c6ca402cdfc SHA512 58f3cc974ff4897b4f160dc47440241bc7084dd62f20c16c019b0c3090d3c8a8adb46ee8cab1afa675c9d3830cfb2eee97e1eb1315a683307d87ea3d2b403efa
 DIST github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.mod 34 BLAKE2B 5f659e02eb0784f23fe0fad723264f2f4ac4e6e9fca2ee0ff6506942de9e4151f91cf7a2f765cd5c3e163043aa649d350404d9240b5dbfb8a9b56eeecfd0e248 SHA512 b61915bf1e9b8a68c240220d89dcb923bb7db6d61cd155a81530daa0316ea03c1e4ad2571725907b4fdbd4603c3ce80ea6752f38a029168aa4077e5fd3b27231
 DIST github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip 594850 BLAKE2B b887705e8fc4a6f9714dacc0204c28efc3fa6efa4588237392badaca453a152dcc9571adc7d6d93c68b4ba06e337707109842b7e9429808a17ef89b90dcdbb68 SHA512 79c541bd344a1cead5f01876786b48dd7052530489636c2eaae48e45e3ee86289bb6bcc0ae438e959a74224763e514af49bc1135958140238595d2f3289f9593
@@ -132,8 +153,13 @@ DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mo
 DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.8.0.mod 512 BLAKE2B c7472d1e964bafe7b1068ad6cca64400ebbfde84b832db39d05627260a875d8feaa67f75b553d9b0eff1ce7d220f164e174e769c7d22b0e6f198b203297deabd SHA512 4fc9800a1d670734231fdcd8c482801c4a776b275f1843800196f8f793cc747be995364c661f2cc1035f6e263ae117ce2889c8d5f33bb834e664f913a5f90f71
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.8.0.zip 1029374 BLAKE2B 750b1245584cd4e94a0588e2afa05ddcbe35b9c1f18a2e68fd679202b969e375d57972c4970e976c07e9aad233fe618b99235349ceb80597b0e5323c12145d74 SHA512 252200d3ca3157e483f944e34e2b62184112e129fd4018859b0bf9a213e6a055fe2730a8749c74c518b67647d8949c8e584e75701966d6acb8edb6e9546a3c50
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.mod 471 BLAKE2B 090acc4c9e35d2074ec7e5f821440bcb960c6ed7485eb1cd2587e1745536cfd57f78566275aba7854b394f629be4e053ec314bbef9f4a0c33fd6fd96fbfc6b0a SHA512 7ac07e70b1ff9b9efb434c2c1d3eac4996ecf49b6dc2134b8bf29c09a8ff05193421678eb7691a86c7c141f7cda73d0240b010854bc749c2bbc4b83e16a31358
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.5.zip 1896223 BLAKE2B 2212f443d2f122e5265ec338676c2a37f5ccc953b812a0311dfa7e34f44e3a360b375a8c0d1039e943e2a04fe550111a87c023bcacb145f981c5ef5f33eb7882 SHA512 7b7c7ee5d55adde09d1458e01ff4c729d060c38dac40254bf838a2547cac63ecf8b342700b7a4a93001b13b3988bdbe18fa88a56c549b7dd4022532c37cf45ad
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.0.14.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.0.14.zip 183662 BLAKE2B ea6ebbfab900f51bdab7a962e0ef59f1822d7e2b452f7340396206267d0a4f4f370ab331665358a8a3bd77765b5e3d38771187f1bc839dfc68ce34303bc63f8c SHA512 c0af221cf2d1b13502ce26ec4a63bef9337d2e76d95d73424663a553425b172ae25ac7426c27d15c80c70ba19f959889cb7c81d5671cdc65bd855194f1645e03
+DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
+DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.zip 194391 BLAKE2B 78828261a7d5bee8399f689ed8de5a90e1a74e54a935d166078a477c79aaacb04663382c8531663a5ec8b3d225bd9e11e3ee4f3eb9fc94b2714fd6c8d34e9a25 SHA512 6091a63fbfe97f1b9bc5a9524e1065666ce653ae85b9dc7999f322f08dd48fe1959be515d2daed0dcacc3a83b80505dad5cf5a9d190cf8136a7a663a460806a0
 DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
 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
@@ -147,6 +173,7 @@ DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
 DIST github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod 33 BLAKE2B f3047b593a38c87128a1304a48b8bdcaf8d5c06d275460f5e0908eb499259b2228754404015935d871f529697b1153c3a86a151cab4fa7aded7d109b4c40f48c SHA512 ea09ddecc4d78f7e9e0407c02de1e3754c68f5efcefa2ea075086f26c203c6cb9551a4d4fd0241b86b14000dd9501bac8e3d9857a98b56445c371a882caeaf28
 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-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod 31 BLAKE2B ad0f7f1eefdcb8962e8a70fc9d27b8c4618a2374e588db1afa039cdaa34b0b612b7249adba1cf61147e46da5dbad1edcab05085d503c7babe31745de553c7f39 SHA512 42b1f72e0d2eade3b2ff4d6689be08a404e8ee9e565f2f9e141d20e11d2f6865052fa5b829712647662204f496cad00a57fade2003c321b76929773a2777e4ab
 DIST github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.zip 55812 BLAKE2B 404048ef7688e941201d56f92e82c122e33b680bb31b35dcb0ebfafe45ae2fb27d1392198a0b6006cf6769fee17857ad87d8662da0fcc5dbc5d52ae253c1a5c3 SHA512 3aa4ffedc9412d199b82e68581e1cd357b23e1b89531ba3014c341e5c446a230c21baab253fdb7aaf6e4a1cd5d7c489cfc30d8697ec6f650a0743b6b0e038bc7
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
@@ -182,6 +209,8 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e8
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 482403 BLAKE2B 47db66e9c8187c20b27b9aeb8584f0f2289084103ccda25406eb30059147c3bcb867c76d145c4cab7eae801ed4cf76a63efe23f091e05c9206fcadc3358a02f6 SHA512 d102d00618f077f7d677eea9f0d4aff600e4b95caaca6ae6021355e64ed0a8fe418fd731370baa968f6fd338e377b5d3a2077b0b8a1ee399f992b8a7717cf77f
 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.1.zip 461624 BLAKE2B 37b2bbde9cd1153fe5811ae008983179820ce40fd6816155fc7b7d040e29b8725509f68c30b5099b686e9a6ff31a2d029188aa526ada6375fb9c7a236b8a7d1a SHA512 a99c2150515bc3deef1d7887644497fc4aaa96ed6c2aaeae91aabfaee6668c144b34a2c75ca829636c7e88d59b297601867b0f188ac048de452b5e0767480608
+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.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip 69641 BLAKE2B 7d5306ebb893e705188699f7b5e690c375bda9e0ab4c904aec10560dd75f278016c9f69ce4973260a4e5a8d8d7dd7c2f12a59f98e96a4456af6f23fd0db224c2 SHA512 fa400e3e1b6f57e29c93ecfb1dd94ccb1e4e4924f3b62ae125ad0bd88d56b5c48080ad78dbf545c1056bcacf860b93363a27780dbce2b812c5b58ca3c74fd11e
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
@@ -192,6 +221,9 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 74164 BLAKE2B 6a3c04c2986b35dcc32f14553534758c3270c294a5e2595487f884e32e76cac2ebbc34cf7e42232eb7d85e71fee7660b513de4e365981e625515b086c341d15c SHA512 7be2dd2b362f56ad7fb7be35b62a841ca051d4fe31ffe1ca784e393b0cfe44674a050cf1129a15094872bc16c8ed9bc62afe0e7017bcaf1a4eb9b2e39423f790
 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.0.zip 99332 BLAKE2B d95e04036796b0687ccfe18e2cae196efa87fbfe7a763a219860a82117f5a7ac594af005d67698289a9fa0f19b9c397f850ebcc8f6b2e2390fcc6463e95dd47a SHA512 6922e27a1a67c4e858880ca338f68ed80bc01175801b2194a900ba265c00eb482c29e785c564e9afb8f60288593b315ae8af6c8f366d35475678003440115d26
+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%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip 9257 BLAKE2B 4082e7b230ac5242c79ba7e1c2ed5d51e76b5cfab0e0b366aac04daeb99d77ce6d2e78fc9ba5d6b7b470cad128bba917a914b6a11ed532559d108e8a0aed3cf1 SHA512 05954f59ae284c142a0526af3b155e78f3b9728fc016e9fb7a8294214139a6268fa8012a8be993f5ce4854022e15eb5d58ba1b1c7811305d575fb69878149ff2
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
@@ -247,6 +279,8 @@ DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B c
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip 23003 BLAKE2B fa553bc49f3f28624830aa0323b0c668db17d7628ca24b280eb718711c240e67fa6ec86b61c7fb5799b63085b570238d07c925a8cbc13e95b9d73d00e4a2ff65 SHA512 91c7b40e4125c3350ac4700bab85547840a8cc848f01bab06bde2eb51693a6dfd584fff718bd2425c67b15757e6e3f8a779cdbb051afff2094444f4bcb080ba8
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip 26063 BLAKE2B a8905f3ce68e07fa295a303cdb9ac8f78f746da9f82e32e44a227dc57608e21dc2a95d7e33f1daf1f91d5dff32e1dfa3a95eae3730e590cb3723f46afe51ec56 SHA512 b374cab2eea5ff0b1b314822094f872df5c07479553611722fc4dce1aff98dd36919f8c1e8d8d36ac7c7da9a51e95e2f6ba971d2f0575ac5f1cad1ceec3d9f13
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.2.0.zip 27085 BLAKE2B 43d07f0c6f351d78cc4bba75c1392574b537a5b8c52b1a86311092ae01cef11c2debc002d1cfb3f71bb74d262e2c24745ae3467d92d6264b5cc4f381a362fc74 SHA512 d5b1da656921ab950265b0789a70232e287b263c61e46122cf0ff2fc7fb294d018909bbdc6988577be990870381c65999f8c9df0d05ed48efe4fc313a28e8f90
 DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod 102 BLAKE2B a2c5aaa93abab3743458479bbaf9ac71dc111ad72793721fadda1c55bd0c6c28b26ff797f0d79c5a045a6893566447aaff76685f73a0204c9bdf7ec52ad6e56e SHA512 8d73ddc435d2a93ce4daecda7fb2eec3a8cb0ab4a1b5c83f14a514046ccdb52358762c70e72da91a15ad1b970bfae8cc9fa775ce4f87b9e4afbe54075961306d
 DIST github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip 39600 BLAKE2B 134b58a09e3417ff72b1568d798d63d621d15a069c69852dabc9950dc8567d2f6eed06a0110fd058b9e9f289fbe9213b35977293faf770b0bc1e887161aef0a9 SHA512 b22f0255a075b7666f10b542fa810d99ab2cd15bd49697330e83199c63d2fe21c317247ae03f3814d5ceb4194a9afac96f4b39422f12d669a9086f96d7e2d28e
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
@@ -257,25 +291,20 @@ DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip 14840 BLAKE2B afc6
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod 96 BLAKE2B ada026bc3e6104973cb7900d638acb7976ee8301e98cea55548fc800d8954997b666d0c605dcf1de0f639932c8834bd13e8f8512e74529a818d3de978f0163d4 SHA512 7276c308f91ed52579965e7e83e839351f2170cef2b58ef67887d5eb926dd21fd502f98ddc84ca8e6f16c81171490c1e2d9a131569b5d6d56a1e2ba28f227451
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip 17595 BLAKE2B 06dae93e8077ab6235d59b57646a162ff31e044624bab3b6ec86c7aaadf49c36b262b957704151db889c515c425630299d396d0b76919403eabf4a3e71098ef6 SHA512 aa4b145476a80d7be7959bf7d0a9a278765496dbf915d083fbc40c5b216a52126af9ba12cf09f9cc178ce53987822ed61c92e2a0295fa977f8a460262e857c30
 DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod 770 BLAKE2B 22eef413edcfeb0337641d6567fdfb73d32f8ab2b3e624a3e5dafa15d31ca15c98c9740d4e9c8652adc5cd9f336153c029b086c260cf9ed8beda64b9c0c06028 SHA512 65489f1fe43c58303bd999f4c8d96b6bdb4d194b78e14d2ae9de9ce4fa877827f47d5d3c79e8417c88d1571b135678c069571e528b061238a9d59dfc8b472097
-DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.zip 105218 BLAKE2B f08840f6a06d88834cc537a458805b9589a3fd247ce94bea5ea99c39061ea6a710d9bbf7a5864ec2a3b136a72997bf5755e94685104aaec76352633c7334fe2a SHA512 d2487934034ddf55c95fc98c02de482c9182079960698c21e14e8b89016c9229853e835695aac7a21ad11abd263fab8464bc8014eb9fcff52bbc2ae1866a00a4
 DIST github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod 276 BLAKE2B 1ed39160b23bffe3c57b2d21b4881b8c9adad956bb2b929a8ae2abe94d8abbec24c73a7a679cf7051f7b8b0a61167ce8c6958532dcff3df4de87a2148196626c SHA512 4385e13d97a4b7243d73f9415c943c40595444bc576f917ca59ea8cf6da3a5794b82ece26a484fb06fc2e2aaf0a46e3904ba22f9236f673c59fdf7e09a297546
 DIST github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip 20140 BLAKE2B 21b3ae179e61ad340a764c28fa866c4b438f658b544e9687f03eb024ecd5b5588ca94454d7904cb0b1358751e3c0532bcf826c358bf6efde25c801b6f7059fff SHA512 ea0f407cec7f99a370593a66539dfa0265856faf9972e89182d169063c5ab7270ea92d46f558f2fc234e5c47e9875784f7a1b0b56996720aaff2b7d2f39b5c4c
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
-DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.zip 17490 BLAKE2B 197d279b7840f334b77ba4a80f24e491709462c6d75f27838d01e4502128bb8a431093d58e689156338a8e5f3b9d5cd785c746a5eae6ecbb47e6a066d2f4cb77 SHA512 cb4a6900e45de081395dbf670c3f7aba821993fb081adebcfcd68ac3aeb94c8acb3d777a28edb1dad6b0a4fc9035c4c3c118ebcb803f2bcbb35f540f1c11787b
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip 17666 BLAKE2B 17ec61e27967762f6f2d29e8dc23f4fba5c4ba0ee5acf7dd342e7437956af4348096da9df87c47c24bdc5f0d11544a1e5638125e888a9f163c97086259cbd888 SHA512 62644e1aad01d8475a0fe8878492477f11c5ac26cb0142a69b0afaf46a74ef3e3658b199ee6f505941f19d9ede170d62237422758e2800d81b251f365ac8bbbd
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
-DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.zip 14910 BLAKE2B f57ec2238d5535dc22946b7636ac5d56ffc4ee90ac57d11e045971634455783bb18443ae67b09dd6dc3086b861e597e8ecd7a06cef2ef7225a04a21017bb4978 SHA512 d18262019ea6feadd73719800d8a613dc0ea00643c5f6ca5f557e46c5d757d584c5735b717a360c65bb68b25949b6d2a39ffc207e4e0f93a49ab855c050c93e8
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod 98 BLAKE2B d536f017d021aa2e43bdef41de97b002d8e08e2767ae5222ad7d05ae23af04c4920fa2663b553ee803d72751ae0772b4e8ab7dd5243aae1c35d53c0f6ed85d24 SHA512 97ad4c83d3c61a8b878871c886a1fcd6e3e954623b56e0775897160368b08a243d325991956d557b5d8741b0609d758b2da0277049e57163e18248594ce3cdb6
 DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip 15463 BLAKE2B 88fb544a56eb6266a2ed75b3b6380f52d11d725e8711f2fbe321bd30494201d43db01398348fca95ef76ebb46ce26f3f523be67bc2d56f264f5c9fc3ac1cb8c1 SHA512 891f2adbadf938d7d070d80198f50a62e187a6aa6fa6b489e0055b98a9b2547b43cda11ee983815026b1e6f0f8864d695bf7e72d70290423ff53b4872d310735
 DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
-DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.zip 130743 BLAKE2B d7e78c75b2a9cf89b07fc1c1ebd0f93668d595e21d13f45fe7cb98f09a8e7539cbc2acd2d14527370c6d4e219c0d5dadf414a8504930b499dd306a08117d774f SHA512 718496a1cd900d52b314a0113729906e42940f9e3caed0f989f16d7e28a5b8476400c00917f05e669737c5c45da3af95741c99a188698b628497ab2eb18ec49b
 DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod 215 BLAKE2B 1533dab2e1f588c3e362d82a22e8031674457b30822ec51d6130bab2d9bdf9412a86eef4d581ac50b2320ed39277386f6422e0ed26145cc5a415428ee77a927e SHA512 cd1d90707ef0309643612f59ed64ee94aa1ba686a4140ed84963e983dce5204788b10def7a0c949b15b215063f52269e7441c2e0230440b07d45d704580662d3
 DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip 132950 BLAKE2B 382fd8ab248997b4f364426ab0cd0a31085b5969b9ea9ed50046e8b7687b81eaf766e9e8e0bd15cfeee84319dd25b0c32b0ca2795066ed38f6979dabe654803f SHA512 43075467209b036a7634f6398af7147d209f685e2108f6190e51487905df4d0e5e0b66c40c8bc5a26ae6edf4652fe605fc2e84fb5421019c07d45710352c146d
 DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
 DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip 6210 BLAKE2B b5d3b234531523546445cfc48d9c4198fd0ffe8c91ad6d2b3349f28d5073a6d3cd76f0db36380d69ea5617357a8677a81ef8cebe04c0dbc4538bec1810f817ae SHA512 50519f8c8efb7b3494c857373cb119b924f2ace674f07bd0d0da5939a75f8c154b5cc8875fd35135228a9e8e221fccc174aa298d21bd490b89a0f2d9aeb38e09
 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.0.zip 7792 BLAKE2B 2ed26e132b77e3fb84ee25c0a591c074040de3992abb9bf9f11399db65855301ac2334b9b5290220d01965c5203eaa1882ba1af551f8aa6ab775abecf2ff2797 SHA512 102786b62fe1c84de948cb11a09cd07f3084454d71b32ad48356553660e7eb94fb8d5950f74d6393d12ac9caad01a8b01add526c9ef8bd73039707f18729376a
 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
@@ -285,25 +314,20 @@ DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip 15533 BLAKE2B 6804423
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip 15917 BLAKE2B 66bf9607834472667be4da679727ff2b004e95dc52e4c69d1470586244387b3cb2afb792b8f7d858c4edb3f73151771eed8d7509c7da91ad31655a945ac4d326 SHA512 b1267266cdb9895cfc0707dcfbb3dbcc8e3a53adb297811ee70d20f6a77d080f5cb0c4b8438e68d933a7ebf701c0c3e3f9a1b881916fbdf5b4832d5ae790ebe8
 DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
-DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.zip 525053 BLAKE2B c667a83b0ff18782c883406910620d3eb32b541043520e782953a71c33ebdbdc149612f87df68fb645f72db9c888c1d0ea8165210c35498bb840b9047ff0d1aa SHA512 5e60b4baa404de9210496a710ef1bd73b8795f679c6079719d7ff30c5a545f9ee407108981a3019bba008100f35b722f9eade9e48c09df4b8a245b0dac228ccd
 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.0.zip 19501 BLAKE2B 6c60c3832f5bd1d3c50b058611c9896a3db90dd727401506bdcb656966368cc9af7d8384a714e370dd69714856b63351db4485716dff566c3518434919cc4035 SHA512 02cde99c414bb38d5586ce722128e6c9a940583c9c4a99f1ec30787988235de6a3a1c516c150aa2bc94dab7723a9988c7efa2d8b151d05c9c36c04af6d145168
 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%2Fgolang-lru%2F@v%2Fv0.5.4.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip 20160 BLAKE2B 19b98d09d695d9d1d999e30896d7bc6b5f7266adebcf182ea18cf8bb379ded400d2200e22ec4151831d4e124c4cbfa0c6332678b20311134d5666eae24302f07 SHA512 f18b267cf4ebb61f56c726f2e6b7ebe33bf97d445d44648d41a5ba9734fd7ef7dcb034ef8881f476ff2ce843118703ecaa01f9925c2fec08bc642cdadab742b7
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip 121655 BLAKE2B 071d008723f19fcac3ee740e1b4898414cf09a2813bdb6922705cdcad5913d7fe4682d11219ef10d8bd3921fcf93c7d568daadd33b8e7c307a55eea6ac0d54ca SHA512 19403c36137b6ec9247fab3a9255dc98ad9dc46ba03ad3788e11298f8a310756b24dbfd3a0d9893ad93dc111dd228c421f96daae09e2058438c3c7c58386a71b
 DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod 32 BLAKE2B fc55666bc550b3f1fb19c148ddcee24a0bde3bd4fac2e7e651bdc300d6bdb5ae0ac88c51b19c905520498e1ccd7bf4846bdfa4d2cd6464ef7dd564dad2fc06cb SHA512 b584d1f966117184e44883b0c057f3a51323e9a6f5a4223655ee1c4e7b5928631d3121abce2505e2a58219cf531d75ad63d3e7e05c12982d73095d4cce21736f
 DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip 58035 BLAKE2B 7e29dde7d2d36e3d6854f56b4d253bfcce1dc78845cd60ea52c8d50a3a64d391667de99fd96ae94101650f850b834c72b3509a9f02594fb46c49daea2ec9342a SHA512 4975a066f8b65dda7f51516347889b666aa930d016270100d0ffb9dd46aa7656dabe8a4ff84751d77ee807e9ebc51fdd882bb6e873bf00b1fcfe88289b04aa46
 DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
-DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.zip 9174 BLAKE2B d972fd0c0a8b7135723ae51a6e57ce7b686c7d4b88313c2df73fc537874405595f82f58f5ca51da4036667f6d48f74022225209bcf148228e1d0deb0a6d3d709 SHA512 f2935ed7cc01bfb3aa7ff86dc4172edcf5fe20727c59a43676565d81c878de1dc6a0c49bd51076bf2e078ff71f72ad689802c0286d26e0bad26b2ded74d222d2
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
-DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.zip 14575 BLAKE2B aa85d696951ae3aefd27eb419d146d6475bd8d9039d2385fd44a1ec7d0ebda4d1d82a7cea586a6090d67b0d7f692ea958b62ea1d8d75caba640ddc58469b7996 SHA512 498f6c6cefcfd5558cac0f3485e2a11f4ce9aeb9ccf4d9c460354da5268d17bd5a301ac60cf93d73062a236330d254da8c2ca02fe0a339d25f9a70fe064ac610
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod 328 BLAKE2B 5d3c1f5b839250a69efe71d633601e076be84d2adbf5f69067118851ec76b6044728cfe23644a8fba03502e476bc40ee79ef3e0c3385ab8ee2c3103321753deb SHA512 ed46a1036f3f7a7c2c5d55440ac93f468b5b4282fb5bee31a0c1a746b00426922544acd55ca6ca539d9d6927a23888e81aa360d2140036e84dc895b5a97c9b43
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip 14557 BLAKE2B 7b306a1151cda04a778b2606fbd7e5257a80da359ee6f02374bcf7199f16e3513be56c706d8af2fe2e683c46b80f9680e6831f0e022f3c8dbc5e0c16020d7a72 SHA512 96125081b3fe8233d3c2885c52cbd46c7091f4dbe7ff3e542f934c21c75f498b6bbb89200f9ed27dcc572b16dcb31bd400bb4d74b4e75e171c565ce7c1ecb3cd
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
-DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.zip 103250 BLAKE2B d322a7ccfc3ca434f8f44cc07769e4179197d1d48d85bf7c4e666f9a6c12640dc4196937af09ba7a07c9da1bdbba5749f2c37744ae28b7c526174aa7af072866 SHA512 af29d68cb9eeadc11a5d0e9033ac0c9a9aa9972935b2cc7eb76e951db9b12124f16b0a6ad91a5990b37c08c8b39258f32a9e63afad75e114fc853ec89504db93
-DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.6.mod 930 BLAKE2B 57a45b6fb8d71a650588f54042a48e04085980f044df42be676b6985d12df508b5e82ec4816df18be51b38ff8be4a42432d8ab4f32bc3b54e2420dc6a903a5c3 SHA512 b0d79367b189b5794c6f8aa68adb1695452d259136cef5e5731813b8ca31b014f7c719f881b40d6c2df5ffcde73d44956158a1c847d0296431651228361f5470
-DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.6.zip 108299 BLAKE2B 636c6b766006dae64701678775421e1ae3fce829da1e7b1e8c7c2687098e5b19237be43839de7906ead9fd4d88763654aea4aa013df9808ac1c606bc18d328a2 SHA512 db23ad5568f7c7d142e88a4246509f06e35aba2fffe6a609ea036337a64d72f9398220e4cf63968bd2cf832c9adb0d59cc88f94a2627e60bd1d967df48e673b9
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.0.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.0.zip 112061 BLAKE2B 96727caa4d00da2a8e9faf0ce2586fed181f3d84525ac585f7eab9a6770c90ee77958a0b446d958b6a9a7e86a40785d16da9b96ebed90f5f212c9b4ad532e9a4 SHA512 127c3b69c4375748a0ce4ef094788b17cb27979099160b933a88c87aa08e2b6c52ae0bf5ab68f028eb64e27ad7f25172e85e2efc326c001a5ec180013c75a4f5
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
@@ -311,19 +335,17 @@ DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip 114585 BLAKE2B 846541
 DIST github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod 47 BLAKE2B 67dc6ab625743aeecd408ea7bf04f70243ffb0a997cfc49206db31f0de98b3a30ef06afcc69726d771512585ea9f855bd42306de4a15ae99c07f49138cb79c20 SHA512 d1ab435b05bfa15b854c2ad3ead3678f0671f79fe9ec7d1352122438e62e40fcae32501a0f539f10747cc8762e8d94c0535d176f89c626c650beacb9c4f82f49
 DIST github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip 4515 BLAKE2B ae028eecfc31eea1056857da702cf0f4521a43ae5a1f1e2a267c1aefb9b5e703703d4f13d87928089e67d4721df1bbed2f7247e72db2cf7b24281114e5956327 SHA512 de6607396bc85d72d44c291a4d4eec7c98f0b54c27a92fbe0b89bc8916ca59294c419e4591da7d12ebe0541867bfb9c57f46ca4be19562129646ec2a764c0604
 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
-DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.zip 151101 BLAKE2B 41c638b0934f697256c87b5d034010ee49bf42740a5152005effcba78d29911ee2e981e6e6643df6f804bf38675b2dcb961161f2a8c912d514d007dd349512f4 SHA512 d4aaa571f5f30c87a37f70ce4b190665386e943bf107931cb0650eb54b2480b9acf31e8b83a66b1a8bef11d088a80c522ee70a4b85ee25ab1b28d7cc44d0e131
 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
 DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip 156422 BLAKE2B 18071e2808ed442be205365d206d4f36042953663db3b219b4a54e90e723e42d753d465ba86614732495f0d3d06c6ae577cfc0ae8d0f715ad4a88c8bb340ec73 SHA512 dc554594229ea4caebdc7dfe34ddd5fc054ee59f8717a6afe2d32197ccf9b357a7f66c30d019c6d7b89685869e0e04c0dbcecbdaaf79e47c766c7573dad54d4d
 DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod 40 BLAKE2B 77f35128903a84139dfc23055bf87c4fd8b4843953c764f0ec004a8a2b10599de19bd767a569080422179bd8ad66218d3639025cf1d83eb5cab22599b5da2c3a SHA512 76ce93f04caa8045ed49fccbbbfe76fc278bb7d94c973e408d0695e8c9c5e569b3dc9d4af8722f13c4718753aa72fea76a238dc8243aff34bbfd10d4b684e38a
 DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip 12245 BLAKE2B a83d39eea2c911303550703d23c6c6be3e71c47c008d9bfc947303b5efe87f60983ba00a5fa3d28359959940ccf299a82971cc4cea9ab0bc28e7214db83398df SHA512 6b88063dd61b36a5bce08e49fa630d2a59d9e3617c9f9b5b747993cc66029209597e296dcdb38c126559226139bacb57dacf451bda3e50d6e85c7b4953e4dc80
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
-DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.zip 540021 BLAKE2B edeffa17022930bd4a779b44fdfbfac3b301ffa9853841ad8ec2f047a4276580d385867dabc3f965822d80ce75a777272cba283347db6856215c89ecebc2c176 SHA512 acc3212eb8404e04fd4016dcfbdeaf519e7ff7a0b1c651d3ba9ffb3dac0565f4195ebca66c0d9fe2a6439d8057699a743447fc78ed671dfb971f1e818e6abf3a
-DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.5.mod 693 BLAKE2B b1f4b4893f87a8af176cac7c5f0ae327efba67b52ed075e52e019489e9ccc815eba4df5f60825d28cd2b8097914934109e3b4dd9758d07d2d0ca228768b9f49f SHA512 c2c27911a47cc4c95faad6ea770506670a2c8ebe0ea4a7b24897348da1756d6a28dbd0e518cd8d0eae4de3cdd4425c1c3c3262ff7ea8b9f0d45684e2b47ee5a5
-DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.5.zip 544544 BLAKE2B f39c5cfe3c5853827b276a9d685459384ea7908237d49762b3d55ed279d2fe44b67feff4be685b1c8254125f0e7fc91dac5d336fb3a144dce42656cec33b4763 SHA512 26c8a0cc981bb44e948dbba039aaee8a969d09512f0ec6b8078c0fb7e2229c3d7d60834745bf9c5e1dd5bb175684dc7c8d45b55af4d75d8088a1dc3897fdd67f
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.0.mod 637 BLAKE2B 66ea021f5ca48fabeff8d0fb0049fd5b90c044102bbb492120aa91630dd4fd37f315020ec6cae4559ea4ab45cf826ffd41448e8b21e1eb41ba1c8f145bb2696a SHA512 5afbf9a96e8fc302d4f4ce11482a54f6fe015e94579334d8a8f3e080b7fb84ea25f5a41248991f6f1f02edb23ac737c01c18580ec5b44b74c3c182a54f88f508
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.0.zip 548050 BLAKE2B 3c0d1ac113ab2219fad328e7935ef425bf4d5d824dc3ca530d5b39d55fcbe02bae261be2d100d43a3086129afa9094532c32d426ccb7d4fd3ae3a7667780aed2 SHA512 0dd3888646caabe9e65c4d7b0465fa42b76147405dda435f2bfbf688c2b8cdebf3c6e960108f2d0727a1f333b2fd4aae11d75511c56839757671c8033291cad0
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.2.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.2.zip 549210 BLAKE2B 72ed5b7d30dd04c6fe9bff0811d0cd85790379850fa3b635a9371057097716f1171e70e1a8e1ed54d3e577a28a600de1dc51d263a7534a0b92a8faca97f8700d SHA512 6b4e0ff25e43c00d063c54827b4683732de82cd09366152fa8cfea74cbe874155e8b8323f4878dbd1c5ea208843a24af71bac009362ce23872767208788f17f0
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip 550154 BLAKE2B e085f5b4c23e656f548e9d92cc3ecddb47a2431569240977ff7d7c2786c090115d5e360d478c3faa30b16a31a99f05959777144b9225f32afef69d77d9a9ab57 SHA512 818dfed4d0813bcc28c4b383daf039515593039e9171e1d970809e4fc5688dbf053bdb5b8b068ea9159397e0c240efacf0138d464699451406178569f77b6148
 DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod 577 BLAKE2B 6966cd924bfb433dee02347599c131e85701a7ad37be76369b3a72ba8d6d3927abf1337426eb508a5a27c77f5005240a08ade70e93e546ed752a70fee483a3ef SHA512 78b71a31222bb3bcb5310c929587b13f19343f6aae9284654bdc3ebee9249c9a8440d428af8273acba18ff144265bcb2e8cccbcec6e18b9cbec2fb0f73dd3abf
 DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip 72918 BLAKE2B 13c10ae1ffb312d91cc1a4dbcb072ca3e9ab4cba3758a04c6c4ea0d7b875453819fa8188861bf6f284f57e44a70f8d6c436699289f44a33082ed8088b1323bd3 SHA512 c4d0ef607d0116b64507ebf631d5190bc6cd2c5508ccf060b226ab7c4798a45b595fae0d132968918ccdb644cf05335d7de76c84ac7a188f4b7aafe8068d725d
 DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod 1594 BLAKE2B c6b069c73847f3b115faacacc323ab407df86f81a9056347ebbd15eb12ac642d8e8a7b0410afbd076f18b704c18830144a4bed5a98e6f31d67c14fd1219fa7a0 SHA512 c4a38235e1b91838e6743f4bff89ba737e6427a65e9a2d34c750b63a75ea86b7ce13243b93d13d34f9f384dbf678fbae5c5b5e056eeece9d17511b9e197444e9
@@ -357,20 +379,20 @@ DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip 128914 BLAKE2B 0584ab3dce
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip 131514 BLAKE2B 477f1ba8434036d96652435c432190539006ee38ccf606671cf319e356c6047c3913c6dffad6e4af13e023dbcb6ce93455797e37d3e5b9524b75ddbcbe0e906e SHA512 e64c91926d1e3688151b4f511f506fe4c2acd0a2ab839a43d12c77145e23215e7ce3ea281651f46bb945a07e04a1d2b6bccdfc3d862b3b7cce074e5817ac014e
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip 133805 BLAKE2B e9a015f12e82e7258f4995a093cb3c710c2ada1bcd4d0e5fd70fa00b7917753c41ff23fd4ef5cd30615024791526a053c623c28b4cc3b2d304d17960b35dedeb SHA512 2ed727a07740077cf749c197615814b52511614129d15e4e4f7f04a70fdea7edb8a55522d33a9e7a29595d3c41170f7a912a7acd9fe88c6c8215df721d4d87f5
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
-DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.zip 9872 BLAKE2B 50868f91729f65d64bbe9dca73ffccbcbb31df9bb30c383d104eae3174551ed24b6dd3048b5e1da16b754d618d4ac5d1ac1f455466e7a8a09f77dd7071b16ae1 SHA512 e3b41d60f9467ab7aaa2f2647deb572d95e5e6582dc15fabbf146d3004cc2e19aff6dc862d7cc33f6ab3d64f38d4f9457ad1e55dda3e176d84be1a9001325708
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
 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%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip 18981 BLAKE2B c940bf7f20236ef2b770dc683b5bd5525bc1413c86ae63dd328b2ab1aec7a319d5201733cc832b31185027e27739a6dcd5277d76856f1f95197b3b7797a23bf1 SHA512 9eba5f95e6c5d29b2928708ed91b1cd5a023f0b7053b5529095112a2190d097ba26be7f63b7719f7ee2ed29e698bfe7c4dfa0b33f60b4e475fd1d420453fe7e2
 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.1.zip 3567 BLAKE2B 80b7bf217df9367160180d44c1fab6a9f10154bb9a6455538860158a08c5bf8c794fff973b899b1376e4e65764a9aa0d6b8b162a6d9ebe1adb1368b9a2a42786 SHA512 27910ae03fc9fbf573ac31454635c43bfd771d2a91325eca544f7be0e24b43c2798ed8e74b4c31e8c20c1a9cd266b835017aea3a3e24c2ecb43a14a6143af8e1
 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%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
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.mod 72 BLAKE2B 8dbfabd447cc847f4616b959e52fd3bfeef8dda58f5aacdfd362f28d0b530c8e1651a38ae742c2d9ad8d9b0a055409a1840664b1483df73956a21190395b056b SHA512 b920109a2a1f40e2c7bb4dd93d07138228fac3064b780449a38bf5e6cb0630c6b7bd79eaf18b35e0452846e5059b0e192682b0aa93cc563c6120816106b9f11b
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip 11505 BLAKE2B a0c7e576801c150d9eccd27e0a36304a931f9ed53da6e47f69882cf78cadb4e61096d2c748d1ae5bd5ebad26f5f4c2f37cb0b6e15de0a7b9aefb0aab86ce4134 SHA512 0dd52dadb4327839bd37391c19a9e008b2345f9a61356323ac79fa0abd54e23223d7e5568562f26d937ed05171a3b63fb273510867e612e2eb1cbc44ce0d8928
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
@@ -389,7 +411,6 @@ DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip 333347 BLAKE2B 6aaa8e120b7
 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%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip 10606 BLAKE2B d9aed996970ecc4828716e86ddbc85a7949f60ceacc7326708ce499bfc09250bc8ee336806b229a44064839e7ce34f5cb2a7607da5e82c417a737ea869f97f03 SHA512 dd1763a8d04540b3e579d397fa4888c4bd8c00c3963cfcd1fe42af7c1990ef85f9a2e2fd5c5f2c7d3e6817448df5e2237241ff5a2cda651b061cc8932e0afdca
 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
@@ -399,23 +420,19 @@ DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
 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.3.zip 7014 BLAKE2B 077be89b06969ca8149b1f3838940633896f1da465e21a189809ca1efda41755d33c5f52b3c6dab971726c2d8044b169950198c62f3223cc01ff813f6439bcb4 SHA512 bb4845cfecd934818a6352ee9d9311d795e0c6e7f8af97da4676b9e2085154bd0175599f745e3cc30ddf123cc807ce50ca02d82fdb665b2582edb842c001a8f7
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.3.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
 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%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.zip 205179 BLAKE2B fb8268a263b729fdeebf985c355c67aa1f3d2d9cfa21dc8268852df9788a2b27b06586be0d715e0d65211272b41117810e2441594bb1f74013cfcfd794baed18 SHA512 21644fd845a9e20e7b142e5671cc53cc39a0de3461b8374b6fb1719b44d464014041458e547e1621a765c3156742b0d5f2c6bd168f4ea49e9819af0d9f25ac79
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod 371 BLAKE2B 3ff3ff24a8fa567c715a8698c5a636f3eb2b1bf95263dc71a57d506a8fdf9e25cd741b8d0564ba95c04c696ba536ba44149da16572e13c1b5134c24dd0edddec SHA512 5a25ee9f24cf52fccb76de4ca0d1ee7bf309044e6700d48273bc1ceba948831320a51a7013584f60496df642284a4a282b2ed44e7d6290e96927927a220619d6
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip 214127 BLAKE2B 305af1bdb26a01095cb780a27be74f6a3d53c72b1af1b6388dc284290271c6a2cd39e06b6d8856d81584b35be6c2ff1ee38d79175502a9e2bab782f29cb855ae SHA512 2ac387028c1ffe54d5223a0325e2c36c827ad93e24c628ac353da6b4b97df9ccbb3f8d0440449d3b190f30ffcfd7fb865e3e030b882dcbdea116f20e3184fcf5
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
-DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip 30028 BLAKE2B 2d6bd9a97203fa6b04ff50734a1f7da69641cc4fab3830aef9820c63f680182efebc9802ab33aa471c4701bce8ae571cb1ca13a8f48f820358b921ca19ef98ee SHA512 37d61427d0ff8e8b7f9183046aaaf829e5006abb3b0e3824c0dfab2c96f03dbecbaab9ea983a8835da953ec664cc6074097f13382edd4fb19ee7eeb21cff4668
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod 425 BLAKE2B 8e9c5ee0d4795def5f031ec58ce255227d2d17c80e0ebe028218e3022bb7c5b2cb831981a3247279a5405f36a061e7f0ec717f7d71ae96f33b56d20d0dbea520 SHA512 743b2f950677b8d24423a2491cfd67edcfb45d032e6995a743ebb1f3d6ec6f407f2e4d1d56b2bd14cbe4c519523ee83470f3e594f2da6e0b3fe7c2dfbad9c961
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip 30608 BLAKE2B 68db36e6420be62aa1594d415cc95da064c3f80e220891bc747ab61d1bada168fa8c33875bb8f5a1b3cbfcae6b9f48cc28fd792b884f7378b797f5f7445c268a SHA512 41d05b304a7325dbb01dc2704407f5a7c7f7c1255c58cfde66b1d9668b15e1b5e83b5159b25a6ad7d6fed90e64446b32c1633135a018bbb4357c495e3efc8a83
 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.0.0.zip 4039 BLAKE2B 7ddabda9d19c3468c1568dada882ea500a4bc8927bb780e8d714fccf9c77a4a33bf2d2108d3c7decc9330b6ca4e3fe12ae9e02aa3391b319e88086319893b398 SHA512 0ec6241bd37dff2b6c700be9eba99a39e5d5fd57933678647d56120d450c3619a2f51c9469a6caa4f48118e2d38b4c90091cd120f42d1067f99d649a39cf6cac
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
 DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
@@ -435,6 +452,8 @@ DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f7304
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08441a9bb45da31ac429a372a969a822a0c5de569352bc25403cdc3e8559a7110dd2612cc9b93c91882973aefdc70f8ddadf44c1488eb0c3f5bc62cca2b73 SHA512 43d57d9ca99ee6af49e8a39be4d65799afccc8cb077a8c5b473a9147eba30d4653a8a4cb86abce66d4c8639d1eb0d961c4a50907ce9af2b2864acb615a2ecfc8
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.zip 28419 BLAKE2B 401adf54267565490e3df3de54063893cdc3dec5babdd5ac4410a85ef16a65dbe13168ffe85a78ed9cf13d02cc873fde44fe5927c691b99587a96dd49aa3ce22 SHA512 33509ea85f0e0b364d5844f27ee5616d53b4665b75851a6a860169d5cb08f9c1e531ffa0b7108dfac4098e17b0d641dfe6ff824ae7abd0a9ee4c1ab47848a1ab
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.mod 50 BLAKE2B 59fc5ab80023eb3670c6f77e705dfb39bfbe64511e5222558ac6debc1f3786782e4e75954b89ba17dfc58ce463d8c9ac0807d448a41eb630cf5e0c4f51782df5 SHA512 408cfe4466cf47530cfdf1bb6ff94b5d77b17208a2a9b3d2bfb63b4853a68f46ba707c604bf03e2173f80dfe480bcf4c0be5b3f48872cc865ac0bac3d488f7b0
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.3.3.zip 31024 BLAKE2B 0764e170ebb5ee0b3c4a827b6df9eb62d6804202375a3c37b115879f7c716c026f80aa08118b6bb7ac1a1572070efe8acb235e1ae2e1a4f154a5cff4f4a4bc80 SHA512 e61765ecbb25ee639710d666f5523cbdca9ac5792782926d5ae7e0b13545e0bc5d0aa5d090bfb5e2b6ea218b55fa3fe4ceb8a51e5ac432f7d6e5c9eb86aa043c
 DIST github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.mod 104 BLAKE2B 22fb94f808eec8235c32993a7348c9ccaaaadb1d425ed711b42b30c4f72c214ded4b00f09a0801a07132944675da4b5150c76992b38e3c09c6b33ea9dda995b3 SHA512 bd4fe6712436e85787eea6bcbfa7eb9d4b63e06fa1bcfe357778fdce536d8cd5080b00a41f98f1634b26c1e1e0f2444255fcfab11d0a168678bac405532de5b9
 DIST github.com%2Fmitchellh%2Fpointerstructure%2F@v%2Fv1.0.0.zip 14397 BLAKE2B 9e44364de4d4fc682832d57a60475d3cbc44f1bd64de899dd6857d2bb576d6a64b918cfd6d0bd950f45a30b49715de3d498fc7533279cb0260a4be1abe6d725c SHA512 4482a9382f9a95f747c1f895874bbc317296f0e5c0f34c74f7dad4c6a1cbf70a491d0edb0267523f8bce6e4f519f18f5961ab6206861631575df59f49ac9c701
 DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod 40 BLAKE2B 82487f50b9cfb3e87f2500b992a68361ad1971106763efb2ae4833e3a0505d6131b87aad4f994d203123b8fde60d5799afe67704ae72d36b3b4e85240ace49a6 SHA512 e7ba1cdb05cc6f30a57cdbfd08d55766cdad89875e4db393c304c5004d8907d07952b9b7f542bdec1c8b2f722fbc5d2283a8ff9cae53b6da0f3b075b8d05f60f
@@ -453,7 +472,6 @@ DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mo
 DIST github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod 41 BLAKE2B c0ae8bfbe1cba24ea72ee152799087e23fd36f61e7e75fe4e0f9ec1e45ceea6c29783a8927aa05dc630c5c75c2413aaad96d7592d397ea055794ca6419176b59 SHA512 30746c685ae63769ee178c2edffbe0a7bd8e9c9fe59c1eb7e04c16c00f282ee4d085e853b6aa6751b3ce53b9b8a10f8dfe5f7554c2873731469ea3faa92e9289
 DIST github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip 26003 BLAKE2B 25263739206a1a1bc788c80db6f3e4c98b3d79b09666b7e74e0bfa8d270c25daf37096e715981d76db76c395ddfd7ab39fb523297d41fc3c2241744788ff38fa SHA512 7f7b5e08c4dafb1873cd55f838163afc65d3f945a7607d424595f4e0ed599b05fa2c7e29894c0e6abadd2c1e4c9a5c709e5e2d8206dca27d8c9f9e9ebbd65c16
 DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod 28 BLAKE2B d1f2187d0457fbf3087b388af0e41fa8c7a6c1d54c9f22fb631a144f42adf679bd372b5fc45f8d6f33d7e3cfbd57c1b7da2c4e969ae32185281390db58e9acbd SHA512 41e5c366b775318a4162bea00a6fa4e3d5a23c2ddb5c2707e4a4fb77c42855ce407429a7cf9c8e506bc79493ad5c56423c70dab081187ea6c94fbdaa0d5040d7
-DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip 8493 BLAKE2B 0f00762e52e47e39e2c76907ef393dae846d9a49422e066c82ebba3e769ceab17df6fe1cb473ba490cb3b2c5c5aeb1616cfdb42b617c4685ee2066f7fe9612f8 SHA512 08341ab41505c3a098ec989ff43d8e460ec2b449b9a4cce6cb6240e33f8580f75071c2a7e7c8269f6cfa3fc2a5e33a3315af0fd2ae80bcc0901cc6ae9118804c
 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-20180130162743-b8a9be070da4.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
@@ -462,14 +480,12 @@ DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip 239560 BLAKE2B bbb8130df38c1ed
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.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.1.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
-DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.zip 145979 BLAKE2B 344044eff97c443e90a322dd802afc033f42567db06bebc17abb582110e37ca065766b5bfa4aa3ec1fffd86089fb5ca78db4c7540556c4f50efb7b5081c3f77c SHA512 788e605225f70da535279c14183501b95c86cd92ef77d2f2c0c4dd2f03627f2ff4b9e2fedaa29e6eadd97027ae16edb65bccf866ccb75c6194b853863eefb4b5
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.zip 149648 BLAKE2B 4000934047e824770a1e083a8db85683f5ad7af35983705aa640e3a19290d3d2d902e1ced2515859efa7f6280b353452b29be533bb600420bd50509270cead6f SHA512 764fa02affbcd953435d97804094180ea5eac53d312721dc59d20b87d5e3ffaff4f50908db378e1df6b6d9e03fa4bb59d1fc1ae5d22a5ee69e92116d94137661
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod 37 BLAKE2B ed6f4a483b165555bd8e0483e5ea03f2b46f9aaa60d0c0275877d1ca107561627e1c8b894bbc3d0054f3229e05f828f9aedf9de9ea8c58879dc2cf8543aee8c0 SHA512 73d11fe4f2a7a420d84b2a749f589bb586d9280ec3f4864825d4d2a557aa5f0e1c2a8acc2dc2661cb06425a35d9cd94d06617ca11aa0a92af786dd25f9911466
 DIST github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip 44333 BLAKE2B 0c915c31d64606ea905b35d962953770fc868ed63c1408d7ce61d96165f3995371bd865defbfa120ceeb7cd0a394cf34364727229129b53f44d50a5208b675ef SHA512 915840cde63a7b85eba397ebd26cc4d61b65df9327ff1f190ac68fc1acd2c044e5dd3b5d0630322177df6d62a8120a1ffe8f7c45c7e66036b848e3af432ab95c
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
-DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip 25325 BLAKE2B 5a4a2551f61bf5c4d0da0dc32ebdc22b9c8c8e52bd1f4e74a658c919ce8c685e8aa7d8a8eece85a8b4958a30459c7daf90424b7dc67c3460323c340aa2743e33 SHA512 da2634fbe6ebfafe3e70a9b6bdd1d9cbba051086a27f9b23eb49d04d2148c10b53b53f6b59161655e813bf7451d5663e8bd2a5b64476950435c3211a69e27b41
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip 24373 BLAKE2B 48d3d48ea7431eba6946ec134f22d789b1e71d5ed5d421214f7c8b1803e0c44988375f1464206209a30cd20ab22da83d34ac27a3efeac55869ec24219fd835d0 SHA512 540d0f75e2fc27aeada7b736a896555732d8f4940462003fa574921d4479523ec1d7cf08697dae09a9bc1aba37b06557639ffdd8458c73346a114fa445dcc9e0
 DIST github.com%2Fpatrickmn%2Fgo-cache%2F@v%2Fv2.1.0+incompatible.mod 37 BLAKE2B 0e37253242e439c5d26f3782ec2a3790b799c1014089101fe2a3b6996ce12b001495e11efdc1de203059231cc4d759445a43fc5e9617e56864082337383d0c41 SHA512 5a7842b9804240c1cbf50e2812f26821a0ccd68d5dbffdc3e761e0e60014dda69de842246c45569c7b09c8129bcdbcf9ddbff1071ae14b7be875a9351ed46f0a
@@ -480,7 +496,6 @@ DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip 22487 BLAK
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip 3703141 BLAKE2B 0c8b5a768e298b8bdf314459aeb938a4a05dfa22bdee1b0a2d65e7b02edbf2be6b73ee51a331f4b1d14caef6bd9a001b11a72b85f5de3efcc044501fc2e0d3ce SHA512 b5352137315ec28c2f40f201629a4e60ac26a218a3c75666cf56959cff953fbb6153123413fd1518a1a636d10edac9022ba9f38065274b9f88a89e937283eefd
 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.0.zip 14743 BLAKE2B c0c06d296c0583be2a6eb06359659b50941ea516bc768833bbfe252b73a2d81616dbe2d2db1991bd196b4a615b253c60046bbc6d56ca7268ded5b0ff40a4dc81 SHA512 2975fb8868fddaff560951be41194b82b631138d617705c3f6162acb76ace8697cc8ebc8f610ca1fb1a5167c6b6b0ecc87c150133a757447831463a0da18f392
 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%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
@@ -498,22 +513,32 @@ DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip 193855 BLAKE2B 99
 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.4.0.mod 612 BLAKE2B e77946b5137a632121f113e6d7b390d25891d1fdf214b7c07ee0307aa4e78f5d19e96d1f4bf01aa1d62a2b0918727db1e128fdca6b6f1daeb08632b940a3084e SHA512 46eb82a74b845f5eda8cd01e8ae182e5dec7867306b31a40cb5c6bb9df2045c3259070b57388cc7826f54ee7b9fddaf980436f74ed500ab88748a13f12b30ff8
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.zip 211100 BLAKE2B 82df0588c836241be81b4dac2a5a5fbef1d358c23d9443f9ec516e87cd618a9af9a9c6fbf891f679d4ffac2830e5a0915d397f131db37db9f1327c5f2a3f03a2 SHA512 84caa262ad3014b633f4cbb3deafaa9a2ea486b2d8d4c871994efaea4ebde04a15a025a03e4996863fb294744b38ab647aca90b3d29814dfd52f4d63ac0f709e
 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-20180712105110-5c3871d89910.zip 68325 BLAKE2B 9b783cb98fd4f1ceb158d8a72ffdc7d0c232a8a9740de221b4321b2c7e240d98bb5f2bfca74222c6a7796368d48b1d3e315229a9d2c0436d5590bc200be31817 SHA512 25290d540c185fa2010b06596a70b6d06d4ae14fd92b4e5596b48074e4e5ef5ec6b990c8d0bc39cb44f0c2a83a0a1ac4415f86ea4e3fb69970bb2496f148d0c9
 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-20190129233127-fd36f4220a90.zip 69217 BLAKE2B 738c4f5d28aff0b5e5eaa04f50e9a4e4671bb0a06dafb2174720cc0e6fa79ee87123f55776cdc051124434a3889232d512b32d08b1db1d2cb7f54e251b617e94 SHA512 6cf7daa3b86c574afbf5d91d3d4f372fb31c06ff93d59aa128d8ef025b5c22fcbca5a148b21637ed97127e5e2150305e48c241be1ee4c1b23ae32a09f19ffaa0
+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.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-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.zip 132691 BLAKE2B 9bfe80a4f61a6b7a2e0dbd235e1a05ca032982ef14a9989c415ad143c84c42cdcace926a5683f2273b84c5babe8c0e5b95c680805324217a7afa18b3c82b0bec SHA512 4459c32fb8b90650c6fca37477e2ec49c5e3eb68a8151c88099017fd2c9c13d2a066bef75061a47ed27398e96aa40a6cbe2524146ad1f315d94d7359d0a7ba74
 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.9.1.mod 829 BLAKE2B 14a7c9b3754cce16715135e33ee294058d999f343d74281b9fd111a9c0a5632b90b6594d1ed220165b58614a695b2b2aae27b2ed9aa35ba1acc768ad12e46ea3 SHA512 4cb3dba50a3b47b9db735de9df4bd7b35d02464065919502bb1e17236c2f6b1bf1e74f312a8d0127d2d570344c30d58063d62031d3439f52a6dd8f47b29b9996
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip 161521 BLAKE2B a412eaeb17bb3e932cb53393de6eeab563068918c9ff384ce32d2caf958b3e3e472f554c70b518b472663f42e2060a97062029e55b694a6c93a67af4eec2d626 SHA512 692c2ceadacddee42e9415892d7eaec95cbf5319db3cfd6b5406b39c99df942b4dec7095003ffb8a36a82424b9ebb312f8bf28913ff902320cad2253337e899e
 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-20181204211112-1dc9a6cbc91a.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.zip 103337 BLAKE2B 0bbcc8096a261b4697bf5cb23b3141a885a5d987db3187d776860206ee796c41e78210e5e36942fdee76862033d629f2e2fbe72522a50c846aef973c22ff6d74 SHA512 132a26cbef951377102cff398932b442920500d12e80ad50bbe05ced623d1618e0d56d95ec5fa36354f4295ef9757e4750fe91a25add4f2175d12e6245269425
 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.2.zip 132055 BLAKE2B ed3f24a397ca21aee9972a2fb1bcd12acdcd5b7aa5b21a36cd8e8c1b1e04bf3a1264cd7b21147e1f69e76792fb0d36f4cd44f51178376a9daeb092e69eb8a2f3 SHA512 e3f4d97e22ad8d27a3c8bcdb6516f4e1574348b864deb6f1569f3d94098987f35bc87c7a34f95e84834fcd8c750b3a177f847b586b72b91af0e0f9a735bc3f20
+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%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod 85 BLAKE2B b5702bb668542b4c88cc63201fedb0fa72a00f6134ac660f5fd392e425a61e4b94a1fca8df1917242f2d6b83b8f810b20f3524a870d1ae1d67fc04ba718abd2b SHA512 0649a85ce1922565fdb4f3eea0c095560bbeb655a382ef6603cfc0fbf1ea4053050a17672c30e91e62ae7816cf178fdcb00e7ef395cfdc2245dad5b63f835184
 DIST github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip 6533 BLAKE2B 087713f137203900b2118c96d7cbaa0a0279095d236ef3050cf4accdfbdec03711917e898da4363851b01c7e0b4144f0848cb1fa5599bdd126504f415699b860 SHA512 8e0ea31f6ba2b89da5c78033796d351279bd981437df2ad40d1c426fdedb07b006ed90318a6429030cae2ce0bea4d0cc7228c22887f4d137768527baa7f8598f
@@ -523,7 +548,6 @@ DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.
 DIST github.com%2Frs%2Fzerolog%2F@v%2Fv1.4.0.mod 29 BLAKE2B 2ea3c35fc2c4329d91f1e51488b118dad13de2b395a1485922f1522c0f510773109caa149ce2e1082e117fed475302995623c26bd1a24e700e445a6d71979b26 SHA512 ba2bf79bee3aaf1c22f0f53a12a30b7fd4a8f344f768ff6e4edc84c237ec8fd4aedbd1442f5a9e6d81d2bfafb6366e844067d4862eaadae49331a155bc7dbe13
 DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
 DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
-DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.zip 5643 BLAKE2B c6fff7979b6a647b76551dfb80f7e61f7b86cf2c1e70f58d6be6609af8197119dd562acb78a395d7e62cb22fc2c60c4c69a036da7cc30f6990a01900c71284f6 SHA512 ed6672528754c42370277b8ceb0f1a06e2b36cfed8526d077192d71c9412430f338612671a0a0c807dee15741f83ac6cf1225bb900194758b736466fd95d3cf7
 DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
 DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip 4810 BLAKE2B e42236b0da77d785a299eb5ba0aebe74c6c4211f7a363bf1f654cb37551e1357cbc0798166641bf691f024b3b1b4328491d04db104a7c48fe3bf7e8adae06cd8 SHA512 094dc845fc470cbe5261646fd3a9eb313c5a41d456dd6e0522656d47f41622092e5f86776ac4855c1dd9b6f145178497c31a621dcad51e224d8294e6947449f1
 DIST github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod 35 BLAKE2B 68028ffeebb96ddadff1a781e7f0d7267d9ee0255b2b00958d9e36b6870e27630f7cfb1f6a1c90d81fa6303465d50936c66567c4b562a8b2711d459ee4e093b4 SHA512 1cf1bb0f786ca726b882a958d719c3b762ac146c01b5f57fa246dabd3fc1462b47cb71f7fa0c6b146873113a609b5a94aee724d2d624fec9651947b78d39cf73
@@ -544,9 +568,7 @@ DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a
 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%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
-DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.zip 80812 BLAKE2B 49073e9a5e8a22c2e024dd44efbe4f413615da649bc0569ea39dba815224d80d04443177afcae0f998a234054d5fe38b24ab9349f99ade95c5e3ced0b707ca60 SHA512 e2fb60ac45ebd94068e3520f43980fbcfe0130a7b4732eed85ba0056da15de24e0bc6fd07ed1a644d06545dfb2389c223fd9da4c5abe239d2f546616d9e237c2
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod 41 BLAKE2B aeccb766735cab34f6559537127886e3227273ec40f78cb289b852430e5cb967e2b3b8a798dd20ab0d1c8481c62d25976a76831092bc114cc6c04214ce7ab081 SHA512 8ce1457d8f4e3cd2d997306844a157198039ae5feb9132f22d5768c1de32800469f682d33a8c3c455f7728332136f376858c23bf00da180a53f9d32d4e4ef291
-DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.zip 1526595 BLAKE2B 3742d9543c9149072eabfe65841df7b9f684c9eb57c12036d62eb085811e18bddf17cb22a16986c44bfdf14e0ecc0796d423fb3b753ea1433c93ac0bd7f684b6 SHA512 a8ed78675612f30aca890d42154fd6d6f530a991069dcc048e66244bdb4c4345e31a60c4ecfebcd36b5756df7ad4694222d58397a21d704ed5629deac7d24eae
 DIST github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod 41 BLAKE2B 5d4d27e0f2c2a03d5ea5a22e208ac33d9a4eba122ac4ca95618d2c3681e63540907800a6e6e28bab54c720e88a4454440a23c0911e1c86855f67b67128f5e011 SHA512 a887a2c822f38592ebd66fdcb2c13a3c2f3a7c3de53eba3c0cff66106dd287332c2d0287ffa4c1b386f1fc008047152e79820bd56d64864a7941d10a91bb4019
 DIST github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip 711899 BLAKE2B 59e7ab12479e515512a2d7a9f20cdbe0b490f6bff444d0856d4d3432698762ef0537933461c88de17a3a844702e5b63cbad7493ac9f58af30f968b008b38ed35 SHA512 906a0e32262d50a20ff827163fa91ebad2b4a1af3ae90625532630fe66c6ddfefc6dfefb2a399be3f511db8da305280e65d6d0cc901483ca1448724150d20964
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
@@ -566,20 +588,18 @@ DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd9
 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%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip 34637 BLAKE2B 9e26766ed5717903173455e60ee1b690779e286b6be3cc22f633ccf26592839d149f813a1b92775ab2a447f0c1a20960f956fe5aa4a7c56abc6642b58b7973e3 SHA512 968b76a138261cfee0d1f58ede483741328968e24d073b24affdc7ab9cbf9bb76dd9fa1785423c49471c02ea4804810ebe673bc623c4f72389b2654a64a565e1
 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.1.zip 37190 BLAKE2B 7c8b79cb736f53337fdd2878cd1d745a6da3d803c3d3f6a0ed53a86f1d4789d2c656c6e7a17f90caed496fac91fdc89fa66b1de7b2caf97409114aa59658efa3 SHA512 b2af82dccd20e9539d72c8629f2d4babd573f711a810fa77e629fec897a614776cc4ff857700c0b6eb32370a13d122504c0a4abdd3d9111eb8ac0938a0e7234f
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip 81710 BLAKE2B 245149718759e71d8c882731fb51813924beee131aa16c9d6ea83a72738721011bceee80411d88dedf91653219d3c8ae33f66349e2d373b08931c28aa2e16d8d SHA512 b2cb918d623065d391a318f4f5c532aec12635662d176a441c30cbe3b042b60be848c7eb685679c5258e661f5780ebc3db3f9dbbb8a37e157da214b4f57fde88
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
 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%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod 51 BLAKE2B 08863dd989e6100eeb94aea780331caed21f93fa1ccc6dcb4c77050afe0b8ede362f40e0a8271668e2ca0e328a3594dfb6481640ff3d5f1d1ad3e6b4e7747e11 SHA512 dcbae023694dbb97fa3e1cd6bc20ab7eee364117c45a45912e6d782744a54e0b2292936cce6e807af0dff179a495993e19ff86360b27d3a79c90a1f81b6e22b6
 DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip 1101286 BLAKE2B fedec4637e5f7bdc4edcc0cbbf3aa451125c95f932d81316351554bbce5b45b68ad359936afbc5d46d602e5cab4a7534fc8a80216a713ee8b364e000ceef8d65 SHA512 6d848faf0c554bd0a1818108b58f15dac2ea8378f5dae46bc1943e48319f9dbc87e2ba2efcfbd45b5c74e3f70ee8702c28b521e3fb2442b52c949bbabdf85d84
 DIST github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod 36 BLAKE2B 5eebb18ea03bc58198d1b18c741aef83b26e69166ad294d9fd109990b528bf96e38ac47e03ad7dc2bf74f763ac292bee5745f8e12e087330225363be9c528bfe SHA512 15a75be7ae2d3696bc36a1bc1f4f26628d9b0af57fe5845df5ac329690be5d0f60ee88ddc43cde47bdbec74afe8d0e3b9a6ed531be640ef8bced3b3cea85f4fc
-DIST github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.zip 4676 BLAKE2B 62db12d8619bf2c5509f4fadb7cc01b9d46addb002da723fb0ee6e50886b7713a5de46166dfd0e781eabc9db0db09bfae59b35c73f98261743e47d18359e96bd SHA512 66c654f334e4a83be21f1e90f70c1bad40406db38a63a144a602bae2331ebc5eb7f5249ee9a95da72a0ba9783461f1a185ba9665a5d19c6660e65f1fb6324d6d
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod 32 BLAKE2B c5bd918ed79f8ad33509bee3028b85da9941f721e12735da810f7cf4238ddf83d3c5b7634c01944ebbe9d0c77fea36d5480d945d2dad9d9126cdb5ceb1cc1d11 SHA512 4168487b908d7fbec0813e5ac4d1cc854216d2355fd2843c2856ce81ee7bc399d9fc2b0811b5fbf1f0f1f26e92d327aab3d54b30809ffed621aff37a706e3417
 DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip 3224 BLAKE2B 408f2daf471af61b729a0dc22ae744fc338c93b375bdedcd76dbc0a27d1c01693c414d3e1e968289177fe1e0a0437fd2ede5177e9582bfce726eb7b63d25f9a4 SHA512 73e006b0818fff13479165491eac667deca291b656e4e4d4b834eca553f40844d4b3ddd943848882a1995752344c0be3c41ed8ccea373bb895df8630c1bb99f7
@@ -594,17 +614,17 @@ DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d73941
 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.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+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.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
 DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
 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-20181029021203-45a5f77698d3.zip 1762275 BLAKE2B 5025486c3ccef3c6967216f6ee8dac5416f37ce22c5f8b3236038100766b768278c5beb2f1483d89111f24c81061fd79231bf8b26cb0170bb340eb77f001af6b SHA512 8605ec4abfddbc56652ad2106863f5e316708f5bd055cc28ff557029377b4f9df98215a1fa8c8832b7bc7f959d89d212b663e7f6dec725aa680dc38813f7fe8c
 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-20190611184440-5c40567a22f8.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod 146 BLAKE2B be8899d39fa75a36aa5a09db22d890466433efdd5310fbe61e7672f3c008a9aa34d038f844ca92450e9b8dde8c7d4d3649984f5edcb02abc34c71f46ce584c76 SHA512 173aab1e733ef5c18c3d259720c9fd7e46681d525ec934b4dc29a56beb91a362216768c28b50891b6230be003bb8e38636974e941d4fe6270a016798675fddea
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.zip 1825975 BLAKE2B 8524a8f4a8a97083e7f3e680b5882b417f8f13fe989361e25f785cca9c7e26214f643b47e10f3827eab878c783aa588864ef58972d34db1a8a788726cbb19844 SHA512 cd4dc434a7db8bec5cc82fcfcf19c7d2ef46314cdc38d471069a03e5bf24988f159fa1bd2487b02bc95ee1d5358035f20dc663b7d5ad814e7c9bb468307ff20d
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip 1845086 BLAKE2B 967aa93280eeac0b9ce3e269d135ee547cbcf007d6411e94eb8b7a6b32dbec501fef102f908e977c670e57c60672b0fc91ea16d17d106cc526d91ddf4427897e SHA512 86b0caeffaa24b588f4439370b3b5b2bb087c9a76e409dfdef278d42a2f21d57aa8ee019353b75178f72441339eb796cacaec5706f9bc73e820743137ab531b8
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
@@ -616,15 +636,15 @@ DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAK
 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-20190409202823-959b441ac422.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%2Flint%2F@v%2Fv0.0.0-20190930215403-16217165b5de.zip 45710 BLAKE2B 7349ff19c5695071b04342199b7694af51d7a63b2a9940c72abdc8e2a03da41260da0ae09b039f1cf2c3752c7f2256164a3f0f4ce00410adcd5389cdc07e5cb9 SHA512 00ae7262d6a4f5839915a648e09a51fd939300b9f0404f2c13c062412d059b8278e3c40b2db2a927bffe74a940295834c18b77fb7dc58e88401e0b7606c13aeb
 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-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.zip 1332193 BLAKE2B ea35c1c08cc3ee88c3391a518cb47377b3c78aae434c34c5ca8bd706f760118760009146329daf136ed026ed1c18f5b36def3c97dc25b1fde4fc1941766bc3c8 SHA512 8154db7b3e750eebd3708c05feeff86210ffe96f83044ea161c23eed8a794863579f7bedc70bf4b961ff8db92c17678b5ff47a37e53e1633435d41ba966b9c33
 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-20181201002055-351d144fa1fc.zip 1322810 BLAKE2B 5457e6fe2004a8b694d792518f1f707c69ce44d005d7c2f6623a0fd36eb099a683022677d6042861a891e421a594212c979adddb56bee840bea15cac9c8de5e5 SHA512 2b34a5da99f3d41b13a7a8414d5948aa15b584beb1ff3e650fa99ec53f23b17b914778b0523b19f8e06623d9c8240441334c5e4026435a9201b8bcc9b46e29a4
 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-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -632,10 +652,9 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAK
 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-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.zip 1413845 BLAKE2B 4e290566f02fa53f1eb78cef295a9d53e012fd29b43387366b10b7bc06e35d65c98ffc37bdf7f8b30445a872b1a924b3993069f4c9f43c4027d74a8b26fb316c SHA512 2723a1c2fba3427eb42957bd57c62c3bde7cb3a08db4f075816e5c72ecf237bcfcfe91dd5f75aa985a61a24017689a8b7672da00d741e9eef164184623b87ee1
 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-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip 1421786 BLAKE2B 15782d84b4fd3576df5ae0c6540880b3a87f5ed47d66527ad88bbdd5e96cd1b0fb321b896b686de67d4518d3c6eecd008f1e49f48fa29df962a4d01f6e08653f SHA512 e79353b8f6b6866a14236eed278aae32ccb02eed040a557dda219cd96eecdc0174a8ac29a5509a33f6f0f9e5aa16f7d1c6861167d9798a5cb1eb01aabcee56f2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip 1423356 BLAKE2B 412d4c362e9d11899790082861e26002ed0fe500b4d5d0b9caa1a00ee9363337d1e47cdc6a232d858d00ff10da2b581c000d20208539098a8fe1f83d012fb00e SHA512 dbd74ce99432faf080dc0980624adfea31cd74d53949a4b747e14d6464632c48e78c40a1b862305bb5650cfb1b202f2c024f44f9ffdcc104555e9f42b4eae30f
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
@@ -652,13 +671,14 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAK
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 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-20181026203630-95b1ffbd15a5.zip 1435633 BLAKE2B d1eac5dcb4b5717d6b87984e51d9a11c9fe763b0af44b75ce706f5ae7bb9f733266768a51e874ee5f52c151f126f2c16e1c14fb2e3f7fd859a263d85b6b8acfe SHA512 ffaa302839b9a3e09f1711a5988d06f04d609b8f106c0ae13a301b4b5a26fc19cba9eac170b8df0bba3e2ec9733acff4761cc2a050238ac0138ab3ec6ff31769
 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-20181205085412-a5c9d58dba9a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -672,30 +692,26 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190508220229-2d0786266e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190508220229-2d0786266e9c.zip 1774647 BLAKE2B e38b255b8dd6781e119b13e0dac4a05c8a6a85433b1eace5185e86f8b51514db6ad0512f452a772edf2991592288d7f971faab7173a12da1c9c4f9ac27d13977 SHA512 acfaa929567511eacb7f0111edfac5c9e5ffaef3274cba7268ef325d355b0e2a68d31e20378a02ac1710676a9621495fca406be2cbdd39f0c40bbea906d5f412
 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-20190523142557-0e01d883c5c5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.zip 1778829 BLAKE2B 75462ad792956b08df688432b8f3ddbd8e33cf585eb806513ddd45a25ab4fd86b232f2bc5438ceedccc5212a19f91d0d8640532d2b7607da6deb83b10322e48b SHA512 28d0af738f9e071f8bbb58c6fcc685888a608e2597cf0fc61e847e9fff82c009dea33ae9cb672ab7a0dc346f5ab3a09ff79afef454c3cfb057e45fc7579ca17a
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.zip 1846026 BLAKE2B 4e3ef68bf7e75a37f819024dba92027ac85109b3087282bd03db1c0a234d4ada2f9aa8f02d611fe96b015bf2fd7cb7ed9d8354a0abeddcf89c0905ed20d6bebf SHA512 558185afea455dd7e96423174af16a6df90b528189065d2ea9929cb20fc9268324c4eb347b23b97dbb48c6ae72c4cdba88327bcf7a96a838815a5b945467c762
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.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-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.zip 1914030 BLAKE2B 7c223aa748649c75cfd8e921bcb10cdae7b52fd8d9096c7a5a0b0a167a307a4813e7b0976647e2d70c658f1a75e9821f78f0969c9ef73da3d498d6755d504f2f SHA512 43ed7210474ffec7b4f9a0dc29e9f4ae5f2ab6ecc5b9f02ed28d9751d8f11e3cc27700e5b0838a76f450d9bfe074d56176d5140daa3f3d40b287695ebd3dec18
 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-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
 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.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 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%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
-DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.zip 12802 BLAKE2B bd71752bbf787376638a3eb8369fb3f3ac4efdc057cf3ecc9f02318186011af009c17c0a7a3b9183b1bb6a88aad15128dc64835821c90d9bc2adabf6cb6ddde6 SHA512 2e23c18588f6f5cb58a6edc02b23ba1abfef92ec0d46c272b3f542354f8ffba45b14c3a328372dc46bd8118a255d3f3d9aed303a8a91ababd6ed296cba2aadc6
 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
@@ -710,21 +726,23 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLA
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
 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-20190907020128-2ca718005c18.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191108193012-7d206e10da11.zip 2908944 BLAKE2B ed5521ac56f8fb0bdd6404dcbdf90bb0281367b3afe1075784e09681a9a2e24bfdca192b77ac0870f50df900b3fb3e3116cce6ad109f75f4fe0286c820c46cf3 SHA512 8cb13d39ad71c10de694ae288d5c2374426e8b674d6968b02da1fec13d2c7637bc105d2ab509acdd856c747ab8c804fb5fd2a1ccdbc73def16dfc568ef1732e5
 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-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-20180829000535-087779f1d2c9.mod 29 BLAKE2B 411ad882e1d61d9e7a02f83256abf55c6a9557a980b89d7fd1a8981cd44f81182c17659e2fec1f4a587163a16556076418f166e90118a04041a8c488f9bb69dd SHA512 f2367919f017863362525d492f3c7f9e36aa311a55f96533ad6a2db1dcbdc9628f516ca435a43cd63a09c677c3528c2fe386907fda1da7dcb69ac2f6c95bfdc1
 DIST google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip 10163656 BLAKE2B 5bc64691f0fea7b5457b2f1e27257fc52e6393169e3965beb422e15ab293d50bc1d49ff40a8552249182f00af6cc91851729e388ca30d1ac1367cbbd64874ab7 SHA512 3b6c2b3e08efdaba51ec595726141a0dffc3a07df10930aab028cd16055b71a3a89dbd070c55e09d87c32eb46b0b4e405c560571f514e1bb743d116164b2a546
 DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
 DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
 DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.zip 12958909 BLAKE2B 9ffceb4fe3e735aac577decb8f9db46c431c76a121c9ff946d19ad36081c67119c3f35e7c0825b761f206edd906eb95cd33f83ac3af24aa1c08e46d58b276b87 SHA512 00e929de2fc5da89f64d434ac2a4ca0252f7ef24926dc0c8c43bdbc84348522801b98346739b387c0b17c88bdb822875301b32a5007b8ecd54a443e0c4ec3057
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
-DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip 391093 BLAKE2B 7e103e9c4be5d953371d0ea553272b8edd9fb180a32708f44b5f97b232498686ab311980d3a01bca53773d8c312307197819223c748adb5b027eeefe60b60efd SHA512 0c4f225732f14c6d205a572b8e289aefa480286a0fe5fa2c6e75e4aaf7443f42fb21866b11e227619cde683c0ca7835adef792178724b25ba9ab035efbe1bb67
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip 408151 BLAKE2B 9f815084675da034d639cf3e8648ee5dd2d1282d2bb6937ffc91956b5cfa46809499441a39636e4f0565c4307854977201ecc8cfaf38b46557c3e715cef0722e SHA512 1eeb760cf1057c306f2301ef4c7065cdd6dc18cdeefefd3a1cc8cc22efa312ee5ba7da6b79a4e7666bc09429d1ca73d7bc1db574f9cd33d271a72700a070a219
 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.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
 DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.0.zip 417366 BLAKE2B 71895742e5a6ad69c7b0db979f725e0171b6df432633912dfda6f367510b0b4d5a2b41d94c7a8eecdbb4de90d2e92818d7f6dc1ba99e41ba54184d39134513b9 SHA512 263419180987380202def791006a59739446ed956bef6314ea378cb6da54079967ddcecf031080295e66755b7312f76795b0f74b876e4928700b877fe1e1e9de
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.zip 2541816 BLAKE2B d23e165336ee73dcb15c5a5d9632a4594b8853421601d497c29a8c16a69c558b6e7fb8a478e15e9808b9bb9f138501a8d82f6f6329e486a24481e337f883fc14 SHA512 eda9b82bbe85d100e1ff545b838fae621b68848c9293e0d3caa8bd2a183bcfb5dce072a1ac721468cffc264e5f9dc38797e4d98c23f85f905ee95b3587c6d867
 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-20190404172233-64821d5d2107.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip 6533885 BLAKE2B 194748b0fc9279db95843c40fb88495765086b0aa42472c3952ca9b58e1c5ec1b90654e63ecd308a474d8afb846c9fc233a7f298b7c53efc5e48453409878e80 SHA512 676aa55eade0c609837f446ca93b9b823cb0943ccfff344808f7a2b2e4a0d7c8d34674d7b218d6a5fde6d98be5d8ca4a3f6e4476c69c2e9df3a22c8c662a1414
@@ -733,22 +751,23 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.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-20190530194941-fb225487d101.zip 5368804 BLAKE2B e90b748f207fbfe06043e6fd048295453416c364f6b1de925ccc06652738f050c64e357a0fc25374ddf21151cdc43430200f71c5228dc9fd35f5e63df62366a2 SHA512 f1b58eaa7b6ffe7a4c9fff15546b4409b5b66649078a8f64e659b37c5088f09bcd2c2c4315fce80876be4a5c069261478214cae28e0afa803f8afbf745e4d321
+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%2Fv1.14.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.zip 856324 BLAKE2B 5c563f29ab050b21a5a388b94f8b567311e2ac8b2fa6dc5ba227d5348a622369d6f95ba91856a9c82c91e1d41835e33db241408ed98a85cc9b2aef5e141a7d37 SHA512 d133c16fa7fe72d1b349fddd2c7562ca5c5fb77d8b28795305690e7b9668c98a50306808bd73e9d4f7511009634128155bfdc0bf8db7efd05929e61a5b784d18
 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.0.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.0.zip 1053293 BLAKE2B e4e5c8bae0f39f767f6540659b58a82def27b93eb1bcc9eddd77e9a009af2a40b412e38200633410860ef5e6d02e9f180be190ca0f7d2d44fb687a8027babfe1 SHA512 aa3b29dcb253ff9b89819d888b176378cf62a386e99800395a5ca54b03d152ffb3e591f78954bf241037c6a55497317d089c50c971a342d4c821e93495b9ac50
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.zip 1000340 BLAKE2B dfc5083cf762cd6df1ab2d43d6d45225db97754ec1c165970563052be25e3655c365dc5011aa7d7b0b2b72700aa1759361155f2dcd34bd1941357fa5ac6cba49 SHA512 a13a30ca3ced87795e4e31dd43eea70f6ff42bad5795464170377a1a0e9fcd9029f5d2ffbae18dff2360f6f290bb6ea320b075626ca13a50899365f3d38dc3eb
 DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351a233f5e8236743a91df1f630355380a4ae8df10c32abc03470955eac6c15c95655caec990eb17ef2661985570e49293cb146517828090d95635 SHA512 8482c3135335a3a69611529f0d50bd19257b0fe8a8de2d4f2d6441ccde5f1e7a57d487cedc375575c5fe16094e5fc1c7f7f1a6bf04acc8a9d4f92701db279002
 DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip 8866 BLAKE2B 279099b17d2f9a46f3b5e2db1e9855fb352eb840cad4c70e67b4612a6305a83d7926ed28396f0e84e27b56778b15f262ec497a835f7e2327ec82d1ec9388c69d SHA512 1649454679bdb5427e34f9ed83952cc509369ca04ee3776beff20096589bbe4d24bd6f6121c816ad4b9563da6fb0c0e4ddc873196160b42da6c07a204b21d43c
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
 DIST gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod 28 BLAKE2B 0fbbe5d1e239fce8fc245a0a54a09a57ba1a669a6ed93aabefe8fd333549b3309ad9e6eb15cff2f0a853d3830e6b5cd60961835b14e2dd13aad5812cca6ee04c SHA512 00151108bdaa29a2097ab78c99c93bf0ec27af203696a11bc7ba55e36d7115ad13279110c245bd3a2cc84b63bb2a8840964e3b2e1334a0d085ac1e8ec5239bad
-DIST gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.zip 29965 BLAKE2B 43a72ac189d5bb6a581938910c317ec96c39c3c32695d844c1a9cd83243a567505d388f045e6c514d077e27857a6e206d628851454eef97ec14b52ccfc2a5da3 SHA512 4624295283c43a64b2413e25c3ca5a91c798d2b2cd7e60313b92c58d048404b12052dca119f6906e1fa0419bafd2e02c160b486856e2e88f75bfb2d08fd662f3
 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%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
 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-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
@@ -768,9 +787,9 @@ DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
 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.1.zip 77767 BLAKE2B d77644df22edfcda7d99d4a4a23a1fd1154fa21489dc36b9a8f9ffc45e341d8d793faae76d4d3d32290766c7b13cea30d17efaa7e8e74786ead90b0605f70967 SHA512 bc935858e1d5c341c7d53c41bdf6f856976a469c8f54f017e41e8be742064ce9980cc6881353e022f854d6e19096a37f5ff62bf7b01019b0425a0c03dc6fe14a
 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.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 honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
@@ -802,8 +821,11 @@ DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip 94436 BLAKE2B
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
-EBUILD consul-1.7.2.ebuild 27458 BLAKE2B 0ddfe1a5852dfb12f2df681710ce92d01da09a73642aea64a07e31d27999a85328642dace5ab0182adc87bff2805e019df16c3ec272244fe87bcdf204e4dd40e SHA512 053d5aa676091c3cc32231af848b71faaf8a853fc77b6e487fa58f05dd9907acea4dbb9d1953a9363400b86043b8a40c8cdc9c3ff48c8e6eab85bd581cf4f504
-EBUILD consul-1.7.3.ebuild 25709 BLAKE2B ae78263543992fc46a37c9815df49daea9ab67ad7f6bd016ec7cb6b88ec54738514ac06f51e16b95524b68c4517ace27caff27e45afa938eb7a1f73d868a042e SHA512 425341d37096709ab5a6f06e136442828a366f31533fc067115692a815bf9204de15963481e83a0f8cfb1e0d3f47b7e5bddbc9c512c2ee315f6303f910cf9335
 EBUILD consul-1.7.4.ebuild 25708 BLAKE2B eb083e6c49e6c4d062bb15a475dc88fdbeaafd394d396d17c245bd14eeaa62c31dcd598b9baf7e2508dd78e0c1f0ba8b05415509b38caedb9e3ca759ed74822a SHA512 7791c5ec933ab4cae9f108c04506d0e57a0abffa4b3a0956cbf4cabef13af69decf000ae1ff2e273585b80ceb61849bb4ef8c31fa8c4dd35b0423fb794f87937
+EBUILD consul-1.7.6.ebuild 29316 BLAKE2B 603871fec0629e42226b1bd6668bb51fb5a368fe5ce340ac6631c34c4f5da0d5d2bdc639bf5bbe8d7acec8ee97e48f23f3b5d66678629ec10595c7b4812ea6d9 SHA512 a34e6c1db4c1377fcc2dd4928c9539c57fcbc3ecc956a03355b366782663a215344c30d1da47eb8b1e383f03c5163fb00a738c9f1d74a3d92b2ac01aee7e7816
+EBUILD consul-1.7.7.ebuild 29316 BLAKE2B 401e2ec84a03556864bd3d30524df4aa3140695e8eea0295907d52b2a7f495f402fde0330c04ac49f4ce683078d43a3d3d2229d2fbf244462da351fb40351892 SHA512 4f1d667ef96b590b78074d33aed04a918bf5eda2fd608dc0aca845261247d3b64a8cb5c756660d9397283b4a6d146d1c2d886be2a21cd2984fa54b2518d6a563
 EBUILD consul-1.8.0.ebuild 36543 BLAKE2B 334022150f621a6c27db79789164c8b618a9cc0f0863357c8b37ff5cb9e242b4c0e146cb56255476dde9e607067d97b6b89f9682466a154f2f5d28747d9e01b4 SHA512 470377dc362892d28e412efb6ee7caedb15f02096a668b395550bae90909ea18763157979ec0ac9f637188bdf67a0ecde006561aeb1b250e52bb1b79a4601be5
+EBUILD consul-1.8.1.ebuild 38943 BLAKE2B 5942f501455a6ae5560049a8db5f59641d3d713026b209fd2b0f54ca03eabea94b15e1eb6c91628105b5a18bc5a1cc49bbed42905a750329ee434be9243d8040 SHA512 d33bf362152b7882c8f3e3a96b366aac394440c62d89e78a8daa1b19ee3c275e84d5b692af53c0f515a034501c66168769c5e1a8fb6ed57b30a0ca75455575dc
+EBUILD consul-1.8.2.ebuild 38943 BLAKE2B e6cafee946b167e013f1024aaf17fd8571868d932efbbd6b2c54f2209063620c68d7d686a69112f7317cdf58b1634635967f2e1fbe8b0eb475f68e6233a2145a SHA512 e2bbe9c9ec68a4c9c87557cc7fa13a7b87d5c9879133effbd48408c71302d69beab59a7dd308c88cca89871569f47c7b62b21276f808925e941a4cf5460c8842
+EBUILD consul-1.8.3.ebuild 38943 BLAKE2B 148de37f39b0214b9e0604a15ff0fc14f612409ed2924743d4e091336c2807d216f6229f7beec88b1893a5af5a9fd28e650726b7c9b12d7badf8172ebe199b43 SHA512 c062dfbf9fa8eca1b4508794aed52054980c339c41a19b2b5a5e963e6d64eea1d4e8a00992cdf33e8f7db0d94116f625ee4e55d9c38fd7c4a67a3d0878678a80
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.7.3.ebuild b/app-admin/consul/consul-1.7.6.ebuild
index 5ba5232b6488..547fac7e158c 100644
--- a/app-admin/consul/consul-1.7.3.ebuild
+++ b/app-admin/consul/consul-1.7.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit go-module systemd
-GIT_COMMIT=8b4a3d952
+GIT_COMMIT=819b21dbb
 
 DESCRIPTION="A tool for service discovery, monitoring and configuration"
 HOMEPAGE="https://www.consul.io"
@@ -22,6 +22,8 @@ EGO_SUM=(
 	"github.com/BurntSushi/toml v0.3.1/go.mod"
 	"github.com/DataDog/datadog-go v2.2.0+incompatible"
 	"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+	"github.com/DataDog/datadog-go v3.2.0+incompatible"
+	"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
 	"github.com/Microsoft/go-winio v0.4.3"
 	"github.com/Microsoft/go-winio v0.4.3/go.mod"
 	"github.com/NYTimes/gziphandler v1.0.1"
@@ -30,12 +32,18 @@ EGO_SUM=(
 	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
 	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
 	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/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/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
 	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/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-metrics v0.0.0-20190430140413-ec5e00d3c878"
 	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+	"github.com/armon/go-metrics v0.3.3"
+	"github.com/armon/go-metrics v0.3.3/go.mod"
 	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310"
 	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
 	"github.com/armon/go-radix v1.0.0"
@@ -44,15 +52,24 @@ EGO_SUM=(
 	"github.com/aws/aws-sdk-go v1.25.41/go.mod"
 	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
 	"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/bgentry/speakeasy v0.1.0"
 	"github.com/bgentry/speakeasy v0.1.0/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"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
 	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
 	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
 	"github.com/circonus-labs/circonusllhist v0.1.3"
 	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
 	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
+	"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
 	"github.com/coredns/coredns v1.1.2"
 	"github.com/coredns/coredns v1.1.2/go.mod"
 	"github.com/davecgh/go-spew v1.1.0/go.mod"
@@ -74,10 +91,11 @@ EGO_SUM=(
 	"github.com/docker/go-connections v0.3.0/go.mod"
 	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
 	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.8.0"
-	"github.com/envoyproxy/go-control-plane v0.8.0/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.0.14"
-	"github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.5"
+	"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
 	"github.com/fatih/color v1.7.0"
 	"github.com/fatih/color v1.7.0/go.mod"
 	"github.com/fatih/color v1.9.0"
@@ -88,15 +106,18 @@ EGO_SUM=(
 	"github.com/ghodss/yaml v1.0.0"
 	"github.com/ghodss/yaml v1.0.0/go.mod"
 	"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/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-ldap/ldap v3.0.2+incompatible"
 	"github.com/go-ldap/ldap v3.0.2+incompatible/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-ole/go-ole v1.2.1"
 	"github.com/go-ole/go-ole v1.2.1/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
 	"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
 	"github.com/go-test/deep v1.0.2"
 	"github.com/go-test/deep v1.0.2/go.mod"
-	"github.com/gogo/googleapis v1.1.0"
-	"github.com/gogo/googleapis v1.1.0/go.mod"
 	"github.com/gogo/protobuf v1.1.1"
 	"github.com/gogo/protobuf v1.1.1/go.mod"
 	"github.com/gogo/protobuf v1.2.1"
@@ -109,16 +130,23 @@ EGO_SUM=(
 	"github.com/golang/protobuf v1.2.0/go.mod"
 	"github.com/golang/protobuf v1.3.1"
 	"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.1"
 	"github.com/golang/snappy v0.0.1/go.mod"
 	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c"
 	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
 	"github.com/google/go-cmp v0.2.0"
 	"github.com/google/go-cmp v0.2.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-querystring v0.0.0-20170111101155-53e6ce116135"
 	"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
 	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf"
 	"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/googleapis/gnostic v0.2.0"
 	"github.com/googleapis/gnostic v0.2.0/go.mod"
 	"github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca"
@@ -150,6 +178,8 @@ EGO_SUM=(
 	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
 	"github.com/hashicorp/go-immutable-radix v1.1.0"
 	"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.2.0"
+	"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
 	"github.com/hashicorp/go-memdb v1.0.3"
 	"github.com/hashicorp/go-memdb v1.0.3/go.mod"
 	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
@@ -182,6 +212,8 @@ EGO_SUM=(
 	"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/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
 	"github.com/hashicorp/hcl v1.0.0"
 	"github.com/hashicorp/hcl v1.0.0/go.mod"
 	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
@@ -190,7 +222,6 @@ EGO_SUM=(
 	"github.com/hashicorp/mdns v1.0.0/go.mod"
 	"github.com/hashicorp/mdns v1.0.1"
 	"github.com/hashicorp/mdns v1.0.1/go.mod"
-	"github.com/hashicorp/memberlist v0.1.3/go.mod"
 	"github.com/hashicorp/memberlist v0.2.2"
 	"github.com/hashicorp/memberlist v0.2.2/go.mod"
 	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
@@ -200,9 +231,8 @@ EGO_SUM=(
 	"github.com/hashicorp/raft v1.1.2/go.mod"
 	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
 	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
-	"github.com/hashicorp/serf v0.8.2/go.mod"
-	"github.com/hashicorp/serf v0.9.2"
-	"github.com/hashicorp/serf v0.9.2/go.mod"
+	"github.com/hashicorp/serf v0.9.3"
+	"github.com/hashicorp/serf v0.9.3/go.mod"
 	"github.com/hashicorp/vault/api v1.0.4"
 	"github.com/hashicorp/vault/api v1.0.4/go.mod"
 	"github.com/hashicorp/vault/sdk v0.1.13"
@@ -216,7 +246,6 @@ EGO_SUM=(
 	"github.com/hpcloud/tail v1.0.0/go.mod"
 	"github.com/imdario/mergo v0.3.6"
 	"github.com/imdario/mergo v0.3.6/go.mod"
-	"github.com/istio/gogo-genproto v0.0.0-20190124151557-6d926a6e6feb/go.mod"
 	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
 	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
 	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
@@ -225,9 +254,16 @@ EGO_SUM=(
 	"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
 	"github.com/json-iterator/go v1.1.5"
 	"github.com/json-iterator/go v1.1.5/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.9"
+	"github.com/json-iterator/go v1.1.9/go.mod"
 	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
 	"github.com/kisielk/errcheck v1.1.0/go.mod"
 	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"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/go.mod"
 	"github.com/kr/pretty v0.2.0"
 	"github.com/kr/pretty v0.2.0/go.mod"
@@ -272,10 +308,8 @@ EGO_SUM=(
 	"github.com/mitchellh/go-testing-interface v1.0.3"
 	"github.com/mitchellh/go-testing-interface v1.0.3/go.mod"
 	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-	"github.com/mitchellh/gox v0.4.0/go.mod"
 	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
 	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/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/mapstructure v1.2.3"
@@ -283,18 +317,19 @@ EGO_SUM=(
 	"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-20180701023420-4b7aa43c6742/go.mod"
 	"github.com/modern-go/reflect2 v1.0.1"
 	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
 	"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
 	"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
 	"github.com/oklog/run v1.0.0/go.mod"
 	"github.com/onsi/ginkgo v1.6.0"
 	"github.com/onsi/ginkgo v1.6.0/go.mod"
 	"github.com/onsi/gomega v1.4.1/go.mod"
-	"github.com/onsi/gomega v1.4.2"
-	"github.com/onsi/gomega v1.4.2/go.mod"
 	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
 	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
 	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
@@ -312,14 +347,30 @@ EGO_SUM=(
 	"github.com/posener/complete v1.1.1/go.mod"
 	"github.com/posener/complete v1.2.3"
 	"github.com/posener/complete v1.2.3/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
 	"github.com/prometheus/client_golang v0.9.2"
 	"github.com/prometheus/client_golang v0.9.2/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.4.0"
+	"github.com/prometheus/client_golang v1.4.0/go.mod"
 	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910"
 	"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/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
 	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275"
 	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.9.1"
+	"github.com/prometheus/common v0.9.1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
 	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a"
 	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.8"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
 	"github.com/rboyer/safeio v0.2.1"
 	"github.com/rboyer/safeio v0.2.1/go.mod"
 	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
@@ -337,6 +388,9 @@ EGO_SUM=(
 	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
 	"github.com/sirupsen/logrus v1.0.6"
 	"github.com/sirupsen/logrus v1.0.6/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/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-20180820201707-7c9eb446e3cf/go.mod"
 	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
 	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
@@ -358,6 +412,7 @@ EGO_SUM=(
 	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
 	"github.com/vmware/govmomi v0.18.0"
 	"github.com/vmware/govmomi v0.18.0/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-20190308221718-c2843e01d9a2/go.mod"
 	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
@@ -369,14 +424,14 @@ EGO_SUM=(
 	"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-20180906233101-161cd47e91fd/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-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-20190503192946-f4e77d36d62c/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-20190923162816-aa69164e4478"
 	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
@@ -389,22 +444,26 @@ EGO_SUM=(
 	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
 	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/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-20180905080454-ebe1bf3edb33/go.mod"
 	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
 	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/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-20190403152447-81d4e9dc473e/go.mod"
 	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190508220229-2d0786266e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
 	"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
 	"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
 	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
 	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/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-20200122134326-e047566fdf82/go.mod"
 	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
 	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
 	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
@@ -423,6 +482,8 @@ EGO_SUM=(
 	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
 	"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
 	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
 	"google.golang.org/api v0.0.0-20180829000535-087779f1d2c9"
 	"google.golang.org/api v0.0.0-20180829000535-087779f1d2c9/go.mod"
 	"google.golang.org/appengine v1.1.0/go.mod"
@@ -431,14 +492,18 @@ EGO_SUM=(
 	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
 	"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107"
 	"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/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.14.0/go.mod"
 	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.19.1/go.mod"
 	"google.golang.org/grpc v1.22.0/go.mod"
 	"google.golang.org/grpc v1.23.0"
 	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1"
+	"google.golang.org/grpc v1.25.1/go.mod"
 	"gopkg.in/airbrake/gobrake.v2 v2.0.9"
 	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
 	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
 	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
 	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
@@ -457,6 +522,8 @@ EGO_SUM=(
 	"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.5/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"
diff --git a/app-admin/consul/consul-1.7.2.ebuild b/app-admin/consul/consul-1.7.7.ebuild
index 52f7b83a48ed..8fa970e6543a 100644
--- a/app-admin/consul/consul-1.7.2.ebuild
+++ b/app-admin/consul/consul-1.7.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit go-module systemd
-GIT_COMMIT=9ea1a204d
+GIT_COMMIT=fdba2d0f7
 
 DESCRIPTION="A tool for service discovery, monitoring and configuration"
 HOMEPAGE="https://www.consul.io"
@@ -22,6 +22,8 @@ EGO_SUM=(
 	"github.com/BurntSushi/toml v0.3.1/go.mod"
 	"github.com/DataDog/datadog-go v2.2.0+incompatible"
 	"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+	"github.com/DataDog/datadog-go v3.2.0+incompatible"
+	"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
 	"github.com/Microsoft/go-winio v0.4.3"
 	"github.com/Microsoft/go-winio v0.4.3/go.mod"
 	"github.com/NYTimes/gziphandler v1.0.1"
@@ -30,6 +32,10 @@ EGO_SUM=(
 	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
 	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
 	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/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/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
 	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
 	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
@@ -37,6 +43,8 @@ EGO_SUM=(
 	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
 	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
 	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310"
+	"github.com/armon/go-metrics v0.3.4"
+	"github.com/armon/go-metrics v0.3.4/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"
@@ -44,15 +52,24 @@ EGO_SUM=(
 	"github.com/aws/aws-sdk-go v1.25.41/go.mod"
 	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
 	"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/bgentry/speakeasy v0.1.0"
 	"github.com/bgentry/speakeasy v0.1.0/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"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash/v2 v2.1.1"
+	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
 	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
 	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
 	"github.com/circonus-labs/circonusllhist v0.1.3"
 	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
 	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
+	"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
 	"github.com/coredns/coredns v1.1.2"
 	"github.com/coredns/coredns v1.1.2/go.mod"
 	"github.com/davecgh/go-spew v1.1.0/go.mod"
@@ -74,10 +91,11 @@ EGO_SUM=(
 	"github.com/docker/go-connections v0.3.0/go.mod"
 	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
 	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.8.0"
-	"github.com/envoyproxy/go-control-plane v0.8.0/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.0.14"
-	"github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.5"
+	"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
 	"github.com/fatih/color v1.7.0"
 	"github.com/fatih/color v1.7.0/go.mod"
 	"github.com/fatih/color v1.9.0"
@@ -88,15 +106,18 @@ EGO_SUM=(
 	"github.com/ghodss/yaml v1.0.0"
 	"github.com/ghodss/yaml v1.0.0/go.mod"
 	"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/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-ldap/ldap v3.0.2+incompatible"
 	"github.com/go-ldap/ldap v3.0.2+incompatible/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-ole/go-ole v1.2.1"
 	"github.com/go-ole/go-ole v1.2.1/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
 	"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
 	"github.com/go-test/deep v1.0.2"
 	"github.com/go-test/deep v1.0.2/go.mod"
-	"github.com/gogo/googleapis v1.1.0"
-	"github.com/gogo/googleapis v1.1.0/go.mod"
 	"github.com/gogo/protobuf v1.1.1"
 	"github.com/gogo/protobuf v1.1.1/go.mod"
 	"github.com/gogo/protobuf v1.2.1"
@@ -109,16 +130,23 @@ EGO_SUM=(
 	"github.com/golang/protobuf v1.2.0/go.mod"
 	"github.com/golang/protobuf v1.3.1"
 	"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.1"
 	"github.com/golang/snappy v0.0.1/go.mod"
 	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c"
 	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
 	"github.com/google/go-cmp v0.2.0"
 	"github.com/google/go-cmp v0.2.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-querystring v0.0.0-20170111101155-53e6ce116135"
 	"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
 	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf"
 	"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/googleapis/gnostic v0.2.0"
 	"github.com/googleapis/gnostic v0.2.0/go.mod"
 	"github.com/gophercloud/gophercloud v0.0.0-20180828235145-f29afc2cceca"
@@ -150,6 +178,8 @@ EGO_SUM=(
 	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
 	"github.com/hashicorp/go-immutable-radix v1.1.0"
 	"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.2.0"
+	"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
 	"github.com/hashicorp/go-memdb v1.0.3"
 	"github.com/hashicorp/go-memdb v1.0.3/go.mod"
 	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
@@ -157,62 +187,52 @@ EGO_SUM=(
 	"github.com/hashicorp/go-msgpack v0.5.5/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.0.1"
+	"github.com/hashicorp/go-multierror v1.1.0"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
 	"github.com/hashicorp/go-plugin v1.0.1/go.mod"
 	"github.com/hashicorp/go-raftchunking v0.6.1"
 	"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.3"
 	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
 	"github.com/hashicorp/go-retryablehttp v0.5.4"
 	"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.1"
 	"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
 	"github.com/hashicorp/go-rootcerts v1.0.2"
 	"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
-	"github.com/hashicorp/go-sockaddr v1.0.0"
 	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
 	"github.com/hashicorp/go-sockaddr v1.0.2"
 	"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
 	"github.com/hashicorp/go-syslog v1.0.0"
 	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0"
 	"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.1.0"
 	"github.com/hashicorp/go-version v1.1.0/go.mod"
-	"github.com/hashicorp/go.net v0.0.1"
 	"github.com/hashicorp/go.net v0.0.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0"
 	"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/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
 	"github.com/hashicorp/hcl v1.0.0"
 	"github.com/hashicorp/hcl v1.0.0/go.mod"
 	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
 	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
-	"github.com/hashicorp/logutils v1.0.0"
 	"github.com/hashicorp/logutils v1.0.0/go.mod"
-	"github.com/hashicorp/mdns v1.0.0"
 	"github.com/hashicorp/mdns v1.0.0/go.mod"
 	"github.com/hashicorp/mdns v1.0.1"
 	"github.com/hashicorp/mdns v1.0.1/go.mod"
-	"github.com/hashicorp/memberlist v0.1.3"
-	"github.com/hashicorp/memberlist v0.1.3/go.mod"
-	"github.com/hashicorp/memberlist v0.1.6"
-	"github.com/hashicorp/memberlist v0.1.6/go.mod"
+	"github.com/hashicorp/memberlist v0.2.2"
+	"github.com/hashicorp/memberlist v0.2.2/go.mod"
 	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
 	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
-	"github.com/hashicorp/raft v1.1.1"
 	"github.com/hashicorp/raft v1.1.1/go.mod"
 	"github.com/hashicorp/raft v1.1.2"
 	"github.com/hashicorp/raft v1.1.2/go.mod"
 	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
 	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
-	"github.com/hashicorp/serf v0.8.2"
-	"github.com/hashicorp/serf v0.8.2/go.mod"
-	"github.com/hashicorp/serf v0.8.5"
-	"github.com/hashicorp/serf v0.8.5/go.mod"
+	"github.com/hashicorp/serf v0.9.3"
+	"github.com/hashicorp/serf v0.9.3/go.mod"
 	"github.com/hashicorp/vault/api v1.0.4"
 	"github.com/hashicorp/vault/api v1.0.4/go.mod"
 	"github.com/hashicorp/vault/sdk v0.1.13"
@@ -226,7 +246,6 @@ EGO_SUM=(
 	"github.com/hpcloud/tail v1.0.0/go.mod"
 	"github.com/imdario/mergo v0.3.6"
 	"github.com/imdario/mergo v0.3.6/go.mod"
-	"github.com/istio/gogo-genproto v0.0.0-20190124151557-6d926a6e6feb/go.mod"
 	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
 	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
 	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
@@ -235,12 +254,16 @@ EGO_SUM=(
 	"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
 	"github.com/json-iterator/go v1.1.5"
 	"github.com/json-iterator/go v1.1.5/go.mod"
-	"github.com/jtolds/gls v4.2.1+incompatible"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.9"
+	"github.com/json-iterator/go v1.1.9/go.mod"
 	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
 	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0"
 	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/kr/pretty v0.1.0"
+	"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/go.mod"
 	"github.com/kr/pretty v0.2.0"
 	"github.com/kr/pretty v0.2.0/go.mod"
@@ -256,11 +279,10 @@ EGO_SUM=(
 	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
 	"github.com/linode/linodego v0.7.1"
 	"github.com/linode/linodego v0.7.1/go.mod"
-	"github.com/mattn/go-colorable v0.0.9"
 	"github.com/mattn/go-colorable v0.0.9/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.3"
+	"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.3/go.mod"
 	"github.com/mattn/go-isatty v0.0.8/go.mod"
 	"github.com/mattn/go-isatty v0.0.10/go.mod"
@@ -269,49 +291,47 @@ EGO_SUM=(
 	"github.com/mattn/go-isatty v0.0.12/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"
 	"github.com/miekg/dns v1.0.14/go.mod"
 	"github.com/miekg/dns v1.1.26"
 	"github.com/miekg/dns v1.1.26/go.mod"
-	"github.com/mitchellh/cli v1.0.0"
 	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/cli v1.1.0"
+	"github.com/mitchellh/cli v1.1.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"
 	"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-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-testing-interface v1.0.3"
+	"github.com/mitchellh/go-testing-interface v1.0.3/go.mod"
 	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-	"github.com/mitchellh/gox v0.4.0/go.mod"
 	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
 	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/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"
 	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.2.3"
+	"github.com/mitchellh/mapstructure v1.2.3/go.mod"
 	"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-20180701023420-4b7aa43c6742/go.mod"
 	"github.com/modern-go/reflect2 v1.0.1"
 	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
 	"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
 	"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
-	"github.com/oklog/run v1.0.0"
 	"github.com/oklog/run v1.0.0/go.mod"
 	"github.com/onsi/ginkgo v1.6.0"
 	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/gomega v1.4.1"
 	"github.com/onsi/gomega v1.4.1/go.mod"
-	"github.com/onsi/gomega v1.4.2"
-	"github.com/onsi/gomega v1.4.2/go.mod"
 	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
 	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
 	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
 	"github.com/pascaldekloe/goe v0.1.0"
 	"github.com/pascaldekloe/goe v0.1.0/go.mod"
@@ -319,25 +339,42 @@ EGO_SUM=(
 	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
 	"github.com/pierrec/lz4 v2.0.5+incompatible"
 	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
-	"github.com/pkg/errors v0.8.0"
 	"github.com/pkg/errors v0.8.0/go.mod"
 	"github.com/pkg/errors v0.8.1"
 	"github.com/pkg/errors v0.8.1/go.mod"
 	"github.com/pmezard/go-difflib v1.0.0"
 	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1"
 	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.3"
+	"github.com/posener/complete v1.2.3/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
 	"github.com/prometheus/client_golang v0.9.2"
 	"github.com/prometheus/client_golang v0.9.2/go.mod"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_golang v1.4.0"
+	"github.com/prometheus/client_golang v1.4.0/go.mod"
 	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910"
 	"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/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
 	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275"
 	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/common v0.9.1"
+	"github.com/prometheus/common v0.9.1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
 	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a"
 	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.8"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
+	"github.com/rboyer/safeio v0.2.1"
+	"github.com/rboyer/safeio v0.2.1/go.mod"
 	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
 	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
-	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f"
 	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
 	"github.com/ryanuber/columnize v2.1.0+incompatible"
 	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
@@ -351,37 +388,33 @@ EGO_SUM=(
 	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
 	"github.com/sirupsen/logrus v1.0.6"
 	"github.com/sirupsen/logrus v1.0.6/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180820201707-7c9eb446e3cf"
+	"github.com/sirupsen/logrus v1.2.0/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-20180820201707-7c9eb446e3cf/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
 	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
 	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
 	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/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"
 	"github.com/stretchr/objx v0.1.0/go.mod"
 	"github.com/stretchr/objx v0.1.1"
 	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v1.2.2"
 	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0"
 	"github.com/stretchr/testify v1.3.0/go.mod"
 	"github.com/stretchr/testify v1.4.0"
 	"github.com/stretchr/testify v1.4.0/go.mod"
 	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
 	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
-	"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9"
 	"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
 	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
 	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
 	"github.com/vmware/govmomi v0.18.0"
 	"github.com/vmware/govmomi v0.18.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3"
+	"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-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392"
 	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
 	"golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4"
 	"golang.org/x/crypto v0.0.0-20191106202628-ed6320f186d4/go.mod"
@@ -391,18 +424,14 @@ EGO_SUM=(
 	"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-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519"
 	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc"
+	"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-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-20190503192946-f4e77d36d62c"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859"
+	"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-20190923162816-aa69164e4478"
 	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
@@ -415,34 +444,33 @@ EGO_SUM=(
 	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
 	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/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-20181026203630-95b1ffbd15a5"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
 	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
 	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/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-20190403152447-81d4e9dc473e/go.mod"
 	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190508220229-2d0786266e9c"
-	"golang.org/x/sys v0.0.0-20190508220229-2d0786266e9c/go.mod"
-	"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
 	"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
 	"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
-	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe"
 	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
 	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/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-20200124204421-9fbb57f87de9"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
 	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
-	"golang.org/x/text v0.3.0"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
 	"golang.org/x/text v0.3.0/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-20180412165947-fbb02b2291d2"
 	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
 	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
 	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
@@ -454,28 +482,29 @@ EGO_SUM=(
 	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
 	"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
 	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
 	"google.golang.org/api v0.0.0-20180829000535-087779f1d2c9"
 	"google.golang.org/api v0.0.0-20180829000535-087779f1d2c9/go.mod"
-	"google.golang.org/appengine v1.1.0"
 	"google.golang.org/appengine v1.1.0/go.mod"
 	"google.golang.org/appengine v1.4.0"
 	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8"
 	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
 	"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107"
 	"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/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.14.0/go.mod"
 	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.19.1"
-	"google.golang.org/grpc v1.19.1/go.mod"
 	"google.golang.org/grpc v1.22.0/go.mod"
 	"google.golang.org/grpc v1.23.0"
 	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1"
+	"google.golang.org/grpc v1.25.1/go.mod"
 	"gopkg.in/airbrake/gobrake.v2 v2.0.9"
 	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
 	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/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-20190902080502-41f04d3bba15"
 	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
@@ -491,11 +520,10 @@ EGO_SUM=(
 	"gopkg.in/square/go-jose.v2 v2.3.1/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"
 	"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.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/go.mod"
+	"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"
 	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
@@ -516,7 +544,7 @@ SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
 RESTRICT+=" test"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 
 BDEPEND="dev-go/gox"
 COMMON_DEPEND="
diff --git a/app-admin/consul/consul-1.8.1.ebuild b/app-admin/consul/consul-1.8.1.ebuild
new file mode 100644
index 000000000000..164d786e8cd5
--- /dev/null
+++ b/app-admin/consul/consul-1.8.1.ebuild
@@ -0,0 +1,756 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=12f574c9d
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+
+# Upstream doesn't use "-mod=vendor" in their build system, and the
+# vendor directory is incomplete.
+# On the next bump, remove this if they have added "-mod=vendor"
+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"
+	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/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.10.0"
+	"github.com/Azure/go-autorest/autorest v0.10.0/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/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2/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/DataDog/datadog-go v2.2.0+incompatible"
+	"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+	"github.com/DataDog/datadog-go v3.2.0+incompatible"
+	"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+	"github.com/Microsoft/go-winio v0.4.3"
+	"github.com/Microsoft/go-winio v0.4.3/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/NYTimes/gziphandler v1.0.1"
+	"github.com/NYTimes/gziphandler v1.0.1/go.mod"
+	"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/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/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/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+	"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-metrics v0.0.0-20190430140413-ec5e00d3c878"
+	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+	"github.com/armon/go-metrics v0.3.3"
+	"github.com/armon/go-metrics v0.3.3/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.25.41"
+	"github.com/aws/aws-sdk-go v1.25.41/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"
+	"github.com/bgentry/speakeasy v0.1.0/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"
+	"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/circonus-labs/circonus-gometrics v2.3.1+incompatible"
+	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+	"github.com/circonus-labs/circonusllhist v0.1.3"
+	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
+	"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
+	"github.com/cockroachdb/apd v1.1.0/go.mod"
+	"github.com/coredns/coredns v1.1.2"
+	"github.com/coredns/coredns v1.1.2/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-oidc v2.1.0+incompatible"
+	"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10/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/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
+	"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/digitalocean/godo v1.1.1/go.mod"
+	"github.com/digitalocean/godo v1.10.0"
+	"github.com/digitalocean/godo v1.10.0/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/docker/go-connections v0.3.0"
+	"github.com/docker/go-connections v0.3.0/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
+	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/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.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.5"
+	"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/fatih/structs v1.1.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-check/check v0.0.0-20140225173054-eb6ee6f84d0a/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-ldap/ldap v3.0.2+incompatible/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-logr/logr v0.1.0/go.mod"
+	"github.com/go-ole/go-ole v1.2.1"
+	"github.com/go-ole/go-ole v1.2.1/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-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+	"github.com/go-test/deep v1.0.2"
+	"github.com/go-test/deep v1.0.2/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+	"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-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1"
+	"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.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"
+	"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"
+	"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-querystring v0.0.0-20170111101155-53e6ce116135/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 v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
+	"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/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.2.0"
+	"github.com/googleapis/gnostic v0.2.0/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-bexpr v0.1.2"
+	"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
+	"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
+	"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/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-connlimit v0.2.0"
+	"github.com/hashicorp/go-connlimit v0.2.0/go.mod"
+	"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
+	"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
+	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+	"github.com/hashicorp/go-hclog v0.8.0/go.mod"
+	"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.12.0"
+	"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.1.0"
+	"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.2.0"
+	"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
+	"github.com/hashicorp/go-memdb v1.0.3"
+	"github.com/hashicorp/go-memdb v1.0.3/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.5"
+	"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0"
+	"github.com/hashicorp/go-multierror 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/go-plugin v1.0.1/go.mod"
+	"github.com/hashicorp/go-raftchunking v0.6.1"
+	"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.4"
+	"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.2"
+	"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.2"
+	"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0"
+	"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"
+	"github.com/hashicorp/go-uuid v1.0.1/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.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/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
+	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.1"
+	"github.com/hashicorp/mdns v1.0.1/go.mod"
+	"github.com/hashicorp/memberlist v0.2.2"
+	"github.com/hashicorp/memberlist v0.2.2/go.mod"
+	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
+	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
+	"github.com/hashicorp/raft v1.1.1/go.mod"
+	"github.com/hashicorp/raft v1.1.2"
+	"github.com/hashicorp/raft v1.1.2/go.mod"
+	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
+	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+	"github.com/hashicorp/serf v0.9.3"
+	"github.com/hashicorp/serf v0.9.3/go.mod"
+	"github.com/hashicorp/vault/api v1.0.4"
+	"github.com/hashicorp/vault/api v1.0.4/go.mod"
+	"github.com/hashicorp/vault/sdk v0.1.13"
+	"github.com/hashicorp/vault/sdk v0.1.13/go.mod"
+	"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
+	"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
+	"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.6"
+	"github.com/imdario/mergo v0.3.6/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+	"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
+	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
+	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/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/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+	"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
+	"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.9"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/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/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/lib/pq v1.1.1/go.mod"
+	"github.com/linode/linodego v0.7.1"
+	"github.com/linode/linodego v0.7.1/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/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.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.10/go.mod"
+	"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.3/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/miekg/dns v1.1.26"
+	"github.com/miekg/dns v1.1.26/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/cli v1.1.0"
+	"github.com/mitchellh/cli v1.1.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.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.14.0"
+	"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
+	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.3.3"
+	"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+	"github.com/mitchellh/pointerstructure v1.0.0"
+	"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
+	"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/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/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
+	"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/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-20180130162743-b8a9be070da4/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 v1.5.0/go.mod"
+	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
+	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pascaldekloe/goe v0.1.0"
+	"github.com/pascaldekloe/goe v0.1.0/go.mod"
+	"github.com/patrickmn/go-cache v2.1.0+incompatible"
+	"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pierrec/lz4 v2.0.5+incompatible"
+	"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"
+	"github.com/pkg/errors v0.8.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"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.3"
+	"github.com/posener/complete v1.2.3/go.mod"
+	"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
+	"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.2/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.4.0"
+	"github.com/prometheus/client_golang v1.4.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
+	"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.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/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.9.1"
+	"github.com/prometheus/common v0.9.1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/procfs v0.0.2"
+	"github.com/prometheus/procfs v0.0.2/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/rboyer/safeio v0.2.1"
+	"github.com/rboyer/safeio v0.2.1/go.mod"
+	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
+	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rs/zerolog v1.4.0/go.mod"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/ryanuber/columnize v2.1.0+incompatible"
+	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+	"github.com/ryanuber/go-glob v1.0.0"
+	"github.com/ryanuber/go-glob v1.0.0/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
+	"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880"
+	"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
+	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+	"github.com/sirupsen/logrus v1.0.6/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
+	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.1/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.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.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/spf13/viper v1.4.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1"
+	"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.4.0"
+	"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/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
+	"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/vmware/govmomi v0.18.0"
+	"github.com/vmware/govmomi v0.18.0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"go.etcd.io/bbolt v1.3.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.4.0/go.mod"
+	"go.uber.org/goleak v1.0.0"
+	"go.uber.org/goleak v1.0.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-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-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/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/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-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/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-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-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-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-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-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-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/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-20190403152447-81d4e9dc473e/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-20190515120540-06a5c4944438/go.mod"
+	"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+	"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/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-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/text v0.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-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/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-20190907020128-2ca718005c18/go.mod"
+	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11"
+	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0"
+	"google.golang.org/api v0.7.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.0"
+	"google.golang.org/appengine v1.6.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-20190404172233-64821d5d2107/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/grpc v1.14.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.0/go.mod"
+	"google.golang.org/grpc v1.22.0/go.mod"
+	"google.golang.org/grpc v1.23.0"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/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/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/resty.v1 v1.12.0"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.3.1"
+	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.4.1"
+	"gopkg.in/square/go-jose.v2 v2.4.1/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.5/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.16.9"
+	"k8s.io/api v0.16.9/go.mod"
+	"k8s.io/apimachinery v0.16.9"
+	"k8s.io/apimachinery v0.16.9/go.mod"
+	"k8s.io/client-go v0.16.9"
+	"k8s.io/client-go v0.16.9/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-20190816220812-743ec37842bf/go.mod"
+	"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
+	"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/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
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+	acct-group/consul
+	acct-user/consul"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake dev-build
+}
+
+src_install() {
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/consul
+	fowners consul:consul /var/log/consul
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/consul/consul-1.8.2.ebuild b/app-admin/consul/consul-1.8.2.ebuild
new file mode 100644
index 000000000000..f192eee4f343
--- /dev/null
+++ b/app-admin/consul/consul-1.8.2.ebuild
@@ -0,0 +1,756 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=ba7d9435e
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+
+# Upstream doesn't use "-mod=vendor" in their build system, and the
+# vendor directory is incomplete.
+# On the next bump, remove this if they have added "-mod=vendor"
+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"
+	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/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.10.0"
+	"github.com/Azure/go-autorest/autorest v0.10.0/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/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2/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/DataDog/datadog-go v2.2.0+incompatible"
+	"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+	"github.com/DataDog/datadog-go v3.2.0+incompatible"
+	"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+	"github.com/Microsoft/go-winio v0.4.3"
+	"github.com/Microsoft/go-winio v0.4.3/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/NYTimes/gziphandler v1.0.1"
+	"github.com/NYTimes/gziphandler v1.0.1/go.mod"
+	"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/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/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/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+	"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-metrics v0.0.0-20190430140413-ec5e00d3c878"
+	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+	"github.com/armon/go-metrics v0.3.3"
+	"github.com/armon/go-metrics v0.3.3/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.25.41"
+	"github.com/aws/aws-sdk-go v1.25.41/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"
+	"github.com/bgentry/speakeasy v0.1.0/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"
+	"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/circonus-labs/circonus-gometrics v2.3.1+incompatible"
+	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+	"github.com/circonus-labs/circonusllhist v0.1.3"
+	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
+	"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
+	"github.com/cockroachdb/apd v1.1.0/go.mod"
+	"github.com/coredns/coredns v1.1.2"
+	"github.com/coredns/coredns v1.1.2/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-oidc v2.1.0+incompatible"
+	"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10/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/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
+	"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/digitalocean/godo v1.1.1/go.mod"
+	"github.com/digitalocean/godo v1.10.0"
+	"github.com/digitalocean/godo v1.10.0/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/docker/go-connections v0.3.0"
+	"github.com/docker/go-connections v0.3.0/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
+	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/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.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.5"
+	"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/fatih/structs v1.1.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-check/check v0.0.0-20140225173054-eb6ee6f84d0a/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-ldap/ldap v3.0.2+incompatible/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-logr/logr v0.1.0/go.mod"
+	"github.com/go-ole/go-ole v1.2.1"
+	"github.com/go-ole/go-ole v1.2.1/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-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+	"github.com/go-test/deep v1.0.2"
+	"github.com/go-test/deep v1.0.2/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+	"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-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1"
+	"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.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"
+	"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"
+	"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-querystring v0.0.0-20170111101155-53e6ce116135/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 v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
+	"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/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.2.0"
+	"github.com/googleapis/gnostic v0.2.0/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-bexpr v0.1.2"
+	"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
+	"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
+	"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/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-connlimit v0.2.0"
+	"github.com/hashicorp/go-connlimit v0.2.0/go.mod"
+	"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
+	"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
+	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+	"github.com/hashicorp/go-hclog v0.8.0/go.mod"
+	"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.12.0"
+	"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.1.0"
+	"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.2.0"
+	"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
+	"github.com/hashicorp/go-memdb v1.0.3"
+	"github.com/hashicorp/go-memdb v1.0.3/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.5"
+	"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0"
+	"github.com/hashicorp/go-multierror 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/go-plugin v1.0.1/go.mod"
+	"github.com/hashicorp/go-raftchunking v0.6.1"
+	"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.4"
+	"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.2"
+	"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.2"
+	"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0"
+	"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"
+	"github.com/hashicorp/go-uuid v1.0.1/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.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/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
+	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.1"
+	"github.com/hashicorp/mdns v1.0.1/go.mod"
+	"github.com/hashicorp/memberlist v0.2.2"
+	"github.com/hashicorp/memberlist v0.2.2/go.mod"
+	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
+	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
+	"github.com/hashicorp/raft v1.1.1/go.mod"
+	"github.com/hashicorp/raft v1.1.2"
+	"github.com/hashicorp/raft v1.1.2/go.mod"
+	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
+	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+	"github.com/hashicorp/serf v0.9.3"
+	"github.com/hashicorp/serf v0.9.3/go.mod"
+	"github.com/hashicorp/vault/api v1.0.4"
+	"github.com/hashicorp/vault/api v1.0.4/go.mod"
+	"github.com/hashicorp/vault/sdk v0.1.13"
+	"github.com/hashicorp/vault/sdk v0.1.13/go.mod"
+	"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
+	"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
+	"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.6"
+	"github.com/imdario/mergo v0.3.6/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+	"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
+	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
+	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/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/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+	"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
+	"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.9"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/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/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/lib/pq v1.1.1/go.mod"
+	"github.com/linode/linodego v0.7.1"
+	"github.com/linode/linodego v0.7.1/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/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.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.10/go.mod"
+	"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.3/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/miekg/dns v1.1.26"
+	"github.com/miekg/dns v1.1.26/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/cli v1.1.0"
+	"github.com/mitchellh/cli v1.1.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.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.14.0"
+	"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
+	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.3.3"
+	"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+	"github.com/mitchellh/pointerstructure v1.0.0"
+	"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
+	"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/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/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
+	"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/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-20180130162743-b8a9be070da4/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 v1.5.0/go.mod"
+	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
+	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pascaldekloe/goe v0.1.0"
+	"github.com/pascaldekloe/goe v0.1.0/go.mod"
+	"github.com/patrickmn/go-cache v2.1.0+incompatible"
+	"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pierrec/lz4 v2.0.5+incompatible"
+	"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"
+	"github.com/pkg/errors v0.8.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"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.3"
+	"github.com/posener/complete v1.2.3/go.mod"
+	"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
+	"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.2/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.4.0"
+	"github.com/prometheus/client_golang v1.4.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
+	"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.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/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.9.1"
+	"github.com/prometheus/common v0.9.1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/procfs v0.0.2"
+	"github.com/prometheus/procfs v0.0.2/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/rboyer/safeio v0.2.1"
+	"github.com/rboyer/safeio v0.2.1/go.mod"
+	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
+	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rs/zerolog v1.4.0/go.mod"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/ryanuber/columnize v2.1.0+incompatible"
+	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+	"github.com/ryanuber/go-glob v1.0.0"
+	"github.com/ryanuber/go-glob v1.0.0/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
+	"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880"
+	"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
+	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+	"github.com/sirupsen/logrus v1.0.6/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
+	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.1/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.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.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/spf13/viper v1.4.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1"
+	"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.4.0"
+	"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/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
+	"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/vmware/govmomi v0.18.0"
+	"github.com/vmware/govmomi v0.18.0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"go.etcd.io/bbolt v1.3.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.4.0/go.mod"
+	"go.uber.org/goleak v1.0.0"
+	"go.uber.org/goleak v1.0.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-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-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/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/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-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/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-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-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-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-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-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-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/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-20190403152447-81d4e9dc473e/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-20190515120540-06a5c4944438/go.mod"
+	"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+	"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/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-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/text v0.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-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/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-20190907020128-2ca718005c18/go.mod"
+	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11"
+	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0"
+	"google.golang.org/api v0.7.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.0"
+	"google.golang.org/appengine v1.6.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-20190404172233-64821d5d2107/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/grpc v1.14.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.0/go.mod"
+	"google.golang.org/grpc v1.22.0/go.mod"
+	"google.golang.org/grpc v1.23.0"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/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/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/resty.v1 v1.12.0"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.3.1"
+	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.4.1"
+	"gopkg.in/square/go-jose.v2 v2.4.1/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.5/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.16.9"
+	"k8s.io/api v0.16.9/go.mod"
+	"k8s.io/apimachinery v0.16.9"
+	"k8s.io/apimachinery v0.16.9/go.mod"
+	"k8s.io/client-go v0.16.9"
+	"k8s.io/client-go v0.16.9/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-20190816220812-743ec37842bf/go.mod"
+	"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
+	"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/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
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+	acct-group/consul
+	acct-user/consul"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake dev-build
+}
+
+src_install() {
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/consul
+	fowners consul:consul /var/log/consul
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/consul/consul-1.8.3.ebuild b/app-admin/consul/consul-1.8.3.ebuild
new file mode 100644
index 000000000000..6eb67f4883cc
--- /dev/null
+++ b/app-admin/consul/consul-1.8.3.ebuild
@@ -0,0 +1,756 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+GIT_COMMIT=a9322b9c7
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+
+# Upstream doesn't use "-mod=vendor" in their build system, and the
+# vendor directory is incomplete.
+# On the next bump, remove this if they have added "-mod=vendor"
+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"
+	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/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.10.0"
+	"github.com/Azure/go-autorest/autorest v0.10.0/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/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2/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/DataDog/datadog-go v2.2.0+incompatible"
+	"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+	"github.com/DataDog/datadog-go v3.2.0+incompatible"
+	"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+	"github.com/Microsoft/go-winio v0.4.3"
+	"github.com/Microsoft/go-winio v0.4.3/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/NYTimes/gziphandler v1.0.1"
+	"github.com/NYTimes/gziphandler v1.0.1/go.mod"
+	"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/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
+	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/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/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
+	"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-metrics v0.0.0-20190430140413-ec5e00d3c878"
+	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+	"github.com/armon/go-metrics v0.3.4"
+	"github.com/armon/go-metrics v0.3.4/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.25.41"
+	"github.com/aws/aws-sdk-go v1.25.41/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"
+	"github.com/bgentry/speakeasy v0.1.0/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"
+	"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/circonus-labs/circonus-gometrics v2.3.1+incompatible"
+	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+	"github.com/circonus-labs/circonusllhist v0.1.3"
+	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
+	"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
+	"github.com/cockroachdb/apd v1.1.0/go.mod"
+	"github.com/coredns/coredns v1.1.2"
+	"github.com/coredns/coredns v1.1.2/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-oidc v2.1.0+incompatible"
+	"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10/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/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
+	"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/digitalocean/godo v1.1.1/go.mod"
+	"github.com/digitalocean/godo v1.10.0"
+	"github.com/digitalocean/godo v1.10.0/go.mod"
+	"github.com/dimchansky/utfbom v1.1.0"
+	"github.com/dimchansky/utfbom v1.1.0/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/docker/go-connections v0.3.0"
+	"github.com/docker/go-connections v0.3.0/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
+	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/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.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.5"
+	"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/fatih/structs v1.1.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-check/check v0.0.0-20140225173054-eb6ee6f84d0a/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-ldap/ldap v3.0.2+incompatible/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-logr/logr v0.1.0/go.mod"
+	"github.com/go-ole/go-ole v1.2.1"
+	"github.com/go-ole/go-ole v1.2.1/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-stack/stack v1.8.0/go.mod"
+	"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
+	"github.com/go-test/deep v1.0.2"
+	"github.com/go-test/deep v1.0.2/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
+	"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-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1"
+	"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.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"
+	"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"
+	"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-querystring v0.0.0-20170111101155-53e6ce116135/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 v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
+	"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/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.2.0"
+	"github.com/googleapis/gnostic v0.2.0/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-bexpr v0.1.2"
+	"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
+	"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
+	"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/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-connlimit v0.2.0"
+	"github.com/hashicorp/go-connlimit v0.2.0/go.mod"
+	"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
+	"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
+	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
+	"github.com/hashicorp/go-hclog v0.8.0/go.mod"
+	"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+	"github.com/hashicorp/go-hclog v0.12.0"
+	"github.com/hashicorp/go-hclog v0.12.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.1.0"
+	"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.2.0"
+	"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
+	"github.com/hashicorp/go-memdb v1.0.3"
+	"github.com/hashicorp/go-memdb v1.0.3/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.5"
+	"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0"
+	"github.com/hashicorp/go-multierror 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/go-plugin v1.0.1/go.mod"
+	"github.com/hashicorp/go-raftchunking v0.6.1"
+	"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+	"github.com/hashicorp/go-retryablehttp v0.5.4"
+	"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.2"
+	"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.2"
+	"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
+	"github.com/hashicorp/go-syslog v1.0.0"
+	"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"
+	"github.com/hashicorp/go-uuid v1.0.1/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.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/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
+	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.1"
+	"github.com/hashicorp/mdns v1.0.1/go.mod"
+	"github.com/hashicorp/memberlist v0.2.2"
+	"github.com/hashicorp/memberlist v0.2.2/go.mod"
+	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
+	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
+	"github.com/hashicorp/raft v1.1.1/go.mod"
+	"github.com/hashicorp/raft v1.1.2"
+	"github.com/hashicorp/raft v1.1.2/go.mod"
+	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
+	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+	"github.com/hashicorp/serf v0.9.3"
+	"github.com/hashicorp/serf v0.9.3/go.mod"
+	"github.com/hashicorp/vault/api v1.0.4"
+	"github.com/hashicorp/vault/api v1.0.4/go.mod"
+	"github.com/hashicorp/vault/sdk v0.1.13"
+	"github.com/hashicorp/vault/sdk v0.1.13/go.mod"
+	"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
+	"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
+	"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.6"
+	"github.com/imdario/mergo v0.3.6/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+	"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
+	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
+	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/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/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
+	"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
+	"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
+	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.9"
+	"github.com/json-iterator/go v1.1.9/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/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/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/lib/pq v1.1.1/go.mod"
+	"github.com/linode/linodego v0.7.1"
+	"github.com/linode/linodego v0.7.1/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/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.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.10/go.mod"
+	"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.3/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/miekg/dns v1.1.26"
+	"github.com/miekg/dns v1.1.26/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/cli v1.1.0"
+	"github.com/mitchellh/cli v1.1.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.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.14.0"
+	"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
+	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/mapstructure v1.3.3"
+	"github.com/mitchellh/mapstructure v1.3.3/go.mod"
+	"github.com/mitchellh/pointerstructure v1.0.0"
+	"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
+	"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/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/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
+	"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/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-20180130162743-b8a9be070da4/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 v1.5.0/go.mod"
+	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
+	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pascaldekloe/goe v0.1.0"
+	"github.com/pascaldekloe/goe v0.1.0/go.mod"
+	"github.com/patrickmn/go-cache v2.1.0+incompatible"
+	"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/pierrec/lz4 v2.0.5+incompatible"
+	"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"
+	"github.com/pkg/errors v0.8.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"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/posener/complete v1.2.3"
+	"github.com/posener/complete v1.2.3/go.mod"
+	"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
+	"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.2/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.4.0"
+	"github.com/prometheus/client_golang v1.4.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
+	"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.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/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.9.1"
+	"github.com/prometheus/common v0.9.1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/procfs v0.0.2"
+	"github.com/prometheus/procfs v0.0.2/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/rboyer/safeio v0.2.1"
+	"github.com/rboyer/safeio v0.2.1/go.mod"
+	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
+	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rs/zerolog v1.4.0/go.mod"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/ryanuber/columnize v2.1.0+incompatible"
+	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
+	"github.com/ryanuber/go-glob v1.0.0"
+	"github.com/ryanuber/go-glob v1.0.0/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
+	"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880"
+	"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
+	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+	"github.com/sirupsen/logrus v1.0.6/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
+	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.1/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.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.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/spf13/viper v1.4.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1"
+	"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.4.0"
+	"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/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
+	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
+	"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
+	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/vmware/govmomi v0.18.0"
+	"github.com/vmware/govmomi v0.18.0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"go.etcd.io/bbolt v1.3.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.4.0/go.mod"
+	"go.uber.org/goleak v1.0.0"
+	"go.uber.org/goleak v1.0.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-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-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/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/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-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/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-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-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-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-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-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-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/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-20190403152447-81d4e9dc473e/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-20190515120540-06a5c4944438/go.mod"
+	"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+	"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/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-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9"
+	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/text v0.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-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/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-20190907020128-2ca718005c18/go.mod"
+	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11"
+	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0"
+	"google.golang.org/api v0.7.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.0"
+	"google.golang.org/appengine v1.6.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-20190404172233-64821d5d2107/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/grpc v1.14.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.0/go.mod"
+	"google.golang.org/grpc v1.22.0/go.mod"
+	"google.golang.org/grpc v1.23.0"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/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/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/resty.v1 v1.12.0"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.3.1"
+	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.4.1"
+	"gopkg.in/square/go-jose.v2 v2.4.1/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.5/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.16.9"
+	"k8s.io/api v0.16.9/go.mod"
+	"k8s.io/apimachinery v0.16.9"
+	"k8s.io/apimachinery v0.16.9/go.mod"
+	"k8s.io/client-go v0.16.9"
+	"k8s.io/client-go v0.16.9/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-20190816220812-743ec37842bf/go.mod"
+	"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
+	"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/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
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+	acct-group/consul
+	acct-user/consul"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake dev-build
+}
+
+src_install() {
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/consul
+	fowners consul:consul /var/log/consul
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/cpulimit/Manifest b/app-admin/cpulimit/Manifest
index 867b6a25b3a4..dac9d5726bc1 100644
--- a/app-admin/cpulimit/Manifest
+++ b/app-admin/cpulimit/Manifest
@@ -4,5 +4,5 @@ DIST cpulimit-2.2.tar.gz 22224 BLAKE2B e59e65c0bd38ff93b2daaef6858c46cc99b8a1345
 DIST cpulimit-2.4.tar.gz 24669 BLAKE2B e0fe0d6766e76e6e2a68dcdc553039400233daabbb14ce4a9dae46a7b694d2ecd660f4c1d13f417a74b12365c719780c732a03bd91c6384d1e7118d0fce521fb SHA512 008dc3fbdcbd8afd875a2a1ce03d609db595c6e110803140c676d3713ea60f4877a1bb8e7aa0e8b669dce31522ad81e2703f616341a0f4cbc69a6b01865b66d0
 EBUILD cpulimit-1.8.ebuild 575 BLAKE2B 6d289bdc46838d5c495908533e0d4c5419ddd7f5f7024a7acd39858cfe46544662ab64adb03dc967c146fa49be34a8ddf6fa2c027733f40b240b85fc7ca9f576 SHA512 5b726887834de6eb7ccaef9d8797998a4bd82e3cd06c8e8982895d9780178afda4778ed2a3a55bdf89125ee78d179c594c1ca82d3d7f7bbad4384d83e6da5cf4
 EBUILD cpulimit-2.2.ebuild 593 BLAKE2B 1571a3b20a315aeac1c051e04691bb71ac832d969908de2e85a95b68876c51d3479476adc5bae4a1f248b98bb0dd27d712209d8d628e71b6dbafc488aa96524c SHA512 a488c04229230cbcc83f800ae39a391a61d8ecb7c704bdeaba85d6dcfc02179e939bbf098b26520350be25350f3ec3a8a2a709cf25991b7777b53a609c6942ac
-EBUILD cpulimit-2.4.ebuild 642 BLAKE2B aa27d5417efb47d655d7e3e22879743b376676f868995ccd7fbf16b7c6c87394985f710c0df3b322c08bed70009b7651a2aacc7f75ed3a1b7504f231e24e676a SHA512 3ea7af0885d83069ce70bc0bf3a2fd6247d05bf6c54bb08b703523209acdc4e146a0a7272b9a25e5a2171e6a161a0914182daa19edda65eadd784c62f73798b1
+EBUILD cpulimit-2.4.ebuild 637 BLAKE2B efcc65d22d2e18aec1fcc72d2e6efce525e4c5eb5ddc295690cfe5e8075e8e7b551420a500118e1d19ba34892ad0f562566383a1e6235c0c33303a0c95ac079b SHA512 ede24c34a0a8f35f8127c81fbf0857f64817cd5f21be4c73cc53d32b80dfbc18eb558caad64eba93d052f14cfb4349359696dd906ebca104d910df08e10321d7
 MISC metadata.xml 328 BLAKE2B cfd9269eca123a335dd8b842cf59029ae1aef98293d1f955cd4cf33ddd56a658c1aba076e7de6318720c4ee0a282bee3c5282dab611e316a1ddbbf45c18af334 SHA512 5bf3122d96aba89083a0776bfeb5cd1ca84cdabc59a1ad4e158b1b50e4eb42b3ebf7a45a51807af380a040c6ae106ddc30c97003a2398e7944bce932fb35d8b1
diff --git a/app-admin/cpulimit/cpulimit-2.4.ebuild b/app-admin/cpulimit/cpulimit-2.4.ebuild
index 72e81d6e2ab9..984249c13da9 100644
--- a/app-admin/cpulimit/cpulimit-2.4.ebuild
+++ b/app-admin/cpulimit/cpulimit-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/limitcpu/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/denyhosts/Manifest b/app-admin/denyhosts/Manifest
deleted file mode 100644
index 2d2d7b072467..000000000000
--- a/app-admin/denyhosts/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX denyhosts-2.6-hostname.patch 664 BLAKE2B b86f74d9eee9e47f96a1894eda227d0c437d45e4d2615d14f350179245a953022d3dd6e401babf6b9474092c77362f6aa56b1ec51b57310b5fed75d843945703 SHA512 0fc512f4a1691a90aba7d95b4757a363f3ff6bb893fdc719277c5dbec1904828be923f5ab21c5ba20e03a5e6bf61a5f7d35c6675b9ccfafd32dbd9e108dd5095
-AUX denyhosts-3.0-python2.7.patch 1502 BLAKE2B 7057613a62ebe718a6712e06b4ef1b3c875a644380ef97398cc9c2dd4d7e84d8887d3783cc853aaa7d04d97bf05bdb6f0929b2eb4a72d20ca5e63369bed22e04 SHA512 ee3c4f7f6a8126e4a9c30531cce2673f8c0eb4c4d2a011aa22a3aa4f0b9ee58f8278334cf9253619d999b8dadf4370d6c02f2535a0b6d794243e3050f3927e8f
-AUX denyhosts.init-r2 646 BLAKE2B b52a481376656aab7525e3f04ea7712137c132605e62e011f41b8c006341e223487a4702e7aa8dd8f2a1faa6f52d33937557eb2bc130c97c6e9e2333cfe0a9bd SHA512 ea20958c74ec34d4f8e2f165cda9d0c3e27d94fe7eef374548d74275d35dc7fc7c89395e36b0a00dfc7d2a83b198f179fd44e16f7dc51419f9af1e907616382c
-AUX denyhosts.logrotate-r2 272 BLAKE2B 9dd9bad7fd6d1b3fac06a331d2b2246697b70ebf7bef84fda0917d3cf925b3b7f6a30a66c67a7ef52c466096a2860ee8f177097ab44c3000169d879306668ae2 SHA512 43d379b5909937913ca78a11581f577a5d9fe52bb16627441311cdac7281f59a1f05fdb308f722f9c376d2e446111021d225b2033c5fe5f3399ab88771be2569
-AUX denyhosts.service 265 BLAKE2B 4ecccdf6f605936ffb7339c2ec2510f14b0817cf3ed3cf51b540456216b3877e561044973f1eda4a743f717bc4e0f36e9f8492b3fd2b365a243f5f7449ea575c SHA512 601b10e999dd2e16cec57035d025a883df77df272c6a72b4d39f2c118d983f308984aa9edd296f334e0e5062e8ca5ea21ba25ef58b606c9c7e4c09ed7b3ad4be
-DIST denyhosts-2.9.tar.gz 49472 BLAKE2B 94f18da3db9dd7e0d979d4fb536160114fe1dc95ac43ad1f7bf3f235702698210e62b3872bf7f3360945228b187d97a274797d535a9b12b552bddf649b5d1fdf SHA512 f41e2985e84f0eeaa493def6b8609de934889d02b124962b0bfd02ebe5e41d0670822124eb50ed84eb1c3b8a2a96775fbe09386cef48a3c3e04949fd6b1452c1
-DIST denyhosts-3.0.tar.gz 56283 BLAKE2B 1ecb8a13ec9511cb4ac65579aa8f88117264f231b586c30a61ad9c78abd17aeebc5642e70f162fa7e73fe81a99821d494efca213b1bf864fd0e2043fa4374e6a SHA512 8a1c796c259049ffab2c88cef780b175ec75c94216841421f831dfbf45f4ba0cdbcfbb0e3dab7200aa79eeb2416db5234ad5016d5770d8ab2f28ef4c9754e70d
-EBUILD denyhosts-2.9.ebuild 1858 BLAKE2B cb836ef7bc0d26d96f873d13c3adcd2c6b7f7a86b464ea41bc20ac4165dabc64554fe95e3404c80be89286da66448375450771cfce0415f3ddee873201e411e6 SHA512 bc389dd61b4b0e305284473160bcc16e4f0e4885d83438652280912375a058d3b2e33d1aab65b6a70767bdebe61ff8c6adcab1de8717e89c271fccc72a1d69cf
-EBUILD denyhosts-3.0-r1.ebuild 1762 BLAKE2B 419fdb0a943cd4e6bacb78675cef19ccd6d73709b0a980c8547a01b9d1cc8077992db61553ec46b270e637659f0ffe53509865edb5ff5f3fdb65d3b97ce4b0fc SHA512 b63ffa7964dc8c1b3d659803f2038005aa098a7b62a3022d6aba7fd7716cc271cc2df7424137be0085def3be663b43bf2d1f71b1520be6cd61db14772880b93e
-EBUILD denyhosts-3.0-r2.ebuild 1774 BLAKE2B 1644ee1f25043685d8ed488604167a143d7330653c45313df6abcddaba6d46847d92586d55ca2b2f81f3d2d0dd6deae9ddf8ca2db0f540cacbd5898bc11f99c9 SHA512 0c64f20fdd92e5fcdd4b7d6baf18f849cc6a678cb34b9e1714ab100402d857fc4e6e2f161f41d7fb8dd7b5e506281c5f8695c2c7ab96751e95a7018b666e3be5
-EBUILD denyhosts-3.0.ebuild 1672 BLAKE2B ffce8305ca9db71a456c8163a7bb1fdfcf7187b4433988c93e01f94407dcc0edf577b8d187ad017ff4e357e56d907aa4d34cd4f4d8b292365d46ea2a079be6aa SHA512 660bca4d0ca9fd4eea074cdfde7629d06cb4c6c48f3b0cf9674d6ad62ac931cf51624b67e52862b6b284157643f634495bbce7c6b927bc1b80274ed497a9aad0
-MISC metadata.xml 405 BLAKE2B 78e4aa249eb769b94479816826f18e7005a20cf59f476be51ea5513f6e1a035b3f46ee7fc6c40c7010e07700d9479088f8281b1a84fff47d79d73dd24bc6c954 SHA512 06a687f8daeda5e4d48fcf9887a13f515ef52e47cfad3285c67907d9d17a59d32ce1eaf679b8b8f4f3832295173268cd548a2e493b0663468fb91603b0c6d8ad
diff --git a/app-admin/denyhosts/denyhosts-2.9.ebuild b/app-admin/denyhosts/denyhosts-2.9.ebuild
deleted file mode 100644
index 7711a19aa6d9..000000000000
--- a/app-admin/denyhosts/denyhosts-2.9.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils readme.gentoo systemd
-
-DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
-HOMEPAGE="http://denyhost.sourceforge.net/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
->=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
-(see bug#531156) that means you either have patch openssh or use
-denyhosts' iptables feature to get any protection.
-
-You can configure DenyHosts to run as a daemon by running:
-# rc-update add denyhosts default
-or:
-# systemctl enable denyhosts.service
-(if you use systemd)
-
-To run DenyHosts as a cronjob instead of a daemon add the following
-to /etc/crontab
-# run DenyHosts every 10 minutes
-*/10  *  * * *    root    /usr/bin/denyhosts.py -c /etc/denyhosts.conf
-
-More information can be found at ${HOMEPAGE}faq.html"
-
-src_prepare() {
-	#systemd needs HOSTNAME
-	epatch "${FILESDIR}"/${PN}-2.6-hostname.patch
-
-	sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
-		-e '/^SECURE_LOG/s/^/#/' \
-		-e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
-		-i denyhosts.conf || die "sed failed"
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	readme.gentoo_create_doc
-
-	dodoc CHANGELOG.txt README.txt PKG-INFO
-	distutils-r1_src_install
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
-
-	newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	keepdir /var/lib/denyhosts
-}
-
-pkg_postinst() {
-	[[ -f "${EROOT}etc/hosts.deny" ]] || touch "${EROOT}etc/hosts.deny"
-
-	readme.gentoo_print_elog
-}
diff --git a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
deleted file mode 100644
index 287529f92f3a..000000000000
--- a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 eutils readme.gentoo-r1 systemd
-
-DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
-HOMEPAGE="https://github.com/denyhosts/denyhosts"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
->=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
-(see bug#531156) that means you either have patch openssh or use
-denyhosts' iptables feature to get any protection.
-
-You can configure DenyHosts to run as a daemon by running:
-# rc-update add denyhosts default
-or:
-# systemctl enable denyhosts.service
-(if you use systemd)
-
-To run DenyHosts as a cronjob instead of a daemon add the following
-to /etc/crontab
-# run DenyHosts every 10 minutes
-*/10  *  * * *    root    /usr/bin/denyhosts.py -c /etc/denyhosts.conf
-
-More information can be found at ${HOMEPAGE}faq.html"
-
-#bring back python-2.7 support  bug #577502
-PATCHES=( "${FILESDIR}"/"${P}"-python2.7.patch )
-
-src_prepare() {
-	sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
-		-e '/^SECURE_LOG/s/^/#/' \
-		-e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
-		-i denyhosts.conf || die "sed failed"
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	readme.gentoo_create_doc
-
-	dodoc CHANGELOG.txt README.md
-	distutils-r1_src_install
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
-
-	newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	keepdir /var/lib/denyhosts
-}
diff --git a/app-admin/denyhosts/denyhosts-3.0-r2.ebuild b/app-admin/denyhosts/denyhosts-3.0-r2.ebuild
deleted file mode 100644
index 70da20f43fa6..000000000000
--- a/app-admin/denyhosts/denyhosts-3.0-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 eutils readme.gentoo-r1 systemd
-
-DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
-HOMEPAGE="https://github.com/denyhosts/denyhosts"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
->=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
-(see bug#531156) that means you either have patch openssh or use
-denyhosts' iptables feature to get any protection.
-
-You can configure DenyHosts to run as a daemon by running:
-# rc-update add denyhosts default
-or:
-# systemctl enable denyhosts.service
-(if you use systemd)
-
-To run DenyHosts as a cronjob instead of a daemon add the following
-to /etc/crontab
-# run DenyHosts every 10 minutes
-*/10  *  * * *    root    /usr/bin/denyhosts.py -c /etc/denyhosts.conf
-
-More information can be found at ${HOMEPAGE}faq.html"
-
-#bring back python-2.7 support  bug #577502
-PATCHES=( "${FILESDIR}"/"${P}"-python2.7.patch )
-
-src_prepare() {
-	sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
-		-e '/^SECURE_LOG/s/^/#/' \
-		-e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
-		-i denyhosts.conf || die "sed failed"
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	readme.gentoo_create_doc
-
-	dodoc CHANGELOG.txt README.md
-	distutils-r1_src_install
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
-
-	newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	keepdir /var/lib/denyhosts
-}
diff --git a/app-admin/denyhosts/denyhosts-3.0.ebuild b/app-admin/denyhosts/denyhosts-3.0.ebuild
deleted file mode 100644
index cd2c9fdeea38..000000000000
--- a/app-admin/denyhosts/denyhosts-3.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils readme.gentoo systemd
-
-DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
-HOMEPAGE="https://github.com/denyhosts/denyhosts"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
->=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
-(see bug#531156) that means you either have patch openssh or use
-denyhosts' iptables feature to get any protection.
-
-You can configure DenyHosts to run as a daemon by running:
-# rc-update add denyhosts default
-or:
-# systemctl enable denyhosts.service
-(if you use systemd)
-
-To run DenyHosts as a cronjob instead of a daemon add the following
-to /etc/crontab
-# run DenyHosts every 10 minutes
-*/10  *  * * *    root    /usr/bin/denyhosts.py -c /etc/denyhosts.conf
-
-More information can be found at ${HOMEPAGE}faq.html"
-
-src_prepare() {
-	sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
-		-e '/^SECURE_LOG/s/^/#/' \
-		-e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
-		-i denyhosts.conf || die "sed failed"
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	readme.gentoo_create_doc
-
-	dodoc CHANGELOG.txt README.md
-	distutils-r1_src_install
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
-
-	newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	keepdir /var/lib/denyhosts
-}
diff --git a/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch b/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch
deleted file mode 100644
index 56d881319c5f..000000000000
--- a/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up ./denyhosts.py.orig ./denyhosts.py
---- ./denyhosts.py.orig	2012-01-30 13:14:41.146715839 -0600
-+++ ./denyhosts.py	2012-01-30 14:45:14.372539341 -0600
-@@ -1,5 +1,6 @@
- #!/usr/bin/env python
- import os
-+import platform
- import sys
- 
- import DenyHosts.python_version
-@@ -107,6 +108,10 @@ if __name__ == '__main__':
-             print "DenyHosts version:", VERSION
-             sys.exit(0)
- 
-+    # This is generally expected to be in the environment, but there's no
-+    # non-hackish way to get systemd to set it, so just hack it in here.
-+    os.environ['HOSTNAME'] = platform.node()
-+
-     prefs = Prefs(config_file)    
-             
-     first_time = 0
diff --git a/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch b/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch
deleted file mode 100644
index 4b727c7067d9..000000000000
--- a/app-admin/denyhosts/files/denyhosts-3.0-python2.7.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b5611dfa0510ec8fbaa2db4b6834d0bd7ecf0909 Mon Sep 17 00:00:00 2001
-From: Jesse <jessefrgsmith@yahoo.ca>
-Date: Sat, 27 Jun 2015 20:24:44 -0300
-Subject: [PATCH] Fixed a type check which was causing syntax/undefined errors
- in DenyHosts/report.py when switching between Python2 and Python3.
-
----
- CHANGELOG.txt       | 8 ++++++++
- DenyHosts/report.py | 4 +++-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/CHANGELOG.txt b/CHANGELOG.txt
-index ca173cb..b585332 100644
---- a/CHANGELOG.txt
-+++ b/CHANGELOG.txt
-@@ -1,5 +1,13 @@
- DENYHOSTS CHANGELOG
- 
-+3.1
-+======================
-+
-+Fixed a type check in DenyHosts/report.py which was causing
-+problems when moving between Python2 and Python3.
-+
-+
-+
- 3.0
- ======================
- 
-diff --git a/DenyHosts/report.py b/DenyHosts/report.py
-index 05f3e3d..9560eab 100644
---- a/DenyHosts/report.py
-+++ b/DenyHosts/report.py
-@@ -3,6 +3,7 @@
- import socket
- # Removing this as it causes runtime errors on Python3.4
- # from types import ListType, TupleType
-+import types
- from .util import is_true
- try:
-     import syslog
-@@ -38,7 +39,8 @@ def get_report(self):
-     def add_section(self, message, iterable):
-         self.report += "%s:\n\n" % message
-         for i in iterable:
--            if type(i) in (TupleType, ListType):
-+            # if type(i) in (TupleType, ListType):
-+            if (type(i) is types.ListType) or (type(i) is types.TupleType):
-                 extra = ": %d\n" % i[1]
-                 i = i[0]
-             else:
diff --git a/app-admin/denyhosts/files/denyhosts.init-r2 b/app-admin/denyhosts/files/denyhosts.init-r2
deleted file mode 100644
index 9b2f24cbf21e..000000000000
--- a/app-admin/denyhosts/files/denyhosts.init-r2
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_stopped_commands="purge"
-
-purge() {
-	ebegin "Purging hosts.deny"
-	start-stop-daemon --start --exec /usr/bin/denyhosts.py --pidfile /var/run/denyhosts.pid -- --purge
-	eend $?
-}
-
-depend() {
-	use logger sshd
-}
-
-start() {
-	ebegin "Starting DenyHosts daemon"
-	start-stop-daemon --start --exec /usr/bin/denyhosts.py --pidfile /var/run/denyhosts.pid -- --daemon -c /etc/denyhosts.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping DenyHosts daemon"
-	start-stop-daemon --quiet --stop --pidfile /var/run/denyhosts.pid
-	eend $?
-}
diff --git a/app-admin/denyhosts/files/denyhosts.logrotate-r2 b/app-admin/denyhosts/files/denyhosts.logrotate-r2
deleted file mode 100644
index 582e72f7a365..000000000000
--- a/app-admin/denyhosts/files/denyhosts.logrotate-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/log/denyhosts {
-	missingok
-	notifempty
-	create 0640 root root
-	sharedscripts
-	postrotate
-		test -e /run/openrc/softlevel && /etc/init.d/denyhosts restart 1>/dev/null || true
-		test -e /run/systemd/system && systemctl restart denyhosts >/dev/null || true
-	endscript
-}
diff --git a/app-admin/denyhosts/files/denyhosts.service b/app-admin/denyhosts/files/denyhosts.service
deleted file mode 100644
index 05a59dd27bfc..000000000000
--- a/app-admin/denyhosts/files/denyhosts.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=SSH log watcher
-Before=sshd.service
-
-[Service]
-Type=forking
-ExecStartPre=/bin/rm -f /var/run/denyhosts.pid
-ExecStart=/usr/bin/denyhosts.py --daemon --config=/etc/denyhosts.conf
-PIDFile=/var/run/denyhosts.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/denyhosts/metadata.xml b/app-admin/denyhosts/metadata.xml
deleted file mode 100644
index 3e89d981c937..000000000000
--- a/app-admin/denyhosts/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">denyhosts/denyhosts</remote-id>
-    <remote-id type="sourceforge">denyhost</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-admin/dio/Manifest b/app-admin/dio/Manifest
index 2698346ea6a1..94ba281f2ae0 100644
--- a/app-admin/dio/Manifest
+++ b/app-admin/dio/Manifest
@@ -1,3 +1,3 @@
 DIST dio-1.5.2.tar.gz 44344 BLAKE2B 8e573cbf2ad1b717ffec09f20f8c7474841bc3e1635af35116d02b37af56ef3b4742e12725134d485f788e7abb595605640e19bd6f84bfd8f14289abf1695089 SHA512 366d2f2d25b8d16439c4a9aaa7cd775ddffb1022980675cdda8e2e4d4de3d3e5dcfa8d0c581b73fcfe4eff66ee8ef682f082c8788f514b7abdf1a2cb2159b9ba
-EBUILD dio-1.5.2-r1.ebuild 866 BLAKE2B 67446d17c74b52e5e59d62ee1cfde36b8947805e5f8f67bb6376f07ceef57e7bb9410b4781e138efe0740d3be7f36a81ff9531d5aaa4ff010547fe49cc4d27fd SHA512 4f340cf0311191745672dfea523fb2a8b0b721181e60700e026b5d6cffd5a9cb0e31ad35c1e41fb5052def7046abd3084201f4c929d6f25d7d76b1f3402f9daf
+EBUILD dio-1.5.2-r1.ebuild 864 BLAKE2B 21d4534ca92e2eae1234efc1136be510f092ebf93f034f9e50035fee7fa9b0fef7756f255571c52c9f340304c9da58e55ac36c21ba9b8ef51727768e974dc014 SHA512 2bba0907947285946c1e3c07a98de3ef20012c29200bc5c40f6a48a78f0ae94508cb1e9018392f28b3dd39e7480f075b100db3bf0e1cadc4f99819526aa51be1
 MISC metadata.xml 793 BLAKE2B cc48bcda030360c69a517a4c76e91dca8adc6d5228d6982c21cd4a07afc474a4ef03daedd773f9a22564eccfadd5fcc6eb528cc2631358b5ca602144f2bf8559 SHA512 9875ed341acd30db1009dc29da6d024b433a77a8212690911286798aeabb4206d3af91452976931bacd3db81159a393efdbd95058fa6d740b22d6ad1a81f2c82
diff --git a/app-admin/dio/dio-1.5.2-r1.ebuild b/app-admin/dio/dio-1.5.2-r1.ebuild
index 23999654ba7b..1ede22cf23f0 100644
--- a/app-admin/dio/dio-1.5.2-r1.ebuild
+++ b/app-admin/dio/dio-1.5.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit toolchain-funcs
 
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
index 391648dcb66e..d5475f16c58c 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 759 BLAKE2B 3ef54c4af669d12b66d57465e66ea36a8904396b40c21c7f7ec42393160bf383079d66e83a5351f5f6c4821accf6032da0e2268df6202438f3ee9b892a6d0102 SHA512 d69b89fa4f247045c19bea216af9d97b12f9445e6fe217ebef48bbccdfad0e61acb68a9c87fad908157f9d593143cf098936abf84a4d81f3b373f0317f480a42
-MISC metadata.xml 435 BLAKE2B 63f345e2db83040c0cd34cce3dbc5f1f53495f3dc6c4b54ef9b09085eb32708a81dbe1e36f8702649cad0f2bae6f3affa4d95a5e996df5d66d6d0425136c09b6 SHA512 87342e8a10501960ff97fe359c4caa697269db4d95e5e008705aa23467b164a25c6cb8c7158530c39cd19a1840192815c3e336b09ce71938bc56dbd2819b18ec
+EBUILD doas-6.6.1.ebuild 802 BLAKE2B 9c18a5a3f6774c581154fe0ecdeea768f0e297edd03c18b80755936d82331e62a6a5c2988c0c68e05579eb80910880c6e9b744c033c6ea99e5fa8bb3bbe4a10c SHA512 c608a26476db06359868d8b7e22e101b951678a3e0317d9659df65fc2832b903ac40ca318ddc9180830182de3a1b039fa8e545b8a2146b8d3121c3be75eaf1cf
+MISC metadata.xml 529 BLAKE2B 670e6d1d61b588eae2b125d19b96f5c145f5712f50e1ef067b38965653c0ca14807efb16b5e0b4ae851531cd4b93fa82c2bfd092958c2806079fb1972df846f8 SHA512 27269e7fa6fdcdbab3676c4940da7f1836c17a82efba1b00a233dbc753959b6ae17e8df9402c5a9467fe9b0336ce0cb7c325fa62d84a361f302621ed3cde77af
diff --git a/app-admin/doas/doas-6.6.1.ebuild b/app-admin/doas/doas-6.6.1.ebuild
index 013cb7f30509..d2d4191ca08b 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"
-IUSE="pam"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="pam timestamp"
 
 RDEPEND="pam? ( sys-libs/pam )"
 DEPEND="${RDEPEND}
@@ -33,5 +33,6 @@ src_configure() {
 		--prefix="${EPREFIX}"/usr \
 		--sysconfdir="${EPREFIX}"/etc \
 		$(use_with pam) \
+		$(use_with timestamp) \
 		|| die
 }
diff --git a/app-admin/doas/metadata.xml b/app-admin/doas/metadata.xml
index 90a63f874100..5646de6e7eed 100644
--- a/app-admin/doas/metadata.xml
+++ b/app-admin/doas/metadata.xml
@@ -9,6 +9,9 @@
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
+<use>
+	<flag name="timestamp">Adds support for "persist" feature (experimental)</flag>
+</use>
 <upstream>
 	<remote-id type="github">Duncaen/OpenDoas</remote-id>
 </upstream>
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index f72c70a4cabc..86e89f4b3e23 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,5 @@
-DIST exo-1.11.0.tar.gz 3805742 BLAKE2B 9b23e750545322510c56a3364b79a6a40c90c42a4bf41bcf1b23f77a5a90a9ff8944693e77fe4b4d9f9baec920af31528e52003d840f19e49911b441241c4400 SHA512 501752d896b0856681f5fc5d4072a0b7b3ac4c40c8a742ead26f94de33da374c43888e7112bcddebb37c3e02b3657e50c3f7d52097845cf8d38c1ebe31af6240
-EBUILD exo-1.11.0.ebuild 568 BLAKE2B ac4e2be4f39e1bfc63d5007b5940f334888b774773a073424992b3ae790c74375d2429869f56cf497c6629acdeec1ab2e79b049f3618f3469320b99071ee86c1 SHA512 e09154e545f36227c8dbf7785806f9c6710655dcce624b4585a30d78e11e8287b014d0434132691ac21d411f26ce2a9fae1dd28e9dded1184d6c8284e4026986
-MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
+DIST exo-1.15.0.tar.gz 4267440 BLAKE2B 5b5f38df929c538528084ecae8ae73f2c2486b2a3ad45c7c4ba55021680912490c90d820c72ac1e858caf023382b2de3a573a6e7f096b3b84abf3da237a3bca0 SHA512 d42887a24de2385acc7e66daab0c51b413304fd96589755874716702747aaea74ea0f080e334f2a4ebcf8b6c6699257f6e36e5ddf9acf9c7aca2693555edbfb2
+DIST exo-1.16.0.tar.gz 4245980 BLAKE2B 3215d001b6c0864e2798e34976e6c7c67c9e4457729a149280721d7cc00c648c273fc2bfd03d6678aad1ac7217d0d3a22dd6c53fcf7822c19410bb556a5d41f9 SHA512 ce75261e09f906030a2fbe7aae2f9aaa2bf631db0f6c8876f9e7baba6622026d2d127a6935fa5dfb9c1bffb4953eb0a7149c345a4eb9b9423e52047588442e74
+EBUILD exo-1.15.0.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
+EBUILD exo-1.16.0.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
+MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.11.0.ebuild b/app-admin/exo/exo-1.15.0.ebuild
index 8bdad808508c..0c2c8d861fe4 100644
--- a/app-admin/exo/exo-1.11.0.ebuild
+++ b/app-admin/exo/exo-1.15.0.ebuild
@@ -22,6 +22,15 @@ src_compile() {
 	go build -mod vendor -o ${PN} || die "build failed"
 }
 
+src_test() {
+	# run at least 'exo version' for test
+	./exo version > /dev/null 2>&1
+	if [[ $? -ne 0 ]]
+	then
+		die "Test failed"
+	fi
+}
+
 src_install() {
 	dobin ${PN}
 }
diff --git a/app-admin/exo/exo-1.16.0.ebuild b/app-admin/exo/exo-1.16.0.ebuild
new file mode 100644
index 000000000000..0c2c8d861fe4
--- /dev/null
+++ b/app-admin/exo/exo-1.16.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line tool for everything at Exoscale: compute, storage, dns."
+HOMEPAGE="https://github.com/exoscale/cli"
+SRC_URI="https://github.com/exoscale/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+QA_FLAGS_IGNORED=".*"
+
+S="${WORKDIR}/cli-${PV}"
+
+src_compile() {
+	go build -mod vendor -o ${PN} || die "build failed"
+}
+
+src_test() {
+	# run at least 'exo version' for test
+	./exo version > /dev/null 2>&1
+	if [[ $? -ne 0 ]]
+	then
+		die "Test failed"
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-admin/exo/metadata.xml b/app-admin/exo/metadata.xml
index 4eceb317f22e..d29e9638f434 100644
--- a/app-admin/exo/metadata.xml
+++ b/app-admin/exo/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>ago@gentoo.org</email>
-		<name>Agostino Sarubbo</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>ago@gentoo.org</email>
+    <name>Agostino Sarubbo</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">exoscale/cli</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-admin/gentoo-rsync-mirror/Manifest b/app-admin/gentoo-rsync-mirror/Manifest
index 5a6f95d227ce..9f353143aee9 100644
--- a/app-admin/gentoo-rsync-mirror/Manifest
+++ b/app-admin/gentoo-rsync-mirror/Manifest
@@ -4,4 +4,4 @@ AUX rsyncd.conf 611 BLAKE2B 2842f2fe86d3d84e6385d979337a523db12fa8f39316652d2cc0
 AUX rsyncd.motd 44 BLAKE2B 764e92b05ece7c7c114106e3cb634cce9383b96b7e076b2cc95217aba5eff6a849e32da1acd2d1cb34316b81701ecf4c7b09bc304e43eff992014128048170bf SHA512 812c0e738274222e65e5bc57379ebc6150c232cd8bf98e72b500763828bfcfa45fb8e89c7cccd5e34685f4e5d4787d9cd2ab03ace64bc76f5c5416deb03c17f3
 AUX rsynclogparse-extended.pl 3476 BLAKE2B 230fc0a15cb5341f3bbf1455b86e5bd0a92bd12eaf5d8ece373bfcac0d1b45b310b0a3194d2200676b351e5b5931be51319801b1e5df87cb7d41c799447dca8a SHA512 60656deb0e501c51c4a37d2f9cce2829faea830ae42d1f33db52f37b337b71a125b7d350e893fb6098b405e1439cbde160d9e7ecda3ebd8a8f8c34b84acf80b3
 EBUILD gentoo-rsync-mirror-1.0-r5.ebuild 1978 BLAKE2B ecea9be8d187fafe4ef4b82f4d04840c094ba6ae5871afd568dc729dee512657f16d24bab1f19431cbe74a45bb1e9c1efccedcf9c8aa9dced8755cee73254d67 SHA512 f2585fa372d66066d63255cb48bb2d8702c65acb376042c349cba5a064b14aae4dc963c04bed3777525593554b4a86cbbc5a56b9b8fcda6373130983d9722d7e
-MISC metadata.xml 365 BLAKE2B e228fe06455e1d2619852d44b50a114e425c0cd1027877b01a4920186d50a6ee1ca39742f75d33cc3ea6fc7bc45744c9c0667582881534793090c974cfa8be72 SHA512 7fce97c62f40d7472b6fedb12be020aa53037a4049885c1ec6c2735b419b3f40462a848360fb33db65aedf2b829d491f2fa521b82ac158b1d15cec115b524115
+MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/app-admin/gentoo-rsync-mirror/metadata.xml b/app-admin/gentoo-rsync-mirror/metadata.xml
index 45969df9b143..585b0dc75dda 100644
--- a/app-admin/gentoo-rsync-mirror/metadata.xml
+++ b/app-admin/gentoo-rsync-mirror/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rgkmg25@gmail.com</email>
-		<name>Robert Kowalski</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
+	<!-- maintainer-needed -->
+	</pkgmetadata>
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index f1af8be0e986..9f07d918b839 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -14,6 +14,7 @@ DIST github-backup-utils-2.17.0.tar.gz 89926 BLAKE2B 82e89d616f78d630a4c537ad110
 DIST github-backup-utils-2.18.0.tar.gz 90357 BLAKE2B e9f6c155246914a36d26ec8cddf4a1e9feca73b3450ceb8e6df11df7c077b86f18cfa23b51e77425ba4e28ce4a3664200c1ddb15e6eb856d6b8930379dd3e348 SHA512 1778bf4cf404444e567f9f6b98bcd01bf9880939b4645692d75dbf10e7b31b40678521b66fbdabfedef648561f34709492b7860ce16442757e161db2ffda45a2
 DIST github-backup-utils-2.19.1.tar.gz 90260 BLAKE2B 403feca60cc6037a2fbcb4cc467520fb3283916fdc78e16e960656b695e1c55341c55e74fe246c56fbc2cd86a85e33bcede4d94132adaa446ea48ed8f3f75022 SHA512 60155021d23eadc5ab1ddcadf95dbab43f19456c0e7ef34e93c75d173c1279b354c7019b304d72cabcac674edbd0c4a0c4e50c08606a8559ea662858a9cdb206
 DIST github-backup-utils-2.20.2.tar.gz 92628 BLAKE2B a6c9fb91b005d20b15ce0b2fc289a145bbfd8316aca4511300cda8a9f1b1e52afb9619a9f467e6e87eec673244776a0bf469d0d4a4c608af0f462eae7a06dc44 SHA512 0d2c56fd2e98c8f858cf3a03e2c2d84c20555716d015cdf1f0a789171cb6ea301050a41d1314a15316258f3f159123ba21526c1fd69cba548e8f259c70a92ab9
+DIST github-backup-utils-2.21.0.tar.gz 89907 BLAKE2B 4261d127a73bc4701521f6c5078444c38b3d97ac4ab883f644e02057090b8a53b6c86849b988175416b6fb0566327b9938f28887417fef109dd59c1b246cf961 SHA512 fc037d180ce6cb238d4613583a1551256ffbc58ec8276945905c0127fb6e29f7d547dfdcbec30bb581202ce0447365642218e18ed8865f01e76037898d0a5126
 EBUILD github-backup-utils-2.10.0-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
 EBUILD github-backup-utils-2.10.0.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
 EBUILD github-backup-utils-2.11.0-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
@@ -32,4 +33,5 @@ EBUILD github-backup-utils-2.17.0.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d
 EBUILD github-backup-utils-2.18.0.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
 EBUILD github-backup-utils-2.19.1.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
 EBUILD github-backup-utils-2.20.2.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
+EBUILD github-backup-utils-2.21.0.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
 MISC metadata.xml 448 BLAKE2B 8f3322a1e551345100a70421c1fcd9d56b8750e425ab6e579ceab918858df09c6aec520898d1897066596df231f983b3384441e7edc9e8350ac19ebd3d69462c SHA512 ae28e31312c3dba5d71fd4bd6c7ed6adc171a250473d09a6646d13de2cdc0d78ff4b1ca389c04717b789d500e7c269d49aef32a785ab4bdbc073c30bffa5eba7
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.21.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.21.0.ebuild
new file mode 100644
index 000000000000..9a251dd782d8
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.21.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	sys-apps/moreutils
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+
+dodoc -r docs/*
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 916b4ef5908e..d52db2b73d04 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD glance-20.0.0.ebuild 5120 BLAKE2B 57726e39e70d1025aacccee7fbab27b44950c0d2f839ab87b4763fa794fea4475e703862845a0e662130fb1e29acda34f80f645fe68d244ee5e0037b1750cd93 SHA512 79d5affed676e46184fec436a2365dbc2a7116c9e1b6324b66c24ff95ae91f8c7c48893283af0c4b05beef14ca0e7dbfca7c91ab1ab274dcf3213d7bdcab70cc
+EBUILD glance-20.0.1.ebuild 5122 BLAKE2B 4e731fb4675b2250a15be86bd595cbb7f84f8e92e0ffbb1837d4939855069a6ea4d831e630ce1e91e83825dae9d469c6177289b1fe630d6c2b2cef37bb0b17b4 SHA512 c8bafc6142bf74d9bb79de44c565347ae90ecb504dc5247c0281152e64492b29f25ff62eacc06dd2a1b1ed67f511ab3390f368ba3d7037460da82f79c4703fa3
 EBUILD glance-2020.1.9999.ebuild 5122 BLAKE2B 4e731fb4675b2250a15be86bd595cbb7f84f8e92e0ffbb1837d4939855069a6ea4d831e630ce1e91e83825dae9d469c6177289b1fe630d6c2b2cef37bb0b17b4 SHA512 c8bafc6142bf74d9bb79de44c565347ae90ecb504dc5247c0281152e64492b29f25ff62eacc06dd2a1b1ed67f511ab3390f368ba3d7037460da82f79c4703fa3
 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
new file mode 100644
index 000000000000..3136ae3593d4
--- /dev/null
+++ b/app-admin/glance/glance-20.0.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+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/ussuri"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/defusedxml-0.5.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.22.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.25.0[${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/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-2.6.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-4.27.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-1.0.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_compile_all() {
+	if [ ! -z ${EGIT_BRANCH+x} ]; then
+		use doc && "${PYTHON}" setup.py build_sphinx
+	fi
+}
+
+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*
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	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 95ed3478383d..8e44d22bfe92 100644
--- a/app-admin/gnome-abrt/Manifest
+++ b/app-admin/gnome-abrt/Manifest
@@ -1,6 +1,5 @@
-AUX 0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch 4329 BLAKE2B 408bd52cd8a7ae8ae60a938da810a2af35556111791f330887d7c6f9af1f27eb50a4efa4f646144fb3e2483398f7e4af21afb4b587f6068a5764004d0efdfca4 SHA512 e7c505da3355a721c38d043fd0dc7397f664d90f1c243203a5055dfeefde7b8aafe02a8bd3acb22ba32941740e4aab38873fa75178ee1d4776a2da182e6b2033
-DIST gnome-abrt-1.2.6.tar.gz 340308 BLAKE2B 5221fe43fd72fe8798f2c11275863e6936e616632641448c53dd24118d3b6b808fc373fe98b8775f1f1c58820c06195a665f6d417c95eaa7cc333cd7660b2d0b SHA512 12bcdeefa481b7caa04da046ee11d6adc9fd582b32f709d79a2d94cf61ca02643edd418cd9257c0f732a30aa5714fe83a282a4c794ff4260ddad038f7721ff2c
 DIST gnome-abrt-1.2.7.tar.gz 339961 BLAKE2B cdacc079c4661c364f13af3102e2231adbeaf4226ba937436f5ce3ae109f28b87c9424c6dfbc016b912599205386f92c32b036ca31adbea79b9a54d7f3a27c4a SHA512 57446b1c1c312f3a47ea3dd2a40ac1d4ec5392df3181eac73086675b65d45cad9a01fba5252d073970878ef97d7d272508bc5b86a56779543ffdc8d083fb5413
-EBUILD gnome-abrt-1.2.6.ebuild 1297 BLAKE2B d6afeb893e9c9733c0ca7f55e80bc24c76195244afe699a9efb662816a6b0667a8697f95f8d5156631f051b4b419fa9da3453871e288bdd1d6ab9dd2818d13d6 SHA512 183486b2d92ace64b16183e7fa35a44424bbb25eebe9a65cd2a94b9f03b305d7742838580bd700317e861a9e2b8b80d96ff25f38f66d33e9b06cb4e7a8d6e50d
+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/files/0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch b/app-admin/gnome-abrt/files/0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch
deleted file mode 100644
index 21d088efab4f..000000000000
--- a/app-admin/gnome-abrt/files/0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From ab72d64818a5d88ceb4ab94f1eaae04268519e73 Mon Sep 17 00:00:00 2001
-From: Rafal Luzynski <digitalfreak@lingonborough.com>
-Date: Mon, 21 Aug 2017 11:55:41 +0200
-Subject: [PATCH] Remove Expert mode and the remaining Analyze code
-
-The Expert mode was originally introduced together with the Analyze
-feature by the commit 532cbd4. The Expert mode was intended to hide
-the Analyze feature by default and show in only when the Expert mode
-is on. Later the commit f5eb93f removed most of the Analyze feature
-although some of its code still remained and was unused. At the same
-time, probably by mistake, the Expert mode was switched to control
-the visibility of the Details context menu item.
-
-This commit removes the Expert mode which is unused and implemented
-incorrectly and any remains of the Analyze feature. Closes #182.
----
- src/gnome-abrt                  | 3 ---
- src/gnome_abrt/controller.py.in | 7 -------
- src/gnome_abrt/oops.glade       | 8 --------
- src/gnome_abrt/views.py         | 7 -------
- 4 files changed, 25 deletions(-)
-
-diff --git a/src/gnome-abrt b/src/gnome-abrt
-index f8e96e8..b1044d3 100755
---- a/src/gnome-abrt
-+++ b/src/gnome-abrt
-@@ -401,8 +401,6 @@ if __name__ == "__main__":
-             help=_('Be verbose'))
-     CMDARGS.add_argument('-p', '--problem',
-             help=_('Selected problem ID'))
--    CMDARGS.add_argument('-x', '--expert', action='store_true',
--            help=_('Expert mode'))
- 
-     OPTIONS = CMDARGS.parse_args()
- 
-@@ -414,7 +412,6 @@ if __name__ == "__main__":
-     CONF = get_configuration()
-     # TODO : mark this option as hidden or something like that
-     CONF.add_option('problemid', default_value=None)
--    CONF.add_option('expert', default_value=(OPTIONS.expert))
- 
-     APP_CMDLINE = []
-     if 'problem' in VARS:
-diff --git a/src/gnome_abrt/controller.py.in b/src/gnome_abrt/controller.py.in
-index fc16dc2..86db419 100644
---- a/src/gnome_abrt/controller.py.in
-+++ b/src/gnome_abrt/controller.py.in
-@@ -45,13 +45,6 @@ class Controller(object):
- 
-         problem.delete()
- 
--    def analyze(self, problem):
--        if not problem:
--            logging.error("BUG: Controller: Can't open detail of None problem")
--            return
--
--        self.run_event_fn("open-gui", problem)
--
-     def _refresh_sources(self):
-         for name, src in self.sources:
-             try:
-diff --git a/src/gnome_abrt/oops.glade b/src/gnome_abrt/oops.glade
-index bbb732b..b8ddb42 100644
---- a/src/gnome_abrt/oops.glade
-+++ b/src/gnome_abrt/oops.glade
-@@ -23,14 +23,6 @@
-       <accelerator key="Return"/>
-     </child>
-     <child>
--      <object class="GtkAction" id="gac_analyze">
--        <property name="label" translatable="yes">Analy_ze</property>
--        <property name="tooltip" translatable="yes">Open selected problem for analysis</property>
--        <signal name="activate" handler="on_gac_analyze_activate" swapped="no"/>
--      </object>
--      <accelerator key="Return" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK"/>
--    </child>
--    <child>
-       <object class="GtkAction" id="gac_detail">
-         <property name="label" translatable="yes">D_etails</property>
-         <property name="tooltip" translatable="yes">Show technical details</property>
-diff --git a/src/gnome_abrt/views.py b/src/gnome_abrt/views.py
-index 82b606f..ec7b211 100644
---- a/src/gnome_abrt/views.py
-+++ b/src/gnome_abrt/views.py
-@@ -527,7 +527,6 @@ class OopsWindow(Gtk.ApplicationWindow):
-         conf.set_watch('T_FMT', self._options_observer)
-         conf.set_watch('D_T_FMT', self._options_observer)
-         self._options_observer.option_updated(conf, 'problemid')
--        self._builder.mi_detail.set_visible(conf['expert'])
- 
-         # enable observer
-         self._source_observer.enable()
-@@ -1002,12 +1001,6 @@ _("This problem has been reported, but a <i>Bugzilla</i> ticket has not"
-                     selected[0].problem_id, self)
- 
-     @handle_problem_and_source_errors
--    def on_gac_analyze_activate(self, action):
--        selected = self._get_selected(self.lss_problems)
--        if selected:
--            self._controller.analyze(selected[0])
--
--    @handle_problem_and_source_errors
-     def on_gac_report_activate(self, action):
-         selected = self._get_selected(self.lss_problems)
-         if selected and not selected[0]['not-reportable']:
--- 
-2.13.6
-
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild
deleted file mode 100644
index bdd38d68cccd..000000000000
--- a/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools gnome2-utils python-single-r1
-
-DESCRIPTION="A utility for viewing problems that have occurred with the system"
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
-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
-	>=dev-libs/libreport-2.0.20[python]
-	>=app-admin/abrt-2.10.10-r1
-	dev-python/pygobject:3
-	x11-libs/libX11
-	>=dev-python/pyxdg-0.19
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17
-"
-
-PATCHES=(
-	# From Fedora (fixed in next release)
-	"${FILESDIR}"/0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch
-)
-
-src_prepare() {
-	default
-	./gen-version > gnome-abrt-version || die
-	eautoreconf
-}
-
-src_configure() {
-	myeconfargs=(
-		--localstatedir="${EPREFIX}/var"
-		--with-nopylint
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild
new file mode 100644
index 000000000000..b9ff00b24a57
--- /dev/null
+++ b/app-admin/gnome-abrt/gnome-abrt-1.3.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson 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="doc"
+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}]
+	>=dev-python/pyxdg-0.19[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-text/asciidoc
+		app-text/xmlto
+	)
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc docs)
+		-Dlint=false
+	)
+
+	python_foreach_impl meson_src_configure
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_install() {
+	python_foreach_impl meson_src_install
+	python_foreach_impl python_optimize
+}
+
+src_test() {
+	python_foreach_impl meson_src_test
+}
diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index 8394d0a85dde..c56c05802879 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -1,5 +1,5 @@
 AUX graylog.confd 521 BLAKE2B b776c8c834358a426aab6e67b894ab3fc8e07b5d6d24f506312f41e76ea36bd39398d1eb424cf9f3fff633a26acb8af54dccd4a19642b55bf18d91fe92aff31c SHA512 3d8c3b6128f839809f14c7a1f2683ed5ac273efbabb1e0f50a2e9e90ef6c7cdc481bd84ef3372bf10f288b08f2b850a80d917838e057545851d3113c8f877512
 AUX graylog.initd 825 BLAKE2B bfcd79f71d996ca1761a79119f8ca29e531dbd9a40411c0c13b0628ebb8caea6c69e72adb3102369ffe41721acfef5ba2656689fd10ee0cae591291e9d20cd1e SHA512 e55477329fe5045b85451abd695d13cb6d67cf0b75f0f786503c6fba850d0cae9e853fb976dae35e65f570fda625bc8984714a0cdd6c23801c917184dc5a32f2
-DIST graylog-3.3.1.tgz 129279195 BLAKE2B b3894a453d369f200951d260c0229cec7dbbeb01fcd5df1d8be354c0669c32c1ae3f435a7bad2fc92823f2408fd6e06eded19a56442d6eaa636bd8401f8573a9 SHA512 9e99784e4c349965aafae8c153bd843007dadf664febe7088cfa7561568841d6acb73592d5f57feaece683ea667a535124cdd49e6ed3a05bab13d07239c8b3dd
-EBUILD graylog-3.3.1.ebuild 2255 BLAKE2B a8e39a5ba451672d598fa6317231e411e0127855252272d67fd90433b16801356cb08683fe0e709d331301251402822c9d22c8e5589f93dfcaabf8e31106a2c1 SHA512 7207cc432927cef54445fc5af8626fecb8679efb26d09dc7fa05149fec3c10e66799458f003069ed99ce65ee7a75c3d4b0427115b33701f2c47ba3ccb6c7f254
+DIST graylog-3.3.3.tgz 129284019 BLAKE2B 35c8dec3becd0cd513e435fec38c296e40a0c330304effb40e40f656702cd791c68ca9c814baf45671d7494d16d4478f9a0b3e44812c4814bea8dc1213f06793 SHA512 6e7445d1bac5addfe4e09f22ba2425859b44720105ba61ec2d819d12a8d693789f717d6fc1bdacb0ef1fe2e4583c405689a60ddd250e4fa17d1d10e70020f75c
+EBUILD graylog-3.3.3.ebuild 2255 BLAKE2B a8e39a5ba451672d598fa6317231e411e0127855252272d67fd90433b16801356cb08683fe0e709d331301251402822c9d22c8e5589f93dfcaabf8e31106a2c1 SHA512 7207cc432927cef54445fc5af8626fecb8679efb26d09dc7fa05149fec3c10e66799458f003069ed99ce65ee7a75c3d4b0427115b33701f2c47ba3ccb6c7f254
 MISC metadata.xml 584 BLAKE2B d19e09582932c7986c85059766f2a845c0e85d214b9af6c61d9c26005e31c208a8ab59e6d82e5870162314c2cb4a9d3e852f12c02551d399c1eb3063449501bb SHA512 c32525442e20550c7e3b0ac8b74d896f35b2de1e87d57befb152047840bf4811c8df135f828b1c95505b4a348f25478cd7b2b186c36f93c6055086437f257505
diff --git a/app-admin/graylog/graylog-3.3.1.ebuild b/app-admin/graylog/graylog-3.3.3.ebuild
index cda5c7e5b52d..cda5c7e5b52d 100644
--- a/app-admin/graylog/graylog-3.3.1.ebuild
+++ b/app-admin/graylog/graylog-3.3.3.ebuild
diff --git a/app-admin/gtkdiskfree/Manifest b/app-admin/gtkdiskfree/Manifest
index ccf70fa2bc2b..fb93904fb058 100644
--- a/app-admin/gtkdiskfree/Manifest
+++ b/app-admin/gtkdiskfree/Manifest
@@ -1,6 +1,8 @@
 AUX gtkdiskfree-2.0.1-desktop-file.patch 625 BLAKE2B 10b93171126c229a6ac4cbf832e90f7a839dfeca74068f61c4c779e001a4c10fc2fdc77fec9a25b19ae60b81488e130ee2e6a0e3b42d015eafbc823472d53fe9 SHA512 f32414d978a9f12d21828024bcfdbaa9046ca68bfe7e197563a32372d892e3562bba8e32756b7fc42891ed49b3a7ee111ae96c5a8e453a1bf8edc22bc53825c8
 DIST gtkdiskfree-2.0.1.tar.gz 354661 BLAKE2B 39731b38eedf92554303fa8f6784c1cc9c6f1843f5c62c8b6e269856198440a0818a913a7cefedc8b8667167974e3b2d269dc35a1465213b5d6cb4db62399ce8 SHA512 ec202cc79dc80fb66fdf028b6a89610344bb76d7cbe09563f5f47ae072bed791e395d9d1389954046c25e882587d3685b14db4e871e26244045beabb8b579de8
 DIST gtkdiskfree-2.0.3.tar.bz2 216189 BLAKE2B 146dae89b0f66328840f22bd7b9e8ad751759dea3a67c332d71e513388be46122cb761fec6229258b63e85c726ee889e04a56d405437904f1eb8060ea31ee88a SHA512 c6f093ff023cb8c67090b3bd3660a998163e786b08386f346bdc1aa7b29e030a31cfb0ef54c55f109f211bf045f90afd20558b91849a4f82d041c99532f170fe
+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
 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
new file mode 100644
index 000000000000..cfaa632c8975
--- /dev/null
+++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.4_p20200224.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Graphical tool to show free disk space like df"
+HOMEPAGE="https://gitlab.com/mazes_80/gtkdiskfree"
+COMMIT="bdda379b9109a226a37801505a19da91494144a6"
+SRC_URI="https://gitlab.com/mazes_80/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk2"
+
+DEPEND="
+	dev-libs/glib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	gtk2? ( x11-libs/gtk+:2 )
+	!gtk2? ( x11-libs/gtk+:3 )"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	if use gtk2 ; then
+		econf $(use_with gtk2)
+	else
+		econf --enable-old-color-selector
+	fi
+}
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index a1e97f6a2fda..cfc949ebf98f 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -3,9 +3,9 @@ DIST haskell-updater-1.2.12.tar.gz 26708 BLAKE2B d0b040cb3b6211b3c5c60f8cfa3dbcc
 DIST haskell-updater-1.2.9.tar.gz 26675 BLAKE2B a3d11cdcee886a07d87cd2888a9deea1d963b7234b4a10a6b78e9467fae4e9382c92f14a6ba0593f86bf9422ab2cb4bec823de96f34b463590ae18429c118edb SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da
 DIST haskell-updater-1.3.1.tar.gz 26573 BLAKE2B 68e5357e8f24b9b372dba4feac76595cbf35602d9d9094d616497c9d0040177b5f1def5833770041b693220717f3a4976877e0608858d5d8d4dddd26620c71e5 SHA512 39c36c4a8997806bb4d64625bc9ed72334a68e57f8c32f75d0c3704ab52b3b68605444c89480e5186c04bb275b3608ea9544366ebc5a00e010cc5fb4ae8296df
 DIST haskell-updater-1.3.2.tar.gz 26133 BLAKE2B ea72850e5ca35ec18fa00136c654435a852b072aea0402003c962abbb0e0f09e8a84568f78c9186324b0b0ee9658de1b413670e268cfe1c0056810b8c61b479c SHA512 a4d80ecb65efa9ae21008e04b1363ff2196df4ba431fc5ec899bb9904c598c7a109a38f7dd86dd2dc86faca8ed5083d036d700e7f7796840ee5470401c24f3d9
-EBUILD haskell-updater-1.2.10.ebuild 1039 BLAKE2B 6e76a5fd6bf42e3f6e10fc293a283ba26e2a17571b9608c8b4e8d775878a1d390d73539788feffde08a659869c21d3c3b4e8dac8d546ecf4b876b79f5683eb88 SHA512 f5cc5affd18acc5c735cf29939ed9013f84a6d5f6ca3e1dff775e0cf421c614a326122141183808bc9b9ddfab87a035076add131c9d1cd418a8864dd3b8bccfa
-EBUILD haskell-updater-1.2.12-r1.ebuild 1049 BLAKE2B 7cc728396ef3232a7183362dee5e8ef7ce5be997183b25e15d2527b84d73c0bf8d3883a6397518d90092778aa91803bfec54e5bf0c740a7d51f134a9ce8d3c41 SHA512 956462c04a22c5172c0ab777e0c42510ea4c1cd4de6c40478a2dcf98f7cc0a373c4b123f64e1c0d0d6cad2c83df04a5ef6f1ce725d3a8a03fc087efbad553f74
-EBUILD haskell-updater-1.2.9.ebuild 1039 BLAKE2B 6e76a5fd6bf42e3f6e10fc293a283ba26e2a17571b9608c8b4e8d775878a1d390d73539788feffde08a659869c21d3c3b4e8dac8d546ecf4b876b79f5683eb88 SHA512 f5cc5affd18acc5c735cf29939ed9013f84a6d5f6ca3e1dff775e0cf421c614a326122141183808bc9b9ddfab87a035076add131c9d1cd418a8864dd3b8bccfa
-EBUILD haskell-updater-1.3.1.ebuild 1060 BLAKE2B b6c3ab746c661e1766a6eae10225c800223c2e71f8c24d4d9394257e5728922a97f5eb663f5b68cec21c982d4d619837706ef9a6c2398ce900d95767e6d6fd62 SHA512 d871ad63a9fb5a8d7a26bb22cbf8541368c27e79e57acb854d35c6bd0b1d89871cb82daff1185869598eb28140b54e1320693b68ad19e055db034f1ced30574e
-EBUILD haskell-updater-1.3.2.ebuild 1060 BLAKE2B b6c3ab746c661e1766a6eae10225c800223c2e71f8c24d4d9394257e5728922a97f5eb663f5b68cec21c982d4d619837706ef9a6c2398ce900d95767e6d6fd62 SHA512 d871ad63a9fb5a8d7a26bb22cbf8541368c27e79e57acb854d35c6bd0b1d89871cb82daff1185869598eb28140b54e1320693b68ad19e055db034f1ced30574e
+EBUILD haskell-updater-1.2.10.ebuild 1027 BLAKE2B 50859793aa557110a1120aff3f22b7841318502f4c710851246c1847df505f02af7323711cb51249f7774cb452c1c6207b989e96de50acb76e87887350ef5a68 SHA512 ddd96b11e6da8006c488cecb95aae19473f1490de6e8cc7adc9ab58d44600054caa3bf8015f84f53bd806d3035dcb7db48c2b7b26ca04d57e9d85e1ad728a8f7
+EBUILD haskell-updater-1.2.12-r1.ebuild 1037 BLAKE2B ef35b3e4d5f936770a7ecefb3d94971078031298fe832fb5c56e2004dd476030b5e0742ea29dff976a59e7aa895062cecc494ae5953e49dbf5836ed536e93bbe SHA512 979671949e1ed11cfece3f0bec2ca8baf634c303fa7f61e2aea56a2d60f2f6692c548716172bf1caa3ba4f626bfb5100cf61be47f1758e2ddf0cd6bd65fb3f11
+EBUILD haskell-updater-1.2.9.ebuild 1027 BLAKE2B 50859793aa557110a1120aff3f22b7841318502f4c710851246c1847df505f02af7323711cb51249f7774cb452c1c6207b989e96de50acb76e87887350ef5a68 SHA512 ddd96b11e6da8006c488cecb95aae19473f1490de6e8cc7adc9ab58d44600054caa3bf8015f84f53bd806d3035dcb7db48c2b7b26ca04d57e9d85e1ad728a8f7
+EBUILD haskell-updater-1.3.1.ebuild 1048 BLAKE2B 43bb858e8a653c0feb06b3f4dbbfaff1f3facee0e3d04242e0d618423d63baab1cfb816607417881bcabcb8beb3ffa112dde18e15c3138745141b544d1cda07a SHA512 8c5f336bc8998af7d5381a949e7de202a9b1e04309e13c0cc2a5de720fef9383b967dae565a4fcdd9221ca83dd0bb1c07132adba1786290d4a93e1319a1502c2
+EBUILD haskell-updater-1.3.2.ebuild 1048 BLAKE2B 43bb858e8a653c0feb06b3f4dbbfaff1f3facee0e3d04242e0d618423d63baab1cfb816607417881bcabcb8beb3ffa112dde18e15c3138745141b544d1cda07a SHA512 8c5f336bc8998af7d5381a949e7de202a9b1e04309e13c0cc2a5de720fef9383b967dae565a4fcdd9221ca83dd0bb1c07132adba1786290d4a93e1319a1502c2
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
index 0ca325522f80..83ccef6f2133 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
index 8960ea72edd6..200a5286f8ea 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
index 0ca325522f80..83ccef6f2133 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
index 680c8dd7f70e..7bab96460e78 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
index 680c8dd7f70e..7bab96460e78 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 8cfb6c7b2a0d..8ba5e3d9b4bf 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,5 +1,5 @@
-DIST hcloud-1.16.1.tar.xz 649100 BLAKE2B a019f21d8c87dd47fc3c2eb069576fd367c1dd6dac7a5909f76a9c31fe9922e93ba4e1fdde3bd86dcbdb25bb2cf84b1eaddd9c7e6b62bb08647ba9d7a804e06a SHA512 e8a4e3d9c883b009eea98443716264115d55b93b212b0a0df64316f63310210a3812b3948d16f822b6f8f32d029029da5b51be7b7561d9396f28a406061a507c
-DIST hcloud-1.16.2.tar.xz 678408 BLAKE2B 01d10032b93295ac5e255103b38023b323b545cb30f78cbd9e6a0dc392579c94142b9c7575e383c5dbd5e88fb17ca1b51419df014782d517f4392683e987c9a5 SHA512 74902f212ebd432d4bec8c566a13daddf38349989e3329b62d75f332941930b55839392efcb7d9e8081700352505def9912220b228f45b92a4a3e853b8091722
-EBUILD hcloud-1.16.1.ebuild 575 BLAKE2B 4432457e8824363aa6bc32d8d21a9e7c22c71f5fffc858a1fafef0a08466c18db4e2c6f196b5bc3d620ce1b0bc53fea19870aa9a416d104f7fd90a4c5e067b88 SHA512 d9486ff215bbf69d438aa36fb1d3ad387f958697096835134961b4a7ea3b0b191138848c65d660f796be3eb8a154b54bcf4d677479cc14fcedaec181d336293f
-EBUILD hcloud-1.16.2.ebuild 713 BLAKE2B 64b198fe517c5b6d22fb6024249e86236336cdb4cd7dda78f252cb3bad4af5e7f279358f8370d00fc4013b03331515ff8439aa82cf42f12cc05cafb532d07247 SHA512 dfdddb5e8356d7bfa8a641ea6f2e75747f0e0812a924f9b0e2517c5b6cf7f1e59769d336a37de8eba4eb03230746cc0bb15cab76e47957795a69ae465a96d978
-MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
+DIST hcloud-1.17.0.tar.xz 687880 BLAKE2B c83530946dd04afc59d45a2bbb12b6a4034dfe5b8c3826e4e78f29e88891672c21e896fd9d24394ce943f9b6574928ae144a564abde3fec8a243cc5fc87e8bdb SHA512 5025357392e9b7661876f059a416e6d6f9eea89e16a9abaacaeb72506aaa5d4d6a193e266d23f01cd0f5d32048f66a3f6e22a1c9c042c2e3183a1e164da2ccc6
+DIST hcloud-1.18.0.tar.xz 691988 BLAKE2B 1d0d6cac56cefa9023796f259fce238952766e038568d843259845d8ebeb040b75dab9dc18908003fba1a10fc76fd45936e46db50536e26dd90a47354feba34a SHA512 39b09b5b79f1e8715fbc17c8576e51955b7729032385fd1aed3f171c56d041d0576dc99662fc9e222f5fe1837a4fddbd57cd406d98fd38a5b9eb116d2a83af3a
+EBUILD hcloud-1.17.0.ebuild 712 BLAKE2B 989221cd61ab4500042665da2679e7f611c9a7db8ce4f38ce81ee40be0d292c4be438846cf643bc056f3785889adba86765a6ee7845ec66cac15481933d9b8ce SHA512 761fa5b38c983a29cd12c069d1c79b141f88b077071351935b670c87e5534a96c9436c8dbd4479ef8401811539c2ab5124b62fc0eccb07a53a85980f9b6622a5
+EBUILD hcloud-1.18.0.ebuild 713 BLAKE2B 64b198fe517c5b6d22fb6024249e86236336cdb4cd7dda78f252cb3bad4af5e7f279358f8370d00fc4013b03331515ff8439aa82cf42f12cc05cafb532d07247 SHA512 dfdddb5e8356d7bfa8a641ea6f2e75747f0e0812a924f9b0e2517c5b6cf7f1e59769d336a37de8eba4eb03230746cc0bb15cab76e47957795a69ae465a96d978
+MISC metadata.xml 337 BLAKE2B b05bca1fb33b8d8d66798d3fa410b5a00bd63fc245d29c76d812415dcfd38d6e86187c5ea74500debdac3715b559289881b4bcb5cdb1dc4d1ffcde409d666b6b SHA512 e3b82ce2611ece38238d64baa5424f680c406cfa491037024af80dbb3b2e9e6737ab5756d732852b6749a132aee61701116515fd3fb52c597ceea255534c7f2a
diff --git a/app-admin/hcloud/hcloud-1.16.1.ebuild b/app-admin/hcloud/hcloud-1.17.0.ebuild
index b9a221da60b3..8d044f742d31 100644
--- a/app-admin/hcloud/hcloud-1.16.1.ebuild
+++ b/app-admin/hcloud/hcloud-1.17.0.ebuild
@@ -20,6 +20,15 @@ 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/hcloud/hcloud-1.16.2.ebuild b/app-admin/hcloud/hcloud-1.18.0.ebuild
index bdb4bb4366ef..bdb4bb4366ef 100644
--- a/app-admin/hcloud/hcloud-1.16.2.ebuild
+++ b/app-admin/hcloud/hcloud-1.18.0.ebuild
diff --git a/app-admin/hcloud/metadata.xml b/app-admin/hcloud/metadata.xml
index 4eceb317f22e..ccac8a094992 100644
--- a/app-admin/hcloud/metadata.xml
+++ b/app-admin/hcloud/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>ago@gentoo.org</email>
-		<name>Agostino Sarubbo</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>ago@gentoo.org</email>
+    <name>Agostino Sarubbo</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">hetznercloud/cli</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 7d3f9970cb5e..8bfdce311d8b 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -843,6 +843,7 @@ DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3
 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 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
@@ -888,5 +889,6 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb
 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
 MISC metadata.xml 322 BLAKE2B b452dfaecaf6b32e7fc334ddb00444d739a618898f8e0d6905e8b3191acc7f0fc5e3929345405d86f9ab56e8ad80fbcd1dd46a0ea3ff5aaa2bb9f56407d10234 SHA512 ef4bb714213346e60a2a39833d0ab1987e10d2b34460a053b479775163e8778021ef3da63a8f5fede055281298dab88309a796cf3ad650c2d3ddeb17a7b0b4be
diff --git a/app-admin/helm/helm-2.16.9.ebuild b/app-admin/helm/helm-2.16.9.ebuild
new file mode 100644
index 000000000000..0a0305fee7b9
--- /dev/null
+++ b/app-admin/helm/helm-2.16.9.ebuild
@@ -0,0 +1,167 @@
+# 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=8ad7037828e5a0fca1009dabe290130da6368e39
+
+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/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 1c5998827b55..5b9dc132ce78 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,9 +1,9 @@
 AUX keepassxc-2.5.2-ccache_switch.patch 2274 BLAKE2B 640bd0bdbd56aa93a3f7d70b4827b50639bcf6cea1cb0339ec78b91cbd4ab7c364bd36353ccc02e88b438566ecbad6545124bf5fd89c2c8e766c723e278ba1c9 SHA512 5b43fe2e5dea3ff3626ae4b75faa8aa4666a2703d08a30c4a18fd2b1079a73ad033d8788f05e28b860f51ef42e9f1a65253319b9d8fe0c34ec058b9ffb59dfea
-DIST keepassxc-2.5.3-src.tar.xz 6839148 BLAKE2B b3cc32f9abb42e662edec0c28967fca65a4f3c794f70bfe6c40c39375cad8cbc35eba95431b33119268230a324f83f2e5a53186ee8fc64cd366e20eac1341dc5 SHA512 8b1e3360b4ae5de170be6936291f7b309de09b2462fcd5a48f239c22f1c8b6ffe721aca8d1e9b6ae3881f7b16374850d7f4b809733244fd16d45eed6ad4f60c6
 DIST keepassxc-2.5.4-src.tar.xz 6839396 BLAKE2B 5f7f415cab73c2665e3dff94c2bde039096b04a6e8e8a6ff4fe40d31cf4c6ff789f72d8c4c18ae0325c6db570933110a65348c4c359acadd2c89617435ffd6bd SHA512 8a70363dd579b95ccb05cb846aa34a5ed89de4305f3bef9e518e5986fe7f0313cb1daaa347f5b2267002f3fff4b71c87f5bb9073f6e6879d2556a2f0e4791dd3
-DIST keepassxc-2.6.0_beta1.tar.gz 8445948 BLAKE2B 46c84d547e621b69ba6e609c75584aec3b6347c1ef8f455c8b69c7bc23f3b87eefcd0c53e595a3ef47f49c4b2bf0f550f11639397b3e511ec515958620992fcd SHA512 7d52c3ac8c1803683a8926282e960d08cba18335a0f5f8a08e6950deb48e570a904f8cc23c7f7ab67e1e398b1dafe829cecdf532fc82e60d61ec5c02bf17b498
-EBUILD keepassxc-2.5.3.ebuild 2183 BLAKE2B 68019fba5936cecc2f48e3c3ea5fb8f24e3385d5cc80f36fde0d7bea796d01c823d338c8d08600cd291cea880c57e78d3b7d20bfc32021598a05c32cb3a212e6 SHA512 b8c4efb3e662085c87357e65355a9b1957bdf06c265668d84cf071ed024f1f4d9f8083cf62f1f8882ef7ce5d44411764895d78e20c2f32c0ab44929f2662c80b
+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_beta1.ebuild 2125 BLAKE2B de716370e41031cc3e9f373273a9360ad91ececa2272a0bc569edb771b54b6fedae04f25cdaa49c0441ee791b6d12c8c0b8e48a9d3a0c57e33c856381e9bcf8d SHA512 58882ac9cad8670f2f95ef0a41d238899eae9a17c0e145912e89f82799570f8be9b55bbcbd14efd3befe22317f3a27162c751c3ba37e360396fa329fb017dd70
-EBUILD keepassxc-9999.ebuild 2125 BLAKE2B de716370e41031cc3e9f373273a9360ad91ececa2272a0bc569edb771b54b6fedae04f25cdaa49c0441ee791b6d12c8c0b8e48a9d3a0c57e33c856381e9bcf8d SHA512 58882ac9cad8670f2f95ef0a41d238899eae9a17c0e145912e89f82799570f8be9b55bbcbd14efd3befe22317f3a27162c751c3ba37e360396fa329fb017dd70
+EBUILD keepassxc-2.6.0.ebuild 2064 BLAKE2B 21546c5edd6287bd30a39d2a491ce1b0f010a12e77a8453bcad8d3f5e565786aed48669004230dd4625e71c7485961532394da98e1ac99d534311a3a8a012417 SHA512 1899b53dca25d584f71badaefdee9087191fd30f0f1fa97169b0e9e1b0667fbf21dee4b09b5437ce91ac70dd182ac80cf6c47ec757f2dea02b8ecb952ef74323
+EBUILD keepassxc-2.6.1.ebuild 2064 BLAKE2B 21546c5edd6287bd30a39d2a491ce1b0f010a12e77a8453bcad8d3f5e565786aed48669004230dd4625e71c7485961532394da98e1ac99d534311a3a8a012417 SHA512 1899b53dca25d584f71badaefdee9087191fd30f0f1fa97169b0e9e1b0667fbf21dee4b09b5437ce91ac70dd182ac80cf6c47ec757f2dea02b8ecb952ef74323
+EBUILD keepassxc-9999.ebuild 2064 BLAKE2B 21546c5edd6287bd30a39d2a491ce1b0f010a12e77a8453bcad8d3f5e565786aed48669004230dd4625e71c7485961532394da98e1ac99d534311a3a8a012417 SHA512 1899b53dca25d584f71badaefdee9087191fd30f0f1fa97169b0e9e1b0667fbf21dee4b09b5437ce91ac70dd182ac80cf6c47ec757f2dea02b8ecb952ef74323
 MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e
diff --git a/app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild b/app-admin/keepassxc/keepassxc-2.6.0.ebuild
index 949cb61dc8aa..a6d25729d322 100644
--- a/app-admin/keepassxc/keepassxc-2.6.0_beta1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.0.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 ~x86"
+		KEYWORDS="~amd64 ~arm64 ~x86"
 	fi
 else
 	inherit git-r3
@@ -58,10 +58,6 @@ DEPEND="
 BDEPEND="
 	ccache? ( dev-util/ccache )
 "
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
-	x11-misc/xsel
-"
 
 RESTRICT="!test? ( test )"
 
@@ -78,6 +74,7 @@ src_configure() {
 		-DWITH_GUI_TESTS=OFF
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_DOCS=OFF
 		-DWITH_XC_BROWSER="$(usex browser)"
 		-DWITH_XC_FDOSECRETS=ON
 		-DWITH_XC_KEESHARE="$(usex keeshare)"
diff --git a/app-admin/keepassxc/keepassxc-2.5.3.ebuild b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
index fa1a828a2cc5..a6d25729d322 100644
--- a/app-admin/keepassxc/keepassxc-2.5.3.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 x86"
+		KEYWORDS="~amd64 ~arm64 ~x86"
 	fi
 else
 	inherit git-r3
@@ -58,17 +58,9 @@ DEPEND="
 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
@@ -82,6 +74,7 @@ src_configure() {
 		-DWITH_GUI_TESTS=OFF
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_DOCS=OFF
 		-DWITH_XC_BROWSER="$(usex browser)"
 		-DWITH_XC_FDOSECRETS=ON
 		-DWITH_XC_KEESHARE="$(usex keeshare)"
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 949cb61dc8aa..a6d25729d322 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 ~x86"
+		KEYWORDS="~amd64 ~arm64 ~x86"
 	fi
 else
 	inherit git-r3
@@ -58,10 +58,6 @@ DEPEND="
 BDEPEND="
 	ccache? ( dev-util/ccache )
 "
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
-	x11-misc/xsel
-"
 
 RESTRICT="!test? ( test )"
 
@@ -78,6 +74,7 @@ src_configure() {
 		-DWITH_GUI_TESTS=OFF
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_DOCS=OFF
 		-DWITH_XC_BROWSER="$(usex browser)"
 		-DWITH_XC_FDOSECRETS=ON
 		-DWITH_XC_KEESHARE="$(usex keeshare)"
diff --git a/app-admin/kubectx/Manifest b/app-admin/kubectx/Manifest
index 72faa7a195b1..6f548befb052 100644
--- a/app-admin/kubectx/Manifest
+++ b/app-admin/kubectx/Manifest
@@ -226,15 +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.6.3.tar.gz 483452 BLAKE2B 9f74a5df0c30e8414bfba0c2934ed0601dab249a78e8083179fc129dfe288b596f8f0932c3daf84b89ebb740a9c6694189f596c7a944bb6a584495a999d08192 SHA512 63054b51e3d2f52e895aa5b15162f67c81970c0d27e974f60f7f6641156d04cc4b590894e7eedcba3925f344009e65d04189c046f67d1edaf7f092ffe8d5dba1
-DIST kubectx-0.7.1.tar.gz 484162 BLAKE2B 54da3821da0fb992e1a12ad1e866f6f10c57a48da0414e8a48f293e090e289a0d26a70297974378b81f4e660ca13e85877c2f76b554eac526d1d830fdc439da1 SHA512 c78beba1820afb22548efb39e1fa704af017076096a4676d5a178bc3d65656f2352ee221d9754eb6fd8cc02a3aa96d743ce2c27a84a8b9c3684272cd2547fcf2
 DIST kubectx-0.9.0.tar.gz 510570 BLAKE2B c8126686c10755d69132f3dfaeae39ea115210426f552116305a1c97d98207de7ee81829ef4e5b04fc20ad07750103fc48abf2182a489832fcfec6357d596e51 SHA512 ac9b5258c23d07ee1ab1d3017645bb0588c7da8537c63b330b01039fb86164af41d2e37adb1e0619acf49e4265ee1ad4ed1d4a59e7ec878f78aa75e6da0dd829
 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.6.3.ebuild 692 BLAKE2B 12a53742c7e79321ea3a3e2f534ba525e65d8d3968494908eae813933aa4de9f07310f2c151301eed696e15da27d6c1f1b444a5dc191ec479c0aeac0c3870915 SHA512 d672947603b0f6c3d2783082b25a3c5ae595d471251df46e8b6ed533c371211c781bc0b6330f14b7659bf88f285207cf74131e879823a600af9708a2576a6a40
-EBUILD kubectx-0.7.1.ebuild 692 BLAKE2B 12a53742c7e79321ea3a3e2f534ba525e65d8d3968494908eae813933aa4de9f07310f2c151301eed696e15da27d6c1f1b444a5dc191ec479c0aeac0c3870915 SHA512 d672947603b0f6c3d2783082b25a3c5ae595d471251df46e8b6ed533c371211c781bc0b6330f14b7659bf88f285207cf74131e879823a600af9708a2576a6a40
 EBUILD kubectx-0.9.0.ebuild 13134 BLAKE2B bee19b9cd74568d88a280b2570647dd29c0953d581542334fcdf414fd33f153fb28129ba21403f5f1cf8f177de356deba0608af3001893dd105fcb881d63dc20 SHA512 fa680582870bd205eed5944b310238a6c4a64bed1d730ca022480d56e2fa81fca2f65fee5148e7b77b89eefb3bb17fad64eb67c26776d4879148558a2d702d31
 MISC metadata.xml 247 BLAKE2B cc3ffec52f77e1ce57763359a7fc71a3225e3a2cda5cb797e98661c354fb9ee896033b1aa38c3a22c3587467da2833a801b710c8f43b3dffb2e9de327c48ab45 SHA512 a47289a415c6b8ee6759241cbaf42a851208f940432451a4b893f336d2c980aab922f8bb37de656465758532321dcbdfb372d1ee85739da46ec83ab89fa3f046
diff --git a/app-admin/kubectx/kubectx-0.6.3.ebuild b/app-admin/kubectx/kubectx-0.6.3.ebuild
deleted file mode 100644
index da79bbe5c433..000000000000
--- a/app-admin/kubectx/kubectx-0.6.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-snapshot bash-completion-r1
-
-DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl"
-HOMEPAGE="https://github.com/ahmetb/kubectx"
-SRC_URI="https://github.com/ahmetb/kubectx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-cluster/kubectl"
-
-src_install() {
-	dobin kubectx kubens
-
-	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/kubectx/kubectx-0.7.1.ebuild b/app-admin/kubectx/kubectx-0.7.1.ebuild
deleted file mode 100644
index da79bbe5c433..000000000000
--- a/app-admin/kubectx/kubectx-0.7.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-snapshot bash-completion-r1
-
-DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl"
-HOMEPAGE="https://github.com/ahmetb/kubectx"
-SRC_URI="https://github.com/ahmetb/kubectx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-cluster/kubectl"
-
-src_install() {
-	dobin kubectx kubens
-
-	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/logrotate/Manifest b/app-admin/logrotate/Manifest
index 23b37e18a0e9..d11a5ce261bd 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -6,7 +6,9 @@ AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe
 DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
 DIST logrotate-3.15.1.tar.gz 220263 BLAKE2B c164c542a0770965f5193f5816509f566b9afeb82ce8388a184d16c2b3e79aa0ef93be10d477c85f62037f01b3e626ea56d3173ca8cf017b8aa315f2e23b1a2b SHA512 72294607762751fb1aaaca1d62ebd87d109d837d50606176159a5e74782a993123321967b7a6185df6ca9c87a54febb832ac7537ceaa580a895901a995570cd5
 DIST logrotate-3.16.0.tar.gz 221904 BLAKE2B 38bfde57e9e055b86d6f25f0dd7c49b5d35865671926b1f8a2bd703ac8b8b2252d40cc29b0e1440309ecf224c747a99a2eab0ea99c86782559bef797f61fadb8 SHA512 2f2e8ebf9349424f529e4cf35e75036dadb00df84feac6b421b5a558ce015c9b1a22586463cba95a0265c104a559dd236764f7e37707975e626e69cc87e963e2
+DIST logrotate-3.17.0.tar.gz 224559 BLAKE2B 6d019bafad6986a0b6264893d36a515db75d746dd590afd26825c01c68e9ccf3c260502a29912d75c069ece8715ae14d3c13d4030f6222187be0e1ca05d60e49 SHA512 ada4415ef68ad97c1415fa0c1ba7bf108621777cd91599bf4f999dea1c1025596543aa00fd579cae4d39315b71c4d8f96a9c9d1178f78be7c523470588ab1d31
 EBUILD logrotate-3.14.0.ebuild 2503 BLAKE2B fdda708bc77a6bbd41bcbda73e1b6cf1c92ae89c70b0f6682bc78c1c3c8a509745b02660634e2d99115dfe64933320e5480470bee4fc4b9a5c5f88737bac59bd SHA512 135a60056c1518b006666d44cdb5852380f83e73844cdc7d99ca8225edd89d66d7a645e256bc7a698d5805b39d0c5860d7881d8d801d12fd0b8fdf6c063e0c79
 EBUILD logrotate-3.15.1.ebuild 2527 BLAKE2B 8bb89e3b8bfa250ac9d394d1291fee1e86540e34bf439fb020a5a98f849deb0658bcf56b6ed89222f2743d9b0bf333e202d0442387dd99b89823a3b25516e158 SHA512 7150d851233a645b918b333676113503f58a60451016a22b8c8500ec4630f5ad6c55b86cc4b64f2fe440947cc52040b43b4c924f3510725fb4c00912118146c7
 EBUILD logrotate-3.16.0.ebuild 2492 BLAKE2B 38e1d4f4fa13982c16375e66c014bd6e1b16c8cb589fc177aa38a9ddb52443ff9161e2255167b99d7b5631d51efb1d85861f62d881db96bce0893f2564d7a83c SHA512 26193d71af7b9a8f52770af0d9de85dd18fbfb525eb71bb231d69eb51a276d66dd7a3e5b6b77a65f2c71fa1cadf4c3732e1e03297ef8447a163153d28db480de
+EBUILD logrotate-3.17.0.ebuild 2492 BLAKE2B 38e1d4f4fa13982c16375e66c014bd6e1b16c8cb589fc177aa38a9ddb52443ff9161e2255167b99d7b5631d51efb1d85861f62d881db96bce0893f2564d7a83c SHA512 26193d71af7b9a8f52770af0d9de85dd18fbfb525eb71bb231d69eb51a276d66dd7a3e5b6b77a65f2c71fa1cadf4c3732e1e03297ef8447a163153d28db480de
 MISC metadata.xml 1197 BLAKE2B 57d74b7b0ec5dc17bc040c8f0db207b05a7c86722606f629b247747cf5f45a5db6e5acae25221d6b43450f1c1cc57e2308d9f045b606f6284dc7c9459a3b3ce1 SHA512 6a354d60895ced8d020a3c8df5cd0a7f294fe5d4d5dbb11c2698cfd3e666e3f8f4778262e5ce210c7e9ec31e6e6f50d0a98f6e3fa7fff8ef77078be8b4025e16
diff --git a/app-admin/logrotate/logrotate-3.17.0.ebuild b/app-admin/logrotate/logrotate-3.17.0.ebuild
new file mode 100644
index 000000000000..b63b513c2ef8
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.17.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="acl +cron selinux"
+
+COMMON_DEPEND="
+	>=dev-libs/popt-1.5
+	selinux? ( sys-libs/libselinux )
+	acl? ( virtual/acl )"
+
+DEPEND="${COMMON_DEPEND}
+	>=sys-apps/sed-4"
+
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch"
+)
+
+src_prepare() {
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+	default
+}
+
+src_configure() {
+	econf \
+	$(use_with acl) \
+	$(use_with selinux) \
+	--with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	insinto /usr
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+	move_old_state_file
+	elog "If you are running systemd you might need to run:"
+	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+	elog "in order to create the new location of the logrotate state file"
+	elog
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs. See man logrotate for details."
+	fi
+}
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 1af4f46045a9..ec3bf09f6626 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -3,16 +3,16 @@ AUX logstash-plugin.eselect 1768 BLAKE2B 539246fb1c6e00fa0928af146d3c32ef69f61e3
 AUX logstash.confd-r2 767 BLAKE2B fa251570a13b2bc2d0779e0f00549f40bc957f211be0f4164829f7bf731221e5adabdb27341c703f1ea67b19455e8832f5d822fd41ffc64994007201690feff6 SHA512 83eecf30baa160041f33fd3dafce317c1692efaf676d0fdc9bee04965eafb15f1e01d07a09607d345665f6bebc4db90d17a0abd1c7fd4962d6926ac069f16768
 AUX logstash.initd-r2 1989 BLAKE2B efa16227a2cf1a42f1f9e27e110dae64c7eb6547e22e89a71b3394fe587e0f83468e361d335e28b15a1507959dc26c019ae8ac9bc110f1b8a6896ceb7f3ceecc SHA512 77c69600f22d31e7e08c2d953c99bea8a24ad83c7abdd578526b850ca37c963a91cfd245b70e4ddb8d405135230fbc641768de2dc4dad096a0db3d40313acb2f
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
-DIST logstash-6.8.8.tar.gz 179965893 BLAKE2B a56db7b09c7fd59a5496e076ab11bf273265cff7eedfc9c9dfaa117a16baeb9b9c8e97a71eb8ff2a80f379b242d08c2d997476d7a48bab802ff3380d8914f13c SHA512 11c0b9be1d51c3feff82181234d0b5cd838edff78678bdc410f306c52d6345393e9d6c4d6095c2e3aa044f8c5af35d98fa2570891e81e9e3c57907c2baed6100
+DIST logstash-6.8.11.tar.gz 176909941 BLAKE2B f3a7085b179215982df87433523735dab35832ae73a41b8b98a66dacc95bd79985f14f78699902c3b7153ff7c11d21ea3f150899095790ad888bdfbb2eaa6fda SHA512 0ebb938784a4a4ea8c1e1691d1953d69605860b6b61fb818d73054b4488fd4c43914c369b468948633ea52d2c8c4f0bfe0e610912cb8c7436b15c5ac5a7047d6
 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-7.8.0.tar.gz 167162975 BLAKE2B 666746571151b1cc1b79fc7405235a107f452c4741ba0e65f151e8b38934239e57698faed3663889d932eabf43e58277a1b2d5aebbf8dfa8c3f5e77fa8778ed2 SHA512 8b7c9015edfde0bed43a2668bf24d8523f785ea8f94b522e5d9dd886a677459f2c2c2e103b91b04f671287177e902e8f3fbf6747841f7984357a803405f9ed00
-DIST logstash-oss-6.8.8.tar.gz 179836007 BLAKE2B e278d8dd34341bceb506accb3424b4af6db0795b582e1370d60f4a4b68671372449c94ae28f4a7585b8d4f4e63dcf7d6fa80eed37fd4ef8e872414ae2cd15b80 SHA512 ceba8d798c1246c9fd3385bc4b64995fcf9083dc5149211fabc09bfa3208d56bba6d8ae4ab73da5f9968633f30c547e0132f76543e2f9a2a96675ee58df74b09
+DIST logstash-7.8.1.tar.gz 159599529 BLAKE2B c7ba03fc106add6ee0b956de1c3a1ed221c2571087aeedec178d65be3cc83a10f7a4eb35898fc441ffd1c27322668d8e95344a5509cc703b4788d76422a5a1f1 SHA512 7ad6d380e92e90fad2a058a24571b85a49d5ed81835837c12dfa2f4ae4c776483de39b099ed6852ca7f4bab833cd5aba44d28df3048557dfc4a52d4c5486e276
+DIST logstash-oss-6.8.11.tar.gz 176779121 BLAKE2B 2b3f62fd78a5ffcea07954c4e9b90fc7df10b933a327ac5400d73eb6c4ecd1013049d04b6cecd014b17ff6361a4be0ee535112267cce71cf8c9dc95b551ed6f6 SHA512 4e0d6ebaa620ebb0039687859f28e8620e5604d8452ad1338b2a670cec3153e521f4c3bdc3a78e10b843c1356e73c96065c1c624efc2baa9b2277fa1f8cabaa9
 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-oss-7.8.0.tar.gz 166982219 BLAKE2B e0d6b500184523e1bb2e52fae6971e12bd7a547796508d4eb6883ffb16e41676a807eb7b228e8e2a64c9b7b5b9e375b2acebe15a0dc77e502707350e43390795 SHA512 4413ed97527eb89da3462cc401b84f4770bfb9e3e3083fb314b8ac813165655752a204f091512de3507527bf8cbea5934f67ada446448802424dd441da2d475e
-EBUILD logstash-bin-6.8.8.ebuild 2099 BLAKE2B f5902b9254e045789a41627c84b5a4e340268eedb1a96a266e20279a9d718ef28279e59b63320fc1d35b2e701acb5ce61a925687cd479d46a74981e92d744618 SHA512 74f8b2a81f63e5d41b373e5cb08f99560afa4f59133bfcd7955907105457ea94cf84fe07f5501e011bb2b69d388207e160057c79ec206589e7d195626fab75bb
+DIST logstash-oss-7.8.1.tar.gz 159415077 BLAKE2B b6dd108679d813cf4ba0d0426ea8acfb460cdcfeec052359a6ce79f194fe4631349973ce1bc726fe7356264211608328204332c74e49ba0aa92e626571789142 SHA512 60d964c0b1f6afebcd41a8036e2dbbee62ca15365c840a5664406428c6b692588ea9343a600ba12d4355ff46ae60a08d42c61c5f33bb7590ce119e15fa1a32e4
+EBUILD logstash-bin-6.8.11.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
-EBUILD logstash-bin-7.8.0.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
+EBUILD logstash-bin-7.8.1.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.8.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.11.ebuild
index 08167fb02874..08167fb02874 100644
--- a/app-admin/logstash-bin/logstash-bin-6.8.8.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.8.11.ebuild
diff --git a/app-admin/logstash-bin/logstash-bin-7.8.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.8.1.ebuild
index 9e7d19873de3..f47057329667 100644
--- a/app-admin/logstash-bin/logstash-bin-7.8.0.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.8.1.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/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index d162da6c7038..e0516253cda1 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,4 +1,6 @@
 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
-MISC metadata.xml 642 BLAKE2B 6a5747be36bcf53a360844ca4fe77ddb5603abc614f725a89f04f42aa1d337fb1a6e8b5d956cfd8b8347502a6e984fbc3b16ea876a1e818d0d09b1d0393cb889 SHA512 530d6595e3eaa29c460f721f187c729a01958d4e770f42c93b4d8fb4dc1d63ce4fdedb1f5c68f29c2cf86cdd9b1f947ea7bfd74eb523301c12e6689b9312e5c0
+EBUILD passwordsafe-1.11.0.ebuild 1950 BLAKE2B 97ab00bd8bc8a8309a947cedb730627d4a66efef322558af01e5e1244c44059f9e77dc7809c994f474ce32f94d5a4008ad6bb4cfad2bcc4630bda05c71ad9736 SHA512 694d5e09e7c260fbaba512744fb49d6dd137eb8108f90d81ac33a61f47398b69175468b29b63417b46b5ef6f14312321c7303e99709510ac35c3d50f42f67480
+MISC metadata.xml 842 BLAKE2B 719428e2e9a43317cbf00f6a0433719fce586a53b03374d011fe11e1a09664593d6a93f86ed7c77b6025496a5c7ae72304b910a4f0a15efb6c378418b2c6408a SHA512 da19977d8e8791ea0f274e17069201e6f2f2c7661e9c313906d674e9e44d964de36a30edb506c8c308a01b8094c6f455253ac449e3fdb3be7f75357c78234c66
diff --git a/app-admin/passwordsafe/metadata.xml b/app-admin/passwordsafe/metadata.xml
index 96d7b7f97b0d..24e655194eb3 100644
--- a/app-admin/passwordsafe/metadata.xml
+++ b/app-admin/passwordsafe/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<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>
diff --git a/app-admin/passwordsafe/passwordsafe-1.11.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.11.0.ebuild
new file mode 100644
index 000000000000..3bf03766ff31
--- /dev/null
+++ b/app-admin/passwordsafe/passwordsafe-1.11.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake desktop eutils flag-o-matic wxwidgets
+
+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 qr test +xml yubikey"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	net-misc/curl
+	sys-apps/file
+	sys-apps/util-linux
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	qr? ( media-gfx/qrencode )
+	xml? ( dev-libs/xerces-c )
+	yubikey? ( sys-auth/ykpers )"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	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_configure() {
+	setup-wxwidgets
+
+	local mycmakeargs=(
+		-DNO_QR=$(usex !qr)
+		-DNO_GTEST=$(usex !test)
+		-DSYSTEM_GTEST=ON
+		-DXML_XERCESC=$(usex xml)
+		-DNO_YUBI=$(usex !yubikey)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	dobin pwsafe
+	dobin cli/pwsafe-cli
+	dosym pwsafe /usr/bin/${PN}
+	dosym pwsafe-cli /usr/bin/${PN}-cli
+
+	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.* SECURITY.md docs/{ReleaseNotes.md,ChangeLog.txt}
+
+	insinto /usr/share/${PN}
+	doins -r xml
+
+	newicon install/graphics/pwsafe.png ${PN}.png
+	newmenu install/desktop/pwsafe.desktop ${PN}.desktop
+}
+
+pkg_postinst() {
+	optfeature "on-screen keyboard for password entry" x11-misc/xvkbd
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 320006c24e65..525d10a8c34e 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -6,7 +6,9 @@ DIST puppet-agent_6.15.0-1stretch_i386.deb 22917002 BLAKE2B 5bab2b6cdde11a46e649
 DIST puppet-agent_6.16.0-1focal_amd64.deb 22255252 BLAKE2B 64690ea444c666476864ff8d2373a266bd91f91ef996c87f04cfdd3401093795610e0e09a4f0588bbec8b83d64848c92a95572ea570fc7985d93c5e161256e00 SHA512 47ebcac58d9b54b62fa9a854ec4eb4fcc83d2fdef199658532b7b87cf461a8ac611f776db3fbb2e1c11e607896b85a67d7a32a4e9844e1b9b07904e0860c39b8
 DIST puppet-agent_6.16.0-1stretch_amd64.deb 22336186 BLAKE2B 2bb62f25bf243e03288a5ee769c37c53c5f1c8f63a5e1a9d231b522409a68f3b3d957adbde0a99f616cdb60ced58cc6de990ff96f2b99d17be4aacd786c460a4 SHA512 dd5536e5fe9caad2dd7da8cfb6e2e2e93138b76f5a1014999f221c2bfcac94f0faecc3035ce09fc170dbb61226325ec82aafd80f1016e1d1ccacad9f1ae1b176
 DIST puppet-agent_6.16.0-1stretch_i386.deb 22579590 BLAKE2B e923847d2d381d6a1a9c1761259c72c4c92e34d4aad5643eeadbef38d48a09a95d15fd359ded3501257057dbb892bc4dc5ae60abdc01d646cd194d1b40defd6d SHA512 4015da5a4df08e03ab3bf988fd2afb67c37fa7c820f73793ebc3270364928a6f89a5ebcadfeab1f07d4e88a98ee95c2069e47fde4391d2dea98855a9743b6adb
+DIST puppet-agent_6.17.0-1focal_amd64.deb 22317432 BLAKE2B 570ef37c8e170ab1d615782322c895b0eba3193ac51dd221a8f9597c34c923c36874a5add1cf1074160c86dd4c4acc3ff1b65709cee2c0cddd84abe57c300faf SHA512 541010d896c891040154b22eed3f2e39b026cfef5669c95016ba1aa5b919002fcf2b8d2a15cde8efd104fc2e0699a8cb5cc3914bc039a27280f97f7f67d7b153
 EBUILD puppet-agent-6.15.0.ebuild 2016 BLAKE2B 4f4382314410a9401868382b65e5ce627e9c706120dc21a537b71b390bd56480988b36e51f000303542d8711f2aebd47860605e8f52087c895e9453d2992a84a SHA512 45a7eaf2fbd6c66b672943192a92826ee10da6f0ba3a4d8cdc6c9ad2103d2fa534587dc31f5505bc8c9a23474e604ac58af0b328723668cd772a1e75fe6d0d5f
 EBUILD puppet-agent-6.16.0-r1.ebuild 2018 BLAKE2B 74f72ffb55bb069bca1a2ea3db686ae1d5236e8c180b3b14afd18f451c7718e51ff09413380abb0bc79497ccde9aa011d7de55a9f7f92ce213d9b8361dde3d50 SHA512 f4aa0379772aa69bc9bb75fd085000e1ea64a889919b025372244f8a72df2da2f5bd27d51844d34985a8f397e9d6b8159ac46da647f62ae7f9e1cb2ec25d7000
-EBUILD puppet-agent-6.16.0-r2.ebuild 2051 BLAKE2B a02f6b94b641e07ccab44d3996c507262f5e537b8a3adf69c1e13686d66d5798230630f22bb91a7b93f84c5a70f699867e7e27b61472ec8d4b00dc4b912f070d SHA512 75ccb2f8833da10f3f12e962ecc5d2e8f54fff5b40a4218b377a096402c7fc3bc5874863e176a7b5ad8a0a7ce3bf1f0ae29eea78db3c77182f2614db452abb40
+EBUILD puppet-agent-6.16.0-r2.ebuild 2068 BLAKE2B fa894f7b4b85afe9cb403d17617ae13ef9bdd566c6ff5e70edfeec2fd3733c3f5b93c2cc08f4f7b35112d2f8d3af0f3ce8e99abf865f345b3e3bea46ac788de1 SHA512 55eaa06a91b994cd4422f0a7c3f67cd25317729a96110e28a291bf2965855f1cd53aa731fc920ad424d27a80ad210aac2f9e6046c44116b363729193791032f8
+EBUILD puppet-agent-6.17.0.ebuild 2067 BLAKE2B fbaa5ddfc2c3085a877a0adb546a8ced6242fcfeffa180cee4588dd6ac0f35ef15b58869f1b22dbc4d92b2344780ad64ae9ef41fa6a46f71bc50fd2f89031ea5 SHA512 154315c97b9ec493d6923e066df73d58a33e6f0c7bc33162d8fcb5b5eb86df3ebd7af93d9cc8a0463d6d19f7650209610fe391a5b530b7b57e147738cc567d9e
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-6.16.0-r2.ebuild b/app-admin/puppet-agent/puppet-agent-6.16.0-r2.ebuild
index 49b12d686f89..d2a6b4ff967b 100644
--- a/app-admin/puppet-agent/puppet-agent-6.16.0-r2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.16.0-r2.ebuild
@@ -40,6 +40,8 @@ RDEPEND="${CDEPEND}
 
 S=${WORKDIR}
 
+QA_PREBUILT="*"
+
 src_install() {
 	# conf.d
 	doconfd etc/default/puppet
diff --git a/app-admin/puppet-agent/puppet-agent-6.17.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.17.0.ebuild
new file mode 100644
index 000000000000..c33a9ee73c47
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-6.17.0.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.initd" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" 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-lint/Manifest b/app-admin/puppet-lint/Manifest
index 2beea80a4908..1ed90cd481c2 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -1,3 +1,3 @@
 DIST puppet-lint-2.4.2.gem 93184 BLAKE2B 5170bd9c30f6e2f5b30120b6edc74550e697c3243d2f5c7249f27a2d61ca2f5612d96efdc0f6be8d065e7d7a4460b9cf6e6dad13a5b24c4ce100d4e6df2f0425 SHA512 ee846688b13536b7d146ea50c0efe5083babf1ca09b77182437ec93be754ae076d54ac34f8082867a26b6df12a09bcd316e5b1aaa9c98150f9411a0c8b007c71
-EBUILD puppet-lint-2.4.2.ebuild 586 BLAKE2B 60d694ebd57c1112b3a76a4da7ec2efb3e72da48ffad9eb0fb284db50fa7185cc885bb19c3cb6f69b15c6f2ae24fdc1ee0078c570bd4d5a39ba2afcad29ffef6 SHA512 241c69280163c708f3c251d1f840aa851db3fb90ca0a5c433a95ef6b04c7f78b57d4db95ccb17332a8122cf80644d1b0de893998851b4992ab5b9587ace3be5e
+EBUILD puppet-lint-2.4.2.ebuild 592 BLAKE2B 3aad54bd161caede6d54df6bf3012f7beebcfe554c9aec36937a9e1520a4d0605606abd4c77c63ae1ef87238cfe097ae7631eb68c83d3a28035d1d64fc78e684 SHA512 c19c14051ea09416031f44e15dd238c6e6bb099daad8b88a30cbd3e7f61ab55b617657e4127c06fa3c15bf823f0bed9b1830296d6d91bcf616d051e374e838ac
 MISC metadata.xml 453 BLAKE2B 4fb00983f98c8c178fa1dc667f966b0f1fd54861ef71e37211fb46edceb8f91c15d55add637a50eda53ccaff8a1d3a6dcbdd02afe2ae32cf0f69797427897d6a SHA512 bd9238c56ddcdcb124df5d7530343756b865d2f279b719fb0ce7bf4e37565709194cb7f564811be6376fd4d3b61403d76eb9542aac3a267c2eb08f1bade21524
diff --git a/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild b/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild
index 738798f64b2f..a8901cb8e2e8 100644
--- a/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://puppet-lint.com/"
 LICENSE="MIT"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec-its:1
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index cc0ff7cbaf4f..0d1ef1dfa134 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.20.tar.gz 2995117 BLAKE2B f147be28967da748bf8d5f7250eae9045caafaa3925f850cc0a77acc19a6a47ed92d4ec81278334608839f6f8c83cab19324f2753bc05d3a042a3bfaccb72a46 SHA512 83b8f234697e13d6fd8ac16634fff4e4adfece70858c32c1001925c71cc4d9a482da1880c27c08e796facb46d5d17889f9521121a69cb49e160e3c031ad564c4
+DIST puppet-5.5.21.tar.gz 2997149 BLAKE2B b42fd79132ce0aab02724c7aa38fc39a216df38266b9ee8078b433860b675f36b3c4da0d13d8fb456069250e6cb6470686c83581bc6b57801a44375f829be195 SHA512 b33191c104cb58fc842d065c3cf7dec8ce723ddc9b273c930f56692e252eb6c51bc3b0442db6500cf015fe24ec3eb133428aa09d845ca92b05de2da39bce8bfd
 DIST puppet-6.15.0.tar.gz 2880562 BLAKE2B 082f6a6b0ee56cdb1cd98b8cade8b07b7970ae0a78a9cf7c80e9af945eb722ad156b28004ad565c51750a63fa5932e99b1dd39ac0d4008d3ed225868e7671a31 SHA512 ac7e17bd87ee924fd928d565389b424ff2ed45b9b08e1be4eff4dec3688545657e2dfede46adeb48faecf3875c640c99b07ed6e09906b3e66b4654bb984d9296
+DIST puppet-6.17.0.tar.gz 2901101 BLAKE2B 59e75d1b2a8d02285ab867d3b63b1656e29c418f4844b21100e135b306e16f82284690565e5354f515499ec7bc0e2ff688308e077cc4656076a38f49bb1bedf9 SHA512 2ebf31cce1dcc4ce0bf9403f56d3f97a41a4014111be1f27e340de8e4db157549bc4609068ee6396be3c88ff1a93b40792692a5b01140fa66a1f5a82453ba1d1
 EBUILD puppet-5.5.19-r1.ebuild 3692 BLAKE2B 7aa03944368b7395b4c587230a39536db28d0a46352bd5c6f7ec457ca29a3e6d9a3672a9b74591d3382909dc4f9ecf6ec73853ad5722b26becafb5c1a1264912 SHA512 6012739c4d92cf576ea482f99e9d560633103116b40be7df8cc3a9e89f9efeef3e02317dbbed1207a91c5372ef7702d723c37207488ecd6ececad5d0df6de9a2
 EBUILD puppet-5.5.20.ebuild 3776 BLAKE2B 9d772a534ddff7356545c782b97eff3b656911d127789391e9c6a4e2370aad1825ebc5c62f05c6e35ad6a91e785a597ede7f67b7855adc707657b612aa27dd56 SHA512 455e955926a4dd543822c2ab13a59867d3649bdb4948c0fe184c24c4e36d2039bbb375bee254d1775a0b257265ba73b53ad1c293e982969689c8c22f0f53ad55
+EBUILD puppet-5.5.21.ebuild 3757 BLAKE2B 84bc423625d9ec703ef345fd0bbc44241e5abcd4c964290778a84a636e30a7b87153bb5c450a7b9e61f488279f28553969eb777deebb6ef22c923929b28f3b2c SHA512 cd1be53da064ad5641de2d4566f36f9733201c92ea68b3d36b416a8f786075d148a9a7f48eb1a67eca3567016f381bbc86c2a4dd6f4e3919befed2ae0bb75196
 EBUILD puppet-6.15.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
+EBUILD puppet-6.17.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-5.5.21.ebuild b/app-admin/puppet/puppet-5.5.21.ebuild
new file mode 100644
index 000000000000..e80f5165b8c1
--- /dev/null
+++ b/app-admin/puppet/puppet-5.5.21.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.0.0
+	>=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.17.0.ebuild b/app-admin/puppet/puppet-6.17.0.ebuild
new file mode 100644
index 000000000000..11fd2d3c5085
--- /dev/null
+++ b/app-admin/puppet/puppet-6.17.0.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 3cd5066347cd..c667ca55a7ca 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.10.0.tar.gz 44394062 BLAKE2B fee0a908518bb89e9dda1d4e8683953d305c70fc0e70a856871b0916a4ef610942db1a8f24f59b7704dde3da67ffc2bb1b25cc9254f3efa3c24408bc3a336cb8 SHA512 12ca864a5a515baf4510bbfcab23b686b66cce460908c103c96fd51ad2898f2c5a42b9d0d0c707977267cc31a517b454893ad85982b31176e1ebfa79d7f948ee
+DIST puppetdb-6.11.2.tar.gz 44799680 BLAKE2B c40048d1fe6cf62371f2adb1a5361b34b1f46e6b344a7565ad9565f2ec4ae3cf1bd4927904c797be92c223dcc98e2302359af753228d09424372ea894cd5d5aa SHA512 af5d5f61147e8b67812af405b3b087897925869a62eb0749a5a59ae72e76bdcfe95879b0cb6d993ee85a00c44c6867e1864c0d22ceac7b854bca248ae1a00ccc
 EBUILD puppetdb-6.10.0.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
+EBUILD puppetdb-6.11.2.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.11.2.ebuild b/app-admin/puppetdb/puppetdb-6.11.2.ebuild
new file mode 100644
index 000000000000..784885ac312f
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-6.11.2.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 c3e12500b9f9..551427d6bf3a 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.11.0.tar.gz 60230325 BLAKE2B e7f95c15755afe1a637558a505f3bf3392da620df44e93ed152ea622bfb35b594120f36bb1c357d49577c8fede83eee318ffe4535df78f50478e09961b62b89b SHA512 1d6fe14cb1dfaec1a8b43c54ebe9bfd9b581b9f2ad4d3f1976e4570679a72657b93060838fdaf55447dd3c7e5e3d38df30c0f20121791ac06d0a09545812b49b
+DIST puppetserver-6.12.1.tar.gz 60422470 BLAKE2B fd3fa33262a5ae83fb6889079a85c262d74d55b0ffb9ed297d60399c442d7a1676cfc54afd3e25721d6e4a4ad926c43a1f8f1a9db206ee6145280601c501fe09 SHA512 9ad5d3e266f91b8a1ef09302a1f8889f139909fb20268f714fb894dcff2379a01c78baafdab1102a26c26903cefe92ac833c2b20e9ea6f8d379af2dd11c20407
 EBUILD puppetserver-6.11.0.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
+EBUILD puppetserver-6.12.1.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
 MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-6.12.1.ebuild b/app-admin/puppetserver/puppetserver-6.12.1.ebuild
new file mode 100644
index 000000000000..5385eacc0c94
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-6.12.1.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 2fa1d8e979ee..0d36516a629d 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 596 BLAKE2B 6b9db6893036a0d3a1a38e36b27a893f985368f45212534eb44092e303c35e8417163716daa60df06c5db3145e97071e766e50790fb86dfbb660597acb463458 SHA512 000c2320786216da066a005336cea34b33d972b5741d9e72a801b3ca217193da77249f1f1098407c12edfbd3c747f466a0b9ba89718d70de1fdb93b24f01de4f
+EBUILD pwgen-2.08.ebuild 603 BLAKE2B 4bc7868765359098329840304c6e818365e85b5b633be37fd05dfe1c0503ca054fdebee7ac70d92070d5ce624f747d3d8857aa6069a22069be61ab8503b0a9b4 SHA512 f57c8b922e6b47ad8406a2be7dd39d4298bd3667f93a51881516ff14bbda3a0d4c4b8759c05e56dedd7843ceaf8cf11feb3c8435c95738ddb2eee5800046470e
 MISC metadata.xml 765 BLAKE2B 133e60da10e57e53ea3013d7615aae83d8d38bf18b8e92c1a081d43524551180e2654233e0a2b2207dd11f31114cd221f33fa5eb4c1486c87ea0bd031c613f2f SHA512 5a6e7e1b7e8fc44e9f39e5d0f349a27360d94778522131c749748690fd6db5278a5a9354242b2030bdfc8db7890e340621a1d939364bd40d3d96b018cc6e443f
diff --git a/app-admin/pwgen/pwgen-2.08.ebuild b/app-admin/pwgen/pwgen-2.08.ebuild
index 2c41684279be..c70ff192f432 100644
--- a/app-admin/pwgen/pwgen-2.08.ebuild
+++ b/app-admin/pwgen/pwgen-2.08.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="livecd"
 
 src_configure() {
diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest
index 0ed71c5c6a1f..e7055b5bf6c0 100644
--- a/app-admin/pwman3/Manifest
+++ b/app-admin/pwman3/Manifest
@@ -1,3 +1,5 @@
 DIST pwman3-0.10.0.tar.gz 75726 BLAKE2B ba7331bd3d36ac23d9151a5ebd4a343e2d8c523ba8b324850139a9ba4af8404ddf23380b3eaef523251e8f4137c5c56b6ab509c3927690fc612962ff872ea820 SHA512 a6dc24b2e1405a91f35a9a9155dde5409e35ce733bacee8858930d82443c09b8017e2701bc8c45688483b6c40554e4d6266f6cd21dc6f205b13f96e7de4f57c2
+DIST pwman3-0.11.1.tar.gz 76992 BLAKE2B cd7289781436f0f8b941d587c61b2d8a5cad52f3d57d01106d73b3da5930de2bd2df15fe5a4bcfbdce5e5733b7328764d6e4e2d18cba8a575cadad8835218e75 SHA512 111713e23b64a7492b5e2735b0d0117a81759bd9f25a87327a2aa4a465fbbc8a0aa0fbfa86b84cbcd40eb1540d05cdbc6fb81982fe61953df91979e674ce5640
 EBUILD pwman3-0.10.0-r1.ebuild 885 BLAKE2B 655432295d431222968c3053b5431106ae3b561b7035b77c0af414bb2178ca02410197b65d96f112feb96902f7bd75ab821e2d41cb94f4a0968b6de5bddebe30 SHA512 5da4a911cc179eba8f02682ba401942e020b0e2744c352da2a1a60c84426cfde0a8631359c05dbc2914f68d6c453df142ecedbe281e1db1078ca109499758382
+EBUILD pwman3-0.11.1.ebuild 885 BLAKE2B 655432295d431222968c3053b5431106ae3b561b7035b77c0af414bb2178ca02410197b65d96f112feb96902f7bd75ab821e2d41cb94f4a0968b6de5bddebe30 SHA512 5da4a911cc179eba8f02682ba401942e020b0e2744c352da2a1a60c84426cfde0a8631359c05dbc2914f68d6c453df142ecedbe281e1db1078ca109499758382
 MISC metadata.xml 913 BLAKE2B e7a041ce4293eb3bab14c466486960eb3d3268c77cadfc88612844fb0c5a599dd6fac5464a42f2e417cd0e56210020ce9002f35eaf5c2350c0a39158b01b8e84 SHA512 bb1aa91fc1f1e02865cc8de32cfadde8374dae91dd75f060289b0f2e5754ab20e9929f541467d5b369cdb4daf83b25235f1f613e89d1871413f619012701327f
diff --git a/app-admin/pwman3/pwman3-0.11.1.ebuild b/app-admin/pwman3/pwman3-0.11.1.ebuild
new file mode 100644
index 000000000000..d86b04e68b18
--- /dev/null
+++ b/app-admin/pwman3/pwman3-0.11.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 eutils
+
+DESCRIPTION="A lightweight password-manager with multiple database backends"
+HOMEPAGE="https://pwman3.github.io/pwman3/"
+SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="test? ( dev-python/pexpect[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+pkg_postinst() {
+	optfeature "Support for mongodb" dev-python/pymongo
+	optfeature "Support for postgresql" dev-python/psycopg
+	optfeature "Support for mysql" dev-python/pymysql
+}
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 9920234f8d84..4bc153a8708b 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 916 BLAKE2B 976d3259ddf49bfe56dac5904c0bc6dbf956c59f6d05648dad4711c5b2e1f696f6cffbe58cd0f3556f857a8136491505fccf951b927851063daf4da69b6be2f9 SHA512 6c131d9a3572990b08fbe606616708bd92e9849d6de2bde7bb09897b0a5153cbcbf00afbfff8822998ff40c954cf764cbfebfd19599f7d3c35e43dba03e2ae1e
+EBUILD r10k-3.4.1.ebuild 910 BLAKE2B a4e6f91d3df7e02001425938d0f3953b443be9b7f5d06b87aa1b66787ef2ff3285f344c79a1b39f314080c8aa8e0f29df83142697ed6d401302fbddb1fb8484e SHA512 9c49942d7a150548460c2e1c91230f61c8cb2b78de89ba50ce0427db9084c764c8164315bbb07a905ccd6e9c4d975aa31d333bfd10cd0976da8ce2361afcc029
 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.4.1.ebuild
index b8cab218aa30..240033b4fc8f 100644
--- a/app-admin/r10k/r10k-3.4.1.ebuild
+++ b/app-admin/r10k/r10k-3.4.1.ebuild
@@ -30,7 +30,7 @@ ruby_add_rdepend "
 "
 
 ruby_add_bdepend "test? (
-	dev-ruby/archive-tar-minitar
+	>=dev-ruby/minitar-0.9
 )"
 
 RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 893ada94af69..4e0b7369e8ec 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -7,9 +7,11 @@ AUX rasdaemon.openrc-r2 424 BLAKE2B d3be2b06631ec3dc60e464b5fb38a4778e92a93fc284
 DIST rasdaemon-0.6.1.tar.bz2 363201 BLAKE2B bdc7ec3c2e7e4b2fee02dddc55b5afd82df64717f45da15dbfd5fee87721b80ac425af5806ee7462cad29c6ab2953a2e649c4b1e455983d8821a1f633d76c85d SHA512 a221a7ea0e4555befbf8acb9d4ce22d5cc7861a0da458111a24905fa06be0e8f3b18d8de5334310a423657febc0532d2705236de89cb1788302bf487ede29f60
 DIST rasdaemon-0.6.2.tar.bz2 375140 BLAKE2B fd22185172777865120fbd13b7bfb5db9b9b0348fe8575ca6b5f16fd662c1e847729e239342b1c9ece70a4e79ad00352bb69d9f80cfbc8da2c961e68874dd03b SHA512 d8c1ee2cc801124837b3a0739f3016a206165306e300ce51e6aac2cef56bb65479f96cdb019ba3a5cffeba94e7b67ca22686d4ac94bfa8a8a1145db6ba51096b
 DIST rasdaemon-0.6.5.tar.bz2 403435 BLAKE2B bc6fa1aea6a6f0190a4f26df936f0ceb4c9b2ae00183ad9239430a018d9c8178e54b016a0aa9d22d97d851b59321b4a27cad7196f1fc22790d15a19c9c06f6e6 SHA512 aa781f3148ae32c8bc7ff8007574912454180725b9b102e1c7c583101dd1fd96debbdc78f3f2a35db45df359c7547cad4d87b490af66f444341c0dc8429c1310
+DIST rasdaemon-0.6.6.tar.bz2 404681 BLAKE2B 4314cd064b255df1cb1a148914c856d074fda1fc2d63e0554cbf0b78799c4252afdd4e827390729e191ff2ed9f719f6610487e85dd52af2b02694fb17740df05 SHA512 481ecd624ab5521d60ee7c613ee05d1d19b85e914b92eae84d18cb2e6dc788981213d49a6316cf575517b6e180f46c66c65804e4feb518bdd84bc21cd2970e08
 EBUILD rasdaemon-0.6.1-r1.ebuild 931 BLAKE2B fe6abb4a500f9890dbdcb06a457d7a33ab8b138fa22af2d4046ff133a9205a8f75c6e07273e4fb7eeadf3bf8a974e8fcea39e29c4b6d080a627d6619a4c2e5fa SHA512 02871f282b1b7a4f4601293974d7fbccc41ee7c90a590e6d349db20040bd1cbebb562c56acf8c0cbad37dd6e4e04ac0140f2d34e70f208b611b1cb73873a0f67
 EBUILD rasdaemon-0.6.2-r1.ebuild 1033 BLAKE2B f3a939268a9b34f730424f8d7af85c96e0240fb8ed3d6dd8b181bdc720b84622e41f2b2bb541a055dff70bda6f2e5c4952bf53bf68a328a7907b91ea47292892 SHA512 5837d47d13166bed48f89cbd10682550f4c3abd9e4c00d1757d432e9ece382c323e8cdc44b938770517f93a801b1eb2bf91ae93e034a9113f1d123e1f74bc338
 EBUILD rasdaemon-0.6.2-r3.ebuild 1137 BLAKE2B a2402b26a92a0b9e6e6383c27d82e558bfe3f2737702ac3f0b2f57096f2eee6a6ca3ee9e8ab1fadab8366eca762a76d82ee02b783b39c35325b3a5af73f9f881 SHA512 490ed88bed969b3ab6a634bf3b04086b187a58deb39279911339f953f32da0618cb055b488b15996c011b4e681b338e640c162d2cf9a90c96fec47f409455e87
 EBUILD rasdaemon-0.6.2-r4.ebuild 1151 BLAKE2B 15161840fc5b98646cf3fbf08657a5492c054876fae43905f55285f3ae0434a88c238479f7a3c02bbda476f43316b559bb4805df49468f66e206c14d3bec78a0 SHA512 2e7ea61b7294ac22d809f32ed6fef34d73444a7a6f6a6bfa93bc004c7cb1e14c75832aeeda335c5c9e4b82b348fe5520b71a381d713a5ba8e093aa2eff6de6d4
 EBUILD rasdaemon-0.6.5.ebuild 1191 BLAKE2B 4765a18d280b44c87970e1531a33c08cc096e277a77d28a86f20ad94be350b27b4be0f83232386c0c0b71139c46995eaa217a8bd846adb696a9d90dec8b07ab0 SHA512 5d17eca9ba89d70644af169d2e4b52aec7b5898565f4a54b23f8946f5f68b6d689d4231baba00b47230cfd115953ee54ffffc1a0dd60d88f48b651353114c985
+EBUILD rasdaemon-0.6.6.ebuild 1216 BLAKE2B 65a8184eb5eb79ebce498d73cc6bdda0088174d5a7a6ff9aab4a70b4e400c1bda67ad5421c9f63e40511160d83185f40398751e9d89fbd42efc486f45e23c73c SHA512 47c4aa0af953a609ca7f178b8a4348ac7e46c879815b56bf1831019618272f05a4e26f94742335b0088cc741ae70e0ade7255780f89745a4429487887b432ab0
 MISC metadata.xml 871 BLAKE2B c9b484c2fd3019681f9c335fc046c7718c35bcafd9fa46f59328c68fb4404571818b861cb938bcb00fa08a164688a58735d7db27e73120597cd114a3a39acaba SHA512 1815bc3a92340071b40de8129441bbf55fee7edbec94f5337d6a9b42311cc3c1d898598d0756b60b56d804629700a2c0109362933acf5442a74097e752b24935
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.6.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.6.ebuild
new file mode 100644
index 000000000000..65a479d775e3
--- /dev/null
+++ b/app-admin/rasdaemon/rasdaemon-0.6.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd
+
+DESCRIPTION="Reliability, Availability and Serviceability logging tool"
+HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
+SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sqlite"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	sys-devel/gettext
+	sys-apps/dmidecode
+	sqlite? (
+		dev-db/sqlite
+		dev-perl/DBD-SQLite
+	)
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	local CONFIG_CHECK="~ACPI_EXTLOG"
+	check_extra_config
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable sqlite sqlite3)
+		--enable-abrt-report
+		--enable-aer
+		--enable-arm
+		--enable-extlog
+		--enable-hisi-ns-decode
+		--enable-mce
+		--enable-non-standard
+		--enable-devlink
+		--enable-diskerror
+		--enable-memory-ce-pfa
+		--includedir="/usr/include/${PN}"
+		--localstatedir=/var
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir "/var/lib/${PN}"
+
+	systemd_dounit misc/*.service
+
+	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
+	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
+	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
+}
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index 6730ce28d3c7..cad10a1ec96c 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -1,8 +1,4 @@
-DIST Rex-1.10.0.tar.gz 332057 BLAKE2B fb8e22c25c6f5bbc696aa894cc2f77138e830bb7a41fcc42e677ae251b63fffc841d206a9c50dfda60e022fafccf4ca0181ba8ccb50151c74830994929cb70fa SHA512 eaebf722d741d028d1f89beefee756e0b2fa6e3ddb8c2d6196c4183aedb6b1dd0a7f5fd4bc4211e4da26f61138ee974aa689d84d909c8d63cc414f803227dcf2
-DIST Rex-1.11.0.tar.gz 333640 BLAKE2B 72f4ae7c661f90e406810d265fb72fd3114808576fb284ac05add4eac9e8501e1319dc9baffceff22d4480f02a8b56f5a502e41cef5062fd21460a61cfa7731f SHA512 efe4aac2d5437d7e174fcf8b285911abcb416b68fa96a424b5b0a871490c9b7fa5d584a746befcd9f2f57f80d4135e0050db6bf8b6ce150b431b6f1e3b008b70
-DIST Rex-1.9.0.tar.gz 331106 BLAKE2B 74bdf06be9454bc41c444a7d2bf576740e8ecfd2dd575d96172becaac5ee6031506b5ef111c6755a3bc3dcb1eb45722a14c050578cf816815954686a0e79a5ab SHA512 9f9f629d681cc9af3fabccbbb31a881ab7a0414b51e6f1fc45600772b5f7207f8bf27a757955576b15eb7e8e7339e9f4746c497e4111904ad57614ebf1e3cb55
-EBUILD rex-1.10.0.ebuild 5099 BLAKE2B 03293ee5018b5dcee7561f30ce7527b9ca61714799b9855a1e4d08fa8ed9645f4cf9309a42cd18a951a079fbc85de769a9c38e90afcd84dcef84d9cb103f6dc6 SHA512 3584defd83a781332a3bd4e15d69525429bbfe4ed56f79b5b13dff38588c429e9881091b9cb41e75fbcd5315fbbb26036041ee2e9dc7a9756177703770779c81
-EBUILD rex-1.11.0.ebuild 5099 BLAKE2B 03293ee5018b5dcee7561f30ce7527b9ca61714799b9855a1e4d08fa8ed9645f4cf9309a42cd18a951a079fbc85de769a9c38e90afcd84dcef84d9cb103f6dc6 SHA512 3584defd83a781332a3bd4e15d69525429bbfe4ed56f79b5b13dff38588c429e9881091b9cb41e75fbcd5315fbbb26036041ee2e9dc7a9756177703770779c81
-EBUILD rex-1.9.0.ebuild 5099 BLAKE2B 03c38fc711dd43055b32e4e29b9c8e095772d51e4e6c4e419da34e2b41b8d11fb469ef9b79ae94bcb85ac6472aea755c4d84bc9c702d72005e7f096f4c234c9e SHA512 99721ba1d4cd612aa6fe36af8d43e2ddd6087a999925676c3be4326a41092e0e92bd4b06bbcd3b064d9d3fc00ff450a2ecaecf37ca590d579f4eaf2cd9273f01
-EBUILD rex-9999.ebuild 5308 BLAKE2B bc08447e34059b62b505042c79fa977922a4dd08b0e7f0d0ed88ef48309e6344f3b85daf8173a8813d3bf7bc68dffd8d2a8f0056fc7d14e02e6bf4a2c1340645 SHA512 c2e2437dcb88693b1b06a494a5f853f23529ef4496ebfd9682b664d575c680640c48137f1c06af1f252dc89747fa17c81d938a3eecb90c221948cd643be1e813
+DIST Rex-1.12.1.tar.gz 339065 BLAKE2B fd026e66a4e1cf6d4c8b15f7fcba0525a3e98346464170f27d5ef7bb54f1decd7450d87d9f23bee8378df4647eacf512c06a8d051bb76021cbcae472e2c2012d SHA512 774452511d97106bb6586324ff4e8642b05be628c80f3adbba7fd82558c82236878e969512bab398e26a1a7a271a7614108761bd0fb888a2122167806796bad1
+EBUILD rex-1.12.1.ebuild 5372 BLAKE2B 2513d45fb2417fceeea5827fb68cfd69e3148105a488c3f0787179300855ff061e08d497772d55cbbdf1e0d5ad8ef4e1b79ed6feb7faf06b51972a5b9b3cfc8f SHA512 550ec06456643c3f784d29e5aedcb8d4a2903fcd6af76b48f5a1a34758dcb1f2a87284945a0b02eb06b8dbbd2ff2d9ca8043484dd4b7f6333cb27690b2885046
+EBUILD rex-9999.ebuild 5404 BLAKE2B f7e254698b468bae8a28cb3713d3c5cd521715fc62e70297e8a6c25731a65b9618a076997a927a7a1c34add30fe955c2b87362f8e342ca800ab76b9bd389d97b SHA512 de392bb91eb91f6087b95dce28bfd1db29fdb213c46ded63d277299e9b6cbeaa1bb08e1e4c4db047d28e9696e8d87e9d65454b182cf0b7a32d6f8232a052f07a
 MISC metadata.xml 24205 BLAKE2B 76aa5370179f64adaaf79cb730a4cc53deb191a27e97b10cbb26efd804572eb79d67d9abdb09c5e62d08d73d969848286516a2176099237feba2a5c855cd263d SHA512 a6cae05b4f46b10502da5acc2905f622b61a30329c300483cea39348e92d182d190dd61433c551a1948d4ac6a281b9f91c47b759f425055970e8c5a6349b8693
diff --git a/app-admin/rex/rex-1.11.0.ebuild b/app-admin/rex/rex-1.11.0.ebuild
deleted file mode 100644
index 5cc3866dba75..000000000000
--- a/app-admin/rex/rex-1.11.0.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	GITHUB_USER=RexOps
-	GITHUB_REPO=Rex
-	EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git"
-	EGIT_BRANCH="master"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
-	VCS_ECLASS="git-r3"
-else
-	# This is intentional to stop perl-module.eclass doing magic things when it
-	# shouldn't. Like making ${S} contain "Rex" when the git clone has "rex"
-	# Also prevents perl-module.eclass provisioning SRC_URI
-	DIST_AUTHOR=FERKI
-	DIST_NAME=Rex
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit perl-module ${VCS_ECLASS}
-
-DESCRIPTION="(R)?ex, the friendly automation framework"
-
-SLOT="0"
-IUSE="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-Contributors
-	dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome
-	dev-perl/Dist-Zilla-Plugin-Meta-Contributors
-	dev-perl/Dist-Zilla-Plugin-MetaProvides-Package
-	dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic
-	dev-perl/Dist-Zilla-Plugin-OSPrereqs
-	dev-perl/Dist-Zilla-Plugin-OurPkgVersion
-	dev-perl/Dist-Zilla-Plugin-Run
-	dev-perl/Software-License
-"
-RDEPEND="
-	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
-	dev-perl/Hash-Merge
-	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
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Parallel-ForkManager
-	dev-perl/Sort-Naturally
-	dev-perl/String-Escape
-	virtual/perl-Storable
-	dev-perl/TermReadKey
-	virtual/perl-Test-Simple
-	dev-perl/Text-Glob
-	virtual/perl-Text-Tabs+Wrap
-	virtual/perl-Time-HiRes
-	dev-perl/URI
-	dev-perl/XML-LibXML
-	dev-perl/XML-Simple
-	dev-perl/libwww-perl
-	dev-perl/YAML
-	virtual/perl-version
-"
-
-BDEPEND="
-	${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-7.110.100
-	test? (
-		virtual/perl-File-Temp
-		dev-perl/Test-Deep
-		>=dev-perl/Test-UseAllModules-0.150.0
-	)
-"
-
-[[ ${PV} == 9999 ]] && BDEPEND+=" ${DZIL_DEPENDS}"
-
-src_unpack() {
-	if [[ $PV == 9999 ]]; then
-		"${VCS_ECLASS}"_src_unpack
-		mkdir -p "${S}" || die "Can't make ${S}"
-	else
-		default
-	fi
-}
-
-dzil_src_prep() {
-	einfo "Patching dist.ini"
-
-	# This block of sed invocations removes all plugins that aren't
-	# useful for users to have on Gentoo, because all of them are
-	# conditional and subjective style checks, which don't indicate
-	# a real issue for users, and paying the price of their dependencies is undesired.
-
-	# The {N;d} trick adds the [n]ext line after the match to the pattern-space
-	# 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 '/^Test::Kwalitee =/d' \
-		-e '/^Test::PerlTidy =/d' \
-		-e '/^Test::Pod =/d' \
-		-e '/^\[Test::CPAN::Changes\]/{N;d}' \
-		-e '/^\[Test::MinimumVersion\]/{N;d}' \
-		-i dist.ini || die "Can't patch dist.ini"
-}
-dzil_env_setup() {
-	# NextRelease noise :(
-	mkdir -p ~/.dzil/
-	local user="$(whoami)"
-	local host="$(hostname)"
-	printf '[%%User]\nname = %s\nemail = %s' "${user}" "${user}@${host}" >> ~/.dzil/config.ini
-
-}
-dzil_to_distdir() {
-	local dzil_root dest has_missing modname dzil_version
-	dzil_root="$1"
-	dest="$2"
-
-	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
-
-	dzil_src_prep
-	dzil_env_setup
-
-	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
-	einfo "Generating CPAN dist with ${dzil_version}"
-
-	has_missing=""
-
-	einfo "Checking dzil authordeps"
-	while IFS= read -d $'\n' -r modname; do
-		if [[ -z "${has_missing}" ]]; then
-		has_missing=1
-			eerror "'dzil authordeps' indicates missing build dependencies"
-			eerror "These will prevent building, please report a bug"
-			eerror "Missing:"
-		fi
-		eerror "  ${modname}"
-	done < <( dzil authordeps --missing --versions )
-
-	[[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
-
-	einfo "Checking dzil build deps"
-	while IFS= read -d $'\n' -r modname; do
-		if [[ -z "${has_missing}" ]]; then
-			has_missing=1
-			ewarn "'dzil listdeps' indicates missing build dependencies"
-			ewarn "These may prevent building, please report a bug if they do"
-			ewarn "Missing:"
-		fi
-		ewarn "  ${modname}"
-	done < <( dzil listdeps --missing --versions --author )
-
-	einfo "Generating release"
-	dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999 ]]; then
-		# Uses git sources in WORKDIR/rex-git
-		# to generate a CPAN-style tree in ${S}
-		# before letting perl-module.eclass do the rest
-		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
-	fi
-	cd "${S}" || die "Can't enter build dir"
-	perl-module_src_prepare
-}
diff --git a/app-admin/rex/rex-1.10.0.ebuild b/app-admin/rex/rex-1.12.1.ebuild
index 5cc3866dba75..d8e8649d2bd7 100644
--- a/app-admin/rex/rex-1.10.0.ebuild
+++ b/app-admin/rex/rex-1.12.1.ebuild
@@ -18,7 +18,7 @@ else
 	DIST_NAME=Rex
 	KEYWORDS="~amd64 ~x86"
 fi
-inherit perl-module ${VCS_ECLASS}
+inherit bash-completion-r1 perl-module ${VCS_ECLASS}
 
 DESCRIPTION="(R)?ex, the friendly automation framework"
 
@@ -83,10 +83,12 @@ RDEPEND="
 BDEPEND="
 	${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-7.110.100
+	>=dev-perl/File-ShareDir-Install-0.60.0
 	test? (
 		virtual/perl-File-Temp
 		dev-perl/Test-Deep
 		>=dev-perl/Test-UseAllModules-0.150.0
+		virtual/perl-autodie
 	)
 "
 
@@ -183,3 +185,12 @@ src_prepare() {
 	cd "${S}" || die "Can't enter build dir"
 	perl-module_src_prepare
 }
+
+src_install() {
+	newbashcomp "share/${PN}-tab-completion.bash" "${PN}"
+
+	insinto /usr/share/zsh/site-functions
+	newins "share/${PN}-tab-completion.zsh" "_${PN}"
+
+	perl-module_src_install
+}
diff --git a/app-admin/rex/rex-1.9.0.ebuild b/app-admin/rex/rex-1.9.0.ebuild
deleted file mode 100644
index 26385e391279..000000000000
--- a/app-admin/rex/rex-1.9.0.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	GITHUB_USER=RexOps
-	GITHUB_REPO=Rex
-	EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git"
-	EGIT_BRANCH="master"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
-	VCS_ECLASS="git-r3"
-else
-	# This is intentional to stop perl-module.eclass doing magic things when it
-	# shouldn't. Like making ${S} contain "Rex" when the git clone has "rex"
-	# Also prevents perl-module.eclass provisioning SRC_URI
-	DIST_AUTHOR=FERKI
-	DIST_NAME=Rex
-	KEYWORDS="~amd64 ~x86"
-fi
-inherit perl-module ${VCS_ECLASS}
-
-DESCRIPTION="(R)?ex, the friendly automation framework"
-
-SLOT="0"
-IUSE="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-Contributors
-	dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome
-	dev-perl/Dist-Zilla-Plugin-Meta-Contributors
-	dev-perl/Dist-Zilla-Plugin-MetaProvides-Package
-	dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic
-	dev-perl/Dist-Zilla-Plugin-OSPrereqs
-	dev-perl/Dist-Zilla-Plugin-OurPkgVersion
-	dev-perl/Dist-Zilla-Plugin-Run
-	dev-perl/Software-License
-"
-RDEPEND="
-	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
-	dev-perl/Hash-Merge
-	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
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Parallel-ForkManager
-	dev-perl/Sort-Naturally
-	dev-perl/String-Escape
-	virtual/perl-Storable
-	dev-perl/TermReadKey
-	virtual/perl-Test-Simple
-	dev-perl/Text-Glob
-	virtual/perl-Text-Tabs+Wrap
-	virtual/perl-Time-HiRes
-	dev-perl/URI
-	dev-perl/XML-LibXML
-	dev-perl/XML-Simple
-	dev-perl/libwww-perl
-	dev-perl/YAML
-	virtual/perl-version
-"
-
-BDEPEND="
-	${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-7.110.100
-	test? (
-		virtual/perl-File-Temp
-		dev-perl/Test-Deep
-		>=dev-perl/Test-UseAllModules-0.150.0
-	)
-"
-
-[[ ${PV} == 9999 ]] && BDEPEND+=" ${DZIL_DEPENDS}"
-
-src_unpack() {
-	if [[ $PV == 9999 ]]; then
-		"${VCS_ECLASS}"_src_unpack
-		mkdir -p "${S}" || die "Can't make ${S}"
-	else
-		default
-	fi
-}
-
-dzil_src_prep() {
-	einfo "Patching dist.ini"
-
-	# This block of sed invocations removes all plugins that aren't
-	# useful for users to have on Gentoo, because all of them are
-	# conditional and subjective style checks, which don't indicate
-	# a real issue for users, and paying the price of their dependencies is undesired.
-
-	# The {N;d} trick adds the [n]ext line after the match to the pattern-space
-	# 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 '/^Test::Kwalitee =/d' \
-		-e '/^Test::PerlTidy =/d' \
-		-e '/^Test::Pod =/d' \
-		-e '/^\[Test::CPAN::Changes\]/{N;d}' \
-		-e '/^\[Test::MinimumVersion\]/{N;d}' \
-		-i dist.ini || die "Can't patch dist.ini"
-}
-dzil_env_setup() {
-	# NextVersion noise :(
-	mkdir -p ~/.dzil/
-	local user="$(whoami)"
-	local host="$(hostname)"
-	printf '[%%User]\nname = %s\nemail = %s' "${user}" "${user}@${host}" >> ~/.dzil/config.ini
-
-}
-dzil_to_distdir() {
-	local dzil_root dest has_missing modname dzil_version
-	dzil_root="$1"
-	dest="$2"
-
-	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
-
-	dzil_src_prep
-	dzil_env_setup
-
-	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
-	einfo "Generating CPAN dist with ${dzil_version}"
-
-	has_missing=""
-
-	einfo "Checking dzil authordeps"
-	while IFS= read -d $'\n' -r modname; do
-		if [[ -z "${has_missing}" ]]; then
-		has_missing=1
-			eerror "'dzil authordeps' indicates missing build dependencies"
-			eerror "These will prevent building, please report a bug"
-			eerror "Missing:"
-		fi
-		eerror "  ${modname}"
-	done < <( dzil authordeps --missing --versions )
-
-	[[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
-
-	einfo "Checking dzil build deps"
-	while IFS= read -d $'\n' -r modname; do
-		if [[ -z "${has_missing}" ]]; then
-			has_missing=1
-			ewarn "'dzil listdeps' indicates missing build dependencies"
-			ewarn "These may prevent building, please report a bug if they do"
-			ewarn "Missing:"
-		fi
-		ewarn "  ${modname}"
-	done < <( dzil listdeps --missing --versions --author )
-
-	einfo "Generating release"
-	dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
-}
-
-src_prepare() {
-	if [[ ${PV} == 9999 ]]; then
-		# Uses git sources in WORKDIR/rex-git
-		# to generate a CPAN-style tree in ${S}
-		# before letting perl-module.eclass do the rest
-		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
-	fi
-	cd "${S}" || die "Can't enter build dir"
-	perl-module_src_prepare
-}
diff --git a/app-admin/rex/rex-9999.ebuild b/app-admin/rex/rex-9999.ebuild
index 02f767b58c6f..85e62dace75d 100644
--- a/app-admin/rex/rex-9999.ebuild
+++ b/app-admin/rex/rex-9999.ebuild
@@ -30,6 +30,7 @@ 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
@@ -83,10 +84,12 @@ RDEPEND="
 BDEPEND="
 	${RDEPEND}
 	>=virtual/perl-ExtUtils-MakeMaker-7.110.100
+	>=dev-perl/File-ShareDir-Install-0.60.0
 	test? (
 		virtual/perl-File-Temp
 		dev-perl/Test-Deep
 		>=dev-perl/Test-UseAllModules-0.150.0
+		virtual/perl-autodie
 	)
 "
 
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index e0bfe7d58298..dd8ba1f586c2 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -12,6 +12,6 @@ DIST rsyslog-doc-8.1911.0.tar.gz 8183360 BLAKE2B f5681945fb30ddf9c21a60ebafaf996
 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
 EBUILD rsyslog-8.1911.0-r1.ebuild 12536 BLAKE2B aefb55649f1aaf7b98b5a9f85e87188dcd1546c149023190dcde3f292d7065bd4249f39e19459fbf1b0d34ceb28204ec5b201f4e3cc6b0946f70b46017554a84 SHA512 0bec3b0bdeb0f36b88569f74af758d43c8816955c53dffd74d991fff2f6c211c55a16c2ed09ad38cb34720439a9afa31198ebf4b585b3577576346018e88c931
-EBUILD rsyslog-8.2004.0.ebuild 12623 BLAKE2B 068bf003cf636f1acc1bbd5a07a1cf81ecffd004ccd06bc2e480b1474a25104a8972cb61d1a26846fc5300c3ee982fe37405232d309eb86401bdf61fdd6adcaf SHA512 bae98b989fa7179015c095bf244b37342c3a8cb2623c5e6ba92690504837fcc2da5ee6f9ae7040f488e850b29343a1d47bad0304c61205af693cc538cbd08ecb
+EBUILD rsyslog-8.2004.0.ebuild 12621 BLAKE2B 253e27ebb4dd77748707be57581c480aaece89f2df6ef6a470ff39364abeb737f0acb218bf0ae678c37645149c67616799bd9cae6a149723eb96c15f19c41822 SHA512 904958441dfb287afaf43efc4d6b8feaa481171d2bedb312102d68da67d9dc80e97aa26fda1a130db1825b9dcf6c619691e97c9284725036e644e74bececa95b
 EBUILD rsyslog-8.2006.0.ebuild 12550 BLAKE2B 7823b49926d0b1f648181f60629d707f69f8b84350a189f2bad57266ba5d717b3d8d1ee14afec139b3f4d1f610998eda74c23c5de770a7ade7116474f4238217 SHA512 180285602372bbf5b6c5eb1efb3312ce435e7fcedf2c4168004e2775dc8159c59bbd00d8712c378268cd11b37e68da6ccd74261f73dfc69f53fa57a730351835
 MISC metadata.xml 3874 BLAKE2B c09a57dcbd88bda6c510ca741e1ee8c5207e5906843fe3ae21c8dd6575c7b104dae74e79e5a27c8bf9f0348673f5c33eb6c4b12fafbb1ba64f1a9f81bd374eaa SHA512 2f7a72017376018aa5d864deb33675d51ab50cd8481dffb7f1421b83d4e07f19a86a90705dbb6191686fc650284e2bcbe30ed0af07082b57eef46dd615778868
diff --git a/app-admin/rsyslog/rsyslog-8.2004.0.ebuild b/app-admin/rsyslog/rsyslog-8.2004.0.ebuild
index 92ca5be2ae67..f19f412c686e 100644
--- a/app-admin/rsyslog/rsyslog-8.2004.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2004.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/salt/Manifest b/app-admin/salt/Manifest
index 17e025009bfc..838e295ff143 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -5,6 +5,7 @@ AUX master-initd-4 311 BLAKE2B 302e71b0328d47addd1508e1992ee56c719463d4b99af37b6
 AUX minion-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
 AUX minion-initd-4 317 BLAKE2B 4c207bd26a72d5dded38e40f7869f46263272a841b978f138248d016a06e837c3aebebabd15314e3896b404058c3f5dd5e6a1cca48450b07b88b6edef6a8d7d2 SHA512 80790ed1b5f86b713ca6384d60253676b16b10c122810ed07b7119c3860bedfe40102f6b7de86d832f084d84f87bf9405ec282629f981767a534d2a53144845f
 AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17
+AUX salt-2019.2.0-remove-raet-tests.patch 2186 BLAKE2B c472be7aa3bc31b0c412efdda564c85a2774ad40a1754d3744e151982830931809005373f78d08d6feb24b7b2e4a7e3e6eec10f693e2beea952f90867b0c9858 SHA512 ad39527aea87092b06cccbb63c46536f0a6cecc3dd9ddec6fdb131dd4d0d3d692624eaeeb2ac5ff64ebdfcc0f2f722ebb6fbc334d494f76ec3771c7905c02b90
 AUX salt-2019.2.0-skip-tests-that-oom-machine.patch 739 BLAKE2B c0e1b18c528ddcdc19e93061112d2c42aeca96f9091218e7ad6b4eadf11255079cecd6b9b9def576c663b4ba794d151db8fc32336b1c29c3da8e9c18c09582f3 SHA512 0bd8fc2ab73be8ffc9fdda65a60c7306dbfa9f76d874994ba09db7ef71678fca80c8fde5963d22b5bbbe3b933140a56f2173f4c109b47dd9e9c3c9a70062b0e3
 AUX salt-2019.2.0-tests.patch 2793 BLAKE2B c609564673db7388a876902deb57f0aec70531ea26536954efdabdd8849eee314e840cc299f6e1fbd6a18740847a9ee8d217426adee38d36ae569f6e2e9c85ae SHA512 eb1d61f5410b36d0749cce5fc7dc08a8950061f7fb3497a122702eba7638ec3e635750b25ad5cacc4839d4828f13785ea122df43e8aff7635d79283be0392f02
 AUX salt-2019.2.2-newer-deps.patch 6635 BLAKE2B 377b06231914bbbfc0ca279bb169e0167f5dec0d421e221f7441a237c11d9670e5fd378d294c02fe16bd5989f2cb0db9864eb2270dbe09755475e9e6fcc059de SHA512 24faf550a0de753eb605df8fe658b71972048be781bb77df0c11f3ed7eda6b423897d1f88d84dad3f5d9e8d3db0784cbfe8d1a017c950661de56deb7edb23eaf
@@ -24,7 +25,7 @@ DIST salt-2019.2.5.tar.gz 14574347 BLAKE2B d456dd493e79640260f3ad3c964fdaaa26dd7
 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
-EBUILD salt-2019.2.5.ebuild 4834 BLAKE2B 71c3b4a2e248f2ce8f3a6264a2a72b6dc2948d01194ab923128225db64edf2e2cf35bb28f4b0a172c4859e30f4dc10b3165af12f71d895f360d9ab94f1e2b926 SHA512 21b6984da017d69f5f25a322c6b64605ff8f57fc9f818c961a3ca7330930742117d97f8d8185262b75ba91df254eb2ef64192f74f3176433bbad9e9dcf6d4483
+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
 MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5
diff --git a/app-admin/salt/files/salt-2019.2.0-remove-raet-tests.patch b/app-admin/salt/files/salt-2019.2.0-remove-raet-tests.patch
new file mode 100644
index 000000000000..fab9f38df771
--- /dev/null
+++ b/app-admin/salt/files/salt-2019.2.0-remove-raet-tests.patch
@@ -0,0 +1,43 @@
+diff --git a/tests/unit/modules/test_event.py b/tests/unit/modules/test_event.py
+index e5d2c946ae..e9140670cb 100644
+--- a/tests/unit/modules/test_event.py
++++ b/tests/unit/modules/test_event.py
+@@ -47,12 +47,6 @@ class EventTestCase(TestCase, LoaderModuleMockMixin):
+             preload = {'id': 'id', 'tag': 'tag', 'data': 'data',
+                        'tok': 'salt', 'cmd': '_minion_event'}
+ 
+-            with patch.dict(event.__opts__, {'transport': 'raet',
+-                                             'local': False}):
+-                with patch.object(salt_transport_channel_factory, 'send',
+-                                  return_value=None):
+-                    self.assertTrue(event.fire_master('data', 'tag'))
+-
+             with patch.dict(event.__opts__, {'transport': 'A',
+                                              'master_uri': 'localhost',
+                                              'local': False}):
+diff --git a/tests/unit/utils/test_verify.py b/tests/unit/utils/test_verify.py
+index 63b9ae3181..2c8294ef77 100644
+--- a/tests/unit/utils/test_verify.py
++++ b/tests/unit/utils/test_verify.py
+@@ -326,7 +326,7 @@ class TestVerifyLog(TestCase):
+         verify_log_files([path], getpass.getuser())
+         self.assertTrue(os.path.exists(path))
+ 
+-
++@skipIf(True, "broken under sandbox")
+ class TestCleanPath(TestCase):
+     '''
+     salt.utils.clean_path works as expected
+@@ -396,10 +396,10 @@ class TestCleanPathLink(TestCase):
+         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)
++        assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path)
+ 
+     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')
+         ret = clean_path(self.from_path, test_path)
+-        assert ret == expect_path, "{} is not {}".format(ret, expect_path)
++        assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path)
diff --git a/app-admin/salt/salt-2019.2.5.ebuild b/app-admin/salt/salt-2019.2.5-r1.ebuild
index d8fbc93eb97c..e39bedf18983 100644
--- a/app-admin/salt/salt-2019.2.5.ebuild
+++ b/app-admin/salt/salt-2019.2.5-r1.ebuild
@@ -23,7 +23,7 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova
-	openssl portage profile redis selinux test raet +zeromq vim-syntax"
+	openssl portage profile redis selinux test vim-syntax"
 
 RDEPEND="
 	sys-apps/pciutils
@@ -33,6 +33,8 @@ RDEPEND="
 	<dev-python/msgpack-1.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
@@ -45,15 +47,6 @@ RDEPEND="
 		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}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
 	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
@@ -87,7 +80,6 @@ BDEPEND="
 
 DOCS=( README.rst AUTHORS )
 
-REQUIRED_USE="|| ( raet zeromq )"
 RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
@@ -96,6 +88,7 @@ PATCHES=(
 	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
 	"${FILESDIR}/salt-2019.2.2-newer-deps.patch"
 	"${FILESDIR}/salt-2019.2.2-workaround-broken-mock-on-py2.patch"
+	"${FILESDIR}/salt-2019.2.0-remove-raet-tests.patch"
 )
 
 python_prepare() {
@@ -104,6 +97,14 @@ python_prepare() {
 	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
 	rm tests/unit/states/test_boto_vpc.py || die
 
+	# breaks with permission errors
+	rm tests/unit/utils/test_cache.py || die
+
+	# remove raet due to deps being dropped
+	rm tests/unit/modules/test_raet_publish.py \
+		salt/transport/raet.py \
+		salt/daemons/test/test_raetkey.py || die
+
 	# allow the use of the renamed msgpack
 	sed -i '/^msgpack/d' requirements/base.txt || die
 }
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 42a04fc98308..9c21e2198fff 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,7 +1,5 @@
 AUX setools-4.2.2-remove-gui.patch 970 BLAKE2B b3d701d0e9b4de0a3f66ca8696700e70becfa5de068e385d12ca61f76ca59f495a69fac65ee986fa548bfec2487f21b5b948da2d729cef8a3008d906c9f7e73d SHA512 088be5d53e4402fa91bec20b3d85b8c1a77b41ebde1bbb44909e740b140bd6f79b641b68f56d258ad5a4af40df3023745663acb305a810ee19f126a0e99f1e6b
-DIST setools-4.2.1.tar.gz 365096 BLAKE2B f415ec15ce7caade2a511896c6027720ecd8b4fae938d9dee1e0b677388966557b9615503df58dd6057f5c0ef81690f753f3e1af773ef5fd8095b29aca0ab249 SHA512 7d00295fe7ff16e96e15266807f8e0a67cc2978f9051cd85afb9ee71ca7fad16ccf7421a4a163bb793950bc20a44f3cbb8409b4e0642d0f96cf7a3df7bc59c31
 DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
-EBUILD setools-4.2.1.ebuild 1216 BLAKE2B 65c9e9268f32bca6b7a1bda27d375e4503c847ca634724e34a68b549b3f96453d1484cd6b11ac9bed4aa41bc76ac6afc19fc7aad7e56d084c0db8cd4ca966215 SHA512 206f08ac8c1b74c07cbcd125248b05098cbedc3dfc502afc1e856ea6a9679601af84382a23e304319ca4dfe65b16836fc5c81691660d56d9d4fb1afba54ee3ef
 EBUILD setools-4.2.2.ebuild 1244 BLAKE2B 12679432d583a6d7cf3bc5b4934afe807baa10beb06cd65554eff037041e4b920ca969cd74e7af575bc14987dd56e5490b54c8b99f31fe93309e30ebebd79800 SHA512 15d41d5cabd0cc8c5f0996379d371342701c42cfbf25e73c72d753bc798fc294ec0e6074b4d04074bc4965bc015acf1d16a083eeef1600b3f57e0eab54a136f6
 EBUILD setools-9999.ebuild 1246 BLAKE2B 96a9668a3c3da8e18bb5c07a14914024776737cdb485963536e8686851538b661fe2deb1032fc8af57101117534cceaeafe7e11d1df4eefb82ab5203d0bd3749 SHA512 8b5f81c50005b285bf67af722f0bef81fac45692764669363241c9fbdc65822c7f0bf40f2be6ba01742ab2b78b41ce4965dd0e5f63aedac0a641209979bf9e1f
 MISC metadata.xml 401 BLAKE2B dc411a73d59193727d72889e4e5f3840aa9cf7b1b6ef55f28ab6a6beee533276954e27fe105a60c392c49ac761745304865c221ff9417464112eb866f35bf6e9 SHA512 354eb8fc14e5673dfd6ad2781a784cd6d77442bf879a96c206b758615c1612397c09c20161efb9e37bc56a588e97a74a20939773dec0b1f137eb6ac353234d2f
diff --git a/app-admin/setools/setools-4.2.1.ebuild b/app-admin/setools/setools-4.2.1.ebuild
deleted file mode 100644
index 80de4a986b63..000000000000
--- a/app-admin/setools/setools-4.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Policy Analysis Tools for SELinux"
-HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
-else
-	SRC_URI="https://github.com/SELinuxProject/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="X test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
-	>=sys-libs/libsepol-2.8:=
-	>=sys-libs/libselinux-2.8:=
-	X? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.27
-	test? (
-		sys-apps/checkpolicy
-	)"
-
-python_prepare_all() {
-	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
-	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
-		die "failed to set lib_dirs"
-
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index f4dd11c1de2c..e511ed383d83 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -2,6 +2,8 @@ AUX sshguard-2.1.0-conf.patch 408 BLAKE2B bec9debaa542d7d2d7f21d5308cda162a75a63
 AUX sshguard.confd 634 BLAKE2B f083e6d4f7df6cefae89ef382a82cd7c5863c6a2ded34aee61ab028f8320c35552b80d5d8222ed35adb13a70cf6096eb5d88749f5b5ff72ca483f27fd1c0de56 SHA512 72b2a9c995bcb604516525f8190eaf35fa57e18274f83a8d00fd5b223b598c0c4ffd8b7ce89b1139c89380e5a7181c8024a6041375c445edb29c8f8b49abee50
 AUX sshguard.initd-r2 389 BLAKE2B b4098e0baf82e1c1f1978d6b3916fe9f2e67891d02b7b842492558f9b44c1c0c23204d88c036f49e069c42b0fbbdba31d8292419a2d22e603f29926228a8a223 SHA512 951ea1479836d1b318c35be03c340e5101aa3663bf2581cd0d928de2fea36f0b7906e50d9abf1b6b11fa682427e8d72b45bc95bb8f40a85fb471bfe354108108
 DIST sshguard-2.4.0.tar.gz 771506 BLAKE2B 82e9caf70dc9a1ba9ef6ba1c0916424a74891c84069a4a879c9057f3baea32af68f35d8b31cacdd60d323f5ec7b02a6e12aff1ec72fc0291b74c4882cd441d93 SHA512 64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6
+DIST sshguard-2.4.1.tar.gz 723940 BLAKE2B 04e72b9959ef3ead418d2a6fe8029b0806a4d91c91f7cd36c236c7203cca1afc67305b21de0b1dee1594b188564f201ff2770d54d4c57c54b4d23db15e0298a0 SHA512 bae7485d963454f2a6dc4b7d96506b03fb49013fe3ab3d81e315ea88bd8067e7a2305cdf25e411720ac014a68ee9635cdbcef65a7dc806b7fc942f099a9d5ba8
 EBUILD sshguard-2.4.0.ebuild 746 BLAKE2B 0284fa3b1f9204fbca96a816efbe9c547556fd3b0cc18c5cf8b35d1e90bed01f4e0db7d0cf1705a575486ef11cbfd609deb8b06eb5c3a841415b853e62d96530 SHA512 8e6a32839fee40b4870ddd1b4308b44c8b3d3a0e9136f269bb935178e9f8551b8194a4a8e6f20f778c4a77ec261009928fa7267f357986ca27617d532360fddb
+EBUILD sshguard-2.4.1.ebuild 748 BLAKE2B ca2ca57e1e8701e864e85ac94eac7f1379376df940719c2248a6eb0ddb96512f0ff26f4c6ca962a9c68534ac15262f0f83c3dc436707ea733516ab4a1e08fbf6 SHA512 5c72d111c83de5dba984cd1bd9d45cc38c069f50382d4429b92f2bcb6cfd324dfd5ae2f335e3563ab24a227d54a9661dda4859b9ee63add76340874d727b7e3e
 EBUILD sshguard-99999.ebuild 799 BLAKE2B 38b307936f73e2926466241496fdf59a6cf7def5e60405674a1a07666cdbf0042310977e79078352e623244670e22a8cd41b2ff7969b2ca6577441beca55ca69 SHA512 a33dbdc779c7021aecfa9927eb7e41313ce8b82f3509f1a33e8beacae5597db7e8f5b1a1484edee7e03956fe07d9a39717673985bc8988dba0e20835cd722aea
 MISC metadata.xml 348 BLAKE2B 9dd6c721b71bc5c73a367a9a7e4ef55ee0f0805c917968e66788716241db4c4aa4479ceffdb881d26c7da8b53fd2a5db921c7ef4138e9ff5401e621124d0bc19 SHA512 b93ba2b6eb5371962e1565ef4a333b50ba0dc44ae4365486fd55b04bdac546c8ff68fedebbb7a01d3cb4810f48148bfb870bef952b631fca931cf149ea8429ec
diff --git a/app-admin/sshguard/sshguard-2.4.1.ebuild b/app-admin/sshguard/sshguard-2.4.1.ebuild
new file mode 100644
index 000000000000..99d5bbe8f103
--- /dev/null
+++ b/app-admin/sshguard/sshguard-2.4.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="https://www.sshguard.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="
+	sys-devel/flex
+"
+RDEPEND="
+	virtual/logger
+"
+DOCS=(
+	CHANGELOG.rst
+	CONTRIBUTING.rst
+	README.rst
+	examples/net.sshguard.plist
+	examples/sshguard.service
+	examples/whitelistfile.example
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-conf.patch
+)
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	insinto /etc
+	newins examples/sshguard.conf.sample sshguard.conf
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 1866b73319b8..f96f47e02bb5 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,10 +1,10 @@
 DIST sudo-1.8.31.tar.gz 3350674 BLAKE2B de5a968732fdd58933b4c513d13c43a08cb50075a00c3e0d338c9892570a416a2b3a8f19940c0893715f4eeab991e804831a87ef656ffd91e7f1ba047c119261 SHA512 b9e408a322938c7a712458e9012d8a5f648fba5b23a5057cf5d8372c7f931262595f1575c32c32b9cb1a04af670ff4611e7df48d197e5c4cc038d6b65439a28a
 DIST sudo-1.8.31p1.tar.gz 3351312 BLAKE2B 85775ef574a3a1a9cc749809fe81f8350f7a4e3f46a905bc3392790b20bb7bc8e3c99fb504e01776f3a92aa6afa7972d3ff1c071aadd3a08ee1d2281f8b9ba50 SHA512 9344fd1d8a8445e8afb9c5628cdc832fe32ea29199f071f35fb6ec694371801556df560f4382afec199f468b1f3264ad5e3a89e964612e571b8d911f823724cc
-DIST sudo-1.9.0.tar.gz 3743850 BLAKE2B 47d557afb13eee300d379ae31aae34cf7cf1e5ad140c6d7e599f687cca2cc259ec17f9ec0b3ca6f0badef81bb6e9d659e3e2bb77d9994218a9a3d88ec7ff2c19 SHA512 f2a191ea5fc65865718b110d4aca187cb5e2cd55c9c891fab32f21401e56f825f34c373e346c55c64fa49cec4d802efb63ccebf3d4a4e31d9a433077daf013b1
-DIST sudo-1.9.1.tar.gz 3834744 BLAKE2B 835eaae5b61627da65f40f04646b261093c56f77bdfb1b64f746e569a4bfafcfbb31d88ab301bf8544a8714f43d3416a792ee8b0fdcb75d81dbc6fcf29551f0b SHA512 7994c7d8f020188eda51787bb5f6fe7668518cc89b711e7840470db7e5bac1219490ffccc73854fecb14ceb3ffaf0fc605f3438c87b83f27921ea3626365105c
+DIST sudo-1.8.31p2.tar.gz 3353538 BLAKE2B 274c72232e18c8ff5006b61ad4d384582ec0296af6326377f08ff4e59c6a4a4fc5e2245874bf9a7c6b010addae600dd41f042660d5bf9c4bc8eb98983704a5da SHA512 ad1bbbde74d3ab6e947071c6f21e436ebabcf5af11ecc75cde8f0c01ca0b8c6ae1cce2ff42f21612816c636e96722a2a14daa57757644ceab6577091f82242be
+DIST sudo-1.9.2.tar.gz 3890859 BLAKE2B 879917b8045c999a17ef36006732509aa546ee6bb04de77191fb637aa0420d54f9e51ec69b697c22119d638393e9c84efcc1ca5e6e8ee5f0c08bb1ca07f3acea SHA512 20afdf2604b1c93395157382b24f225cd1ff88d3a892362e2d69fecd240c4e7171f05032c08be1778cd1dea6e460025e4241f57272fac0ea3550e220b6d73d21
 EBUILD sudo-1.8.31.ebuild 6863 BLAKE2B 605dcb95b2668e74e9fbc915c98aad1c787919036b450476e9c9d50e2151489154d2232d0c1e445bfc6647cccecc240f508c2ef636e64331fcfbce385025ad72 SHA512 ccf9c659c89e469ad9cd0282ef2165a549344734dd3638226506944e39a39574af5f56d96ff0108880571a56a9eb457077fd2e73889fbb9c27a0e766b88f9abc
 EBUILD sudo-1.8.31_p1.ebuild 6872 BLAKE2B df4b0b8974bebc5683f9e1e1331c1e25f8c2dea63bd8162a3906dda75c92197a35007d3fb3fb257cee91643918be81222cf0141ab13f28a3a789c0c96053cc1b SHA512 688162c59941c57261c7a15726bb5a368bbc40a990c98d18d7d46f67fd0aef3f1a332703a79691f0c133af0202beeaf0af1e8249a8ab6fad0879899698f40f89
-EBUILD sudo-1.9.0-r1.ebuild 6878 BLAKE2B d6ad927f05ef58e372c5d26c9cae06df0b939a25148a89f981fd460078708b681fa4d76f99353bf7fc6187e027b2552d26d46835e119eba1edfd5d72a49d8986 SHA512 8c6f351b9d8e450878c6ad70f26a1f0305a5691e6480e8ccba14d4d22c78a68f2e79a95e85d5f63981652fd847064f04964faa27cbea525b81deb5f4b18715f9
-EBUILD sudo-1.9.1.ebuild 6878 BLAKE2B d6ad927f05ef58e372c5d26c9cae06df0b939a25148a89f981fd460078708b681fa4d76f99353bf7fc6187e027b2552d26d46835e119eba1edfd5d72a49d8986 SHA512 8c6f351b9d8e450878c6ad70f26a1f0305a5691e6480e8ccba14d4d22c78a68f2e79a95e85d5f63981652fd847064f04964faa27cbea525b81deb5f4b18715f9
-EBUILD sudo-9999.ebuild 6818 BLAKE2B 7e4ab79b53a510067f52d4082ba38331b12083104b61c53d737d701ed1edd7150d7dd4302b42bd958175307fb0374496bd41a4ab683f363fb94e9dd8fcd12944 SHA512 4e1ab7142549eab298f1ef450877789d405c425abf9e13cf8b739c1805ed1c71a0bd2651273a928b57e113bbcb73734af754b730d4cd114c905651e3b1633296
+EBUILD sudo-1.8.31_p2.ebuild 6872 BLAKE2B df4b0b8974bebc5683f9e1e1331c1e25f8c2dea63bd8162a3906dda75c92197a35007d3fb3fb257cee91643918be81222cf0141ab13f28a3a789c0c96053cc1b SHA512 688162c59941c57261c7a15726bb5a368bbc40a990c98d18d7d46f67fd0aef3f1a332703a79691f0c133af0202beeaf0af1e8249a8ab6fad0879899698f40f89
+EBUILD sudo-1.9.2.ebuild 6929 BLAKE2B 948fdcbe5caf74d63fd11480ba55c30bd3b02c27800535c4022f83eb17ef4f0313fe0c10f76c5d85af395ada58bf9e57bee0be71f751b36c2b7a59487e286a8a SHA512 afa68f7077fc674a20242fc7bed81a31c1d46b6ad4b443f1c3a858290b196b82d3ce4df918efecb9b3b2ff3a6771e9febfba541fc03f96c3811fe2d98f127264
+EBUILD sudo-9999.ebuild 6821 BLAKE2B 6ec4c8325e4275d902df02e971ca9b3e87a24b312cabcec7909c8ce94c4662aabada79fe550305603ad92151483bb3ba02a92b1ac49807ed0ba6fa7b14da0f12 SHA512 92536adcffa6e1c62e701d7a00a9032a60d559aa114d196e9851f198321ea8d027e9f7caf598f9d0eae2182362520a3c1ba62117d13b8e8b8ed6c5d9f212e7ac
 MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6
diff --git a/app-admin/sudo/sudo-1.9.1.ebuild b/app-admin/sudo/sudo-1.8.31_p2.ebuild
index 896554456b5a..f0df8a6c9e22 100644
--- a/app-admin/sudo/sudo-1.9.1.ebuild
+++ b/app-admin/sudo/sudo-1.8.31_p2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit pam multilib libtool systemd tmpfiles
+inherit pam multilib libtool tmpfiles
 
 MY_P="${P/_/}"
 MY_P="${MY_P/beta/b}"
@@ -30,11 +30,10 @@ fi
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest"
 
 DEPEND="
 	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:= )
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
 		sasl? (
@@ -45,11 +44,14 @@ DEPEND="
 	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] )
+	system-digest? (
+		gcrypt? ( dev-libs/libgcrypt:= )
+		!gcrypt? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
 "
 RDEPEND="
 	${DEPEND}
@@ -135,34 +137,36 @@ src_configure() {
 	# 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
+		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
 		--with-editor="${EPREFIX}"/usr/libexec/editor
 		--with-env-editor
 		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
 		--with-rundir="${EPREFIX}"/run/sudo
+		$(use_with secure-path secure-path "${SECURE_PATH}")
 		--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 ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with ldap)
 		$(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)
+		$(use_with selinux)
+		$(use_with sendmail)
 	)
 
+	if use system-digest && ! use gcrypt; then
+		myeconfargs+=("--enable-openssl")
+	else
+		myeconfargs+=("--disable-openssl")
+	fi
+
 	econf "${myeconfargs[@]}"
 }
 
@@ -198,7 +202,6 @@ 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
@@ -206,7 +209,7 @@ src_install() {
 
 	# Don't install into /run as that is a tmpfs most of the time
 	# (bug #504854)
-	rm -rf "${ED}"/run || die
+	rm -rf "${ED}"/run
 
 	find "${ED}" -type f -name "*.la" -delete || die #697812
 }
diff --git a/app-admin/sudo/sudo-1.9.0-r1.ebuild b/app-admin/sudo/sudo-1.9.2.ebuild
index 896554456b5a..301a917d9637 100644
--- a/app-admin/sudo/sudo-1.9.0-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.2.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
 
@@ -62,6 +62,7 @@ RDEPEND="
 "
 BDEPEND="
 	sys-devel/bison
+	virtual/pkgconfig
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -71,6 +72,8 @@ REQUIRED_USE="
 	skey? ( !pam )
 "
 
+REQUIRED_USE="?? ( gcrypt ssl )"
+
 MAKEOPTS+=" SAMPLES="
 
 src_prepare() {
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index cecc68448ea9..7d0daa6f3504 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -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}
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index 48ace87e9304..0e74740676d1 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -5,7 +5,9 @@ AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c4
 DIST supervisor-4.0.4.tar.gz 437708 BLAKE2B 211726da07ce31c00da0d6edba57942d78ee5d2757927b22afe569364c29aaf55375d4895b381f06071bc6b6c39a926ca2073e8fcb8e0ea9673a89aafd08b346 SHA512 22a38f759b0584310f5e16acbfc7b0c4cc59f3206fbfaf6295bd40a826d50ad02c8b0093821362c5038dd987a6599879d82dcefe948a2eda702b89e9f92e471e
 DIST supervisor-4.1.0.tar.gz 459020 BLAKE2B 0c4bdc2c89f54c08ad536b43852941f1aadb0173013e0f73337302f500b779023bfa0fcf8cc3ace4968cfc724998a08ea5a63680e290051d13c7cd8ac788dd24 SHA512 1ae343293707ebf33d0a0c0bda2c6cc78278e12737940a79e51b2365e7a20b07d9f5e50134ed2abbf8e7af1ebd8f1746002a159cde1cfc35e83fda0a77dae9c5
 DIST supervisor-4.2.0.tar.gz 456056 BLAKE2B 51b66cfc34505b937c47c9b510d81bcc777b9372fdeb2e08fc25153d2718cd2682258b812630160954587ceb992e1a528cdd5bf0d270139f7ffac9463ac2f015 SHA512 626d806f4b03be7cbff795afd1bdb3ff5ca5ecf44f035909ea1aa9360da9fa3047b2fe05543190bf1442f01dcdd403be19fcd907519bf7e26615900bc4bf9d0f
+DIST supervisor-4.2.1.tar.gz 460935 BLAKE2B 0c65f904599c1e8a04cd3a71085e2b2a5460691c2bfd790d3b7c10449cae08472bcd72a870cbe611801434624f405ea3e245f156cab93f25a8df784b58d948d7 SHA512 c560ef959f8d580fb20c1812aa2a838c9feaeb3726a754e8084fa8c7406ff9258139b55b081558b8d8f33e4672cdfad40695170f55412a5e85a6c1aed0f11657
 EBUILD supervisor-4.0.4.ebuild 1889 BLAKE2B 742a09c3881070eb8bb8356521a8064689341055dd23b449bfe150449c4fba4d0e60800c329fc3b2c1ad2f84f34ddac293d698183999b3ccd7814108a60d0916 SHA512 dd02e46bf2d19adc95da5ff836851e900a636d8f9b41317a5fbe3d39485391d8a597d4af1522884a5c6cedf8986f0e8338f46a7e160c6c66d702df26550b1849
 EBUILD supervisor-4.1.0.ebuild 1479 BLAKE2B c6ce3863be2f873514d1c170c9140bb5288c65729c83a81f8620a64780db2f84a659ddd6d5978cdea9f6df683026cb444ca1f920be8cdc234558a8d206e8b8fe SHA512 bcb297829bec3c8bfb8b2b41813a4e2f30ca8b92400e1cd286a4c69ab051bc52045198a1bbfdae824c20f58e6c82d6b5e86bc9b2ce556a68069b50c5aabaaca8
-EBUILD supervisor-4.2.0.ebuild 1719 BLAKE2B 0641569200d065d7964dab1ef0f2e720701b7679229ca0abb7fb5576dd93f8cc5f047a51a10788687b4db7b9242a48050a6ca39ab80fc7ce671ca12a8f17cc0c SHA512 16c9a0f6ec942ca56aceeff8cd3a86c7d74e865d0c0dea1b2237f827754f8231b830409662f99ec4c16d01126bb6b158263ce0ba7a9f03660285d71e3966fa4d
+EBUILD supervisor-4.2.0.ebuild 1717 BLAKE2B 3b43ad7862ec2b40aa3249ee2614eb47e3d07236d6c4f5b48f6337cd45e36c1449d5f7f4ec69550cb15473affdc759adcc144312fa766e95d365b9fb25dcf889 SHA512 a5d045834c67f084034be38ecbdfdb079b358786e932b3a19aba1552f7b68a96aeb0fdfee49e754765331b4a3b5ac14096f237ce90c54d3aec345227c305ece6
+EBUILD supervisor-4.2.1.ebuild 1481 BLAKE2B 550b341dbf20cc142ba747f8bef222edbd9b173f21e12c9549677488ead4df4d187efab4969dc6dd1250bb2568b1bc92a95ae20f119942e115c0d070bdba1b4e SHA512 0d279ffb60ade7fffee94c8b857b9ba6b3015f556e165b005eaf1e09c954b7eaf1a997635728f6b0054d19f3cb29c8b79d006f83cdb56549cdb0ef03a676e41e
 MISC metadata.xml 623 BLAKE2B dc7acae3a83fce87bdaf98f65ba4ac2434e0344faeb8ad302dcba5be3a59f2b6ffa9d85338ad432100d5e1017e40bbeb606724a214097e14bcc7082eb331986a SHA512 f05e62f68c51fe2bab054d03b3a902682eaaa133de08ac558a92736868dcc8049d1f27828e3ecae8f5f64b038bb8a322e58c90401e6fe01d215941e1507076e8
diff --git a/app-admin/supervisor/supervisor-4.2.0.ebuild b/app-admin/supervisor/supervisor-4.2.0.ebuild
index 607c68383023..35344f2fbbfb 100644
--- a/app-admin/supervisor/supervisor-4.2.0.ebuild
+++ b/app-admin/supervisor/supervisor-4.2.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="acct-group/supervisor"
 
diff --git a/app-admin/supervisor/supervisor-4.2.1.ebuild b/app-admin/supervisor/supervisor-4.2.1.ebuild
new file mode 100644
index 000000000000..9cf38eee7a6c
--- /dev/null
+++ b/app-admin/supervisor/supervisor-4.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 systemd
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="acct-group/supervisor"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newinitd "${FILESDIR}/init.d-r2" supervisord
+	newconfd "${FILESDIR}/conf.d-r1" supervisord
+	dodoc supervisor/skel/sample.conf
+	keepdir /etc/supervisord.d
+	insinto /etc
+	doins "${FILESDIR}/supervisord.conf"
+	keepdir /var/log/supervisor
+	systemd_dounit "${FILESDIR}/supervisord.service"
+}
+
+pkg_preinst() {
+	fowners :supervisor /var/log/supervisor
+	fperms 750 /var/log/supervisor
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
+		elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
+		elog ""
+		elog "By default, only members of the supervisor group can run supervisorctl."
+	fi
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 5a4dcc9e35ee..daa195e8802b 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -16,6 +16,6 @@ DIST syslog-ng-3.28.1.tar.gz 5149671 BLAKE2B bfc33f2a595cb4fbcc5a69b60d283673922
 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
-EBUILD syslog-ng-3.26.1-r1.ebuild 4913 BLAKE2B a4b5bb25b4ff855d509b2c9e0669d7b67544da8a3b93204b22b4dbf330f7e40c02ff5ea45c10cf36a5c1e10b800e641163ae1bb52f4dcd70346345764ba1216c SHA512 2159fcde51275a63dc0b721596cc70d5ce308cc7654459531eb3f616c7598643ac0d15057b8ca9597c7a3a2ceadeda7abdf43a42269ea477d91855ea7d9c23e8
+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
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
index 829cccf812bd..2d87ef470ea8 100644
--- a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+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 test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 2f323fcd2f35..70b67860619a 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -3,13 +3,11 @@ AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f497
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
 DIST sysstat-12.2.1.tar.gz 1227707 BLAKE2B 566382d83a0230517d22e2630a9cb1aa631d761c914188a4e7fb15eddaedbd25b8a3dffa9893b1b2bbcc31d87a37cbe11b2b50ab0ec94a28f84018685d1b35c8 SHA512 a19d0978eb11071c228462cda496a59721541e57a1d15cb2d0964f287ac2d50b5587fa5bc2b8fe6be2a1f00cbf2e7c3bc59db6494e3e8c1906aa81437b30d073
 DIST sysstat-12.2.2.tar.gz 1227793 BLAKE2B 7dcfe904aa60e9c61af516e718668a3f8fb9e4274c51a2c9d44b5e56dc6cf27ffb18d44641970f75abe1c1f8a2c5df8b7a7874da8745757f937ccc2ffbfa03d4 SHA512 82f4fb1e78a26275bdc6f6939dd2c75d7822e930992e74c1eaeda65c0e873d88e777a7f315c7b073aaacb6956281b2119448af2ca22ae6e7f1d20c370b01e3e4
-DIST sysstat-12.3.1.tar.gz 1245248 BLAKE2B 69848c452642be992c7b4af33268c0d6b30f16e5ea44ec13b00ab57e6ec3b498d92b707a53757de9066138a9ee92b995765f44f75f692e1b3c68d829519d53ca SHA512 f67a2dac22748217687bd7f58521c0719754f13298fb5faed8a6d58c2bb1f8620428191d0415e816eea07bb3ca81453e057d03c7db0096430ad7d6ba6b7b611e
-DIST sysstat-12.3.2.tar.gz 1335057 BLAKE2B e075d0def13cd786dd0c3c49d0770cfe3e946a6b6f500e4364bc30d79fdec08ee8b4c4a2ef3b0188da3435f5921e0b27c8dbd8845a6c6116cba88f8684992674 SHA512 e78feb082a6ccd634f1f1565769b56a6b7aee95853334e73395489445f6f0d96d2b5bdfeacec16f4530be8383ebc3b6b126e7df93abc3e67c409b3791d02e275
-DIST sysstat-12.3.3.tar.gz 1365214 BLAKE2B bd7969bbade8e4d00fd1c918ee59222d136908d932caabdc042b0ff09fcf9b4462aece256969736b68b0bd0f0138692c1af446000cbe1d0e2d294105b7da7658 SHA512 9bebb36c6bc8d8a105921b43cf458cd4691d2dd29d9534b9bf9b00e2d1dd907e99c4aefb928da75b31c057784be59d0c6fb4420ad8c97b3c2600f5493094ca9a
+DIST sysstat-12.2.3.tar.gz 1227666 BLAKE2B e78cba586eb8e5f5a971f608ee0df39a20e3af9f02db1778c52bbb09eb4565e29ffb79d68ed00af0142ccbf1120b97825c638b323b53e0b210c96bf808db4aa1 SHA512 d837193b59840b1b1a87f927a4416ba4c688f3b470be00e9ab013b62b2f11e7b963ef4cf521bc42a0a041ea8923e176922ee5b6df56c0612b6646054b048f067
+DIST sysstat-12.4.0.tar.gz 1375207 BLAKE2B 66a9c15bb4e3b349158c9f7ab37d00c77844f0fd654df1b613141d906d3c89477e581d7143c77ba6952dd2cc7296f0611bc99aeec8e55e8090a488d5a286ee8b SHA512 156cb38bc4cedb68278d9054ce5b477cbdc84d2480ca302988c0fb5427b9f1f823f0939f2bc1c91fa7657b00b29d02d1f58aeafd342eef83b07d79c3f4141be4
 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.3.1.ebuild 1704 BLAKE2B 3d5e89a9fedf962c45e9b89648cc43241271aba8aa4998c8f21e82fe9f9d156aefe68abfc216b8de9cd427f792d8571ff352eadc8febadd4a46b5f2fd190ae91 SHA512 1d69d5199688fe2b764a160c994bfe208cbd5129c187a89b8526c6ffd10f64d499465ff0341d6d8c903dfe8f1e71f22b83948d5cbd7a04859a3db6ad049b92e6
-EBUILD sysstat-12.3.2.ebuild 1704 BLAKE2B 3d5e89a9fedf962c45e9b89648cc43241271aba8aa4998c8f21e82fe9f9d156aefe68abfc216b8de9cd427f792d8571ff352eadc8febadd4a46b5f2fd190ae91 SHA512 1d69d5199688fe2b764a160c994bfe208cbd5129c187a89b8526c6ffd10f64d499465ff0341d6d8c903dfe8f1e71f22b83948d5cbd7a04859a3db6ad049b92e6
-EBUILD sysstat-12.3.3.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
diff --git a/app-admin/sysstat/sysstat-12.3.1.ebuild b/app-admin/sysstat/sysstat-12.2.3.ebuild
index 70f1a5412854..70f1a5412854 100644
--- a/app-admin/sysstat/sysstat-12.3.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.2.3.ebuild
diff --git a/app-admin/sysstat/sysstat-12.3.3.ebuild b/app-admin/sysstat/sysstat-12.3.3.ebuild
deleted file mode 100644
index 70f1a5412854..000000000000
--- a/app-admin/sysstat/sysstat-12.3.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="debug nls lm-sensors selinux static"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-	"${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/lib/sa \
-		conf_dir=/etc \
-		econf \
-			$(use_enable lm-sensors sensors) \
-			$(use_enable nls) \
-			$(usex debug --enable-debuginfo '') \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm "${D}"/usr/share/doc/${PF}/COPYING || die
-}
diff --git a/app-admin/sysstat/sysstat-12.3.2.ebuild b/app-admin/sysstat/sysstat-12.4.0.ebuild
index 70f1a5412854..c2688d2e957d 100644
--- a/app-admin/sysstat/sysstat-12.3.2.ebuild
+++ b/app-admin/sysstat/sysstat-12.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="debug nls lm-sensors selinux static"
+IUSE="debug nls lm-sensors selinux static systemd"
 
 CDEPEND="
 	nls? ( virtual/libintl )
@@ -26,7 +26,6 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-sysstat )
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
 	"${FILESDIR}"/${PN}-11.7.3-flags.patch
 )
 
@@ -50,12 +49,15 @@ src_configure() {
 	tc-export AR
 	use static && append-ldflags -static
 
+	# --enable-compress-manpg <= Yes, that is inverted.
 	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 '') \
+			--enable-compress-manpg \
 			--enable-copy-only \
 			--enable-documentation \
 			--enable-install-cron \
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 82a87acd8155..be222eca10c8 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -7,18 +7,30 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db1213
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.zip 2156000 BLAKE2B b637b0c50932848e72fca02c604a1cca227e92e5a9c706bed9a1f6a1e561f6f02f9f03ea9a420c12fb5e4b4a635af53f5c68ae9bebca367756fcb645816aadd2 SHA512 c6a5042af61a2617139c9081066086e9f94e49bf083d29a8c8ddca31c2c0d3124a937688571fbde5998c47d0dd9ff44692643117a45875fabc4943d5658f044b
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
 DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv21.3.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv32.5.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv35.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.zip 31161655 BLAKE2B 8c07832d9023d7f932e15c51508983f1d539cdc0c67ba3ca65a41e2882ff007f88395298878d8e05ea3d5d9dc6df04849c6b81da0f5e2e151bda93495eb3d640 SHA512 74830cbdcd9ebb8eae4640098d2964cf5dbdaae3cd69eeaa5787ac340a0bde06576d54376595632dbc91a35bfb247d596c93e1511e7f473f458ba0fd8c4530b4
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
+DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip 34780090 BLAKE2B 7a465854f74837c79c1b2166116d89b2156645f9ae80b13f0cd860eafddd17caf1a34f7876f54c5ede094fe808eb39f4a1bec54e02efc53fd0bd897c80bde21f SHA512 88a7e1ba6ac2bd373d82f0a6381565c24014b0cd339efcd815ce93dc9f223354f561cbe7bd021fd5635599331a23b7e9ca084754325c68edeecd6f5e1cc47227
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.1.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
+DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.1.0+incompatible.zip 21291 BLAKE2B 960b3ab8ff81fd7105fde92e6d30e6b96811d6efcb56ae1b35a1b70315c13f671558b75f0964578a9b9e6c5ea0d185ebcbe68e9a2af5a460144b5886638ba148 SHA512 975bcb9aaf364f9b4852f496dfe3d141e2b645cd992565d6c2e43bf38e18c444c09b25746db174d9f511acec2a1ac3443b6281cf8d4974bed4aeefce182cfecc
 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.2.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.zip 96994 BLAKE2B 7932efd0586b1f4a2a6142815d5bb64c0f88074eb43347b458daa1aab9f7989c192004fe7c27a58d830a847db2884d6bd8bf8e97e5a3c3d2def4e721600177da SHA512 639dd9dd5b670eec05d33224f9f025a67105ce34ba7d3b8cfae7a1fbd947312737d31a6575d839790b3373bd6eb1a6a11e264481c0292c50b6b4f4778855070b
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 BLAKE2B 1ff6851c8e73b2a566cfafdc2ebd259478b39258f785040407cd853433312ef10e492da8dc0dc9cbd4a2d2470e2715ef5ba4c05100c35f5b0664c9b23879e721 SHA512 61c06f593c1759bb078042d461319db2f91afcbddf50186d09195021eab865159ca5c017eb078d354d7db590365846e401ec3f91a2cbbf753bc32d7111683bd2
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.zip 38083 BLAKE2B e796f7659059c9bb04caa298c94a318fdcc3e251a4caccf71a973ec957899cf49ada77fa866b1883036aed3942f0887c88ef33b22da1387e55bb2847bfdfe0a4 SHA512 16ccb2211f3acb23181cfaa941e5d757dd975a8491cabb0b083411dc7c431c3230aaa7158c03d7ffd1dcba4535d4ab170a6d110c1b9d91ca2553d665767f53ca
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.6.0.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1-0.20191028180845-3492b2aff503.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1-0.20191028180845-3492b2aff503.zip 41301 BLAKE2B a4511c2b007ba0d066e7055c16580327b5a18aa2d49d954e300660072232c5e80b7be85b39d690e3a99d21478c507038793b56434b46537afb00288df18a4c16 SHA512 f11a9c09267aae2ec86600e9e6f5c2af6c345c7724f92cc11ba050a50ffefcd78b537c26f2b3bc92bce6b5a80458899d440564294659bcef8e4656f4ab544991
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod 371 BLAKE2B 778ec4567ccf1533e9815f0f855933c94c2a4aed6285f10815258c71a39fb706ed130db03c85f8b944b764978ae584f7cc675cdd3688e6a93961f4437bf3aca2 SHA512 02605c296a8277e72074a0b3049ef0ee87597b67ba8d1e008d17746ee2dfc2551e2517e60f972135d368b27b899452e1c768c3b13afb9315da48173733450fe7
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip 40633 BLAKE2B 8ffe2bba80daeadc1a27198e4c6cbe39bf4219340686899460c4c217966d97583bcbe10ff7182a0bb27ad01550690ccdd12a1b53a91264bdaf3d6febe30adfd5 SHA512 d0f6392ef14fde8128709adaeeae7c4109a2c81830bbc107b8fca4ea6145bf68434a171f1d145536d78ea5e2fbc316cd21fabbb99008604a276974405274bea6
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.2.0.mod 256 BLAKE2B a3d6043ccd944a28dafb799df0122c4fb8a0f01ccc342d46c32198d8d3a10ac3466612ef5431a40b19a83ea5280c5563ad0a94a4da1472d5a0812640d00a4b8d SHA512 9572676471e1232439c03bc3be1b71c060117735ecaf42e3bca5fc6a838459d342279470107c8688cf1a1b0865cf873d805d771545fa1bdb28f9cc122f5881cc
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.2.0.zip 9359 BLAKE2B 840ec2a263e4e76efb7020900d04e1adde8d76bd30b0c035349b43be28022791046bca9984b6150e5cb390a5d36a46cacabcd93b44241c928c09eee0696a6f64 SHA512 dae57380e2fcb94bdfb3f61ad2df9239e158b38f3811f0bfce5f1ade80abc65525355aff312d0600dcbb450c4ad68193a1ed8903276c87086ef4a4e0f0d4a306
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.0.mod 302 BLAKE2B afe841f1cdb7364a3da99230e3cbdd500630d16f78147862122885f0af683aac1207e6790e751bc282eaf3beab6de08c9420b4dce3af4e4492903f2133217c43 SHA512 54a5cc08f53b1caa34cb2d26519fae2e23b0c48806588085b95fc9a4951ed9bd5ab7158fd97345fb004984cbedcd4c14e5a6912c31062d8628edb1cb9616c699
+DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.0.zip 10602 BLAKE2B 7fc9f52e62d13d63c797893693e5153f4eb0af301421f1947ed4ac579e62ee4ab1a7f40ac8518190fce86da4ce15ba68010cd75316a71bb42d802982fc6ea211 SHA512 8e0d2c2cf4f0f6eaae2a07c7a2e31eb159732363db3f8aef2337946955f02b64947968e61316d76d40d383c78cf60ad9c32e31c1407a2c4797357f6e3f47a468
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod 59 BLAKE2B 7816ef9919ec514b2eafce6a859edeae85735475da10c34c64ecaf9a53a07748b02a424bd0a16b0413c499a2eacea0fcd6ce7807b651acd9f67ecd00b5fe55ce SHA512 d5eb17738399f8b8e1a1be409ba5b24520b848b3be5fced46c726499f9df5bf5a54233c6c0c9b8fe896834bcf5132f39ba0b91bac0ce6347b9aef7c8bf93f912
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.zip 17111 BLAKE2B 67e9376554073b3fe82834226831bd7ce92d34c9f75240c3423aa3db4e5ce3cee445bf2df4f0f24a61a4f3823c33fbb92e0986f0e5e6860dfd4f5d157e2c5047 SHA512 50182309e9823fe6a3af86a9beda7ea9a2ffd798cc0d9a97481324a205db8ca50f524ec1b482cd9d8ade987c6e7dcc511c2d6937f31d38195f4b496d42e63bd7
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod 113 BLAKE2B 7822bd4ddff863c4fe4e3caf59e722121828f61b08d5504216e1fea40401108199708fb07d7cef2b9dd7ddc7ed7d8feb4e0c823b8a7962217881601107404ca2 SHA512 08860dbcc27a83f322c07cb64b9fb1dad3810f8a7dda4ad5914b3fb8dcdc14fd20640e5aa78ad5dbd220c6dd95b8c9ab6e15c4bd75dc476db743f1c5df1fac95
@@ -37,10 +49,17 @@ DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod 53 BLAKE2B 6f
 DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip 6278 BLAKE2B 1c42d23c77848911af642fd38f79aab655056e731f015a62374a23cdaade84b53f61b80f65f9416bd4f0e4b72a0b42203b56d659d30a44bb244a6ed5ed1869eb SHA512 f1a334ef91dd9410c57efbeece2ebef6ea326485e790e47de67efc9495d3e252cd7e981bd9da3f94f2f7e35c1bad9a8d5153e671a9b81758ad0584883c916155
 DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20180810175552-4a21cbd618b4.mod 35 BLAKE2B cb1abbb2d5d094d5946f868ec3fd1b6ce72721b5e220ddf2be7c8376195fda1659112b93b7af24b08c66b441c950e6d555c858e51e81c9d3d29bc5b72271379f SHA512 b9bb8b7bd45785e18073235507b6e570ae27df026d38676e0b36cb19bae6b53a085099fd23d4a0bc456dd9bcf3459f1f53d0e8d11b6bfc7e61a88f8673a3ca9c
 DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20180810175552-4a21cbd618b4.zip 13425 BLAKE2B bf7774758bdacd841a7fd02d343dcd9eb980e57cb3b6b8e30d266a1d7ba0a722ef6342455a7bca4e7e8ba6e25154f469636b5cf553cc4b793ed8a6c65c03f262 SHA512 a9cb374919e68e157afbffbbf630c455e975a7ebdfb87eed454fbef07899c32a89cd7dfe73de932aaa0bc6b8b1026f84980f9c8098a561e0e14b0f5756d732b4
+DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod 35 BLAKE2B cb1abbb2d5d094d5946f868ec3fd1b6ce72721b5e220ddf2be7c8376195fda1659112b93b7af24b08c66b441c950e6d555c858e51e81c9d3d29bc5b72271379f SHA512 b9bb8b7bd45785e18073235507b6e570ae27df026d38676e0b36cb19bae6b53a085099fd23d4a0bc456dd9bcf3459f1f53d0e8d11b6bfc7e61a88f8673a3ca9c
+DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip 13778 BLAKE2B cb389977b9c081b3531f0d62708b8f0202deb17ac651100343b6e59c668c7135e1eb0ea0c0dc4ebb953b6d8c8df40498e09362e8415f6daa8725e4c768813082 SHA512 0b87ddabac154fad7ea06ed88d28fc4586dd41afac9a2eedb2b0b3a695ef52354d3bb6f087c2422b88cc58778afa0e6a4da19fd2fb0fae5a125aaad79fc92d53
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
 DIST github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20170922090931-c385f95c6022.mod 40 BLAKE2B 2c4dab1793ad76dcad762359fa1f9e45f291c15ed270cc172577dc6d96b04460c3a3be683151c2335198247bf9f79a3d9a1bae8d199f19329ea786058da74eff SHA512 9ce2ed40e6d11dcbce52248086844c68adae61e1269a45658007be947571fea9e94e1b1192a34c80fcdda0f37156fe2756f57b9de5ac2103fb32432db0c256e6
 DIST github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20170922090931-c385f95c6022.zip 51522 BLAKE2B ffd378bb46b84b435015e486d24958898158c2be4affd80bf7c23b354487b8e85fcc9df390f38bea898a1baa891660329a4240d6244198f8a1cad721744fbed4 SHA512 8d08e138f0176883261bea1159a1af83d3aac7cc845234f08ef0bd4ac428bafed18aababc0d96bc47d4e7b3bca02ee8323a58c6939aa5e1b43f03c23a15f3664
+DIST github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20190607011252-c5096ec8773d.mod 40 BLAKE2B 2c4dab1793ad76dcad762359fa1f9e45f291c15ed270cc172577dc6d96b04460c3a3be683151c2335198247bf9f79a3d9a1bae8d199f19329ea786058da74eff SHA512 9ce2ed40e6d11dcbce52248086844c68adae61e1269a45658007be947571fea9e94e1b1192a34c80fcdda0f37156fe2756f57b9de5ac2103fb32432db0c256e6
+DIST github.com%2F!chris!trenkamp%2Fgoxpath%2F@v%2Fv0.0.0-20190607011252-c5096ec8773d.zip 52105 BLAKE2B f20c4cf84d26d48820535e8e707383e2d0deb5f048f187a1f7299f91bfbd79a13747afcee343771c27d401dd554432b5d73e85644d46a17ee5db2a052230940e SHA512 5babb7c2528b7e7911563339fee141bc885e820cd0ef863d305e316802aa203e566607675afd4a1c6612ec42e55052affeb64ef6b7e784298f5f7e3680610b75
+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!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!qcloud!api%2Fqcloud_sign_golang%2F@v%2Fv0.0.0-20141224014652-e4130a326409.mod 47 BLAKE2B 91859f0f4a7fec349c1a1403a76c651ebf3c56d6f5a62044ab9c87d41f6904c61888e77cc47adc9e8463b69320441a1ad10b5d1e7263b0fc0f6a10ea86a16fc9 SHA512 9d49d01de02c003ba65202b3bcf290afcfd3c301134085697f6bb3ea13a18826dfc0fee5e032b1701d1002151c44bca7db3fa575817864571640c4d4f2bb5732
 DIST github.com%2F!unknwon%2Fcom%2F@v%2Fv0.0.0-20151008135407-28b053d5a292.mod 30 BLAKE2B f6dfa75b9c11cd126f0d4bb1d000ed8cf2a95df64addb279c1cf647a82de6b817890ca4624cca8e1e26a606b70bfa1a8ee4f17baf47ebd4a0a2ecfb07c735e44 SHA512 91d239b6504a52a8a645270f7f1f5b4519ecac9082f994084a7b5ed4e8c320841449ba45c12333e623cfdc6b63762c96f4ff8839394bd95b72d6ecee5426f02e
 DIST github.com%2F!unknwon%2Fcom%2F@v%2Fv0.0.0-20151008135407-28b053d5a292.zip 40352 BLAKE2B 224d9bd57810fa8275bf060e72539727b5e648c50dc6df0e1cc4abb2ada8d29ffa6e6b40aeeb7c532e548f0c3a39ab5e81f9b021dc95c7f5b00edcaa4867e2f3 SHA512 ddea1fa6e10625c2418c9fea938d51363a9f08587d493e13d4b0dffabc9a4b168768d231b2ba8328f83294ab4cd870f32f53917be62364915346d90035a226dc
@@ -51,6 +70,8 @@ DIST github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.mod 36 BLAKE2B 4fc95f5e7e113
 DIST github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.zip 18038 BLAKE2B e9c3c57cce998ff3230349fa06d098ab7d381c77c9331f97a671cac795afbb561602781e076a2929a0a9df3daf1a9e534ad7c534c2e5297c7aeb1f9346e885ad SHA512 92bc64c2e07506ef24b16ff82b2f8c60d5ad5f66343728488dabebbc4dec62ed290503b322941279af007891abc0a6b278fb916c2675494e21845372b93725a3
 DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20150830182803-278e1ec8e8a6.mod 30 BLAKE2B e89977c245471f14f3e2e9434d08e9683a9d4ad350dfde2055098d913fa41ca92c4cd8f26345f3c5b07ffea825b4a87d5d06f1ca99105456aa63091f00cba1ac SHA512 ae14432db61f891b7a8d6d8e51c47675deba7a13f0bd392536cecb625f6f9eab5b253d6744957dd0cca3464f84bbbcc3a41fd0f2bc25fe47e6d6b4ce51858930
 DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20150830182803-278e1ec8e8a6.zip 104685 BLAKE2B 74c7b36e96901f3f244a12d951df3dcb00d0fb7ac76dacb3a192d939de49657f3383044c102acd165921ec8c6be9a00a7093d7babbd165e147e14beb953a568f SHA512 99a869dea0e6525cb26e3f305b8da7f55eaed841174f05f8d1dacf7ec318154b83b0fbf7764b9c46e5803f70867c36c388c9abf95be9b58dbc913dd4f6cca04c
+DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.mod 30 BLAKE2B e89977c245471f14f3e2e9434d08e9683a9d4ad350dfde2055098d913fa41ca92c4cd8f26345f3c5b07ffea825b4a87d5d06f1ca99105456aa63091f00cba1ac SHA512 ae14432db61f891b7a8d6d8e51c47675deba7a13f0bd392536cecb625f6f9eab5b253d6744957dd0cca3464f84bbbcc3a41fd0f2bc25fe47e6d6b4ce51858930
+DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.zip 104690 BLAKE2B 7c52d737b8bf2f9a4b4ad4a7b2a843b715cd991dc18d61b0c2c68ec25ef8f8bc00ee0b5cdc95b91a1c64715d1990597dafe29c070a090227b2b7d1244a8b80a0 SHA512 8d15276c2a6e82ae72d903946fbcb2adc6446b964492d8c5653fee885e4c1b1d75f119a3fdcb0a35044929810d31420ac218b7ec077d1d07acaf2f586d869854
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.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%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190329064014-6e358769c32a.mod 46 BLAKE2B 86188ba06e70b77421a7b156c3a1955d5a5f93dc3ac34d6c93247e5c12cab23d6c2e9f0f3486d91deb4e60df94e5e75cb7575ca32967ea9c8522f66f27831139 SHA512 cd235a247bbbec18565d56a2de766574c7a9d1e40f946d9c93e8b23c7642ac048389ecc57a1fe0a4ecc4724b007a2afe40f032e80f5da7e025931d50eca596cf
@@ -70,8 +91,14 @@ DIST github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20190214190832-042adf3c
 DIST github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20190214190832-042adf3cf4a0.zip 7971 BLAKE2B 7639cf5cc0146fd3941d24836ca364fe23b4e44fa8d935b12c02886ae7afecfbb6975058637d68450f833af2d94462ec821ec96d6c29870e3bab86cc10672996 SHA512 5961eacf446ee1156f6aab1e21ced4e2f439757320bb2a95dc1e73176bed9e4dab74eb1b443003ea6418f0628c4ddf6078d7312d87c8f5f84d223524061efada
 DIST github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.mod 44 BLAKE2B 770e15635e43111b74151815d493796982cea2dafa5ac8828de2b12e857d30b108091bb04068d037032d8e42a07ba10dd92fcff6fc78ed4c93a75869a9639c39 SHA512 a1570f4b4c886947f5c747387871a09ba0ef2fd19b7afb702be4e7625d76027ae722dbeb601e85b1eb1698eb490a5f0a38db2ba14d32b6ee96fa83279d010715
 DIST github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.zip 133293 BLAKE2B 9d62348e8118a4099568f5ffb309d9b83763fe06466d408611279edf1c0412147cd6aeeb8966df2bf7eba4251e9ca5cb62272b6c25e97f0d36e9207b2204e101 SHA512 80fd9f8b561a3caa7198f064892008cb2549e228e48d83440b3a2648426e834d5909c3685e97ae0cf7fccd0efdc489665789b521a2f6501e171c6a69c73bb6e5
+DIST github.com%2Fapparentlymart%2Fgo-textseg%2Fv12%2F@v%2Fv12.0.0.mod 57 BLAKE2B 59143290eb1b5bd14d2132acf39e0bce9135370ba9fdd69d311fd8b53b2a26c4606438191b71255716ddaf7dcf7555bd202a8af522fcd1871e81d338d7296372 SHA512 cb6c6194e179fdc5bacc742dcc56d29e04eeb87b9a494fa1588c9a7f7e158e2837e3199c7fece5b7e0b0d03f2026930dac355914a5be8a6f7bc99616467f68fd
+DIST github.com%2Fapparentlymart%2Fgo-textseg%2Fv12%2F@v%2Fv12.0.0.zip 128469 BLAKE2B 360332f3ce1b23b65085e266cd7fd50ac8675fb18d8ad56368b68de7c8864f75a99aa7a95ae70d36bbd1d7380eed7d04b7f3b197db4fea213a0e5a510c465d2c SHA512 707b79ef4fceca4916f38bdaedf330c20db46452fb1c6d3369da3cc0a73d8bb4ca8eac75ea53b365e7a08d7f492345ba4169ee57588e4b85802d752835f2d565
+DIST github.com%2Fapparentlymart%2Fgo-userdirs%2F@v%2Fv0.0.0-20190512014041-4a23807e62b9.mod 153 BLAKE2B d12d3a3173a6534a84d2921cc4e27e0593e527f778fd03e70356ae37350c9af7e678f396652024463a4d49a4101c0ec28ef8f84c04bbe59b13a64e27453bbb6e SHA512 0f619e2e44fa4be820a049e365017ee91c8ad3267a350eb23509ff5aefb44cbf577a2952e230ca9b92e8411fbcdad0024051464bf6643a81ffbc9a164e666020
+DIST github.com%2Fapparentlymart%2Fgo-userdirs%2F@v%2Fv0.0.0-20190512014041-4a23807e62b9.zip 26041 BLAKE2B c592c47192ec388e002154b518302832f7a5a500d63cf02c75ae83f124ad9495eefb5cb6b7bf9eaf3c447d0eef1b806be1c646f9592d62562a84b35803236406 SHA512 7f816354fe9669532d89de774945261705f8045e554ca0f3aad2f4d8c0edc65b5d29421ed1087e5c6309899f576d647a0bce989475ba47be506bf0d6b6b888c1
 DIST github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv0.0.2-0.20180815153302-64b99f7cb171.mod 191 BLAKE2B d7b3a69969e42ffa19ebf7c9733bf856cdcad526cc08ac3a223394aed93325faf0a05321c2afaf69d4616c5440bc495c7afa31a4a0a261a8e481ee0a46cc1443 SHA512 6a11bdebf0de4bf63674dd98e3d0ec06ff15704bd5114b48cb1689b8672662a55922275714288d30c2fcbf82638c971ae6f54ab9efeb07e5d4c346aa7c00f89c
 DIST github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv0.0.2-0.20180815153302-64b99f7cb171.zip 50430 BLAKE2B 16bd26350a8d4cc27c671d24f4b735b9a902d91e6b486f8d91c982a901b6c1fb12cf754f11e448a858c7557ee9d508773290050e61bd5183000ff8381e3fe18c SHA512 70af625414965f96a036d806683e5ec3649540fec8122b71328fec4c6bcade4d321740985b254f21c8542a457b02a23b9f415d0e24a60bab574cf2dd66e8bdad
+DIST github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv1.0.0.mod 200 BLAKE2B 2b244b819ae5d198be2bce3a1bee79f97a8c90855652e236f3ae2e6f46293e6bac6899694f042e358b97288e80dbac889ddba4f393f654018057056ff32d20dc SHA512 12d04873a179e33143fe3a62644794c0172ecf32cf8edaa51ed610777d340eba89ac3163e5f3b771e580ffcbfcdb2a3cce843ab68ee05365c36c10c34840071d
+DIST github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv1.0.0.zip 48266 BLAKE2B b0de178dde7fc9d233d4192eee49fac5f71a11bd91c7083eb6a51c700ad7b2dca4312446539c1ab054873be91603d0b4faff343e7a7e4b8a9ba8aa37fe1ebf7f SHA512 b8f5b8f0e537c95c7b3fa2b24e91d52c1e23f72ec6371c553dbe60fbd218aabad0b3107d60ac59af40c20e28983fbd6a3e97861a052f24fc8e8bfdca29bbeb93
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.zip 4164 BLAKE2B 8ad86e9653c8353591245723691c78b07df9bc96b91117e6e1f5905195b5c7f575e9754fa525df773fd7a7de8f2944fc9274d149be318cab2860845f429f2b04 SHA512 b618f2476629bd8deb8a3473a1a67b9aaad52c870e6c395c093a16b1cf60e32050b1a6642b1ef8f6abfe01521456d1b903050dbb8ce7a9c9a10372c878c62149
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
@@ -84,6 +111,8 @@ DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.3.mod 109 BLAKE2B 70ae989bab9ef2
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.3.zip 13141499 BLAKE2B ed68fc1e907a3b643174859d734b29b088ab009a527bdd0ebbece7e103dcff2e20f16983e000a3da3a020f76efa5e53ba7cdca9743626fd924933ebbdb94a963 SHA512 515e55c064659c1a9d06ef854b929c56ad7f6b822f932b41bb80b7a098760d1418964a2d77a5437f6d0e95f21639fcbea450fdf9cd7382cfb842857bd4d84b48
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.12.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.12.zip 16027457 BLAKE2B 17fac96604cff1de4f63eaca53107a6eed97ed8bd1387983295590603c7784b473f4b9388662cea1f614663ef4f8bfb2a4f72654070e04bf6f18b88410f762a6 SHA512 bbcfed9c7fc835b7bd2228f0594b9d82d8e0a5299fdc0b4a3a2a53ee2014fb78ff03ef529a128c25ce9ec14fa1d349ae2c9808d0d1700865eed12eae13db6e64
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.9.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.9.zip 16363510 BLAKE2B 93d4e2f2f3a5007796ea867d33bd38c4504bed8fe48ba4add7f9abc353257d48ddfc6d55ab0a76e0adf55e81c62c645b57b0ce6b6a1869ad1d913f9729c10683 SHA512 e763c69d49755e88ecbff815788fdb67900070f5feb154907c33615978ab418bf2428d4e26794a128a1d39364da3ae3f9abdc7f30978419e611c1cae70e95684
 DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod 45 BLAKE2B 224d034afb0473cdf6f065978a0b8cbaea268a46e3dc6b1b8ea89bed2d013ff52bd32408bb6d768097d3ddb20f95e35953b9b679439309ff832b2481d4e35401 SHA512 b398c531571bc397b2d97f369731fb7bbe8e07328f95043dec62c9be4a9f09562a0ef0faebeb05f1bafd488a77c30e6e957189d54548ddb94b9dc115b85dff53
 DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip 7657 BLAKE2B 068727abe4a8d862a04d3d269d431af59cf048d596dfa951112c40e249b623278eaa74aab6a0afeab45bb62d77ce7fa3c5f341d3236c4ebe1c7c92fe48984b31 SHA512 c147af6f868c87dc6b1b311f5c78496dc8cc65e2cc3c3984651751f58a1762941d555f74936554a0beab1bb8530f7c6e8c249d83548a348fe83918644b89303c
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
@@ -117,43 +146,67 @@ DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.zip 109300 BLAKE2B d76af4585d0240852a075ec55fc5a2d139cfde0530fb306893f2d981b0c9d5675eb162fe14bbf51b67f266049795f9e002f4929ee51a5686a59826e0ab4de3c4 SHA512 8e27958a53533d7412defe10e7be2c479c8d147001f4cb0e615a130ac362d604d334e35b43bed92a10f33fe72fbf7609aea46b910f53c2b7f7f15fa1dd088fb3
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.zip 57782 BLAKE2B cdd50ecc0cbd0c7e58f3e6ff91cd26f7a212f4f62cb10358e1729b6b8be346390f1659ec7443a0c48f280c4a499f399b3ab3c03ba897ba8a7a61c336ff6f7c29 SHA512 e0ac39873cc584e40df505c3c01d20771d3a5e06f1c2c78a046971a220f029795b4cce7da71b497bfb618c0159897640c6606a4bd0d446826b142430f7f66204
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 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%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.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2
+DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.0.0.mod 35 BLAKE2B 4e9e86f0f7f18e47c80b9f4a0abff3f07d47814a9c54b297a2419265fd91b16c2780e170ded80589dac290cc3262aad162911b789510703d973f3f891d5e0849 SHA512 6a786a38aae43d8a7532621bac8c4c053624f39573a37bd66fef9048a7eff36ea55778ac8a4bf3d18cc1e6faf352dc2365e6f819053359df9ac98129e16f422f
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod 35 BLAKE2B 4e9e86f0f7f18e47c80b9f4a0abff3f07d47814a9c54b297a2419265fd91b16c2780e170ded80589dac290cc3262aad162911b789510703d973f3f891d5e0849 SHA512 6a786a38aae43d8a7532621bac8c4c053624f39573a37bd66fef9048a7eff36ea55778ac8a4bf3d18cc1e6faf352dc2365e6f819053359df9ac98129e16f422f
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip 9787 BLAKE2B bf52b08f028e5117fe9cf9554ffcfbddec214b1dc972e8be2511b5571fa15cd433b3528ddf9c8805b3a71455a94f859d3aa90348e4648300121be269d2ad5f84 SHA512 83a35ee1aaa0aa34e86db32471f18c2ecee57c8962eacd44ce492a29cd9f630318411535d3474ad10c5ec5a5634caf619eae8a06e911c37c6e8fc8d022aebe3e
 DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180920040454-5637cf3d8a31.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
 DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180920040454-5637cf3d8a31.zip 25454 BLAKE2B 9faa435a37b9da461243d1040e45036135259b9f19e7ddb15f4909dd19c2e3e81be14d6aab13413025c68f10624f1d1fb5967f0d6932c69069a492e1afd4d7cd SHA512 8712f5d38a03a64f1cec212e010ca689ed63f6f9344e9a8323aeb3e26f0b414473236176094f90b27f46b37ca29c849b93786927293112d477fd6ee4ca2a04b9
+DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod 36 BLAKE2B d46b14a3eed14f8d5886e333deada157d9484ad3bab124d3d57d9fd6a39242c2272417df8bb31e08361f2be8b11dda9e96600aa800879f393c8753330eac4e68 SHA512 7ffd6ce59d5c5fffc6ee8e8f48e1e7114628ee2631abbb1a3591b794c23b2ce6dab10f67b8b76bf82c73e1cd8614313b2bb1152b829a8875425f1a603ee394d4
 DIST github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.mod 35 BLAKE2B 18effbab22ec81323de6616d2177fac8d3d81a02de8fe8cdc427a969e6ca54d5c6c84898598fb0970ac12c4577ad10db1b04715fcaaaa1515ca291b7fc4f289f SHA512 f49d53dcb97d48267dbb282392bfb57a39ca600e4e61bd0483e27573dbe80e60334e3b023a6db6d86d86681a88ea25061d6724d656b1fe8ff5d02bb3edbcff85
 DIST github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.zip 3006 BLAKE2B 78b6c92a698fe1bc7d870b5219da44e4249b9ec12a31eaf9b438c0a1f421f273cb1b11a40dba55022c90af217c4afed112e5991655b14b2a04991764c117c65f SHA512 5f7eaa50e67ef3ccb02ca7d21eb2660395d08f2c86cb2c45bac07a3fb38d7bb783688c4ed7202ee86312b4efd488defdee2893b80a78bfd1046306c4b787614b
 DIST github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.mod 429 BLAKE2B 1b89e15ade551911f2cfeb241f1707157c1a0427871f0c4ba0eaf39f04686a6fa2a72f32bc6fbcff7e113a1cd7bb731a1bf321dd4007489e66faf612428e2a97 SHA512 b5b4f0f88fc76c4ebc7d203729b095a969d2417a59a605dc78dd7eca128aeaff5a5f4793ddd9281adec7e65c14f2e1121778012e60bdb10b8ec9f84d9b13e6b6
 DIST github.com%2Fdylanmei%2Fwinrmtest%2F@v%2Fv0.0.0-20190225150635-99b7fe2fddf1.zip 7730 BLAKE2B db4cfc15f34d8ab0ad8ea09c0fb8c993d3b80aa00c233b87646e56c60a9ba1c681baec563f594be7cdf43d0ac9b3342a76679bf723c8716d136891f329387ed6 SHA512 6677a77aa84dfe7406c12c78b629dbccf8503ad6e4246383c6404300af23708aad968ac8ca540ba75a527440db4ad8b199cff4fe03aa3b3a7ba58b3142b5526a
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
+DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
 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-20190203023257-5858425f7550.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
 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%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
+DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip 13436 BLAKE2B ddd82721096e3dfc8c70543b4324d02f1137d9eac13c1eec1236c4ff537bbebc2ce5f205af07e8ecc16a909c4415e764d87324bad3efd5c878aecc9f8b105647 SHA512 722683483b8071b58508a7de9a9c9826d4a33c874948c1a6612c89195cceadfbd0ee0b56635d408f0af09aa2e904b0ae3c86a06e9b8f86c502080ce04c756e42
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.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-logr%2Flogr%2F@v%2Fv0.1.0.mod 31 BLAKE2B d141d98fd2673b422369b754fbd430a465f08bcdb07fbbf1ed626304ecd0843255fd2e909fc395b04c7adec18a15dea65ede0c64689be98b7491729d13363db7 SHA512 45bbb63ae2dda8c2ea63c9e38405b379708326c3f2e7963e3589ea53d06fd3bdce1613b5a0c1ef66f9c6ddc21374b1669218bd6b3210918df0a4b205116f3e14
+DIST github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod 41 BLAKE2B f496cc326aeee2c6f1547b802fa1ea13a578144331451bb772a33e2934dcc655c9355f06f7845684130c6647d00decfa937c839909baa01a6d84f6e601a427e8 SHA512 56fe1d995f8f51197d68494fb2edc2d5c5cc863c881ed640a74ba80e292a54a0600f10c727b3dc8a209fc33c750d92ad658374d0dc3d083fa9750bb7174f5613
+DIST github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod 43 BLAKE2B ab024fc86c325a82315f5a99c39e1fc08440ee35d81fe09959816a0fff09aa5d852431fcc370dde082963ccbd0d79d74d987f1bacdd4796d6d1d11eb80089d63 SHA512 b3548cd55d406b9148e992e276f7178d68116825198f359971f22a1d9e7e2548cdf9605a1b8b6f04b3b66d92faa906dae781a53624344733fc471452f16f4312
+DIST github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod 34 BLAKE2B da7fc8b2c3dd4e49dc2efc50ae5d50571e906f68ebbaaeb863f4b3f6f03160a381d7b0e743863cb4253ba36afa2f5d7e518ac08fb4d6c08566d9931396d87fa9 SHA512 b75a0212825e9e0554f7654b1da4050ddda233853ddd86fcfeaac0202dcc4605f0608f3e5ea90056407ccef504330ac407493187a759a36fd716f508b20dc60c
+DIST github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod 34 BLAKE2B 3eae155bd845592809662beb61207107add5a1e0edf380e313e262699dc421b3bbeabad5ea9ee73d29b6a694b2e58854b888e8fdb3dd9c7176ce637056cb90cc SHA512 81cbe6c6c48012994253a40b9c897207b8b4b79f35c09ede64ad7f8d22db8861ec823f2b4a7185334554c75bae3b614de236f804312c77b0027e97114ed4839e
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
 DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.1.mod 31 BLAKE2B 5b9a7c710473f58b57d11fb76ec3ea044f5c7bcf2532298a7bd687897e4731416f423c051c601e7012426958060519f664e9c481ac5a791b0b1603e83b406bcd SHA512 2dc02a7038b6c4e9f172e5787e70de1dcf44d1abe19fba03c586d7051f723e78bef3067f25d1bd47ca591b4f252fd76febf8494af610d8a2bdec57c306dfb496
 DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.3.mod 31 BLAKE2B 5b9a7c710473f58b57d11fb76ec3ea044f5c7bcf2532298a7bd687897e4731416f423c051c601e7012426958060519f664e9c481ac5a791b0b1603e83b406bcd SHA512 2dc02a7038b6c4e9f172e5787e70de1dcf44d1abe19fba03c586d7051f723e78bef3067f25d1bd47ca591b4f252fd76febf8494af610d8a2bdec57c306dfb496
 DIST github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.3.zip 10264 BLAKE2B a442af353fbe4e06b4d14e992bdf4cae3d92eca6e5015bc0f74a27c2e4f26287524f757d3e69a3c1ab72bda5056214f5bfc6658e7dfed15f9e82af52b41df1ff SHA512 6a52f40f36b24cc255edec25956339b246ebdd0426b5597b62de90a15e6aa89c1ee516966c47dfdafaaa61907b423d78133d13b38172ae167be025e4c6d6da91
+DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod 29 BLAKE2B 5311a22dbbbedd78a98e34293e79fb5443c57774fa9049665943e377fd07984a9316f3ec5c8fb70da9b133c6390d32ab28b97e939f938bfeeef78883cca6fba2 SHA512 8a1ab67bf3555ca17b7efb1042fb6a7d58b225b4186302b0cf289e7b60f9aeaf23e36ff6d4e8da2ed728dcd676cb2f30f0625c430c0b6943dd25ee02d2c27247
+DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip 36892 BLAKE2B 86fda2a386b182044a4482b9cbb90fdca1c07b45b6c0f0a6f2c63468263840ea99f22140a3d7a9f68836674f884c425d8d44c6583df554ea6bbd1b7b84add874 SHA512 c8c217d61335e9b4c9ebad513fea36f7bc529d398ee7bf6f538bdc355ef62f0597aa7aa3d78b57e6571198cd43e53ef032e8ffb66650fdfd25fe49e17c7ce84d
+DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod 29 BLAKE2B 5311a22dbbbedd78a98e34293e79fb5443c57774fa9049665943e377fd07984a9316f3ec5c8fb70da9b133c6390d32ab28b97e939f938bfeeef78883cca6fba2 SHA512 8a1ab67bf3555ca17b7efb1042fb6a7d58b225b4186302b0cf289e7b60f9aeaf23e36ff6d4e8da2ed728dcd676cb2f30f0625c430c0b6943dd25ee02d2c27247
+DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.zip 37788 BLAKE2B c23c30419fd55a14451ffcd5b95ac35ff704ad6d1d0d4b3d344c9e3e0afe3adcc619ee2d99630dd9343229a890d8331183806eaf0e012b8597d7a5d285ec3b57 SHA512 2d8bb8c9051997cf18289857515a09c6a5b2475bdb6a54206bfd1cb213d1e3516d50f3fc8879d69174dc5f91b0b81d23e834095684b39d4d850c0aef5321e3fd
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv0.0.0-20171007142547-342cbe0a0415.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
 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.0.zip 2638262 BLAKE2B 36e2ee7f35b229e77d6574d45712f6bee214e604cf1be37e0217e5d1eeb68863f8c0e3269bbc17487ee49105bd18d202615ba7f93fb40eee5eed42aad53ca770 SHA512 24c8b22b1cb07fe19e1648894ca9439afd87bab73aa627dd319330aeb5e83eae5a8c4b155f1325dde3b31bf040da6a162b9845c1a11b375aa0b969bde845f055
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip 2737734 BLAKE2B 6d5345f7334008fd717d25d3a3d8f18b77408de943a1deb60ec3fc488ead17a2d41fb2f91ee174195b87f01446fcb61106fa2798acbfd2c477863e7a1740a71f SHA512 b86f02e94eccf0d66190b6ce8025774e2c9d181d4308a4725c2dcd3e7234e71965250826c6ef604665922a2986c3c7e54309b22004fddafe8ebbabe33baafbe1
 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-20180513044358-24b0969c4cb7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20180513044358-24b0969c4cb7.zip 39653 BLAKE2B 9b547d2792e07aa81123297fa72df889d1c4e695dd6376e0930b242361c5cda59d32702481e40b29148fd47df25679a8a1a75f3aa66c75aec6be416a5b5e1749 SHA512 1627f509fd7d9a18a913af9787d043d66dd10e1fc51cad4f9e08306cfbeb8f0d7df023d20f46c31b424ce79e337788df10c37285659db6f1be118a27b6083303
 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%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.zip 85123 BLAKE2B 89a11d5b2c0abea9b2f391dea5fbd539b37f7770623b7e535b60d902a33ce0bd6a79928569542e932f117548eece074843303cb4c0539cc8def54dce7363fa25 SHA512 1bf7c75b83793a806e6e664b987f6a21561be9fc687364a6d4cf9fa104df27826482fee467dd752b19f349de2d8dacc1c390b064ecd4eaa2fde6d74bc10af734
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.1.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
@@ -163,6 +216,7 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod 43 BLAKE2B 1985b508a7ca5fb
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.zip 458318 BLAKE2B 04daa21a72a6b8662d746828ccea97421d645e109afb6a6f48f1f56b614a8c014d2ba764b80f9601f3928b3573339936b9b522ba02ad7bcfb7c8f8323c3fc102 SHA512 dcdae1a76ed6795a7e223d3b1aae5ba2a1c2bc058d07dacca08673e484e1e18825aaa301dfe03fb8d8ce4eba253d61e1236058761eb1335ac45fefb2409417b8
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.zip 70555 BLAKE2B d83b37593eea44bbd11100af9c0c41bc2b55e14d06ef1fae1dce5242bf8cea1574c97a7148e7878385fd4bafbb433aa26fb4fcaa47e766353b2b6c179ddda124 SHA512 3ecebc76ab8e8f3cb65a95065639f3e90b5d722ba1aa564b42104e83ea4bd67af65e52c73a33b9b327b9934553f2c5b7324be8229f2c2e95c495065360a37c54
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20160524151835-7d79101e329e.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9
@@ -173,23 +227,37 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20161122191042-44d81051d367.mod 32 BLAKE2B 11dbff4f4352c70c63b410ec8fb7986235dbaedd97ed64d665ab465898df351f2ec3eb9758c165812d5f97bd7b409e90f2db6ee41d73ac9d13fb96c638b42c38 SHA512 8720691f3968ccec689b3c777eeb9b5dd2932f16f77760db3e51fc0315405f7d96711fe0683d6bea810c8ec4e5b320fbd16e228f5f407b12ac5ff896cb263372
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod 32 BLAKE2B 11dbff4f4352c70c63b410ec8fb7986235dbaedd97ed64d665ab465898df351f2ec3eb9758c165812d5f97bd7b409e90f2db6ee41d73ac9d13fb96c638b42c38 SHA512 8720691f3968ccec689b3c777eeb9b5dd2932f16f77760db3e51fc0315405f7d96711fe0683d6bea810c8ec4e5b320fbd16e228f5f407b12ac5ff896cb263372
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.zip 16584 BLAKE2B 91b7f51050c2ee0261447144d1f86c7952cdd5f3096d72040b069dd2737c008084bb456b57400d3fa5cd26ce3bb34265c0cfcee94c4dace3468ef13b62d73c74 SHA512 6e265617828739486750cb8c5a8337f3e17f83664821208778528d93e608bd142902aaefcd64d4e6fb8542e5b0938b12191ea070fb5deefbff946daa146e9278
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.zip 259222 BLAKE2B a40b65755786c83fc0cc40de98de0c7f734b54c0441617f0274890f823175b4e44e721d4ca3c46a7551bddb5487c7d992459c928ff4abc435acb5bba5a302a96 SHA512 26ffdf319d3c952533c25c487e027bf219be3f7ec7345f9d155a480e1e5f3006fe335ba790cbfed00487e23a8506a8208ed7223a514da11b7a4bb069337573ef
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+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
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4ad34d0ca2cf07ed10f5b4510f277fb4fe621523c213016171a42be56edc1b33185a93226b0d04ae6f629358603030083c7b5ba03a36fadf8349b0ebaa9f SHA512 240fccffe9eef7f5900b7e3add1fc95b45efbca63d6c09086ed4a0d4c50d470fddeb01672da067222c107b794c204f8da63c366782c52e7b7de6514c310bcb7d
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.zip 411726 BLAKE2B 6ee260803ad6b9edfa2cae99d831be8ca468f58463aead297358e3f6857b97503de8253b61e1fb9c0489526fa9937d6dbe57a50cebc31296d219ba7b834574d8 SHA512 413d7e0ef65ea9a6315a393a72caad1288b4b9a78f545d1bf930622404540af6550e0f3fa405ded6902099a271475d8196de7d5dbcfbb66e89c5fa1f7b2b41da
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190126172459-c818fa66e4c8.mod 42 BLAKE2B d45f19486e49c3288bd7f55b18dd296a05c8264b6eb2880269e778dad0b13bf178803311ec2accce3e1bbdf14ebe07be28d72de8647db82c81f062111962359b SHA512 355b395b1a48d208a8de8ee47662146556565d6a8b1753c45528617b77d0cb4ee06e8af500292666516e305e68e7aec31172c2ec271208ea9d5c759faf56284a
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190208042652-bc37892e1968.mod 42 BLAKE2B d45f19486e49c3288bd7f55b18dd296a05c8264b6eb2880269e778dad0b13bf178803311ec2accce3e1bbdf14ebe07be28d72de8647db82c81f062111962359b SHA512 355b395b1a48d208a8de8ee47662146556565d6a8b1753c45528617b77d0cb4ee06e8af500292666516e305e68e7aec31172c2ec271208ea9d5c759faf56284a
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190208042652-bc37892e1968.zip 1669798 BLAKE2B bfaef686346be22d778c28dfe59f41ea1021f62ab0fe7e46bbe01034b4bf36ab600b3242f2d81c448200f1110073ad7f7c4f2fde3c4a9ca8425ec522b64c4a80 SHA512 46f02a38ea6aa94fc8df0f1c8e5e04cb25fdb0808ec197d975149a8dcee4250ca26b5438004a7b1d85297d78d76629c33cb1a21d6d585224e9352ebd87f0daff
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.10.1-0.20200424014253-c3bfe50899e5.mod 572 BLAKE2B 7d42f91a8230c31654878829577a0160bc3fc3f954d4ff246220b7ad8ea18f564a9d11a94fbd2a7c3f9663da5c5da4ef058f69e4e3778e42bb829ccc9ec9275b SHA512 b364b013c82f9f20de89cf5fdec98c666bd2301b064abfaf51f92d229d83838c249fb81687dfc0cfe636405a260283b85aa80fdf6f6224d7883d235225299695
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.10.1-0.20200424014253-c3bfe50899e5.zip 2025041 BLAKE2B 8d34799bed7b742576cf0f226ff365e97e23c3cf0a717e78c1b6781c17568fa1584b80f07c0465552ebadf3391f8bf5b8540e26b01b2938496d734e0a7448d92 SHA512 8c86cc76db18f9e45955238c6f4dfa48c30200e3297a218614dc84cae83a84f4f4565496f94853aef55bfe14281bca8bbfa233071d177b6d35114a271791ebb4
+DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.6.1-0.20191122030953-d8ac278c1c9d.mod 136 BLAKE2B 30918ff7a9fe07deb706dae946872ae188d15a1c30096e7b907a4c57ccbbe6624dabecb2f26444e7fb84a1e428bf104d299ff2f8805b88b6124deec7ac786a19 SHA512 4e76c8f5be6ca281057dd42021db748d9fc38ed5886a4959c0212677210b172e3e50b180c0bf2f3800f8240f5115b5c7d37f669f36f5e12f9907073ffd6ea8ae
 DIST github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20190128072930-fbb6ab446f01.mod 36 BLAKE2B 565fd7830e103217512df5132ddd118ee71efb8bb9efe75c30cbb64cf2334586be260ab5c53000d0b554edc78c04e178f21a3783a9ac7800b6df575309d44238 SHA512 62d129cb7d3e56784afc55455ede7fc27a47309646966f31186796b1cc651f7f8f0eeffe64f7109448e9aae2adfc9943bb1f40bf18e3b615a9ecda458b2688b5
 DIST github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20190128072930-fbb6ab446f01.zip 80095 BLAKE2B a7a6e20d2eca38f4990a5efd06a428c0e8d3257ff44730c391563a4baabaa6a29e0482e3f51410f9582763c5689e79aa2bf8cb404904181453e4489aa7ddb725 SHA512 565b97d95f359379c1c04aa67060478e99cd912edd8f368054e60d3fc1ba2786380ab622e379b0e2df670cfb258b97d037ee7c536c30af018aa6f28a92f918f3
+DIST github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20200423144003-7c72efc7435d.mod 233 BLAKE2B b3089e71c2fd5e1b9699f7fac1aadf25a41b1050be2ea588da7c44e54b06960f8b40966e8a9954a451d0dad46eb060877483ad68245bf2df5f5bd63d7d0b02d2 SHA512 f885bb6d2e316d43653899fc2c729ac0ec10570a29705f9ceb15aca8fccaae321f3abfef5b3a9d3195f2c0d2c39d7f2d7d9572eb0161d00bc4bb7face4d0e9f3
+DIST github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20200423144003-7c72efc7435d.zip 140573 BLAKE2B d83e9e4d33e001154553680f53021b02beceff30d8ab7eecfbac78eb3f8fc05b52a3a49a1e26fca059ec273bad551db1eafed915f0937d53cf033277241886f0 SHA512 0ffa5cd9bc91aeb97e429d1be7f49ff54318b704cdfb7b22ec207d1c1b79ec4b5337af887cc7396aceac61cd4807e6aaed9649388401147ec4684fe9a4cfd40c
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip 73861 BLAKE2B ab1760636aad8ffa0aceb1720b6221debe9ddc6ef0c50d180cf5eb30d19a746acbe07ba3bb83047d7595a7e3060370c63ae6288fd2c57fa66a49e36492fc93da SHA512 6261d3ef4f67e239ad3a2d5b3a6b7b05254f6596ee7e9410c1e80de1b42047642286b2c0239b62ee769fbd2319c5aaeae595a1b9beb69abdd85504b53108bac8
+DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20170728041850-787624de3eb7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.zip 165533 BLAKE2B 04307e864994ddb9d843c45b57eb5bcac0c5d13aa18e63da83767803e4c1dda72d0c17070d566f6040bbd561fbe46c97bd2027477bbc23acc8b27fe68d48e4ef SHA512 dc279707dde421e9650071c85d85e5311053b1ade53dbaff95e71f3619b54d91200a8836f342d5bae6a324aa27474329bc93323e13ef8a64f79114159bfb79f2
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
@@ -198,12 +266,15 @@ DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod 661 BLAKE2B c7
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.zip 421304 BLAKE2B 4c4754375d5603517ed3c272832b5f15958c17806266bed6582d9996d952e7870cd17b547faa6ca9a1e34c98885641c39554816d24f4ed0edf106c518b16fa52 SHA512 c1e49a03098892179f8fa98aa5873085aa3268e782501e83cef88fa909a05336c61dba5fd7094d49f03fd163169028af661699f63ccd6836a67762d7453da77b
 DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.4.0.mod 337 BLAKE2B 91f4d390615c5b479ef339c74bc9c9a460031103eba8af9e570029068cb1f6dd51d3369290bf31e472bfd426cebb29a193fa7830398660a60b83fda3dace5791 SHA512 8c72241f9497d69f4af2ba25f0a9870888cc877a3c287a7a28e891a5ece956afda06d4792dcba852a87d40910b392c0ada9a9961b55498869d4989aa326bc13f
 DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.4.0.zip 27150 BLAKE2B 0e73c40928d73128501176720c08b4964f124189cdd4d9947b409094ada3f9fe356d1fef86bad5fefc275971a487392f22279c59a78fe3939dd684eb56eea2ac SHA512 552c8e942208b9757b6ee2aaf32d1e52c178afd48e3fdac65bbbc436e9f45ed72ba3b2e5d87d0853788b48b6169e679c514015a5bee009c8d1ec2a9d445d3c7a
+DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.5.0.mod 226 BLAKE2B f7f023e293b358c278ecca07bb202f1bd82d11cd79e3549b1a9cbcf2028271ce2f40fff8c8b59cf4a5b2c0af4f92f08a07e71e1251fe9b4ffcf7b29538f97b9a SHA512 28a25ca24c618a16d228634c3330de7aa8a90b3199c56e4bd6bd27e67ca29e4a62ccdf4282fbfee6a4d7a6dbe84d43ad778d5cd883505472920cf939a0719dc7
+DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.5.0.zip 38254 BLAKE2B 1fbf40317e848a93bd071850e6cbcc00986b988da3c487250f02acc50c29133cb08f758d38001b6cfdaaf0e9d250b988af09431c3ec00392d336c2ab4106978e SHA512 6f5504326df5a2a67d718df6da1cc01b4dfc969863689806526d79e84b3f8897798ae098e262ab3c0ce3f6ec4aa201ff6c36497602cedb10c947258ab2a5107c
 DIST github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.mod 35 BLAKE2B abe58b21d1d4bfd808722eedf7c5539a14f98cf479cca98e38905373a84b0d230168d22f6cade1576e145585289a01a69597d1158a893db6b8393a203d4b295a SHA512 30a341d9047bc35fa2911b119514c68e9a29ac0b57ab84e820b5a52f968fa7968d662777dbdabf06f96f0a4398339ab4d25c714ab7addb833e5c4d6e938a9fb9
 DIST github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.zip 4331704 BLAKE2B 28dfc37ee0383d7cbaa5145641a36d63f1700d33c0a7dbe6172547302f6df0f79f5eaa8c5d4dc2838665ddc80594266c965966330cb7a501d53a0dfc6ed875e6 SHA512 78519356b3201b506c561b94946fcdeddfa2aba82fee86d860c3ea151b8aed954ead7e0aec13a0c94e24e13874afb87da7895e1def2153bdf09a8582a377135b
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d
 DIST github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.10.0.mod 582 BLAKE2B 2d8283278ff4de7a94eea01e4b2e96c49e2eb0452361a93468c2a511607265dd7a8eb3d698eecb2896fac654102be12b43d2ef12245eaedef92a8ab4c376611e SHA512 0f54eccc2a8e9eafaeeeabd51e0427b31cc7eb828846835affae7149814b86a5b6b4836710e75053baba390c74911286c95bd41c89c7bbf8606b3abc28b94853
 DIST github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.10.0.zip 43063 BLAKE2B 4011cc0a3eda61f79bf15e5da9d81b45025e6d6519cc50090687838c76d2c17b8be39fda54b248e061b8bf00d3d3973c8ce32d897606b50b88c98369e8c02438 SHA512 7a5016d906562436a1a8367bdaaa41f624f412dfd5b8839aaef81c202045dd2994b8894a6e5eb28d52f50f2f07526d1b8e50482eca5b548a2097986f51067182
+DIST github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.4.1.mod 475 BLAKE2B 5fa6b03722c1e8c2fb37b62364c33966e2a6fd83a834e969931bdeacc278031aa8ba574c0ec4ddf3a79dfe3c68f3c364ef7d5bba3230b44ef9207d2fda607525 SHA512 6131d39d0da32fff61e5c653456cd8bbb9984b164a9093789aa63c7cbbd9e348be0a86e93611c83e9b81299e10ae073ebe17c901ca9aa223ff67e656850b3f93
 DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod 134 BLAKE2B 484477f336780669d2467c673d49aba38a44868ae2e3535282c19631fc7767c36bf3bb46d3ce27aa8173e1167e7d56a206303f73b671b49e999839832b14ae17 SHA512 32745c37e703a050b2d475ba122956a1278450a852f1b101e5900f62f0d0fc2e499f2e156b3640e76b2c4c368e3eacb8bf215b4ece5c55b7f8db3fa941309bda
 DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip 15916 BLAKE2B f206df5f4f898d04fccc38e95a4d2d05cde33762f1585aa673b60fb7f4b7c1d5b9d103ac7b07ddf9aa34e3a79c90a51c6434a1a9542341f050f0422135786340 SHA512 25e6d14319a8b26bba1fae08123aea772246aabe9c7bc0bd401226bfbfff6662c28c694231d8ed9b7c0a1d41b7b6d50a889f09dfd58f09121bbc8715b2838f9d
 DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
@@ -215,14 +286,14 @@ DIST github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.4.2-0.20200106182914-9813cbd4e
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod 37 BLAKE2B 3e6a6550c5fd7b237c484b2d7ff9d4fdcf02eeef8be89f18169d50c0ca7c58849c362d363428893035a5720d094cceb407c8565ed680ff248c305cd4acf886b2 SHA512 f2a0acca0b74daa85f1b49e2a56bf2d58c17570379d80c696428e31c028ace8436bd734b032996b2e3a52396d90cfaf3c0a99fd414c10fe1d67727a0da962ac0
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20181001195459-61d530d6c27f.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20181001195459-61d530d6c27f.zip 17539 BLAKE2B b90c7a23da87d5082b8a1ec8371a6c19c8d34ecc729211c2d206101ac5b3a1b3e8750cb75e1085a213b3e4a461a8321958ac1378807ee23457467f22db14124e SHA512 512322f2fe5c67e7f4b331babbee61cfd9fffa13e14e2e17297ceb5292a5181d4b4091405b9419bc20d875de7885086877c5a6d4c36a5d0ae4ee999521ae4535
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip 35171 BLAKE2B d5f7278b148d56258773ef2b7add6efeaeb98ff9f551b3944e0e418f381a12f9ecefbd0988604d71e076da0d598eaeee123d30e93bdf30370ffac0a26bc33469 SHA512 b2a0b596bbd10fb8393459ddbeb2e4ac59b1ccc30226b158e81bfc9bdf686760d212afedf957ba11e8c4354c2ec3abe75bdc40dffc97d5dc70366c54f209a884
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.mod 47 BLAKE2B 3806ab2f6eb5f3ae860f62ae6c116a332e7c5a5f4ee3110e68317f0818ec6926130d794ea52882f1858ece1c5d8aeed690338ae8cae4a4ab1e4df7461602f140 SHA512 53e8bf4b7db2447d188559e227c18799b6e8581deecadd94d79fd825c830d9d49ca340a20750bdb61b88552d0e9911cb1fd911a933e8d977c6b9662418ba66c5
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.zip 22836 BLAKE2B d796cf7e391b6d10f3f9aadefdcd9cffbd871cc795a0f8995cc4bcea81036947267b6d7f8f84d98f75ab6991fc0704798be0757ce0a89e69b3e610aa0a9ff672 SHA512 66460ec64753d16d75300686856f6f11fc3c0033fef106fc82e9b3939560dddb262e3feb227b86453612537803f33a181b1f0c45cc91b4f3ad963ebc9aefa6ea
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.4.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
 DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.4.zip 62571 BLAKE2B 0c4df616e4bc9d352799adbd5ebaa553f1aa6b9eda133724095f6c698bf568125f6db86d908e20c44e35aa588405e0def2a4f0d3a9eccef73530e3aee6597e13 SHA512 8d32ab3e320050ec8bd136aa4507c26c52bf88a47c4523ceecafc91e4351a3a13917433ff0be09abadcc94eb1947e16bafc817e96dff67342e4f936125233570
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip 14840 BLAKE2B afc6e5519fc2dc1209382c6ffb6f73d29dc97b6cfa03ef525d6095e65870a1ce25ca59d56648e24bc399f53f6879c0a3ce91e27645a48734602292c7d99bfe16 SHA512 8f86f79788cec64d9ce4f02af2ab7acd64f2014e5b592256f07563841444520bf4810a1dfa76abf04909dbe5f3298c67c0a88e636e45a181e461a2fac08d385c
-DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1-0.20190610192547-a1bc61569a26.mod 770 BLAKE2B 22eef413edcfeb0337641d6567fdfb73d32f8ab2b3e624a3e5dafa15d31ca15c98c9740d4e9c8652adc5cd9f336153c029b086c260cf9ed8beda64b9c0c06028 SHA512 65489f1fe43c58303bd999f4c8d96b6bdb4d194b78e14d2ae9de9ce4fa877827f47d5d3c79e8417c88d1571b135678c069571e528b061238a9d59dfc8b472097
-DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1-0.20190610192547-a1bc61569a26.zip 109526 BLAKE2B fd8e23e076a0a5fee9b66ebc28d6509c536a25bfefc54988f45ace70b2884e2380c54726053317cc5f00ac45b354547ae7883c83a7e9106e5eafa8274dbff6f6 SHA512 517c806ad97412a1dba795eabf5b45df84fc69d75b285de602112a99c15508a6027b3cb32aebb2647e0302099f4f42090fe4f9ac221c52e381fecf57f5074f0d
 DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.3.0.mod 502 BLAKE2B 8e1ba6601246ceae6ae40381c0ab3830f8893b84921100fe5ca25306a7f05bf9cbc2b348ac9b491b0921204c2c45d9a5ae0f82b1ba0c0e673dc6ad102db0bdcf SHA512 57a29d89297315eb58b2c6313396693dd927161138b58affd52687594ef46fac8a8eeddbe3877cbbcd067186a1ffe50d5ac6dae383e0ca6fc03484f1b8014902
 DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.3.0.zip 117001 BLAKE2B 756f2a794f142e8a945bd9e2bb82290c2139df4d03357a7afae87c5494865848c3784204b24989d383bab5daf67b1ad9b94ccafb345d89063b8c5a102d2c9901 SHA512 2720f3712371327a88ec167dbb8095d5a69d3434b4d0c479357f637418f2e1754d088ef2d6f3fd77fe0038551dd5379202d253c1964976dce1791e11a560ec0d
 DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.2.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
@@ -235,13 +306,12 @@ DIST github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.mod 45 BLAKE2B f929917e6591c
 DIST github.com%2Fhashicorp%2Fgo-slug%2F@v%2Fv0.4.1.zip 19131 BLAKE2B a54390bdac1be49b1d08b1d64289d29219edb64d3fa2ad867d3e992ca2ccf47813a0b5e7a17767ba7c6f8adea2ce1f179c67aebafea3e89ac41cdd4b489bd64f SHA512 5029bf828e02a226e417430bb848096d267c061d6c88d7dc465ccb5b508f2463a7ac070e9ff7e93b38f81acb2118ab7040db11e7ef71e8db2b62e5332ed77f9a
 DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv0.0.0-20180320115054-6d291a969b86.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
 DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv0.0.0-20180320115054-6d291a969b86.zip 136787 BLAKE2B 43f94a4b4ea2088289627886db892f223925a1005f9f5f130d0829f71c263a1a0600d837d8b476d11f0a1d9c2d9047e446fce65a8aee4107adbc0137d4d75681 SHA512 8a0978d3a1ee96bad8d72bd8c6f12d149cb21f0ccfe3ed4321448a02894c99a4b851305c43407f9f6beb598586b157ad6bac6a449841024781562aa11b7d615a
-DIST github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.3.27.mod 456 BLAKE2B d7be2023d4410010c276f13d5fe652162c3d9ef556c8e373894d39b69fe156f29ed4936cf89a55a9abc0f37cc5d22e13db9023d59ddf7ec16ee2bacaa64b00e3 SHA512 f08bd718a41cd1c3a820ec900baebe9e5de37d305d6d229a99af946f931bc609a5577c1b1a24783435a7522a0c57670395478bd90e5719caa01ccceef93761eb
-DIST github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.3.27.zip 100373 BLAKE2B f636846e6cabc522bf0edcc36e14693378f38a12865d01215d2812c4bd7795391779dbc83f7ad0301a2a3de34156aa06af6b0e8ea3a8dd11d508d468d43ce487 SHA512 53bb81c5b007de05873f21ea198e50b9fbcd198a13f2b29e4b8589c0142959e14f6e54e987081e77d46d9f61a304140f3c2aafc8f5c1b0d0d5b51ee83527d393
 DIST github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.8.1.mod 465 BLAKE2B a9d616008797671e04a47644ca0ac0cb1912ccdea59d1cc4daa656e08e19d13adbdae8e0aa9eca09f09f98088059a977e6701f7a35b3fa1791b009da68139252 SHA512 43b0b1af500405f94f3187719d0ba4d18bed138be7e923061c39d92062a32d03bf509d1ea3466b5f55c27661afd2643f4a27690792f3248b767d2def093d7c84
 DIST github.com%2Fhashicorp%2Fgo-tfe%2F@v%2Fv0.8.1.zip 114881 BLAKE2B 2ab265643d3f76746bdd02fbeba7db4ffbc42c1e8e1361720f07c849bf09fc83bfedad3369bb22f6334c9587cecf0da23ae5e9ee5389454ee76413aa2b396a0f SHA512 b6b38ea5cf7b17396967e3753933161c859478ff52d8ae19229a45139171832c0cbe7d8ca963088051569d48dcee6469349142251e07c0f871d73afa96967f90
 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-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip 15533 BLAKE2B 68044230c48b4076c3d87d9c46cd96d3b0f293683129f72c6612f0091aac8e7d722945ade6e689c4174baabe37a9f9cd78d722d9a61bc304034525e8605522d9 SHA512 b0d8eb07cb45a5d0e048956fad5c1c822e15d4b5544f59eb2ce925d8e9cc14a8de072f3f4a1792706b293b1d9a0530391f2243234dbeead9bdd77f229ebfba8c
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
@@ -254,6 +324,8 @@ DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.zip
 DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.0.0.mod 819 BLAKE2B d92365f486528e4ee8abf0a03ec17a4177ee070de453b1bf02af7eb13a944fe85ba81976a5d61cb3e1fdb422e188ebbe62e5db6435eee56bb81ef8f5d5fafbb1 SHA512 f87d8a710287fc690267862806a9a2c320ad0ad6a3b1e80ce5c0c9f23a2cba416599fe855bd4e852384c885fa8dd92345311e652f19eb2c67984eafe3fba322a
 DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.3.0.mod 819 BLAKE2B b350f3a61b049f663433ca0e8c81d8286b0ee7ab1cae8bc427ca0fa5a58ec36320f865bae4664eeb5f97967faa42b966602c06f27d97b021f6594ee33b78c14b SHA512 43f38c0bd9aa60bef8b7befe6f13eb17727fb46ff97806c4914a107b69b183e55e381d055d4502b838d3819e335fe35c56e8b4356ae5187977611c5dbd3bee3a
 DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.3.0.zip 506189 BLAKE2B 2fe00f838565201360ff7d37aa6beb501ddd18b63a92b398b188e9c7893af43a2db34f634cc84426e57c7a97981cf015eb8f634e0c218a02287c23af6de49beb SHA512 9cf90e319d8e80005e207bb61f3fff34f0b3fa3534ade94f0b85731f9fe8f1f9bce5f2891d6fbece97f409ac09c13b1b8524785c42eacd0ed2482ccc0d6b9615
+DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.6.0.mod 833 BLAKE2B 63324b64f017b8f90b5ad3417c05fa31cb6789e39080e30cc4b00ad295b3ec506e9ce9fa6d2ba62b132d6adf55f5fa6969d7407fc45ab89333ac5fe9b6d790a5 SHA512 2d35aaf54e9e7b34a6713acd772e4a177052dadc906cba2d7af08aa4882d391216eee1e19748944e9e5c6b873c1325add9e062836ffee3ec1c872095a9a981bf
+DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.6.0.zip 519810 BLAKE2B 055eb01ebb4326c0be6529ca67863c99279604d0ece283415e4ce7f9c09e1496ca4a47e4d64727cfb08b57553a4fb9948e8c0f6c5b3a9c0b2761b630fb0fda58 SHA512 cda0a56da459e9532679f4b4b7b67af75dd7f8f77919c1965fa29f1305dab9d46cdca9d75401d920566b98b7cf49d1681b2121da58fad4f022e6d64c6e67f35a
 DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20190212112733-ab17b08d6590.mod 128 BLAKE2B 1eb83fbb14a562b773bab2b3a7935d400cfc3921c643e9854c593bef8b55a82e19d88f0bdcf5fb814536a85d52a8ba53a55295631dbd5d6aac9d51a547d1b966 SHA512 107d9cdeca3151466c4b6833d8b39808ac5f3e05308ce9d78bb8afa18623bb91248ebd156f78343c4af95ddb91bbeab33515d7e414f5244753970b8b9948b498
 DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20190212112733-ab17b08d6590.zip 75802 BLAKE2B b3fb61bbc3320c9e45ae5a13ab59dbea15b7c2ead09cdfadcd0d9f57e9cb086bd228b70d655055bf64ee2654bc5198722cf85ad0d39e6ef9a52cdb44661d8865 SHA512 d3ff93e46991144635d29fd6ac46b5922480d4f77b66e741dcf9939f977c1a5f6065303410bd5aaeb6e495cf741ebffca205a89d723e02e31f6d6b9a15f85845
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.mod 39 BLAKE2B c11742f4aa49d10e9a7acbaf0ace6c42549eae13b5107286dd45432b5f83c45d6b87ec8ce57730f232ea21ddf22bcf28a9f4cdfbfc46f9067df311c34dd44361 SHA512 4fd06e96314b6f8b94b8c73af586a934a6a6e9733111fb9253860ae8e65d190a71be0b902f2c0b3b35141499fda55de3e294c317ca1abc5286c4d6570b22a565
@@ -268,6 +340,12 @@ DIST github.com%2Fhashicorp%2Fvault%2F@v%2Fv0.10.4.mod 34 BLAKE2B 5d90bddb6c15fe
 DIST github.com%2Fhashicorp%2Fvault%2F@v%2Fv0.10.4.zip 12479370 BLAKE2B fcd2a5f6e8f5713513bde04c197791f8abfe76f23ff3cb407f574cdd9c79596693f8d1f48814132f0bb391594b2f7ccba916a9a37c8e4318214c276ab2aea318 SHA512 691d3ced283223e2a6b0c5303980232cfec200277696654b980d3a966c1e099d9d849487d0323f86c308db2582efe75bd8d52198f0756f3d823cc989c785a44f
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.zip 27916 BLAKE2B 03c96600c9cb255c97c2d4f6a51bedf5730509de4746dc32d2970ce772a1d7970734d005a56c188f38f754294a2b336cd0aff65b4291e8e4870f4ce99df065ac SHA512 49efd0e004ef2d630807f4ddf1af45521805d21ea57b1413e8cec7c67c37b6ac2562d21873138009d98bbc530f496c6ab43f6e73c960fe98014e2bfbf897b73e
+DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
+DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip 28730 BLAKE2B dac64266297648a7f3519e13bae1dbfb4d46f818d02cb1da520a1888b085ce31028e274e5085ea58d8786e9f39144880ece626ba46b50b68d37dc17d730ecdc4 SHA512 1949e95d8f3d259b27e0152824e25aea2ada28f33b56282a62bed9a6076a25dbcf664a945c5fc3015247c6d3f470192fd22273d60bbeb155288574bdac6e2e8a
+DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
+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.9.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.zip 30042 BLAKE2B b14fbf7999bbddca7c82a13eb46485682474824f9fa310c69c4376ae5111496426a9b4b72df6a009efc2f3530c56eafd73bad9df8ca2436211a2200cb812d810 SHA512 fe7617211e425fbf6245c55d42d436c5600e89b84a17f59e56563cde8e2957fee5be9b570f546836627c021b7896d3a7e238ad8adef66f4c3f08f9d231bbd93e
 DIST github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.0.mod 270 BLAKE2B 5549706699b1adfc2d01e7fe9e2bb7f7ce3f58fa81c921f3eb57dc7b2f418d3e8a690b1c4e68ce49a5e722a9c800a7a68c55ca453d60fb171d2442a2abfa6531 SHA512 9ffc97ac538d2bbd9ffd19857bbbd42846987022919e1da5f7b779bb95a1bb9e13b84c4397e2df796a4e43982e79465063b910b4cd9220b6119a2550a0f1cc5a
 DIST github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.0.zip 643347 BLAKE2B e1a5a00ddb690f18811b7c304704fced71d8775aac45757b2e6d1fe0c5f0b142ef91e7e047896deacc9a28e41fc38051eb8f51fddc380efc604e886ad380b306 SHA512 2dc9e5fffb23adcd89ab91efe3846ca9563a0e9b650a72f37331e323c59bed070ef6c4e4169ffcad257b1e529b6a47fb0d2687efa48502b665567c49a00ba6ce
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
@@ -279,8 +357,12 @@ DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab91
 DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip 8857 BLAKE2B 2887917f30fc4cba4c028ce8d42262b007ecd785df9f4ba1dd74f9ddf68376a6c3af924449684c8ff8ca530b249445a7ac0ea36a63fdb18d767ed3649a63f7e0 SHA512 999ed7f22551e55d6b4b59af2ff2692ddddb251de4c61a835ccbb9f8386ae426ef8df6c3434b8e8e143faacf82ab64e022350f9d57ec51544a27042465cf920f
 DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.mod 35 BLAKE2B 58f9081333c4d484056fc9fbc8be7f41cd1f059a20c2786635176a283c47a1d526fe2b5718fc03832a4879c70b9523c9cc3fa6a3d75081778621911e7123af0c SHA512 cb340ca055291eefd8e3f05764d45dc8f11fc25486e8ecc7f4510ef925d0d6a1b81f29c23aebed0e03beb6bd3bbab45ab9ee9344e9d4cf3f4407c2a7031e2ebd
 DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.zip 161148 BLAKE2B bfa0b01c4e9fb0b576b1ac3b96d4045591ff9b64c7d6c0626dd1a315eaa270889f5634cefce54bcad390faa6d3e1bdd940ca09304d4fbd38580f17e166ad6e47 SHA512 e56b1ebdebeaa8c48d2ab2a934ea5be6f5622a8d2d64e0d8621d054b64f81fc5239ef95b1a0589505a67303844757be6c98116abfcbb200ca71b297dd5dc4b40
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip 128914 BLAKE2B 0584ab3dce388bdfa32846c4eb13a143565cbce8f884e5ac50efb194934d82790f6fabebff4f20ca88dd96b0ac0f1d352b30c51037040d1e4e6bb427960cae67 SHA512 28ccf98d677a0ac08bbc2d8e8c94e5880f2c612e891487c8a4a051b67b9d1ff71fd47eecb357ed2c3f7ea25b6444dd1ead2d9942a45ade8c0927de18cec54060
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip 131514 BLAKE2B 477f1ba8434036d96652435c432190539006ee38ccf606671cf319e356c6047c3913c6dffad6e4af13e023dbcb6ce93455797e37d3e5b9524b75ddbcbe0e906e SHA512 e64c91926d1e3688151b4f511f506fe4c2acd0a2ab839a43d12c77145e23215e7ce3ea281651f46bb945a07e04a1d2b6bccdfc3d862b3b7cce074e5817ac014e
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
 DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.zip 9872 BLAKE2B 50868f91729f65d64bbe9dca73ffccbcbb31df9bb30c383d104eae3174551ed24b6dd3048b5e1da16b754d618d4ac5d1ac1f455466e7a8a09f77dd7071b16ae1 SHA512 e3b41d60f9467ab7aaa2f2647deb572d95e5e6582dc15fabbf146d3004cc2e19aff6dc862d7cc33f6ab3d64f38d4f9457ad1e55dda3e176d84be1a9001325708
@@ -289,6 +371,8 @@ DIST github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.mo
 DIST github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.zip 8274 BLAKE2B 9f7261226e45d83c0c0645eb1df0e99fcfd3e5de3e0f4bdfdb702aa81f6e4f9b9d0e5a36023c2c723893e10697acce9b32e8a806e9e231d9d150340299f9224e SHA512 0ca91b5d7133f7e71ba33e41f5d87b39eee842986f7c356c1751d03377ca266743b1b00ac912631b8c96f82de03109e3141273730accf160f1a2b91791bdf016
 DIST github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20161004153544-93f5b35093ba.mod 36 BLAKE2B 47002df6c177371a992c98e6e821e8ee94926bd256b81470e1d06fcbb48ab7ed843e76e4ef1e23ca40e4238d2a3844b5890649c52ae1cf79e8275e58b52c17c6 SHA512 f634e17321bd57c29ef906f01294b53f3af7a8b4e191c87c61c10520800bdcbc43f57e21bc445008c49f41adaa3dabb0ba61461e416907a2ce6ea5cd78b01bd0
 DIST github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20161004153544-93f5b35093ba.zip 1332306 BLAKE2B e48d8483acf2ac14f213b1d32d5ca700a90d07a9c5eb115b9573bf842976ced5de0f97001714aa252b4f643326b96fd6c8f4b926420ce463fe31a822f9eb8981 SHA512 813f00c09b94c1b4459604d874967fe00a5ecb971af594b86c7f078202baca441f0927665e29395480aa5f8db51f9674e62fd7fa6919044db6641af9f792aa22
+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%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.1.zip 3567 BLAKE2B 80b7bf217df9367160180d44c1fab6a9f10154bb9a6455538860158a08c5bf8c794fff973b899b1376e4e65764a9aa0d6b8b162a6d9ebe1adb1368b9a2a42786 SHA512 27910ae03fc9fbf573ac31454635c43bfd771d2a91325eca544f7be0e24b43c2798ed8e74b4c31e8c20c1a9cd266b835017aea3a3e24c2ecb43a14a6143af8e1
 DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
@@ -312,10 +396,15 @@ DIST github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4
 DIST github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod 120 BLAKE2B f6155af40edbc708d9bf99a9c4403dd5c75780404099278d2f3b3737843eac0a06518413529999f1387329b93f499fdb5dfb143b6e94a2e737d05e9d067ae35d SHA512 edea2397b688b2b8a16a38ca58bbe99ee9206d799414a503db000d70c7b7ffea6e956553c1ee1bbc81e0349277f111864f725c53762e1e0af20abf1025e80c36
 DIST github.com%2Flusis%2Fgo-artifactory%2F@v%2Fv0.0.0-20160115162124-7e4ce345df82.mod 39 BLAKE2B 406a71bff60b06230bd1dafd228d27c128e46a18b14db329fda5e3e3dee4eb3c777972ece75e0eb62af751adade4ce0cf2e755126b095fb343d53d67027d297f SHA512 fec059c2ef349c930988a7cda3229239ea79b4ed96433c3ac2c1c904839add88ac0dd71eecee488bf9bfe495aba544609be62ec6c70d7d5fca5dc1ee94035b72
 DIST github.com%2Flusis%2Fgo-artifactory%2F@v%2Fv0.0.0-20160115162124-7e4ce345df82.zip 44499 BLAKE2B cc42fe20448cd095eec48a2acc587e3fa264803e1cd49ba28becc81a2252cd771bcab3d65d90a8d988cc64f3f26a5b7473b37e6924168f9e76da8fd797693f2a SHA512 dbbcac000691f6967b04fc08ba9e6c11eaf761b8b77205bb306da1097525e62f950ce68c851fd7abe967c0be698bf3957db928df9d9102d288a07038497ef31b
+DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod 34 BLAKE2B 0f1af1d8e53c7b13c36f0a436cfc14eb8fc7a7bd4df72d4e9315ffda79ce20852ce50ff6297daf8fb2998e1d76af4082f71c94555ed919170d0003483de94f4d SHA512 8a3f702f8044a984fb6e1b9c73d837cea4b7f51783fbd03c6a957b58a0b4084461c63c94367314ea91f4684612b1f7b8d4eba8c1cb3522913d51db41edb73cd1
 DIST github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20160608183007-4572e39b1ab9.mod 38 BLAKE2B d0228217f6928e5e181f254b9d4ceebee6bfd4c4ffa388a2dd18a5b761a41130af97f5725e447feb7fc40169ee017c69a43565a70f3a17c46e56097ab2674b64 SHA512 7c39bf919ec24040eeeec3892f7f5cc2042c09abcc5c6899ebd42d0d8c3c8ccea052ee2afa01d32dae81aabef64da0e831e19033092ea06b69f3077381c6ded2
 DIST github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20160608183007-4572e39b1ab9.zip 8193 BLAKE2B a603ef11c065eae9b49fe7336fd7dc115392f6384693f598507f0f267190c85725ac175aba71e81c7fd6bf8c03a0e8cb183c4578db2f5e63dbd9adedda63f506 SHA512 7f5d2566bd58c56a4145153ecf667d00ecfcaff0f359b9657279f89d8cc211efcbfb196afcb018cd5b1c53aabfaac40f1a9519f486c5f7371efa8b4b93b547c4
+DIST github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20190410153822-31eea3082786.mod 38 BLAKE2B d0228217f6928e5e181f254b9d4ceebee6bfd4c4ffa388a2dd18a5b761a41130af97f5725e447feb7fc40169ee017c69a43565a70f3a17c46e56097ab2674b64 SHA512 7c39bf919ec24040eeeec3892f7f5cc2042c09abcc5c6899ebd42d0d8c3c8ccea052ee2afa01d32dae81aabef64da0e831e19033092ea06b69f3077381c6ded2
+DIST github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20190410153822-31eea3082786.zip 8152 BLAKE2B 8c0485351d1adbd657c3d21214b5e905bd7fc19e42562fec5c7fe5f868c66750995cb0b582d9d04f9aae2e511a9e743f2bd99d946a4d25a81f025b5da0ddafde SHA512 4a4133e27e90aa6c2b0bc33adc7fcf5aaafe0e1f0d0941893dd14ce910398144a37d4bd1ace60bf506fb56b9c8ff704539d9e54d4baeb05cad7ffdf93155ce88
 DIST github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20190223112901-5e5c9a7fe54b.mod 576 BLAKE2B 886987c87f91c1da62ce9d1698687e49f9bc50f9a1f50eeda2e19e8a951cbfa897e5631550825e8986bc367ef86edfdbc9950a0743762ee838bbe07a3cfd933f SHA512 fa1e280e5b93f647c417109a902e2959668437201e971e942561960462594f153046b32bcaf4c1b7884f6e001e3b2bf791d13e83128337ea34d97668b76ca904
 DIST github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20190223112901-5e5c9a7fe54b.zip 51831 BLAKE2B a216f66f3055c1dc043e09edafbd71877eda7e12fe244533136268d6af75c41d79110471fd13f81de83fb42f4e52b47ada8df8ef68da6607b0af4f85103e05ad SHA512 77d6e575be7fe2a9b95b8f7765bd5c1bbb559d004b750c6819cef707d029531b4d275bd55b6e3b052bcedffaf6ea3ae84d85816152c50655c08672d9c91aa930
+DIST github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20200615185753-c42b5136ff88.mod 565 BLAKE2B a001f1a8c50cca5022dc8dc687537b186591147f6fe1e81046e0ab66c8292d3d531ceda5d16bdcecc8c033087419c3da95441b5179018637e8f2d578af9ffc7a SHA512 c91c496c17f05fe987b3c0ec20afc5c26db4fefca9f86109db3cc2a335870126433b56033f4ab12638ad02f9d33bffadf212ce1c943636bf22492bf24a502359
+DIST github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20200615185753-c42b5136ff88.zip 52370 BLAKE2B 6b571dfe67246ce1446df354445ff6767abd06e5b98c32912cdc0cf2bdcd4f89e2d865d350730b6d117aee26d173f0fa8980aaededb0bce66e269e81c8ee7a2b SHA512 38caf289fa67f169d67589e88bb85d1583b39cc0625784468627af869331ec3a09f4cf45f4e72810dc8d44ae8f940f4917d11e17ed38d8e6ae524d280f171d44
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.mod 80 BLAKE2B 60990a438d80f62d28312e2ca1f07f9ce277b9d9d52ca762201f9bdb4e9bc72bf7ae95b40f1a249126f70db8f296059bce4d7a098e82d2615186e1267e51eec9 SHA512 89a2e1340f04d1aa40eacc84c94ae2723fa34d2fc5772c60bad2d7e00512adfd5f503896aee75440173037f4d50ceaeb98f7266e80284f29ce00692d15bdd2f9
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.1.zip 12177 BLAKE2B f0c99c40e021ae1262064909bdbaf9493836fc860e36decf3400d1ffb385d23ed4fbfd476d5c329d74a336b26781cea0b62180420895d3a9811a1d5fa27dac76 SHA512 fb7597c396082e29ccef11a9f78963d850bfe154a400def531e607cad7b3585b1f546de026eebff6ea8bc6d00962dc4610f2d20d4e75c25d7c36915e6831aabc
@@ -347,8 +436,12 @@ DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip 4603 BLAKE2
 DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv0.0.0-20150314170334-ad45545899c7.mod 40 BLAKE2B 089a3d8f85648feb04c692c4e108e1e843217ef67fb3d5c00ffec847c06eeae55a9432c206753cb220595441da76b635f33a9812ca92f04959b4e7dd08644abb SHA512 e8e4f318e3cc6d203ccc62c0b47af2aebee3fb99680cd6bd24af023442154ffa9c3d4bcf9064af5220f01d3cee71e7c600e465e3651ae0d7d15e2abee1caed27
 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%2Fv1.0.1.mod 121 BLAKE2B 1bcc532c14adaa320767f5d35d1493bfc9a6cf1404bb1ad7c5f5c7fc940b529ec6afa0effdc757aa20640b601b11fffd9f0ca07e1b3ca2cd5128717b9fabb5ce SHA512 a0cc03f0157608eb5e9a26c6496d60446de5493c66d81b2fb7c20c6c029db2e4a9026d22c77c2906e1995d4ed2abf3b353c7bdf34cefd4e57d94499fe159efe3
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip 23850 BLAKE2B 4cba89eb304fabbe0fb2e5108f0385b28b32e9a18daf7b766f1446a051948abaa4412bf9a17a7d6ca44d9315c47fb5c509856eaa0675263b916dd0b2accdf694 SHA512 6fb395119184b78061f3517739e05a3ecd98d8dae3f790a1e52563a3e10f9aecaa6a65dcf2fb52a8aae6ad27ad8939d2446a47ee66a866bf72a866f8eead6436
 DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod 42 BLAKE2B 8ffe9f17b9bfd55d7f3b44a0571132809a2d18960cad73780b88d31a723fb380b82c2c3952030a0bb4802929b625583e8aec8875c36a2720c0135ed8b59fe4d1 SHA512 414c86e4d26a8cd2f215353f04ca7ba0eaa17af36e3d3708164cb3698b8d198355bc7bf57897fb9d96cfa822ed50681a18157540a752998060c1549348791755
 DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip 8207 BLAKE2B e83d1907a09b00eac0ff79803983863e643961fefe9ff69fe0c8ca7ea590d0878d416109df385eddaa7eaea4cbb86fa60ad0df16a09254fc16d06cadfab82219 SHA512 c4d665252984e51420039cea5d2fb7e435b31cf8df3fc915bf01eb19b739514ccfd632c6e4b4f93df575b0e1fb02ed7ea822a5e02790442bae4e421b7cff44b4
+DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
+DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip 2536 BLAKE2B 5f26ee7bc9146338a1bea319bd563161f921017bb208967b7745a06e7482232f00f7c32f23cd526efb44211e9275d0fd27556f77ad3fbb033677b12e79d520ea SHA512 c27fae2305ad9b3dabd7bf99214b86540ad21a6b2bc746c67251813769da9d49aea1cfe473fb4effa9ab7ed9e1397c36c9906445a68e84be1215ed2b3148ab9c
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08441a9bb45da31ac429a372a969a822a0c5de569352bc25403cdc3e8559a7110dd2612cc9b93c91882973aefdc70f8ddadf44c1488eb0c3f5bc62cca2b73 SHA512 43d57d9ca99ee6af49e8a39be4d65799afccc8cb077a8c5b473a9147eba30d4653a8a4cb86abce66d4c8639d1eb0d961c4a50907ce9af2b2864acb615a2ecfc8
 DIST github.com%2Fmitchellh%2Fpanicwrap%2F@v%2Fv1.0.0.mod 47 BLAKE2B 7ba56d388a2d82850868b01f372032ff1653ed029a66c647aa0f82af1cc184686da4057ee3983cafecdccc9d965256bce53b482fae2efd78c85ef6ac09999187 SHA512 9e6c61d5e879ab04661e678bf880f9d95562730074532bc32cd912bfd92b91a081849ce3669f43732c451053189cdbff5583696e4600d75c617a0cf128976e4b
@@ -357,27 +450,44 @@ DIST github.com%2Fmitchellh%2Fprefixedio%2F@v%2Fv0.0.0-20190213213902-5733675afd
 DIST github.com%2Fmitchellh%2Fprefixedio%2F@v%2Fv0.0.0-20190213213902-5733675afd51.zip 4887 BLAKE2B d4fa1345f59e735c7766d83944304c62c798202d5dbbc14f57401516e016be33406e1f78381deb967b232fd097dde42c34211d66fe2f76822bdf37de85a148d9 SHA512 0c1221839ae9e91e973fd0ef808d1183eb3b7e2c4916a5c35aa6eac9a893f18359bf9e722e179f08c4d30e54e105d263dd1b31d40346b2a06453d8ca841f1989
 DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod 40 BLAKE2B 82487f50b9cfb3e87f2500b992a68361ad1971106763efb2ae4833e3a0505d6131b87aad4f994d203123b8fde60d5799afe67704ae72d36b3b4e85240ace49a6 SHA512 e7ba1cdb05cc6f30a57cdbfd08d55766cdad89875e4db393c304c5004d8907d07952b9b7f542bdec1c8b2f722fbc5d2283a8ff9cae53b6da0f3b075b8d05f60f
 DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.zip 7647 BLAKE2B c7fede2886d6150a3e79d73526fc48df4922ebedadfbadb70c4b994d58626b0c7121beeeed6c7d83c1da0d2b98e7e31e7aa46d78638ce2ca834fd84a2a4da9d9 SHA512 41f5065474e14b5df4a5c9752c61231a1d330cb1c1448b3b7a4fdf5971e5511f7445361ad008a5ac7ac5f37633cfc490d7e64e605fd3a306018001e92cedf3b0
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod 40 BLAKE2B 82487f50b9cfb3e87f2500b992a68361ad1971106763efb2ae4833e3a0505d6131b87aad4f994d203123b8fde60d5799afe67704ae72d36b3b4e85240ace49a6 SHA512 e7ba1cdb05cc6f30a57cdbfd08d55766cdad89875e4db393c304c5004d8907d07952b9b7f542bdec1c8b2f722fbc5d2283a8ff9cae53b6da0f3b075b8d05f60f
+DIST github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip 8002 BLAKE2B 0a8b00c6fa6fb7ee0edbd7c64c09d542cb3b5f3171663982d5391161855f908c91d938dd38d13c66f638fd37c6729f96f195ae75ca7e4dc9baad3f15cefcf619 SHA512 39e87a715707ec9243a382b6e9a3d951234a73e6a50be0f3e15825ebfc9d9a0cdc52e9584909e2f09c852525c1de0f2c5214f6786d3352ca9a9ead579f9d35c7
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
 DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 10936 BLAKE2B b045256d37d4973e88d0d9c6dbad7397160ddd7b3102ea8420f92be2e8c3ebf6362f350eff10b52fc7fb447d98b00f07c2bc1da3f6e442ebdb8e90103492c8c5 SHA512 e7986e7dfb362e346309cf77ee3969c2881056959e34db07d2dfa0e505106844b7424270d8f17f1a89d335071688e98b992ac81e8ffe0c98c8a0e3d145144d4c
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180320133207-05fbef0ca5da.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
 DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
 DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
 DIST github.com%2Fmozillazg%2Fgo-httpheader%2F@v%2Fv0.2.1.mod 42 BLAKE2B e82f069a37fb1b6a6fd2e1db134dead30783798c9a53f981a46ee92e95de0c632e0935ad5dfc0189af152147726bb61ff077860325051fb249b42219d9d26e64 SHA512 f131e8f90d367d342616a13c57c7bb49485e1c3001bf72b02376d8a038a097c292d299e7d0e76111a31f0ef1fd2bf05370eb3f6d1c96f23eca168aaa8ded197c
 DIST github.com%2Fmozillazg%2Fgo-httpheader%2F@v%2Fv0.2.1.zip 8951 BLAKE2B 54c8c1441934a073eda32baf85adfd0de13cf46eb0ce9a8a27a69ebdd5fc09042f6b1adbab66fc9ec5cc52f64dda996a992e65d7d74416974b4ab36316bbe9c3 SHA512 2c37c05cc0c9ec81756bd41539a6ef6f0673d8fac0df9a9ff58156f0e6a925e097b3b1465234c119ad008765a87fe94e9eda12447dc60515b2d6c6c2fb861a8f
+DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.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%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.mod 34 BLAKE2B 1e9a31fac4b60a34b6fd680ad3989ba26772d63729017be7166012d7daf1b8a92c4f0b40e91ecc74397d2078534eb9de7a41ede7cc35e89ca03d3a81e7839adb SHA512 5ea9f53329358ce8f981da1eae9827aa484aa159776e1a00bc180833a34a2c9ffddcc1000c81db4018c77ce82108b10815a3d472b396f7312b040534d5eede42
 DIST github.com%2Fnu7hatch%2Fgouuid%2F@v%2Fv0.0.0-20131221200532-179d4d0c4d8d.zip 5536 BLAKE2B 4aef4f0b7976b684d558a78b210af19968c039430e8444c91be6bdc55dd9728c66678e840f6e89932ea8ce368ff3a1087051e6a9e0f624c5426031b97b5ac6e8 SHA512 8f33d00e767a0209538bc96087cff921f42b710c88e335eeae1fb06a1435bd3f8ba604c629b2d8970510e6dbec7853087be1a957c4ada8fa384dac90f93c823e
 DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod 28 BLAKE2B d1f2187d0457fbf3087b388af0e41fa8c7a6c1d54c9f22fb631a144f42adf679bd372b5fc45f8d6f33d7e3cfbd57c1b7da2c4e969ae32185281390db58e9acbd SHA512 41e5c366b775318a4162bea00a6fa4e3d5a23c2ddb5c2707e4a4fb77c42855ce407429a7cf9c8e506bc79493ad5c56423c70dab081187ea6c94fbdaa0d5040d7
 DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.zip 8493 BLAKE2B 0f00762e52e47e39e2c76907ef393dae846d9a49422e066c82ebba3e769ceab17df6fe1cb473ba490cb3b2c5c5aeb1616cfdb42b617c4685ee2066f7fe9612f8 SHA512 08341ab41505c3a098ec989ff43d8e460ec2b449b9a4cce6cb6240e33f8580f75071c2a7e7c8269f6cfa3fc2a5e33a3315af0fd2ae80bcc0901cc6ae9118804c
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.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%2Fv0.0.0-20190113212917-5533ce8a0da3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180102160824-81144009af58.mod 43 BLAKE2B ece3eccf99be110812adcf17b957ee6330c1c490b128a25c1ba6a69f57f0d9efd4c8c030645c750e41f676ab33aab05278149d0875e91010f2dcd1efec08d4df SHA512 10dcc16784bf12ecbdbfd7bc27bc4fd478c4ee09883d80ff8f64b74f0dc92de37366f5bcb81246622110766b693c77e5562519f908ee1453dda84d83afb5ce12
 DIST github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180102160824-81144009af58.zip 10489 BLAKE2B af26e3711479d14bbffa351c5fd53c842874ac8e26ad3622b23c3a8eaa2ec04abaf9427ed2cfcc646dc37dc194c30c80e2e811fcb5f715cfa67f0daac3f70a30 SHA512 6c5791f40f2f97ff327c0129d270a6e4486978d12faa5b522fdf65e317b2f7fc635a7cb45774b24274d406fa8b8576e4350020f660bd07e435a5c741b0109d69
+DIST github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180921211025-c76d91c1e7db.mod 43 BLAKE2B ece3eccf99be110812adcf17b957ee6330c1c490b128a25c1ba6a69f57f0d9efd4c8c030645c750e41f676ab33aab05278149d0875e91010f2dcd1efec08d4df SHA512 10dcc16784bf12ecbdbfd7bc27bc4fd478c4ee09883d80ff8f64b74f0dc92de37366f5bcb81246622110766b693c77e5562519f908ee1453dda84d83afb5ce12
+DIST github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180921211025-c76d91c1e7db.zip 10517 BLAKE2B acfea0b53e17986ba19cfb2d2aa11c7c01e3ed7eacc00f9ec515af9535aee31a6278d0bbd670f9dfdf5aa43144c0ae7fd2d5eb6a999650e08ba4322668ed00d8 SHA512 f3186e973e7fd05bacc9816a60feb6a011576b0f863523770c0be7cf4b174ee7e8d7d133229b98f839bddfdda8347bddb717a9893901084be29a6fcd883de130
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.zip 25325 BLAKE2B 5a4a2551f61bf5c4d0da0dc32ebdc22b9c8c8e52bd1f4e74a658c919ce8c685e8aa7d8a8eece85a8b4958a30459c7daf90424b7dc67c3460323c340aa2743e33 SHA512 da2634fbe6ebfafe3e70a9b6bdd1d9cbba051086a27f9b23eb49d04d2148c10b53b53f6b59161655e813bf7451d5663e8bd2a5b64476950435c3211a69e27b41
+DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
 DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod 30 BLAKE2B 3addf97309c342e8d5bcf397c7c22cdf02eaa571e0632595f9268678a2ca0ef9818cad13ccb3444547d001994d137325cb2cae16fed3c080aa6e62f206a3f059 SHA512 c084d8b2c486f343a891b3b2d21200f80161f2ba1303ae17f7a482949b1c10562e7f87ca44b4258d32a1743b0eb66f842bc184d80fe349e9deb965215ab98b2c
 DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip 5869 BLAKE2B 5aa5d1f38eae51f3728c284ac81ff9de00b0ccdc17d78a73e006ba384b204192aaef056aa872504ed5887496a817f99c6d8f88414b44ebe8eba0db960d94387c SHA512 a6b0274e65e084f59bd33088dd3fb6658e0824ab9d8249c2417a2f9396d4461ad9dd7e3a1d5ff5008bc0edf7f835bd426f1447c1bbb8fb81cade200d0c891579
 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.0.zip 14743 BLAKE2B c0c06d296c0583be2a6eb06359659b50941ea516bc768833bbfe252b73a2d81616dbe2d2db1991bd196b4a615b253c60046bbc6d56ca7268ded5b0ff40a4dc81 SHA512 2975fb8868fddaff560951be41194b82b631138d617705c3f6162acb76ace8697cc8ebc8f610ca1fb1a5167c6b6b0ecc87c150133a757447831463a0da18f392
 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
 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
@@ -413,11 +523,16 @@ DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b392
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip 26744 BLAKE2B dbc7578fcac5c616d1cb5dd7cae959ee8df0496532db36d78d617ff265f213e4e5a336d33b795e793100c1b8e604919ca6fabb1736bcea0c02bdd0f8f0cc931a SHA512 dc990fd4f640acaa66baed26f2e82e0a6c46e293b016bd1573e72600e1256146f1b8abf746ebd96771bad4f3d95dded70c9f884908580ffffc4162efa0450735
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.zip 68422 BLAKE2B 6a49cd89113a3558267baa933e779eef70de69f4b722005553451c226e66071105b6dcbf491410fa78bacdbd0fa586459f4df5d655ce102b5365aecac731d4af SHA512 8c253cfd9317a6bafd1395c102b1defa5bd67f30171a3d7c85fef05512bad16596c605ff340fe2246b7751600f15d37222c4755e0faa7e5e45d0826791ab9eec
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
+DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip 68547 BLAKE2B 608b2dc4f6e135b208d273d5e6de884f02eb15ca5d790104c4b2c449595c3c8984238cd4889215472cc2383968ea4d78f75771a2c66b7041980b8f76884b54f8 SHA512 6be9a4d700abf43f9eb8279b601339ff2290f6278fbbaeb308a9d51d621881e613308595dffb8d843d070bc3e21caca3ebaf20ffcbc60cdb2f8590cdcd30c595
+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.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
 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%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 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.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
@@ -433,6 +548,12 @@ DIST github.com%2Fterraform-providers%2Fterraform-provider-openstack%2F@v%2Fv1.1
 DIST github.com%2Fterraform-providers%2Fterraform-provider-openstack%2F@v%2Fv1.15.0.zip 687432 BLAKE2B 736719aa41cae88ecceeb0bb403b1e66549aa13f55c50ad5140a9a4d12ce55f214a3f6d43d270c594cf95b260194fa572c8b8c727c6352063202896870c29d96 SHA512 c2734b7bad81095ad1332210e563b54784c0ab3acc97016f61e253cdbc8189beeff8ba6897573c8ddcec6af528dd1bb7d86b54895dcb34eafcd50f557d3a9357
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.zip 13531 BLAKE2B 7da23f76d1f6cfdb578c6826a9746381c6227706fdd4658f30bd088883def6662c17d3c06363ea4b9007fad4e7c14b7add0e96380bbe4f5b7feb03125bc830b1 SHA512 6142450cb34a7688845cfeecfff68957118b039d9117ab75584132e34f8ce12ad8ffd24578d1d602c7a98fb2b6b494693ed4e509df2d6130e1d47c5bebcbb420
+DIST github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.10.1.mod 611 BLAKE2B f3670639a943f405818687cb0eb32e7ccd85d94a25c9d3c096922431498f6bcd0f48c7adb8c9b202911d51ad8869708ae22c72f240e8b02a5f3d76e135e1da06 SHA512 1be1bb1626d3a12deb398a1f57bbc3dcd3477ca4b4cadd4cbfb715f40bedfc7461d870e482bfe5805e106f861c3790783aeb955495d563e90f10d682eb0ded0e
+DIST github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.10.1.zip 708099 BLAKE2B 22f0a9f459124f10b2c5b84a7e211af3c73292719ade71756babeea9488ebf7c903a00d011ba9d3be89c4c013663507fd644db16d28b0361ecb946af932e8f4b SHA512 dc1417f24c15d1c36688653c7345b46aebd282fa101e463e5ee4a59d971dd8201c6fdc9c26ea0adb0cca235184f160811471cbba184ac42af691fcf5b7c22053
+DIST github.com%2Ftombuildsstuff%2Fgo-autorest%2F@v%2Fv14.0.1-0.20200416184303-d4e299a3c04a+incompatible.mod 45 BLAKE2B 4c6da05924de7b0482e5bf9d8a1eee79486205f6c7650cf3b4acfa3fcdafbc2d3a37261838e8053b8e2f59fc3129fcb4780ed9493f80667c94dd5f72f1c6ee46 SHA512 ca20186c5b7114bfa0c14ff41ec20f8b8219fe78d41d110176995d88d76c88c57775ceeeb0d7a04b7eaf168965214d98b8cc6952c7db774d008bbe0d4c33a68b
+DIST github.com%2Ftombuildsstuff%2Fgo-autorest%2F@v%2Fv14.0.1-0.20200416184303-d4e299a3c04a+incompatible.zip 24547 BLAKE2B edf95fd5b6f797f6087c61caec3474a89b82e90a9fd6de36d2fc3ba2e6f643b3e7604d0f2094ee1cf22c7c31fedec1bdde53853c004ca73600d00302fcb9303e SHA512 376023de5a62b8544bebc5d08e477aa361b96008215c1167db2c616e4cbc82df21879e38ead297f7407a2f695a31635df33054d9f07928bb9a66f39875ad393c
+DIST github.com%2Ftombuildsstuff%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.1-0.20200416184303-d4e299a3c04a.mod 315 BLAKE2B 649b180d4b41279bde5a3ad4e7a8380b3e23d9428af2b2904612abfce99e5abf53ab7fa27ac7805faff0be8c2d52d685c7edc1380b909ad2c033beaae87be7f3 SHA512 eca3516d2491afa621522aae14e0e5c8632b984d8c6daff3a69df9b2b46416eeacdbd11de8cbc2247fb1119051466d24a4c178b065b630a684be8476be1ef15c
+DIST github.com%2Ftombuildsstuff%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.1-0.20200416184303-d4e299a3c04a.zip 109776 BLAKE2B 2217d9342efd3ceb7b0959b021c7788468253caaacea88586210dee8df06c388e8623579f99bff90073d08fa476b5cbd04b3ae4fa43db55dead9c881725e6e5c SHA512 0779a4a93b5dceeb2a1b742aca3af741b12a97da85ccee044e02c63adb0dc51fc504443ae6093661c6cd7f4b87d78beb57cd45c365b5ca9bd5d27bd396c2f3f7
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.mod 28 BLAKE2B 4d0512f0c014baf150880e5a0322d1fffc7b726106a54fe1bfe2ce5926081af697f6ce74fe000ddfe18e2e6d44799346272c704644ea4f1fb44232ae02b09725 SHA512 65d5e7c1e6f710fdf6b475ad898c14466064c86e4aed61e44aa23ff699cf3a9a631f255ec298c8b3d7414ba640d8d5117a06386fe2cfa5cee47d183b03ba3bbf
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.zip 355151 BLAKE2B 845d552a6f36dd795cb634fbfca8b7fb3b70f783bba125827ef11729296621cabcdd1ad5e605f9d6c6148e1dd401efb4c80c7f2de4fe8143e05f7c5dc6e607fc SHA512 1c7d0944948442d15a2befc4d5817883a72b95d9bb0320be569863a64139bb45df5f0a06805f9893de657c6ac78cf6f3e4793d78cd2c674eb1eba86305faee66
 DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.mod 31 BLAKE2B f8ed4b103891625af3043d86905f693014b245198a180911efb7e33480d81b93babd35912c5768df62cd26199e3a742f94365a82de619a97385d7407baa22424 SHA512 33639405743ddf22f19ca03d348c47d9cf963aa151fdab9e7303679ccd5cec373ceebce456eb96ef52dcf933f96e4ef7d4a8099822dfc183996d8cd4f09cba2e
@@ -453,8 +574,12 @@ DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.0.mod 601 BLAKE2B ea57e572a8fa50a
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.0.zip 222764 BLAKE2B 3388f9eda2946e53a85f864bd1fcbd79a10ace6d340cece015a94ff05d8585f38528009d535a2e3c3ec135481905ffc1640fdb2c97e0342c9c2c85c39e3c36ed SHA512 37803075932f25cd124481a9eec295cb69881d13b5ad025228cf66cbb8692dd8ef1f6b745b9c264b04984c79d5e9cddc893ca61ba287cb455b87e66822a5dba1
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.1.mod 601 BLAKE2B ea57e572a8fa50a2bea579915eaea6caeefaf85d2dbc68ebfd468e514a05d5e0ce5e0d19fde245f0a83bc8cd80803f18b640539bb3e072759ae331d01577ee36 SHA512 d71075f8e5fd435020a7e27b20df1026b1c841c06b5235bd6414faecbff4f67ff9812eebb8c21f8735dcd1ad605fb36e662692ff67bf3ee4bf2c06d97ed71aee
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.1.zip 223098 BLAKE2B 79609e80b13e36790dd88a2a0c63e74003cb04ca0ae67200daa3cf9e64517fac06dda81c56161728bc7da55c76c9f61410c1640b3eeaca38443853c20724648b SHA512 fc34a477dae8b2f47fe2bf9e25528ffd57832fa737a33aefd4ba9df22ddda9bebeb76dc511f64779f4333c9b02bb4ef446cfe068c39e65b3e7f3a0d0ca53421a
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.5.1.mod 549 BLAKE2B df283746e9dc0e249b15fdd39ff88fe97bf78012b3f0727413566bc76e4fa39c383ec0f5cb3167ad4fba5e7418a155af7145e08c9832158e0de6a366e23b6b7c SHA512 494c91b0a0e52ac0fa7d64ffebc60fb53c64c0e2a9faf3450a7744c9bb6d853010c5565951eb7af92dff96d631dae2db3047939d86857082cc16651a58267dc8
+DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.5.1.zip 247987 BLAKE2B ab35bfe4d2347c4a620c055c8c16e2e84a079d061cc0544d4b0c0762d8f6b5f25c0b904ac0d13163210d6b8703504018b052a7868a7670ba1ffd2b8773f0dcc3 SHA512 b5f0146ff0dbff6db20c07e184b09997643cb0b4a5f5cd1d15b56f9fb7baef35b54558decbe7274bb4a5bdd3bbec58283caa9f6dd688a475ed0d6f63f2fc1e7c
 DIST github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.1.mod 80 BLAKE2B 792b829d635e212603aa59faf482b301b95e5465e5544f28fd3810393bd270001fee6679a08567963e366d01e0f1fc9e8da9db5727669b6fe262f9d0f2db1431 SHA512 52f4cda625bf8ceda19e65dee204e30b1ceaa68b0a0815e925b22d41a02fce6b44e9e73b6d1e957c7826257dfecfe3d17b5c46da5668384957eb6b723e8024fc
 DIST github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.1.zip 68122 BLAKE2B 4b999c18fb98aef02c9248f1c878d844d57ed88aa1e77c81e7d4399172078e50dd4cdfa124a5d6fe9f60a4462c69a25bd2681d0abfc9ac0f6c9962a9df3ac8a0 SHA512 50036e6ed162b1a498062a2601c30e33f833f17a0e3f87a7b12512018e701925311380de89087012a5f72918af0bf6d9d84a84614ba0381353bc81d622551b16
+DIST github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.2.mod 80 BLAKE2B 792b829d635e212603aa59faf482b301b95e5465e5544f28fd3810393bd270001fee6679a08567963e366d01e0f1fc9e8da9db5727669b6fe262f9d0f2db1431 SHA512 52f4cda625bf8ceda19e65dee204e30b1ceaa68b0a0815e925b22d41a02fce6b44e9e73b6d1e957c7826257dfecfe3d17b5c46da5668384957eb6b723e8024fc
+DIST github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.2.zip 68523 BLAKE2B a90db518f6eccf2664b55221e860ac52037ebebba5e69129497ff86cbe7f7f4890ebb78930feff7f987a5f14af1ee00a4c0febc23787afa2617f92ac4a11c26d SHA512 536f2184e0f721374b4e739096a57cba35d06ac5594ea1d3712d373a18d5f98a0fd479c3d1dd723612a8a23b1d83337c8823dbd039e9f825a8df747feeda7181
 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
@@ -465,13 +590,20 @@ DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.zip 14488 BLAKE2B 3bb8df1a459b2cf1dd63
 DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
 DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.zip 221108 BLAKE2B 9f03d8b356ccff8e8dda9a4885d7fa79eeccb614415b1bc50ec206458f650456a9e1ade1401908b53c37a3b293cd3b7503b84104555250bc801e5c74b8fb9122 SHA512 259b357d0f31ae6ad5dd1b841d69d934b1d9d441617944d4b46269f43fb4de1cbf15750dac9dc87cf4260902ad2f4e4560e6e023375212e554d150fd65af5f9d
 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-20181112202954-3d3f9f413869.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-20190222235706-ffb98f73852f.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-20190426145343-a29dc8fdc734.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-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191202143827-86a70503ff7e.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+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-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
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.zip 1874278 BLAKE2B c9d8d7150f589d4b313bff96b41e1a24616db4e9a6447f1a20b81e15c35d6dd966507f5b24564afb904e81768f6c226ee73d3bf4ac3ce736c0276eaabc38a139 SHA512 61a5eb5e3af434483bfdd470a028b10c7ea6bf149e0cb4d4443cb8325417cf5b4e85d2fb2e6335dba74d366b80d4bf0b6d6450dbcb3f3e06714c2bc4b0ef6f75
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
 DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
@@ -481,14 +613,19 @@ DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAK
 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-20190409202823-959b441ac422.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
 DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.zip 126236 BLAKE2B 48caec10f6bf4b8da7028b0358645ab0414b5526004479ceececbd68380586bfbc5b4cfb9d43f8c608565f30521a0dbfe005669db7d5e245a1b63ddc8171d3e3 SHA512 2735c124a735b4cba606e4e3de5bb39c889aae2516525f778764d987b58677dd263cb286604fee63bc45636662c11e3dcc2c9726dcaf85a26e072ccd56597b93
+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-20180530234432-1e491301e022.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-20180811021610-c39426892332.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-20181114220301-adae6a3d119a.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-20190206173232-65e2d4e15006.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-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
@@ -497,12 +634,17 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip 1421786 BLAKE2B 15782d84b4fd3576df5ae0c6540880b3a87f5ed47d66527ad88bbdd5e96cd1b0fb321b896b686de67d4518d3c6eecd008f1e49f48fa29df962a4d01f6e08653f SHA512 e79353b8f6b6866a14236eed278aae32ccb02eed040a557dda219cd96eecdc0174a8ac29a5509a33f6f0f9e5aa16f7d1c6861167d9798a5cb1eb01aabcee56f2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190812203447-cdfb69ac37fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191009170851-d66e71096ffb.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191009170851-d66e71096ffb.zip 1424478 BLAKE2B 8c855bc381cd29e62046296d7e94dd75628a7e03b37a5ace2a51af8f49ba565d7ef084cdbd3528d88b8722150be142d6b1f55531b06f3f1b4ede6e8374ef69e7 SHA512 4d93e5adf1b09f1821772034571658bc43b7b330fda25ee7ff52cc0954e481ae0980e199657e96f5943f09d95c2e149307f1efcf7bb0cb834eff7f1259a06a20
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191126235420-ef20fe5d7933.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip 1499901 BLAKE2B c60f861c6531bcfe3b3ba34efc287605a9e7089a7fcb98546a3b9ea46dc982821d3233d613c96d4e4660ca00923cdbc1593d94469fff552882ab83e3eb35d2c0 SHA512 8585cf85ad230928be11a456d2153f918d8403da892e1ccf0b638d0f79e2edbf30d9e18e687c33dba4d486ef743226c5f8ed23ef96b14f6c8910aa550b2e0f3b
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.zip 1503269 BLAKE2B afc7425e8a2354a2ea7de4b9e007d7091796edc22fe2783f2ec1cac2d0554d87aafbcf49fb838b1ae4f0193f936fc4cbb87fad4ceb4e5cf4e2b020b73db7c648 SHA512 66fe99252beeb16a4a8b3e37da32343955f1727043bde2ab9e5797d1e6b65b85c97292b43ba0f19587e03e02d6bffa7b8cb0986ebb714e992b9d91571dfdfa6b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 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%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
@@ -510,12 +652,14 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAK
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 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-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-20190129075346-302c3dd5f1cc.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-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -524,18 +668,29 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502175342-a43fa875dd82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190509141414-a5b02f93d862.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 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-20190804053845-51ab0e2deafa.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190804053845-51ab0e2deafa.zip 1817976 BLAKE2B b5b4fc1b562771c9a52c5b2ba34a76520d11cf7876f58e9edbfb288926ae1fe9f560a1e64b7861157dd13a8eefa1face651e8d1705b94ded06019c5ff845ea53 SHA512 ea18bcafe72e397ace410e342ecf19c8d62ea7b9fdf07ec5ee8d6659e41c4c82a9d27c718118aa0df7c5b6f1d8ce45cdc798bcc94c56d559051edda8cc84c5f3
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.zip 1905524 BLAKE2B b8270bef80476bd3eb4eccb3ad100a434e5dd6fe51bec02c33abe193d264d873b7b969fc87066cf00a918955b34c6662e753a71b3e37d9446d7701c63e8c1b43 SHA512 e3cb3a0e1a744f0ebb2164ecf61ec8049dc55b53c1a9f29aa90836de645a2fc4bb2111477e4ae4488761c959a354a2f09a37b43a15bdfbf8392f60d10aa1665f
+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-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
+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
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 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%2Ftime%2F@v%2Fv0.0.0-20161028155119-f51c12702a4d.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 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%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
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
@@ -547,6 +702,11 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.zip 2727853 BLAKE2B fddbbc97d7f84ee9c80e93815c3893f7cd7ea009ed9199272ad79c5e66d4790748f0b514a7d886fc8a576d751453938f4a61053bc93b05a32dad247f84df4f00 SHA512 2d9d072e62ed56ec47f76ea6e0bbebbdff15ae7fc94782ff1b25e80507a8d2fbc5f9f1bfa630ed816a95f7e64ee764628c24e3f75092691fcaf0b7f09c8ca745
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191203134012-c197fd4bf371.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191203134012-c197fd4bf371.zip 2910194 BLAKE2B a1dd0ee4075bcb7a03470b47dbf4a17d015e5365c239084d5d3cf2c3039d9dc529f4beb579aa615bbdfdcdfbd882e8f19e8962bc976ad6d45f4161e19a25bd5d SHA512 cce80b7a130c3c986d9fddb883ae4852d4b4454ace4147c2e44a3c23e4d1aa97d0cd572e1cf7afdca60515e652214b49f37b7202a2c8b280913b069c582290a9
+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 google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
 DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
 DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
@@ -566,7 +726,6 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
 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%2Fv1.14.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
 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.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
@@ -579,25 +738,56 @@ DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c
 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-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%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
+DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
+DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
+DIST gopkg.in%2Finf.v0%2F@v%2Fv0.9.0.zip 15890 BLAKE2B 0d6487d18e92562c02a2770941af995d18fb9e11ff43d4deca6cf4325a94a1a3af04a3cc324ade8bc349e0dbf1d3d0a00caa199327b99607079479641760f368 SHA512 1ee9d7696e45af565a2b38fb263301bc15176354ad0b0528b41ce1dcce6e5c6df1bcaadaa633d242aa506a9f3a703182149bdd3115c8be07e1263ed53cba7653
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
 DIST gopkg.in%2Fini.v1%2F@v%2Fv1.42.0.zip 48918 BLAKE2B aca803aaefb327d186b7f703ca85ce70caabd200938d8fdaae4a0c8fb41e73adc0a3a9fafc15483a2e6f13d5854a79a2753b8a67a3e33b39a351016856297bd4 SHA512 653c33136dadca777b3c9863cf7fd3f71d6fd51346cd1b812f30c901298728aeeceb03b48a87becca5eb3e980ca2b26ca374cb713d92d017e4d8e8873f3a6c98
 DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
+DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
 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
 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.7.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 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-20190418001031-e561f6794a2a.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.0.0-20190620084959-7cf5895f2711.mod 562 BLAKE2B 7cbd0ba1e1fe5709aa573ed44a8cb99b35149c9135046e2dce45f609b34bd6d3544caa782ec860a64e8c0fae68a2a75dc25c1995c0b6e487586eae7a9b2b0299 SHA512 7609796c9e3b0873ca0d6319b5b96db829477f4b68f993ce079c5e065c104e4aae9daa50921219d0f5402d6d6852e5f0ccd18f220409dd151d4071fcdc3db6ed
+DIST k8s.io%2Fapi%2F@v%2Fv0.0.0-20190620084959-7cf5895f2711.zip 2316270 BLAKE2B 11591cc41647623f54145e25041162397f01427998e48bf25893d9efe92402b7d08cbccc32a2f4b3a730a0b50509c15185edf8697aa576c765aabda75ce02c96 SHA512 4d991a2a3ef8ea59a2233d320a4237a2e07a2406c005adda93a61c378c385eddbb4a2e719769cf2d63b74367f71177176120dc914c8d161331395861f631d5a1
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190612205821-1799e75a0719.mod 1795 BLAKE2B fcc21db46938f665a6d745882eef885a8d2b0bfe6905b4d750262d33840250393e5331868939bb0c2248a3fa95f7e4558c3d2f73ba8f19b7031ebb803b155722 SHA512 fccfe29b8252ba32795f777cd63ca50d860fa9ef6fd516012e979257d48f705922812e3643d756e8eb61b999018864fafd6f7595b62338b16c08cde5b595b89d
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190913080033-27d36303b655.mod 1622 BLAKE2B 084a7507348f865932996639e813f2fe5f1a68635e71963603dd002e6f911f86a7aef6f1d11f5bb8ae2f76dc91f61bc2e2bc95879e3baa7f3f49ad43885aea2e SHA512 56aa7f600fd61fa17a6ca278f5649683d9a24bb7c5d94333da163832a726143098e735dc5fb2a9669ba8773e83b9ac54634cac8aa00b9ae683ba79c4bf66bff7
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190913080033-27d36303b655.zip 772250 BLAKE2B 42044dbe9d8534f5767f449e5fe4e9ada301b76bc7ca5e378592dbf0fda634a3219e437b56f89a831da9fc307bf9859de13f306ea1a47658bb7acb7afaa389fa SHA512 fc16249f3810bd0cb5cbe9e2eb0d576f17161037163d94bd11fd59f890b3a863240d35e0694b58be9d7d72818f4a352fe6ad9d8e5eb1ac5ed2f96c86142f74d4
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.mod 1817 BLAKE2B 245da700b263b41d318beecf0dbd39a4db7bfcbc341ac28473a737e929413c54c950f6ed50411f04eefe68e050ab7a2a987878a19a8fecacb0c3ec9a00d99437 SHA512 3e221c644f7be31e6e81c7b8dd9caebdd3286d33d9acf0cd1284aa59f56a8d3f6a29d0bcf39acb20d53ddb79a14417a51c0e836c6bf9d19906484fe935fd8413
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20190620085101-78d2af792bab.zip 1528066 BLAKE2B b71d06a4f08956919cd0741467a266839c39c0ca809d8b9f325a5848d4accfa28537b4c8c4a98a59beed0d287c98c85de50588415a5a847075b68adffc0808d8 SHA512 fd776725fd74de3be6dac057c87605a4bd893037b2ca750a0d0be859a6cd7e61dd69a2c11acb3d09dde373969b0bec44dbcf8cdf6739564abba0602a4f603913
+DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.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.1.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
+DIST k8s.io%2Fklog%2F@v%2Fv0.4.0.mod 68 BLAKE2B f745a62a974a42d1692705de032c8c651477ec71f32b0515adc02360e5a3de6c7d65f5d97960e78da06e99b0843c312a09701c08c6a5c112af832e3cd2e43649 SHA512 cfee3f10c26fafe7cbc510ff8cba479dfacedf1d95b4e25b75978656862067524b4b9f5e889455f2d74eacf07df7895fe266415a05b9502a759baf2e4bd3884a
+DIST k8s.io%2Fklog%2F@v%2Fv0.4.0.zip 39896 BLAKE2B 444e722f7d9ded9f98bc7608150fb650e8b0a1851d77166adbb3add990bb3577a9bb4855bdd71ca685a4b4df3c0563dd81c8864bddfd2ab63e4116a29375b60c SHA512 1c4e0fad285ba706d1d33e5a9651db1d5f0ae129700ba127a133c77d65d452491d4eb7c653637d2a5fdb980ea661a4f26c269142dc7933e36389f3e292b140c7
+DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.0.0.mod 71 BLAKE2B c6d2fc56898a5b4e11c13f2d102269674def5c651031128231aa23d016ac3e74c23c734c4637e574e7deea2173733ba6272f02fe05e3c39aa5d1de4713aa184e SHA512 29871958be33057ed4a8f81336085da0c633dcc4c00c4dcc134d1313b1220bd24124d5b2b7a47b26b56ba2e7daefcd33dbef7bbc0a344c72e6c2b039767f810a
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod 27 BLAKE2B 9c24d9586f1fdfa479ef27be1f45780be8e756931657d77cc78236332838e6f792d3c8be027ad96528ac819933444eebaa1b2a84d7f7fe63f3f4529c2543d259 SHA512 cfddbdd6ebaa638a046c7f20a87048946521ce1320a615bdd77ec639dcc3994fc8cdf3375c1dc523691af6eb4c87cc4b2119c228d222df7f449c03271670fd5a
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190816220812-743ec37842bf.mod 2088 BLAKE2B 407e0a8a7b3fdf35034c02c9a2b22a1dcb43347d3ce85b89088b04884d49a3a24eeb80a20263699bbce415707462375a420c92fd458016ea151884ac8d2da151 SHA512 b0969627b58ab34c898af158e1dceb5427a621c39c563537ac547c2213cd7034a5eb152840e359821d152bdb47b32426264bb3b86cf64cc1359191a943712340
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190221042446-c2654d5206da.mod 20 BLAKE2B 98441f8baf467c4c00918acd9c9e22b0e2368cec17b055ac2c518a12eb8546f0c43930c9fca03855e170f7894e3749a55154e9c9f3f6be1e868b229867522a7f SHA512 1184f14f81034921a81e5526c559cd68d07f244998fa134aabc7015ac6e85a6c2e976657fa2f15d2620bec3601e0674324e663f4480394313c3e08af738f89e1
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200411171748-3d5a2fe318e4.mod 167 BLAKE2B 2a61747d367153284e7e614a82f98c8913693f3b51174c24b7f25d8e9d236418c4da9e6b33c7cdb7b4350314373037e1e7121ad7c0ca5fbc9a3b4b711a078a98 SHA512 1117d2493d40a111a749b0033c92876773242b86da0b437ba063e5da21289102d784479b0c757ad8ce50de4b1d8a2f6956afe3b2656977bd76bfab9f97c1d8a9
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200411171748-3d5a2fe318e4.zip 149447 BLAKE2B d7ca9984f6dc80e42713ac2eefcd23a7ca58002d2eacab2dcf6d20613dc0a003be83c6fb1775f07a069a5aab17ef65c64726de2007d6ed52f648d7905160444d SHA512 90bff7c79f4e96bfb5a918ebace123b09b281cac4e725c5898ebc88419ac925affa588643ebfb239edc814db671401b7f1498d3bfadbe72a2516eaa32c336f55
 DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
+DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
 DIST terraform-0.12.24.tar.gz 10427523 BLAKE2B 088d0cd249a065ef663b41690e0c1e27baf61706da3444d4677b3a1b24652c50882601e036841fb004377a57d38918a62a45eb84983f5d8f09138ae2c5b3e77e SHA512 026b4c30438459d5fa433ea606e8e020f2ff71ba6e14a5caeecef32f5800a0699cb192ece4bf9b5005b8e0fb2e375f70602d44d94b0b8efa3bac20f9a30e14e6
-DIST terraform-0.12.25.tar.gz 10592286 BLAKE2B c83ba62cded25f279abcb55323137cbbb4e0089ce641136848c235773ec18b8254af3ee761daf0e02be80c507ded26fdae720ec03b80cc8b77000d7ff564ce0f SHA512 875b41987972f7f6e3fea0444a98ba6b033b3a932995693fe047f8751cf556f785a54efd9f53a0ceef598f73df7c6064908fa51824dd8a5b6c3686ba557e9730
-DIST terraform-0.12.26.tar.gz 10636755 BLAKE2B 31be58cbd883ef0c7cbdb71884e100c0e53be8707a1f73d506a40912055dae275d8d4b75bcdf1eb1de4b2f25677a7c64e2b21bd703d7fc91fc5caebe83a2dc56 SHA512 caf11bf1f9fc1abe122409c24ec8f60e80d601f4c818840ae7e8c16e968dd11771af1fb662b695c9134349052c6ad6827b3a0387d2bf8f96fca7304e1575ff33
 DIST terraform-0.12.28.tar.gz 10637713 BLAKE2B 218d8316c004c363bce39f1e4547cdf4a6d73cfd1b1c0e3810b5759ea509ddd6307f2694f9673c1b6b8668c1a869bc04a81be600a38c5d2c5868e2e1962a231f SHA512 cadd2a5527b4c4ee6dd0385d962435e15ac72f99bc0d3e8193f78a49a474e491dab73f9280c77f37f34e516873b12a7f1af23cd437cb2f9d0afb2bef9966c836
+DIST terraform-0.12.29.tar.gz 10640549 BLAKE2B 877ef798dfe67d60a4030fd138a96eff796e24efeca451388f5c1ea7ec3fc9a1eb1824732a13dbb700342fab37296f8e4636de036f862a106bc2b6fc8cf10b33 SHA512 f1c05af299025b350f6748f832eb046156f97668f235281e446d9a2c400b7361c51e8195d8825a54558554cfbf907e562fb75ac27e296468c950e12f212979b5
+DIST terraform-0.13.0.tar.gz 12804812 BLAKE2B 75b6514efa73ccb438726973d1c89021c2b25736e958f3f61c79e713b0dd2dd4e21d590db4c5d6eaf2e797d3de28d0b51b6b3857dac30ad3c6ceb7e9717aaf1c SHA512 9f789b89466b74128ad75dd6b34c1ccf0f7d2b233ea6a6866a09014dd8c7023c1e5c156bcc9e0834c8fdf06e62694d81d4585fee4829c6fd95129c6cd8645798
 EBUILD terraform-0.12.24.ebuild 777 BLAKE2B 686b38d1df4e28c19f03812fcad15802193f11fc1c8da7ba263513122952ccb9f9d5d469b9ed5e44e1d147c4f7d4d7f1e225ed6345d9d1934cfc062df1be6713 SHA512 4f2f3cd4b891778209a279cd62954cbc91e440422ac5334b88b09e274804c24c1ce9a898d4cfdbeb9623c5e370b8ec9c72ce56801386e981030d821939a7ed91
-EBUILD terraform-0.12.25.ebuild 32516 BLAKE2B 82760e733c16dd65dc176500be6e0295b87e466543cea769e48c33398d81abfa880b74ad07d02c470ffcc30a36c20e69b8d8621cb38dae25f55b9b72718ee0de SHA512 a1546571d726307eacfd58f296232718d0ebca2469a956fb21cdccf35abc4376f0f03b02cb60acbc568932b193e356ff8fc59150bb845801c1bd9c06dbe5ad1d
-EBUILD terraform-0.12.26.ebuild 33304 BLAKE2B 338c8e6fb7f885c28bb932489f977f6ce1f0685437376a17cf05c9a1c69447dd6c4079898907b5326b93989f5cf6b58acce9e4cf74af52c9432135d767968c7c SHA512 08d25823e509ede5234c51b38b5cfbf194b20ab55c8a2f4e62a7be74c11f4530990960f4f1dd28c3ddd28823f32a384ae5a7041534a8cde833dccbe510cdd3f8
-EBUILD terraform-0.12.28.ebuild 33303 BLAKE2B 4c0259ea3d2abbf4339caf96cd8428128f6fe15a9dfe7290f00ac39997796867db7b3861f99e8c8a4ddf28a3382c3d443bbde7ae22cb0b04e74b41a7f20004e7 SHA512 9114f7a5a1f532d4302ba792a2721b8d6b3e5ebbff504b4f48f406fd3de9933b2d57bd888a53fe5cad165d99e1e26f05865e7a46139ab34862dc805f59929add
+EBUILD terraform-0.12.28.ebuild 33302 BLAKE2B 9ca5f33aa00c5eacbb82d25fc06cc6a90d16474fe85e0e087dd91edac361188ffcf853b21fd543d07a2836c3d2b6cf47c0c367406c533fb19c5c9ecedc4ef230 SHA512 e521a4cc67ca85de383eb06e2bdace2acf1adba81a66999a744436ce42314c20a9aec78a79795a3c88ee0234e7eb481ffa3778b998692c26ad7783b01ae20bf2
+EBUILD terraform-0.12.29.ebuild 33303 BLAKE2B 4c0259ea3d2abbf4339caf96cd8428128f6fe15a9dfe7290f00ac39997796867db7b3861f99e8c8a4ddf28a3382c3d443bbde7ae22cb0b04e74b41a7f20004e7 SHA512 9114f7a5a1f532d4302ba792a2721b8d6b3e5ebbff504b4f48f406fd3de9933b2d57bd888a53fe5cad165d99e1e26f05865e7a46139ab34862dc805f59929add
+EBUILD terraform-0.13.0.ebuild 41229 BLAKE2B 5cf91bdb2608f3590790071ada4cf4b85ae0a85f69af276767385196a30734bbf0cbf71282ed75edb973b2a8cd6819157a859dfe98ecbc99f9c49a5b04a05753 SHA512 52a093e28f057f3da780e8559592e79051abf79754d9493f05216fc8654c25f0e4822227081df8b8a44eeaaf8218f946517e61a7b7a32298590b907e218bc000
 MISC metadata.xml 1074 BLAKE2B f14c6ede900b616f5a5514adc9735d25fa834dc879712ab79b68fe15a927cb3e8e77a7b30ee8af3b44551be9ec2368476757c4ec5e5b44fcd266367b485fc8bc SHA512 2e28b3de2b512246ddfb76b547151683c4202620992f9453747b4869db1a16d92996cbf810bf82f09e6895ddc7b23ecc2e0ecaf43d9c3ba9e8a2fb53baa995dc
diff --git a/app-admin/terraform/terraform-0.12.28.ebuild b/app-admin/terraform/terraform-0.12.28.ebuild
index 7abd310fc46d..9736011384e6 100644
--- a/app-admin/terraform/terraform-0.12.28.ebuild
+++ b/app-admin/terraform/terraform-0.12.28.ebuild
@@ -605,7 +605,7 @@ SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RESTRICT="test"
 
diff --git a/app-admin/terraform/terraform-0.12.26.ebuild b/app-admin/terraform/terraform-0.12.29.ebuild
index 6ab2a6c8979a..7abd310fc46d 100644
--- a/app-admin/terraform/terraform-0.12.26.ebuild
+++ b/app-admin/terraform/terraform-0.12.29.ebuild
@@ -594,7 +594,6 @@ EGO_SUM=(
 	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
 	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
 	"rsc.io/binaryregexp v0.2.0/go.mod"
-
 )
 
 go-module_set_globals
diff --git a/app-admin/terraform/terraform-0.12.25.ebuild b/app-admin/terraform/terraform-0.13.0.ebuild
index b0e1ffac3e9b..9d7cb6350848 100644
--- a/app-admin/terraform/terraform-0.12.25.ebuild
+++ b/app-admin/terraform/terraform-0.13.0.ebuild
@@ -15,24 +15,30 @@ EGO_SUM=(
 	"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 v21.3.0+incompatible/go.mod"
+	"github.com/Azure/azure-sdk-for-go v32.5.0+incompatible/go.mod"
 	"github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod"
-	"github.com/Azure/azure-sdk-for-go v36.2.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v36.2.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.2"
-	"github.com/Azure/go-autorest/autorest v0.9.2/go.mod"
+	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
+	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
+	"github.com/Azure/go-autorest v12.1.0+incompatible"
+	"github.com/Azure/go-autorest v12.1.0+incompatible/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/adal v0.6.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-0.20191028180845-3492b2aff503"
 	"github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
 	"github.com/Azure/go-autorest/autorest/azure/cli v0.2.0"
 	"github.com/Azure/go-autorest/autorest/azure/cli v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.0"
+	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.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/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"
@@ -45,20 +51,25 @@ EGO_SUM=(
 	"github.com/Azure/go-autorest/tracing v0.5.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/Unknwon/com v0.0.0-20151008135407-28b053d5a292"
-	"github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292/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-20150830182803-278e1ec8e8a6"
-	"github.com/agl/ed25519 v0.0.0-20150830182803-278e1ec8e8a6/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"
@@ -78,8 +89,12 @@ EGO_SUM=(
 	"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-versions v0.0.2-0.20180815153302-64b99f7cb171"
-	"github.com/apparentlymart/go-versions v0.0.2-0.20180815153302-64b99f7cb171/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-20190512014041-4a23807e62b9"
+	"github.com/apparentlymart/go-userdirs v0.0.0-20190512014041-4a23807e62b9/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"
@@ -88,10 +103,8 @@ EGO_SUM=(
 	"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.25.3"
-	"github.com/aws/aws-sdk-go v1.25.3/go.mod"
-	"github.com/aws/aws-sdk-go v1.30.12"
-	"github.com/aws/aws-sdk-go v1.30.12/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"
@@ -106,6 +119,7 @@ EGO_SUM=(
 	"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"
@@ -124,108 +138,141 @@ EGO_SUM=(
 	"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.0.0/go.mod"
 	"github.com/dimchansky/utfbom v1.1.0"
 	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/dnaeon/go-vcr v0.0.0-20180920040454-5637cf3d8a31"
-	"github.com/dnaeon/go-vcr v0.0.0-20180920040454-5637cf3d8a31/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.0"
-	"github.com/gogo/protobuf v1.2.0/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"
 	"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"
 	"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/gophercloud/gophercloud v0.0.0-20190208042652-bc37892e1968"
-	"github.com/gophercloud/gophercloud v0.0.0-20190208042652-bc37892e1968/go.mod"
-	"github.com/gophercloud/utils v0.0.0-20190128072930-fbb6ab446f01"
-	"github.com/gophercloud/utils v0.0.0-20190128072930-fbb6ab446f01/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.4.0"
-	"github.com/hashicorp/aws-sdk-go-base v0.4.0/go.mod"
+	"github.com/hashicorp/aws-sdk-go-base v0.5.0"
+	"github.com/hashicorp/aws-sdk-go-base v0.5.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.4.1/go.mod"
 	"github.com/hashicorp/go-azure-helpers v0.10.0"
 	"github.com/hashicorp/go-azure-helpers v0.10.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"
 	"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.0.0-20181001195459-61d530d6c27f"
-	"github.com/hashicorp/go-hclog v0.0.0-20181001195459-61d530d6c27f/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.0.1-0.20190610192547-a1bc61569a26"
-	"github.com/hashicorp/go-plugin v1.0.1-0.20190610192547-a1bc61569a26/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"
@@ -236,12 +283,12 @@ EGO_SUM=(
 	"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.3.27"
-	"github.com/hashicorp/go-tfe v0.3.27/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.1.0"
+	"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"
@@ -251,8 +298,8 @@ EGO_SUM=(
 	"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.3.0"
-	"github.com/hashicorp/hcl/v2 v2.3.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"
@@ -267,17 +314,25 @@ EGO_SUM=(
 	"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.0.0-20180206201540-c2b33e8439af"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/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 v1.1.5"
-	"github.com/json-iterator/go v1.1.5/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"
@@ -286,6 +341,8 @@ EGO_SUM=(
 	"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"
@@ -309,10 +366,13 @@ EGO_SUM=(
 	"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/winrm v0.0.0-20190223112901-5e5c9a7fe54b"
-	"github.com/masterzen/winrm v0.0.0-20190223112901-5e5c9a7fe54b/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"
@@ -344,8 +404,12 @@ EGO_SUM=(
 	"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/hashstructure v1.0.0"
 	"github.com/mitchellh/hashstructure v1.0.0/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"
@@ -354,27 +418,41 @@ EGO_SUM=(
 	"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/packer-community/winrmcp v0.0.0-20180102160824-81144009af58"
-	"github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/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"
 	"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"
@@ -384,8 +462,9 @@ EGO_SUM=(
 	"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"
 	"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"
@@ -406,15 +485,17 @@ EGO_SUM=(
 	"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.1"
-	"github.com/spf13/afero v1.2.1/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"
 	"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"
@@ -424,10 +505,14 @@ EGO_SUM=(
 	"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/terraform-providers/terraform-provider-openstack v1.15.0"
-	"github.com/terraform-providers/terraform-provider-openstack v1.15.0/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.10.1"
+	"github.com/tombuildsstuff/giovanni v0.10.1/go.mod"
+	"github.com/tombuildsstuff/go-autorest v14.0.1-0.20200416184303-d4e299a3c04a+incompatible"
+	"github.com/tombuildsstuff/go-autorest v14.0.1-0.20200416184303-d4e299a3c04a+incompatible/go.mod"
+	"github.com/tombuildsstuff/go-autorest/autorest v0.10.1-0.20200416184303-d4e299a3c04a"
+	"github.com/tombuildsstuff/go-autorest/autorest v0.10.1-0.20200416184303-d4e299a3c04a/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"
@@ -442,14 +527,12 @@ EGO_SUM=(
 	"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"
 	"github.com/zclconf/go-cty v1.1.0/go.mod"
-	"github.com/zclconf/go-cty v1.2.0"
 	"github.com/zclconf/go-cty v1.2.0/go.mod"
-	"github.com/zclconf/go-cty v1.2.1"
-	"github.com/zclconf/go-cty v1.2.1/go.mod"
-	"github.com/zclconf/go-cty-yaml v1.0.1"
-	"github.com/zclconf/go-cty-yaml v1.0.1/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"
@@ -460,13 +543,18 @@ EGO_SUM=(
 	"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-20181112202954-3d3f9f413869/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-20200510223506-06a226fb4e37"
-	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/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-20191206172530-e9b2fee46413/go.mod"
+	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9"
+	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/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"
@@ -476,27 +564,36 @@ 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/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"
 	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb"
+	"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"
@@ -504,12 +601,14 @@ EGO_SUM=(
 	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
 	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/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-20190129075346-302c3dd5f1cc/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"
@@ -518,18 +617,27 @@ EGO_SUM=(
 	"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-20190804053845-51ab0e2deafa"
-	"golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/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"
@@ -537,9 +645,14 @@ EGO_SUM=(
 	"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"
 	"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"
@@ -550,6 +663,7 @@ EGO_SUM=(
 	"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"
@@ -558,27 +672,59 @@ EGO_SUM=(
 	"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.14.0/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"
 	"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"
 	"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"
 	"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
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 1ba4dac9c5d1..5b371bba8c1f 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -5,5 +5,11 @@ AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea8
 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.5.0-webui.tar.xz 1237556 BLAKE2B 2647d9733a6a20b61f5884b15dd46d048705c3fe5dcfb9f4c8c2fa71303d17c9b69d2f08a42ec171e863affd45632c0407d4db4cb6bb229ba780860dfbf05449 SHA512 b5164f7525c94752f3f6a17ba6c738eb42e05f33682b790b49c322882964dfdb68abf28d0f30836759383ff6777cc5d5061699fc2a5d2a7a3706b5423ccca378
+DIST vault-1.5.0.tar.gz 34940170 BLAKE2B cbc4b25bbb6881415c63be41970429e4413e3f70fc9aa3dfb3c54136719c7166896475d77a11d33d3e388344d863a19d63836f2ed3e20cc42db98ee2b57ba9a4 SHA512 245d5ea837f561d6c3832a0cb28d851dabe908fac2be7e53d3fd466689778d67b2cd5d9ea8c297f8daceb003c571a9768254a7e27d1fbeb1a376ac75e3c6edfb
 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.5.0.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.4.3.ebuild b/app-admin/vault/vault-1.4.3.ebuild
new file mode 100644
index 000000000000..d7f0e36a12fb
--- /dev/null
+++ b/app-admin/vault/vault-1.4.3.ebuild
@@ -0,0 +1,77 @@
+# 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.5.0.ebuild b/app-admin/vault/vault-1.5.0.ebuild
new file mode 100644
index 000000000000..d7f0e36a12fb
--- /dev/null
+++ b/app-admin/vault/vault-1.5.0.ebuild
@@ -0,0 +1,77 @@
+# 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/whowatch/Manifest b/app-admin/whowatch/Manifest
index 5948bd72cbf1..e07d881ea2db 100644
--- a/app-admin/whowatch/Manifest
+++ b/app-admin/whowatch/Manifest
@@ -4,4 +4,5 @@ DIST whowatch-1.8.5.tar.gz 133845 BLAKE2B f0f5b80d7adc488030877936ab8d12687f8b56
 DIST whowatch-1.8.6.tar.gz 141801 BLAKE2B d52ae8304d25c570873c65cc3b91d8fe227bf71f1802cc8055332f4614b9ca9f6c17dea10b07bbd20f834623f9e10456b19c6393996f6c66819e7e921ffb6240 SHA512 49aa45b0a88a41c98fb7b548f0f098004c8bcca9ec078e977fcec8bc109c9beab25989003bfff4b3dc38a9d62d69378f64441753a1cca62729d2013d2ed73cb0
 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
diff --git a/app-admin/whowatch/whowatch-99999.ebuild b/app-admin/whowatch/whowatch-99999.ebuild
new file mode 100644
index 000000000000..73c452f9523b
--- /dev/null
+++ b/app-admin/whowatch/whowatch-99999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop git-r3
+
+DESCRIPTION="Displays information about users currently logged on in real time"
+HOMEPAGE="http://wizard.ae.krakow.pl/~mike/ https://github.com/mtsuszycki/whowatch/"
+EGIT_REPO_URI="https://github.com/mtsuszycki/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="
+	sys-libs/ncurses:0=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.4-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	dobin src/${PN}
+	doman ${PN}.1
+	dodoc AUTHORS ChangeLog.old NEWS PLUGINS.readme README.md TODO
+	domenu ${PN}.desktop
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /app-admin
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)