gentoo resync : 14.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
commit: deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree: 9a48f42594e1a9e6b2020d5535a784314434d7a7 /app-admin
parent: 38423c67c8a23f6a1bc42038193182e2da3116eb (diff)
123 files changed, 3636 insertions, 3943 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 51da3c255370..380c2c8007b0 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index 961271d55cb6..b4f812718347 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -2,6 +2,8 @@ AUX abrt-2.0.12-r1-conf 687 BLAKE2B 771c5370e3f7f181c22f8a56d8a13a02759aed2fdd5f
 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
-EBUILD abrt-2.14.0.ebuild 3160 BLAKE2B e4091dd74e7cad18a4ec51bb5d220b746afa11e200649d3e088e2c67bceaf94466228e5979979e6d59cc8bf6cb7c389c7eb15f0500ed5d3c9872e91061529f32 SHA512 ec18ee6df3ec45164caf460bb6159473e54398fcbcb719f3acb93b3986b18333aece2efdf96b97cbb040e3adacdf9215935ac452431c7d24a1940dc41f69c021
+EBUILD abrt-2.14.0.ebuild 3158 BLAKE2B 61454e86d94458b541971bd1b249864ad141cd0ac30a19929c65d49c30336441ad2c1d17170d54302d73bce65bd7f0785e5564865608158c5ffb852e05036bf4 SHA512 0917826e044cadd00bb4b87271e4a76c59fa07629186a49475d941785c90b0f9c0c111dc96c4efaf68442a545d1494484c9fab3397a6088f5b6803660ce2f57e
+EBUILD abrt-2.14.1.ebuild 3160 BLAKE2B e4091dd74e7cad18a4ec51bb5d220b746afa11e200649d3e088e2c67bceaf94466228e5979979e6d59cc8bf6cb7c389c7eb15f0500ed5d3c9872e91061529f32 SHA512 ec18ee6df3ec45164caf460bb6159473e54398fcbcb719f3acb93b3986b18333aece2efdf96b97cbb040e3adacdf9215935ac452431c7d24a1940dc41f69c021
 MISC metadata.xml 327 BLAKE2B e5a24f189c128e35fd3b878143c5d99da897af8535258f7eece0153df8a5b2dfc8b4f19000c60a6fcb70bb4f0b9efad98d2deab9e36dd205615e4176a06c0c45 SHA512 687cee8b12e63a46b815a1d6099a2853ed72d3d19d118e4e0cdbe67f501475ed02949848a4537a7c5eef0ac4a398edab868f816bdff277e3c1b348e5ab73ee40
diff --git a/app-admin/abrt/abrt-2.14.0.ebuild b/app-admin/abrt/abrt-2.14.0.ebuild
index 0c87155270c0..2664d60151a3 100644
--- a/app-admin/abrt/abrt-2.14.0.ebuild
+++ b/app-admin/abrt/abrt-2.14.0.ebuild
@@ -12,7 +12,7 @@ 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="selinux test"
 RESTRICT="!test? ( test )"
diff --git a/app-admin/abrt/abrt-2.14.1.ebuild b/app-admin/abrt/abrt-2.14.1.ebuild
new file mode 100644
index 000000000000..0c87155270c0
--- /dev/null
+++ b/app-admin/abrt/abrt-2.14.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit autotools python-single-r1 systemd xdg-utils
+
+DESCRIPTION="Automatic bug detection and reporting tool"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="selinux test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libreport-2.10.0[gtk,python]
+	dev-libs/libxml2:2
+	>=gnome-base/gsettings-desktop-schemas-3.15.1
+	net-libs/libsoup:2.4
+	sys-apps/dbus
+	sys-apps/systemd:0=
+	sys-auth/polkit
+	sys-libs/libcap
+	sys-fs/inotify-tools
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}
+	acct-user/abrt
+	acct-group/abrt
+	app-arch/cpio
+	app-arch/rpm[python,${PYTHON_SINGLE_USEDEP}]
+	dev-libs/elfutils
+	dev-libs/json-c:0=
+	sys-apps/util-linux
+	>=sys-devel/gdb-7
+	$(python_gen_cond_dep '
+			dev-libs/satyr[${PYTHON_MULTI_USEDEP}]
+			dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
+			dev-python/argh[${PYTHON_MULTI_USEDEP}]
+			dev-python/humanize[${PYTHON_MULTI_USEDEP}]
+	')
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_MULTI_USEDEP}]')
+	)
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+	default
+
+	# Install under proper directory
+	sed -i -e 's:dbusabrtdocdir = ${datadir}/doc/abrt-dbus-${VERSION}/html:dbusabrtdocdir = ${datadir}/doc/${PF}/html:' doc/problems-service/Makefile.am || die
+
+	# Ensure this works for systems with and without /usr merge
+	sed -i -e "s:/usr/bin/bash:$(which bash):" init-scripts/abrtd.service || die
+
+	# Fix hardcoded "pytest-3"
+	sed -i -e "s:pytest-3:pytest:" \
+		configure.ac src/python-problem/tests/Makefile.am src/cli/test || die
+
+	# pyhook test is sensitive to the format of python's error messages, and
+	# fails with certain python versions
+	sed -e '/pyhook.at/ d' \
+		-i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
+	./gen-version || die # Needed to be run before autoreconf
+	eautoreconf
+}
+
+src_configure() {
+	myeconfargs=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-bodhi
+		# package breaks due to not finding libreport-web with bodhi plugin enabled
+		--without-rpm
+		$(usex selinux "" "--without-selinux")
+		--with-python3
+		--without-pythondoc
+		# package breaks due to no sphinx-build-3
+		$(use_with test pythontests)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+
+	keepdir /var/run/abrt
+	# /var/spool/abrt is created by dev-libs/libreport
+
+	diropts -m 700 -o abrt -g abrt
+	keepdir /var/spool/abrt-upload
+
+	diropts -m 775 -o abrt -g abrt
+	keepdir /var/cache/abrt-di
+
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
+	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 1c0ab11fb428..f2291afd8afc 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,6 +1,6 @@
-DIST ansible-2.9.6.tar.gz 14201258 BLAKE2B 29da78035291a252f215a49945e82d9f3598a91c9c8993c69623668e9f8a667882330d51c75e1ae27ee5242f4a6320ee947af338c4c38e23f4f9d04cf19364ca SHA512 7111fd72b4e029b2f661bfb849b4323b69ea796f8a069ad3120e8de390effa670180c69ca0fd5e0a1c2e444db6d574a52d530a2b0343c76cd81ba963b3c3a7cb
 DIST ansible-2.9.7.tar.gz 14215538 BLAKE2B b3882c359d0e71446c81b4f4592a08447656c22ed70358d7eddf36f4a84811d97f047afcdfd57f67664a130cee5c1231a106fc5b77b52cfab8b1be868ee03f81 SHA512 ce029441bcafdc5b44c9fda69f183d4defea84ead5628164caf87306cb97efec68c11b2cce728e90f28290640c320549486a6b4e823710f638d1d2e7c35675a4
-EBUILD ansible-2.9.6.ebuild 1711 BLAKE2B 1697739493cf880bc2b0374ca2afc1e4fae28d0740afd9f237ad2507a3f69e7c837ccabdaf9cae2f66ba99536da0bcc83f6b5b364a63d41e89395c2e43d6add7 SHA512 719e35eba96cc4ef0d4558a508f553b63efe60151bed4e69671247b21f789090e34e75380a7267ac40639b75920cf3054ba6aeeee891adac98bec1d0c2243538
-EBUILD ansible-2.9.7.ebuild 1713 BLAKE2B a888274e71e059297c58d463de427aa3cc2c04ebf1bc272f98830cefe96c2a2dfeca7e3d5bf26b9724f1840631c586fab0753caf2d799e18dc94f23cdb63acdc SHA512 4582bd23813d31dee689dabd84f020e20249582dd8c51e7aa4221bbe21237e92ae5c48305e6bb0380dfafa754ff3cd56ff243a1e1ce93ffd9f89786e8fa42ce4
+DIST ansible-2.9.9.tar.gz 14222889 BLAKE2B bcacd9271aa0275cff8090819ee5c2832c7b59a287d976ced7e4dad52b5af85350baa1de30f56fdbb92e237c1dd3a9f6ff86cd1af5cb20167331b3f846649d4a SHA512 327c5ece277096f71f10fec2b33a8d2c94ee59b0e22b15bb5ca449da2331b8158239bdbc8e3afd093af358a787f410c7c2e0942010de65a8d9c8719cf83e4abd
+EBUILD ansible-2.9.7.ebuild 1711 BLAKE2B 1697739493cf880bc2b0374ca2afc1e4fae28d0740afd9f237ad2507a3f69e7c837ccabdaf9cae2f66ba99536da0bcc83f6b5b364a63d41e89395c2e43d6add7 SHA512 719e35eba96cc4ef0d4558a508f553b63efe60151bed4e69671247b21f789090e34e75380a7267ac40639b75920cf3054ba6aeeee891adac98bec1d0c2243538
+EBUILD ansible-2.9.9.ebuild 1713 BLAKE2B a888274e71e059297c58d463de427aa3cc2c04ebf1bc272f98830cefe96c2a2dfeca7e3d5bf26b9724f1840631c586fab0753caf2d799e18dc94f23cdb63acdc SHA512 4582bd23813d31dee689dabd84f020e20249582dd8c51e7aa4221bbe21237e92ae5c48305e6bb0380dfafa754ff3cd56ff243a1e1ce93ffd9f89786e8fa42ce4
 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.7.ebuild b/app-admin/ansible/ansible-2.9.7.ebuild
index 8c8b3a948043..2a5dea9c0317 100644
--- a/app-admin/ansible/ansible-2.9.7.ebuild
+++ b/app-admin/ansible/ansible-2.9.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
diff --git a/app-admin/ansible/ansible-2.9.6.ebuild b/app-admin/ansible/ansible-2.9.9.ebuild
index 2a5dea9c0317..8c8b3a948043 100644
--- a/app-admin/ansible/ansible-2.9.6.ebuild
+++ b/app-admin/ansible/ansible-2.9.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
index bbd02a57ba94..9223d14b250a 100644
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -12,4 +12,4 @@ EBUILD apachetop-0.12.6-r2.ebuild 896 BLAKE2B d8fa75f505641c95219c94f0fb09bbb838
 EBUILD apachetop-0.17.4.ebuild 726 BLAKE2B 2979fc7c056474d3e6e968eb7f8a9729a9dcd83137020f50f45c14d1dae27a567dc03e189878e7a2edaa5fb9c68a4ddb4b9211c4d2f5089a98f4850bc67185da SHA512 3e7bcd2561a0dcbdf8d494e3e41c4735e1d08b6893d2c1889dc7590edb83ba729d42b73327284eb50f7c313f0c4b7d07a7c2e63cc5cc01544fa593eebdd8a072
 EBUILD apachetop-0.18.4.ebuild 756 BLAKE2B 5dfdc856a095e583b707fbfeb2afa79f7a7f9486c8792a814bbb2823d8e92cbd3f78b1aa2fff34a2cf236923abe189e7e7ebc00cf2841cc5b100c0e43fd64391 SHA512 07fd2b11883cccc65befd13045f5d4fdf454e6dede3b2a97f46dc3487364daab176777d928aa575118c63806b1a8b7997c55961d895359504f02e97e20df5ba2
 EBUILD apachetop-0.19.7.ebuild 672 BLAKE2B cb03970143eab1da727332a1745a546cff9aef653e048c8702724852dc745b4360ac7370d7684b4d5920cb198cc37acf99610edd47705ce99cd11860d87479e5 SHA512 0336fc0789fcc78d45083ebc6ed85418174782fedcdf0884d8d857aa8bd7b172f9bbf6a43496f546ce9a34811697a9acaec12ce31d2eb7476f5cdd9d6d073bb1
-MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
+MISC metadata.xml 169 BLAKE2B 21efaa2ec5fcac1a8cf109ad11001875d2c1327d6765bf71d06666699dc6eab3eed845895cc55a6a1d57358bfe6a6fefcbef1f616d6c259ee725a526e10b5a05 SHA512 5192868b5508b672a7e4e119ffd5a730dca1630781ec37fd20b74e2370521c83dd9020d7bb1379cf911f643a57e4a1e6578f89b64b6e3486571b58fd06e7b88d
diff --git a/app-admin/apachetop/metadata.xml b/app-admin/apachetop/metadata.xml
index e7214b7e32c5..97c6505eb5cf 100644
--- a/app-admin/apachetop/metadata.xml
+++ b/app-admin/apachetop/metadata.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>oleksandr.trotsenko@gmail.com</email>
-		<name>Oleksandr Trotsenko</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/cdist/Manifest b/app-admin/cdist/Manifest
index a76d81ddc9ce..2cc476c54047 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,5 +1,7 @@
 DIST cdist-5.1.3.tar.gz 915245 BLAKE2B 5fce58f6fcbd48852e1c0c5568b72c360e74fd49b5321e2aedfdc8e48fd090cbdd7bab87a94e76d087f04f5a706bf2c7b1bebdc5a80867e26d8cc6e28afdeab3 SHA512 8330a5af80dfc07da722675ae1d402ebae4ba0aada451a02d782365d68d1d43a643609f3326f5ed793d2902838ee29071c0255c9d8a9d38c1e8a7c92a24cef46
 DIST cdist-6.0.0.tar.gz 934813 BLAKE2B 3cb18ebb3059fc9a37beb1567c691e1d34a9cde5d49081e8798b5ba86ea8da3b6c964d2c8bea7bf2f04f986b0b4a8766c8ea53ce48fb4bc024264e72efec1fcb SHA512 e846060f3020d6281d41e97b9cc33250cd1d4ae0d110a2792fc2447af110fef91199fc0382d5a1e501f487fda42f703957ff5a39cf28061338609a600290d792
+DIST cdist-6.5.4.tar.gz 898002 BLAKE2B b4565cd8112ce1bff6ac74625a5920886a708fec827f70c3a3a2df156408761badebff4e161900cd09685bfbbb4954927c9771f6516c54a510b582ebec075e76 SHA512 3f1405e1b28d7568ef3ae543d59e760b2dc1fc8004be031550ba52d3aa2d8911cef4325865fb9ed5df053ec1609a076bb31a520b100bad5811f0de9cd73f416e
 EBUILD cdist-5.1.3.ebuild 590 BLAKE2B c587b9ffe196b672e600f80c521138e46c838ab3c2c93165299fe58037957c93e4a9fed227705583ae877444d76b81d466827e283af24845127de848594b6308 SHA512 64de373a0834108dcdbed4ad81b6747aa14ef5c568b341ca8056c4d7eb369cabb543d02d252b5cd3c89832fc9a5b1192640072e47594ef2d9c5312e1e6d6d60d
 EBUILD cdist-6.0.0.ebuild 596 BLAKE2B fac03ebac640f9a3c0675bf239849276005d9374c144cfd342bff70bec164883dc3b7aa5c820d28abff14f0a48c7d49380cb2940758cac0b49afa0f0853db3b1 SHA512 265a2362ccd5bbbce39d85b975a0a938b15e790394ae3cbabbbe6244a9e7c65db6248205484927627bc13c6e7bbb3e54efe35c9a7c801d00c4469ead0b4547ca
+EBUILD cdist-6.5.4.ebuild 646 BLAKE2B b590d8fd0f7794c433908ded86c9b1e53007c8bdab64610d94b2d086554ccfd066e83b9b282ef7d29d6c754c8296e6d07666c7e03378aee9edc7f6c3a560e3a8 SHA512 653898d859c35fa4551d95f5d4f84431784d4e48430f4c0ff00e40e92934efa08532ffae6bb74157af19bfdbe78948de1eac4a4fb44af49c312db5fd4f62be56
 MISC metadata.xml 240 BLAKE2B 1dc43622dbc22a70ccbdccd82d2fa3c54b7bb985e0ab124812aac7a453546a46ffa6bf205b4b8e72e014cad9ee017dfec3c4430881277b3463367418bf4f76db SHA512 bedaadadb9b7d70f72dde98c058a74300749effe632f00af0f693a9bf826076d02773cc39bb5b3b813fd2ed24cedfaf3cecfb8cac81ea561d288286840cf1f1c
diff --git a/app-admin/cdist/cdist-6.5.4.ebuild b/app-admin/cdist/cdist-6.5.4.ebuild
new file mode 100644
index 000000000000..ed4bd09b8c98
--- /dev/null
+++ b/app-admin/cdist/cdist-6.5.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="A usable configuration management system"
+HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
+	distutils-r1_python_install_all
+
+	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
+}
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index 87ce4eb9e925..ab8c93f1c77c 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -2,5 +2,7 @@ AUX clsync.conf 589 BLAKE2B fb7736b0972c91916770c6cfca693267bdf0cb3f6ad540388967
 AUX clsync.confd 645 BLAKE2B f2e2f70f5a88ea3a416f4151637d63f79cce483b499ee0c1b5005ef8e9d16558f0d1c23ddd182335f7e963172bafaf4b41a37c1288f7fe55e7a57e2868418ae1 SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5
 AUX clsync.initd 555 BLAKE2B 18b3f0e1e8e079eb306709d2b55b99100ce3efa852f285d7ac9acd4269fe41e0fe5d1b7c12fa966dc01f60a598d6178cf5c8b6a2cd21410bdcf0f66c1facf1d2 SHA512 a5ee987466dec0e8ca7ce2502bd71d000419e03f33e1585e47fa5d91fdb5321f949f3d3ca566e68a0aedcc50ab6a84a92210aa866520d1703805958a2bfa270a
 DIST clsync-0.4.2.tar.gz 256042 BLAKE2B 28474fc66341b93705a502fcff390e3affcd89a9e1eb272dce9b28be709562e09c03e9c300cfeb5371e2e618a2239468a58c46212a39d751fbbfddeaab12bcf6 SHA512 d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200
+DIST clsync-0.4.4.tar.gz 268276 BLAKE2B 0027760cfdee5c4410c4cea45aae2def6498d812d2f50038993c39a33c6029722ec2dd2cfff20815a3ffd8834eb8c439059e5f1d2cc3d2cf98ecb22ed22f2322 SHA512 cdafbf43fdeafe9cb53c08e0514ef356fb5b4bbd8da2226263180e7441d222c76e6c73f847f484b3688a8672e4a85df0346c0236d8d0ed4506d209189af02dcd
 EBUILD clsync-0.4.2.ebuild 2728 BLAKE2B 164359485c64116501a2b5c43252003846c103ee8489664c6a88bbdd55e99f8fe2df3fd913906cbc1e7d54fdedca4f0e6fe28b55ba9e5b69629707f955d96f21 SHA512 1ff01617f74e030d1ad48c5177550272e56d633ad22493e774a7937f8172ffab51316e8872f74da4266dd02eea93758d00319fdd408d902519717e9fce4260f4
-MISC metadata.xml 1757 BLAKE2B e907cb32524743bc5571eddc4d0c7a30b51b82f49f72405939110e3085a8561b55e5927950be83ae3a647418479183aeae8491092ba8e5432a7633365f769e2a SHA512 6f853983a4886bbacb2fe1e26b728ba5d86b05f348b6df2cf0779725ef11623f73274829605b88aacd4300b4cb28ff6fbeead916c8dd01f4a07c9780218f1bfa
+EBUILD clsync-0.4.4.ebuild 2787 BLAKE2B f81207ffd1e0b6b77bffc024ca078a0d1ed09e86432af9784118933e927345e1b42b7f640643ea95bcd7e2af20eeb26d1bd31cd2863fb04332c72b2c67fa3eaf SHA512 254689abc5d84a395db6a7058e4f2ca2c33caed9a6e9e44310c8490f6992794ae44e1509a9a7c0799b8cce0a8605278ba457bd27974986e1cd7372fb91580402
+MISC metadata.xml 1755 BLAKE2B 78e3d8a08fe1bea85b4b9944ab339d36ea1a751d88b788b959fafdb151bfdc616fa892df6df526d42ea2c52478d7b5bbdd8606b87f063740686095a74f209004 SHA512 9db85a84fb53806ba1062790bbb16ac37b9942e33bb294ce844cb7d72b8afcd0ded045134c7cb541f5f1c2678b0fa75292aaa91244c05c44db05151e7d5c51ee
diff --git a/app-admin/clsync/clsync-0.4.4.ebuild b/app-admin/clsync/clsync-0.4.4.ebuild
new file mode 100644
index 000000000000..ee8baf2da676
--- /dev/null
+++ b/app-admin/clsync/clsync-0.4.4.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info systemd
+
+DESCRIPTION="Live sync tool based on inotify, written in GNU C"
+HOMEPAGE="https://github.com/clsync/clsync http://ut.mephi.ru/oss/clsync"
+SRC_URI="https://github.com/clsync/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+caps cluster control-socket cgroups debug extra-debug
+extra-hardened gio hardened +highload-locks +inotify mhash
+namespaces seccomp"
+
+REQUIRED_USE="
+	|| ( gio inotify )
+	extra-debug? ( debug )
+	extra-hardened? ( hardened )
+	mhash? ( cluster )
+	seccomp? ( caps )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	caps? ( sys-libs/libcap )
+	cgroups? ( dev-libs/libcgroup )
+	mhash? ( app-crypt/mhash )
+"
+RDEPEND="${DEPEND}
+	~app-doc/clsync-docs-${PV}
+"
+
+pkg_pretend() {
+	use namespaces && CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+	use seccomp && CONFIG_CHECK+=" ~SECCOMP"
+	check_extra_config
+}
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local harden_level=0
+	use hardened && harden_level=1
+	use extra-hardened && harden_level=2
+
+	local debug_level=0
+	use debug && debug_level=1
+	use extra-debug && debug_level=2
+
+	econf \
+		--disable-socket-library \
+		--enable-clsync \
+		--enable-debug=${debug_level} \
+		--enable-paranoid=${harden_level} \
+		--without-bsm \
+		--without-kqueue \
+		$(use_enable caps capabilities) \
+		$(use_enable cluster) \
+		$(use_enable control-socket socket) \
+		$(use_enable highload-locks) \
+		$(use_enable namespaces unshare) \
+		$(use_enable seccomp) \
+		$(use_with cgroups libcgroup) \
+		$(use_with gio gio lib) \
+		$(use_with inotify inotify native) \
+		$(use_with mhash)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# docs go into clsync-docs
+	rm -rf "${ED}/usr/share/doc" || die
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	# filter rules and sync scripts are supposed to be here
+	insinto /etc/${PN}
+	newins "${FILESDIR}/${PN}.conf" "${PN}.conf"
+	keepdir /etc/${PN}
+
+	systemd_dounit "examples/clsync@.service"
+}
+
+pkg_postinst() {
+	einfo "${PN} is just a convenient way to run synchronization tools on live data,"
+	einfo "it doesn't copy data itself, so you need to install software to do actual"
+	einfo "data transfer. Usually net-misc/rsync is a good choise, but ${PN} is"
+	einfo "is flexible enough to use any user tool, see manual page for details."
+	einfo
+	einfo "${PN} init script can be multiplexed, to use symlink init script to"
+	einfo "othername and use conf.d/othername to configure it."
+	einfo
+	einfo "If you're interested in improved security, enable"
+	einfo "USE=\"caps cgroups hardened namespaces seccomp\""
+}
diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml
index 9cbe60e8159c..824f11d2a130 100644
--- a/app-admin/clsync/metadata.xml
+++ b/app-admin/clsync/metadata.xml
@@ -25,6 +25,6 @@
     <flag name="namespaces">Enable namespaces isolation.</flag>
   </use>
   <upstream>
-    <remote-id type="github">xaionaro/clsync</remote-id>
+    <remote-id type="github">clsync/clsync</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index e194e3f644cd..5455742a7e5a 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -3,9 +3,7 @@ AUX consul-template.initd 592 BLAKE2B 21d6ff6bee67a82c4305eba3765f8e9c49ee59357a
 AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed1e57c23fb3bb3df4066cfdc1ff70f2eae6a67c7816d8d38d41106f003fe2a98732a9180838c05d04a710d9bef09 SHA512 642b53e43fd7a4da00907600f26e3814893b61856a62083c804b0077043a4f8f6603f0ae4461e901105f8e1fe52c2f34f3e949e752441f5f510e9cc21890ca75
 AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
-DIST consul-template-0.23.0.tar.gz 192356 BLAKE2B 204f0fc7ca6780a60d88ccbd75181897e9c4db5194cd702e2ac3759d456dcb9fcae4a9f8481ccbd2d61609fb9d1330f143a0c039b6278e15d85cc2535cf5b13e SHA512 769992578fb6b9f69e9c41280a46c27e74cabbd7cffddc158dc301ffaa9ad1e5b11e626e5bc2e18532952fecb61f83c107003929e9671d5de4c6f3a82b7120f6
-DIST consul-template-0.24.0.tar.gz 192679 BLAKE2B 85717ad08038c9ec27174220cb5bc7174c8ac8eae9815fd0f403ebf0f5daea39429cfed30939764c53cd1448be94e8a2045e6fdd79af41a4fd913592b4f74600 SHA512 ea5c92b2b30534a2e9e407ebef5057e05f201488f3b46fc9f2b339e1cf56086fac15fff3bc17c5622f852139d1d9b3f872a13b9e6978282f4939c76beeeae28a
-DIST consul-template-0.24.1.tar.gz 192750 BLAKE2B ed9b8cd0059597fe540f8522d05237f8f98bd26083b5ee73a26b78e9882f76f58b595ed5f423da93d4aeff8717c88ffb1665d70769b744f282507b99dad2f991 SHA512 5cb36888f088f1be2a313de51776d258acd5a7b064fac7a80c31d9a6e8852132c82226703da0dfc26fd093eff7cff8de1c34605c18abbf3353d87e91f9a6ddbe
+DIST consul-template-0.25.0.tar.gz 197301 BLAKE2B f6e7d87b6fbb1d56728af0116ce0cd3ace800fa2e1d1edea57acbcd9cd1f1cf9a625426ab139744083071a1641a99aa526d44f28a147bbb1f2afe714b83969fd SHA512 225e0e1f400b6ca6913758f0c4c77788977d4e6f861d50efa89662a652b1c8c648d269c9cb42ae5a590739ab1159a8b1a386cd9942a1c7dafc5200a8923b4c9b
 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
@@ -25,6 +23,8 @@ DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84
 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%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
 DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod 32 BLAKE2B a73ae1e577fbb84fd72de422c367c1003355c117a9660cadbb5d6d52fcd0c102fa3b22c7c7dfb6e149dc14ddcb9b5fef847fb2a7b9379a35405c7bd9d83ff1b5 SHA512 2ef8ab60b4320b9358614a28a02b4207f3986c4a06798c3e253a79bfb63692dfb1765476e9d154e15f9d5e30983609c98b6ee39ae910c678a3773fddca208cee
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.0.mod 112 BLAKE2B d5d3a6674d915a64981d16e50519ddcb083e77a5bc0e2474fb1e2d718512edd48534c11e13c4acc7d403da5778cb6f04c275c8f208d14d54880cdceadbfff872 SHA512 b2b728fab00b8cfb86dcfb042631a37025bd981364c068990abca3ed57b3f47837ae71e568bb2a60a2c941aa2a35ff1bb24a336e786d20ff0bebb63384fee5a4
 DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.0.zip 36790 BLAKE2B 0c0cf4b8113b5baaa213bf94438e366f4426bda4a2c211596fe7a84830f744db7f0060ea56b2cac5660d9d779bbc9509b99fa561cb2c7ada0feb2407805254f8 SHA512 faf7229e030894dcf8c8de2c3095fd34f6b86a3588033c200476bf33065f305df946213100b26ce73d6169835b6087a5c4471ade9f82c5e8c6b543649e704b7e
@@ -43,10 +43,10 @@ DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef512
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 99332 BLAKE2B d95e04036796b0687ccfe18e2cae196efa87fbfe7a763a219860a82117f5a7ac594af005d67698289a9fa0f19b9c397f850ebcc8f6b2e2390fcc6463e95dd47a SHA512 6922e27a1a67c4e858880ca338f68ed80bc01175801b2194a900ba265c00eb482c29e785c564e9afb8f60288593b315ae8af6c8f366d35475678003440115d26
-DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.2.0.mod 449 BLAKE2B 5c517acad8ba870fd05145616c26b0dd4fd8761116cf531c49e9d5509da11f993d66a066c272d1e3d157e721ca34a3260257b351d5118225f48ea1433d0c4629 SHA512 cfd0f9903956f912289fb78038b00623e489137c9d7a4c25fb37c3dfad21d7f8cd884976665c6d4738c557207030120cb3763dd6a1696695acaf8ab18668b449
-DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.2.0.zip 135728 BLAKE2B 04450f9349fa79e6e6245006eb3991355b7138ad7a9ab71114b7560276b34d6d9685d8ac327f71782e8d2468fb20e0e2791c9b91e1b59d15d69b5667b51b3c67 SHA512 d85f09bd8676878bd0c84574c2564c4c8b859a3c77b5e0daa6000c0bec10ae0383447f5025d602f230c26308ba54d3f8931365445cb81e7083cba397a98c6589
-DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.2.0.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
-DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.2.0.zip 21629 BLAKE2B 4a93cb56a62fbeb93e4f96495733029a5706ab5548790cb72a0974f9da4a2e92a9e609ec497009157d896a12f6a1be76603dc1a8b0c10a57260f2ccab6e69903 SHA512 4e1e910ba95093d7eeefce5cf83311f3245072ad34a5812d4c700a6a8d457d55fcea653d7d4e06c28fceb34b97b41bb0429b610a57b030e1bb3a0f4d8d6417b3
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.mod 424 BLAKE2B 8e4575e659f7b2829ef4462f2a94694ea22ba05b538e309c958414f9c8e99de359b007813f6dccaf7bbb0fe2f0ba1b69a878eca6edcb0d6fae10cb6e930f6b7f SHA512 a0d2ae55eca543e43aa4ff03c5a1b27f0fdd405c019a67f9d50a3218888c4c9ee44ab212babeff6f950c86e0c9c2ff98c3f68d973e515f977dca46920a5a9fc5
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.4.0.zip 144944 BLAKE2B 1846b3b50033b90f97245fce8165dd02af8c6ecb6db3aebb7e06cf88be0ab148afbb2e0bf4b0034d485462b765cfca6f092009cfec1bb5b50abe059ea2696375 SHA512 687e546896553b777d6b52c5150a3adcbc26668df2e937a0c7c20d4484b19b85d318544da4be5705437b2409b49886a8994f79d533ff903e752a8b07f972220d
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.0.mod 595 BLAKE2B 0feef849725bf5c462504df952e7f5ad79c2030ef3ee3dbb26d397cf2df6dfdd3329883a3dccaf661d2d0edfd2fb339c38d6901194bb782f2b016c6ef75e9cc8 SHA512 56bb4f1c943db405a3f669aec2300b644f9d7cc9bfc88ebbea37a0abbe7019e27e6edd3998c727d5701086056d180dfdb85b763f701f44e61804a6df7bb9cdee
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.4.0.zip 30165 BLAKE2B e2f789f1c27fd99f317553e2085991c181c4006f70993401f50a0023a10744e75148538f43cac592cfa8b2cf0cba40fae6c196583f5314372c96baf36a29cf30 SHA512 cdf9c1d9b1121d0aa9955aade790a0b1dc11089f2bcec84a37c092e7d9aab8a1df9c461b07bb40ec0f67051eb70fd9cad281949744b7653ff604f78fbd450f43
 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-cleanhttp%2F@v%2Fv0.5.0.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
@@ -55,6 +55,8 @@ DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip 9560 BLAKE2B 2c8039
 DIST github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.mod 48 BLAKE2B a9aa353a1736234b52d79c42428cb1afdf4c39ae85351d9702cd810a26e4b272eecaad248706d9590778ca8109f17ceda47369cfa214a74f695927dbb532b7ef SHA512 fea15af175092af9694b0a9e304b34d1784a57ac9fb2f603edc39bb878dd42e537fa12057718e97b0c9e48937c7e3e885b4b9c3b16b81ef262429610a6e752b6
 DIST github.com%2Fhashicorp%2Fgo-gatedio%2F@v%2Fv0.5.0.zip 10242 BLAKE2B ad7f11783760bac17a84750ab2533d231c841cd95f718f8c815b992df97ac977ba67d2d18128a119758dd01e24cbfe2e541dea691ea40cb18b7f6863aa7f8fd5 SHA512 009a62e7b135c194ca0a5a5f1f29669632b0248d855d11c5126590ac92daaed0ea69641b71b3da22db0c205fa6a0c511c7ab99512d9a7d7eaa2c5a03b2fda6a0
 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.12.0.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip 42172 BLAKE2B ff4b18df1f223c00368c8be01634c08d8433e3993ac90c7243ca1c32c7871ee2222f25346a2c234b4d8f47ea4d6f62dc34c3eec86438d2cf95c8315779ff8391 SHA512 7305cb1a2a729c091267b1d4f1d59634c8cdafc39ae3355230e205e9aac960f321f6b07fdc3f3cd67f7f64daeaf287e214115df480bb7a318dcf51241260f642
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip 23003 BLAKE2B fa553bc49f3f28624830aa0323b0c668db17d7628ca24b280eb718711c240e67fa6ec86b61c7fb5799b63085b570238d07c925a8cbc13e95b9d73d00e4a2ff65 SHA512 91c7b40e4125c3350ac4700bab85547840a8cc848f01bab06bde2eb51693a6dfd584fff718bd2425c67b15757e6e3f8a779cdbb051afff2094444f4bcb080ba8
@@ -69,9 +71,10 @@ DIST github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod 770 BLAKE2B 22eef413ed
 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.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.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
 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.2.mod 215 BLAKE2B 1533dab2e1f588c3e362d82a22e8031674457b30822ec51d6130bab2d9bdf9412a86eef4d581ac50b2320ed39277386f6422e0ed26145cc5a415428ee77a927e SHA512 cd1d90707ef0309643612f59ed64ee94aa1ba686a4140ed84963e983dce5204788b10def7a0c949b15b215063f52269e7441c2e0230440b07d45d704580662d3
 DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip 132950 BLAKE2B 382fd8ab248997b4f364426ab0cd0a31085b5969b9ea9ed50046e8b7687b81eaf766e9e8e0bd15cfeee84319dd25b0c32b0ca2795066ed38f6979dabe654803f SHA512 43075467209b036a7634f6398af7147d209f685e2108f6190e51487905df4d0e5e0b66c40c8bc5a26ae6edf4652fe605fc2e84fb5421019c07d45710352c146d
@@ -106,11 +109,20 @@ DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mo
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
 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
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 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.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-isatty%2F@v%2Fv0.0.10.mod 104 BLAKE2B ee5067e0e89fe2d374ea852dac828c094db84c3a3d2d8a991abeaf40385431015577eeb6b11a66033e8da599e808f9385a84843fd8f87dea487bd3bc9ba233da SHA512 f144089cc85271c7d91b9a6faf169018bb12177dd770db0092dfd0b4c71846e5cc6dea385c0158a974cfe86971e5642858a6d633c64d3b598f1ab254fd47db28
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
+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.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
 DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.mod 38 BLAKE2B ddc3076fa3a93a287dcc66d087fcfa08483a03baeccc6fcfdca7c390908cd0b83017754103a78f6977c929d24868a9ce78859bf9e270fd84b5fb38ef8f939f9c SHA512 79ad90998c2a3e01501014598c152d4d08a92d354678b5e395c4a16ded8519f12e4ea883485ef49f07e240c52e075c7f9a07a410eaa9a1aca3657cfbfe4b6368
 DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.zip 6666 BLAKE2B f8b1dc89e5c872b76d4cfa86ca5439e074cf15736861f772d0a01d195ccbdc71f1cc58756e403ae13784d244c00c38dca27619e5b6d1039a0840380e0c13bbf1 SHA512 db1d13b6e07e68a5a0a131b6d2bf1b8d21c25d082d02e911b01743b63819a9b8c558fbb929e8803e68d6b7ab3a89aeb0b23ac15a345cd1007402f0a049c831d6
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
@@ -120,7 +132,6 @@ DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip 210715 BLAKE2B 246ffa14da7608d3f1b0dd2969b2ac4e3f0b62fbc5060ae3e7f39d8ce5cf40d17b2c074021205513c068b33607f108f887a9cfb42b5d9f013b642e70ef85158a SHA512 c7084476120e931394480ea1ef2d4df157500e89f5e5e2fcb05329e5439bb15c99d70a2566400bb74e419984ead7197809ec6cce16c624ac42b8cfff0e222d5a
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
 DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod 91 BLAKE2B 22854387f9c0bc85c6f4b7b9c5ce8a774c10c6be0c43ec6d188b6ff2f2e394ffdedcdd1bc0b8ba0e31fa3c418cc9339a78a798beeb355032a0724b284573c38a SHA512 8858ec62f3bcef65224ee7d66bbc16c080b2ed16609c46c5c6b6d983b9f7eef9e020a2ae78a16d0226c0f02c609ec5da92565861c02a81494cd6060dd56d005b
-DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-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
@@ -162,47 +173,9 @@ DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.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%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod 32 BLAKE2B c5bd918ed79f8ad33509bee3028b85da9941f721e12735da810f7cf4238ddf83d3c5b7634c01944ebbe9d0c77fea36d5480d945d2dad9d9126cdb5ceb1cc1d11 SHA512 4168487b908d7fbec0813e5ac4d1cc854216d2355fd2843c2856ce81ee7bc399d9fc2b0811b5fbf1f0f1f26e92d327aab3d54b30809ffed621aff37a706e3417
-DIST github.com-BurntSushi-toml-v0.3.1.tar.gz 42077 BLAKE2B d846b7961dc3447a43e5c91dee1897a9701c997a407d9ba8737d08b82b493f99823eeab87cc9d4fe6dd4dbdb7b0d2a218d9f9f220ffcda2056188afbf0f2ab87 SHA512 75801d0263a68613233f3b18e35b000e1aeb5322015c0f032598d9447122fc45b1854741ce6ce9fb4d5a064546ad26f3d6384710bd8e6e1229ed2d4551524852
-DIST github.com-armon-go-metrics-ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz 27423 BLAKE2B 48344146241205d76ae35407e4e5131db7277a7bcd2b44c966ed2c8fbfcd7bd628dcedb7538c28b9106643f8c0f2af4bf0985ada6cb58db0bff739583435b306 SHA512 bf28c4df0927296214f4e89263e30a6ab7c2f5fb62c20177e597890bb878f68df4aaf5445ff9af629864b38da8f506fb530f09ff22d5d8509ad7b5f4ca20a395
-DIST github.com-frankban-quicktest-v1.4.0.tar.gz 26586 BLAKE2B 365dbf6520d5e4b936dfa71022437012b45ca8d499998af8b204fa2f4ad00086b8adbd7c871e494c0a45481809253bbdbb10c05e72f3e6247b29148b61f7a7d7 SHA512 5fb98186c0ce5c96858bd9c018a86f5db2d5b04d7d659a9aafef16e6abb6ea9fbe076c84e74d5b8c5cf7e8460f273bce203dedce0e3ce6c024a16f588acac20d
-DIST github.com-go-check-check-788fd78401277ebd861206a03c884797c6ec5541.tar.gz 31594 BLAKE2B c97dd0f24c42ac32ac9534de280ec9f5ab12e7d91ccd6ad9233b4145c9797c28362c44242faa95fb9f051ade1d5457b7938def97019ea98e337c57d396aa6c86 SHA512 3b0a79ee3dd9e4c321a549ff8b08788ea1bfad34c29cdf42976e955716f2139b3ba7c40e8bf36d8dac01711d590fb2ab26767a06222fe4645856a401219a481b
-DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
-DIST github.com-golang-crypto-4def268fd1a49955bfb3dda92fe3db4f924f2285.tar.gz 1693268 BLAKE2B b19803b58d5f242bca292c1b6e69b5cbeafa908077cec327e9d502576ecb2e19feb2bd131431ae0cb229cfac025eb36ece5f6ced66d0f075e233719aefde6a29 SHA512 fb3da32e55a01c4d8449ddbd9bcb3d2491d2ee9b25e42fd0bacedcd3dc5d35125ac7e57acc27fe57fba63ace43008205041a7654e681c7b91e20d4de6ee28e2d
-DIST github.com-golang-net-ca1201d0de80cfde86cb01aea620983605dfe99b.tar.gz 1099752 BLAKE2B 6300e151f53e5a5886000fa82e9567d644ce0f769588f4f8e3d443208718c36ef790ebe4fecdadc9517b232cfe881c63bba215a649e429304e612af473cce0f5 SHA512 8ba27323bcfdc8f7e5ad3061906bb993c0a91a3da1812768f5652553f9f06ebb8ba35572d5512e65f7ec10363e506779cfaeb1111f1b7db95fa012b9ff64495e
-DIST github.com-golang-snappy-v0.0.1.tar.gz 62605 BLAKE2B 0af2dc71967b38aa4677e5286c8f0fe4167deedb32f065d9612e318bf1e09dd220014e5b05d30418a625dda138dd33ced8b9e73781f2c6e8f7f301246c8103d1 SHA512 87a934b1b5af6a19341b99170d6dfa078ca33753a4c1b2ec120cb54c55a51bb4e808d38d77d498115c9c53678adddf897b4bd81b7a9480564c57a209e2745f42
-DIST github.com-golang-sys-1393eb0183657fb29200106b17a5042ec6e48dbe.tar.gz 1457004 BLAKE2B dc4d4fb792c03cdeff86a55651567c69589195b2947d8d33fa9084cae9abdb4bde02258e60d42bc55fb99cfd293ce52810b77d1fa1b4e4506ff95b0b501d0e20 SHA512 455fa30ab338e2dfe5d289c5a81267138358d28a49fe5932c443e59def5ac50e36cb549b609c77bf8f6a0928567e0c6fc1faed71e092e91c73a00462382332b3
-DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
-DIST github.com-golang-time-c4c64cad1fd0a1a8dab2523e04e61d35308e131e.tar.gz 9392 BLAKE2B 9c06e2cf9a4d51eefa4d687263bd64ffef69d1937754bff1aee0a51c441510a9ce2e3193c361632c45a818b3cdd906349f44c9ee29f1fbf5c405d68bcc4b9f89 SHA512 2e1bdf8a182875315f776c556a1ad8cf2f8e3ceef72d386b8bb7dd5a3de9d5cf2216e2bbec58d2aada149f4a332fbcdef639d6479923f5a0139bb9ed3fe0f952
-DIST github.com-google-btree-v1.0.0.tar.gz 15292 BLAKE2B 663edd55fb375f2b2b1ea377efea8d891baa501161bd5b87a5d10cc84a65d4de0cd4e7b60f421d476f49f26b2ded0fb8633348392c993585790d1af194c147ad SHA512 1bbd6fff467a0f6f6ce074e94a1c13a019e7d37949cbc041d2886bcafa1076426146b46c21a15f55449d525265c04749312792006bd9ea6baeffa6f3d9705a20
-DIST github.com-hashicorp-consul-v1.2.0.tar.gz 17187054 BLAKE2B 5e8d1151efe1e8ad5932886367d0012774713081aa2725f10d45af1e05751e328d76471ff3cbd85031c252c65cde0137f96c3ef86eca7e3e7f6b28e2d20ed0d5 SHA512 1c018a5f35164a899a086ccdae94cb5e6e2a490e4c788d65b0026dbf448950d0c1038b2d61cb10f5e8c9ad22a1affad64dd4a7086b59dffd115d40aa7b3d0cce
-DIST github.com-hashicorp-errwrap-v1.0.0.tar.gz 8346 BLAKE2B b407c23ddc2daa5534e38f23d69363d47012fcfcfae4e75f31513ab9fbf3d05f101258afb2bd60009aa4a6277eebe7c2396db5cb713670ecba6589a0d4b9dccc SHA512 f3bb952d98bdaaed055c4d4adac0a727459964645f8c6bf9becb03ad7eff4ec71e8e4047a29c446ee52148a0e201aac3d4b47d05bd750627650ca0e84c91652f
-DIST github.com-hashicorp-go-cleanhttp-v0.5.1.tar.gz 8069 BLAKE2B 36f2411ec94ba71b4360fc625d19fe995606560d92a4b08459b490831a4d4fda5114622cfe1aea2d100e316300a107045b9d5ce217d3748ab142e49c662ad880 SHA512 a94953d10485bbb6b1510036c8b87dac1d3ca41f84b1b397bb987ae7df68964e082ed09d9b57cfb8439735d246e599a7848882810699d26505662da735cfd406
-DIST github.com-hashicorp-go-gatedio-v0.5.0.tar.gz 8250 BLAKE2B d5a51c4ed7c2d6b3689ec50118a0543b0b581b140667b67f4a842ca6299d392832c10c6512b145f4aa372d97de47b62c29565d01f231cb41b830e18542ea26df SHA512 378cecb6d3f0f13d892ee087ee8335fa7a75b9feb8af549e06d4c81372961840767ecf7d706f0602a7b47c692abad96016c158b5dc3973dac9667fa06114268d
-DIST github.com-hashicorp-go-hclog-v0.9.2.tar.gz 26486 BLAKE2B 127105115f962a019ba753c1a437e192c2d8fc3dce346247fede375f49c2ba10edac0e5d2baff58eddbcc0cf2057bc6128e6cb7eb02cf8636dc795eb7f5f945d SHA512 3dfa8cda3dd87f82cc0b721f664ab2f39afbe644ac785b086023b50432a904396fa33bf5fd933a50951b8059f88d07ea9017c9d5e5150379c521a1739c13527f
-DIST github.com-hashicorp-go-immutable-radix-v1.1.0.tar.gz 22073 BLAKE2B 13961a0b78b894d72d33575eb58e11e98394952504fd62a0ccab70bb3d86dc7d6faa1fe314b0fcd8c835c004c056a23c59d137494df423c2470b938204c5f7b3 SHA512 85e4754e7d4cb19c00717d4273b5d8f5c68aa3349a6f28dfbd2f879be26b7d3711a2b5d092512a720946d5209d47ccfeb76d0e007b22354b2b9733daf90aa45d
-DIST github.com-hashicorp-go-msgpack-v0.5.5.tar.gz 50069 BLAKE2B aae96b54b58b0eeab45956431cd3b5ce2115e5ff82a66e3b803bf2413aff2ebbaf9da9d6e9069639ee9828b0a9ba967888248d658c93c0085a920f8d9e408812 SHA512 956fb5839348587bc85385a2d822824001b5f08ab30c5e3fb5f82c1536021c8e2b429a736e04ffd6b338e7128caba63284cf9cae955451aa8444615937754cfc
-DIST github.com-hashicorp-go-multierror-v1.0.0.tar.gz 10066 BLAKE2B 3df1a8bfbf828e01f5bdfb1837a47ed3cb92acf1666f2abdef2ae29e643fa2d4982018c3787ea696397ee6eb8ae760b5f7445bb3dd256e1a35a8eaf8f1149e42 SHA512 958dfeb5fee67d242e70ef6289f598754d28dec6a05f0d2e3d8b92685fd84dc4543108fc391d6f1190c667415e082745a376fa2ed4ceecb190f6f7f3b77c9d6b
-DIST github.com-hashicorp-go-retryablehttp-v0.6.2.tar.gz 16094 BLAKE2B decf767f16ebb793c2d7acf7698f4ad753ab518ccd805cf50c6bdc7c557c20f13e360137140cf10823948a0366035fca9b78a978fd0ca90ed5bebca8b72a7814 SHA512 c403931112f812d31243145cac941dbec65a1253063e152fdb8c0255bfe37fefaadea4cf5bf145cd18d3f5f3fe916a1d7ce82ca1c396e528eab32ae24b74d1e6
-DIST github.com-hashicorp-go-rootcerts-v1.0.1.tar.gz 11786 BLAKE2B a84d637ba320f503dafe0f546addb3dde7e65dc7c12caf25b2a96969e4c328b88eaa3dafda9a44bd34e91d285d91c552ae70f4a7f3aa5060d958f7e17bf98327 SHA512 da55cbe3a9ace70a7e2ccb2d10dead996e6ecca1fc5a533b8609c5b14589742947254a98acfac8711860cdad98be88afc4afe0615b722361b09f21f86ffe5dc1
-DIST github.com-hashicorp-go-sockaddr-v1.0.2.tar.gz 663049 BLAKE2B b898d7563b426498e3d4e589cfcadae21d6931a82b7d34efe9d80f6ccc64def45e88a0532f11bae4c83b341f23394c351b39d3a83acca2687c5ff3f73f67de31 SHA512 9a9ab17b598be33513f3baa1d456e5e223a6857fc86f9d2104823395b1b344bbf6b27dde45b87fdfb038e36aa368b188177b28ab4abdc50c29e4b1c1f71d7b87
-DIST github.com-hashicorp-go-syslog-v1.0.0.tar.gz 4517 BLAKE2B cab2b9569356395d07b58de464639048654c4acb48f44bc6d125ff08801e666adcc07b8b47293200eab5ea54490a86c315aff6ebae4a4001218c6582919aede8 SHA512 8ce3188cf62a6c168a5620168e5ae89eea1dc374c1242acde74d69944eb1de6fc6155bfa5945ee52edae816682f65926b53808219ab3cccd6b2ba1f1b8707fbc
-DIST github.com-hashicorp-golang-lru-v0.5.3.tar.gz 13348 BLAKE2B 598db380ae34bfc568d5a048e991e9bdd6d486800caa4c7d27ea96877f47e5fa5448b3bc30aa9d800a41755f9a17189c36ec738b8e7c00a51f2a80db3c270a1e SHA512 8775349e1c9df60a57a425f506ff53a1849aa4877a878583b59bc53f3e746f5b6c482ded9bed9182c68e1d12c5acc4bacebe7a6d41440234d4b40361bddb805d
-DIST github.com-hashicorp-hcl-v1.0.0.tar.gz 70658 BLAKE2B f28dbe8171ce4fa94f57e8bfa8ffe7e16e57147a6a4525a8b5d31d3a47e817e056a85bdb8b91d56be202db27a29f37496f73014d1d97c5d55ce07b89f7ff6848 SHA512 044e3ba2a44a1abd9c851d4ec1f5c541663f8cd7f705c46c6ae2c377fae6df6315a6596c42f391e8239b61f0f0f6caed8d4156f8875cbddfbc7bcb78eaeb466f
-DIST github.com-hashicorp-logutils-v1.0.0.tar.gz 7753 BLAKE2B ce8516f7f34790b36630dbb40ecfdd79d6e582b19ad95f1258ae5c8f519cf03c29f9cc4a0a9b90c2146f9aacfda8e89a19969646512c1db4a684dfba0ed9a033 SHA512 079a279f92977dad2a0bd7aaa41983478e7d159a405108cbfd64a36f66949ce20b73b7cc321ab15f116c82f72467ea051be9038efd26a1bff96da081b9896ed3
-DIST github.com-hashicorp-memberlist-v0.1.4.tar.gz 86880 BLAKE2B 99e7de2439f16df6ffdc6c0a23be8199929c5a3719b5339351a66bc9a68849540a6cefd20bd7155275acf5454254ebb3cd76bf83aabb602ffd6a5515863a8677 SHA512 948f8a80fffb503428006e97f80ef18836140f5beac525254da508acbc04c4875d1e5389c881b01d0c6d2ad28be4ed9a9d5badda0ed805a568335e12a7572be5
-DIST github.com-hashicorp-serf-v0.8.3.tar.gz 1970313 BLAKE2B 80ac6693e40ce7fbef5b14ad078d11d3b4d449c5d1057a4d25486b62f9d03630d69c95b5e0b863634d4d3774867a2cb0305951efe99487da0d4e26fca7fcf726 SHA512 1ffcc9f34d2a79c2112e394292b587680fced0cc0cd81b8ab40bb82059e0fd3155679f945c1af475efcb20cc2427d0da625d859fecf79fdf54b9d31b0f358502
-DIST github.com-hashicorp-vault-746c0b111519166ff2126f55dba7071912c33006.tar.gz 27595435 BLAKE2B 0ad4543ba99d309d615bf57a8cfd93d8810fdd65f31a89106eb56d6cf6b5ef154476e191d150ca42c51e13d87aadcd15c8e4aa831546b49d271fff893bdec4f8 SHA512 088777c45f8eadd2c4b78617490a4dc20a849d3b9644ec755340562695bb99e3250df056f6b91f104ce83be40a14dfaebdd29efb695a0d713646e8da94850362
-DIST github.com-mattn-go-shellwords-v1.0.5.tar.gz 4261 BLAKE2B c4ba9bc37d550ffe1e8a4447928aa4dbb652c2b8478eb4a9485e5f018896bf0a1ceb8cc02322a33553b81c2a64ef05dab5cd7a3acd973b4ed9691c5751eef688 SHA512 3b6607f35d7d617a2ba913f8d697b82e0ea867410572a29373ed09fe1b1e1e84509003476de39292e498601571cc1f78c3981ce14b04babad84bc85c6d9ad670
-DIST github.com-miekg-dns-v1.1.15.tar.gz 1692734 BLAKE2B 3b657b7432ec4cf9b4a89860bcd7a0bbfad151603a3612edc2cad5aad45ecb1b9934a1b405311bacce69503a946e0912530ef13f216ba65f5a6c5d8ad1a2737d SHA512 ced9d3e594fd48d727e0a44204bf6c6b3575392e364132a15a3d61b862ea66b311357f720bd547c605512eea1cbca98df01a598e36017862ee09ab04929722d5
-DIST github.com-mitchellh-go-homedir-v1.1.0.tar.gz 3362 BLAKE2B b3388de9230439ec591042f6a319a80216c0bd7ef055f4bee42bd9020ce8104afb1d10b6105cd2a6f431f066f78af1286537236c054c3bfe15c7ee9b10e1935f SHA512 19f3341d9b343d46a215da3d9aba8e218cd4a5e22a33bb26ee296ab3764e9ab7befa7b65f05bf7e9af8b28be1f078e7da691b68c0a7b1e0c8d853de3ba53d643
-DIST github.com-mitchellh-hashstructure-v1.0.0.tar.gz 6507 BLAKE2B ae7f4e449f2f01adabc0163dde5b403d5fd4e18d247aa9296f4b65fdd6b0f05240b05b25cef3a1389430d63ac8bbfcbccf4c3af300a61ba0494e312d5e282a52 SHA512 a2b0688cb9e352c3ade1a928ad6c3bb9feeb066703af4b125789f045537677898544b97610272edab1476894c261c558ba6ca95e32a894f5471dfb055cf88265
-DIST github.com-mitchellh-mapstructure-v1.1.2.tar.gz 20980 BLAKE2B 6792e875503b852773e8f062808f7bfa5a7e77ab4ec9012865750a5e15a13a6338490e7dd865545b8055c043a9f016cdabe6fc71c031a1210eb3a5e0c28a3394 SHA512 86c9fb9494652dd391b67185aae44b9cb14fcf96ba9ff62ed95c8952b01f6485154102e5883d16c6007d18a02bbf34e5937e2842df72c0244d48b22ee6aa9fe3
-DIST github.com-pierrec-lz4-v2.2.5.tar.gz 20499382 BLAKE2B 88f2958f165cfb09a378466d05835e6d684671349c206434bf58ad57a01dd4204270210ec369abbcc5015a385f0e47424ea19fe0104769aff0b16f9f9def8506 SHA512 c32f85fbcb71e41cb4dc60eaf29987b177919ab40deaef30f2d21da521112b1c80bd23073451a4d1ce455e547efc961ed4d1106e12d97890f303580647cf467b
-DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
-DIST github.com-ryanuber-go-glob-v1.0.0.tar.gz 2969 BLAKE2B 152f01873947fd0e17928b7ef86b826bdb66f1d2e6a4139b6963a5ce2133567816488d7dd240221b15adf56713094bcd11b155ac29faae04590b31f0d566c1df SHA512 fca7548194624dda5d7b5317a29c3a1a6bee44ecb3b62772943dca8afb5e665c9c3c72c740a91a7052fdddc50c60fe23917199cb67d79cdbb8b499f13a34f768
-DIST github.com-square-go-jose-v2.3.1.tar.gz 299480 BLAKE2B 861aa2e72c5e12013aab1e7fb81ef45b1f4be63a854c49dbdb2e537e9dc63f0a0478373e20ab437560fe245bd71172434fe19da42ee571bc0b48fb540fb31e12 SHA512 cc634dc543674016db6b52cba8235885ed3236f360e42992b55471b07dc20762c490edff7276d84109d1d46a9c052fb8fb62cfa002e91b1cbe43f00ff152727e
-DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896
 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-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
@@ -237,11 +210,15 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.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-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.zip 1606010 BLAKE2B 00054dbd545a215c58b77b03cb891154dac1218f7ba33ae70b04dc99c87dca4314b89ae76cbd285808efff2d2261da3c6f48112888f079179206b4487d7c7104 SHA512 54fb9f36f69e468fe0b4cfcdfec3b12c4bc2d3424143cf9b47088c5b5c7e70aeab1c408000f4015cf5369ff0bb7f1f8df9415cd082e0035dc7c80cc8c38d7b46
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190730183949-1393eb018365.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190730183949-1393eb018365.zip 1817725 BLAKE2B 6fff6d2cc21f1f561367153980b446ed8f0ac67a4bb437994d2739d785f3da9e90a567e61974bef80fd1c4e250c14fd13bc2a227027ebdb6c3161d3b72421ca5 SHA512 775f9c5f7504501f0dd8648a32a1f5e3dd9e5c9617a68b4c9170d8dcba25efc6ad21d3805a1d772e0b15c052308828f5fe38b2d9dc7c1e37b7847022f4cb3fed
+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-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%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.20181227161524-e6919f6577db.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
@@ -264,15 +241,15 @@ DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff6
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.mod 28 BLAKE2B 0fbbe5d1e239fce8fc245a0a54a09a57ba1a669a6ed93aabefe8fd333549b3309ad9e6eb15cff2f0a853d3830e6b5cd60961835b14e2dd13aad5812cca6ee04c SHA512 00151108bdaa29a2097ab78c99c93bf0ec27af203696a11bc7ba55e36d7115ad13279110c245bd3a2cc84b63bb2a8840964e3b2e1334a0d085ac1e8ec5239bad
 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%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip 343284 BLAKE2B a4f4f886636b920a987942524f504c0049ca3c9d9ca5be16101109235e77e9a8a14106fee9fb2d02d403a056dcf5f42b0a4e4f57d33dbc78a88e0df5682162f8 SHA512 0b212e847ef8972bbc9dc96685c9fafcef5552e96c622134cb1aac903aa3f6f5a1aa65a2f179e93396fcf32ea4139a34f46c4e6fb3558c9da8579282095d1baa
 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.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-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
-EBUILD consul-template-0.23.0.ebuild 3306 BLAKE2B deb62933b47ba59e47d3ef8c329621e84aed26668edb872e2972862caa9f950882b7d1512224457eccd1a92bc11d212eb16511e817ebd1ecf87d80d1f949ee1f SHA512 1fb3133715911a5d41b7b0088b12d5d41c0f7331613c8902a06a0c9c7e02f4d54ded9c1477ffb5ff0e81755cafe2c04c833f58179329be4db5284fbbcc0b6d1b
-EBUILD consul-template-0.24.0.ebuild 3306 BLAKE2B 532da4c3bd7a22d3fbadafb91c983c300602641ed751498e44ea1b21e6e931d9434d0b571128f18c2d636c1ad7265abf429553b8beed68eb8903850032786d03 SHA512 f8ea687c558eb084f834f83d7b3c251468ae92b6a8983b4c540738b265a1edacac26f1eb8389d0afc888853e27e3b1527c11ef0ec95703cddb802fb850028b07
-EBUILD consul-template-0.24.1.ebuild 13104 BLAKE2B d2874897420e3e8462c091870855390eff4d45e6c0b4491f00fb7e1d584a484ade39b6ae7eed85ead4be5840dcd89f2e4217f61a0967c66ff08a7e4b5838d39c SHA512 f573dcbbc8f8cdfa57d44e9df8989f273ecd3f47866967107eeff1657b67dfef4e95d5604a2ea954ec375b944b9044cfce46f3146b0b35636a835046d0e2284d
+EBUILD consul-template-0.25.0.ebuild 14026 BLAKE2B 2b71defb24c9727689c69f4e560b7d65938c40dd2a8e94b7dfd4b44dac268b8581e39c527710e8c60d684f73209aaab5d8dbb726df434ccdfc7e185fe61879bc SHA512 508c9f73c8ee542fca200126b32e2ddf092bbd57764440b3ce7a68bf4f273ca912f18337fc14844229a2366b71e7f216114f91490dae6a86f789b6eb4d9f6083
 MISC metadata.xml 316 BLAKE2B 857b3a0a26e35ac2f52f797b85a42f91c74a10b4d8d6a1f5394465e68f6ad57bd732286650966f99cc516ec68d00f31f0f880931e2041cb596d50e521ac3a599 SHA512 e66cfdeeab0bec39ed4149454fd1876ce963f7bd0012fc659abf92aefbad4e5fba90c9fe84019273d5f837f6bdf438146b433d9ea00cfe1cf4356e112522f1ad
diff --git a/app-admin/consul-template/consul-template-0.23.0.ebuild b/app-admin/consul-template/consul-template-0.23.0.ebuild
deleted file mode 100644
index b3ef61e527e5..000000000000
--- a/app-admin/consul-template/consul-template-0.23.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_VENDOR=(
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/armon/go-metrics ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5"
-	"github.com/frankban/quicktest v1.4.0"
-	"github.com/golang/snappy v0.0.1"
-	"github.com/google/btree v1.0.0"
-	"github.com/hashicorp/consul v1.2.0"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/go-cleanhttp v0.5.1"
-	"github.com/hashicorp/go-gatedio v0.5.0"
-	"github.com/hashicorp/go-hclog v0.9.2"
-	"github.com/hashicorp/go-immutable-radix v1.1.0"
-	"github.com/hashicorp/go-msgpack v0.5.5"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-retryablehttp v0.6.2"
-	"github.com/hashicorp/go-rootcerts v1.0.1"
-	"github.com/hashicorp/go-sockaddr v1.0.2"
-	"github.com/hashicorp/go-syslog v1.0.0"
-	"github.com/hashicorp/golang-lru v0.5.3"
-	"github.com/hashicorp/hcl v1.0.0"
-	"github.com/hashicorp/logutils v1.0.0"
-	"github.com/hashicorp/memberlist v0.1.4"
-	"github.com/hashicorp/serf v0.8.3"
-	"github.com/hashicorp/vault 746c0b111519166ff2126f55dba7071912c33006"
-	"github.com/mattn/go-shellwords v1.0.5"
-	"github.com/miekg/dns v1.1.15"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/hashstructure v1.0.0"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/pierrec/lz4 v2.2.5"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/ryanuber/go-glob v1.0.0"
-	"github.com/stretchr/testify v1.3.0"
-	"golang.org/x/crypto 4def268fd1a49955bfb3dda92fe3db4f924f2285 github.com/golang/crypto"
-	"golang.org/x/net ca1201d0de80cfde86cb01aea620983605dfe99b github.com/golang/net"
-	"golang.org/x/sys 1393eb0183657fb29200106b17a5042ec6e48dbe github.com/golang/sys"
-	"golang.org/x/text v0.3.2 github.com/golang/text"
-	"golang.org/x/time c4c64cad1fd0a1a8dab2523e04e61d35308e131e github.com/golang/time"
-	"gopkg.in/check.v1 788fd78401277ebd861206a03c884797c6ec5541 github.com/go-check/check"
-	"gopkg.in/square/go-jose.v2 v2.3.1 github.com/square/go-jose"
-	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
-)
-
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="Generic template rendering and notifications with Consul"
-GIT_COMMIT="521adf1"
-EGO_PN="github.com/hashicorp/${PN}"
-HOMEPAGE="https://github.com/hashicorp/consul-template"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
-SLOT="0"
-# TODO: debug test failures
-RESTRICT="test"
-
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e "s:git rev-parse --short HEAD:echo ${GIT_COMMIT}:" \
-		-e '/-s \\/d' \
-		-i Makefile || die
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	export GO111MODULE=on GOFLAGS="-mod=vendor -v -x" GOBIN="${WORKDIR}/${P}/bin"
-	emake dev
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin "${GOBIN}/${PN}"
-	dodoc {CHANGELOG.md,README.md}
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-}
diff --git a/app-admin/consul-template/consul-template-0.24.0.ebuild b/app-admin/consul-template/consul-template-0.24.0.ebuild
deleted file mode 100644
index bf93081bbff2..000000000000
--- a/app-admin/consul-template/consul-template-0.24.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_VENDOR=(
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/armon/go-metrics ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5"
-	"github.com/frankban/quicktest v1.4.0"
-	"github.com/golang/snappy v0.0.1"
-	"github.com/google/btree v1.0.0"
-	"github.com/hashicorp/consul v1.2.0"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/go-cleanhttp v0.5.1"
-	"github.com/hashicorp/go-gatedio v0.5.0"
-	"github.com/hashicorp/go-hclog v0.9.2"
-	"github.com/hashicorp/go-immutable-radix v1.1.0"
-	"github.com/hashicorp/go-msgpack v0.5.5"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-retryablehttp v0.6.2"
-	"github.com/hashicorp/go-rootcerts v1.0.1"
-	"github.com/hashicorp/go-sockaddr v1.0.2"
-	"github.com/hashicorp/go-syslog v1.0.0"
-	"github.com/hashicorp/golang-lru v0.5.3"
-	"github.com/hashicorp/hcl v1.0.0"
-	"github.com/hashicorp/logutils v1.0.0"
-	"github.com/hashicorp/memberlist v0.1.4"
-	"github.com/hashicorp/serf v0.8.3"
-	"github.com/hashicorp/vault 746c0b111519166ff2126f55dba7071912c33006"
-	"github.com/mattn/go-shellwords v1.0.5"
-	"github.com/miekg/dns v1.1.15"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/hashstructure v1.0.0"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/pierrec/lz4 v2.2.5"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/ryanuber/go-glob v1.0.0"
-	"github.com/stretchr/testify v1.3.0"
-	"golang.org/x/crypto 4def268fd1a49955bfb3dda92fe3db4f924f2285 github.com/golang/crypto"
-	"golang.org/x/net ca1201d0de80cfde86cb01aea620983605dfe99b github.com/golang/net"
-	"golang.org/x/sys 1393eb0183657fb29200106b17a5042ec6e48dbe github.com/golang/sys"
-	"golang.org/x/text v0.3.2 github.com/golang/text"
-	"golang.org/x/time c4c64cad1fd0a1a8dab2523e04e61d35308e131e github.com/golang/time"
-	"gopkg.in/check.v1 788fd78401277ebd861206a03c884797c6ec5541 github.com/go-check/check"
-	"gopkg.in/square/go-jose.v2 v2.3.1 github.com/square/go-jose"
-	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
-)
-
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="Generic template rendering and notifications with Consul"
-GIT_COMMIT="521adf1"
-EGO_PN="github.com/hashicorp/${PN}"
-HOMEPAGE="https://github.com/hashicorp/consul-template"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
-SLOT="0"
-# TODO: debug test failures
-RESTRICT="test"
-
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e "s:git rev-parse --short HEAD:echo ${GIT_COMMIT}:" \
-		-e '/-s \\/d' \
-		-i Makefile || die
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	export GO111MODULE=on GOFLAGS="-mod=vendor -v -x" GOBIN="${WORKDIR}/${P}/bin"
-	emake dev
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin "${GOBIN}/${PN}"
-	dodoc {CHANGELOG.md,README.md}
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-}
diff --git a/app-admin/consul-template/consul-template-0.24.1.ebuild b/app-admin/consul-template/consul-template-0.25.0.ebuild
index d3cccc9d7ba1..1923fc309217 100644
--- a/app-admin/consul-template/consul-template-0.24.1.ebuild
+++ b/app-admin/consul-template/consul-template-0.25.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-inherit go-module systemd user
-GIT_COMMIT=58aa6c60
+inherit go-module systemd
 
 DESCRIPTION="Generic template rendering and notifications with Consul"
 HOMEPAGE="https://github.com/hashicorp/consul-template"
@@ -30,6 +29,8 @@ EGO_SUM=(
 	"github.com/davecgh/go-spew v1.1.1"
 	"github.com/davecgh/go-spew v1.1.1/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/frankban/quicktest v1.4.0"
 	"github.com/frankban/quicktest v1.4.0/go.mod"
@@ -48,10 +49,10 @@ EGO_SUM=(
 	"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/hashicorp/consul/api v1.2.0"
-	"github.com/hashicorp/consul/api v1.2.0/go.mod"
-	"github.com/hashicorp/consul/sdk v0.2.0"
-	"github.com/hashicorp/consul/sdk v0.2.0/go.mod"
+	"github.com/hashicorp/consul/api v1.4.0"
+	"github.com/hashicorp/consul/api v1.4.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.4.0"
+	"github.com/hashicorp/consul/sdk v0.4.0/go.mod"
 	"github.com/hashicorp/errwrap v1.0.0"
 	"github.com/hashicorp/errwrap v1.0.0/go.mod"
 	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
@@ -61,6 +62,8 @@ EGO_SUM=(
 	"github.com/hashicorp/go-gatedio v0.5.0/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.12.0"
+	"github.com/hashicorp/go-hclog v0.12.0/go.mod"
 	"github.com/hashicorp/go-immutable-radix v1.0.0"
 	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
 	"github.com/hashicorp/go-immutable-radix v1.1.0"
@@ -74,9 +77,10 @@ EGO_SUM=(
 	"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.0/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/go.mod"
 	"github.com/hashicorp/go-sockaddr v1.0.2"
 	"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
@@ -111,11 +115,20 @@ EGO_SUM=(
 	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
 	"github.com/kr/pretty v0.1.0"
 	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0"
+	"github.com/kr/pretty v0.2.0/go.mod"
 	"github.com/kr/pty v1.1.1/go.mod"
 	"github.com/kr/text v0.1.0"
 	"github.com/kr/text v0.1.0/go.mod"
 	"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/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-shellwords v1.0.5"
 	"github.com/mattn/go-shellwords v1.0.5/go.mod"
 	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
@@ -125,7 +138,6 @@ EGO_SUM=(
 	"github.com/miekg/dns v1.1.15/go.mod"
 	"github.com/mitchellh/cli v1.0.0/go.mod"
 	"github.com/mitchellh/copystructure v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
 	"github.com/mitchellh/go-homedir v1.1.0"
 	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
 	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
@@ -167,6 +179,8 @@ EGO_SUM=(
 	"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/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
 	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
 	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
@@ -202,11 +216,15 @@ EGO_SUM=(
 	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/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"
 	"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-20190730183949-1393eb018365"
-	"golang.org/x/sys v0.0.0-20190730183949-1393eb018365/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-20200124204421-9fbb57f87de9/go.mod"
 	"golang.org/x/text v0.3.0"
 	"golang.org/x/text v0.3.0/go.mod"
 	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db"
@@ -229,12 +247,14 @@ EGO_SUM=(
 	"google.golang.org/grpc v1.22.0/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"
-	"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/square/go-jose.v2 v2.3.1"
 	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
 	"gopkg.in/yaml.v2 v2.2.2"
 	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
 	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
 	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
 	)
@@ -246,19 +266,22 @@ LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
+COMMON_DEPEND="
+	acct-group/consul-template
+	acct-user/consul-template"
+
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
 # TODO: debug test failures
 RESTRICT="test"
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
 src_prepare() {
 	default
-	# Avoid the need to have a git checkout
-	sed -e "s:git rev-parse --short HEAD:echo ${GIT_COMMIT}:" \
+	# remove -s and -w from the linker flags
+	sed \
 		-e '/-s \\/d' \
+		-e '/-w \\/d' \
 		-i Makefile || die
 }
 
@@ -272,16 +295,16 @@ src_test() {
 
 src_install() {
 	dobin bin/${PN}
-	dodoc {CHANGELOG.md,README.md}
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
+	dodoc CHANGELOG.md README.md
 
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 	systemd_dounit "${FILESDIR}/${PN}.service"
 
 	keepdir /etc/${PN}.d
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
 }
diff --git a/app-admin/denyhosts/Manifest b/app-admin/denyhosts/Manifest
index a1a2534792e5..51b4ac22355b 100644
--- a/app-admin/denyhosts/Manifest
+++ b/app-admin/denyhosts/Manifest
@@ -6,6 +6,6 @@ AUX denyhosts.service 265 BLAKE2B 4ecccdf6f605936ffb7339c2ec2510f14b0817cf3ed3cf
 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 1772 BLAKE2B 6ff2b05f82fa8994b97b6971113c9b71b009499cc52ab8eb0a3b035cd84ca662a36d4efce59b25462ad25176e1d0a4295a9041af3ee6f84fb8c02cbd87509985 SHA512 604dd60801f9eb800fcba6062fa28ed8086152e30a12426fb4884179d7c06bb486182b6df86f66deaa603281b1ac10961c0e6cf25067d5dd5c2cfee29ac3b3f5
+EBUILD denyhosts-3.0-r1.ebuild 1762 BLAKE2B 419fdb0a943cd4e6bacb78675cef19ccd6d73709b0a980c8547a01b9d1cc8077992db61553ec46b270e637659f0ffe53509865edb5ff5f3fdb65d3b97ce4b0fc SHA512 b63ffa7964dc8c1b3d659803f2038005aa098a7b62a3022d6aba7fd7716cc271cc2df7424137be0085def3be663b43bf2d1f71b1520be6cd61db14772880b93e
 EBUILD denyhosts-3.0.ebuild 1672 BLAKE2B ffce8305ca9db71a456c8163a7bb1fdfcf7187b4433988c93e01f94407dcc0edf577b8d187ad017ff4e357e56d907aa4d34cd4f4d8b292365d46ea2a079be6aa SHA512 660bca4d0ca9fd4eea074cdfde7629d06cb4c6c48f3b0cf9674d6ad62ac931cf51624b67e52862b6b284157643f634495bbce7c6b927bc1b80274ed497a9aad0
 MISC metadata.xml 402 BLAKE2B df1bce989ad8c249f83b5ef00681d455ca645b9160456b615c5a18c1d564d3dff8f6021ed95b9c7ff0d5e6939fe2a99735b4ed16ea8360f021000377f981503b SHA512 0a232a4ee999ce021244cc19ad62e68c962fcfb1cbfda1aef306e6b3376e3944f233cff133c746aedc3f68c60a61511b0a749b434515b705f63d68a034951ed7
diff --git a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
index 34e74b4e4cdd..287529f92f3a 100644
--- a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
+++ b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 eutils readme.gentoo-r1 systemd
 
diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index e9644d84fb19..8ed0f00bfbed 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -2,5 +2,5 @@ AUX diamond-4.0-psutil.patch 1842 BLAKE2B 21774c34c5557c84b5ae217acfe468b7d55a4e
 AUX diamond.confd 57 BLAKE2B 8a5e3f478d3eb948e262239a9a83026e067ed67f2a4878075c8ddb7d8d356a2482da0642e673b8b3f658de6c6f30a30c830bc68af3fe2d750b998dc896525942 SHA512 51b037902394b22f957a15ad1479ebdae5ac29384f2b7a5053ea8200bad05dc9c9060cc5c6c1a931e341e99b95327e55b06aaa9a828950533265f9c96a8dff55
 AUX diamond.initd 447 BLAKE2B 76354f66282325005f193d4ad51f3deb0358604a681cfe54a596037608bd794c3fd68a78a03659295ce2021b70809edc01340f5ee39348e35275cae0b00a5042 SHA512 004b305ba945fa313da4cd51226050cec955886405026baacb15f7ab586b7ba650492b0e2cd9621b3854ec83ee6192a7b86ad4fd8239008df3c6c8bb5c8c84f3
 DIST python-diamond-4.0.515.20170311.tar.gz 671963 BLAKE2B 9449f2d27b48c0e24727eb2c415a5095b20199d9315ef69df92a4aa6f8f3397743f3dc6cf2d8d91f79eca309926731b6b42da170a02987a20aeccd1e0980f4ac SHA512 d18a80540018975455b839a78fd55d13d167726b92914e3dc2de1c6f27f47319962361e05961c55047ba185e11ebf57831f3ab5cff9158a50d30a2ca635d53bd
-EBUILD diamond-4.0.515.20170311.ebuild 2930 BLAKE2B 3a8275290d4e029ea67321ccbab6f2aa1473284d842cfe1502958eef2fbce828416140dc9ea00737ebf11b36c57e24af2732932c45484a29c382e3deccdf8ea9 SHA512 b7fa0bacb2951377905f84cc8cfa394e80e9a6ef6ca7b5f67d07c2d0d0f00274cce3b086d9328ec92334e84c06ebb0f114e05cac8d8dae63ee2ce7a549d59cab
+EBUILD diamond-4.0.515.20170311.ebuild 2930 BLAKE2B 367260bba34e5ce64c5b1070ad2daa3c9a21fa76286a4d62b7452475f7f899f3b41efd101187439767ee9782c9b679a3263141a07681ed4c857b589204623a8e SHA512 07e79c270f6c987dda3d2bb4e98ad848b46b43964118fdb6878a278f0ca6bf43a21b965ad59f2032004a16bfcca1da7f23ebf91354f552915d4565e6f4989e3b
 MISC metadata.xml 802 BLAKE2B d013e1b87c2f1d5f0f628766ed754a4ac50e9c9e710b7b2542081cd06988f7f577513a53165c54ff4d1d1de3bba92ec2089eaa15d16cbe946f7489d0345aeaaa SHA512 c455baa068661000d395e15f6952b3106cb3633f1a95395745c6a0d7cc5dbfb193d018af1341f27b250226bdc109e961bda4a612115d5805958f8e500108239a
diff --git a/app-admin/diamond/diamond-4.0.515.20170311.ebuild b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
index 6cb19661490f..80dbc4734ecc 100644
--- a/app-admin/diamond/diamond-4.0.515.20170311.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
@@ -10,11 +10,11 @@ if [[ ${PV} = 9999* ]]; then
 else
 	GHASH=73207d04e0739a4ce92bc201b36681c42d9fa7e7  # python3 branch
 	SRC_URI="https://github.com/python-diamond/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${GHASH}
 fi
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 prefix
 
@@ -29,7 +29,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="dev-python/configobj
 	dev-python/setproctitle
 	mongo? ( dev-python/pymongo )
-	mysql? ( dev-python/mysql-python )
+	mysql? ( dev-python/mysqlclient )
 	snmp? ( dev-python/pysnmp )
 	redis? ( dev-python/redis-py )
 	!kernel_linux? ( >=dev-python/psutil-3 )"
diff --git a/app-admin/ec2-ami-tools/Manifest b/app-admin/ec2-ami-tools/Manifest
index 5e132c477563..9430939d0544 100644
--- a/app-admin/ec2-ami-tools/Manifest
+++ b/app-admin/ec2-ami-tools/Manifest
@@ -1,3 +1,3 @@
 DIST ec2-ami-tools-1.5.7.zip 156611 BLAKE2B f3e4c05a1f25e1d47a6981981b92db551953028f0621e3f175e3ab5db8823d72f56d2145376c52dc6d134ec2a167c14d64997e969785991589f9c97b93277f78 SHA512 2754ded47cbe842f58e12207c4bb7f81c8cd366dc506cbadfa9bda74d91fd5f8e1cafbb117612b14833368ff5943c4943a072d1679f23f591c15f2f49b61b4c2
-EBUILD ec2-ami-tools-1.5.7.ebuild 1128 BLAKE2B f5d009ec1a67703ac2d93b25bd476c22bb47160531553184a936885c1d91f1608f180fe093f5ea9d61796094b14657f14c0226e52dcc41e6c3f6aa1d87f7b385 SHA512 777d350d9a0d17ec8b2acdbe37ec4b6a71a7801f54dad99c408c8b2bf199bcabb67f62067f562b6c9f5bf3f6d06269cf983667ef8ef7d14b1af6278b5204ef48
+EBUILD ec2-ami-tools-1.5.7.ebuild 1128 BLAKE2B 0235a4bdde2cc30762e9f92689fe8d57d03a30b1b72c75a6e906dac0cfa0e2b1d65dfd0e2e4ab958f7d49ff083d8ab30e298b3c34d0a55d8c18e34ffceb541c0 SHA512 1b8e74ac8d228bfbfec7141501a299083c728fbb508e99d980b032405fda0c64d708b626bed77049a9593cfdcf15234c38ac9a8c2a3f4d91ae06428aecd72de0
 MISC metadata.xml 299 BLAKE2B 3fb7a374afb6ce5b06c3272f2cb25ef4f05614ed59835b4d28b8e9f97a8027a349779215c26c6bccc1d26ef0413d9b662eddb9ba1e0b7dc6085818994fa72ac6 SHA512 32d0280896d9452574a1ca6ef923aee59cf559e2b9023a4b6986c735bc327df57eb2c73183f5cb660a991e2f41268f0477b24a7e68a81d283fd68c1d2a6ff6a8
diff --git a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild
index 75de729d04c1..6d52ba74c16f 100644
--- a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild
+++ b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit ruby-single versionator
 
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index f4d838a5f4af..216693c16bb6 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,6 @@
 DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
 DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
-EBUILD eselect-1.4.15.ebuild 1605 BLAKE2B 4abc736704dd5237194c88ce47c50c019cffb05c83af055c7ca045d228fb3513357d687129b55c96785c02abe3e72970087ef6a16db717cfd82a1b1332840786 SHA512 ad7c648eb24462107183a8fa97add664e56eb412ffb008995fc791d4442bf90b15cdb13a08cfdd8c53c636ec82364a7447914634893fb6147d7acbda5b15416f
-EBUILD eselect-1.4.16.ebuild 1605 BLAKE2B ff3156d5c50a9a436b49e89dadc6391d7b9967444e13135bb31c0a81ca19705bd2d629f2ca9330d62ae98c67ac0bc76f3be09b1ce79fcd46175ca32a307c4882 SHA512 0fc8bb596f3bfda6193757a8ad83332bc65d88dadd03048a9cef847738421060daffb3395d39dd90c2d1123e7a23e9f4519df3b0ea65b9844e48c4b46a90d3d1
-EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
+EBUILD eselect-1.4.15.ebuild 1579 BLAKE2B 1cfc3648f6725ef91c4eb5144451088987a5d4e39ea65d56d83f6bfb202ba1e6b5f78e0ca5130196b96b9860296420194a5027f72bf02ca49bb0fa09d1d1e107 SHA512 fdc708d34cab0d77e5661c641f58e3d0994fb65dea43caacc1f0992e1d30e246810f6c97d53a545d9143f66e80a1027a81c4f2d2328f855cc31caf1a40b5909a
+EBUILD eselect-1.4.16.ebuild 1579 BLAKE2B 30c0f10f18b2e18609fe55b090a9b3d76e72fa5e5b29faa87c83995630a3beef8f69f687996a5fbb3ebefd89cf34b8c167169173082e4df8955c47e6e7ef2daf SHA512 9b7c26d5e1bca87f058b0ab2e115eee42caf42659a37356c5fe5e8e6e20e0cb2c79b08f35c80638aa2c1486bce79f053118604eb11bb5e8e38c918daa4ef1cc0
+EBUILD eselect-9999.ebuild 1408 BLAKE2B 428612d4adcac6611b23df171bdf8b7ac578e3ad36f968de94fb978b2df8d8af9d8e487d78d8f6cd41823c68e495caa834fbf309607b5689b85784dc9cd39895 SHA512 3ace7d1f05535b475b2401f37b2e1c74a3fa60d2ce92931169e3da32df31c063ba8bbc0c8431b1b1dca55b9f56fb73c1fb8a2045d7de410084eada71fa68c062
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.15.ebuild b/app-admin/eselect/eselect-1.4.15.ebuild
index 01dc829cefd3..3d5786a4bf1a 100644
--- a/app-admin/eselect/eselect-1.4.15.ebuild
+++ b/app-admin/eselect/eselect-1.4.15.ebuild
@@ -17,7 +17,6 @@ IUSE="doc emacs vim-syntax"
 RDEPEND="sys-apps/sed
 	|| (
 		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
 		app-misc/realpath
 	)"
 DEPEND="${RDEPEND}
diff --git a/app-admin/eselect/eselect-1.4.16.ebuild b/app-admin/eselect/eselect-1.4.16.ebuild
index 4b76c3faac2c..777283e95fdc 100644
--- a/app-admin/eselect/eselect-1.4.16.ebuild
+++ b/app-admin/eselect/eselect-1.4.16.ebuild
@@ -17,7 +17,6 @@ IUSE="doc emacs vim-syntax"
 RDEPEND="sys-apps/sed
 	|| (
 		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
 		app-misc/realpath
 	)"
 DEPEND="${RDEPEND}
diff --git a/app-admin/eselect/eselect-9999.ebuild b/app-admin/eselect/eselect-9999.ebuild
index 238cf0896ada..6710d08068a8 100644
--- a/app-admin/eselect/eselect-9999.ebuild
+++ b/app-admin/eselect/eselect-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,6 @@ IUSE="doc emacs vim-syntax"
 RDEPEND="sys-apps/sed
 	|| (
 		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
 		app-misc/realpath
 	)"
 DEPEND="${RDEPEND}
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index 60388059270c..3b97bcd8b21d 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -1,3 +1,166 @@
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
+DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
+DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.zip 42823 BLAKE2B cb9b71b7dc0372ee4fed1c9c4c51abbd6cffa907f0eb5dd156475187256e5f8d007e667324edcecb3bbe51badf51c7d46643b89f30613670506c0aa5e76833a6 SHA512 b419a038368e290028a8e10066a95044d1b4aadfc3d33d396c05482f155dec4bd04f5a2277092761fa4433f4e25263a64b31524198dbe669526871ee540070d1
+DIST github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.mod 36 BLAKE2B a276a7a6f741d44088769d7f398dc149179e64f54b3c37a2698f9d6d399af81d3b193e5fc6ffd34f222c9664d3f00ef26f8cab6b319c87b9c0cb327fc499a8a6 SHA512 9f41a508d98b7131e46a5cca2211372985f8bd1ea9bd2327ca46262855593b990f0d76aceae6cc92f30cfd8590d74c77bf99cff870bff88aef422aa20c700d5b
+DIST github.com%2Falecthomas%2Fbinary%2F@v%2Fv0.0.0-20190922233330-fb1b1d9c299c.zip 5309 BLAKE2B 9edc07c07aaee14eaaf052da0084d0414011f087aec821dc8d3c51144fcdb04f39eda9912b243e20f26d00ef09a43df6aadc6bcfb30f75e85d692c3eed484eca SHA512 7e655c05f5f86243fd2ddbbb23b1001b8f3134733a9fc45a3f26ecda5dacf8de0dddd5053b92fe9071b67e7b7c0bede38736540fbbc13282b9c08b5bcec00166
+DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod 35 BLAKE2B 15461787708b56993bf7904db63ae2a711c78fe67157ff2adec29bcdce2f6c29b7ef5d997ed7a0123ab24b0f3069d3833405849924037ca4da8c05032725706a SHA512 49d95d7db5b42c6948c50dcbee20a5ec6b554e78f8ee4beec2303b318d6289a32be807084806bd17ee8e680e58c2693f753614fdb6788f424c9d7496790b20ba
+DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.zip 7610 BLAKE2B 98f86c3092146db7614ab394d67f720bc3a8852576c0ede1f7ff053df2222d8811274d0ba981efa7dc2c8fc3350c360f21ed45f429ecbcfd2a2da8663a209079 SHA512 5df11a2def2b93ec0465fffaeee22cf12802fd63574dccf977a6153aaddbe95c2a3ce20388fa3c3dba0b41d0cafbfa827ab9e6c311cfeb491e5b09aa907cb6cb
+DIST github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
+DIST github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.zip 21256 BLAKE2B 7b97d839138a150071d5c23287761f25dc778ce0be309e740dcc2e80902b15575647295c0b82de0737c5de96a04847c078caac89519ceaeb763ebfb8861946f3 SHA512 cb924d643de6a8f38fdb1b8b512ca17e7df4bd93f397280e89a659f90d4ca937cc33a98bea851371275b6ffaa83220e275fa36a9095631d2784b16f4515d0366
+DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
+DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip 14190 BLAKE2B 068cbd85a43c03d801420e794a87bca8d06aac5650cbd8597eff929bb3634edf85f33342b9b111626f995a340f77c76f60aa436c25654f47b3ed5c87af847c17 SHA512 cba946a17b3237fc696dcf45a7d2ab8e08795aa9a6b6a2dc9bf032cc26b15933d5b2d799a30e6631dbf6b2913c8cbf4f1833c6eedfe45b954a6cc1b6703a1b4a
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip 12266 BLAKE2B 93705895ca63c348ac5397fe8531214f5745a3be6f5760f9d3fbf67fd85b917dab4a2077376251a005bcf07450df1fe0b0114feacc5f92c6facbb2da637beacd SHA512 284116b4f2778ee7981e3aa5583c4e685afd8434e36ca647f0c72c5bb308e87bc3bfae8c83acd259c9da75549339aa382663b7103e4033b2418e314106923c0f
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.2.mod 48 BLAKE2B 6d45c07a9caf59fe567db0a9ee6559e1b6bf9d0cf29319b92dd2fb20de10f60e478b6c90cf9c65c3761c33007c78ecceb6e75990bc118e59ba50e91e74abce81 SHA512 fd3c622c8677770dbd7f6afcea139839603f2d5cb74e3a8413964cf61f0b673f08b510d8b70ff8c17196f14cacf4a78d91622d0d7c410810cefcd26381aea47d
+DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.2.zip 2093 BLAKE2B a9962cf11c8ddb52f5627865a8f4cd19d283ffe70b0113ebcdcbf21ae6bca97be280b3f10393148ab3c78dc6e360c9a6ebfaa52a8506efce2b0b44697800d132 SHA512 73b1bebd953c1a196e4577d703eac245c82985fd30b9b87bba568e05b156f1b1ec97c5d4c30a18aa07fa9d41c8c2c24ffbb61dabd94645fcd28193326b60aa63
+DIST github.com%2Fdoronbehar%2Fgocui%2F@v%2Fv0.4.2.mod 176 BLAKE2B 3c435505d80ca197dbb90ae2b806b2ab89d7f29dd012d454f30a8d4e1aeacc1f7fec04d18f3e5654abf6a635659dce5b2d9e606e428556afec94b2dfc8ea26d9 SHA512 a6cef71bb9131591837ea3bb0f8e46c56cde469a2c0f062481f036c00ce49b13d60b208c6c6c1cc4ab124305b1f62c26baa0336167a40e0a56a0543843cf9600
+DIST github.com%2Fdoronbehar%2Fgocui%2F@v%2Fv0.4.2.zip 46226 BLAKE2B 99ac5c2c5c69f77df602fbf62231f935434325e14b41338842fa487b8f564c115b70d4e2f553d16eee4438c4c35c40842fc54171840433890f1d681dcff84f0f SHA512 52c76c3cd9f1f0853c239bbdf8b372923da79cf92277b811adcc41014c27614385de8d10d2fd55cbf30e23f3d8a0e0a791395ee27efe693bdaea50b27360bece
+DIST github.com%2Fdoronbehar%2Ftermbox-go%2F@v%2Fv0.0.0-20191006141301-8c9470559e05.mod 40 BLAKE2B 2f3acd29af54ff6db117efcbd44997cfeed321dd21c1e4765921b4189f3eff653c585a2d289d0bcf367241826985367a30d33ead7dda1055fb927a2740128f1a SHA512 1f6bcb6beb3bafb41a251b0ecf912e0151d79ad1bcc70ece5a79667df7165f149ba6d57b2317ae8008fde4df098fe265d2601721d12805e50806cc7b7880e7dd
+DIST github.com%2Fdoronbehar%2Ftermbox-go%2F@v%2Fv0.0.0-20191006141301-8c9470559e05.zip 47173 BLAKE2B 3fda57610df0d4910bcbbbafe474c3135a83cacbcc2153289284242c3d11348dbea7075a8c88baf4f3a1bede52e5dd16f758326a7d2932c23af0fe67d59336d9 SHA512 09ecb725872e3195dd3ccf7568daa162d34bad4ec19cd65535a360f5b3222a07b1ed223708f6efd38dc930b4a43469a09c3914b803fd0dcb131becca58ff6fe5
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
+DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
+DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
+DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.mod 250 BLAKE2B 27970513f459c49bf9bccb001157a605c14e5546d6459e3f6e2bb3851cd8fcffefd12fb2f6f918c01a06c6aede2532656d809b80b46ef4dccb838fd40bef7930 SHA512 7fdc52fea1b91ab1c81f426948f7153c0c16cfcf1f79c64a695b62f5195f25468b08c4e1b2358ab834c94efd7b9ab9a2edddf1b00ee22ea5454b46cee19302df
+DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.zip 219885 BLAKE2B 1a8e3a5a8543b871d30c9fec272a50adac9755de8945cfc0ce553e7163e942d6a1ffd22b4e2de6d8e24785d906d86ec2f18afae04d27e3065115ca5436064e85 SHA512 69c17dbdf99d75b54ef71fa2c856a72b24a50cec0a34d8b99ce3bff01d32c6f325bb1e8dd747e3d448ba73fd5af66c1cc1f6042b0b12e292441234e7ed928658
+DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod 39 BLAKE2B 9884f8a07f2a84a159eb17ef62e9b17398b84bdea38fc37591af050dcebc2f56b83f851046c3333e604a7f954b7628c16b267c0c94807f7a41d5d2b797db0918 SHA512 c32a84bb302c9db3f31f714484131ee3ea96fa98b224b9cbf2c5fdd15100a24094e94b55175cf1fb0b6326128c2db8950677d8f6d281b49645b0c7b51b759093
+DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip 93044 BLAKE2B 2c3eb15f4f2792ae60e9712392db623ab2a662e1f2e319da7014c0e94b82452ce141a5c8d7656b02dce44d01cce06a58ac4d8b5bb29ab53a8e3b6d6c65c41582 SHA512 60dd4f9e8b60d72d65c7a35bea054ece6045a32dd033908daec3acbfcef17d6f85b6050c7bff53d49032eb08097e36588911e56622b81d3fb2ed2543187c3478
+DIST github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.mod 35 BLAKE2B 8e6a890bcd1d25cab5f07d335454e2251dfe47b7eb40adb1c8479f93bc2134adaa53f7c594caa5e790c06e634ff9789ea0e438b2382baf416be76b335aeea1a9 SHA512 ab41dcf4805fae3baccc64c61ef13ea3e4dad8e92807ca77bb0a8300968b498d5f2b05a0b1aa3269d38fe37391bed80eb7de5c626b90714a8ba490ee05b67682
+DIST github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.zip 13502 BLAKE2B 8423a01877ac7ebe40452e5e84551dc9e00a818051d5bcd5d0daa84a55939caaf2ecc130749d4664af62845820e429b8313559c6a78d79f83ad3728d17d9669d SHA512 893ecce9d3eff9ad6e845778a5499a5fa1c723afdcc4be16b323773cff61fe216624b1aeae62ef8c731edb68cfcc099a81297b261451496fe133156c6df133cd
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod 151 BLAKE2B 9c1bc32114f742984396777149c3fad997bb47288dfe265614a1d17412ae3946581c2e60ff9ab87e784d71cfbe423b7ed1ea5864b6cd3f81f35e9103c8c08a00 SHA512 431b8d4756fe79e43cdc2f8478f3171ac9c90912222e50503301fc83d34c90001fb6ee0fee3bc05f66e47d657977395769e54efa0fb74ba35f34429cc0dac5c3
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod 151 BLAKE2B 260f1bb3e48b0bf9870ea3b725b13f84d2f18a12c6ca1275afcc2897bef547fcc1e893bd6b1efd46330bc1de66a00e3ef133a4418a50a075302aa3141abed8e5 SHA512 b6d7911148c590b3ce2a14a158cfbb94dd56dd402b3a4a2399adcd0421604f85d904244ddf5f8dba65326f04a7817d5652b30a306c65f44fd248ed269485a21c
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod 151 BLAKE2B efe8a8f8394f082a813ed4983158ada7bcd20f92f9f8b9b0d0e61e8dbb968b3c825432ae05d69c9b61a04ad57533c1e60438d9a1964312d4c9168f86864ba2d3 SHA512 2df7aaf6cb36a18165dc458a7b3f4158e2bce3bf10165418de401dd43e06d44378511dd4fea6530cb668a8ebb17b4c3f294ba35f5018e6aeb1b7b9082aac8a84
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod 154 BLAKE2B 8645404d124dde54c3e9c284b1243b1faf2124f2b7d6c5e6566ca600d3c965f7787f09f6825840f5e3ea6d36c016ef2c7fef10e8e12dce354593f7a8a3210a33 SHA512 4c9416c4777123a39b23b49ecf6265295fc3432de083a04dbefc87264b8c69f0d9e342ebb7e8e488f30c3efdc02951fd7dec23dfd1fef0802c8f0250f96612a8
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c8765cdd720690c1067c7c0ba1005bbfae01cd928bc60d96bd82321052fdb18a4ae12119144e34865cf910e306c5116e4f4f56cc5f70f5d52004e SHA512 acbd5afd399b3798d4b24529479b18523ae4009e21acde15a3893d2af75f9a6e65fcbd5a237423849003eb8903718eaa0b1aed9177c390972ab9490f3acc0d1f
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.zip 205991 BLAKE2B 75d746f36cc90088b863fa6c00c6ea30f071c5704593de0fe37b810c530170f6062c35460717a52170f7caa7e6c015ce2357384147fe4a12a9d695add2915394 SHA512 4542c6a57361c255ab89d2330c1af61cd706edf82c02bc48854e6f4407911a1657151ecc286b774e25be93bef29d63d2f031a99e24ecdb212030bcb1dbf7b17d
+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.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
+DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178
+DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip 347066 BLAKE2B 5ef49f931c987f9a24880afbd3ca231093bb43f0c059df9110c38ffe3ad54c4de3851cc36cc9af15b49112462cc164b0812c8872d5fb2d61d0cf751040213762 SHA512 3a24fd40eec7d23c69143355338019544fcc935b01f63f604419a5d7b5f1222e89de7e28dc86454e57e262f9bee5e4333395f3b8d7392c6e87b7e8c442e05709
+DIST github.com%2Fgoogle%2Fgo-github%2Fv31%2F@v%2Fv31.0.0.mod 362 BLAKE2B 66fd257666d0d7445f79d6aeaf7c31768b4b8f9392b9b30c498d261dbc87c08b48456e3fffd7aada41720eff4ad51e5c9cd6186fdc1ef573c4c5fd71fd7e80d3 SHA512 865ae58366e25fedc575873957948850cdb37bc96d2628c6e4f2137b1d4ac61daf98d03b065eb45eb7006a9e8df11ca851880da112baac124aec859720c0bcd2
+DIST github.com%2Fgoogle%2Fgo-github%2Fv31%2F@v%2Fv31.0.0.zip 436062 BLAKE2B 5d33498a4a42ac99b348d1886ca23941b7b47551c2effb5fe8a78ce93fd42a12f6d3863cc457b03e94b2239a71ed6325b76dc4512d00cde3d2d00ed562bb94a1 SHA512 c4c791528941b0a0a5f24a355e6d26e74595b34a28111f37f84ba5d4265be5ad4809806cd2540941e97bc5c398825e73cde44d039aff6268dc529f9237109c9c
+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%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-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%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%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.mod 38 BLAKE2B 66807be55b6dea3229c9f7e7c69d5a8d2a32c3d3aceb2d1755ac55853de062aba2285a5bd09e1862ecf2e5931fca7ae34e0fdbe95a8ea4631081218326845ed2 SHA512 efb9c8a70c060e6ca149d62c78b62d389bdcfa46ff8f3a77ae0ba98f3e49799ea42d9c25f04546e2460251be6fcf6b31a6b219da6861666ac7e90da66362cba3
+DIST github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.zip 9214 BLAKE2B ae1104a8066eb6c9c0548ec568845605beace57d4c04059e5701563cac1f4e7596310a5328a9e436c517dd8bd331120fd7bf08d77f81af6df9ec3f023c3e0812 SHA512 f7208bef5d4b97498b847d6436ba675109aea6b961188529a51060ee7f26dd71f524fef6ce89eb298d68f22edd2671ab7c448238bdc8ed23f18ab832cfc3c729
+DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod 41 BLAKE2B e9dae477e838938303749c4e7f1d0ece371d20bfb8f0d6fbb915a9ec249b82e300ef691c2175137488065828f67b02503576420fc95c2aa40f4fda262526dc7a SHA512 ab1be2f5ee91ad8c24a7c1d3c2277506dd76f85e8511f53e923ea7e0ecba140303c9312f0ecd2e09631e2e6591ad31a3b19e900ec102b486ed9b56c38a0d0c84
+DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip 7034 BLAKE2B 7732946a34f604c858bda571c3afee7e0e02720d02127d8b4887f4f0363389b50088727de91b0436f0c943d11de80dfb766208f15665d0b4e5cf68f2a7b00817 SHA512 f9c4eaeeb1380aa5e219a19923cfd51f2612fbf11b7f37c710cdb0dfe20270f8cc7841d50dfd17110b004ec46e4c90329286213e04de481a54094df73efc9fe4
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod 98 BLAKE2B 074cd6d5ef6f25ec043afc4f23272f5fad1d7bf100e75122f85c49ee93fc3c6205c72a1e5b4227ca45f3267be1b2001e743b51e54ca5f11302c2610e93630858 SHA512 f7ddb2f6ef35b65ae4a9106e31cbbbd08a7d011d3d9d5827445bf35ec0243041c3e4881a850161134d62ff822610d3aeeab2941472dc7ff0d664edabf2ec4eb9
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.zip 442733 BLAKE2B 17af8168c2253f09f1ff15c5d78359bd8449c84027b10594eb5878fbba0ed2ecb250b34809693ab75869ab02d7677f874029e85ed352295896f9658293ecf4ea SHA512 b1515c6fce781a653025c41ef164ca2a625879b2f7ba1349c470cb9afab9b92b173a89513bf601ef7dcf53e0665010a12d44311f75c9282c244d58a154af781b
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
+DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip 442291 BLAKE2B 02ee4982a588e0fd1575206340bd97663147459664a2942edf151c4aec2bd20da83984c68c76e1c505c1ef930b77f934a8210f6c0ca106a0c0c91ff63733b92d SHA512 8e275955eb9e5034c155c6e469e2a3117bee30fbe42e8ae394f496b83f473a1568847707707716dd5a3c57dd0e0a4bb4f4cc9af04940218ce24420493e923f14
+DIST github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.mod 45 BLAKE2B ca27cda838147e1d68ba10649109192dd05cb2b100910f940579b6bd89b9ecfcbd186b7f6482edee593ff773360abc8ed8ad7c35deb5106fcf498d1394fede80 SHA512 ed4b221709e662bd34be729b9a409caa16ede1b3d82300b5acc45b61e2d28cbcf2baf23d61e61112a0f66c363adc8ed7662a9ff12f9fddebbd198529c101740c
+DIST github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.zip 292019 BLAKE2B 46a3c8f8023a8d1c5f22fe1fdb4bb959f48e9b890b81664a850625e00325ca7a60892166a7ebab0887e45dc4c294084f2dc15cf50aecf66abdcbab2b5ac6ad13 SHA512 5ba20536d8534cd4e95ba441d42db3828770146ff1ec3efeb31e56ff7a75cb528eeb0100f13ba7a3ef70df136ae7b06a0e10057b94fc8194ea188e8679ecfb48
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip 8885 BLAKE2B a9d15d5bb4264391abb906ef4b8ec929ecf61d0bbc781ad37aa36e236cf92f5a97f2035c0c08bb49c85142df10ba129c4c1755ede5bc8ec71743300f60af3d47 SHA512 4430b33d70f0fe35d07aefd6320ca0d8e49b71689d93b49e021e1893f8f9f043f8a6d16705e5517a600a538b3f35fed8f14a69a985b2955e8b6f34c19605c83f
+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.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip 7430 BLAKE2B becaf402e397202c86c156c3a5b7ee8f785290ca134d87cb36106a9496d18b1b45e97d306c6280c7186976a18307a7ef04d6ffa29a2e6cc2a3dd378fb400ff44 SHA512 1a7efd886840455b37b44b4d0c048b457eae14e509a740455db995e84c98f8fe94449e7dd11c544ff241e784ebeedf0f60c87838adca21fed08146fa3adeeecd
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 22344 BLAKE2B 9dcfe0ef5fb4f7e493f29ed3e5edc8ef2744351a4e2a5b70f5a8931b503925ed58b5f5f58e3512fe5fb5fb8d2e7bd1598037f29dac4520e7d966f60ce5f2d307 SHA512 fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
+DIST github.com%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-ps%2F@v%2Fv1.0.0.mod 43 BLAKE2B b6996dd7e1e75268f4018828d23802d360e28d700e6be0c0fecc9a17fd4ba79e00e81aff04166b461295b95f7225f12a1fc22bc5462ffe6a0f7eeb35e58aee5c SHA512 eb0cee04d26b4a0acf1b45504ab73931c10f98ebd41a6d96788aad477178f8172da402757c1fb8853ac513fff0aadbe3a9a4f74134c88cf9e26928896af55785
+DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.zip 11977 BLAKE2B 885bab4a5c6632cb919fadde65d0c7257c15030e8c12e545705fdafa498a55a941154fb39d572e623db85a5672e85edd473d3411d24e5dbe64b4836d169da62d SHA512 046a755112a19a9fc80e25e5031185394d25da265b67a07fcc0eb3091168f47ed14c8c502b9ffd35d93d60056a6e2dc0d540e8149ddf402a5cc20d57776e312d
+DIST github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.mod 112 BLAKE2B 50b4b6b4d07888fd6bbcc3d88b7f4b542bf2f3c61733319c918104f9f3a8cbbd9c8c2b724751ea2ee4bb09369dee4cf22dca0cd334733826ac882f270300f944 SHA512 bf10719acba9ec2fab1e504fc2a02f542b347cdc4b891237fb9cac81f5aa72882adc25bef2a4a9d43dc33c5d2dfe8f0398c698e65ba74352a8b498b7445e3aa6
+DIST github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.zip 11581 BLAKE2B 6faf8c5d4368c6456db989791fa327e341a791b601e6a561ef3081ffababa7dd0a97190c1e96888f41b1d6af8b9231db09434adad8471737d54b25f515260e7f SHA512 3bf633884ff896d94b70815ad990806ebcb89ab69e297bb3f07b8b186697216053b886eb2029df3769910df7be6f7c99b590606b0a02e5fa46aa5e68281cefb1
+DIST github.com%2Fmuesli%2Fgoprogressbar%2F@v%2Fv0.0.0-20190807022807-e540249d2ac1.mod 112 BLAKE2B 1dc44bd5ccdd4e327130d587d3c79204209dcdd52210365bb473cc35cb765b52ae7dcd4500539f97e53516789994613d4d20528a4e8fd43c80accb7d66983ffa SHA512 2eeb6ee54be862261bbce1fef101e855631d7dfc6933c710721a4b04fe189149ddc3b19c32c2e8f5ed1e94c11514556c06d8c7661a1d3b6d0982e986947453da
+DIST github.com%2Fmuesli%2Fgoprogressbar%2F@v%2Fv0.0.0-20190807022807-e540249d2ac1.zip 9869 BLAKE2B da2716aad7472147c432a5979bc5254474a7cd4961edb5f4643c96bcf9e19d35d6e7d47b62b61ec510594a5c93cca3e5b69c6f08d2f1f8b1666cd391de074797 SHA512 29fa8b4914ed77a6bd35b8c3b786a1f3e4773cda67621bbb5b0c31658defe5f8e77eeecb5e976a94dcbc709e03cef643db036c4888b9ab50e98876b8b0b56c65
+DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
+DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.zip 13281 BLAKE2B eb14a393cfba4230af192cd76a63a20568fe80ff650113640eb63d880c276307e792b0bc3339ea37f1387f78ee5e9f15a8ff66d0c4b8c8cfb09fddb1e73288fc SHA512 96747fb5890efdf10e0793afc08df1ced6dc8c71462397a0e4149f32f77470f1af6bf8fb2637693497d33a2a7483c4609380ee89ee0a85ce21102a32b7a1000e
+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%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%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
+DIST github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.mod 39 BLAKE2B 1fe1086bdd2304d771c53f56cb46df742a3e49d6bcd3dfb6f10fd81cd70ff372a34ac31088ef79e51a211068ee248437f5e6dfe4edd739a5719f783fed79b478 SHA512 3e1d6747fa7a97d9ee969060130b0e5bdcf162274f9c5faf66f1974cb7d34e59f569bfe1a2339a71047cc86db2422ce486aaf5d7d47feb61f89b5e6e429c8075
+DIST github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.zip 636486 BLAKE2B 08c35fef4d5561ffa1bc3de75524f50fe1c791559b162aaff74cd6c7a0667ef2c5b8f53cc39a1cd7a3faec4c3137412b2f3b27d94af7b72d7f25fcf9ca32190e SHA512 99a05815aaceedf4eacb645b5180d6591a696d2b51f04d8848c0b3d03a10975a166d1492ee3611aea595f6588e4c48fbcf8de097ef0bad40b2e281c5312093c8
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
+DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20191027152451-9434209cb086.mod 34 BLAKE2B fce952a243794343a8e85170c6ab3cc518a9080ea83d12effdeac8e42af930ebf247bd2b3ad5a234be26808eaacc3e5d38b913f9a36231fd1bd585c7816c8e08 SHA512 6e445bd52c07c412bbaf8770168707b5e01d8327b305df406a8fd72feb26502bec6c8ca0199f601a1c102f06882b8dc23f53a09ed265eaffc7a2ca76cf27049c
+DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20191027152451-9434209cb086.zip 46526 BLAKE2B 5b071b1f25998c6475082ae4609b6e88a44627468ce99c8ce5260f471a722caa977e20d385fdeaf7367aca848b48dc90aae4017c243c4540c7f35b6a96334acc SHA512 c66ecc4b694cebaa36a172550348e086eb161df7625230b2b50342f39760d47d595aab202f0ad700be1c3748a8f42919c189b66496f9c9ed3dd6fcb1013b0e03
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+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%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod 183 BLAKE2B 43fea991eaa4bf055a796d40ee3a72557fca99711c698b3ef2feec5d175ff6cd1af486f7e3b08c6f95b6035ea5a6c9bd76478264102ce85cb0bf08f22b841957 SHA512 4630a9172936eba1e550a8f6e95847faff6c2a3687900143cb8ad593df1b1f7f793969efb94dbf42a529074f6a4049554773157c3bc4eb7179f435d0af317c90
+DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip 3449475 BLAKE2B 5eff2b47efe3fc06e2b99b939997554e58fc2548310656f990cc44dc1787d061a4bcfdf6010a20bd9d469c6b66dbf16dabc205357f28cd46322a2442a1c3c093 SHA512 087961c76752484ae4be8d7f0b79538638428e35ec47db185f57a6ec07e3b60d55873ee0801919b169acd5a1e36c5150613e528fc051910eafa362830791fda4
+DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.mod 33 BLAKE2B cf8b03e2f337d08c85902281a5625feaa388536ff2522b3f0f1d381452af3179d357fe973c877061d45c0ff82c075cad7e0743df2db155317e0bd4b1c5876592 SHA512 2b8cee8b222f55816fd323944727f83de0f2705395057c8eea447bd4274390ebcfa0d96c211d0f185ec8a9eeff0fd3b60f4e8ef48a423f175e7b4c9a689a2b60
+DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.zip 1589821 BLAKE2B ff92776e0df9cba4f2f1f3eede7264ed5c3fda1b7c5d1550d9500fad32f2e2a8ad860d3e8f84a369f84d4a7cf8a4b3756db63afe561e169f9c2c409e1fc62b99 SHA512 b4d6e66ba2b9362aa265bdf405beeeb55b31c72d2df59c4faaa6231f0796c4893db5b5acd45ebde4c1cb7e35b1886fa82adb53a0b2b54d52cdf607ebda5ed7d0
+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-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.zip 1825995 BLAKE2B 043e1f926e0ae47ededfa2ced40e95fe6c564122b2e2a64ed631f3bd4dc52c8ccf5b5bd4641d17ed996875dc1e64ca8edcb6f02dca34be178e611cee74e4ce7d SHA512 a596a5c0e3ae5fcf366d84dddc7b884fb72d6dd89dbadc79f9ac2cea397f2795ba3ea5408cfcb75f248ddb18c9774ac7f55d0e355f1be1468812565c5403fa5c
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.zip 1874180 BLAKE2B 20899757b255a90730b8f62f656f6edd1f41539f3e6b5ff1034d274b0f47ca81b862072b9a619120befd2a3260e8b7f84aeb80b51aeb126d5f2ff5f3bb843ecb SHA512 e04eeee38e8ab6ce597d4a342c71823940cc227ce5eab7c245b7035c194ac1bcd33472f1f07ffd125dd3fed59e878fb95857ff93ce90dcd49d26bcbe77d22a64
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.zip 1500505 BLAKE2B aed582fa92d06c76e5c250a9eaf7645b4147d384422e263ecff6136b660dd2af8a40cdf539b9966059e754301afed01b3fcf59d2680ed88bc438d6297a44d7b3 SHA512 7cfa0dc01fa55ff83d10087ddc6358e2e7021d1a8a27393f5778607cf3dfe0c31363676e1663ab4ee485273e580d6f92a486ea62d5944892104f13cac5080b82
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+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-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200420163511-1957bb5e6d1f.zip 1471954 BLAKE2B 0ed87e29adaaf2e15dfa803fef857f82f73f5e45864a2d52a21e94a1436fd22773b5921c229472ccdb1e715c081f4865feffe618ddbf258a1ebdac5636386b84 SHA512 bf736828279ead6fabd59a1608870ed72ea610e32effb1c65015c925d214e81712f636ae60e39636dc7820e88a4e6a728f18b3f08b517d9c5877cb08f85bfa60
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+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%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+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%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod 128 BLAKE2B e36e105129abbd7729a6d509724246766c16df526ce22637e92ca8f29bf854b66622a0afc5afe8e4ad29c9efc498c488a87020fad5969e044757d49ed4bd6399 SHA512 802c0df5ed11f0bb2e221c01152c6339d3634068f89aac760654411884e6b936b031cbfabad57c5add340f9d504edfcd683c77cb0ba7d753e06bc604095257ce
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.zip 1456574 BLAKE2B 4957a5322065e982e12220a4eae758cca1626e9e158222acba41df0bf5fffaa8256e4efc832d90c4853d29b46fdbc8f4af9702f51cac93f92d25fa0f4d7cd603 SHA512 739d87735445d8c7bc877774ad0400570a3bbb67216100fd7edab615f11087225dda48fd16be53f7e6535c16f1cd686716c262567954e8ffc052b11125bcfb13
 DIST gopass-1.8.6.tar.gz 7072723 BLAKE2B 5ae883c54f8180f8b6da870bd99710f1c740afe9de193c127a3047fa1211641b94ab98e23148d83c6d5b2cd2e3275f644dc875d106c9267e7e0c6342bf0b9a46 SHA512 7acdb095cf8913954044c3206eab020f197542334798c6b94724709c3953b12f7e5b73ce8c1aa4bfd5df3acf1f424b64bfa94f9a8f68fa7116ed14c8a0f2e6f0
+DIST gopass-1.9.1.tar.gz 418562 BLAKE2B 9db44fcffd8728763364dfbb508565aa30b6b31ab930d65cc8cf9adcde9c26a6dbca5232c6027eac0316e78957f3fa0f5a10f75d24801b6faec283ab51b67a22 SHA512 a70affc278b5d46582a3362c28f1aff8be4481aae3d07f3b7e200117fc2ac79466c475d558fe5a642b0102a46fc95242334f406deca6ee4abd7d5e9f674451ab
+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-20200227125254-8fa46927fb4f.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip 41484 BLAKE2B 34fbdc1525bbea7fc6b7f74e74ab407ed03d3b58e25e9b3b79ec35945acce36b7c4be54388c1244d508c7cf67ac6e4f1ff7c9eb5245f01ff27dec82cfe87bdb8 SHA512 713c79551d48a99cc9feed3bcf71b7f1fe95270701787dfb114237bd358ad104d18ce7ca412f65d1ce6b7f94ffb6c01afe28c9b821e1a5378b05c93340aa8a49
+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.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
+DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
+DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.zip 23674 BLAKE2B 86c738bd62b56b84e8029cb3a963f882a8a735dba19566bacf07dae0a146d0a66917153999995c3f0a9fb9698d874f25c6207b8a90d8e12e82cfecbef343a9bd SHA512 169f87e5c57dbcc4d1a289481faca3c3889f0fe019f797374b86e001a3f2893db3e8180be2651c7cb541d30822fe357c7401d75f15303ee8f549227c9b3ec485
 EBUILD gopass-1.8.6-r1.ebuild 1068 BLAKE2B 11cfbbeb943ad9ed42bd9e16ff230d49ff40759e241d6a60ccf57b31a4bf455dfb4ff954e31fbfcf06ce242e5776ddff100b604448eed80986bd63c472680fdc SHA512 f9a71715b209b88157c72591a30f3d385f14d6e3456324a75cdcfc1e9e9e9f795f65482f7b3ec45b9691af88d756fd71646a4bf7e0c4855415843663d9c1e78a
+EBUILD gopass-1.9.1.ebuild 9220 BLAKE2B 4108a361a430f00d8eb80b17fd387688c32c7873ce765bfe09b1d4aa09ef4f0c6171a2898072ef56b2e178d02e442901e465111ac6708488f10b4104cb60e6e1 SHA512 68536d8b90fa584227e7a75981fe0b4f66ca85e5c901b3f0dd4be21bf37e21bfeacfaa93c0523210678400f008fd7c6e464c37d244a79e4b72ba66c6e517036f
 MISC metadata.xml 327 BLAKE2B d3ea7ba02c3484c31b58d8c8e1b1b5a064eff597c42add7bcd720d818d90ae107a9f72292fafc6c059995118d96204e8f8f2ed82856dcc0e1061c2eca81aab54 SHA512 7c7bb9cd28275bb75bb0e71da2dee86f7a32340908e59359d330b03fd07ba8569226775101a92032b06fac1ba0327ca6cb57c5ecf6b6c3c1a0319b3259bda38c
diff --git a/app-admin/gopass/gopass-1.9.1.ebuild b/app-admin/gopass/gopass-1.9.1.ebuild
new file mode 100644
index 000000000000..2dfec7c7afb0
--- /dev/null
+++ b/app-admin/gopass/gopass-1.9.1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module bash-completion-r1
+
+EGO_SUM=(
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/DATA-DOG/go-sqlmock v1.3.3"
+	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
+	"github.com/alecthomas/binary v0.0.0-20190922233330-fb1b1d9c299c"
+	"github.com/alecthomas/binary v0.0.0-20190922233330-fb1b1d9c299c/go.mod"
+	"github.com/atotto/clipboard v0.1.2"
+	"github.com/atotto/clipboard v0.1.2/go.mod"
+	"github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1"
+	"github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1/go.mod"
+	"github.com/cenkalti/backoff v2.2.1+incompatible"
+	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/dominikschulz/github-releases v0.0.2"
+	"github.com/dominikschulz/github-releases v0.0.2/go.mod"
+	"github.com/doronbehar/gocui v0.4.2"
+	"github.com/doronbehar/gocui v0.4.2/go.mod"
+	"github.com/doronbehar/termbox-go v0.0.0-20191006141301-8c9470559e05"
+	"github.com/doronbehar/termbox-go v0.0.0-20191006141301-8c9470559e05/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/gdamore/encoding v1.0.0"
+	"github.com/gdamore/encoding v1.0.0/go.mod"
+	"github.com/gdamore/tcell v1.3.0"
+	"github.com/gdamore/tcell v1.3.0/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722"
+	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722/go.mod"
+	"github.com/gokyle/twofactor v1.0.1"
+	"github.com/gokyle/twofactor v1.0.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/google/go-cmp v0.3.0"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-github v17.0.0+incompatible"
+	"github.com/google/go-github v17.0.0+incompatible/go.mod"
+	"github.com/google/go-github/v31 v31.0.0"
+	"github.com/google/go-github/v31 v31.0.0/go.mod"
+	"github.com/google/go-querystring v1.0.0"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.0"
+	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad"
+	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad/go.mod"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.2"
+	"github.com/lucasb-eyer/go-colorful v1.0.2/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.3"
+	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
+	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3"
+	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3/go.mod"
+	"github.com/mattn/go-colorable v0.1.4"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-colorable v0.1.6"
+	"github.com/mattn/go-colorable v0.1.6/go.mod"
+	"github.com/mattn/go-isatty v0.0.8"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.11"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-ps v1.0.0"
+	"github.com/mitchellh/go-ps v1.0.0/go.mod"
+	"github.com/muesli/crunchy v0.4.0"
+	"github.com/muesli/crunchy v0.4.0/go.mod"
+	"github.com/muesli/goprogressbar v0.0.0-20190807022807-e540249d2ac1"
+	"github.com/muesli/goprogressbar v0.0.0-20190807022807-e540249d2ac1/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e"
+	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086"
+	"github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/urfave/cli/v2 v2.2.0"
+	"github.com/urfave/cli/v2 v2.2.0/go.mod"
+	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9"
+	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4"
+	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
+	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5"
+	"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20200421231249-e086a090c8fd"
+	"golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f"
+	"golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.8"
+	"gopkg.in/yaml.v2 v2.2.8/go.mod"
+	"rsc.io/qr v0.2.0"
+	"rsc.io/qr v0.2.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="a simple but powerful password manager for the terminal"
+HOMEPAGE="https://www.gopass.pw/"
+SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-lang/go-1.11"
+RDEPEND="
+	dev-vcs/git
+	>=app-crypt/gnupg-2
+"
+
+src_install() {
+	dobin gopass
+
+	einstalldocs
+
+	# install fish completion
+	./gopass completion fish > "${T}"/${PN}.fish || die
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${T}"/${PN}.fish
+
+	# install bash completion
+	./gopass completion bash > "${T}"/${PN} || die
+	dobashcomp "${T}"/${PN}
+
+	# install zsh completion
+	./gopass completion zsh > "${T}"/${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins "${T}"/${PN}.zsh _${PN}
+}
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index 13f6f56fe68a..01a02a7f81af 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 553 BLAKE2B 14c900043e079c7b46306cc2560a23bce66c2677f96a2121e73ea013fc5a1aa18a2606261162b21ce71e1c3ff8dc104a977787c21c3329402e8ae90139863579 SHA512 d4d1b9e1c3217bd3c54e654a337b94528a616ab6e57b154adefcc63dbe8b1ba24cbe3a755eab0c557a4b99471603fd41054301bf95731de7ce5cf972dcf4c992
-EBUILD hcloud-1.16.2.ebuild 554 BLAKE2B d47c96e84796e3ae3380c07351af1f96137e1e5088d954f64271400afbb5bfb13c659d626a7f5810563182982e13e43fc6f18f2564ceb1d3b9c47c4a07943f3d SHA512 b67c7b9baeae237e4b0d68d3e31551387f4ae984bd31891d36528aa5700c75f673809eadd8cb0f97ddc1529032d8553a46290d3c89c73e2c3b55a89856369de0
+EBUILD hcloud-1.16.2.ebuild 691 BLAKE2B 4ec7a4f12bb6b0c5598a65c052785dd41b81244722a48e162aafee0be4518085500ae5d693caf588e301ae5b857786ccbd682bcef7e3c82e93d0dd21b065c168 SHA512 883a4e88da4220295b1704996d26e678436a482fef6a893b0ca668423a7847a32a3ead937feda84139b12234e4f251ff82a728eaf3bd177246a4b91f1fd68962
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/hcloud/hcloud-1.16.2.ebuild b/app-admin/hcloud/hcloud-1.16.2.ebuild
index f5620e0f972f..4748be94a842 100644
--- a/app-admin/hcloud/hcloud-1.16.2.ebuild
+++ b/app-admin/hcloud/hcloud-1.16.2.ebuild
@@ -19,6 +19,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/helm/Manifest b/app-admin/helm/Manifest
index 1e05e9beb34d..57583c20918f 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -24,6 +24,8 @@ DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip 6278 BLAKE2B
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
+DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.4.1.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
+DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.4.1.zip 54053 BLAKE2B edbbafc09d77f9c148eea7b1a81aa59fbfd674be51dd514328899709cc5f19ebd41d93fed2c5dc1303680e667cba0472d46b882b669cf58f0caba70f7c85fe69 SHA512 81e8da102d3ee39631bf160bb44e6c6c9c59bb381f21293600cbbd93781120c1891178ffc513ecc41573d81e7000de8e365e7ee723a108ce8648e1854cb4887b
 DIST github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.mod 38 BLAKE2B 176ac3e371386c6a43148aabcf75084c43038decec0062e623c4a7baa194bf7c654f59cddf9f8b413209cbdc03372c790ea91d8f3f6e3d393ced5eff1e903100 SHA512 3057fdb8ea9b349e253361877f132c1808099cccff5eecfc8cb95274bfdf219a466c26ddaceded7867f0cf47f605728c417961d37a3f40695b720967c61973f8
 DIST github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20170808103936-bb23615498cd.zip 5595 BLAKE2B 72d6d4e22f8aae9443e52fea0b8b01f704c7d58812c3a52ec4cccb2848f360f995e72b29fb393c333abe92e571e0b2e32a7e328e46e91d1a490b97d4d9ec93fc SHA512 258e6875c1a5c8b700cbb95bea37af6886766cc30b70aa5fd78cb18a92bbbf073ee918bac7699e0bb86c6cdbd4b25f5ba4aff8c95087ad845f8efc84f715c8d3
 DIST github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv0.0.0-20171113091838-e9091a26100e.mod 38 BLAKE2B 176ac3e371386c6a43148aabcf75084c43038decec0062e623c4a7baa194bf7c654f59cddf9f8b413209cbdc03372c790ea91d8f3f6e3d393ced5eff1e903100 SHA512 3057fdb8ea9b349e253361877f132c1808099cccff5eecfc8cb95274bfdf219a466c26ddaceded7867f0cf47f605728c417961d37a3f40695b720967c61973f8
@@ -34,10 +36,16 @@ DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.1.mod 49 BLAKE2B 75301d
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.1.zip 29369 BLAKE2B 675db8802b544429f3eb3d03016b3362d17aaebea0ae931b8d610afa1c2b38baf78e591b640f1e180a96f5c32f5da50030a70847de3e6d831a06af8a4d7d95a3 SHA512 3612d456e242b053cf9af4518aa101a3f1b2d24893a2a7cceb9943ad0a1e96a139b48f22c3a8055dce13e05540f9115241ef6e2e09d78ddf37e61cacc3299844
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod 49 BLAKE2B 75301dd276a9f53c22d9d15f2ec4fa32cb90eeacabd9ddcc604d7f306d7e9481f9ed3f8f8bdfa5090951623f2ad2bdc671808dd8eae512bf911be30a6b93cc99 SHA512 7b9615ed8dbc53987e0370b5ff24bf62bfbf4cd3644859b735dd267826ce75177666106d8447a113dd508542086919336c82819385c92ee520082f6f6ada7ac9
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip 29035 BLAKE2B 44ceec916a8ed19a1e9bbc3b4b4f325e5b9fe1d55991553f30eac70b3ad3b93ae92b1f0487ed57354b40db1b5b1458885a127c5db92a27ee806b9f8f1498f3dc SHA512 3954271496e703d876e1bd9716ae1bdfcde08335cf20915aefa71c5ade8a836733f0635005d9eda8b01fb1991dbfd25d0df2aa71a1d52ae3677477eb34382aab
+DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.mod 49 BLAKE2B 75301dd276a9f53c22d9d15f2ec4fa32cb90eeacabd9ddcc604d7f306d7e9481f9ed3f8f8bdfa5090951623f2ad2bdc671808dd8eae512bf911be30a6b93cc99 SHA512 7b9615ed8dbc53987e0370b5ff24bf62bfbf4cd3644859b735dd267826ce75177666106d8447a113dd508542086919336c82819385c92ee520082f6f6ada7ac9
+DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.zip 29693 BLAKE2B b82bf12654737a5719056c9aa16c0a2fbb510fc0680844485c79b45c1d54c2254832f41517440f4ff37f3d7bf292f594dace50038e221ef790ded3ccd18bef24 SHA512 ac438522dffc4312f7b67ae0dabd8b640584f5c934682e316b212c106cd4046486bf9a29ea4a7f00afbae98288b95633acb2cacc5034da65372fc8fb9e15a505
 DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.0.mod 405 BLAKE2B 8b1bba137a8b24663d45eac0ed56e83f148438910e8dfef338cad483c366624dea27eeb84bee8b699640002c7f2db21b564901a318a409809ab3fc41526a68d8 SHA512 51877bb3be8b8a388b82ed7876dd4023ebe4b5ddf59ee30c5ecea31fe0420e1f93b963d160e4b91185eb33764015a3381c4bac4dfde60548a800b5668bae4a6c
 DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.0.zip 65549 BLAKE2B adf2f127d73a027e234dfb60dd5edb84bcc08ae8f378429c192a1deaa021ad2f4b592412475324ca187e33a6500d02b3f5200c42fc9bd54cfb290c7599da5d43 SHA512 2596e3f541f941b9337289fe3a30f2e90b617bd81d7444c90c8f5fb54e18484e9c7c12e88ebdbab3d18507d3847566bffc464081bd81708771b5ec9b30bd4d29
 DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.mod 405 BLAKE2B 9c6d467ebf1d4627bf376f7865a64ec587bbddc41b8032daf75b67cf799cbc1c6a30d7669fad3463cf58d0ff51d3aa077a81e85ab007809ee36a82fefb1374b7 SHA512 264a23b0fae206105a5cc428d7e3c11793c4cde9c5ba9f0db326d22a903d4652a7002ba353a574a5da50b289b2d07f9d3371d82d0aa5968cf4e9ca45cb921993
 DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.zip 65647 BLAKE2B 76553a2c54a36401fa6ef3c374031bf593f209d692373f78ffef942a27dc5d7d453c3f06382acb8ac6c1c0eca87c8cddb0038080f07b5d61aa0050d462936e6e SHA512 5bab547c857895610fbbb16c589ce96f0025b19ec5da08d2249dae2815c536cd1f9def2fb2767fab49ffa6ecdd52ee1b769a69435a78e63ef03fcd046e18d1dc
+DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.1.0.mod 405 BLAKE2B 1fc7d2cd7fcc518aea753db768465f5a16c8ba91fdfe7857bd4e8ebc9dae9dfce8565fa6e5c97f2d68f8446797480a4d7239f9f34996cd0427fa01e4b11e0778 SHA512 c7dec4a7d2b69239d4e583bec5839b7611bbe03d2274740bde007bdf72afefcb1e6e189242b30c48b58bec88eaba888f68abfbbd2a0ed851e38698a81f27f54d
+DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.1.0.zip 67936 BLAKE2B 658935dd88446c8b33fb2bde13bc46975b49e98b50855149984485a4c1ac8b85211b43c428e7cc461dea615f784390f1439d338185833cce17b692e3e33b2b10 SHA512 04c1aa98bb863370b0075ed39dc999525ce7a6d8b1bc3bfa99e16ea02c6734889720cab7e7f820bee013bdcaaef57a3bc74d7cb02a1789e9892c5775d42bb01e
+DIST github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.2.0.mod 312 BLAKE2B 386d733f3af5e520c16a63340477323f079302c743c19488bc09b7e63ed83b1d290db14eee791d9a06c7a2cd897ae67b79e6c681256adcbb4531789531936d07 SHA512 eaec26ac7cce88c407435c5715327d93a31746f93f57a6071178c8a45271e32b82bc8a1ec0f754a8d9318e7ff6d1de2ea28f04ef0b29158695893f89fd6a09a8
+DIST github.com%2F!masterminds%2Fsquirrel%2F@v%2Fv1.2.0.zip 43911 BLAKE2B f3ce7ee5e28e6f55e0b0a87019df0f10b7a440c4dd1a4e025c4eedc76c66f3cb490c1890952519dfee83f33901f352df96dee77f61796ada76aea78c7ecb1cd2 SHA512 96ec08b06cf74bc2ed135ff98eefeea449cd1be8fb5eb4baa59fb35dae5911e7bc496ca2be2fe97327f6725dfbe1a45af64fcbe63654ceffb93593821747ba2c
 DIST github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.0.mod 34 BLAKE2B 3775b686ef0a7d190a38eb6cddc8a2c5d0dff7ffc656dc762ea8733def2abc81fdc3f990854a9e3e97cacdac3149be6a05f7b271cc7f8d63d11ac3512f2d64e8 SHA512 c5c6e7621f9018f117ead83e96a26b75c7f1c0bf2a71579bcdf494e1bc49553c4def4b4246f740970ed52851a66582695702c8fe2f619073e6422e593a350143
 DIST github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.0.zip 43315 BLAKE2B 3e9ea3f6abddc61b01532cb0c55aeeeadf73d438024e855c8fc8f949df3911cdc280670c13625aefa0e640225bc606fdf008b65082bb7844006d9b9ad0f6fc54 SHA512 1ecf26e0faf020384f2cbe3067c1e58db0c9870602629061d074fb18ad710c0b4fc0d6d1c9abcca3a87227f0aef4586feef04887908f29ef43d0c81ca9df2283
 DIST github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.1.mod 34 BLAKE2B 3775b686ef0a7d190a38eb6cddc8a2c5d0dff7ffc656dc762ea8733def2abc81fdc3f990854a9e3e97cacdac3149be6a05f7b271cc7f8d63d11ac3512f2d64e8 SHA512 c5c6e7621f9018f117ead83e96a26b75c7f1c0bf2a71579bcdf494e1bc49553c4def4b4246f740970ed52851a66582695702c8fe2f619073e6422e593a350143
@@ -53,6 +61,7 @@ DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.mod 1988 BLAKE2B e89ecdb464
 DIST github.com%2F!microsoft%2Fhcsshim%2F@v%2Fv0.8.7.zip 552856 BLAKE2B ec7ad9c6e4c49c04f8aaca1c42e198027e5db5abd79ed84f1bc8dcef2e26d3e386e02554285b666eaed6dae5ac9bec5f0e9c01cb703585921f2834cd8f49b65e SHA512 5d4575dc4e98137cfacd463cabbaefe2df0e49b81af900e9c43d2f98fe2aa4a02323e395b390bdf4c05bdb1d470f8fd2f2766123d27360541f249cde5e91c738
 DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod 38 BLAKE2B 3f0ac051b31c84f5e98663c1e6245a4e2bde2be5c0be61ec80764d753bef5479251bbad3cedf6fb998d1a4a4e66a80beeafa6f3291ed45f46d643f7be109004a SHA512 aa1f503fe0c19002da21ae30df5393c15f2b2243ff415493420204d11032a562d5d40047705b1644d031523881dbbf284d3c56ce8106a2a969d2610504426762
 DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.zip 48225 BLAKE2B c86fedfca22f95ff6f1e7f08d3cdb34d32ee9875917ac14dc1d7e0c7881028cd4b19977aeda5e6a58187f683f9c76689c1bc1eee2f80933941174d34a55b066d SHA512 62826d9c7aa1871288a5d6c5a2c075ab5b20c442aac3bdcf2d32f906c39a02b5d749226125d72365101e2e6b54c8ebc567e795abf4627178cdfccfa7f4a1b31d
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
 DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
 DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
 DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.1.1.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
@@ -69,6 +78,7 @@ DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.m
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
 DIST github.com%2Fandreyvit%2Fdiff%2F@v%2Fv0.0.0-20170406064948-c7f18ee00883.mod 33 BLAKE2B 5aced043cac582e67e8d3ddfef0a54dae0f7e4792dba23d7c6cb18fe687be98649a90e9aa46f591385003f945a2ffc192aca18bf1ef0516ac22fe1526d2e3b85 SHA512 8960a9c2dcaa7ab5225d3d10fbba4264032ff9bba80fd8efe2ecda6f9b925dab4db320a4650fba43c0d9c61d31005c6045eec4a650411bb549c60792f31c3b09
 DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
 DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
 DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20190424111038-f61b66f89f4a.zip 59688 BLAKE2B 30de541318005736d121fe47b75f2d7941c94069d123e3818bc70fa41628492ac60f91c9579555e35b7a365b02f50cd1ac8c426e74ed9e5cae76d8c3d963cdde SHA512 6e3b4851e20ea19500af601ca473c16e13a52845e53047bc04b7af788a7033d3e7eef794f978322992ea0772050ea314d89c82d406d45b8887b3e8144f40d93d
@@ -103,6 +113,7 @@ DIST github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv0.0.0-20151223152923-e2c28503fcd0.
 DIST github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv1.2.0.mod 36 BLAKE2B 8937677f3b8473d8d71c79e9d3e420bae0476de69d366765ba5f9a4c42d14a8cd18a49f4ad2911673c80276bdd47dbf019a62fc0aaadbffa72647cac046c362d SHA512 b23603768dd8994a9b735ae81f119d2ac2e33a1b54e6328044f92ebf03f905210e54692752076413dc45217b0a400870a5da8ebd75856bf6b74272d0a301484e
 DIST github.com%2Fbugsnag%2Fpanicwrap%2F@v%2Fv1.2.0.zip 11517 BLAKE2B acf3cf703d1efcc21eb42a46b9c9f9f508af815389ab9b1bf095149495e9f443845d670b46e2ed754f61a12f817f7d76a69fb3bd899aa022e0a942a2e3deaf84 SHA512 cd9563c1bfa725588a05b29f47c94644e05398354e4081324dd812bebf4c3a07fc9554a643afbdc66add969bcb7379441cc26b650fac5638edb84efebb6cd74a
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.0.mod 45 BLAKE2B 294b4032890409da39f83e21947cbe4e039ae894cac4e044f4c91830c531ab543b510f7cb30dfc1fe05ea58b90733480456824361bf26e8f6e5445ef66346485 SHA512 2710d436147bc9075072e5e51a0df952bd39743f704d8d125ac27ea864bfa47a3ac6f0f6cd1bdcef9639736c11846176fd6f04e4e6c7c306ebf2177446eee066
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.0.zip 11905 BLAKE2B 311593d226c9bb209ef9fc34e4cc9e4402d289053865f8d5d7dece81d7c83b6d0ec4fac25329c5fe2a07015c36bb0963222e59b94dd8a94544d83eb51fa54e03 SHA512 a21d54d64ea7494b69fd7249b1c580e2b20193062c99050115c0376f5dd24ed99dd15d8caaddaec8d31b3f462393f81889bcbd1dfcba14e79b13fa151607dc5f
 DIST github.com%2Fchai2010%2Fgettext-go%2F@v%2Fv0.0.0-20160711120539-c6fed771bfd5.mod 38 BLAKE2B d8a847320562a5d1158e868d3ade028d83059898bad409051f8a342843ec21d8df4305b50b35b7ba7fddad63b53f38c5689f4f7053cfa510a2b222a043880748 SHA512 b3a401f05d85f8d687fa8387b475211ec627c7d2c80f5fe1b5a4d97a41df7707d0cc0dab634bcab246f43058f204f10b45ee4cea5f61d8e7cb88c4ba8f085dd4
@@ -130,6 +141,7 @@ DIST github.com%2Fcontainerd%2Fttrpc%2F@v%2Fv0.0.0-20190828154514-0e0f228740de.m
 DIST github.com%2Fcontainerd%2Ftypeurl%2F@v%2Fv0.0.0-20180627222232-a93fcdb778cd.mod 37 BLAKE2B 109f32f2dc537cfeff1699937e93eed980f34a37faa111ad3831be6dbbb1df965c56ef266deba48aa1390fd94bdedfda9ba3a51f4f6d9519ae24db6b99dfe1d4 SHA512 6485196f4703578401e82673647b49d58fe60d7f90c311294096504d3e11477c75fa50684f00c7b378b2566e6e8683cf18d99f2ac78043b077318a643fb11720
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.1-coreos.6.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.1-coreos.6.zip 109050 BLAKE2B 856184da060ca4416f44b8f61488fad9113fabf92737bfab8dec83a3f908cbad69b5d58dea219d6c9815ef1ee329d10d7e83169f33bf839291e7ba422cd28b5d SHA512 c128911c998712f1062e43fdfbe6f5875a42b5f8d803cfa02ab2c4c2c6b8842383e5195317497d7f0e5a1ab4734115a510bc065282c9c8cba511572b022811da
+DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.15+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
 DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.15+incompatible.zip 4243908 BLAKE2B 8dcef6e903f418d1d4c7388501e2f7fc2505c4af1daebb1c20abc7895cc806bd03f23c82faad2f04738a9cc2eb0e7554123ed4a9eae6ccd871d0f0fa9851c47b SHA512 a6ade775bba2a770418c97d609fce1cd7e93c44d18959e0431abc37cd6dfd6c1d8ff2c704f772e0ee57dbcce49cf34fa24863330d1cb2319980adcd2be2b02c7
@@ -144,8 +156,11 @@ DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip 57784 BLAKE2B 1f6e54681c062413577ca873cbbc251c2bb9df4de6339e1154d6b34aa146136ff9464629e419bea7f75afd9feb8b50bddee965160560b25dc5b4041e9d30072e SHA512 4e0f838a7752838dcdac70a96235bae7aee51242022ec2c27be99f4af7657ff5afda5b710be81e25539d2712e5644211689b556e9d8971897ab9f8bf1d3845dc
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.mod 94 BLAKE2B 94e391c9c787f7b0b9d238f1fc61ac5e90d4d6658f7d60a4c143bbeae999ea0ca23d28f2ca204523e44b61807afa23e8690af850d14203e5755717b0a1f5981d SHA512 b54a3715ce2745ef68bf269b09d458d3712d8ec7a876eff53f5c171d23d992a5391552651c56f7adf5b90a356bcefab552a7ef8dd3a0d562fd396434970963ab
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2F@v%2Fv1.0.10.zip 8850 BLAKE2B 9053d9c01c92faa257ed0623eb06b27e7d9d93ff9c155ce862183bdb9da6483d57873290eb5bc7bf8f906d7b18dd29d856a7cfabec69b84a2f5400f6e43c616c SHA512 9d35a6f2ccc2b51fb2561891311d5ab33737ba76c61f190fa6b4276eadee8b09d008b2c925fb8dd5bf9202bf3e1ec944c0b5026b080d2adf050fbe8e88a74def
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
 DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.mod 45 BLAKE2B fd78b551df24aaa503a1e3a673291776e988c7975ac3bad69beadbec7ac5c85675da6e6da9deb4463535e1b0ef0a3e640df6e7ce771de71f033f0e7a3f67a1c1 SHA512 9d9af0844e5c76f84c3804b788cd643e461b02b8a00fa5a41a6238dd72dbada1bb03aa3e7e420f0c68d9926b9cbd2d159456f26ceb64f1c51162da939742d0fd
 DIST github.com%2Fcyphar%2Ffilepath-securejoin%2F@v%2Fv0.2.2.zip 8869 BLAKE2B 9c466fbe14685f949b792015995e38f276bc66f3f6ce8df45cdce9b1fc362733b3f0b08de7ed393c4fd89f24a48e4bfe90dcc8302af8e636707b07da769b4e8d SHA512 e8c8cbc63aa82d0544634f3aae9a4c94816aa5797bbc1946aff148b19651bea6c3c544add0ddc644d20eec3df99a4056bf11f7f9dd83943c53e7c443cc393eba
@@ -158,10 +173,12 @@ DIST github.com%2Fdeislabs%2Foras%2F@v%2Fv0.7.0.mod 3463 BLAKE2B a78353a168d261e
 DIST github.com%2Fdeislabs%2Foras%2F@v%2Fv0.7.0.zip 106023 BLAKE2B 718f4fbc8b8aa15aeabf3bf9726cb6ce38c040c9338cebf6e1c1c64621f2db408cad8f2958783d443e2b0288881388ae666eb74df48bb40752f3db29883d9d74 SHA512 9ffa8e489bfc1f3399a711c1de4f6dd1d9c49e689edda5c5e5b72538eb1da24baef084b261ac617b85e5e9a27b2e8eef2a779eea4552696dfdc46f42fad74fa4
 DIST github.com%2Fdeislabs%2Foras%2F@v%2Fv0.8.1.mod 1583 BLAKE2B 58c50cd36a8effb147acd6a352ab85037c0ab46683830878eef71afc5bf489f9d14866248d80092990a29bf09bfa24699316041f3626c82e1c6e69a966d9fa75 SHA512 f311aa5d1df50fd7a647ec707912f6f6fd49b8cdde98065ab5763752de8df34c200bad707fe27cac9243e962d5dbff300e21d56f0dbccf1ab3a318417c3a81ff
 DIST github.com%2Fdeislabs%2Foras%2F@v%2Fv0.8.1.zip 113348 BLAKE2B 52f35c417afd6f1540a47ca254252495f570719a29648e50e1fe400b9518c33988443494bf87c9346155ad2ff65cec7c1ffd5e3add8b162b77a0c6e6a607448c SHA512 b0cd9b329bacdc462db645f46dc2d5945fffc01c80d6017c8056d24222892b792809d7995f732daa1157375024692ef9b3c762d294d0c00d0488dd38a444d9f5
+DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20191001013358-cfbb681360f0.mod 182 BLAKE2B 27d2e8f155923769d6df395281d9d2967f2bee262faff767c586e851c1595d8c74db1f890809bce63cd9544c4dfcdbda89e518a25e1a8925ff78607940e2a374 SHA512 14925087284b332c5458fa81d0e92f2a33b4a59e98b93dc6c99e0943f03c13165e8dbe1a27fe5a4d78b62b3b3bdc84d634bc31f346a70301cdf7da7463c85f92
 DIST github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20190125010748-a747050bb1ba.mod 38 BLAKE2B ca172597deee09bc6129ff6d8a27b70cd49f5891f9db37e73f1178996255cd0548405d7fdfcffed3745777a332d3e979195e4da827f45e00305725f119332cc1 SHA512 086ced52944283fce02fb1b53de3748e32fed8a90dbab1d69e9ade5ff40c47e3fa1277cb3ce7bcdce2dc36d903eb52d3d3e723801fa8f6265736badba1ae935a
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20170104182250-a601269ab70c.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%2Fdgryski%2Fgo-sip13%2F@v%2Fv0.0.0-20181026042036-e10d5fee7954.mod 35 BLAKE2B 8f9b63ec3e5f70db4f7f0185a03aee0608efdaf267377c48bc0e1aa6c37d431119d6e422c8e7c9bd93f0819796ca0aac423804ff0acdd49458265dc37e9d439e SHA512 2b6a3774801edff4f0b3fd40ae8e5396782e796e36b02b4d2f34e5dcce19d2f064a7a8d0787a9cb994b9208acf39b466f291525cf6f459ecd7c45d947dfba50e
 DIST github.com%2Fdmcgowan%2Fletsencrypt%2F@v%2Fv0.0.0-20160928181947-1847a81d2087.mod 39 BLAKE2B 7fbb088c2fd9eb9b92170f9963cc29c41d49cccf98c5b0171189de39cb194c93f98ac92bc57ec8655b8854e0720e3769f723d3fc1b4541faf6fc8fb5bef1e041 SHA512 0094e4c4eabee86b05f3cb113a7471fe2b53d91243ba7e25a1bfeb56da22730ba9ee184e743ad0a761999992e315c9176fb996570d9e4356e9b86fb764934943
 DIST github.com%2Fdmcgowan%2Fletsencrypt%2F@v%2Fv0.0.0-20160928181947-1847a81d2087.zip 11990 BLAKE2B 6e668176fe6c60ef53f2df38c83a4efae1cb760e2695a4c3597534b5ff9e4aced701810258ef3b0feba94df0969c32f0a8bd1afe6df9e3b3d3df7b3ed05e1bcb SHA512 47d9b7a47cb2f1c69b39a86965de74b407ffae57e8e8ec96bffbeac401132c23760e751339348ecfcb7092ffdf9496c459529bb98b98e0779964b3c5103b2044
 DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
@@ -204,6 +221,8 @@ DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.zip 123357 BLAKE2B f90cde27ee435ad6c035c1f5d5e5269730bf04c3328ac75e05f10d4023455e73b1a6bee17685393bfd32ca14e4887eadfba2d882bd0d84ad7a3a9575f7b31dfa SHA512 18c021a4cff23572c12fab0f163cd775c9cc046d5216e37d18ac461ea113e1032d504c8877c240bb3d1461665f926dca9b42015991688fe99389a55e2e2ae797
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.zip 127557 BLAKE2B 1747b001bc860fda3bef9158f85863e56c8751834dda8160e80075efd64079059cd088e6e31c3e951db81823cbd33f4787e55b5afca96795707d20b00d09d2da SHA512 d64c47cb432cdddd39ecbd6f53a431ab34eb1f17e95264302b8708832166f847d81dc650e9a61475389b33e0b5b08f8f7402258d1ae927f4fdbc2cd098326e31
 DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
 DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.11.1+incompatible.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
 DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv2.11.1+incompatible.zip 115823 BLAKE2B 160af1621533da031f66240ad17fc8c8e40d3a96ac2c406a1351ce1d716a2d92e382611177c46d86bf5ed91a47d0f3fd962da142b3d1b2a4a6243d7200338b64 SHA512 bcd6fe2be104043d481a4f8f04c5896c43c3cceb5669012dfe85fd18e24eddc72e10859e80fc0a4d7795aa025aef8a568fcc8ada140a90c492d8bb79a80b73e6
@@ -300,8 +319,20 @@ DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.18.0.mod 446 BLAKE2B 507304221
 DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.mod 419 BLAKE2B 1d7e2f5a1658dea6016639a05385324b0769a07f563bb1414d560cd34d47dc64d6fab2445fefeddeecb8e70fc0703f7a174f1039a4f9948590053bfb4451b8a7 SHA512 4b81b994907ffdc0489ce9755fcb76c12b8c80a8c1f3e94a0fd628720fa8bd495b73eec430390151e417fa6d04e7784fe3eecf2efe59149f26f0da953f6598cb
 DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.2.zip 709518 BLAKE2B d7713f9e674f27143f82d8b9d43759984d642144aa03f02ae8b6705e75ebf730e57e4491fed9bf6a396e346a55f01b67de77c166e4358a6fef403b54d5ece3e6 SHA512 045606e7bc59fb708aca8c0917e142edeb3825ad255170a8e8de29a9b39162847f529712680c40f1a050ee92d0b98ffbd598fac4627296148bd2957f598e390f
 DIST github.com%2Fgo-openapi%2Fvalidate%2F@v%2Fv0.19.5.mod 616 BLAKE2B 195302c90abe853d5c39ecaa800355007bebe9eaad6c6a57e49d8a432d1d30440c213cf3b5e926f5264a65aa22a9cb59b58fcb72597fe38344e943a3ba8f89c4 SHA512 099f9d1770c55309210e8885d327a0c1299a429a5252335578009d415b56da4f30c1ab37049826f9a6a009a9a8003194c60a9837aa733e74578b43848b16c33e
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.0.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip 106521 BLAKE2B c7c61852b093d2b0452e9daf9ab26b83ee6426a9afa4f67abb0e0f98ef28961017f774075f5d90fc05d6de3c26fdf90a1916b426b32a41e2cee8fb0452e21f03 SHA512 023209372d47d4b5279789f581a6f4452aaff1e262ecbdb3fbdc48a0939599e319109b99d1c79414716f1c426c143cc1ce506dcd38f304dd5aa3e9348084628e
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.zip 10204 BLAKE2B 37977dbc6c256bcd404d5b7076ac49d1c3c3c495ad0869cbdf8943b24b80ea5f155c80a0a23571b778e7fcb381140988fd19cae6b8ad681e115260b0fe19394c SHA512 1e834ba368fcac6e13fd8b3a478cbe9b181ec3660087733b68adc0dd41838e54367d22f9bc53e602ece889e6051e319fbf80d5874abcf4daeb0bfb9b64e298e6
+DIST github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.0.mod 202 BLAKE2B 52f0ee72de8be8043df75bdc9b888601b25557a690be151d1696949d73fe3239eeee938de9a44801d8bfa940b15ae1749cb6a14249b3fb755e2d296b55c47c9b SHA512 33236cea065ae18acdb40c50731135610d8c5f3685b1c14eda46d99da5705d2eb3457e9c60e6ca60e39860a18343d9877480a183a6242667989cbea501807d20
+DIST github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.1.mod 211 BLAKE2B 5cd9a0b010793e35bc8bdf1697052a8d829fe8e1c05ad49124d7dc1d6ed8a63343012fd1d44909a036e175aa6531ac9abd750db4676398db0d97359d8cb1df7c SHA512 7dbdbd6a258c4648c48e841203696fc917997af7f8c7bec9014a44ec0b3d6bbb1f09b4e9b958a81bc18a80059b4a3bb718ef11439ef95910a1b21ce87d85ccdb
+DIST github.com%2Fgobuffalo%2Fenvy%2F@v%2Fv1.7.1.zip 12623 BLAKE2B 4d27ce189603004e899bc32d5f11f9700a1fbaac2b0fa896a4cdb05c26cdfa123fc65677896e77355763d257ce567ecfd920b61d1bab0015db23822955cba471 SHA512 0e1163dea1c5fe5c80434e40639442e7592715f0bff4498197fe6abeb5a713b48a306dfbb6a5a6bb434f839099333c56ae3d314f5e33912d6e5628c6f755a49d
+DIST github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.1.mod 370 BLAKE2B 1e5767e4bda0f4291ad234349ff515ebfa465e3e0592615308147d7a8fc80868a57a98e90cdd9325536479d960387f45dbe155ee7b3139a79c022ac5ecb047f7 SHA512 f6df14d67539914f0e34620a1cf88dad371d6d1513ac3560f57bc6c984775ed53e4dba946916b07eaa700c8c026b80ded5fec1fc871b3e517d03e8037719ec62
+DIST github.com%2Fgobuffalo%2Flogger%2F@v%2Fv1.0.1.zip 10914 BLAKE2B c5ec46225d323b3163f61b3af7d0caa5797c0bd0b86ac9526612b8770b3492a85c4d831f6b774c8c7fbd6cc911357fdf089bc424d3ab858caca2e0ec6c42eb11 SHA512 4caf07ba598e7526725e7a0d436f98ef27f49506938d016516468f70abe9f0015027c6cf550b92b1807e5cbfb6715c53749dfb3203de348f432cfb1c8532b062
+DIST github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.3.0.mod 139 BLAKE2B dc3d1d2b39e2320971b1c9a5d930d30f6e13764da48c752aa50fa64de8a3a5e91802f0fb7e5df197ab0f78187cdaac92af1f2d2ef3ff4c8cade24fae034692aa SHA512 27976de1d72af55488bd43acfc7e2ae7bb3c90cf244f32139e38f917e1e873b55342e2005ec938674d20a59ff3b46c9ddb2d86137769c1ff0ac9dea78bebb4e5
+DIST github.com%2Fgobuffalo%2Fpackd%2F@v%2Fv0.3.0.zip 17243 BLAKE2B dcd6910da7847aca9ef864537d234cfe65b99d174797f6557b09e235991266388a1706e986698e5193110c7e631bde6c91d3ace568111c231ac418dba0454989 SHA512 9efeb61b78d3ce4d0b1cfb6f241f969c76df2b98c3e27bb42852f2e776fa5aec6d9e10319db6b34eacef67f82971c994a4c9b1f4a33526d68f7a4a28bb6c58a8
+DIST github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.7.1.mod 415 BLAKE2B fe0a0a3d50dc3daaa0ae20efc034551b140fe98683af91aff6c15bd2591fa896cf08a023ba071c3d7faaeb0e19bdcdefe467d84d2a7a0f256207e206909be11e SHA512 76795e1d8b77e7a5f931cf00ca8d62f785a241f9666aff21eb9b5c47fd76ceddc7115ff03a16e02a1e4a2bef0e4ded8322b7a423f1eaaab64ad3da760990f279
+DIST github.com%2Fgobuffalo%2Fpackr%2Fv2%2F@v%2Fv2.7.1.zip 112274 BLAKE2B b38ce7eb0daf2efc3ae5dc2e9ad0aae6235404c46eefc935d6b74d7b7e99543d67a2c9912176a365b79bc20b4c9ce033eb3b5292d5fa696b5a12a8ce9ce47bb7 SHA512 7c59452e7b7708620206a4179138e136aca33c2b2424e4b681ca6205ff3f90c7c3f64b420d36a2a55d232e2cbd2d47ded88ce1b2c0854626b5eb03bb6d66cec7
 DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod 30 BLAKE2B c4b58079c7f353b01123ed35c24b8c9dc43139a9c87b12fd90cb99e41b97d6e2ce646710b261dedd2a6c9572ee42e677be0ffb43cbb8cb55b99d1eb92ac68f4b SHA512 e0a6df51284e6b2faa2ae12bbc2c53c649fc503427f0651fefe99cd852a012a76a9c5d967cd1a088e1b3270f9b68abc39f56a6d823c5913fa025b771145f80c6
 DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.zip 50402 BLAKE2B 361f6199022b22ba47eb17a7d85a670c4843cc4269df2587e8d9fcd1083525308b74f0a164dd1a59aec04b473da7eaf003bd005b92558126f282600b3cd4e262 SHA512 87e7c1792bb3a5ba1c78ea5844c0083abcc10f60d19019bcb763cac5aa7dd7625903e074228562207e836803a83bfb086148d886edc6d24e5fae7fc6d8abf11a
 DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190422162347-ade71ed3457e.mod 39 BLAKE2B 9884f8a07f2a84a159eb17ef62e9b17398b84bdea38fc37591af050dcebc2f56b83f851046c3333e604a7f954b7628c16b267c0c94807f7a41d5d2b797db0918 SHA512 c32a84bb302c9db3f31f714484131ee3ea96fa98b224b9cbf2c5fdd15100a24094e94b55175cf1fb0b6326128c2db8950677d8f6d281b49645b0c7b51b759093
@@ -319,6 +350,8 @@ DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.zip 38604 BLAKE2B a7d16e6b3e1820db97600f17bef2076ec815b81d36c22c8ee927012e8df74bcfc6a3384b2abcffd974a1635068ffa5de9443b204c587df10c9593f830e1c3df8 SHA512 af7492e0d36fa2a876c6204a651d250193900badb819dc7db8c62141d7ee7253eab9d87393a131059587160a0a5f7d373017b2ea2170b4ca6d91e9a58175d88f
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.zip 39653 BLAKE2B c84bb2352695575c56a32eb0e7a8d93818b15625d850ff662039e5650f78dcb06a093203d0987d00a2271ad02e811182cc7fabff7f8b5d5475ff2628d18bcb13 SHA512 050f33b3dd4053885c46c07e7f56cf45d6addd908549ca5ed98036aa14e964a7ff4c30e08887979a69f25df85af131491fc80a62c36d038b1f3af5b3b06756dd
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191027212112-611e8accdfc9.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191027212112-611e8accdfc9.zip 39695 BLAKE2B 5ff7e9142690928949a5b1a167a05d106f064d529d1f3acc0b7d79a844e8dda2b30da10b556e8615539dbbc60e1caa56a43fd3058c1b0190b99f320de6fe7cbe SHA512 d50c62bc89f44d5b15d9a7e0c2c169b43d61e4b406c3d005a07ee908b1be4ebe32b165904dd9f36748e511e8c39bb8b0377724e6abc6e0cb1fd05e393bd7d328
 DIST github.com%2Fgolang%2Flint%2F@v%2Fv0.0.0-20180702182130-06c8688daad7.mod 30 BLAKE2B 342057d82bd6cfc545f94289ce6dda498b35f949a3e5f9ad978910e5fcde556edd6e7a3847d136c5ef40115d99d9718e0c2bd2f420ed4ba72a4cbfda31db4c6e SHA512 fdf76199e91b2db4f75d0f8ce5844df0c4d0ea77319bec31ea1cc12f67121ebdee9f236eac8f6410313e84e3d4d625b92105802b8f1bf25de49c870aa6574d49
@@ -330,6 +363,7 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e8
 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-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod 35 BLAKE2B d6addf74aa6a2ad97c1792946aea166c48bbcf35fbc582a9dfeabbdba68992106b7cc7b2515ccf002f44bc74c0f0655089e3110e39fc312a683b1c364318279a SHA512 33a68d466b4aee3c41e6d70766e90fc7b7b8e904acb360d1a5e15236832ca47e5f45393a7f5c486893f6a8ca04af4ca4ced27b064c15a5189217141a325972a8
 DIST github.com%2Fgolangplus%2Fbytes%2F@v%2Fv0.0.0-20160111154220-45c989fe5450.mod 35 BLAKE2B 2266c9ec6e2058e41afcb70dfe33ef7bd1d4c0dd3ef6af9dd85d9f86ac0c5ebcf231c21d66a0c34d6e5930e1de410ad482f7774a42398aac213eb0146c2a00ef SHA512 17790f178fd61969fa03eaca0c0a546ccb8215016d44bcec8105cba39a188c855b5f90c7d6c01fece401167daac2b662405532ac3b38e0a167a2629e6d52a01f
 DIST github.com%2Fgolangplus%2Ffmt%2F@v%2Fv0.0.0-20150411045040-2a5d6d7d2995.mod 33 BLAKE2B 1f96bc7ad16794099334f84bd7b7760ae7eb94a4b32186b2d408e3bb424d19b22b3eff38a817c6ab845ea7c39555305bb940f2b9b9e83b342eb4169f2237d207 SHA512 5a17ebee3e4ae0212aa83c4923932996988a3a693d0ece14fdf1aca4193452ca43cfaf4bb6dcb78c3c7b996300ac285c503ac18b098b95445bb26b7c25cfd25d
 DIST github.com%2Fgolangplus%2Ftesting%2F@v%2Fv0.0.0-20180327235837-af21d9c3145e.mod 37 BLAKE2B d66b4b477f3f94af0760263acc5065e51d1ec6a88ba3652b0f36233e6bcba3190c694019fc3fb5cb03cbf9118f37b9ab975eb6bc79adbdfdff419cf6a13aaf0e SHA512 96042f35b1d67dd01e7d799c47a7314b3d9c30cd318ebed4a55066c9c5d94d321377dc09ee97b64644c5132c0e03ac8bd7e856a38f1d694d31b94d88cb0d0f39
@@ -346,6 +380,8 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf
 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%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%2Fgofuzz%2F@v%2Fv1.1.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.zip 16936 BLAKE2B 04270e67b679a158d5675c41f8b92803ec49d9d29f4e8725345c307d7cfc97a4876b30f6518eadff651a38af46440e184294ea48757dcf53ace35f44d36801f4 SHA512 c94aacb755ae942dc487c9e8f79f01016cc31fb118f6f340a58eb4f458de5735b2533af6ec513cb4512a05e270cca73faf46c5f3f621a0b76a79d0606000d3bc
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
 DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.0.0.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
@@ -354,6 +390,8 @@ DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
 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%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
+DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.zip 537340 BLAKE2B 6c20d5154ff3df760a60d3828b2171204674d8c477b7836cfb41330eb74656fe2dabdd8067eb2c88ad511c4c58f4695e9aaddf23f94767e267385ef26fd16bef SHA512 fc23502a912ba05b0e01932450dbeea39731b1c470251a3780040cb79265a8c6141ce6dc806e564728ca5bed9b537bf36fe6cd104eb25cef8c0f9a04e51bfeb2
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.mod 183 BLAKE2B d0b924588ff8bc8f0f19031808d4d1e33926040e3d66ada91561b5f549b663ea2a1ebf682ee9da7a133e36a1bd27312465ccb0076287c1d5625629431fd32b3c SHA512 0ceff1d2167408fab3f5b5d1b64563fcacdf5b1db94c4fc8bf4e90dd7fff9c7475862df9ac15566f0365e5b47b4476b8cd398a90dd011f4a73ebf5f7fa61a7cd
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.3.1.zip 561785 BLAKE2B ff16feed7c7482a41f0fc715a34f82f9818abcb79b5178bc7e5e0ec641d46a29094881e10f38a53e6c4c90e2e0f302be77ce9c4a4f07fef9f896c09351008761 SHA512 03c175f256daf180119752b31820d6c3ea5cf25b091ed8cbc3b28c49df68290618473187ff95c43dddb69d5f60849dc2cd6911c1a3f5754a32fa0ddf24ac3528
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.1.0.mod 201 BLAKE2B bc1972ace31333e12a0462701bcd8aa135ebda6f8619d3f98e4db0bd037ab854873c68c2503812fad3773f1bb1937aba7ca4b2af50e8eb2c13cea5aaefa7f573 SHA512 a1e237b3f47807afcbe3eed728821d15da81c78e20562ded5a8cdad18d498a670cc4e1c10821374fef8661afb7ec7e41f27b4dab8db2912db7edbcdc642815cb
@@ -381,13 +419,17 @@ DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20181110185634-c63ab54fda8
 DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20181110185634-c63ab54fda8f.zip 20646 BLAKE2B 35ad7d0c8f429a3a9884b50201fab5c2eb1d4a1e9564e880348d38c42385e0972fba571d8a22f7a86ff4d72e7f633d989c03e66adf232ee298a73fcd95153de2 SHA512 a6b5556424517e0def4b3a80f8d2a80cd8fcac2182f3302eb7d81f12a61a217d7a50c6795498f69b5391986c5aa3e789e7dd5b94c570b252546f58e506d4d885
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv0.0.0-20190222133341-cfaf5686ec79.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv0.0.0-20190222133341-cfaf5686ec79.zip 138604 BLAKE2B 916b22547652652d969e12387616e00fa14ac1c17f0a35fcea91b71d8ec7c856963d64d54a195c9ea851bec8df9f2a67a8fa527cd5114dea968069f83e226691 SHA512 68277a11e1e5f569ba3176f9d04fabec386fb697ef08340aaca711f0903fb81eeb74bc2dcd87c5c1dcc18662eb80ef720b677d1584c1137f1e15810c3028dbd5
+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.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.zip 35110 BLAKE2B 4ebd3cf0dc4580a53cbefe7a955cf05cb6d1d60a69951ea4e18eaaf108ce2cd5bfd0b2dc4bed62a12b48922f6f9dcdf1e598b77a946bfa0267314caea827286d SHA512 5c8e6beedefdf390a9eda76fd8d5042323e1c9a6306605ec7ca8b1612bc038a6cb0c02ca1093e0b6373a05ea64b7eb0c0bc62720a74b37d4ceb61564f4d46753
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.3.0.mod 46 BLAKE2B a909a61754bdc458c27211bf62b57f4ead8065bcb84511f4fc8c6fa77f56d78ca714e7e311035c1544d92f596de2fca56bcc767f9aa360d8d2cc36b7301fde21 SHA512 b1c1ceafb509b0b3c2b1c5fa0a28281880084a63a071a32f6ea4a04dcd2b2c455c9824414da7f767b1e039a079b6a40c0505a2e71991b9e737c1ba01947ea434
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod 42 BLAKE2B adaf8e14cd6696bc97bedcada70988d2508d8bf28e94a8b528067359665aac351ec7b7f38ca1a89ceb0c18c3c7935e30af4df20102563c9372b34b0cf54d41bb SHA512 da70feb8b6a17512c3761ce6f13653ea47bfcb4af69b471a3bfde9b79901d0f24ede05c10d35f3e051df54e1e636a848be5d00194ef5e9b85bf7915d6b27dd0e
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3db37bc280cf5f36e522f4b13f7daa45768cad11c1148634ce7af618c1c20f568f98ea7193b0be7021fe8a4d209a4a7f1c94be3c05924a36022a57c46b1 SHA512 6927a910a368e1f2b0792989858d25c5a55891082cc38f5907c539a35919916e02872619cbf45ed583c6f6f8e85936a3fa790a161b071dddc922383e983d37ee
@@ -398,6 +440,8 @@ DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a448
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
 DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.mod 33 BLAKE2B 1001759c50e0b825975577d6b7752503eb891aacc3d3a5642a3f338fa90091ae6de3cc81d2d7270ca7fa0ad40e01cc53bb433dfd079cf419904a1ba910014bef SHA512 3f1f76283ecc9d917de9b7061becf780dff161774eab48319d9094f08f51b7e4d82a4a068fb543ef766ba73d26346de29c6a69ac31e83f43186924aabf5b3bb4
 DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.zip 23295 BLAKE2B 7509d0d278fb0e01c8a83013382c335d0974007ed7c7637248b1bb161cc75fc9eaa8e89766acca3f11f0749413388ceb07dc11ebe894545cac98726894855928 SHA512 9201c976a637124fda2853aa9963613653165f96d9a6a4d8f100ccadc692686b168355769e643e840c0f3e44944e5ccfefc18c58157f38ab6b8acaf3f4b29953
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.mod 43 BLAKE2B ea72fa407faa556d4164e25aac2a8093cfdd8efdff6f68f9ebb277ddca3aa7efe0df0f22546a36fe6858c22dc638869cadcde024e32d0a930e0cf12ef5b17c7b SHA512 f6d3531d393904144d7c84cb254becfa2dad42f8695ce32e3f44789abe89d60019f01543936a64ae1728f8d395dd96bace969282e3cd9f8a9eda8085d3d1475d
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.zip 24521 BLAKE2B 6fbe5fc8d03415b09b19029c9df95e8a3169c4d4181a988167a104b91f81b5d359779c9f3b51e71dbea191c8f4bdd70fa11d0f47235a10056725f0a6c97303e3 SHA512 20e6207e6ab0e5bd23e4e496c19573345228e0abc804db1a17dab11dfc2c9926200fba671292a63f09b88b91905d867d817506a7bda25c261b3c4002cab9e961
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.5.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip 26261 BLAKE2B 65c5f6b4f0e2af1076e279c5d3f61f7d6b8654b8a7537aa291693a784886dc68da0c40b480d881c41bc46ffb28364b90d22d88b17cd82ac8380d5ecd9777414c SHA512 448dfe08b2a5f7f2f1e9868274be4dcf7d2f2ae495994d16c74924f8059742204547ef2abfb73428afac3938e5f477a9db51b29bc76fbda32e01b67419af46af
@@ -407,6 +451,10 @@ DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 76458
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160803190731-bd40a432e4c7.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
+DIST github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.0.mod 145 BLAKE2B f260c703eec27a229b5bf30176cfdd57dace844cf14b184d9289cf197092ce4bb5d4c878dfaa54bbe3ce23e9c28eeb35b94376001f4085e2f05d3c977b48d4c7 SHA512 b529b6f0312bf2be99646e11a339a97885716f44408714cf2c4343d5c5cf114dfe454fdfe75e9d5ddd9e0ce8c3ba451ba0d3729eb27616246c0bb72aae6d29c5
+DIST github.com%2Fjmoiron%2Fsqlx%2F@v%2Fv1.2.0.zip 60383 BLAKE2B f114ffe3ef1bf6e7090ab57c4ea9591682fcad6d150b3d235534b4186580e3f66f5b4244fa47e8d62b9cb1a317bdf558962512a6c562858a1a0d2570bcdc97c1 SHA512 ec6e5e98ea9d968c27878fe0da8b7a566920202eabc53607e91c06e1bccf6044bb33d890d2c5c7c03ca2051ee1b0b28c043c77acdafbfa1ffbc232569634ed6b
+DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.mod 32 BLAKE2B 108af2b21e180487fb535381cee881222cd34895f1b3d78561bee6bdfee40e7b9681c74345d10881fbe519fc496181b85eb880b5ec411e13b24926a39ae8a512 SHA512 5b3e66c42da78c7df031089cc05aabe56671eeda4617683a1e9857677108cd0dec00332f5b05f29923b1314fa1d1c88e57fac1b653808cadf5a3cde93daab03e
+DIST github.com%2Fjoho%2Fgodotenv%2F@v%2Fv1.3.0.zip 12758 BLAKE2B 09c81f777d01c390e78ceb0b3bdb54c0ab19e1dc8f1d8747ff79e96c12b9fb700e3affa05a65b2bd36b42cd86979a45a78cb3c7288ec9dbe3b8c972313dd83a2 SHA512 73928846a03ba2fc7df0952deddcfd553e2decfc4b336f4c60b90caace96621b2b01057319706d4e52c6590c4963c049a496aaae92bb054d0467a9977c4befb7
 DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
 DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.zip 8857 BLAKE2B 2887917f30fc4cba4c028ce8d42262b007ecd785df9f4ba1dd74f9ddf68376a6c3af924449684c8ff8ca530b249445a7ac0ea36a63fdb18d767ed3649a63f7e0 SHA512 999ed7f22551e55d6b4b59af2ff2692ddddb251de4c61a835ccbb9f8386ae426ef8df6c3434b8e8e143faacf82ab64e022350f9d57ec51544a27042465cf920f
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
@@ -425,6 +473,8 @@ DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054e
 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%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
@@ -432,6 +482,14 @@ DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7cce
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.5.mod 34 BLAKE2B 1365a1cf7687e1b4d333eadaf4871aa7a00c98f5d235453d7e4e000b51127ab036d4b20866f46343338aa79acaf71dcd8c847aa0b1568e7df9cefdc05b33f009 SHA512 ac5a145ff4464a083cec55891b85876ba0280c7115e5be9b70b3300311515260d9e03a94faedcd8eab5a7a2de838448af1a810c0e9f01cb8521582dafc10d78d
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
+DIST github.com%2Flann%2Fbuilder%2F@v%2Fv0.0.0-20180802200727-47ae307949d0.mod 31 BLAKE2B cdb721a4d4b33e518da7944f9cb1fe048bb7d126645e5031ebc7907085bd791393749b3d26d955047219d7dd54242c9916b5a73b1395501bb676fed7489376b2 SHA512 3e38fa21095d46b366bb05100da27f52e5e8c5b67352f766b2b0ff91a5a0a93da59c35e8782fa98a1933ce43a780fade4609a8f824d4d742d6aeb56cf3d3bba3
+DIST github.com%2Flann%2Fbuilder%2F@v%2Fv0.0.0-20180802200727-47ae307949d0.zip 8136 BLAKE2B fb4e06acd3e985ab706227f7453e106071687adb422b2ee3dca4b8e7015dfa154a3cd13a5bf7c1f559abc46c5938ae199683e13197598e3f0c02a3939a001e2c SHA512 2070df4becfdd6c15b72fea268c0067591995c231abfe3016e2813a8b9f819da77bc214ba6ace8deff8c0e966402b2a9965bf6c1de9cab4ca57b6159f94cd9a1
+DIST github.com%2Flann%2Fps%2F@v%2Fv0.0.0-20150810152359-62de8c46ede0.mod 26 BLAKE2B 572d6a985e99bbccf2caf7782f8722c684a97157a13120438f6ef5f69222437cfce96eb45b77220b3cd7581137bc3739d200894308a0b0e013399f926a85c65b SHA512 f07dfdcd383aef5dab1c83cd8373a0a6b34e73a34f13f74153ec52032e8a3e5edd425110d81c63107901da57597228aba9df744fbfa289264a84794cd80eeb07
+DIST github.com%2Flann%2Fps%2F@v%2Fv0.0.0-20150810152359-62de8c46ede0.zip 7157 BLAKE2B 914975b5aaddf896cbe00547422fc3698665fdb8c50baf1a8f0f244f908f25d0fdedf4769aacdfb9b662180bc4365e09ac9117525d10bb039bfbe83de86df293 SHA512 be7bb138627087e0070b260c37d4ba7dc4448cb55ef8f610af35b067568b4b305e32141b0c73687b04fd5cbac508e6b3ba11f6ef60063ce563a03da5dcd70ef3
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.3.0.zip 114746 BLAKE2B 19f9157f1a163b5dfd9e5a2b09d92873c8ac191aade266d1706aff1624f3bb0d87fe7cfe0c00c4c02a7cb649a98d931d1f95ab547961778117b61909982d0231 SHA512 3da4292db7b32b1422a7c85497cd4f8e27b532dbd7570e41b17f9388f9377912cd9c8fc6c205bc504f652f7b3c6945ea21f125c14c5bde97dd4a629e327ef516
 DIST github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.mod 36 BLAKE2B 16dded88c0f04a1444be329ce01bc4e336b1205b962021589dd7f8d999285da6517a4a332f585e129250cbf7387157e713f0a6703dc0b316c4581e7782dc199f SHA512 7c71255a224e45b30037823ae51ac2805b91238b6e9e5cfe295d822428af95760718e2c955f15ad672011d317516657a568b412dc2e184f068d1bc18c2eaca47
 DIST github.com%2Fliggitt%2Ftabwriter%2F@v%2Fv0.0.0-20181228230101-89fcab3d43de.zip 14370 BLAKE2B f420806544c85e8956e5588873c10e604c75f6a830510a1e163fc278ce802de4b444a15b01522249749abd4ae77510cee97eb7f4e391e22c9f4469bc705a97e7 SHA512 b535bf7bba884b24e7a97c82b12a48954a4b5b7510c3383d37bdee5963457d3122ed648f91432f9259e6606927fc2e9fedd56902ec20223c8478c2a0650b3b8c
 DIST github.com%2Flithammer%2Fdedent%2F@v%2Fv1.1.0.mod 35 BLAKE2B 9177d5e73b349b57f364f3bd14e835a38cb33ae37d914454aafca908004c23c3902eebd21e9841f93b9728dc40d061a78aaca599e1edc1df0c941fdc1e972791 SHA512 f91dfedfb737f905f20c50323be91dc990ef172727da91efea0fbf25de48f1f4fa8e288032ecd89af0fea177b905be7986ebd1cdc7e64853fe7fbcef8fee436f
@@ -447,20 +505,27 @@ DIST github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.7.0.zip 68804 BLAKE2B 1949c9647b1c
 DIST github.com%2Fmarstr%2Fguid%2F@v%2Fv1.1.0.mod 30 BLAKE2B 672d0e9f9aaf18bd8da762725652827a96008d49cf50ac4c7a9776d884b15dd92a7738f49ce870b53c9136976487ea8b64a31f9b689615e16327b76a22ae605a SHA512 65984a32ddd3eea6fe699c2e636cc2368a11059756fd1f711ecb20930ac5a9bdabae5735e9d4ef829bc4312219bde9f2907dfc7864dc53c2a580fca3f8b7b39c
 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-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip 7026 BLAKE2B 3cebbd0bdebcd1d32b7fc618b7190b7813876a1df010d1c3ca3800c41acd64b6537e4b3e4d4a574e3eb736822a27eda7bb2fffa197063baf9a347a820573883f SHA512 829b0596279218a2fad36695fa42036f265ce79903a0f5aad27495dfc7c6a33e8bad32010e59f4dc6853f1e38fd9e9f635ca2f56adaf5ea47e4914f2a892d251
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.zip 24025 BLAKE2B e814fb5f02c39b111715c1b39b66cd720c03ce5011c2534f6255eb2b6fe9d6666eae2003431e8c23438f0af500b6b738ee71c715a4f4abe49df63d2e81d75fd9 SHA512 02d32d992b0fdf082ee703e36f2d3a82c2e8c1e260db4f2ea83b9f73f44f8486187aae2190d4d8c506426a2b81a5468e0482cae946ad488d26d7d9f6becf9e92
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
 DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 22344 BLAKE2B 9dcfe0ef5fb4f7e493f29ed3e5edc8ef2744351a4e2a5b70f5a8931b503925ed58b5f5f58e3512fe5fb5fb8d2e7bd1598037f29dac4520e7d966f60ce5f2d307 SHA512 fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.10.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
+DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.10.zip 7653 BLAKE2B 634fa4a231f31f291e49731e9a5e5d57aa289c86ec8c8fe879e6d03a28291dac034547b6bcc239539cf67f36d6e6e6990bd4e03a92621ecdf01ec899e1c03325 SHA512 075011dfc750263fdc03e80c69feaea71db12c9af8c99b49ebb35c494f5e3ac5a4faab3bdc1530322ea38ff3eb2671f0a3871097dea918f736f757e50cb05b4f
 DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.mod 38 BLAKE2B ddc3076fa3a93a287dcc66d087fcfa08483a03baeccc6fcfdca7c390908cd0b83017754103a78f6977c929d24868a9ce78859bf9e270fd84b5fb38ef8f939f9c SHA512 79ad90998c2a3e01501014598c152d4d08a92d354678b5e395c4a16ded8519f12e4ea883485ef49f07e240c52e075c7f9a07a410eaa9a1aca3657cfbfe4b6368
 DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.5.zip 6666 BLAKE2B f8b1dc89e5c872b76d4cfa86ca5439e074cf15736861f772d0a01d195ccbdc71f1cc58756e403ae13784d244c00c38dca27619e5b6d1039a0840380e0c13bbf1 SHA512 db1d13b6e07e68a5a0a131b6d2bf1b8d21c25d082d02e911b01743b63819a9b8c558fbb929e8803e68d6b7ab3a89aeb0b23ac15a345cd1007402f0a049c831d6
 DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.9.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
 DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.9.zip 8150 BLAKE2B 50fbd50001b69238741ba79fc1021387ebdfcfe54fb4853c0e3c2c551d5e427b4311d9fa2062860fb26e42573367442ae58446cb8823f3fabca8228d9df47288 SHA512 896aed87f7b0c4c30c2e8e37e3cd290cd6bc1a427a4ea03c7189bb59cae8a4447754b20e51e6bb9002245365cc5c03ae019e7090d8e08a028c40ee080e997c6d
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.12.0.mod 35 BLAKE2B dfade1d4d17af2380cb103ad9a0c91ce0eb7e570f9ab98d32c8d74a9056b1ba89c44c6fbceb4a2d5e5d45bb552a18e5845b1c40d8d1efbe5a9aa87e4af0ae2cd SHA512 c929334b82e3174b98a22bcc58dffd1291e3bcea6c5f789ab36296353cafe0b09640ba7015ff559acdaef58a9212b0367bada54aa89f563c6dd4773f3220c04e
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.12.0.zip 2344176 BLAKE2B 5e5fedabe2270ffcbce7c23d14b54d1464e179c0f292ba0140dc0e3d39ebee30779b55a48cbd2d0efc86ab303decbabe737c3dccb9e4e8b3c5302f6f21ba42c3 SHA512 1127f9b191f93b1815ee237741b0c569aca74009e31b762e9cfd93d556388bbc1c6fbcd35a0d7a89ca34d0a18aacd96b442fc98a297ef1b7af9469bb5e1f3c2c
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.9.0.mod 35 BLAKE2B dfade1d4d17af2380cb103ad9a0c91ce0eb7e570f9ab98d32c8d74a9056b1ba89c44c6fbceb4a2d5e5d45bb552a18e5845b1c40d8d1efbe5a9aa87e4af0ae2cd SHA512 c929334b82e3174b98a22bcc58dffd1291e3bcea6c5f789ab36296353cafe0b09640ba7015ff559acdaef58a9212b0367bada54aa89f563c6dd4773f3220c04e
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv0.0.0-20181005163659-0d29b283ac0f.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv0.0.0-20181005163659-0d29b283ac0f.zip 206092 BLAKE2B fed3ae9d893f030c21f92922d9909a2f5674986be0b67fa7cd26374616b713f73892d1e89bc889e254f58999c0f37726bc5e423daa1d86f5cfef8bbc20fc5a18 SHA512 e64071272f5cfcad29a5fecff94cd8c04454bdd141741d09e40a4e119268138d56f17223eae1c51c7607c39633a6e9e8746ac017e0f5346f2bf5f9a7e827b7dd
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
 DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod 91 BLAKE2B 22854387f9c0bc85c6f4b7b9c5ce8a774c10c6be0c43ec6d188b6ff2f2e394ffdedcdd1bc0b8ba0e31fa3c418cc9339a78a798beeb355032a0724b284573c38a SHA512 8858ec62f3bcef65224ee7d66bbc16c080b2ed16609c46c5c6b6d983b9f7eef9e020a2ae78a16d0226c0f02c609ec5da92565861c02a81494cd6060dd56d005b
 DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip 11210 BLAKE2B a469026ecf6a1ee2f2d56091fd90f00857cf5e57164ead9e53c15af03d10a8b737a1d2b2fc336e3e972af014dacf8f1321ee1fa1cc9dab93790fb6d03ae195ed SHA512 30b1a531823403a911d9f877352218890bbea15d82390b4561ebaa4bab09f493d49181ea5c34078c18df31b1896165e80c4862b450ef5858ed8af55b2a0c42eb
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
@@ -491,10 +556,15 @@ DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a22
 DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod 34 BLAKE2B 315fe4d5620c1d1c92df3fd382560ac2cf164aa17a741c1a74fc25807819de811705467227923fee7f804c6b6e96606c87b4adb11a6b722f367b543c2792cda0 SHA512 b1c163d7a6a139eeee1457fa07933f01eaf6d2ff24d10385e75f87b443a95fe1b08e9e144d3c18eb6a77d34e8521cc6dbd486fefe908e60452c5a80f654c551a
 DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.zip 8705 BLAKE2B 905de677e6b1baf15fab1e19177c6f45f7b84aaa1e6426f8aa1c9c77d81b491d4c334ec542d45729e380017a91619b99c8e79451768b1cd9bacdcfb7e9e0981b SHA512 a7983e1a07e1e7fcb047ed7f210cc131c1ac43f4bcb1863c8c17f557e2e2f946624d793e8446632ab127d109ee5d8c1de96f914d6183494ec46145ccd5e75da3
 DIST github.com%2Fncw%2Fswift%2F@v%2Fv1.0.47.mod 28 BLAKE2B 57fb6c274af3e1f296bbb2c4b81cf52ecd31af71afac9be2f77ca58c67831ecac4eb2f4f8819c510f3e2982d9a5ffdfbb5f384db878b37b531e59e06e0093a31 SHA512 2f4794d0c8dfff16f1fa252eb5e3396e2cc5479c96b5e4af9ec01931387790e51273d4a308fb2813a699a54a3cbf6b3adb5e92d831d3032120cb5f19698bfd19
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.0-20170122224234-a0225b3f23b5.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.1.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
+DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.2.mod 143 BLAKE2B 2093eab853838f64e707b38726d449ed964c84e930a04a57f4e0da17990879e813eddd47490ebc320a0e3e63f066bd171d34280217e363368addb858d5ce66a1 SHA512 2c7ca93aa590a599d4ca5b47238459e84013ca40b9bc25f95ebede9f68f1592b785716341e8a3315a0674310e547cb747c8247e67ec4d3408d1ab0ba1c0ade74
 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.10.1.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.zip 243243 BLAKE2B ab663a1a0cbe337fee8b519154c18aeb568da73186d92e7cb122650e68aa22a728c04b91992660a8626c78be5e5550f1538611718052348a2a760ad040191ef2 SHA512 9269de68436cafd9f729f88cc0b8775ff2e94a7ac17f691c4eaf8e2645808558797937b8f1de857122daf2e31ac2a2c13d5264085360530b3ed09bba40f5081f
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip 245650 BLAKE2B f917c3c8b6076add4a4cb59fcb1561b21785e9c7cd910c96f7decaeaf4f2c988566ef656925cf91842cb4218142d13f0487721c23dfd85bbdce1f847e12f1551 SHA512 bad04a31aa648777f437f3a7516549992962ef1c660694c02aee62508540c553a2ea36370b917d29a8e4510cc171d94590721c447e8878b562f55a7b0ca78f23
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.zip 241037 BLAKE2B 6496c984a58729c6d0f0099f22d1dbd9c160639f3eb15e473a3ac62df5c6bb3dd6ec3a70da85c75596e28c04d0ecbef7a2e3ca858e4fba0247e85fb81e15fce4 SHA512 90cdcf9e8aa063711cee273792a94fdf4929c0dac94255e28f5c51894d91deb71284acc94d733c11d38c503c5f1a4770180582eca570a0530d215418eed9fd97
@@ -533,11 +603,13 @@ DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e
 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
 DIST github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20171018203845-0dec1b30a021.mod 39 BLAKE2B f2e759320f64fa232673f4f5326c688510df6d43523a08df1b4b7524f92e294bf196c13049fb36feb846916a66b4baf7969cc0200b7109467b1f468dd6ab61cd SHA512 c0602d22e7cb8f1a20a354cafe61518a84a1499f793cdbb4e1d258d62b4f83a2c2a72e6cda49894eb2885ff524baaa47c542937c68bf338c76de5953aa468436
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.0.0-20180209125602-c332b6f63c06.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod 540 BLAKE2B 4d43a0901fa46da74e62fa22f61dfebdf6468f2766bd43dfd487d7a5434f961d181ecf26015ff9134e8d3f9c2dc03da6abbcd0030348facda3a499af9a04665d SHA512 9add81238044589ae2cf38042b963953d507e40945118fd62ac1cbf41bde1b001a69423c50b7045b721488b3d53489b4ce3c544b68f6c4e31e340d2581f7c8a6
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip 193855 BLAKE2B 992f1dd35201c2f388e3fb03bc51a592a4b36db69a27b52d9e840a95d920cfdffcb2dce6fe2b8fc30a718d87b07383df2ce8e97a4a2a40d4f2f0ceec35c1d4a7 SHA512 79cebb06e6a958cded21781e651e1afd406c7502a945f2c97c9b910d0621a46a7a84f8fc8fbe7c21547146ec407a8f475eb0e711f37273e28f2fa5b3062ad19d
+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.2.1.mod 403 BLAKE2B 1f6b768b530eedeb17d97fb568df5a39f5d71fc75c5851b0a07b2cd6dff1884c5d42a4b19eb7ec5677699c4f99858b9d7301ec8fdb02b36ae6d401bc38c17a4c SHA512 fe961ef0875e1251f0387a7b1a49e41d7ccd1150e01d383c6893f020c8b0f403d87a407e47d96b498b92e61ec93cc5e1da681e35e586b3d63b4c54d1d4dd685d
@@ -548,10 +620,14 @@ DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f42
 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-20180110214958-89604d197083.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.zip 139422 BLAKE2B 8a7bae0792b45bbc14f152be071b52651c125f64630709bd7539a4a6bebb9a2305a4dc5c39b882190a46699124ca491e5045ec631d0a544c5ec03f1fb00d303e SHA512 83799d97c51ca8f9a557366506ad82a9e1edeee8388ac77f0cf86ccb17f84d99a3e3efabcbb21c31e2eef50a59aa860482900c0dd103b27bdaf141328f830fec
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.zip 151692 BLAKE2B 89c5a1012d53a62b773c2c3e9a20426564f01e70abd39ea67cc76abc00f38e6f1443ccb31c0ad89920cff80ad94c5f7e72c5d67eb3aa44e047c0bea758be242b SHA512 121a4e3ffbf959722b4333b5e449dd54b6a84548bb580e429b21fc6fdb6a494456ea55208a039f7be6dc7b7fedcf0c6183edd0dd727cd7ebe0ec517a8e999c85
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod 857 BLAKE2B 4c4486d3772ba9c4ecb347940a8e6c84d650847e5e1d9f2a0165569bf062c2a2060cd01c8325221a0c59da8864881c35bcc1532acb0b52f617a02a28f4ebcce9 SHA512 17deca5d2ce10cfeaa0f8e0b1d83317023f4c9841149f9b989cedbc9ea2cdd2d05b2dec1a6323f6202290c7920a68d35da1d4b064892072fb056ba3a767129d2
@@ -561,16 +637,29 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.
 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-20190129233650-316cf8ccfec5.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190129233650-316cf8ccfec5.zip 106381 BLAKE2B d9aef2973466f5c7487706ad0d8c1c3b6fecca86cdc667bec0504f86dcf9072361f518e095b01e8d888e8d803737be342b4d7e91a1f94669a4e40471dcd3601f SHA512 b7a511a3b01382f37d167d26ab2bcc0daf965e312ccd1c3135faa739bcf5680364d5410c7de279c78c203d47ffaf9dfc9b26061ca0c2b3fd7fcc013a31ff4876
+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.5.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.zip 188550 BLAKE2B 6163258786861881f6a7b621f8578e8dbe3eccecee396c3564a88686cfe72584e234f593847ee5cb4fed6a6a1009f1f14da8238f967ce5d68ff919410d25d8df SHA512 42a764174dc4a56c6e27b0e83004f042b3fba397039a923310b8bdfc658ec24096395f27bbd69e8275c1d0f0ea45ed68c2015ffdcc74b6186c6d1497f0ea1e6a
+DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
 DIST github.com%2Fremyoudompheng%2Fbigfft%2F@v%2Fv0.0.0-20170806203942-52369c62f446.mod 40 BLAKE2B bc3d826f4064d3832b3c6156849f9734bfacee51a6b5984a1dd9e4432fc83ce9e73f913bb36e17d11cd01958e7eaf36a83b3973a03c70a381c23e60eeac1bae4 SHA512 60f8fb7e3e922979c04db7c0e461f22385607f2b2c76600f230e44f410cc01dd2f5e4662aa89171a94ddc2385d879a785f3a2b6ca806a4123bbd2509fb251be6
 DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.1.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.2.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.4.0.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.4.0.zip 189937 BLAKE2B f8cfa55e9ea1d32d20233241b8cb7ee4eb5174da429afcf6cd2c38f752d7d729dc4a6805878c3d75cc0a4413ab79d934e6b99e2aaa113f05c85e3255e6e9d28c SHA512 b25f0ebe504900b3df828340c68ebd40c6f2fee71528a0cfa99f03f5fd5d3afe96dbc6fd23a3ef92b431162be133455ded65f1825627c971d7d68833e11d1d2a
+DIST github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20200212082348-64f95ea68aa3.mod 541 BLAKE2B 8fa6af798e820e8f6cfb87c74d71cd69f8b857658d27e8ada17d7065fd62fcae447199b7ad8c4b75aa36e3fdca0b53f11183ae8af3c0a1fedacf4629be4cafe4 SHA512 9a9b22523a458c61d66c7813993983592bd8f4f1030796688a0f4302cd85b4bda4b0088678504af74989f9b5a281c367c272e2a32c32da530725193fa8464749
+DIST github.com%2Frubenv%2Fsql-migrate%2F@v%2Fv0.0.0-20200212082348-64f95ea68aa3.zip 46530 BLAKE2B bd4a11025c5125d13b880679816bf7b30df1c98335234d9f144de449651ed8b5c248ea095fd0c0cd6accf7c0ce9d2abb13fb29b2f1d87edd87af27046677e1a0 SHA512 5dfed30da87fe9d1fc92d146ee70815f3a3486aaf703c12a0a52df2380d52789efabae2780d17a0ef6e1c462b28fe635ab5b6a79fc2f18fc0dc230e292cf3e9e
 DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
 DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip 105716 BLAKE2B d8a15d43cda9d636577a114fa0cbe0c570146402a5e0bfe94bb4b49f1b5d42dc6f30d9f29682721c28c63d261f9bc6fcdd6094bbedd81ace7bd2ef657ed97405 SHA512 7cc5f41055137124a3d330e3686860b3294c668b514fe19b21edd6f571ee4f3d895dacad4ef6e333aabd3a872f2bb3ba50ffbf19636d7f1bb462d97026713322
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
 DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod 337 BLAKE2B 41471db637c5c0363cd36be6d16a6228671ce9658ef71103ad2122a2cd8cfc13c30b87bf2b34df7ba9d6c1fff1ac821462fbb86b622c274cf26a1e3ecb7fd2e9 SHA512 29a4efc27c658b047fbfc6eb2ae311753b01fe878cc733e2fdfd83f5791b3e30ab50b08addd300dff37e7880f6b57662ac0cb0f4b98df2c5a5a9f7d555bc98a5
@@ -581,15 +670,20 @@ DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aa
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.3.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.3.zip 26557 BLAKE2B 1596b7359c0ec77ed9d56d82e7a9414ec5734a5aa94b249202dd681f1b38b53309dfa6d4e81fde9a1920bdf4d74654c0a70318140dceebbd40ed5b5122c25d27 SHA512 53708e894c24c62496b102e080cc91d90bc1e926d149cc3f634a84640ae2ca369a118570e41eb96b7134e8814512d653f3d0ba8b66333abc059e8d9ab76ca16b
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip 68547 BLAKE2B 608b2dc4f6e135b208d273d5e6de884f02eb15ca5d790104c4b2c449595c3c8984238cd4889215472cc2383968ea4d78f75771a2c66b7041980b8f76884b54f8 SHA512 6be9a4d700abf43f9eb8279b601339ff2290f6278fbbaeb308a9d51d621881e613308595dffb8d843d070bc3e21caca3ebaf20ffcbc60cdb2f8590cdcd30c595
 DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
 DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip 12738 BLAKE2B e7a649d1c85aa7b3aa0a80123c49d6e980d8db2bdbb7c49d5871cef8c35a4f632f4de0987ae1b41b3f9b472343e22228f7e75cc7c841d446ced4f33e859039f2 SHA512 4ee0de0cb44960bd75a18648a2c7e4428cd1df1b042e24588d3ed6adee05388e6211854db1878e6ad74dec95083e439d147975082422b8ae5f3c6c7896df4304
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
+DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip 12750 BLAKE2B 65fce8e1c7f8d6553e3b003b02a2ab3a7b1eccd7dae3db0423b8ba9d5579721d6d84d0227e321f8d7b557db71648ed2e4a3b810ef867f34ce25f02f29b4209f0 SHA512 bc4f20343133aad94ea020cbb5f2c74c5b983603f3638ee84093a31b4cb94e3725f3e0f01252e6546f86d1e47c317e171e0229681116b8d4aeac67221af40636
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2-0.20171109065643-2da4a54c5cee.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod 310 BLAKE2B 851f2542f28849f4f5c33155e5d9562aa9aa2645f1fb57e6300e2c6e98c39e0728e01a5e26d4a514435245662fccc55b8eca4eb2633a21057a6c4a5d80d24fd4 SHA512 dfde1474aedc5f36508bed07a01fdfd433967d2a6c0acadc6d985ce862da5e1cbec7ced13d55073512afbc2d925e6ad3e3cdee9511ad17b14ea8a159d8adf8e0
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.zip 151788 BLAKE2B 423089b53512bb0c6d09fa259a266d879e2fcc1db85939481475f71df2dd91db5794e4492ebdf61cc6f694501d94cfe8e761f986f857f62e328e596413403304 SHA512 cf0a047c617e014bfcd50dbdf466431efba7d32186027dcd714e0a63a483d4abbbba00716265309f10477f7739406fd3710fa137a4dd6fad4a9d3c4ff84c991e
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod 265 BLAKE2B ecbd8f71c2576f741916c7e6fa4c279c327766a9bf957e019164a1ff8af16ca1fc6810004935e57a3b085f81252549ff0f4ee2b89a5e53dc0110218acba937a6 SHA512 25511d7efe6d605b33c4e142ee073694b95d93b10cf3e9d74a161dfb71171de0accd626587299f41a061f4a3ea34482ec36fe7b9b2b3588d8af6b3545a35a45f
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.zip 171286 BLAKE2B efa68ba65ecac895de82fc8f8ae470ed9b2e24e7343f24429a5764fa042f7c91dbe8aedcc0ae003fdfa188bca32e7c4c82481b69736a72df76b50fad3e9094ba SHA512 f311c5ccb68a0b5dfe41f993e0867cbe9742dc3fd50904ed688d4b89777f4739f7a9293f548e7c2ee940d1742e921a3cc82cfe1b9d1b210e435d16c8f0c91880
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
@@ -599,6 +693,7 @@ DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68ca
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
+DIST github.com%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.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
@@ -608,10 +703,14 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd3
 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%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
 DIST github.com%2Ftidwall%2Fpretty%2F@v%2Fv1.0.0.mod 33 BLAKE2B 2f2161156210fb855e4efe08126e21b4fed0ff111b4f03679aa26051e23ac71f9d269c26088262a3ebeb6364fa60cb9e85c1850d8fd1674ab488c6583d6034ac SHA512 39a892eb40bdbf1398cde6fe8575bf4fea604e3bb21473de5b2316ea182130b92c9dd2467e2807c0421a35cddd0096fa99134a9f9de02fe79bb59d82e2762937
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.zip 13357 BLAKE2B 679a623ef429ee69279da815f3467805fd339a082b10272011db5e2edee034efa23f03a0015fac0fbc33ffe2818a7011a5298e44b1013d0015a31f874201588b SHA512 d4f3b3537e862809c33ab7b0d372806ddac9ace9da1831cbea77649f43773d59b1e2d221b152f73eb148e7a6350c476ccb8ccca41108c0a4e4436e878c234d36
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
+DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
 DIST github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv0.0.0-20181204163529-d75b2dcb6bc8.mod 35 BLAKE2B 159fcdee33f554db7f7bfc834a6478865e93a6258876dbb3ae755eb474786149f109ad8823484f1d72a8fe4012f24041c994e4d19ce7e684a84f85025803ffc1 SHA512 633ff61cb8fc7260fc5bd11d9bf59e9a758a3db457a9780701686b9b942b6aaabf102c7342f97d2beeeed247507f383253bc396b26581f7726538149ea4203c0
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
 DIST github.com%2Furfave%2Fcli%2F@v%2Fv1.20.0.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
@@ -641,242 +740,116 @@ DIST github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.6.mod 37 BLAKE2B 65bb120d0623
 DIST github.com%2Fyvasiyarov%2Fgorelic%2F@v%2Fv0.0.6.zip 12494 BLAKE2B f34a0d4c291ab13172b0c4be2e276c6f5957dee7226ffab24d5f25b5b059e38dc4de5934545f3221e3ec00934e37b90820ebed6b732ada0866af5dc2d8670465 SHA512 00b1a6b6ccb29cb2a21971e4ca0c89c66bfd774808501f33feddce41ca93c67a6a2c89890f20d44f444501f51181a7188e3c527fb614aabb9b5baeee5c3b682b
 DIST github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.mod 50 BLAKE2B 1df5b82dac953ff568a0709714e04e4fb31f384e8160fa933b9aaa579f311eabd38c42781612c6d39b7eefb1f995251f74b5ca5364bbd9d240f6896df3257ca4 SHA512 a921e5321a35252f98bbfc819df7177a500b64665f710f2b833f4187062e5c2f050daeeb5230c6cea9dce724823eae24d272924742df53fd3437d9bee9ad89c6
 DIST github.com%2Fyvasiyarov%2Fnewrelic_platform_go%2F@v%2Fv0.0.0-20140908184405-b21fdbd4370f.zip 7601 BLAKE2B b56d7ca4d7e755dd83297ca8c4ec96648a3c666fc63534882ad1c509b84c4db7b149a52694105856975c0bf8a578e6c751f4066af7751788d98b835d343e4ebb SHA512 d8e7286879e7cfa4a14ac2df3f311dde56288bad6c17195fc7d585ea428cc8fb45de4795dae22d8a22aa08b4d50b42bea4c62f18a795900912185ddb928d7391
-DIST github.com-Azure-go-ansiterm-d6e3b3328b78.tar.gz 20948 BLAKE2B 36ef6d0327a373d105a891d28de4a2e620856c902f5159330d8c316a31e3dab77847c292bd14e3c014203744ebdf0dd1ba1431024a52b55991e87b92a43535f2 SHA512 079dc6400c2dc53d46cad809a1bc7723b43b10939d51624a0aa48d2734f2d44b1621748ef1820843f55c07f233bcf394d2ae63ff356aa22f66df32ca40556e44
+DIST github.com%2Fziutek%2Fmymysql%2F@v%2Fv1.5.4.mod 33 BLAKE2B 06075bbd3eb02ab2dd096de6cce4658000082d9afe5616c75d74b0dadf777263a3c914517bf0df87908d043370cd066c4a5c45b6843cf02bb3fd67928a8d5197 SHA512 cd6a60a15f71d86acc64da0657180522cc0cb7a6e43428e131241bcf791a9c73d6dd8813fb8dd5b3d8e9bf99ac9264b0519c796053a7d519bf66143e1b0643ac
+DIST github.com%2Fziutek%2Fmymysql%2F@v%2Fv1.5.4.zip 80096 BLAKE2B bca8ef9ec11f0ac9d2fe16820df45d3b1537af727ccb7884987543d196b7a6ddf41766e26ddbbe16ddffdbdc8cb6b2ce1a56f5e8d5084728f0067d1b180c7387 SHA512 99d07cd6de9d82336844cce61cd3742bd30128cfb9de97312e5d84e649ce166eed86277dc21a67625c97746e9c86ed895db1026757230dd60091343fce46ed08
 DIST github.com-Azure-go-ansiterm-d6e3b3328b783f23731bc4d058875b0371ff8109.tar.gz 20948 BLAKE2B 36ef6d0327a373d105a891d28de4a2e620856c902f5159330d8c316a31e3dab77847c292bd14e3c014203744ebdf0dd1ba1431024a52b55991e87b92a43535f2 SHA512 079dc6400c2dc53d46cad809a1bc7723b43b10939d51624a0aa48d2734f2d44b1621748ef1820843f55c07f233bcf394d2ae63ff356aa22f66df32ca40556e44
 DIST github.com-Azure-go-autorest-69b4126ece6b5257e2f9b0017007d2334153655f.tar.gz 157788 BLAKE2B b0ba1987b95af4cd2d742061bd337eaaa0d9cc339d2ac2583d5d166b957692373f0444fea9c1f4c01a78dff21086a186135290373020c8a4ae664a74b5dde5a8 SHA512 e2225fb6ff49b62bbac42d1a72bfbf953ace8e73772fa41c23eb8cbff16a0011d5e281c078f30a8d5969912ffa264aad446d2a17a024950cb25ec2a8937b0e27
-DIST github.com-Azure-go-autorest-v13.0.0.tar.gz 181063 BLAKE2B cf4663c84429234425f516adb3071b150282485311e9cc36ec676eacb8f248f57567cc86a2aef9a96bd53775862c7a5b849a04b7bfe8d61ecddd0571669cadf3 SHA512 26d2f3230a2f15b4da9a2709c4e3254431ea0efca2fe740799f6693546eb24efa6d4b9160b199de0876da4839e31f4c64358b68cdbc2c5ef964828c4090bf0d4
 DIST github.com-BurntSushi-toml-3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz 42084 BLAKE2B 09e4447d28ddb0824547d9aaa84c3c16acdc309faaf44434119e1851c40b3d3f67d0cb745691bf47a560084c93a9ce492c715833405061e5fc6114cd674b37a5 SHA512 bd14b162d4d33f62dac4abfe3bec908ea45dce88b9a0e5dd173e9f0576e29344c5136bc48e5c6602add41ddb71523e831c53107b47c4b36832c97e7b0a3d18f9
-DIST github.com-BurntSushi-toml-v0.3.1.tar.gz 42077 BLAKE2B d846b7961dc3447a43e5c91dee1897a9701c997a407d9ba8737d08b82b493f99823eeab87cc9d4fe6dd4dbdb7b0d2a218d9f9f220ffcda2056188afbf0f2ab87 SHA512 75801d0263a68613233f3b18e35b000e1aeb5322015c0f032598d9447122fc45b1854741ce6ce9fb4d5a064546ad26f3d6384710bd8e6e1229ed2d4551524852
 DIST github.com-GoogleCloudPlatform-gcloud-golang-8c41231e01b2085512d98153bcffb847ff9b4b9f.tar.gz 1922404 BLAKE2B 09d935979634506edfd69ee6c72650a4eeaa4a6e6402e0e8b10c8d8a03b783c935dacafaff4f462e14ddc79319be37d36832ae757478afe3f0bae4c4b306f763 SHA512 7edef0098965732f64ba974fb90e772325f5079fec10bc7986cd8d82178dbf906a2b17a83a58bc655bd0b5138c61aa187c4841a2f3213716035e5b9cc2f09193
-DIST github.com-GoogleCloudPlatform-gcloud-golang-v0.38.0.tar.gz 1919592 BLAKE2B 4fb7f0bbd6b7514bd02a02e8c0a67080e60538518637b05de863e019081f5b851b1897dafc958631dbb63931544bbbd17d5e2aba130444de5244726d7e69dd56 SHA512 212f43ea59475830024c520543560553e8ee253b261eec0435f2265f75f1561b97c8235361a71a040f8c97e1465d3b719f3823cb82d1068b1f50804d296c15fd
 DIST github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz 3384 BLAKE2B 5eb9bb3c88a3bee70cd64f30afcc039f2f43b68be23f39c72f9091765388229a8f5bdbfba8d11d1916d18e9c785e15959c000337461e44940df0ea40ecce40db SHA512 b877b8b0e67f300ed9773b32593a1edec2fb6df3b0d5026cc7b67490ec9a4cb0d9630fb30dc3dee6b7081f81c3fbf1399809c4bb171a5afab665ff93a9f3a034
-DIST github.com-MakeNowJust-heredoc-e9091a26100e.tar.gz 3399 BLAKE2B 9f15faeeeb693cea1adc7dd4b71a4e915e5e7a1dd0ca04710ccfbc719e6bf91b49257ec713d4bf0ebde42fbec9b096fa9d1e5532e7f1aa88be9ef16cf73e0a02 SHA512 039007e53afc33daa55e92da29342123f1fd18e718c8049470fb5ae319ef420f43aabef28a9d8d8a94e90b795a9670c0ac6b77d97b9940f9536cf0095a17f5e5
 DIST github.com-Masterminds-goutils-41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0.tar.gz 14603 BLAKE2B f8f04dd7fb48c67ea31e2c438210100d671c0c017026317f43428d0460970cc6e07faaf6b3d4c2d554851dd962a7f62c8df617d0a42bf30f4d7038108f9df8a3 SHA512 05d67b1d5eb8881a9a4223d823412826d2ec035782a58879645c53e75d4e3a0a312ff70e32020d385faf6c345125edd8808b63d33c4f53542cdba73b3901d3b6
-DIST github.com-Masterminds-goutils-v1.1.0.tar.gz 14610 BLAKE2B aa78c7326a97a92121f6d76f21d26eccb0ee2ec04adec2eba928a4a8789bb0e0610444a0b4a4512bf8cc5a19c82a1b61995065a7359245a9f48730bc4bfcf337 SHA512 cdc1dfe47c95275599d048327ce62964df0e14a549cf7787fac024250b1ca7b30fef07af2be15d9d5084f923b04910a9872cb1561393544c29f0eb8023ec84d8
 DIST github.com-Masterminds-semver-805c489aa98f412e79eb308a37996bf9d8b1c91e.tar.gz 21138 BLAKE2B 07cb99b393f48eb0df3fcacf327e2c769791e5353bb717a998ef7acf587cd7e1f211d258cf55768d5b7951059612ddfa39e3404dc908255ef900901d16c33c6c SHA512 a442038c4a222734d0f18a10eccdc450d4c2fddbcb2b1e10bb32c70e956d74ea3a6672ffae2a89a52e92aa6bb4c75fd85337392dc1e2380d27843237f6ebec2a
-DIST github.com-Masterminds-semver-v3.0.1.tar.gz 23977 BLAKE2B bbfa3a3d07c941500a726de392c67ba5e86809d8be6edbdbf884698ad18f8a2b274b32fa42be56ed70efa480aeecd1ae5550fc79f0f9070f0248ec06bec87712 SHA512 c66c509579e24ae46be7cab2397a1ee77fa1fa0cbfd5ba4b089ad17362ef66b1ad35251b6f1e9b86d1498d23c49a64b46a785a8d181c7f5a6ebfa0c4f042aa1a
-DIST github.com-Masterminds-semver-v3.0.3.tar.gz 23824 BLAKE2B 9185141af73f7dce8ca41a5cbfe03d45201217d688f0085cd2deb20efdfd884888061af1520851b5d25ddac609c0e7721154eb30bcc267d81d413dde680f95a4 SHA512 0be0eb9387056e0014ffa90b59f000f5a4075a3445be174c137dc5e48ee3ec1f580db980bf902327f63e9a2b5f498625ab03b64419f7ea848a3b36dab7f05556
 DIST github.com-Masterminds-sprig-e4c0945838d570720d876a6ad9b4568ed32317b4.tar.gz 42053 BLAKE2B dcbbcc8e9d0f3428a5d135529f0e72883263076bf6d69d2a0d543c8ef3b52aeca1d78550b3db03bf1356ecefc4201327b1de65b8d89e67811f9fec7388f3450b SHA512 8732128e531878a4498a38d9445be448bdc77f9a6236e10fb9b20f56d249edb65f76bbc13f6bb916d5a259deb7ae77423f6116f2600c803ebdf443e3cb2d82c0
-DIST github.com-Masterminds-sprig-v3.0.0.tar.gz 47424 BLAKE2B 7c9477ace01acbfac00a17038fe82501e4f4446c48a7f43ee06eb184b86ffa3d0d07cfb7746a1098ab8bbd1d992701f1bc4d0f0f3438b38587abd399a09a2e39 SHA512 72a637eeb75a41e675a531f2753417837e9f98351b802cfd0e851dc02c42bc9e33e207bb62e8d7ccb66f71daba380850196959003de66de74fad81323c743c77
-DIST github.com-Masterminds-sprig-v3.0.2.tar.gz 47799 BLAKE2B 8a7dc7b19f9d8134f74a71ca3d7841f5161a75597fac6628036b333c85fde0b724a0c0c70286f3fdbcb386d3e68e04d66e140de19ec34f168b38da4d068e0540 SHA512 38663dda324178c5b562fd1fa814e5629350e7f04760a27de1a04aba5cdf786717a0cff2be532f3d8ee1b8b278c6a4bdcbc01d0676f294a495da9f8a28426b15
 DIST github.com-Masterminds-vcs-f94282d8632a0620f79f0c6ff0e82604e8c5c85b.tar.gz 27791 BLAKE2B 4d9f7e81c9d66f7302ed45f433a9329319b75d6e1416ded87c74032a7cdcef4a321edee370305f7e6ef16f30efa70b56badbdc81b75fe90a87f890ff0cab2eaa SHA512 2fbaff5ba0cb0a651e93634ba1cff5f34c374f490c7182b904d052b22fabe717f5a478856101e8e8679ae806db0b70462f59abfe445714199fe91a3dc73b975c
-DIST github.com-Masterminds-vcs-v1.13.0.tar.gz 27675 BLAKE2B 77b7748a01113fa0a2715b4cff12a5b82bbbbad062833a6516448c8c3408211ad51816135c773022b436d8305eb370defed883d400f59fdeec5f3ebf57e70cef SHA512 fc4db2d5cf2cbb1098ddbc6c796661bf0be8f040134d31281097785f6729404df2ea1c30627fc78c6e560aa95ecd42f6f41a9748350fab64a03887b59a00a2f4
-DIST github.com-Microsoft-go-winio-v0.4.12.tar.gz 92439 BLAKE2B 7ce1539125742ab5d96586a8cbaddef90f1aeba8124430ee33c23374a3dc1a117fe8bd6d68591c83f0a8e4fb1633c74a19fcc8466567f89450056ea3843dca21 SHA512 3dfeb9f884aff5bb1b667a6558471274161ca7b4cd9402e47250903b74522f0bd6dec13ce32c8312eb8570f94dc061a5bf9ada5e0837d45a510cd4abf38c8211
-DIST github.com-Microsoft-hcsshim-v0.8.6.tar.gz 1664509 BLAKE2B 860447c4130f2137b9321e762ed01425005bdd3b6ba31ee6d3878ff49adea334f827cb0882ac922e383c8cf67cf92ea141c1e354498cebce1f7e91aa27cfd42b SHA512 454f0acc723754dc55b7ab82ce33788cd0edea28dd12d6568c835a1f339558cb7a1a3faa1d95ce73088c3bf8c6fb0d2dc404eef48bf65aab963e1356bb350392
 DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
-DIST github.com-PuerkitoBio-purell-v1.1.1.tar.gz 11604 BLAKE2B 3cbd5a831338e0c252e87d680a886581889a1f5ed49789aba25ef99ae297f9c9e42f3ad04e77b6446f70dc07eb8b1a371f37e3a65f5c086ca35bd13a8f2d55ff SHA512 536681e7d92e4b3c5be53dc6cf4cc654348f8a76595b00647c9332528761441a601f354070ecd82c52944e6f6924a227eab88f6a67f52fcc64e7b177356589de
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
-DIST github.com-PuerkitoBio-urlesc-de5bf2ad4578.tar.gz 6799 BLAKE2B 8e27467b05093ef6af830c07a3a5a9fcfbd158c75893c6e0279538b02d70ed8ed48981ed1369aa1472903bec16c48b020a7949759dce625f6fa5cb8fe6fc4e03 SHA512 a7c80ad1cb51be792f92dd34fec99dd1d3f11e5762e196e8f2d126afaf7e62548f3355dcb2616a989d0e4afc4cd7f559a0bf528ca0e20b0d1013b27498308a30
-DIST github.com-Shopify-logrus-bugsnag-577dee27f20d.tar.gz 3377 BLAKE2B 8901b06cca0510bc871561e129d3b6e1bbf0fc4c01557773e3539e691aa18c1dd671783e1d4c9d9291d2b5e7fd75c4eccfbc22df6e438d1b44c26ec9a20df564 SHA512 63c1c0db85529c2d1cfb9beaa56c8df61a980b4425c8073568dca40acfe2fe127f2b351fc57476a46472b188a75dd4c11bf55a88d2e12ceb1942eb931d05ff92
 DIST github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz 35759 BLAKE2B b9406a926df5f8b27e27711ced93c9749a0d69c35f1d65c1edab7682fb039741e3825ee62f5b08bdf62d17d2373b17c974ed2653e39cc8910878a94f81b1331d SHA512 c7e5d4497201398cdb2314f8f863d717f91d52815da32abc3d3a1af00ca35696d612c64b1c2a862eb3822f555e2df5a671f2e446be7f5b5cce0e8153b9a5e878
-DIST github.com-asaskevich-govalidator-f61b66f89f4a.tar.gz 51864 BLAKE2B 841b1998e6584e8928ee0d13ac557b4519a4a39cd6f3a4727d8c92d586bc14012ad5bcb111f92bf89999da4c4df1a2d3cd4ec90e679bd3fbb594855b676e84a2 SHA512 44113f8855001fe5454e88043c1bbc06360de7b7e187c540a98e7a04601134467ef16c7345a5d7579249291b28523257f394344e67a671f418bde954b797d94a
 DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-beorn7-perks-v1.0.1.tar.gz 10867 BLAKE2B 373c4dc08cc964430f187a05a8165df751ea7398b2dd271b85fd13dfe5c9a33c2f8df32ca6f6229b332358e60e90de6d4670d54eb1b9808d1eada0ec7a83e0f6 SHA512 686eefcc824c5bde49385d63916299e2797be205523bda66500404c5ad64ed4d1ebe8ee50958237b41a4c481579f5040288b99c9d2ff1082abbf172893f389f1
-DIST github.com-bshuster-repo-logrus-logstash-hook-v0.4.1.tar.gz 6616 BLAKE2B 93e8be82065d275c7af7f3d0cc03e1f77b52e788a49ca442e0213932254249afada1797d9fa3a23f146fe1b4e33c6e211e45cc270eab4626885ff9c62439f552 SHA512 b41d4db31f36f6c863022717fa19529e2a92f0a68d6a252c7b954de33b4cfa0738359db029ebbb90d20f3000ec79e04a426ef2c540df2b7baaf7a3458cb45b3d
-DIST github.com-bugsnag-bugsnag-go-v1.5.0.tar.gz 347088 BLAKE2B 4bde5512a4792bb97f040e71d52f787677918b022ccd2547db8a883a3dd3557ca0d55e32a9c1dea43c593e3766941b2759793906893527a91a1bd35b7d4046e4 SHA512 207d6b03569d10fcfd0df8968b02087199777f48bef08cf7f91566b7f1ddecf220b801dbaa782490cfa4dc72d8e0e6cff7140b39c3ed14f8ac0ffe89db95e3f3
-DIST github.com-bugsnag-panicwrap-v1.2.0.tar.gz 8564 BLAKE2B 7d5ece37442e6802b41b79d4ff7286deaa5aa091351e0f4e1dd3784602997ad3ccaa5b77249cccb382ece8373b0bfba5c0a496a8dab49b0ba7b8f004186ce24e SHA512 4037559a93da840d95b0565648df11f7e006f076fe3abb00d1969d0a0a357c8888b65c3bc2d7fed4eb2e20c08ef3656e47bb6b82b9045e517599e9fd55b020b2
-DIST github.com-cespare-xxhash-v2.1.0.tar.gz 9198 BLAKE2B 15dca7edb75751fac840795e5735c5e284e212180c0bf40b6bbb3023685b611b3835b8e70e865bef07ed915a5a81def967caa8cfc2a46bcd6edf81eac42d119b SHA512 6a44b29efe90fda8cdb267d1419673a577e231398480add90e7afb7eab92ecb375c947ce68c2221ed94b1fc7032a497703ec8026bff62386f52d22cac89ae2ab
 DIST github.com-chai2010-gettext-go-c6fed771bfd517099caf0f7a961671fa8ed08723.tar.gz 812631 BLAKE2B 576924f2df0e824490075c661b3a503b184b5d1b262c6154bc68db159b14f09fa15942e1650de20389ed950664aeb9698de2389c22dc5b9f15e335b22b87d3d2 SHA512 8def098c2cc2bd9c2a91f26473f99ac67931af968dab770e1eeb5682b3d3d259a39d4506e78e39395edc201105d6161d79308a6b17e20eb65b1349e9053e1692
-DIST github.com-containerd-containerd-v1.3.0.tar.gz 5697153 BLAKE2B c334cfd2aa11dd430c74bc9f3fe6f31d83faf752b9794da26021033bb6af492c48ed1665fc76ddfe5b858f04d45e9b77505f331e3c3da556af2d75e3cca3bb12 SHA512 cff9f0189b9fdc2b5492c92129af284aa8cd099e48de94cafd90aed191e2d20060c96008111b05fe081de0d4fc41d35f8cba5a3dc2d8cc0a5c37f695fd3cedc1
-DIST github.com-containerd-continuity-004b46473808.tar.gz 1076781 BLAKE2B cc0308a8daf70278f271500ed4ed6a3df06881ab04310844050766d3a6dda650a16c9c6337063827262fc305205b07763e4eb8108c579c9b7ae60a33e1df2a23 SHA512 7ec6688cc76c7f99bff3e62dfb578db8fc1b1089a33365efb5d10616c7ed1c25fee832f3069e0a13e0dd870c86d7a83f6c0651f93b74907412c92226092f3409
 DIST github.com-cpuguy83-go-md2man-7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19.tar.gz 43935 BLAKE2B 1fb9f5795a4149e5527f80f229f074d1ce655981dc4f7cfcd6491fedbf8abae72872b4d32e5f5211abe0e43aeef9bd0030770a717a742981738ee989f3a66513 SHA512 8fe7a79dc1b046d8a967063c642942d06313f52caad27061ce03eb6b175549c58232b1d1f24f13f1313f4db6386dc345eff197a4b92df2fa9ee9605a9c108e9e
-DIST github.com-cpuguy83-go-md2man-v1.0.10.tar.gz 43936 BLAKE2B 2858c50d4fa492ba4182f08502b1145a401d0a45dd6a86eeb8b78ca7c65c97c108da07239c12bb25593f619365660d0b78903d3e699a086e1162736b949f0c4a SHA512 cf9eb65bec7fc4293c4a867eca215a0ccb0c495c3e4e0759c04899887033c1edc2b4174d6975be73e56d621d5003b9b88f590f48276099c39458609b533eb40d
 DIST github.com-cyphar-filepath-securejoin-a261ee33d7a517f054effbf451841abaafe3e0fd.tar.gz 10810 BLAKE2B 4150ca52c8229e8d4533347b8b266b6b9421b86a9e511aa70a26a40e34c0468b0aa853f910afbd9ecd206d3c7009d36e6e7b3ac85d79aa4e738acee62bb71f03 SHA512 ca22438bc5bd9196923dc7e70748452635afb743335e4b198177b88a6e716a2677f5941a8c5352ba452faa7b77aca02ebc2404ed59918e626cf2478ea9d8278f
-DIST github.com-cyphar-filepath-securejoin-v0.2.2.tar.gz 10822 BLAKE2B 280c099ad2f23ed6a430aee5d6e7c522b4f3d851b2afb53bd26ed6b29b00fc7fc30c7c9972618c57bc4bf57d7e809561c3a5954bbec0e4e273a03b2f8c01cc06 SHA512 29906c5fbdb78735b37dc177b6dacd36391961b505de5310eb6734c93630102c07c53da9384b5041d798056ea51b6563232e50156145678c3c7db9828cb74529
 DIST github.com-davecgh-go-spew-8991bc29aa16c548c550c7ff78260e27b9ab7c73.tar.gz 42217 BLAKE2B baa5e818fa0cafc3d0af4fcf158e96ff5f9820c186872c3b4038be83b41878ce7ca297216a9669b903763ecaebe7ea36507602280eb3734bd9eb01bdd54c631d SHA512 4c4047bc9a8cbb27973c7b11779388458dd9cca5937e8b65e19ea513cbc7bfe8e97f538fcc132c7512aaebef44429f531a15b367b027d731db5762b7f4a210b9
-DIST github.com-davecgh-go-spew-v1.1.1.tar.gz 42152 BLAKE2B 3c6689b3d2861fbc4a70b8ab25b790d132865e4ec34062fd80005fc7d62c1b4cd77df534c27a2d8b1c42c63f8a551fc7d98e3649bf902d176fd965e933faf6be SHA512 b00621d2f11c4cc858e69fda3e6975f910deb375c4f2305a45b230e2d9be73f183db5d2ce4f5e30a14b27e11e79380233ee68fceeef0d855c64fca966e68111e
-DIST github.com-deislabs-oras-v0.7.0.tar.gz 83133 BLAKE2B 25098894fda24d9d462619b69ac04f5c81c36fd08b20bb01a6bbc82c3caf6fdd7bf2899a7dc97416be901b34b6f59b45cccdfeb8f0b3bf3b64c2da54f4e835cb SHA512 48ece2e8bdf17785b7a775f7e1778ab6b09751cb36c65575088038b08884095760ddb58a7e0bc519338e94983a08424e350a0b5786340616c1295a084529c5dd
 DIST github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz 36975 BLAKE2B 8d6ae74ef5b5a07af42a81a6902cbb0dd73054a7c678f35bfc6397d7f9abd79e79204f1eb4aa46cb42f1314122c2a84134d6cdc22cdd987d1040d056143730a7 SHA512 4a46ca539ec70e5e8352621cba3b1da20ba3799bf7615b1842991471f812cb4877dc053e915def3d70120170cf9c6c25b5bfdbfaab92e0537835ad66f52cf732
-DIST github.com-dgrijalva-jwt-go-v3.2.0.tar.gz 36960 BLAKE2B ad0829882581302e00997886c31e763f89205b5aa58226033061d36ed24a1c174170e6a723cf7d7ab4ade2a6c67803455ff9f33e4781a8473d351470af55b156 SHA512 782dd5fb85e56915fca96b894eb4c6f57ea05cc2ed725f3504868a7acf9c75a4ce1acc46d179b3e4ab14100ec7eb05a906fd291bf016897c4490c27126c0fb0f
-DIST github.com-docker-cli-d88565df0c2d.tar.gz 7429995 BLAKE2B bb7f3a8026b501e37cfa81828cf7227998e410bb8c82feba46d19e50d2eb51139a03749890f33c72e3eab154064ad525826ef60ef8db75d40603a2f7ee245be2 SHA512 390144ba4c3bc22ba6341d4e6109ff75569234f211d2f5c71a473e3c989a2bd04955cc5344f53f225d5a32c80a8cddaa580ec19bc3b9a55fc2abc95cd9a9bae5
 DIST github.com-docker-distribution-2461543d988979529609e8cb6fca9ca190dc48da.tar.gz 1996404 BLAKE2B 2eb9fd568a9dcc2641195dd1b303c9d27c3a65302aa9169ed89ad15b14e1e3071844063a681d4042b4e1651fee5a3cfa26e34b996819c31eb653fed0728b0b93 SHA512 ea44c5dd0f80887fd06e4e172412f71e4633d77c613318722e8e1c9b8edbdafb0c697e64290da89eee7fd3a83371c7da7ca6b9154c717a8cc1e71a889f81c8a6
-DIST github.com-docker-distribution-v2.7.1.tar.gz 1996699 BLAKE2B 2e22db69f476be5a4688f5b3d6b41fbbf71460351543ae849f707dd5b3d56624f674815a25214002886b057f0859f75fd197bb275a7b3cc8a7787422f716ad0e SHA512 f6baf0e7aa96ebe828c628f7dfd84ee899331c3c1bdab86662aef595b092702b6d9b2c9be766a6de6d153ff4ca55d85c5fd8785a0968f285f56a32a50092c754
-DIST github.com-docker-docker-2cb26cfe9cbf.tar.gz 8717172 BLAKE2B 8601f7db2783fa3c407c4fa4a6ae83739a403f9bdea7f65147c59c4fc16416b670f1b118db9e230e22be2c4d7b34f985cda7b2da6bb6494c3a66846714d798ce SHA512 567f170ea27f80dd4da06ca9bd1be9e072f9c50b5dc56a9e1eaf77c044713e118b10635bf32df6a4749a129da1610b554b6630d34266abab256dde0a304f88e8
 DIST github.com-docker-docker-be7ac8be2ae072032a4005e8f232be3fc57e4127.tar.gz 9059054 BLAKE2B 8c4489bde6cba2d6318f93abdad0e14141d38398de06e06ce58d4cf4c7cd8a8d6526d21e41c0433eb31a4db97fe4c8e98b48fdfd49ac15a311e3fc507af49d1b SHA512 15bfe14059103fb8cbf62a9f39835b0a38cd61a859d2feed3685a39cd38ce81f9b525142c8c7bfea66b970807be78183956c74d45a61b4161c7f41d7c7177f17
-DIST github.com-docker-docker-credential-helpers-v0.6.1.tar.gz 27723 BLAKE2B b287454964e614755a307ea4ae9398634e58683d5df38c1de7b8c003d5ee619819c1f56cd87c9dec3c5f3f237f71a2eb421b34f46d13da4820755315debda40a SHA512 57d7d8039c980974a568be2f4b557227ab2df0dbb48e9ba4f4729826a9d96604170dc8782e4b9baca06337be254ecb118c51911ffd6812e7d01895561e78abd2
-DIST github.com-docker-go-connections-v0.4.0.tar.gz 30770 BLAKE2B d86cf8632524e1f3ebc4b612aba43a7b77a305625f797f7c27977f222c1c705087a13908224adaef00d51061b0f2e52a12d4bd8fb7bef5100c369a5ab50430b2 SHA512 b8b84bf0d6a0ff7b70073fc0929613385c719cefbbd9f63dd2075930adf93b9155e0c1776ec01bf1a845b32ed92854252e3ea668d4c9d46e66874b04b891cb45
-DIST github.com-docker-go-metrics-b84716841b82.tar.gz 16292 BLAKE2B d7b0e1062b5c83edc38a6970539fb1c0469c7f70499e30ad15e62006e460193ec7cc07d8d1cc9a44ebb96b8d1ae865464adfd33940d73b38e4130ce237b4dd8c SHA512 2cb6531a1dcee8017bb907ea2f65fafb84ed704c46271f8eaada42a4979399040493bfb7a8a27d73610c2aa49f4b5e7f68446b98ec33da91f18a983008514935
 DIST github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz 11094 BLAKE2B efc28ea5f3db552cacd9c48d7ec4de65a4f50a9463ac964d98782d62ae8c6103c119bf443d3219a39e0ed4658228a04b4a388c29ee38a05ffc3c78c25456abf0 SHA512 baf231424d453bf889e8614c54cf28f0f37f8b8e06e841c2b42ef82729afc4036018b1ca0116da33a8452a2d2345bebef5e8c66be489896db813abaac79d668b
-DIST github.com-docker-go-units-v0.4.0.tar.gz 11514 BLAKE2B b1a734c813b59d8de4ec80f3ded93a73a2d2ac57d6cd65a733033fda049a0c315c04704dea3bb826e9e5821a022e1fcb09e5e8efdd6502bd1741efd80b70e10b SHA512 7b714811b2821f68ecca4cc220f564cda871c19ba043b7b1a69ac70d103bd9002cc698121bbc2a15936e96af862430eed47e2fea022c44005ffe5dfdf9cf0e27
-DIST github.com-docker-libtrust-aabc10ec26b7.tar.gz 39352 BLAKE2B 53b93dacca792288423eda450d1b8dc898722d51e68ebfe111f7faad7a756da33f306e1838b74e1f56c40d6b2070721904ae3d51d2890daa76fce48a1cce3e22 SHA512 31d5a613807764c03d3356ee134bf384eca7953d4113e35d8fcce322611c25b444dd07904eb34c86c7e951529040c33fa821a56a687260e9298f900c7907e83b
 DIST github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz 35378 BLAKE2B dab00cf2ff22077187532a66abdd609a9101a0ca4b0fb6bcd31647e72dc491ba6ad2c2f82d3780d687dc8a95c3f499bd457abc7ca4b98cc0d08c726f13d58593 SHA512 754efd869559f96eb244a603bf575e1b439d8aa4ad34485121c76c4900150ac8a81f7fcdde4b2af49bcd317eba2212ed60a16a10cff973c9f87516bf50ad0d2f
-DIST github.com-docker-spdystream-6480d4af844c.tar.gz 35407 BLAKE2B b0595179d4e86ba0a85d24e470fed3a406b16841b08a2f712d534498ef922e23f4789ca1e0f11f7a9820d8b27ec09210c2310086f1d948f1c2647bce45a6c05d SHA512 a973f346df1086bc3b24054f9a508ac334fe90011ca3e70c3b9c8df8773545bf82f93cf3ca49db28e1796bd71788f8d8bb14a2b014fe2148df352683c6993d00
 DIST github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz 59771 BLAKE2B 91eaedb1f78485b68000b02a9ea86f86a156e8109ea173b3593407ff5779ac1f4652465bd617b13e7ff95ddd7d12d1d39a284fee2c59dcc53e63626b5e1680ab SHA512 c762005454ce5247941d86fb8587ed8229927c1ce81fdac8601ffe41d535d1b3d89f81366be2c0bff13c8fdf2750c7db4b913b0548f19b71e2ab7a7654ab8a71
-DIST github.com-emicklei-go-restful-v2.11.1.tar.gz 66646 BLAKE2B 6ea876ed1956e706c4068b10b9df778caa5ed3ad7a5633a87a13a3663082262b22e904ab229991759278b0a226a7ef937ecee8749e79e1971cfeda2fd913939e SHA512 63da31ee5e377d9c76fcdda1bf4089e10edd5571f82782d350ae01a309aac0dfc4f8564ab4086c6fd4feb06bd59dcd2d0850a08951af8bc83ccebcfe7a7b8d18
 DIST github.com-evanphx-json-patch-5858425f75500d40c52783dce87d085a483ce135.tar.gz 14566 BLAKE2B 1e4e84030bc17a66a92a65cc0355b3a4983a6c932b8b88225c9b64db9a6e1980aa15a743525030f0554531afd103b010dcbfbdf062693ba5730904dc1b06006b SHA512 78e094dcff9c67887f8420baaa506591e8be09368bafcd750720a4c0b563860a94fa9d8cc4f53f231fe7fd34432c8f8c78b1bd3dc7588428599fad1c6faf6a88
-DIST github.com-evanphx-json-patch-v4.5.0.tar.gz 15076 BLAKE2B eae509cacc3942b7dc3c4f367278baafadb26123104c12a1449817e87c3cb1e1f775ea47878bc7f011ddd23213a08fb03c4654c840182296646caf7cdc51bcd1 SHA512 c97693e9b8ec2cca0b198d95c6c364e2d707c0c7b8bd01b8ddab02166eefe83bf2a610a9b1a2bba3f392b3fe1da5f272ee535bf693a69c2f6f2f15ac331600fc
-DIST github.com-exponent-io-jsonpath-d6023ce2651d.tar.gz 8224 BLAKE2B 8997719d55e4c051d7addc41bffbb11092df5dbfbcb35de6cbbd464c8232661c714bcf83eb652143b6cdf5e868b1df233d23c17c0341399410bc4f18d3188158 SHA512 1db86023b693c41a2bb80ac3e3a26f54aeb741b417ae2af81f5d4ca44772ba45a02cdb2c928cfcaca425212717ac3501b627a39fa5794b41d93976ba65c24602
 DIST github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz 8224 BLAKE2B 8997719d55e4c051d7addc41bffbb11092df5dbfbcb35de6cbbd464c8232661c714bcf83eb652143b6cdf5e868b1df233d23c17c0341399410bc4f18d3188158 SHA512 1db86023b693c41a2bb80ac3e3a26f54aeb741b417ae2af81f5d4ca44772ba45a02cdb2c928cfcaca425212717ac3501b627a39fa5794b41d93976ba65c24602
 DIST github.com-fatih-color-3f9d52f7176a6927daacff70a3e8d1dc2025c53e.tar.gz 818620 BLAKE2B ac9796c56ad9495a5d209b6953f731d81317368f164dc9b6e7af2ac8a2430fee25a7667bc3b2a59b87aec8f8f5ac074c51b490007a9de76cd0f3943c83c4c6a4 SHA512 f4b07e214d43bb1cfa725bbf31035cb7874793d5097aa1a924566b4fad42c9a8209060fa43f871815a6d694b417d3e61382f49fab7e56e6d13113baf52d52def
 DIST github.com-fvbommel-util-efcd4e0f97874370259c7d93e12aad57911dea81.tar.gz 19033 BLAKE2B e68efaedf4d54041ff111dc00fa8d4470d0e0d89a2af0cd3dff09ee4d9307bfa9c15e22f5f52069e622fd895bcf101f9e0d125aefd84062147ddf851ff795a1e SHA512 f5038d650af6e794c57158c424d9a130412633dcde4a00dec9beb3819228a38faee59d91dba5ad21be12beef70581702aa22502d8ead1209458376da7d4fc418
-DIST github.com-garyburd-redigo-v1.6.0.tar.gz 42765 BLAKE2B c45429ba8544eb484f4ba1bee83e15e644f37dd72bbf9aba4668f736d3f5f735777a828b805e8e25086254db988401c3ebd5fc1c7b335efcf6e4da6abdef803e SHA512 74fc1d31c53ea00d21114dcdb2d8aba578bb86cf707680f31ecbc4d48983c9010a9da9fdc9036f2267cf7fd7e0ea9fe4bb1120898d445e1deb2d65030a49d133
 DIST github.com-ghodss-yaml-c7ce16629ff4cd059ed96ed06419dd3856fd3577.tar.gz 12713 BLAKE2B 639e75ce14b999ceaaaf70dd5cb1a261c1348d2ff04d754956e392e6ff486377d2d40ed155818680c7cbe399889c00a2e4cb9d36eae556442eb10ff84f73a1b1 SHA512 bacd77956e8647077700a3c6f6cd67462eb323c21aeb4185ae0f983ede8d099f84109df114cc3efb635c150d4b3729f3420920b51fc866a66210f3630684a2f7
-DIST github.com-ghodss-yaml-v1.0.0.tar.gz 11772 BLAKE2B 4fab0b1ab4ad03fb63dc1485111ebaaf494248488e8c9fb8ee665c160e8e26b275bd9a3909beb9095e650ba0959927d620595bd628da59850f1400cf4cf45b98 SHA512 ea6af2084d3d65d4afbcbf498deda1718e2e692e1bec6d46dd74f4e41ca3151f82d55b1f041ae689606363d37dc604ab20762e773dae964206cb446262963250
 DIST github.com-go-gorp-gorp-6a667da9c028871f98598d85413e3fc4c6daa52e.tar.gz 36804 BLAKE2B 3f6b78fbdafadd4a4ee7d4a071fd22bf27509e6359cfae78ad905f564704a8c11cdae9af55723e67891dcbaa136fa81d905babe8ade35284a4963643207b655f SHA512 ac6c55c12fe1a44d8adddcec3559b70dbbc4892a7a58ac679c951d6c48a008cad12a1983bf5ef3a8f247ba2e7ff58ebc7d5ddb846bfa4145c26cf8ea390edc55
 DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb
-DIST github.com-go-inf-inf-v0.9.1.tar.gz 13072 BLAKE2B d7418f32eebd7a31be97c25f876e91ca7b44235975f2f69d8f75c0009c097095ee2e847cf6ff8f552749b6efa1bb5098c72f29c624ee92cf573f8fc37d0e3e41 SHA512 8627b4a636005089669ab0c7262e7a5a1549941d049a66abe6b73e61533f45a953012615d9b114c883d68450608d69f8aa5d0b1e9ad67d95ce9916d4ede640a8
 DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac
-DIST github.com-go-openapi-jsonpointer-v0.19.3.tar.gz 15377 BLAKE2B 2256fe8a963661658727fcd00a6c3596b5d9ccca602a4fec9d67f49eb820fd29161b49ff9138aab08fcb45ed6e07fd720794d7ab495a1747dfddba2dd9cd24c6 SHA512 5ab7f7e41a0a940e92663c6293d7adc22603dee742677270653e3bd9f38becb56a37b4faab9183de84b4cbb1037b1c051fbab093ad1c96a0d064aed5dfeb376c
 DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a
-DIST github.com-go-openapi-jsonreference-v0.19.3.tar.gz 13931 BLAKE2B cec29a5607d1dcd7864b0f09004f0ea5dc1e3f093e9bc37832feb83700afad559e9d4c9df7319edbba14a29966a861cf7311920e756712d1772cb76f2650f01f SHA512 6d0a1a49122b036da0c6bf1d1269f85e1a0f3d8034b3dc463be627f73870121413d82581df4386933933eb84fc00b76d4061ead433c09dbc9ccb5a0101746fa1
 DIST github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz 77740 BLAKE2B f048d3619926628ecc775f9c81f6d70c948e493656d704c571797e4112292d255611b44f791b6ff8cf5e8dac064506ad0f46fce03ef2180bb1b7fb34dd6557b9 SHA512 57d396e4da00c39b4ac3d3a924a899b784badda76abe71c6c717256c49a50887d3ae1afc7aded869becea3fb161342f03b37ab85ccff60c6e3417449abf879fe
-DIST github.com-go-openapi-spec-v0.19.4.tar.gz 217801 BLAKE2B d1578dcdf95f3da947c52f993bcb61e251d7f2676e9efaae76965373129978a67d9bbe721e8b48b804c09057319f9805f5db509ba405545ea75b2cb5ab927bc9 SHA512 b3f947ce06fca1b5ccb693f684372793f7ee3fc919c8e957beb41ef0e7efdf05fefbf258e7e36f05e3c8e69486b2710c78fb6d3cfc12436ff1e84ac0b1872b41
 DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz 22386 BLAKE2B f44219523228995462be58f864ba66587f8bf6dd957cd74ac869d59a21b904dc9459445852c9492ae46f46a5a006b6c897e5908eb3b0c3394b6aeea686aa77ea SHA512 67d3895fdd398a644c41750078052b9fb88ae401275d3cb351e9947d0c782cc9d569cc022a3c882b619905876259d004ae3c092b3da8ce4cf0ac99475d7bfaab
-DIST github.com-go-openapi-swag-v0.19.5.tar.gz 33023 BLAKE2B a974334212e3229ae59d074313ecd40316f360885b92da854a4cd7339a9ba227c096c3befbaa4a2982db99900c5bc5d74d075afb849a9047f1b80ec3e8497216 SHA512 9d74fb3b9b63344ce7aa026e4c4a9d6080defa79fc1b4b1dec4b7dac5cd1c5bb345d6c555f4793637a1696a99d0698fde692c8c4cb07aa6fbec2d392db9259b7
 DIST github.com-go-yaml-yaml-f221b8435cfb71e54062f6c6e99e9ade30b124d5.tar.gz 72297 BLAKE2B e9bf7f236c8bbed85ab885462790b1c5ef156ce2b58804d3562e3ffb5c26ea0214b1d185b38731befa2cbfaab6ac89face74c2207c1cd84f83701773ab94675b SHA512 b5f5e028c038cf16cb6b6d6fabf83522d9b19f2903e74004d611796a0d7c925d3e1509a8b3971b7349d05f106e69521fcefe7e9cbae1e9ac2c0180fef7ccf6e1
-DIST github.com-go-yaml-yaml-v2.2.4.tar.gz 72209 BLAKE2B df823cd5f6f734c11b9b19cd3cc205aa4bfc15bc90359a508220691867841698d0b9caa35b2aaa40b7c4c6c804bfaf9c7fb8d64f125726dc3728cd6833618c11 SHA512 2fd417b57a5adcd75ef34adbaccc0199fadcea42274fc77efeff601a0f12e376fb3d7ad62a65e1ba6f0b9eebc217b4c3540f6fbc6accfcb136e839a585b3e900
 DIST github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz 25955 BLAKE2B d6c9b20f80800396ebc3eba2b08ad48522d297bd0da90ed32d6ea2ea4e575e9feea112513332a3c55bbeae2569770433466536698084e787127866efaf0d25c2 SHA512 e5767898e8aaeff59219e0a0578586b63717d5c8507c74ecb813e8e8a7b02470b10df0452cc378c7f0a4b9bec030be22deb3c3ce7c5ae88fd739271cf05e36ad
-DIST github.com-gobwas-glob-v0.2.3.tar.gz 25962 BLAKE2B edc7e7ea8db6312690989d007d2a292f197a22c6efa7b5737cd925c2608e4a0ee38571082bb0dca57088d4531bb5b1dfad6341b09cd7fd4bbb57943640d9b441 SHA512 b91b27389e1f172d7c2c181f19ebc27d566e6bd6397cc6ad924ecf5f2ace98ecca639e020e05c9e281fb8549f9065610f7eb6070c63e3f9e7c6fd190c457e42b
 DIST github.com-gofrs-flock-392e7fae8f1b0bdbd67dad7237d23f618feb6dbb.tar.gz 7291 BLAKE2B f1b1025008a54f896c2d5ded4ae26f601fb9ccbe751bc06a1fc93e5963857d8ffcc1dd8a2709fe0b0762ee4b94e7e351d793b70f187f6ed9ceb35ded3aafdf57 SHA512 7309fe6301bf229002b28c0eafbaeb0e8d1e0500b09af6327e7e52490e003eeb291b982125780a0106333b3aaaaeaf888aef97bdf5ffbc015aff30d913f75637
-DIST github.com-gofrs-flock-v0.7.1.tar.gz 7294 BLAKE2B e11148c7e96a6feb45a1d35085b67d11ea3111272ee56c3a816237b2c83010d8b10d4a4e41891953b30fa22038153d8364f0079f7cda4fd6350d8c758ba2f992 SHA512 9e5b20a788e8b5677ed8665286aad069b6caea0d5bd1f2301f9617fdabdc1f0a82f0db9a28225df759edb363382e061f9fc87a4e51fc5a4b720d13454deff4a6
-DIST github.com-gofrs-uuid-v3.2.0.tar.gz 17064 BLAKE2B 9e7e4d2f2d2ba248438e26825abdf71f6a948b4c6b684c3fd453c478c4994efd7d4476052cd5950ed33230f535d63de42225236a9c19558eedfc1a9a2bb45bcc SHA512 c7acb8c4090ba5acb2c741223ba924b7c08e14a724e289d4ed13451e9069923c1e4659837927b80c60a375eba8ead548a1547618937a239c57354eb4f25729ef
 DIST github.com-gogo-protobuf-65acae22fc9d1fe290b33faa2bd64cdc20a463a0.tar.gz 2046917 BLAKE2B b0b3f7a8409647435927434e79dd5d12dad0ef235ecb75e1a1d454b27236ba0bd61dd4978fbf2de30d2b2e47b3d2be184c6d27c66209cf447ee0aec197aad36f SHA512 409f246db5f76d72d1d27e405a2e9dc079114fdce33c448400d0f37c56ea0f6d1a7109253af9625c27e526427fa0d9155111c708b4e810193e82a0340becaed2
-DIST github.com-gogo-protobuf-v1.3.1.tar.gz 2038188 BLAKE2B aee5f1910018ada96b4e52070bc487f6703c6cce4366cf5e1f167234702a7a318dc8dc74c19fc6612579d7d59b7e8220cea0edb6e70ee37c141093d857872607 SHA512 a901a849d5161fb9806ded3b4e57afc53a355875625ef285a74895deff32d799bf96feace6fe55aff40be5f16347a491ec16529c8d1ca4cbf087174960f013a1
 DIST github.com-golang-appengine-54a98f90d1c46b7731eb8fb305d2a321c30ef610.tar.gz 326123 BLAKE2B fc4ad02a715532a99688dced5ed7dfdf7f7f22f8ec913de73e2f8d0feb95de84d46d497415f4d19796de37f2234dddf5c1b4c7a2bed69feebcf709d54669b2a8 SHA512 353f9a2705dacc5f485db1faaaac3ce51dddcc2f383f9e4a3874b199d5ddb1c2ac4a8d40d82ef3fe4f20cff8940edf5ffd09caa943096084364d06eac1e2e854
-DIST github.com-golang-appengine-v1.6.5.tar.gz 332903 BLAKE2B 270cfef777d2c70521b09c6578821903f46579fd4fc0e1c49232357253f1e39f8ee9959668ff14cb046c3b007744d20d3c78ee6050c9c894a82e2132c44341e1 SHA512 394da1993b5979f8e174f80d68d6b1c165a11248c5d54aa61bf337541013d5f157e28946b8edf8259b2381bb4a59d0d1fa3e99596868681a586384bef87ab8c9
 DIST github.com-golang-crypto-e84da0312774c21d64ee2317962ef669b27ffb41.tar.gz 1641247 BLAKE2B eeeefcda7ca9cdbd1519ac03e4cb195d68041efd556b5ba7999b202fd993b3dde2455bf3fad3590dd00bb1a40b01141bee12a756a6db974c8b5deebba93654b8 SHA512 3d88feb4e9c840207f3f5185b6d33ebeab673746ae2fd7a8589e6180ba5d9aac6e18229415d1acc525854fc4c717b91702701edb73fd2e9979550f82908ca754
-DIST github.com-golang-crypto-f83a4685e152.tar.gz 1709294 BLAKE2B 9ae1d75eb1638f4014944f028bc983e515520f4b60e3895abfc3966f82621bebbe63eac0df5d975cf11f7c053d3498749e59f18fc1243e1e805ec1d967c8e09e SHA512 bbb4584e769161b76c9a9ffa74278fb8fafdd760b0c106fe86a09fc8159e9fba8950c52d58f0072b9748cc66d4364284748a8808fa45ee927163c8d93b312af5
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
 DIST github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz 25244 BLAKE2B bbfd67b7c9d34fe1cddab77a372fc53c899424122c46dd637186bb571e1a12dda7f0d6991bb5ad85cd0162803832e5843af6b184f861fa5dd1ac0a5cd8c7ed86 SHA512 e7ecb5c64bbb9e1fd2555ed496abb1e65f836b8017f21010dc853f8c527826eb6c315744ce991725d85e3500a6c877b3f25ba22090584c4c75dec6e6cbdc938d
 DIST github.com-golang-net-cdfb69ac37fc6fa907650654115ebebb3aae2087.tar.gz 966750 BLAKE2B fb24de16c0860ed2942a3819792d16d004be26c8682be3bd900ff31a37544791a131810dd02c90c76d3d8da0c05b441529472f69b000811bb44b8c1f18d6987c SHA512 a42d962489da4e29943bfec16a774f21bf9b63fe6e1887cded2b2c37de66d7d01ca6f34ca89eaffbc750d3cde11387b62d0487018a342dfca3969369e7651c17
-DIST github.com-golang-net-fe3aa8a45271.tar.gz 1103753 BLAKE2B f6275e938bb46dad65d065d838c9ea7c9d9feb1370527cb82f166db4fc085a3d88dcaa6ff1ed3650b978ce094493265a971a2cb2d1b05e8e81d8b66993b3f474 SHA512 99c5b7b08181ea29dd22975e58d5b49a1493ce3180a92f78e9763dc5af60905da0ee94e5b31c3f65b8c6b0295894f3ae3208509d50cdb212478bf716e3c9b692
-DIST github.com-golang-oauth2-0f29369cfe45.tar.gz 45476 BLAKE2B 42a97cfb38a2633d99e5995b75f055a6ae5bc3f34b3a501fd4b016c129a0e85fdf1412f5f8e5614ccaf19b1abf018e3b5da7339c9c796ed9d2bb40c25ee477fb SHA512 f7b55b531c924bcdae71beeae0191b0ba002a7551012e8a6e1c088fc74dc4c985353af362138fa9276eb5d965f25b45b3c87c8e1a756d8c0e89893816b825661
 DIST github.com-golang-oauth2-9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz 45022 BLAKE2B 0b14e367f087601624a84ef25641b1f3338cc689ee92136ef51abbbdcf1b3b3dc1cad47b17868a39c1a9ecb2f792cdb1d5bb8f8ede300a5d9dc8445319c05132 SHA512 8a9ea21c4e7f9dd1ceeb069dee1987f5e5e5ba4f973572ab6f0ccf00ae6246a142dc517ef15ff83de5f3c16c267181ac3812d3c6bc0180d12b98d7540e1fc91d
 DIST github.com-golang-protobuf-6c65a5562fc06764971b7c5d05c76c75e84bdbf7.tar.gz 312591 BLAKE2B 68f068eca7c4b2b7d54a1f8775f78441f94990e65ce389aeee932deb15099cefbc1e5e24d0dd270374283ab5e2191435b646f65c376f0997e74a9300cf9c7ef0 SHA512 46170e316d5e46f01c927d00d0c953ca430463356f08f904973229fac429903760c65cdfe34b60156bd79159dc1670c88589d19c3990d7460fe6d0e235c220de
-DIST github.com-golang-protobuf-v1.3.2.tar.gz 312285 BLAKE2B 381ae3c4bad3d3b3d489a3b66752e9e2405d17d9ed2c55aa1ec06ce6c18171b1c7625f6cc6e28490551a6410835f6e774a408de39f6e9ea9b3cddaf46e3b859a SHA512 ef9190f7773b18005760eb755a1dee25eff38c188687033362635e2431cf2c7372a59a3fec91acd6e4f63aa31d08391f7521a8dafef7895268b6a1a78735dd8a
-DIST github.com-golang-sync-112230192c58.tar.gz 16835 BLAKE2B 51efe53ea7ab1f11f8ff078fbfa91526b97a1d918101bdbc755aa500424dda860d3a11195c1e44d033eaf7e0d09e7f327e404ad9af84f4b9747d8805b53dcf10 SHA512 bd90bb14e688fa7613d83dc8718bbb688a2f05cc8eb8c3dfbbf71daa7dc08e35044803c4bf8e5d5aab625a612e986e6f76c822c437f52132581ac37e0e2e92f9
 DIST github.com-golang-sync-42b317875d0fa942474b76e1b46a6060d720ae6e.tar.gz 16241 BLAKE2B 64cd1b60a2eec29327f6438bcb6eee78eb81675996a04615aa43157b565abd3f6503edd3b6eb6c59d11351c1de1cad4d2f5ca7194f4b69ad61d198e6f90702e5 SHA512 02aaccd81a4cdbf26ef10f4693e4e102cc6616438a1d6cd326fc4d91f39ab0dee36cce364ca74c1a424a85d5d59cec6e3cf364f5dffe7262c6cb32d9e485e56a
-DIST github.com-golang-sys-195ce5e7f934.tar.gz 1516474 BLAKE2B 1250ecdbe45497c53c629a0564fbb651e00167d62bf74f2d0d2bc27928c128f17d14d6480e07c86b80b5ed304ce4c3bd4fdd596e73bd2da010b84f0e1941192a SHA512 0ce3571ec62cc80f486665abccb2ce565de997685ec86f58a33bace4e193f344f7016754950e2e4d43ac6b13d05f64d5235c26db12165335e37e941bac4b0f2c
 DIST github.com-golang-sys-b90733256f2e882e81d52f9126de08df5615afd9.tar.gz 1242904 BLAKE2B b25ad8ab9a4376ddf2b51303eec7cbb954c53693950b040bf118294484b22f27e2b463c3ee2c994b511c4d04119c85b1cc6f56a3ccee21b297bddab242f22b82 SHA512 b79478d67ae01728adcc6fe81ec91396ff2459ff0d48e05c235f618264262b393c566af902845d34f2ffecb9fcc02ced5a1476a3e00d66ee721cd20e7b49fb7b
 DIST github.com-golang-text-e6919f6577db79269a6443b9dc46d18f2238fb5d.tar.gz 6588337 BLAKE2B f182e9a40157c43aa749fae5fd6aacadf994a7c2051fc23dfef8031b243f691446d4e5c93c9b363ab22df38f533b1635aa45e23f4d8de7947ad7ab0aa8e5898a SHA512 caae52905ffdaa8e712f6b92a03a8cf9d9eba227e04ee795977c2b76bd79bc16457f846c11e45525f3e3df557fab5e0279fe098c0145b5807c0e580dd339f452
-DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
-DIST github.com-golang-time-555d28b269f0.tar.gz 9592 BLAKE2B bf24959690760b113dc64c0f87069d5d271200fec989c6360063448cbad078b8ed8c405c7a6b62616e4a37cf584215c8ce7020f2a1e6000d2f0c09820a32beb6 SHA512 fb3aead0791f2012484f94ef97f12c7217fc56b583f39c4e38ccea5de26ee84a4e8274a044f96a62ec3cbc5e647ffc064fc613d2b7172187f283108171d12374
 DIST github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz 9005 BLAKE2B 5ad1988c9bd3a632ea4b248e32f6223a79d54b68b1c95bddcace042c22c20d3aee6192bf3d72def729292ed50e4d423935c3ec7004398e03037f91b7f401fd77 SHA512 65a69bfc6044de4ecacfad1c9c8add6312745bd2ba3dc46f522f1e7a424aac49b5e18aca60f8daabc340d50d73675cd5c06de9441060d86009a092feb4f5c9f7
 DIST github.com-google-btree-4030bb1f1f0c35b30ca7009e9ebd06849dd45306.tar.gz 15299 BLAKE2B e7e700523dbf1ba2f8f71d2bf8279df517787971058a46d2599ff0d4c57c00943209a5411c044393e5a15c8a233ee7135f3436ce924a2b30f107b264bd71d3f9 SHA512 c2511fcbdc58b3574ee30e4cd4ef3ab7483ffe7792bde161a9d926c09fe4ecfeaadc87e9bda84c18a5439f26db9c48499706ce8766cb8c232d0dccecf53e7429
-DIST github.com-google-btree-v1.0.0.tar.gz 15292 BLAKE2B 663edd55fb375f2b2b1ea377efea8d891baa501161bd5b87a5d10cc84a65d4de0cd4e7b60f421d476f49f26b2ded0fb8633348392c993585790d1af194c147ad SHA512 1bbd6fff467a0f6f6ce074e94a1c13a019e7d37949cbc041d2886bcafa1076426146b46c21a15f55449d525265c04749312792006bd9ea6baeffa6f3d9705a20
 DIST github.com-google-go-cmp-6f77996f0c42f7b84e5a2b252227263f93432e9b.tar.gz 76176 BLAKE2B a2c233a7301def18dee5a8820daf83734c41022b391a9cc93f3af598ed60449a17d4c0ca5a6a54dae1e91375c86956accd608b1ca6941f00cec2f79d49505a0c SHA512 e2067f3159c0423b5b067581b116997d347f6f6fc7c43ccd7856877eee8c7d578350634405e082e287ae9cbb809e82eef83bc0624d25f011b6e39ef365ac09a7
-DIST github.com-google-go-cmp-v0.3.1.tar.gz 76403 BLAKE2B 868b09df4c8f84d945e66ab8f4c6fc20cb939459709d8479bf5ea2824f75e4f4850ef758818d75d11f86185772e7fa6f1a6ad4c5e7b593679f456aa81cebb69f SHA512 5cce583593d7d6bcab92271fa0d1b58f7b34bbedd9c3e1864f9e86cacb118b9bacd7b111165bd932b5f978d27fe0c779fc6f5edfb6c7b59f4d8b111511e7a782
-DIST github.com-google-go-genproto-919d9bdd9fe6.tar.gz 5549359 BLAKE2B 6c3a3172e33c5f7e8869ee79c60bb834aa11da173a1b7a8c71837efcf2c026ce9c6c27f7e83418e47f219b2c7486b81925eecba8581bceae3f986f60c5874f36 SHA512 e7f42b9a1d298e8a37d662fee6d478ecf515ae13b6e9418b1b8a73e46ae3c2a39b57db723891e9709f02cd48d2dc24d046c74997c31b2c186b44afb154a98037
 DIST github.com-google-go-genproto-919d9bdd9fe6f1a5dd95ce5d5e4cdb8fd3c516d0.tar.gz 5549359 BLAKE2B 6c3a3172e33c5f7e8869ee79c60bb834aa11da173a1b7a8c71837efcf2c026ce9c6c27f7e83418e47f219b2c7486b81925eecba8581bceae3f986f60c5874f36 SHA512 e7f42b9a1d298e8a37d662fee6d478ecf515ae13b6e9418b1b8a73e46ae3c2a39b57db723891e9709f02cd48d2dc24d046c74997c31b2c186b44afb154a98037
 DIST github.com-google-gofuzz-f140a6486e521aad38f5917de355cbf147cc0496.tar.gz 13207 BLAKE2B a64f29fbf7211d3285c46b0691e5f2ece230014c1e614552c150a45d1df218b321ab3b87c32f5055a7a0f1855d468c0246f2a9891fb116fc71005b978a6af636 SHA512 324543b6462cb05811240d4646c8c0d56ffbef7f8476d5091a817807fc941ac72311e27b31a20ccf2df894bb3360a8d36b34dd6fcb2069922ba5f3cd6777b046
-DIST github.com-google-gofuzz-v1.0.0.tar.gz 13201 BLAKE2B 3884b6e9a6f910986f6ff5705b505e9107200a034d0c99de426af38938a71adb3ed443bf45da70fe68133c528db69aacebf4be74fe47d5f8bbff0bb88a4d8bd3 SHA512 826cd0d22d8cfa724e4b16e052fe732f52c81ded6168b22eed1839fed2b12d020b98ff3518f8620bba3659cb404fae342875c16386f4ecdf48286e5b99b46a95
 DIST github.com-google-uuid-0cd6bf5da1e1c83f8b45653022c74f71af0538a4.tar.gz 13561 BLAKE2B d158ab89d96b1987a79d5ceec74ac002e5b4053a86cf3a3d407f26b27d425fcb11e113e388f688eb181229ca280548f6c3490077d01f994298a5d47ec68258d4 SHA512 c0185645a3df24ed5edff43004194f844b5e67c69b62dfc746b457cfe236b869b225b3d383e8bab161281aa1fdd667d4196a7b0ff81dfa32e3ddc73aab43af59
-DIST github.com-google-uuid-v1.1.1.tar.gz 13543 BLAKE2B 554d0cd47b38f272b4b6da0e7f326336c43bc2730ff595640c1ecbef2087fbfc063b21e6477003033ca2486c68fb91610f9e294a60f69fc72c60b1bc553eb778 SHA512 49d72c190422c1c7bd201f288a8bc644641ef61538b21d91e79d58d096f672bd49359d22be856d450f657848ff11b110ef325030565720f7bbc3e9d58b003f0b
 DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136
-DIST github.com-googleapis-gnostic-v0.3.1.tar.gz 435152 BLAKE2B 4e44b4aa14ab0abdb64480284d0130a1b14654ea51ab64a6fb047f46fc0279b7cb92297d9f142978499145a4c1cfafb2ce467cca48a069c1ab9946119cdd19f7 SHA512 deb94ced6b07d76f827bdf9d5802e0734756ae96afc7c3fec7c602a17dcb55dc3228e8ff22869aa70c7be4a560cd2118218fa5056e19c198577b25c197d9b4cf
 DIST github.com-gophercloud-gophercloud-c2d73b246b48e239d3f03c455905e06fe26e33c3.tar.gz 875548 BLAKE2B 229cfc12ebc179242a04fc5fb80269f2b25e28d3e795a5f7ee4894b6717e9dba8240d5e0b5621dd8ced6809e4f13c0b2919b6455888534ea96d7fb106e9664d1 SHA512 bb6d896c5d830877d3ce8b865be99c3807558ca480e237530152096db3f1c4bf3ea757e3cec1c2206153e3721299f6a066784c7391b701f9de0e4a891e6edd09
-DIST github.com-gophercloud-gophercloud-v0.1.0.tar.gz 878471 BLAKE2B 14a11a26925d738024b38bb9417da8e0fb4462df825bab5093ded9d57cd0b7f1ce2c156a9d1946aef5ae40063961a759be4ebed9a5d717608398012eace393a5 SHA512 ecf6df2ae34e42119eb33b05d90d9885d45eff12ea18d6da539e7c57d986eb1bd2659e82943a55ce67bb78f91e05ad2813e298115b8bda5e2c86485f458bdd88
-DIST github.com-gorilla-handlers-v1.4.0.tar.gz 18379 BLAKE2B 6e8ce2f251b18a5e7323758181da27387e80525a7cab4c2ad6e479d4cf59a4fb5f79b27e773b2a0eb79768979de2f2c101ce1023344bed7dc913a177b2d27c8a SHA512 fb3f9d00b7a5e2d2381c1495b33a7426466d203657ff19e3f08b4bb81190d2039a85a165d3a16b9228f58a46d8d3b9befb566c62bee39879c6cc9bc58448e747
-DIST github.com-gorilla-mux-v1.7.0.tar.gz 40777 BLAKE2B 328c4e882b43293bbc0d7781dda02204f125f3c8947f4c282c228b773d1ed3b4e1a5ff9d95d6750c77a17b12ed64a9aaae9e78078897d3dd7cbcb1fa79a73e8e SHA512 d0e212b5bed8155bd84a63fd3655cfc27865125b9e2f828ef107cbcbadfbf6bfd0acce4af579f52deaffb0dbe20288ae178c1c5cadb05e525fba2efca5c0c8ab
 DIST github.com-gosuri-uitable-2cf933346b8370a3a3d8867ef5cf54b2129d8ecf.tar.gz 7216 BLAKE2B 59a08e73f84e424c5be5d811011996bccf2892295c49d658e90ef899349bbee0e1fd97ea6ce46a5fa5d41493a19ee552e0cb27ae0dff8fe47d49045b4c2b2c96 SHA512 151569d9477f3ca2c7f91f80ccd6dd15a5c7461f7918f2b38de5149a419b56bb2f5fcb79247fd74fb57143b74c28906f31ded794e7e89a50d4fede5e092a303a
-DIST github.com-gosuri-uitable-v0.0.1.tar.gz 6858 BLAKE2B 5868330856e262df2eea7a1710ece3d0c1e4382262589bfa2b75ea2a718a1660361b24c0499987044cbfd0ccc5fa3c40fc977b4debaa9945d5556ae441e9c44d SHA512 cf544472820310725dfb744c3d62a661831dcbe224cb8f40a8e33277b6eea0acb05adf0f2b048222dd1c045214697240644d85a134814913ac7be8ff11b7a1ed
 DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
-DIST github.com-gregjones-httpcache-c63ab54fda8f.tar.gz 13973 BLAKE2B b7999233ba740e90789d970e89046fd705a7830878c782fc23b29fd82c5284d724df58d30fe831ebadde2efa2f3173f569232e1903903b1d31906f8c3c43254f SHA512 ad9d66e88867da3cebf877550f1e98c4258923a0e262a8863b5635cd926f2f798ff1e8efd3a8d0c3e614af748c44b5c5bfc08b8930ab2281be01c51f1bdfcdf5
 DIST github.com-grpc-ecosystem-go-grpc-prometheus-6af20e3a5340d5e6bde20c8a7a78699efe19ac0a.tar.gz 30622 BLAKE2B d877284cb5e2c544f56f4df5e61d3176da794e1af7c95497e0de654863feaa201dc5addeef0c04cd0871da643a56819466f3da129896befb10625e6234cb130b SHA512 8a3c39803f6a6a6236917a50ca319a7b13097332c8b8ee831a82214dd6b464e35e515c3058faaa0f2223671c44f9b2e0af64adf87f6e9cd1b21518a37ed06b08
 DIST github.com-grpc-grpc-go-a02b0774206b209466313a0b525d2c738fe407eb.tar.gz 590343 BLAKE2B b5f35015f4511024163a968d520f94f47dadf83e5514c24bbf990f460acd1a5389f2ccc015040d889216eda8cadaddccaa94841d52215a114f900c96406daaaf SHA512 f14f19bc116cf465da08244d924baaaecd1676a3ff19c9efc6e3fa5ecea60558826f945adb8b5f1231046220241b26e69247a108399a04de6289384d0636a3ef
-DIST github.com-grpc-grpc-go-v1.24.0.tar.gz 755074 BLAKE2B d3f65458971195db3329807e147811e3ac049d0b6775498efee7a98885dfbfd616bab490f5684341a9968bda6573b89ac008219d76b224a8c25994e97453b36f SHA512 479dbb72eaaec6fd6e48006b9b2ae636b5fd08b1fe5aeeed18c40d794b1ee4d4fe473b3d2cc77fe5ceaa1ddd00221a64d940d8fb228612c9ed3c83c7d1b4c756
 DIST github.com-hashicorp-golang-lru-7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz 12983 BLAKE2B c600a2ee072ae86dc080f10232d079f5d0179e4f3ebc4c7db4ac2ef05ed99998843ce0882c38236552ce36ba38898dea6a13956e2da9ed58af91a728a34a980a SHA512 1a87bbb71da395c99b947aa85ccc8e8f680af14d0be3fcaf353bb058ffbde80252ee5dc5186e5a0a325cec0cbb8fd45cf86f3e6d4f8056515af1af4072c49308
-DIST github.com-hashicorp-golang-lru-v0.5.3.tar.gz 13348 BLAKE2B 598db380ae34bfc568d5a048e991e9bdd6d486800caa4c7d27ea96877f47e5fa5448b3bc30aa9d800a41755f9a17189c36ec738b8e7c00a51f2a80db3c270a1e SHA512 8775349e1c9df60a57a425f506ff53a1849aa4877a878583b59bc53f3e746f5b6c482ded9bed9182c68e1d12c5acc4bacebe7a6d41440234d4b40361bddb805d
 DIST github.com-huandu-xstrings-f02667b379e2fb5916c3cda2cf31e0eb885d79f8.tar.gz 16630 BLAKE2B a342eb5cc38aca4f5a5a5a36295c0c804997550997115b86373b6b6879b0d6faf1576aa0e0b550127a1b9fa477e2fa27c44c7a6be93c827ffb913419ba4792de SHA512 f291b9893795084d081bb6cf025ff82044b2ef436325a3f0e16f6a193e5ab516439895886a284ba45156839bcc643b5e702db7d1bb438b093d91a2ab4999c62b
-DIST github.com-huandu-xstrings-v1.2.0.tar.gz 16628 BLAKE2B 730e593c459a8b8719f0ef946b548ad27dddcc7620da7285417940c1cbc49b63b6c68b09fa4208643ec5c663cd8f32f28b7b4cd10c40c79ee063c16949d60e0c SHA512 f7e0258a706bfdb22ec954c0b61aefd1191993d465ee6c3b756d9ba40935b08b621275a5097c779e41ebd9592376e8e640532558b948acacb182f14dbbac759f
-DIST github.com-ijc25-Gotty-a8b993ba6abdb0e0c12b0125c603323a71c7790c.tar.gz 10563 BLAKE2B 1e14db7f262dc98146e9a7cecce50f60dd592c62b776432268f7203f10fd075b8039d5b0ff1292933e6bd2f3d7fbbf703a448d915fba1842164b6db70460fa37 SHA512 531bbc613bb6549653ecc7c9e4b7418505c9de93a2fd638a52ea6025c40416d46bab3476704661245edacc68cc200a32ea4cb7d4b0b6231b5ea1011f2bb18f27
 DIST github.com-imdario-mergo-9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz 15928 BLAKE2B 1a6f95308897829160a1a61d76fb17fe6da2159ec68a9def1294eee0f7c5acfa0de9581a7afe05353a79088374ebbe8ca1299844666ee52a3074b8a2ed04d02c SHA512 34bdc7ed182a4290862c4c21fd9442e6b3bc03a16aa04a54aede48f16c0baec62478dff97433c6d3370b110abf4a712b304064826589ef922d1bf8cfb80fd446
-DIST github.com-imdario-mergo-v0.3.8.tar.gz 18180 BLAKE2B cf61f9eea10b02f4a179017f2baf3462b8626880902c0fad48edc5baaf2acb95576debae34cb33bb09b2146e9353f44bfad3067c08157b6632532672fc0d3fb9 SHA512 aeb0b1463168cf9f4c84763694d366cfb67bee66e112e1bdf329fa72ec7e475182f9eb902c82cc9eb191b4a3309be2727759c591639a11e088121916018bdb6d
 DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
-DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
 DIST github.com-jmoiron-sqlx-d161d7a76b5661016ad0b085869f77fd410f3e6a.tar.gz 49619 BLAKE2B 69a7ad4e10d12420534374e36a0897aaf9219479a128842455f00f865fd9c15d0b580ccfab2ae0a98a4720b19f0230291d24c773b7c297b9e47306fedf68e6af SHA512 d52c306a0664135d8c6e63e836791ba829daf9cf23c656e8cf93ee258aef5c708a7a83d57efb0b0d78456b3c644677ca25c0dc9960a0a2aa058202f799880555
 DIST github.com-json-iterator-go-27518f6661eba504be5a7a9a9f6d9460d892ade3.tar.gz 77940 BLAKE2B 3e783fe2e4a2f2ae32944492d8c959968ed48a3d0c3eb73c8bdf91533bf09b954452edfa489f0f1e916956c764c07a6d6af8e2cbe2a5cbd843acc0bb0184b1e4 SHA512 3cf5fc88eff6625ef43dad53127c1499ec8edcca864ff4619fa9f1c28a2fa776cc9502afb40e775c08e0f269315a5abd16f939be25f5aac7c19a97d2e2b9b391
-DIST github.com-json-iterator-go-v1.1.7.tar.gz 77936 BLAKE2B 3bdebbc4c36c3fa6ea805a120b542768203460618b7a1cd566f7618b11096af9b6f378806074d06c5cdd17527e6ec7871e363ecdd17973a7a05d5c9c956fe98f SHA512 b93e335d828a4be5bbc402b17c24ede3c741e9ef4e62c91d8899c4fd70b567cbe841c175e3ce31a87d589627185ad3dd6c664b9db6170943451a4e66ab75ad02
-DIST github.com-kardianos-osext-ae77be60afb1.tar.gz 4860 BLAKE2B 8f5958f711e86899267876fa27d534a34e8d48d07eddb14a82cdad1bd4056e525e74e41161be398e7da9c8c4bf7e03a1dd90e897bda7463dd7c425a20b94c8f3 SHA512 924fb47d68a300e7a17e67259c1ca6f395c23a2d630cabccdcea7ff76a9087597b317c2cdc9cecc42d885ce1e8faab338539f210681f02c695657d7b17039bc7
 DIST github.com-konsorten-go-windows-terminal-sequences-5c8c8bd35d3832f5d134ae1e1e375b69a4d25242.tar.gz 1901 BLAKE2B f8abd760472e484d1d6465fcedb5240ac104556af67715860c0429b9dfd963441396266f3b1b0af2b6a62530dfa4f8ffef9414561ff64b8639e6eada9efeb301 SHA512 c8445e656d4042d0c31661bfef05cf918e84d5b4905de09553cad0682c83fdab60ed11c0fdbe90949566514125d2353aabad85d36c15825a48e86d8ed73a94fa
-DIST github.com-konsorten-go-windows-terminal-sequences-v1.0.1.tar.gz 1909 BLAKE2B edc8dc8f9a9c27d724b98614c2d937f5fed94977c1590f542cb1c8724478a63bba61cd6569fc7daed1e870bc59fc5ca0f5acd501f58e7c93e5c69517c9ca80ac SHA512 8c781a4c17df20623b8ab5af9757fedf6fae9362c10f195eaaeb821a0520ab9407de30607fb085a38a04915eb180bb8d5c4940f91db4fca7ce1cf69a8276bbe7
-DIST github.com-kubernetes-api-35e52d86657a.tar.gz 2540409 BLAKE2B 867f6230cf50a507b284b6e9345a800113c81bb497dfa8becfd926d2159154db39fc22d811448bbc2b812633444c8b262d14ba20395029b6f885f6138f498d43 SHA512 ff48c59fa4aed8e860115303b58f90104bdef4238d7aa6e6393dd342c4b9f3e07c7a4bd7ef6b3d3987cda819d5cc73345dac07fc58dcfde8389921d7df0fba85
 DIST github.com-kubernetes-api-35e52d86657aba06859dd22099bfa14faf1effb2.tar.gz 2540409 BLAKE2B 867f6230cf50a507b284b6e9345a800113c81bb497dfa8becfd926d2159154db39fc22d811448bbc2b812633444c8b262d14ba20395029b6f885f6138f498d43 SHA512 ff48c59fa4aed8e860115303b58f90104bdef4238d7aa6e6393dd342c4b9f3e07c7a4bd7ef6b3d3987cda819d5cc73345dac07fc58dcfde8389921d7df0fba85
-DIST github.com-kubernetes-apiextensions-apiserver-5357c4baaf65.tar.gz 376464 BLAKE2B 0cc999151e2e7fac2e92aae39d051a0a99f2a3f103456d2af803c56ee8d9e8d07027d99d5de50591ba61d5ec9cd48a228542ce1792c867a737172c696b10b4f4 SHA512 430954477f12ba2cdfcb9de5010fea62f9a1e8ac1926f2ce2fe7e6589763d0e44a741bd246e7232554860ba8fa2198ff76e478dbd7fdb45987c4a5f21a5c81a0
 DIST github.com-kubernetes-apiextensions-apiserver-5357c4baaf6562e4d37c9afc9fef99bd16d76a9f.tar.gz 376464 BLAKE2B 0cc999151e2e7fac2e92aae39d051a0a99f2a3f103456d2af803c56ee8d9e8d07027d99d5de50591ba61d5ec9cd48a228542ce1792c867a737172c696b10b4f4 SHA512 430954477f12ba2cdfcb9de5010fea62f9a1e8ac1926f2ce2fe7e6589763d0e44a741bd246e7232554860ba8fa2198ff76e478dbd7fdb45987c4a5f21a5c81a0
-DIST github.com-kubernetes-apimachinery-a2eda9f80ab8.tar.gz 504261 BLAKE2B 2cfd317dbd539ef44429ed651e939ca4e91b64a2f1bac801048b2499d7584696ad44f4846657a3be28d60dbe2f6814d51e45dc702396fd10efc56440b25c03c4 SHA512 93f3cb4b2be1f81ad8a343b47aa2c10f36f9178f93d921a9253605bf9e12473eae68649976abe6e3d6c68a1a2ddbfa95d5d3b1cab0ec7ef0552dad6169feac9d
 DIST github.com-kubernetes-apimachinery-a2eda9f80ab8a454a81bdde16d62a1afe5f931c0.tar.gz 504261 BLAKE2B 2cfd317dbd539ef44429ed651e939ca4e91b64a2f1bac801048b2499d7584696ad44f4846657a3be28d60dbe2f6814d51e45dc702396fd10efc56440b25c03c4 SHA512 93f3cb4b2be1f81ad8a343b47aa2c10f36f9178f93d921a9253605bf9e12473eae68649976abe6e3d6c68a1a2ddbfa95d5d3b1cab0ec7ef0552dad6169feac9d
 DIST github.com-kubernetes-apiserver-5190913f932d82e562d4eb91d0f3d7a063bdbc07.tar.gz 771653 BLAKE2B 1e078ad6acd4cec8d65df0175afb87b7bbf2a6e43d1e71f3664f4bc130bdb4f6202f20ddbf4b431c295bf363408c425025a150350e5b4804d9419f93eba69eee SHA512 da52a1e61394131281db0fd321ac119c613e01f875cd244b5517f6c3bbb86a5747759f3ecd6a0b9dffee27bf6767661c19a01e6fcf27dfb87e29f6b8bfc1e4d6
-DIST github.com-kubernetes-cli-runtime-74ad18325ed5.tar.gz 91304 BLAKE2B cd376f071227fda170fde7bc72ce4efa64d49a054d3e26c35119deae10cd63586f513fc1dfea45c354da092ddd13da827152984dd2de521a80289558cd1b6c71 SHA512 25e0d88e45fdfe3ccf3391de5b28f9669723d103dcd90653e9954df7c78a6c72c4c95ee9fb80f617491db7c4f3bd33974afcaf9a28a62282bb7884d0edd0af74
 DIST github.com-kubernetes-cli-runtime-74ad18325ed51ea6de9ee19bae59156bad18ecd2.tar.gz 91304 BLAKE2B cd376f071227fda170fde7bc72ce4efa64d49a054d3e26c35119deae10cd63586f513fc1dfea45c354da092ddd13da827152984dd2de521a80289558cd1b6c71 SHA512 25e0d88e45fdfe3ccf3391de5b28f9669723d103dcd90653e9954df7c78a6c72c4c95ee9fb80f617491db7c4f3bd33974afcaf9a28a62282bb7884d0edd0af74
-DIST github.com-kubernetes-client-go-bec269661e48.tar.gz 586153 BLAKE2B 959255e10caad42994001b1c8e39fc31eab28842ca36a48fffb2b9af5a7751d2a2fe59e2c40c6b13b083e9efca6051f22d04fc79641434ed156f84c06da4eea1 SHA512 c4f59febb8795b36fc3012d3abee4139f8987c46b3d696f540458e994ced5b9b3b2e9609172c77eb411b3cbfb303a6ca576684cdb049f3630d93084d47475973
 DIST github.com-kubernetes-client-go-bec269661e48cb1e5fbb0d037f356ffe9e9978a0.tar.gz 586153 BLAKE2B 959255e10caad42994001b1c8e39fc31eab28842ca36a48fffb2b9af5a7751d2a2fe59e2c40c6b13b083e9efca6051f22d04fc79641434ed156f84c06da4eea1 SHA512 c4f59febb8795b36fc3012d3abee4139f8987c46b3d696f540458e994ced5b9b3b2e9609172c77eb411b3cbfb303a6ca576684cdb049f3630d93084d47475973
 DIST github.com-kubernetes-component-base-039242c015a9f5eeaccea3ea17c6973b9c27166a.tar.gz 55170 BLAKE2B fd2a2d5d6c427449e4434f3dbf03ffbef1953294f22a32b005197bdcbef45cca3bb9ab5feb45d8f9e3cf8352764c11f25850376a0d975dcf83c5dc73e1e23d47 SHA512 1a968cccf2e060e9ccb052cacfa67be49aa13bea2cb0152d1833b238db23ccedcf102f0ef66895a9d9a6ef2b09648d7d9ddb0d13fd4ca3730a5bf175e26f0fc6
 DIST github.com-kubernetes-klog-3ca30a56d8a775276f9cdae009ba326fdc05af7f.tar.gz 32456 BLAKE2B e7ec2eb0097378d00a7ce7700a2428e36dd75d61cc2bee105661da7465a08dea3e1ba1070cd089deb8a07667cf39212a604f28268d44e53f51956062061c1a38 SHA512 2f16731f09ba48d2862c7744c700324966f28f9dc5135d6812de29900ec58046b88a1d0402976beede0c55b356dcf1b3612e1606bf0597f1da1dfdb1580ee53c
-DIST github.com-kubernetes-klog-v1.0.0.tar.gz 32366 BLAKE2B 8280be986eb5045c13762a97f96b006b38bdbab268a5b18940f18653fbebbfd00ffbb4d82f1bc8da6a2ed202108c1aef214233797309aed082c5870a344d0a5a SHA512 80a8796461e57b5781e2339ba9bd1f40af32e29638255e9ce2141075a8f3f981edcbf551502b0e9a8d23ce6a9ed52e8bd6fc33d7682cff8467ab0ba56b3f8b37
-DIST github.com-kubernetes-kube-openapi-0270cf2f1c1d.tar.gz 739768 BLAKE2B cd4126a01c5e67d0f87d2db5a45bb609bb2d3ffe9840fccf4d02025b8cdd04dfc145a3d48d79b52f4ee8efe27656222fdd007cc6bf482768674d51ceebe05d1b SHA512 51ce0f9476180d683a8f03c729cbb9e1e7e566eae2f2320a0be8831ab94454ce1f4b4132544f622ed1ba0948b772a16dcc48e8514cabfe4eb43f15fca6aef59b
 DIST github.com-kubernetes-kube-openapi-743ec37842bffe49dd4221d9026f30fb1d5adbc4.tar.gz 739569 BLAKE2B 7bb1b625c74a03e046895f21df2c8364b16109b150dd97cce5a882bb632d51dda1917062348ffd35d49c3d16842608ec50687369823df44face78a9ac78b6af3 SHA512 0ef0ea27c32f56a69c80b420658544dbda82d268a6d4269d71fb597a7e042a48088287580c078e1d164c36d16dc784175979ee55654465cd9e3f2e8070d0a893
-DIST github.com-kubernetes-kubectl-2ed914427d51.tar.gz 2760556 BLAKE2B 92ca4c84ff5208691c93fd3bb580c70886b9cb2517abb5518a6574d008b6b4aa3ba2fe7c3bb10605927772991c4e176207289e4a20d917dc5ed7be2834afe540 SHA512 6fe4656a9d2d5122116e01ca94980ee3c9a378ee83a2b314b9e50211854ed2db80995f1012fdd77d4a60a5c8a65e58256cbb342ed2409a21cea26bd4a387f9e1
 DIST github.com-kubernetes-kubectl-2ed914427d51f6fd865e0db43d72b2f22610cf32.tar.gz 2760556 BLAKE2B 92ca4c84ff5208691c93fd3bb580c70886b9cb2517abb5518a6574d008b6b4aa3ba2fe7c3bb10605927772991c4e176207289e4a20d917dc5ed7be2834afe540 SHA512 6fe4656a9d2d5122116e01ca94980ee3c9a378ee83a2b314b9e50211854ed2db80995f1012fdd77d4a60a5c8a65e58256cbb342ed2409a21cea26bd4a387f9e1
 DIST github.com-kubernetes-kubernetes-c97fe5036ef3df2967d086711e6c0c405941e14b.tar.gz 31200712 BLAKE2B 1e2019dbb270ab37fd8a882bf932d031b34a33a5e39db5c37e2779eecd5e228dc304cf928029d95c01ed2c8f77464b7e237f32569b865532bee498abd03180e9 SHA512 0189f8ee2de8c094676a72a3ba59ed5a77abd489ce583d37ed5b8a9d2e5e118140f38c83c68084738aba7fdad58776b6869edc4cc59368ec07b5d42dcf59d1ea
 DIST github.com-kubernetes-sigs-kustomize-a6f65144121d1955266b0cd836ce954c04122dc8.tar.gz 3437120 BLAKE2B 9eed49b8b5f924c7627304a48307de2f3db386c5817d8ad00ec1f15d6fc9900eb00b16508abee9c4176b3853aa940421d0dc6e9a7a900e4c4cfb85ed399cf42c SHA512 fac0eea0c20ce1c23986e77f6d7fcc783b044cd774f2cd05e50d6088ecfc179141d6d547e6537a0bcfe8d2291c2610bf4e6a1806d6d86eda4e93ae871c10f1ab
-DIST github.com-kubernetes-sigs-kustomize-v2.0.3.tar.gz 3433390 BLAKE2B fb5bba60d42a3fca2f6dcfcd71dcba9c5061d41e80ed0598f87ab3ce7b92ee2b39ce11a209e057029c3716af0ac748e4ad4450d964f595f3bf2a7a1bd5070eb6 SHA512 ceb528143af3288ff56002108ba307c997457957105d21d8539e25b907c36e2c8c262c281f61060e8aaab9a7c159646e9c01da52bd8c91ba59209dbee2d2680c
 DIST github.com-kubernetes-sigs-yaml-fd68e9863619f6ec2fdd8625fe1f02e7c877e480.tar.gz 14901 BLAKE2B 8403e128afa97525c6322e80fd9810334fa6cb8746254f98877478db49b7eac6dddb86ec4a980844ca1d4fa398d881a8338b80bfb51206017c771d6d4f07c9d4 SHA512 7bc311c2afca9d83af3242f008267e7f7ed9eb8320a55c09fc1d1a0854fbacbf04e38fe69efb8510aab54444e6b1bccb9bfbc5e54630a1cef153ea3caedb4f0d
-DIST github.com-kubernetes-sigs-yaml-v1.1.0.tar.gz 14890 BLAKE2B 0c4e040a25cc75839a748a7e1918167e3ac994195fd80201692946d2ad722ec234ee2c98fa6e5d799d4c74dfa7355418cfb1559f2d25f3a33034e6399f3b9101 SHA512 a6c8094a0ac9bf59e784ced474a402b0ddec48d4bc6280db3eda9b896b6ece8b995fbffec680661ef61c79aae40d578f47446fe3837d6d4903f84e26d875c9e7
 DIST github.com-kubernetes-utils-581e00157fb1a0435d4fac54a52d1ca1e481d60e.tar.gz 50736 BLAKE2B 0c465d040112f872f5958997a3e7bd5ce2baaee048a4b13f5f7510a7cf8eb4f1194a04e666dc695f2aca14a702215481a39891e9e15cc580ae4f0ae913cebcd1 SHA512 fb599fa617c50ebd9381f5d208fc1929adf5f44f61c5e7ba4fc46d9771aa985327284c1bfe3b4e4c1ca45312b3643391d8d145b29a93619e35552a30cd627a22
-DIST github.com-kubernetes-utils-8d271d903fe4.tar.gz 52024 BLAKE2B 3a5827e30893fc91155c7dfd80307f3b422f6bec79e4b283c29a6be823bb4f40be80be70f5a6736d665c542712143097768effac44202f5344da7fd2f56b560c SHA512 2b278aca2c13494d1e192062863b155a49fd3fa59eb76fd6531802b6145079273ac752611c7fa0a5275562814a89dceadd28c536798238ad3dc486d1f033fa59
 DIST github.com-lib-pq-f91d3411e481ed313eeab65ebfe9076466c39d01.tar.gz 96260 BLAKE2B f6d83f5dacb2b60f4cffe5211a8ab4c5838838a756e5bd33132501a74e9f92d0fb12600d1693ed538cbed8367df3e8206964b70b12b38b174c0fe6c06b3eadb5 SHA512 ef5204491ab76492dc4e05e8dfcbbc886a92ee614bb65b395cdb6050b208ad0b138d8c6907b7738e648f153e1b1ba2e60976d00960c41f0fdf4a2b34d018ef0c
 DIST github.com-liggitt-tabwriter-89fcab3d43de07060e4fd4c1547430ed57e87f24.tar.gz 12277 BLAKE2B 7c8c248116cd4feea2fb9bcf22d64e110feb6e377c9b2859a5f0786e3949b57505d1ed3d072bf2216a0ca0926978932d60ed84f236d9d2fee26309ac6582c6f2 SHA512 f1aa930429addd014ce293038087c447e44d0f840963b188930cfcac95490ea52df174bb662a0c5d506371342dbd8466223b3a0f6641017fc20d59f7f209b33a
 DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
-DIST github.com-mailru-easyjson-v0.7.0.tar.gz 72804 BLAKE2B 444ed8bd5a242b40ace2525496cdf548d9d8732795533f41ae0db50451dc48e6c7fa8af328906bf46e8535fa03bcf1c640ffbac774f70ea8b2964859b1bc0e38 SHA512 f2ebd2f6a09483715808333d478b2563bd4e0e0659a4ddde8fe2ff7b86a4fbcdf2d07052bd2d4f69cc2e06156e03638b25545c070465931e5ef594bd0936a045
 DIST github.com-mattn-go-colorable-98ec13f34aabf44cc914c65a1cfb7b9bc815aef1.tar.gz 8980 BLAKE2B c4851097d20f928513ea60eba8119ef0a0878a5401ff46abb381ca39c47babe5a123094257bb0ee7c08b8d9e8df10a594ee1a3e967ffc1c913eb1a941c446855 SHA512 01dd99ffd5152ce8d3e45c3948ff49ab792531c02ba4155dad760a5c5191a0791aa410a7cca7b5d8fe49d8b143d761a7ccfd57f55389322b25aa31f40d638b26
 DIST github.com-mattn-go-isatty-0e9ddb7c0c0aef74fa25eaba4141e6b5ab7aca2a.tar.gz 4461 BLAKE2B c49434cb88ffa87793507a64a4acd17a877beefb7b403ee5524e1046f98511b3846c7b3a4f021cc33cd2804dc30e61cef83062f6e696579eaf7851ae51a8fb2a SHA512 fdd8ae0488ffc2a1a34f12dc1781c39c64677c5970fad6963394fef2462ac17b081f77d86cff171136f89016be5a47ab00d4242c58725b8bff6b1f554b58a58e
 DIST github.com-mattn-go-runewidth-9d4e0701ab53d89eeb2f46b282d1cd71f458f0bf.tar.gz 16016 BLAKE2B bf9413cb5774e487fcbf4d1eacf958a3f94a564d6b92df78a296c4a2a4b77e294c9e1c75ef2c481184563386f9294663a4d1aefc6a4bc8ac7878cf2130534de0 SHA512 8381b910c16b79661aeb5109a48ef1a3cc1f4eb3fe2cb4940ef23c0b9576258a59cbd163977aabc82cf103c588f33fae89a83dbb5749bb85a94452db8acb9bba
-DIST github.com-mattn-go-runewidth-v0.0.4.tar.gz 19827 BLAKE2B d2320759711986724f1feadebac45fc809a881031122585e26ab20f5144ed89101b338e5cbd736c7183d46d63f5913e291b14e035fb00a8c1d2bba21dcd0fcf7 SHA512 3f55e7cbd66014145593910a0e0fb37d0700c8ce6f1987ebefc5806626e7e5774dbce8af914ee8039cc20d38902d5cb8254a10638de3972f22131b7a058a0e64
-DIST github.com-mattn-go-shellwords-v1.0.5.tar.gz 4261 BLAKE2B c4ba9bc37d550ffe1e8a4447928aa4dbb652c2b8478eb4a9485e5f018896bf0a1ceb8cc02322a33553b81c2a64ef05dab5cd7a3acd973b4ed9691c5751eef688 SHA512 3b6607f35d7d617a2ba913f8d697b82e0ea867410572a29373ed09fe1b1e1e84509003476de39292e498601571cc1f78c3981ce14b04babad84bc85c6d9ad670
 DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 BLAKE2B b3b007f925a4a1c1862c8cbe34c5cd225dfa610ad8c56b5328e6920a44b507680daeea97209370bd6b259654d0ca5791f4bcc54b8bd8970b9aaf994eada16d4f SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d
-DIST github.com-matttproud-golang_protobuf_extensions-v1.0.1.tar.gz 37184 BLAKE2B 9ad023f9b70938f45e6dd44624a7008c1895e488e63124bcd8f8492292ef98479e966ed627a62de32e0fe84a57e60710227e02e4a276aabece81f021af9408a5 SHA512 63d9963502e967e47253f638a19dfbeaa2b63efab74ed790539ceaa9b4a0b695aa107f9e0c920c0da547ac1abe81af22d47f6de547c500deeb005fd8a5e22660
-DIST github.com-miekg-dns-0d29b283ac0f.tar.gz 1318264 BLAKE2B 92ea7b517cb686210a8d13290a15d4eead3550b3a1d34a5cedb447c08e2a32a65073173688190f329928fa0e1b02bda91bc9195062b8380f4a23888ee07154bf SHA512 91baf45bfc9860c0df26ed1bfd1d326b2cfeca41365d7577c427861e12eb380816cdb8151e92b51ca8c4e018fae3cb53193e9f9b95725a1d44957638bfbc76ed
 DIST github.com-mitchellh-copystructure-9a1b6f44e8da0e0e374624fb0a825a231b00c537.tar.gz 8905 BLAKE2B 832bb9e9d51b2549a1bd83c85d4d9eabd0aeb32033304f8e1c6f487d0fbce1b252a2546bc35502df9f15e69097f35be601e98d2232607527b70f1246dc280f8b SHA512 932a1c50185fd1ff78636d004c4a4c8e7e69253a85d439a0775862258963c5d0b1ad4ffecdcce84ba61d01060ffc4f8f142d34fce73ff7c49c0f05e3bea8ddad
-DIST github.com-mitchellh-copystructure-v1.0.0.tar.gz 8903 BLAKE2B 8ceb61efdf28278953d7f7d4d9cf9219c74fbdac8f4b1ae3363bb9b207d56b50b1c6033844e548ec2c3266d5cc030bfc6fc57175642539deaad2db91215bf664 SHA512 689577f3b6f8ea80baf29ba9367298d35c5d023cdf85d2b998a38b9903fcad8c31731ebcef585cdd339e6ca647d8f6f4e8f637e77ccd6a5825d49c03a5a3d922
 DIST github.com-mitchellh-go-wordwrap-9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c.tar.gz 2785 BLAKE2B c049e833101c330e1c153b212e7a98f02be90333719d1ed5557f1ff52f9db9e82bcac942fdb2b6206c8e3ef5f5dda6b90e7f2b370b16b45c69413b0f93597850 SHA512 377d539b68744a2b03e9fa6990822fda18103854ddc93eeffa4d635864f44e00844b4bbb48b1d4149e6d456483337f357343fd806f9b150aa319a98a773407bd
-DIST github.com-mitchellh-go-wordwrap-v1.0.0.tar.gz 2777 BLAKE2B d2903b50f2bfd88b553845ea6b5748bd9b568b2e241a3f9dc78562a4549153d0fd8a11b3f1f33dfa44c9c7384d4a39b79e7a08a03f1768260c4a2ed430ab3de5 SHA512 b2a916a08f13847ef8c0da2c944604bd0c8c6283eadbf2f9b791538d26c17f2c1f73ce629b245320c1ff0fbbfa9525208dddcf3a21c1370ba97d9d82b35e2812
 DIST github.com-mitchellh-reflectwalk-3e2c75dfad4fbf904b58782a80fd595c760ad185.tar.gz 6446 BLAKE2B dc51802649e0c6f0ac20e3eeabd0b00d6a390d25c7a3be434cc3f3df5fa3ec21e2151ee7917a54e3fb675426413b5767a150ff79ee6bc913a967f7309aebe88c SHA512 357cd5283bfc5f6f1be47bd732caf26951775eeca233e76e9118da2c2a6f59b51613334e7390e6ea479af2d3fe462c711b8567491e7246df0cf9fe512001c784
-DIST github.com-mitchellh-reflectwalk-v1.0.0.tar.gz 6143 BLAKE2B c19360beab9e47373bc355f959a768ba199ab84bcaee66dc5da017a493f565c67f8b26e8ffc42b74d6a759d690f38fb7afbd2b6755dfa4f30b3f2c565c215466 SHA512 15c2dc2de1ec000d868b3d7a172f49ed038d236c70d77a00dc681fb78b7ac8ccb74158822706fc62132f96c9d564625c285252ffec25c6cad641734cbe6d6226
-DIST github.com-modern-go-concurrent-bacd9c7ef1dd.tar.gz 7527 BLAKE2B fe191bd398bbd1beac3de9a69b54b04e01436347f0f8933b8eb189dcafaf3d68bb76d6d738f5532e5e9d8e1631ef4d3785a110b69856c4e11d811b80dc31f19c SHA512 bca1593dea7cd004a0191420ccad56cffb91bc5523434f50920ce25c2ee82dc6a756e2eefdcee94ae0bb403fea881e42bf403d6218d6169f30dc9288e72d1c36
 DIST github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz 7527 BLAKE2B fe191bd398bbd1beac3de9a69b54b04e01436347f0f8933b8eb189dcafaf3d68bb76d6d738f5532e5e9d8e1631ef4d3785a110b69856c4e11d811b80dc31f19c SHA512 bca1593dea7cd004a0191420ccad56cffb91bc5523434f50920ce25c2ee82dc6a756e2eefdcee94ae0bb403fea881e42bf403d6218d6169f30dc9288e72d1c36
 DIST github.com-modern-go-reflect2-94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz 14404 BLAKE2B fcf261bf39415ab06f03df46887f6373386007cab1c439733039a00eee7f3d430323f1589b422c458435809c38039d4440a537845ed0e4d49193b1448cca63c8 SHA512 1e622f71b935169c463b2cdb970c6f9c142e746a40daf760430f6a24a1e938a905d84793a7ef241a32cfcd7cbeca701714b69791b2117c46fb90490c39fe1ecc
-DIST github.com-modern-go-reflect2-v1.0.1.tar.gz 14394 BLAKE2B 6169613fe7fda3f65902f153c0e87b11058ab72af87c669d71140cb19e835bcb2d84cd579544379ad7e77bfa4683b304c930e2bb833bcae035a71447bba1ffd5 SHA512 6c52772e7d164837b02fd6b5b5653b7633914e5e8cadbc071d4cd647cc05b0408c152e4334b30f43f6c5a8700b032e5a8ef35e6506961963bfad918b28f5df22
-DIST github.com-morikuni-aec-39771216ff4c.tar.gz 55447 BLAKE2B 6a4a25d99e789f7ac83bc581426708854a81cd2267b7b2a788e452ff03822e6adc07236c37801e9264c6f26cda4dff9399b7164bb3340f2465a5fcff4fede40f SHA512 bc3aec9e7b04d8555eb78734e2f154bf71494561fd6bcd58d876b86505b1d2c05d7200365846b333f040fb85a03d04df77bc5e49fec86b16c9fbaa766a2dca60
 DIST github.com-opencontainers-go-digest-279bed98673dd5bef374d3b6e4b09e2af76183bf.tar.gz 19205 BLAKE2B 752148dc0119bbfe1c956fe157b205e25fc4cadc71289bff0b3c4fe12a6ad5d8e555d0d782df33172a3619f022ab2b698c1671eb05b0ecc9e500e9829584ce46 SHA512 2a3f4eae058d7379be5495f2b253990dbb59bbc394b5cc2adb948be41e1e4cab76efe388eb9ccc1cb30cb51e0a9d9cb07357b6e24d07afdd52aa08a77ec8e01f
-DIST github.com-opencontainers-go-digest-v1.0.0-rc1.tar.gz 19206 BLAKE2B 41e5cf18fdeae0a27e311f7114ca2fb782c53c1bf1ddc627f2926b3c76118042beabb2e6dd6f9b518486f3cee955b458a28109e01696e119035eaa28deeedde3 SHA512 2b2e8d02d45d5d9f5a73abb8228b097a7db4f48afb4712f3cc98444493087c9dfa02e2bc192d8dece0d5d98ef07d23400ae0796301647e452d5fe4ae1bf42caf
-DIST github.com-opencontainers-image-spec-v1.0.1.tar.gz 138674 BLAKE2B 4cc13e304c7b328e03b59433b698940094a8d583fc8c7ac1b7245c5dc121c9d6b1b8ed98916b3cb9b2c16ba2c857f613dcfcbb8c3ead2b4bff2fe3d001d289a2 SHA512 762dce11fa262f0417e9bdd20ad4d75b3efa505705b2dd357889e14b4e0120c7655468dc1b998c8dd824ca1ba1f0293671e80d4ab6b21375c80c3ff89cee6d27
-DIST github.com-opencontainers-runc-v0.1.1.tar.gz 496426 BLAKE2B d15285608d43ae77ebeed3bb9087c5775cded87251f3d86769e6b93f124fa4324d1f5c8a696558b1610f1c979e04d8a50a21afa73de21c5e37b3da78cb866397 SHA512 c5bdbcb9c7d8f1be391a6cc0810a34a8471f80168d80fb153a60c8dbc7c58eedffd278c1206244d59943700fc148aca1c4b1053fb8d2e4273c0c8bac7cb4db25
 DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
-DIST github.com-peterbourgon-diskv-v2.0.1.tar.gz 16077 BLAKE2B 8d1cc0a1bd6e84edb8fba63cd8ead9a390b43dae95c7bef74a81dc8302c760623a5e0377a2c3c0abb5a63a92802709ca2bb2375b0f2effaea2ce786c44262b24 SHA512 a568690b332dbe7f2ba3baa995e81428c13c01ca2ed65a1791ae99d1f315b00b66254888579ab829e9aa85f87b3bb7fc4de716cc7f8408a195f5cb4cb5ce93b5
 DIST github.com-pkg-errors-27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7.tar.gz 12294 BLAKE2B b25f0fb276d65047ca0fae8712150bb4f5e07b597f5a297b216eff8f6b0a3a25e484d72ff683494a48a047efc699c03c34a8e05cfe6caed5670ce82e74f9bb15 SHA512 361100e92b0dc27297ecbf1d72244ef2859456f37830c510a2b2bf39a277e9647c808ae70682eff7bf037c1e23563312a6e0a060b49e60747d1659c5f0cd60f6
-DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
-DIST github.com-pmezard-go-difflib-v1.0.0.tar.gz 11398 BLAKE2B 8f317c172d615e07c92337dd814c07c772347de3fe81b952bbc4fd1a643d495cfb6ec5b694a531f2745e1601eca2d4977ea2c1202ac7fb1e3cdba31e90c4ea34 SHA512 283927de73a3d0405bbca8b5b0c24137dde2f1063539c6ce4437331ed99e732175b2a384e5a70cb9a87cc74da94f5347e2a9785fbf3e46ec2431dc5071c3f045
 DIST github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz 130114 BLAKE2B df1149ebda18c7940ea35fbe09b08be6437a8d4c4f812e3b4b088da8a374718212f0b10a153f3e04a6ffbe0bac109a92e5eca8b95814d221cd6a01d5fcfd48c5 SHA512 27a3cd10256ba6784b2f1318919ad6ce9e2a15c029c18961cd760a7569d5c683097c7407478b2ec96852163a321cda854aba18b0a73e0dda836480d05451bd62
-DIST github.com-prometheus-client_golang-v1.2.1.tar.gz 142465 BLAKE2B 5570e7fff11db4372a6e3dfc465359e32ed51921372f0012768e23f0b49d84e8a10dc60ec09b50c50b51e2e566779ca7e0d034de7b3b62850d57b7890a88de10 SHA512 3ac98e101fb27cdaab5d282ed01eac2d4b8addd902fb40f67a3307f82f0a1c9f6ce15b706bf530d1bb55524bc1f2cc34359eda48676f76d68b26ef48e7c413c4
-DIST github.com-prometheus-client_model-14fe0d1b01d4.tar.gz 57541 BLAKE2B acc5701969d724df3d0c85a3b456b1e397b6c72ba33fb2ff98a04702423e8873c2c3ce2aa68ef7f62ab2a6b4ab881dcfec740217f88f29bd35a7d99df298ec19 SHA512 d9cf5775446d349767573831df1020aec72fb340e6fd3d181ff7e6cad9e972a2b26f1aeb1382d70431470933e1452d718782c8f0a0c4159a81069e9ee5623198
 DIST github.com-prometheus-client_model-5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz 57195 BLAKE2B 08fa9bf28957a15e543e2d86e5a19fc302f7ef5284796d6dec24c182ce7a3889a5bbe53d58fc018cabbd0bc717b36533043c3ccb3e3355d8434fa7e3dd399b50 SHA512 e44828e3790282e088bedd5c8786948192beb5061e8dedd4f0b2508e31f641569c2c2a7e3899c2eebf4aac0c0fb3a22fc9172e0460fa2372fa876e23807d23b8
 DIST github.com-prometheus-common-4724e9255275ce38f7179b2478abeae4e28c904f.tar.gz 80876 BLAKE2B 669ebe88636632ff26229b2e3ba261cd5a35bff4586df59950637fe169802fdf6e1fdd7d7c64fa6918aa26cc5dd196138f13a87dba7532d2e84ba2550bc5b705 SHA512 fe1895ba4410b326c80aca9cb97614e32daedc2f35af4a32b502a25ad3f98d6e47ed1b12c2066a8ea9eb2618ea60e1ee4d4b423e48bc337b778472c3897ede05
-DIST github.com-prometheus-common-v0.7.0.tar.gz 100520 BLAKE2B b03ae3e46a9cd038b1123df7b230995c65f8002430f341cc94fc39ff59a3050c37cf1caac036c7c13798c1303ed13c67f3628a2f9e5c7a90b92f465b98f6acfd SHA512 47a1fec9bffb720a8fd20287c7628167e649c9fad436c3d6eb290863b30580dc9c9ca417dfae01d8d76c278bb021cb2288ff1d3fa9b598370be6534637fa8337
 DIST github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz 61606 BLAKE2B f67de9c0f3e8d814bed1711f0e0771c13e7d4d8d9dcc67ede3615bb80f8a8f20bbcf9ef65e46dff4a41cc587ef10ad54ffdb6909fbe83f19993422ed5714dd81 SHA512 8cabd997ac2405fe53aa507b6755aff7aa4ae2a1fdb3711abfac5d29bdd369412a17359c3d9c3ebc4945d1b6310c2fadd25201ec7b040b20e2ac5d27b56c564b
-DIST github.com-prometheus-procfs-v0.0.5.tar.gz 112152 BLAKE2B d989dc38ab9e4b056884eedc61411d34ecbaa109d270820ce2bcac1abd40dc1c730071a0cc5bd1fd93191134a26f8475d682a17d517bac69e4ee37a93bf07a28 SHA512 35f29e69c4782f882d8f68ac448c6c7e2aceb93319d44a07c5ffbbcd61051e3ab1355e5191ccbd217146403492d33f8f35eb61e44c73dcbf1700b5cd72aa635b
-DIST github.com-rsc-letsencrypt-v0.0.1.tar.gz 605634 BLAKE2B 30457605f8f768844664fbbfe1ffcf83e93d94eab2f659bf026ec4354c6f0cbd1ab6ec5878fb052846472fd3157e7a4762da8dd73b78fb4d54f4c25f2b89d621 SHA512 fb0003e2baa9c477d9a1af00dbd408e6f47d25b74bfef69f111fccb5d3b9ed4ac56156f5e2f259af6ade1dcbc5ee86bac57ba50ef725ba12772f56a326d7521d
 DIST github.com-rubenv-sql-migrate-9355dd04f4b3dc9ed604623307307a3491a627bc.tar.gz 22615 BLAKE2B ae7b38054b394be2664e5b5001d8d718e83d1eb5a691dc2a76d37585f4d39aee8e56a822bf9162f9a717449f0df62ae5fd267a3fbfde3d2681dd4b705e1705db SHA512 104a21a84b8315f7ce16e41b587c01f441bc037e875b6552137a06c580e8ed2b2bd724bddd5c4edda7d7a259a1c55e866a342873467ea6b779c8b551c3571c19
 DIST github.com-russross-blackfriday-05f3235734ad95d0016f6a23902f06461fcf567a.tar.gz 75898 BLAKE2B dfde4cb8b2a7c18643926ed21b46ca0af43ea2302b055b4d40715a31cd11d398c1404db49a47703112e536a96bb2b05525123b4e197197e0b41f0e565c912194 SHA512 e6e442a45835e28ffe58667db018612862c33528af0c2e4aa3c1e4a7e89c503e59b004d42df76ccd4619a998d1796ffb106db20e0a01c8932aaa9f4175fff2c2
-DIST github.com-russross-blackfriday-v1.5.2.tar.gz 75779 BLAKE2B 0ac00fa2b2fd2f84951955848725871b4b50762e91cd5160a1428c1598ef1e88b8caaf6e45a1bfe859d53dbf70fae65938057feda9b657baf2c5637fda867002 SHA512 e7dc4dd6d7bce8819e525b6b2c9b729bbdbcfc96b7672e7b0f60970b3b75508155b2c73bf637cedb6e2362b30631278ae6d5669b5c11a04555db672805075c94
 DIST github.com-sirupsen-logrus-839c75faf7f98a33d445d181f3018b5c3409a45e.tar.gz 41379 BLAKE2B 6f33e420e837503679f0b330893d2cbf63751afdfcf5a1b9679d8fbc06ce6f0c9ef00a35d2be16a128513caf13d9b75830a63068af89fc5baaf92c9a45398b9c SHA512 606eff13fb7bad42f64b0f42d56eaca8a83bf9c1c88d69f5497f72e266ef177f3f36697bf60c24526a31a8c420723db26ef41de9b643f305c077ca1300779664
-DIST github.com-sirupsen-logrus-v1.4.2.tar.gz 41373 BLAKE2B 3675dd82fd9c174fddf93eea87f3ca2c2671d9719ba148b03136c35ce6a3ce95866c57cb706a641a14522a522606dc9ea9ec9f0a6c7da6f8cf18f46b9f4bd3ee SHA512 c29689e5ea0ff919afc6fe1c492898d8b898e6831c442d3fc45c29508bdfda08604b1ea09d3b17db401bddca69fd5f8f744610075ee3c0577df6a537e0980a13
-DIST github.com-spf13-cast-v1.3.0.tar.gz 11085 BLAKE2B f46ad23efac14d599ef7268c033c5f244ea7976982fee02b4d83ae65f91a72150bef359eb24b8c868f8a42ea8a0aeae839dcf82a7646648bf482f2a520704e09 SHA512 4cd15f59860fddbb67055beb15dfb8114ecaad5999a8fb46fbbbdea1cf78eaa094a4893c10b97efc7d2f95509920688659d609623135bf9871e6229043452194
 DIST github.com-spf13-cobra-f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5.tar.gz 111260 BLAKE2B 4ba7f888257cd5b883379d9bf137872b1ecdaee796ba7cde107ef7e85d1f55d45b039dc7d6e7bf170a6eeb76cf8a56e9a60325284f4318397edbfcbad5ed1bda SHA512 c9b210a7c08e96e66b14c03d8b4dc613092eda22b647f56da597d329203b594ce6358f34a2404a41ce8070250721e18e4defb7aa70fab8b3a6bc7ff81291f02f
-DIST github.com-spf13-cobra-v0.0.5.tar.gz 111126 BLAKE2B 0f5fe38e3e278603fcc53edfdd72206d7b6850aa3ac4054b4242091949fe327bf80ddc46c20c3df1e644807e5b8882c528ca5d3bc184b9f039038cbe9043835a SHA512 c21a2c935365c74772152e37adea553dc89fd31dae794bd7e8f56d7c9eaafe717e2d0d6f56e1c8d2fe442df445dee9f03bbd30e802e2ac6911babf309b901c04
 DIST github.com-spf13-pflag-2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab.tar.gz 50880 BLAKE2B 49c7ffd77b8bb294ee5f35a9d0fb1567dc740723c7e7fcbfa54365ef1d4e91006032f3213771aee55b35eba418bda53c9da27da31ed4dbbb81a0987302883591 SHA512 c579ad91387f90e6fe630d9711904d63dc8b4fa71d49aac83d5e6489e5150f9d6c8aa5444bf5f2357f67eedab82bd7f32ad00975da5267290c8957fc416a904d
-DIST github.com-spf13-pflag-v1.0.5.tar.gz 50796 BLAKE2B 735cf4ab840354082dd104f417a938000ca53d60f71f201e1995a9d5a77b45ee0e83e41b1f16713224f6d16d52230ea75d651e8fb377c689c883998502080de6 SHA512 ffdfaa3b2431cbb0934cb996af158aa56132005f978a7e3a954e43f24efed36805213d5aa03bd04792119e909a0d54a8b76b0c891f83cb4f6a813a73a704e13b
 DIST github.com-square-go-jose-e94fb177d3668d35ab39c61cbb2f311550557e83.tar.gz 298098 BLAKE2B f9641af6620e68187360e8fb370de2f0a76e263662e1af5c039bec94c95894beea1d2af99b4ff6b6107aa3a504d137982ea32923c955a9cff4c5b382acdfd386 SHA512 f04896aa0c3a4bca3e435bf6d5b0f8968d21ad0bd06ce87f77054914a724cc1355fd20ce383a517a6e433362b9ac2a1f07f12fbd9875cea6f6736bb2f862187b
-DIST github.com-square-go-jose-v1.1.2.tar.gz 258878 BLAKE2B 586af6545ea3b53bb0c7e2ab558d4d849fc7ada4dc2d234c8abf0fb6a57a9e37a38d3a6c2700fbecbc543c0d5f0339eca037cd6229080b5cee849bc89a0114a3 SHA512 fbeef66e781ac036d62e2d56b1d00ee9c8ebfdef47d45ad1489e2880b16d34cd4d0b6d4ccef30c44fb981cffec8525287824ccee8460c0baf890d72240da8e7e
-DIST github.com-stretchr-testify-v1.4.0.tar.gz 110085 BLAKE2B 258f195090cdd71f977c77fe66ac7350a10487e43332bfb4d32bcaed91e0d7a84fb206415fd8c444a36b66f30ced41a9b31a7705a3249708e242c9a7ccaef799 SHA512 7a91c120f5425a1b89239a03ef9419d44c83342665beb3362384fe6512af52c49a5f914e5bbf9725656311ff0b826146f11b7db9f4cf4c1a69ce6033169d8c2d
 DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613
-DIST github.com-xeipuuv-gojsonpointer-4e3ac2762d5f.tar.gz 7718 BLAKE2B 94b4c2ac92a683b2e26ec907cdb63826ebbef2da978d76146334ebd115e9dc95a69757ef91bdc1fe52d7de39b6e8f6400f9062a6d6ddf6637188f92e1c501fcd SHA512 c29d364a2c83d22546f9f22a3622f44662420f0d33b974138cc1f01218c7b0c14d59570a57bcfa8a55797425338aa227aa4347cf41c954e63437615736e38a5e
-DIST github.com-xeipuuv-gojsonreference-bd5ef7bd5415.tar.gz 6952 BLAKE2B 5390e11eaae7b3ef816f044874e665ce76cdf84cfdd19139a0923921f56e8cc24fc418952a0d1ec1ef56aa535fe314c131073ff0ae248f1c4b918bd70485d073 SHA512 e14f931af21c64ad4fd68e3f226d062938e747fc0107b00c41ffac489193b39874ed1ebe6dc24478f6979f9055ae4ca67c016c11952589c8a95ca3f3fc69c1ea
-DIST github.com-xeipuuv-gojsonschema-v1.1.0.tar.gz 70883 BLAKE2B 5cfa2dbabf97e74cac7b6f681b996d0f425318461095d5c3882d31fac0b5db9363e01e421bba99ba8ca2e7fc37861b4c9ec4d39821acc4276479fce205ca0708 SHA512 2f2352540120ba99081bc894e9f6346ff7093fd9caf1ad7caec41b9c56b0fe456be7f7adf45770d573843cddc215e892f157fafa518f359d0f19f423be9d5d0e
-DIST github.com-xenolf-lego-a9d8cec0e656.tar.gz 60136 BLAKE2B 0c1666a771c73fce645e36f807ad63ba74c8e3860d5bf76ce18d4f00479a79a8a58abe8cab6c4b53108bf3c2eb3a5b13af6c73f677fb2cf209e7742acb828e37 SHA512 bfdddb5e5019fb043db1d808b98cfeb44e3038519d29aaf8c3789a2bf9c55ebd3470ecc32102ffc4002896fe61a5a5985381b4c4f961390c1eac9be026a0741b
-DIST github.com-yvasiyarov-go-metrics-c25f46c4b940.tar.gz 30706 BLAKE2B 0f1b5c235b4625ee021d2f1254ffeb5e55ac99e705edc1c4a13ba55307f5dcde4ec4b42660795f0f76d12251d2e17b3602278d104781a5a46b564eff09f43af5 SHA512 ee183b481bd26936b9caed795e397c7667683c229107f690b2aaff0a73cf1d0fab19abcf77693b80123325f973c1fc6e5ea225ee3daaef5216f6696e4bf84f6f
-DIST github.com-yvasiyarov-gorelic-v0.0.6.tar.gz 8045 BLAKE2B 9c1265548490a1b2152f2aeb42ee31fda03c2d86611fe6a8b4f12c6963ee23aa417278994abed437086d0b2e8a29705ca8ec8053395c2a733e9c24e563585d43 SHA512 129ab577464b363ae07828e5cdf686ec6aca6e04240372ee61806412308c87163ffba4d2b57d1d6baf0b681cb9d6044cf94af05f840e4055809455a8c7d223d5
-DIST github.com-yvasiyarov-newrelic_platform_go-b21fdbd4370f.tar.gz 4637 BLAKE2B 48f88542905baf59399c3964e9c6f0f835e1427533ac959e1aabd282ef4df619dd1e3c48ea5de07c6c24c30ee21d426b2d73de5f1a53d7637bcc2bd9cad8655f SHA512 889e9c0c6292f313f348a2ad4c009d1559c774c7c6d12169d8fb666313f553318ceb2ed05e6823869916ece190cc41cd23a5a08a3f2f2c601172c7fb6984360f
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
 DIST go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod 2182 BLAKE2B 024744c8c4b0f296f32ce1af2407eae0eb760a443d43e2a1824254c9b2aace62966a2f0f5b5dbfb0cdaf66f2f00740ab653a2b429cc9aadeb3e48421dd6e180b SHA512 904249febd483a4504d49a1b769ded804042c34acd6b7f76503af9f43c76c53063888a7d0e15ee457107cf688108d2bff057330d9d44548b2a30979336370f09
 DIST go.mongodb.org%2Fmongo-driver%2F@v%2Fv1.0.3.mod 35 BLAKE2B 188e6d186d3c57dbdbf44792848f3e774f7b3c8f874918af1980afffdee1a2fa165d7e1d57f3baa517b128b372be6a84f4eec768050fcb2af7d5d8a8a10a8e3c SHA512 b117791ab0ea72cec89e79672ef8e17d1e3c3c5f2c419a7709892e9b8ef5b0ceed43439ad7f78d8c3d9e109e6bd662e816aaae6a8f62d8a74fb7a1f888d365a3
@@ -888,6 +861,7 @@ DIST go.opencensus.io%2F@v%2Fv0.22.0.zip 291484 BLAKE2B ca3bfc9c9864a2218ec373d7
 DIST go.uber.org%2Fatomic%2F@v%2Fv0.0.0-20181018215023-8dc6146f7569.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
 DIST go.uber.org%2Fatomic%2F@v%2Fv0.0.0-20181018215023-8dc6146f7569.zip 18474 BLAKE2B 4af1e5ff6db801303f100ac9207df8f0e751b4670ddba708421db4e63d323f864fcc12a0fb17f6f34b8658eb4386e0287bfa8a9fdbd1820aeeed2e8554908741 SHA512 adcb13201d90cd0aa326441d0bcbbfb59f6b1974f7ec6f533d214e534e9846a50360cf74f180166c443d4e2f51d3b30cd7acac719a2fb00487b771d265a51fe8
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
 DIST go.uber.org%2Fmultierr%2F@v%2Fv0.0.0-20180122172545-ddea229ff1df.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
 DIST go.uber.org%2Fmultierr%2F@v%2Fv0.0.0-20180122172545-ddea229ff1df.zip 15267 BLAKE2B 86196b1975374911b272ba86ee7d83669377943cd9cba437d8eb7f6a33a3a6fa01e3fa148f74d5ade83b76ea4ce2312587dd20877232fe03d5c394ad00785d45 SHA512 075da266ca2e491c485262cf400cd46986aa3529c157b8a76d822f3f16e342c8880176eb2150c3e1849ef084c02dd7c1f9b8508aa0a6f5df6c5486bc91e5be3e
 DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
@@ -900,9 +874,11 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BL
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190320223903-b7391e95e576.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190611184440-5c40567a22f8.zip 1820987 BLAKE2B f9ed24af7f0f588ececbe2fcdaacb9396260a9940e06dec53826f28505770bc4536359edb0dc9c4901f47346edee26865bfca52436e57161dc67ff2d2f160304 SHA512 e60736e9052e986753acbbe012372565cd70d806a92f7daafa2af441d41bb5166d6f7c8ed4d88752f319d639d1ee5119d4b4660ec45a0d9563ba7f752e37b27b
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190617133340-57b3e21c3d56.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190621222207-cc06ce4a13d4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190820162420-60c769a6c586.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.zip 1825977 BLAKE2B fbd6179f4a161974c5c7fe37a2d158941ba6dde8e660909e53c54e01e94d3e69546d00fadb236a90761bb3b1336a716f8b047a7bc51638e738f56fec13ba0235 SHA512 e3a27f363a0fb0bbe9ae5f1d0c55cb8b06b8761ba5bc8f5ac5f0b38e49da6ecaf108b01a9a1e325305263bc1d2e40b58fd117825f5135386b6ee2ef301c796a2
@@ -910,6 +886,10 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191028145041-f83a4685e152.mod 155 B
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191028145041-f83a4685e152.zip 1844915 BLAKE2B 2e6b6c2f16f5e00cb1ae4053742a816f72741cb22683f9894f1f6f63ab7def3ee70e6b8ef0063c4debdca3ab16bcc008060dd8ab6569a321e85f5c3f7d324082 SHA512 0b5523e9de16f23bcb6821da3df3fc71641ad56aa37c699c88a7a5efe427cb63b13215e0979059755df04e15b553e5d1a7985339e4a95ca6bc9b7f93462f942d
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.zip 1859245 BLAKE2B e33051036e462284bf672b92f35863014e4740917c856eaf5aeaea6530dc5ff77fcbac4d797aeb8131cd013bac525e502e582f7139ccea4d3c226fdcff83ba0b SHA512 7c0734618d52ac2f0e2fe9245fc15208d13f05e6ab3e89b4a76bbb94e2895376f3d5a7d71d36a020c8861a0ed94a344a534f4d3b6bd9003d153e4e4b80abaf05
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200220183623-bac4c82f6975.zip 1867651 BLAKE2B 7e9654d95bf03c5462d4d6420e676bd4a0e8769c5cb7954797a66c89298ed16063581391294b7c3e7c1e735ba0cfe3b60e899fbd2821b98179b2669740271a68 SHA512 a0560b1c03857faee4e6f6d959d042258f30bea2bb86af07c701a21c7a6d7e44a8929acd3e42503daed070c3597abede768af32814e252441f85823f330e573f
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.zip 1872925 BLAKE2B 8f054f595a831d9b947dee796666fa7885b107ce8892adb04daa2f9035493917e658251ea699f05177b51a8d5ea35b503d9480eecd9cb7dcc842a48d7346e23e SHA512 dfdbcfb5bca3a5e7931f21065b91d7673938f7b6b9a9602bce78a723cb12b580a44f5d716695e27ea9dbb79bff91881ddf4301a980ffcb492f26065444904691
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190125153040-c74c464bbbf2.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190312203227-4b39c73a6495.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
@@ -935,6 +915,7 @@ 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-20190320064053-1272bf9dcd53.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.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-20190619014844-b5b0513f8c1b.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
@@ -961,6 +942,7 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 B
 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
@@ -975,6 +957,7 @@ 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-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 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-20190514135907-3a4b5fb9f71f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190515120540-06a5c4944438.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.zip 1796051 BLAKE2B 8ae290f5ac2a687e7f2445c38a81565c89079c5429bf11d20e17a55244e8a195fe319d76be3abbfca21a9968c7b85c7c5dd648806b8f4cab604b5997c1e40be1 SHA512 bd21fa68f2bfc5afd6b1e764326fa57602127614af10c557cbe231f4fc9428fac0531e3e76ddc05eb7f86a4ccee335a6955e71e05a60b8370fce453cc56cccfe
@@ -982,6 +965,8 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.zip 1837462 BLAKE2B ae87037c165e15d3a17fb2c37b59faec2af12dc9653ab4bc504f8a283679d7599704980971e8d0d43235b723f67fa8ae3d5f6005dba6073930f4731859f17416 SHA512 a5fd196d6476e16cc864616cfeb62d29a96e1132e181a261940639918fb4a8452cd473878bd8fad8ce5b269d3466657b5aa2e7771e02591f999e98eb81b55957
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191010194322-b09406accb47.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.zip 1867555 BLAKE2B 88d89694c8bb9e902e96293be8201438741eea890f444a93764359288aa9e20a275bc5876be2bc1b02dca9c929134efc8ba3b783e3d91cea8b837c97405fb9d4 SHA512 1c3a28e9c6651261a4f0f57ab7884b6183fc2c0de60dc94cf3815043a1af0531bf0c1142e9666fc309016a65259c51e799b35f3ac300ae2e6ce52504c89c71cc
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191028164358-195ce5e7f934.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191028164358-195ce5e7f934.zip 1884567 BLAKE2B 57c8beec57e2ab5a8eab21f130b07698f7c4c36efdf56f81f3aecfa9834d2595981df55d61ee8609e3d8c5298abd9a9602b71a14c94efe70181b6877ee1b38b4 SHA512 b06ff556fe3dd4daec254e2719c37a2edfa1aff6bf14bf9c908ff7cc9444fd2e4b933a61eb215b9b300c5eb3548c4f76b9339cd71d0f57e51a7228664143fb6d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -1015,6 +1000,7 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190617190820-da514acc4774.mod 155 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.zip 2714038 BLAKE2B 7472e32eb2b2e13fb69852b75ad11c290959ea5b956e6539e116f22bb1692574ffbdce06735cba47fd53ef5fd2d4bb0e61c5ac8c311a0d1c866a732bdeb4d4d2 SHA512 1f009415ce8aafd1f09a288d61409edfc74fffc2e5ceb16c81e50958b7ad9079ef6dae777505ad8c1e854a287cf66f3dc32681abe5cf083c97b4434e838ccdc6
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190920225731-5eefd052ad72.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191004055002-72853e10c5a3.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%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
@@ -1048,11 +1034,13 @@ DIST google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod 903 BLAKE2B dd9ff44489e2a944c07
 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.20.1.zip 992863 BLAKE2B e00a0362cf9f38b4c54f7486bc4d5450eed26b467c81964c9ef6a22d4b4ab03e01c96047fff1c0382b34c0e6ff5135f517d1af006577e5d334018ec42c016ddd SHA512 7e5523677bb7628a35630fde4a46914ea0bf1215ae4d408ad0f2ab5192c57ca7a797128a658f9e19dfc1f67af18ec08ebdcf74f04acb0817eb3c846d622304f6
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
 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.23.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod 771 BLAKE2B ec4ea0b34d044e7a4dab50109d3b4e9b0081c538bd568155c4aa7a6370dd0ec31a18f3d1d294ad87af95cd58f2ac885026d07d43d21df1eee2c926dd4d8b2712 SHA512 b6c886622095b3999f108230f6cd3dddb72157180b0ad1a539919289b2e0c8496ebfaab369d65e83d6fd6eeb97b618b49a834c7ad3b98afc996f290d49c936fa
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.zip 1065639 BLAKE2B 71bbc2ae5288a6008a020b056970fde4f25f64dd6fa8a6d3e1129256707c332af7d07861deb1c95cf068bc039c3dc2da56ff12b4560eec071b9f451e91ceab08 SHA512 e261d085731561e7540eb367f12d5dd48f424eae915380ec99cfab5685297c2e81adc8a58fff68ab29fecd04d03c28e2357c882fa72978391750fd50491fd29b
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.zip 1141475 BLAKE2B ec5a9cbd45f90db7991979e1b25fbdf13f242cead59116a9f5703461f0b2d20b643edf61b906afa54a6b730cb5a1be4483757c726c46b571dbece739610db041 SHA512 687e9528375d9b87ce91eb5c67b22d3a1157166c753f729e4d6c0d3d7964d459defedfe09e8fbe035e49d432130a7029432cbfbf6bae95cc560e715748d4d42c
 DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351a233f5e8236743a91df1f630355380a4ae8df10c32abc03470955eac6c15c95655caec990eb17ef2661985570e49293cb146517828090d95635 SHA512 8482c3135335a3a69611529f0d50bd19257b0fe8a8de2d4f2d6441ccde5f1e7a57d487cedc375575c5fe16094e5fc1c7f7f1a6bf04acc8a9d4f92701db279002
@@ -1062,9 +1050,12 @@ DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20141024133853-64131543e789.mod 25 BLAKE2
 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%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
+DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
 DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod 50 BLAKE2B c715a977e733670d4047cc0f62fd485ce2af214d87e799cdea97015f64ee66488e1f68f4aec8e8ab139cd70574a0dd5f54b7bcedad09b8890ad098bcb01d7f5f SHA512 2d48fa45b7183412ac358a60c0af0b3c2f77d5c461f6bf4ba5d7a162195d49076870e739ac6c59e95d41dae2002370f52faf183fd6ca7999d60374866fa3ebdc
+DIST gopkg.in%2Fgorp.v1%2F@v%2Fv1.7.2.mod 24 BLAKE2B 9588790fb20149d89a8c642c78b290ec899213f9c17c823720783faffa7c5efe49deb8c34ee4e33516266c673be5e3a735ef541d30a5e3bf1f61d97f2e86438a SHA512 8d9f15ab56fae617fbbea6ec487691eac23cfe91a7da046fb1d9be206c5a0c88ce541148012a970fd9059d1663c4b37318f86665676c0f4fab5e92d2627a7598
+DIST gopkg.in%2Fgorp.v1%2F@v%2Fv1.7.2.zip 39742 BLAKE2B f7a98d3ae247b3ad78565361121aa4c8511b64abdfbe070b3e4c706f27721ded5cbcc22b275c89aae3267b8fe96f03dad01dd8aa6800bf644ac07767db9b2c83 SHA512 3dd995952e9a692756220126a4ef767142e90c7b91810ffd6c5a0821f180498201a6d080ced7fd85f842cbd42fc0d13bcd9e0f19fa6a762dcf46bdc7c659c5de
 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%2Finf.v0%2F@v%2Fv0.9.1.mod 23 BLAKE2B 7e865218970f4a4fa06035c7474ea6a854843051fafd593b393007eb606d813e7817d2444697c68a3c63ce44d57b2f7bd47348ae6e4481bd11f43ed6ace64e5a SHA512 cb350a878f5cb581d62859e605c732ff92a0b92295c28eb17f17768845feef85c1838bda755ff952a8c939f6a46e9cbf5dd77b6e278adf8197a418111e2f98dc
@@ -1084,15 +1075,16 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 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.4.zip 80160 BLAKE2B 7c19bcfee1136e9afaa54bb36a296e48c276e21517eead613313409f3ff85f4a961c1dca7926d3c4fd51feb0f537a85de905294d2a310276bb8177f27f3776c3 SHA512 a8fa21d2f84f8c6f28250e9ec7d678ae160963eaa0a373f345fe67804925b2647239a6117ad6f253f458f34ec9f62bc21e8f2071fc9dfe76dbd2a7ded1e1a0e0
+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 gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
 DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47b24b347ee4758fac8c11e3f627788c03d6568af129acb5b911b08857ab77a619bf571986ee90dd1c6c6aa12fd8e6e26d395a64bb7513a8b SHA512 66a13fedc358399644b869ac4b39a295c6c15d642e074ec66ff042e1b109f9603bc941ff25aaf7d9bc700f6c2fb1f60bf2a637a471e26ae037d822f0f1e2c518
 DIST helm-2.16.1.tar.gz 1283836 BLAKE2B f0a2cfb05adea2b0a98341962753e777e9329b669ca32a84ce0ed9b823df48f7884c6809d1625dd8cdfbf50efea31081c3c0400f0af65a67ab0fbf1afa3deba1 SHA512 eed2da36ba72da61c121d2cc2d4dc4ef2163f926579b2189b8b8113ba70102d0f63e48729e08b260fb3877d0fe1e0d6ed7eb8e9c67605d7d4a3bcdf7b33c2544
-DIST helm-3.0.0.tar.gz 498488 BLAKE2B e55b64d9547744118f35b83ed8ed3f1db168c491dff7d73c9871b7a5af36505b7be2ae861fbe3439463ae8459c71aa30e16fb49858ac9be09516a6e905ed8a51 SHA512 924df23cea78d91062f15156c989a84b223eda5b1e291f8a781c0be2334a6f2436936e88b7c800c3fc7f68b8d3ddb1f8be78573f014d17024b68f35f7e11b153
-DIST helm-3.0.1.tar.gz 498975 BLAKE2B 802b49ecc8888ef988571c9469be2dc039bb58373346a9d75284480b61971435774fcfffa42c1ffbc9d94d6f39fc1bc742c296aed2ba2676872bb50128d6333c SHA512 0fae3334e1c5c5a5e35c25a42d37bfdbbfcb40b6c1dc7a7b13dec4357ee0c538b619a2fd965921126ff8a652e1250fb158a502a99bf7da4ea697dff2e905d32b
-DIST helm-3.0.2.tar.gz 499904 BLAKE2B 0a3fb3912a1cca4c2539922ad5759196de5d4d7e61acb9370017a5053a519ebfd2eaa7bfa3514a05c28e40ba2d0d8bf55b7651fffdc2f32e69d0e0db50bfdb17 SHA512 c45ca39603e14c75812c695ffd1d67b070144c5311de369a53fbe10d2935ae616d5fd8e79fb81bbc8485061f649b63446b4f081152c3de0a3a0b4bafac7104a3
 DIST helm-3.0.3.tar.gz 499874 BLAKE2B eda691d2b02fb5aaee7e09dd846c19650c3fc0e5d46e703a768b3db5a9966c8bb5548beb1699c5c8771e8e39f8fe35558e601a961d900cd6ebd2e813dec1e6b7 SHA512 9dc776f0638350ba09f7a1af383160a56b0badd3c353f57173ea2540625eb36afe2c0cc1a203b6bcef738d32e4d914028a9b0495d2b652a8cbee4317bca47f0b
-DIST helm-3.1.1.tar.gz 530397 BLAKE2B 02e92379a9d2010e2126e9b24b48282ff607c4850328d7988e7110c33c509b606d4f48b4cc6413ef4fbc3613536dca6f8ca118921da8b53fe976ecc82bf6b41a SHA512 c48a6cded6c65b44f75d45136a2b9f661a4c2b3ced3ab479558f2cf4d7eb0921b10852ebf998582f607975b4e5b5258dce0e2166f55facbfcffb023cf486b276
 DIST helm-3.1.2.tar.gz 532703 BLAKE2B c3b1ca53d2cb6847342c67514094487e960bcdec0b2a3aafc21d493702a8d48e49a32afb7178f1336e840cdc908e88fffd81c48306771cedb7f0c51f64e606e7 SHA512 5d2392fa1c738f3be0cab1542df850748d237d2cfa978bdab96267e74401f2956ad372e178ff9716ba7ba5cb8f7bce7e3a31448830666b570767a533d559db33
+DIST helm-3.1.3.tar.gz 533593 BLAKE2B d6fce53a4e6cdb9a934552c44c496aae416cf3f7b1220ce0a086b6339afa5c44c5d8202e3cd86489c4726ba9903062e0fcf35702b7462d616d29eb01f93a80ea SHA512 49f924cc79c75328ec4ebc787468198be85412a56224b50d625837445982ecaf990df6aa36e099705ec9bbf4c75c516f4015fc38a5f5f22f9a47568d2f5e2c8f
+DIST helm-3.2.0.tar.gz 618296 BLAKE2B df4879a1ecf46c70c8768ac840284b7de9865dfa047c9233a93f77ea214cd00d27072921ecd77043aaf8f7e15937ce17d1bacf93deec13a73d28c734ccf948c5 SHA512 9c640084936634e16784a297cd8e953d312725f8f3aad8505bce8ce8db73c5c4ab2453c26b4893ab56da677a2c321fe3aa08848c131a60821b844c0446cec8fa
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
@@ -1101,35 +1093,50 @@ DIST k8s.io%2Fapi%2F@v%2Fv0.0.0-20191016110408-35e52d86657a.mod 564 BLAKE2B 3194
 DIST k8s.io%2Fapi%2F@v%2Fv0.0.0-20191016110408-35e52d86657a.zip 4475775 BLAKE2B a0a3e8cc4159ebd2392e9a75223698c643d1278c4b82a07a9016c6227a229208446ef19d2cd691ade169288828409e310079fa7f39240b4d6f2183ecdd6cfe95 SHA512 15aa315856c528afde85c1e38da9d8e007a23f8beb9539c72033531b93c9fb2bfd342194fa5714ec1dde18db3e9247e2b26f3c4d63af564f92629ebe3e36d295
 DIST k8s.io%2Fapi%2F@v%2Fv0.17.2.mod 505 BLAKE2B 405b92d5c64c6d2a327ec4712958588f243a9a8cde1482349d2d3e57690afaacb421dc21c6fe80a23ff7b46f6692a3c54203e118f16559380fd00567ce00c11c SHA512 8817dc3f946010b3fb20504c51dc9c7d756d26721e6f95ad9c007a7440188a05debc0a8d931fc6e0ff42c708ae1af95ea33e141dd17182fe48db3cb02e0191a1
 DIST k8s.io%2Fapi%2F@v%2Fv0.17.2.zip 3937737 BLAKE2B cf35eea2fe1e36e9662cfebf44d7dddfd0992c2d7248c36b638a5d610b3b6b0ef02ef7048154aa8cb891252cf6794c587bea716bd4bec96eb87ab68294562290 SHA512 36cb87bf07703fd877ee4e0bb5bfd1f3e31e37ecdc2f3bfedae7e92316ff369292a42e7ae2a0f1f785314be62c67968b9da6df8547a32bbb75279953f95249e6
+DIST k8s.io%2Fapi%2F@v%2Fv0.18.0.mod 475 BLAKE2B ac30820fa8c3fe58d2b98ae9e46505c68ed009b27a25eeb23edc1fca76e8e37c2b0dc695ffa7eaf5147242781649551c2edad150997a7bc499ccf84f0b5f03c5 SHA512 7ef5f5b32ec02042c913ddcbd433dbc5c5fdcf5a4747509031ef5920a58a1bc7f1708e966624ea887ac96c919f7693a669cb4fb392c74e6a0458eec8e17f37d8
+DIST k8s.io%2Fapi%2F@v%2Fv0.18.0.zip 3442466 BLAKE2B c5a0a38eb9883ab1d6663c7606229110bdd7a875cc7861c4ffa11fbf2924bd72cfa520cf4425931149d99ed3e5e36679a076a8cabd4fda238d6cebf96d95a12a SHA512 8d8f54fd006a897d322b389c1e533c7102344810bd0a3a839199879414fdcaf111a9ac94ddb8947db828ffe9bc63b740a30cf338a9cd9ece216b8995dec47d6b
 DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.0.0-20191016113550-5357c4baaf65.mod 2260 BLAKE2B bcaf86a2c3fc0bb84990ebaf5497fd58d4e22e6f86c5feb6b8ddcef251ff8087e09c0cca9eec050e107576ce53ac273477c0feddd60b5b21899becb9857db277 SHA512 f62a4582fe1ec45a495011adc6af1b754acdf1c09f62ac2aa64cece89e5dcd2b6b8b1bf4976a2ca2fbc504673369867ad2b01edab4e0681841b952d942dc34a5
 DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.0.0-20191016113550-5357c4baaf65.zip 592339 BLAKE2B 1b8100c6ac137a315595159eef3fb0347e8f86dd327888deedf413d1c14c8ade6eaf2b6056aca5e160f58cc53c7b5c17f4cf9cb2e110fbc7125c74b0c22a936e SHA512 057d3f517f352dfa425ff940a421048bf776fdc442cdaba4cd4f20753a72cabef88c57936eb19db08afc383bd5d1a2e0b90f3bb7aa3411f48a67ab19070447a1
 DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.2.mod 1585 BLAKE2B 14369480397c9d58d453599ebe39295654188686746b42a7b8c8a2a92dca8fe972bcd9920101c574576560a65040f85d6a7b7032925b264751784611d670aa68 SHA512 bc5ac85d03d345ec6de78262c52297b61cbed9f22a7f431b68bee259cf01963f7d534fa229d8cdf714d5df80d9386c8d1adcd4483b00a5ef1316c95a71520fbb
 DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.17.2.zip 591982 BLAKE2B 9eab272c51ed093763f37e9df839d61535df67bb6b3f9742c267534a83e8de66c6954acfb5896c1bc4c51abc5d3b4009e4f65e4419f8a97fa1853a655fe93060 SHA512 b883669830458e47a4f3ae0a35719e6523a2b662ad8462d6ab5e139d77e12f455c66c2d204a4ee3bb7fe5a243cc327fbdb454b87b127ce4f1919e9ec53dd6b97
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.mod 1527 BLAKE2B 83aeb7da9e70f337f4778a7ead4b5a24745baf5836ff75e5e2848f08bbb4abe1f5a0f3a0446f569d7927425c5f773dea642edb757f295ba3d5ebaf40766db42b SHA512 e4c696fc06d257cd8f3457e59cec1567b27399bb684c8dd67ef37a751aae5eaf47ec4f250f0905a6cc23ba6579a1af5f48da8d33e08166d3e905055078aa8403
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.0.zip 604196 BLAKE2B 90e8387d1eeccf4ca979b3c66699ae0fad8b5d3dd35db60922e295dda3f2b765789e4584f9a99a5f5b8f2384e10663543a5c81860797740e92c926d3a7508fbc SHA512 b8a1ee8b2572fa4c67b4dfd7145fe87914a69a80a3f084bd576050e8a2a30ce0dc325109dffb999663e8acb23a9b72ea0399dcd1795fa69c29f7befae0fc0663
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20191004115801-a2eda9f80ab8.mod 1622 BLAKE2B 613bf97334fd94082ccaedfa49f84b2f0486b15d4db23353b8123fd52d8879406c4705f67a27e6e954fb74da41cfe514b1ba6f42b229f578a31d70a88a137eb7 SHA512 d43c85d612d037b7df4c673b56d7577e6df99cd312cc8dbd704b2d91f8cc69f5f27a20fda1c6bd425b52138e93f01005b89c65ff3a3108292ec2471ace207bae
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20191004115801-a2eda9f80ab8.zip 776663 BLAKE2B ee7f9f25d0e70ab07b5bc7e7838ea55d28fb72816884836ac6a4e43d7677fd72ab18c1699d61f59a4469eb98daef196afd11827a2f03fec5f4b0c52b79713c86 SHA512 e66cb639f7f0ea8bc2d1910005ae392a1b053d347f48eb81bbb5dcadf5be0ab7940bc5875a5bae6ff2a5d4551ec174b27c80a79c290bd47966a5dc916684efc2
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.17.2.mod 1618 BLAKE2B 3adab28947dc91814453d8ad3929935f8e863ddcb272266e30a55bce506b05e361eb621e1227a420f90c6b6a58fb0da3c528d524d10a912ee7d75f7b6ea42ce7 SHA512 53c488b7ffbc76d32f905b0dd92577c9a9b9d5c30b810e09ecf2242cb3fec1033a71aef4bbcc53bcf4d4096d0cfa3069acbe49c40c7548553a0ae7b0af4d8ef4
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.17.2.zip 779247 BLAKE2B db3dede8f5dcb2961f93d4d2f483ff1132376f6334bed941b3bf3a120dc6ae1eae21a35a77db74a5ad68011837728458f30aae2c8bcda89383b45e6bb191cd9b SHA512 9af75af0f1969fca251294ae63cb105a42d6f1e4de8db50d056ee4686f65ecff703d387744ee551b217364d172c4e1f3a4b779f8736f5bb866bf2867bc2d1eca
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.mod 1605 BLAKE2B 7863e328cd5985db939aedbc154aa73c9fabbaa3554d21e6cce2bf02c6c07251f0fdc7c330cd9cc0b7470c6646145ad2f50ecb229b774f56ca6161a11a865fbc SHA512 7bf3281763e6aea61c2b1e83e97c74b3cb20151bb35ec5b6061a3de2a12025c488abd560e68ad90b8bb6a238a493973ea0caf016c24bff5b2ca739faed9ef0fe
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.0.zip 782249 BLAKE2B 86edcb0aa2b8d3d56da1a9a597506e4d7a78ab4be10cd1e7c8b8186e05e36d94e7a9139c167f8255600a3dc2e48d2382423ca6e253c8fef836a1e1a3c6073804 SHA512 819dfab278769ec74f1db24daa293bb443b4fd1d473b0016a499b167baf18affc3dc02b48601997c43ad555d8394545b75d0c76a12dfaa6a33a9621e32865a7f
 DIST k8s.io%2Fapiserver%2F@v%2Fv0.0.0-20191016112112-5190913f932d.mod 3724 BLAKE2B d98148a0c3f6054cde6a29678e767aa62bdb11f3c322b59cad30df12c152cb1e1deb42a536354519b1dd4c532f75c9720a3f8384e985f6fbb29fc30f0cc3601b SHA512 73a05ed9634dd95da7d5c9dca59de1d0ec71a8c367d8e3617e42c5593f1a0540a1eab09b9c0be72c644610b41ef2c4727e031e7b3d29d4ca524a4c1f6000adb6
 DIST k8s.io%2Fapiserver%2F@v%2Fv0.0.0-20191016112112-5190913f932d.zip 1268885 BLAKE2B 44ddfd2e26a16a0fcf67013b89487ae0364d63beb39adae4cff0dd1d70ffaf408131252e7cb8c76834d96385c0a880e92667e361e4e3ee2bdaa294164d53c289 SHA512 cf96a199ddf32fcf8574cbc3fa3e77d0da2aa8a41764f12a453427ea799bda1de8e424febb9b93cb1bd1501fab52bf2f043858bd9083d701bff80742c59f9450
 DIST k8s.io%2Fapiserver%2F@v%2Fv0.17.2.mod 2745 BLAKE2B 09b3a2c8c4786018b156f1cea3654ea6c88b51f1497a2ab4ae5661e7b8a516fded12999d7db4288ad35ea09f1f47ab0121ddd215ff20fb1a38f7fbeede0951f4 SHA512 097684e1195a0a982d6cbe65ca628664a97a63a418beac34fb9911da5ae4dbd61500ba18ba6aa85dc1dea004a340d6ce6b40f8e49ad370ee09e5f4e8463578f6
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.18.0.mod 2631 BLAKE2B 66d2b46bba152f0cfc006aa81e6225ce6ee2eb846431046db0e9a56e9af6b883d1797b7c43d11cb47aadb27235c23d758c0c98de7a95d2f9598bc20f7333211c SHA512 d2859003d1c2a2bc2844f8904e66f648d39a09e2847dd411ee68b6004ddc3e8e65d75c5af805a614a02167a8d1dfdb8c31b66f7985d1b1811c535060623a1ebe
 DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.0.0-20191016114015-74ad18325ed5.mod 1506 BLAKE2B 1069f079e38795b0c0595066dbaf4996e3465ab223296dd6f66af1c98c0dd242c5452b5f64732c934303439b0b9ebf1a630b13ac919dc47bd337e55c5c7e7e41 SHA512 40ff8fb5fc755ef1548c17d6e5164523cef530b3150e97d1b8225f7fdd66f3c9063e32f9f9ab71fde3aaed9429ad9cfe47778ccaceb98dc4486b3bad876d2499
 DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.0.0-20191016114015-74ad18325ed5.zip 158762 BLAKE2B d66bc0b99ee419396aad0531efa54c796fdb9393762b7d208c8e6ed8e44f471b848c7ef3ac66c1fe1e17aa5c443b5ef4960deadadf5b2b284f741300622ae0c1 SHA512 a8878348ed2679c887d9ea1756363cf5344a413c78cca9444656e1376671654084f278e4b697aa2a95b9b8c51e327f5ffa01107fa31a9146bd312f595c589b37
 DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.17.2.mod 1172 BLAKE2B 26b3dc0b046e2d3a4ff328d782269a3336ec6b4216f1835d861de9d1d232b7b6f836282271e3244d2884410c2663b9267d75b9b0dfc6af109ce5244e5a6c8794 SHA512 6146e8b103ad8751148cd527a71332269294be62bede816579821740cc647800d2c8b8460d6c0c5f56f41568681e1df290968c05c718a399e6ee36bd57a4286c
 DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.17.2.zip 170661 BLAKE2B 3d7e34e71fde9b9c5f6930c49e934d2f0e4bd90b19afb8d1ed4e5eef074333920bb05068e1238ac85c1adedd8ece67ce53332dc5f1f44ba3c6b62818cb56f73a SHA512 579b8c94b12c85cc9230986c953314cb30145b50a18cf6303500c69f7f9d73b3e88e048fb51964983cefac34b4a9717b2049deb9181d9c7afc68a0e1ecb8cbdc
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.0.mod 1291 BLAKE2B abb1bd080a36998bd0f48f77a40f119a4c55b5e396a9daf5c8ebe5ff5b29f5b1e105a186aee71f39ecfc1c18baceb3ea33beb2cbf86c7e323420b48dac5b62a0 SHA512 d4f79849dbce635e8f80031fb406c0f4c52d5c8a9c2896d40c3d3463d069d6c3a62de422203a41acfd8f325595aae77450e90138e5fdf7c812dd1746ac3691cf
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.0.zip 463302 BLAKE2B 760bf8cba810832e43ac24d4379b3568fc353120fc1f410aeab0556925089a737410125a5e5591910297a8d5ab87dd075c537e009d4fd785481db3dafa3da23d SHA512 c8b4c133f5912a02aa839f802fabc5c11d0b0ad1c1b4ceb702a67da8db25c2594e022eb45e11249ce0455712e5acfdab9720eba5486ef456f9b37ce1d37d38d4
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20191016111102-bec269661e48.mod 1995 BLAKE2B eb80cf67e6755d7a417901a8a88b8c43c5348411e0c2bdc1d325dfd41fb804521f1cf7757b5a5aea7c42f94bf56d256d970c770ac0a60e838a6509564ab4b765 SHA512 ba6ca6355efda00a793fbe496ae20c4c117fbed90752639d71f4dba3f0b3b1c80227d64e756b8cfd1ed669b5993993208b1311a1b8c4c7b19be090360ddcefb8
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.0.0-20191016111102-bec269661e48.zip 1597214 BLAKE2B 29a5feda723a78c0d155ef17421f54018f1ad84f53afcd1d04b57b1b4a94eca4677dcdf2d6c6a77138c366ef8b3e89a0bc636929cbcb256a2b12165af579ec5f SHA512 a698cdc2bde3e20d22ea518875060803635913a1d683a361293e3a7ba3e87cf1903aa25074a47ed751e53a6698823190e054a208db3a31b5e4cca90fdc4e5248
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.17.2.mod 1649 BLAKE2B f4b09caaab48fc4e52e8581042b61c5ae0d1fdcb7135dd2f3154c19c8b289cf299ed5f133c968bf586d8b707da9bac40b334c230aeef378fde90a2956e3a069a SHA512 8fcba798f1c04d4201dca42d9f5801da3e5087b8cec2be627c91649564ee901c2bee260cd3d86c21f27264ea7ad789aa3e3b6771f788a97d144f98040f166f1b
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.17.2.zip 1585013 BLAKE2B c035725434248ca4950300ef59e92c891e1f90b067d716d70bccb5e65534fb8aab6d71120c3e32df14ae2e0039e384518ec3c9e3839e86c44e548918b4fa2f36 SHA512 085d3b06346634b982e229dcd478c40dc86df4851fb46c1faf6fddd96c1fb2b78572ef58fe7e2b503ed924c7fa38f7369dd10bc8c96d04d75309603298a338be
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.0.mod 1591 BLAKE2B f6f6b7dad0d604859d7e8f62b9ad93199d1696e19498f945eb8faa3d2733b34b5e599272e27bf817229a59ea7da9dc973c00a5763a8b23aa6a3633d0d5b214a3 SHA512 f454f2667824023ca333652f78d6da7d3760061d26faafd221a464660a2eae54958c69f4f4b66ba5f8aedf48de14c91e092bfbcd64a2861f8c72192984376bb5
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.0.zip 2145216 BLAKE2B c153c76422e1c41413f98aedd72861f92dc5e0386da4f420d36b0c62f504dab4ba50b6f1609cb6c825863a7db2c0cdba0569ec5d16c922a5b659ca11f44a92db SHA512 7c3987914c2fe141ad9b50b876bbecf8ce6128d14a956b98a2e3938f447930b83420faef7020270c0d51d77ae0a42861e1b93e6a825c7b87f52aa189da88492d
 DIST k8s.io%2Fcode-generator%2F@v%2Fv0.0.0-20191004115455-8e001e5d1894.mod 1141 BLAKE2B 26ad88a090414740a404c60050aa02e7d6859a414e53740610c2a465e8ac8553977d519d9c4e99b3d4e179f1e65d1b7098fd83c9ef8cc66d8d0aad840907f8d7 SHA512 066c6d65537323580817ffceecf73382b7bb2d7b3163c4aa51d23851725ac8b1c502d854dc9ac6eee22b89bea1de72f0d4bf88e802a02c64cd32d960577b70c6
 DIST k8s.io%2Fcode-generator%2F@v%2Fv0.0.0-20191004115455-8e001e5d1894.zip 454823 BLAKE2B 3900f06c8646748419dc7fc21f257926e61c52d7a2cc2f6a466e418c66283fe4b2ae1b5589208cbbf5659a479b76c3e8b82c801817daaf4a26fbe69bc3bcb5a7 SHA512 229e9dc27d625207303fa00fdbfea2f62a86d6e93e09a9ee89d1fa864b612da0616a67eb5caf4a150752cd0edb87350406f771e4294054d654e85f319e4dd606
 DIST k8s.io%2Fcode-generator%2F@v%2Fv0.17.2.mod 1209 BLAKE2B 49be5cf7ea6cd809c3135660a5a586684cac197b3a0eeeb65a9ee08ab4614425a296c4c517c27bd70f2d042e30eace4ecfea2d05d3958489ffe88b449d4c3550 SHA512 4e8b189ef92a1bc66386f8328c082600b659ddd9891a0d38a5c9f051c6200aebee0881f273fddefe6ce13a4316b1337157e4e733b0ea9dd506aece36b2e64245
+DIST k8s.io%2Fcode-generator%2F@v%2Fv0.18.0.mod 1051 BLAKE2B 28c44c1ea38f4bb77ab538784e40af90093dd6e9cdc9dc8babc5bbc6322f6aa3483f97cea03c0fc9a3abfb95e64573e8f17959c6cecf5915b361ca7e30a25cfd SHA512 b3dc9fcd96c9996eeec0decdf5e7ae12c33bfa8d87e94b14566aca3a492bafdb509bfa619f1e977c7f1f8f051d63a0003c2abdfebef15b14f5c4c78812344a59
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.0.0-20191016111319-039242c015a9.mod 1397 BLAKE2B a08f80c9e07b4f61dcafde1fec26f5f667f8e5126d7c9b1f5f2a908cb46eee63b177f2422da6a1d5325d02dca04f8a65d60bd789eeada3233db8562d457f21a0 SHA512 b692cff0026e4f5f2b9310802d545d76322ecf6bf7c4201bd415adfc5fff31d1591a39cb0e0dc23253ec6c7de76292be382bfa651a72763454159e10defee9f7
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.0.0-20191016111319-039242c015a9.zip 110614 BLAKE2B 71398df48d79c9641d0797f1dad643e7dc99b023da0ae259ef6487795c4b88e08b7420123af6dca5ee1a7aa599a834e8ca6e88881237362d7ca22c98e0f9a815 SHA512 0c3c488c44d038e974ee04ddee6adc75bb5642b22321c28942aab18ee82bea7e9db47831d9c1a40b4cd74630c22e57fb0e872fc23935112ab558cb9bf90d0143
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.17.2.mod 893 BLAKE2B 94b5217c1d26265d5e588986e3ea42203db3508a164d8997bb2685ac65d7f5af3aa96dee2a7709b3fcf7a537aaa8b2661129cde85fca54f5ddf3f86643e0195f SHA512 1affb253ce3c62b082088d43eb0ccc5b228cd486e476b3e2dc95c6b89e4340d270299c5f028e7ba75ed4fd419ccbfa51918443779d4b93a0ae4c73c8a57d68c8
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.17.2.zip 130165 BLAKE2B 6897bd848f8fdf01bea2b8f5fafe7349697cc0b119b4b924442a925d769d3b3570bb25501cac7a0b26d712ca33e65b686573149adebb2fe3833758098de57240 SHA512 bf8e4ad5c2c5897d325a7ac149efa099376d19b39906b90e68ffb239677cbf1d3e68343d51d6b514fa1b3118fefa3403b224c2c95166af1aa35a29ef4ffb3925
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.0.mod 898 BLAKE2B 6cc9e5252b2e886ec23d67511e7f17d0097b564a2a35547d5c0c03c603f1485787c6a1bc3a5aba7d6b91c5377191987d7947a6181587be97319e4969c5ab5123 SHA512 743600f77e0d833d652c2affa3c0e6bf7f20dd429a914220762f044cd6d7460e8d7ee23af29b84f5bf0f1b0d17e6c3f8cc0853d31dbfb6ea64e78f5d7a6eaff5
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.0.zip 146593 BLAKE2B 125f77ab92e623c0deee825aa1f7a411ef680a4d9386a6696177228288821add27caec82483e335905de0722b8bc5c030fa32805a4d22194607a39368ae7776c SHA512 62273c50136a4c1c8b7ebf2d4510440ee58ed9f18d90cb34e8ff1e8c6808f83542f2e70060546b6ca9a3003953b2d4f0c7adbdc0007709c31ff14ccdf8d6a7e7
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190822140433-26a664648505.zip 155511 BLAKE2B 294f52f83e1e2817df5b6b2154d67c7b1c15fe5ea973734a1489a28961c6b5a27ef41f825d8cce2519b749cb1fe90e6acb03a83c39bff9f9fec9fd3208d4ad37 SHA512 49b40d7fba22e467ee8519e240c03971ac23613f277c65e0e4a51ce713e1a04df9b6f5156f3276f57d68df8094fae4671fe6b7f7107370add74f639d41e1d3ce
+DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
 DIST k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
 DIST k8s.io%2Fklog%2F@v%2Fv0.3.0.mod 19 BLAKE2B 2af8f84f1cc7227be731c55dbe33e87e9d4fbba134ae86b6a86bac30260f32c7f17422789189486b17e1a2b84cfdca35984dd6d6079aab621620e90da230a6ac SHA512 cd5afa0488338a1b22bb852219078d74d61f894fd075b60b22bf062dbc49ad16c1088ab55bc8ae72aeadb4f7fb9534b99adceeaf3913e47bbf00df1ead1c7aaf
 DIST k8s.io%2Fklog%2F@v%2Fv0.4.0.mod 68 BLAKE2B f745a62a974a42d1692705de032c8c651477ec71f32b0515adc02360e5a3de6c7d65f5d97960e78da06e99b0843c312a09701c08c6a5c112af832e3cd2e43649 SHA512 cfee3f10c26fafe7cbc510ff8cba479dfacedf1d95b4e25b75978656862067524b4b9f5e889455f2d74eacf07df7895fe266415a05b9502a759baf2e4bd3884a
@@ -1142,39 +1149,50 @@ DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190918143330-0270cf2f1c1d.mod 2088 BL
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190918143330-0270cf2f1c1d.zip 826066 BLAKE2B 52a1947116eb78086ace09f265e98bac72d32228bb0dec8f5295a72a601b91ac00ac10ac8c9083df59fbf77460106a6efaabc4c90536131d70dd1a8f0f825167 SHA512 caf8b842d2cb0a5011cf94663bb2f896f6d6192c7af8ba6c0be23318d35b0224f40d71a1ab5d6639ef425e0e968703fbc0911eab8e86d3cc7a81ecb5dd87aeea
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.mod 2088 BLAKE2B 407e0a8a7b3fdf35034c02c9a2b22a1dcb43347d3ce85b89088b04884d49a3a24eeb80a20263699bbce415707462375a420c92fd458016ea151884ac8d2da151 SHA512 b0969627b58ab34c898af158e1dceb5427a621c39c563537ac547c2213cd7034a5eb152840e359821d152bdb47b32426264bb3b86cf64cc1359191a943712340
 DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20191107075043-30be4d16710a.zip 826182 BLAKE2B 00f00eef706ec917307b0d6c7eaede29936e5d81395fbc48ac6d5bae6b6137bd509a4f91398d293e6740eaefbe061896e00ccfcdfe26e7a92b4e80870fae31f3 SHA512 206e531fe7a55399aeacf9f523bc27dea2c251f41839fb313a45fbfcce7c893e9c85d89eb9b1654be471efec016d3fb4bf4d3859530b5b700d6dbdaef3abbee9
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.mod 1743 BLAKE2B 1f2f1c417b102908c388ebdabbe4686f756287951943eac396b07d8be7fa905a6d362442a2f99d5411aa19b27df038e699ec1264648e9c948126835df0f1a767 SHA512 6444514b3858974b4517ef18bbf82366363e2032e53a8a88db6bf2cda4105271ed672a49cac0d01aefe7f006cb69a8e8deebc077a91063571dd1b20fdf09b21c
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200121204235-bf4fb3bd569c.zip 826029 BLAKE2B 454d5c68dc5b2216ff9d38302a817349ed84e2a74e52cc115695d37e6d6b0425af6163b52a96b370a09a6034dffde3ebb362d6f112c2f8b8d0d59a90f9933a17 SHA512 5e4f061796cd04e9dccb2f43c292922363d670a2be8362bbc11b5cc4c658847585a552525ae604b909ab159f447bfbeea71b91c871b01374c749f75d117c3dc1
 DIST k8s.io%2Fkubectl%2F@v%2Fv0.0.0-20191016120415-2ed914427d51.mod 3209 BLAKE2B 3c509a4b4dc0a8cb5b4069df62e9e983163b9167093e6b6611f723033a0eb63bab1c55b188e37752681651828668e6b2d25e1772724004edf19f60b3bbbf0e88 SHA512 1f1f3b7fbf1c4855146ba8f0e9eb9497aa7bd41b148b258eef503a2cf1b0d7b8f2707880db106c9c10e229412721bdd06daf7e2f8b8e452990b6d833bd6eebd5
 DIST k8s.io%2Fkubectl%2F@v%2Fv0.0.0-20191016120415-2ed914427d51.zip 3313151 BLAKE2B 0956218edc27d1c68c0da3eddc404ef88f3c41d16c0227cca8fc12319436c01859a2ae58e0804b936c5ca447b10ff242faa3ea9ea795b9a491fcae024b368499 SHA512 b01518cdeccb6c7e96332134bdcd8e01bc96fd53cacd96f09d3be8ed423ffffbcfbbcbb282f642886c660d097b974ab60dfa5b12d6307bd98ec742c3ee383f1d
 DIST k8s.io%2Fkubectl%2F@v%2Fv0.17.2.mod 2669 BLAKE2B 2661544a96a59af43738e7f0c9c0a28f28bc15ce8050c72b6250ff08668e821ff6c0320289799292189be1dffe4468a1a433dcbde0b277cca560e3ee333f1d68 SHA512 9bcccc057a70ba96132fdd0418fb464581ff7f5e41f409f6942bafcf556a03d696ad31c1415a3bf34f41223485f812fb58bfbee0df92b255e3a0f23ccfa05416
 DIST k8s.io%2Fkubectl%2F@v%2Fv0.17.2.zip 3320481 BLAKE2B 3e005f6dc2fb1bf2fd5d1f7afea84ce0777cf504838d4628a03e0a35f86ccccafdf222a320a13a142c82a34be2943fef599ed195acf65f38eedf48202a5b71bd SHA512 c6f56cf9cc1a9f4944e2caa1369f615130671d09d4425c24315581766405e553c00b25b95f1b740b21f39b60a4402e56e27471210ceaa8cab8cd8f9dbf43066c
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.0.mod 2674 BLAKE2B 7ebcbe7a21230135fffa57633be6d3cb2f356200a371a94f5f653c4385c837416cf669774e7f9180f2f151bc957e17516bb14817fa3886620754ec23f2d4d1ed SHA512 189bffb0111bab15210d225304dc9973b78eda60d056bf3c5972df8ab453d506ef41161e2e3db27787212a59d8cca1d7d4a1d80069c19dc93f10e3ed98e8dcf9
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.0.zip 3312721 BLAKE2B fa4ea05eb33293ee93fd8eec7601134f5ccb840b8f78f8dd2d5a95f639848a4f9dc8380241b1cffa49fbd9622b2105c3ff3bad42675b5f7fbb410dcab3c69b69 SHA512 a3eb4055d63f7dba025b85760e0201e9219480bab6be003851ea3630b075c35511605e080dec3bdba371f27278e79193590c0ce712e4eac8df86486e285dd7d3
 DIST k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod 25 BLAKE2B 4060536d51fac9854215957b1108a158adb0b3aeb8bfc659eca1140efdcf79cffe378db6f3cb1f4a4b68aa36468b7d5631e993d5a089eb839bd03b6b608496be SHA512 2349b7dbe8409836cc70d97c5b336f518b809f5731baf05ce68d957c9970895a9b7f89caf09763794cf13824ee29410b3a6e431b2da7f64610895c44b86c4d2d
 DIST k8s.io%2Fmetrics%2F@v%2Fv0.0.0-20191016113814-3b1a734dba6e.mod 1251 BLAKE2B cf6c8cb1db02c930d215ffe8e59fc59358b1666fea6aa909bc907cbc032c0ab255420012ad8f605d1cb2eab0a5f0e2c3ef9b99370b1a88f161f4d625dcf53016 SHA512 f8280df4a57aa1afa1ec1ac697746726d49d7c09592e496fff8e6d3472762956bfa53f17b697dd893c53c96000f1a4bf5c1e94ff45ae2abd4c8c5b9719a677c6
 DIST k8s.io%2Fmetrics%2F@v%2Fv0.0.0-20191016113814-3b1a734dba6e.zip 154827 BLAKE2B a10cb84b84f6725dd3b4464c0d1eec485522c0baa73dd4801db5f1d7a29ce3ab110a385dde1291e7bec8cfdb12471920899da2c67a304a4fb646ae7e1f89638b SHA512 67160098faba2177b3cd6c99ff6342e2f32fd05aa156bc2525a4e6417eaafe747195d7676b48a5b3f1906fcc9e6088f4841c16c895d14e8ba4b486b710653f17
 DIST k8s.io%2Fmetrics%2F@v%2Fv0.17.2.mod 722 BLAKE2B 8abfa2f744770db64668abec95c9a8b943007cf930896a18debf6fed62c3976fc17c89016cbd0026802c3ff1d07128c34cfe29ade7398115b1af2fa243ed1b96 SHA512 fb2e9b7cb390e65c6f198f250aad90e933a7f0b58d41898b75e4f6b33dfbae6e65128b8549f7f53759a8ca52c2a7021b9b483e39836d83a78d28bc1cb98f07f7
+DIST k8s.io%2Fmetrics%2F@v%2Fv0.18.0.mod 692 BLAKE2B 76478ff05c62c6946518a3ddb372257c396362b4637dee49165e1c0f77e5e2a8d9a0acb81a530474c8b558d5d0766db67307d9ec37f999aed7d43f793ba46c31 SHA512 2ba79ee78ccd463ae3901b57f5c54ab88302c7cf8784173874b0cc6f0df9dbbc6834db5aba21934b140add4e7c961645112af66b1796fc731a8aa06d37391885
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190801114015-581e00157fb1.zip 94436 BLAKE2B e37065fa03f0e668da9d572af59f5ea5f4ce5c05a625dbbd17e8aeb68c322363c6bc771b907acf947aa2212ada6b0b674914408d30d9095e2c0f88468dbdcd5c SHA512 207496ceb41f9033e93e8be0648d286b9c37fc36f9274266073266c370a6a2bc29640b459e7f2ec3a1c3d40ca4abc61de35b752b72dc8e43ebe4a19e40801ff0
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20191010214722-8d271d903fe4.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20191010214722-8d271d903fe4.zip 95828 BLAKE2B 825798a951daaa331a3011754e7ddeadd3705fd52ae9dc5d3d40432f362da5f51295e73001c366e9e86940a71627479d9f28037156f0a16717f94e125f7500a0 SHA512 0dba418d6592d0f1c5448d7e86ca580af94b4f74d3f489de1afa5a6ae4830124783191bacc2ee0b359371cee2f83c85cdc5775ed632bf45ff45aed4c749fdc5d
 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-20191114184206-e782cd3c129f.zip 137840 BLAKE2B af608dff09741f6cc1fea2044d4409bd238949f2f965fe890fd8dc9cfc7d6b1e00279486197c20cdc4aa17de2548f1835afb162b094bdb04b4cb079a8cd81d99 SHA512 ec27f133a5042a2df05889cd9f131a27818165e126dfdc330c0d686b4121b35aad64cc0fb66d072ab358c62cb881cf2d7706fa21a424941b226d0d9c19e61eab
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
+DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip 147166 BLAKE2B a9d5897231997c8184aba7c58d6b31fa8413d7c94e48f52fb59f171f537d0e9a047055a5e717e411c7f0dbc63bf1794c2a425c278724eeb73de59e7bbd8d2ee0 SHA512 49641d1a253a5469d9dec1e104b5ecbd7033e28f8ab08c351edea432687fb1bf902d9fbf3ea2ef217b82ab06ca3f2453a1dccf03468d38281c847e19477641df
 DIST modernc.org%2Fcc%2F@v%2Fv1.0.0.mod 22 BLAKE2B 26488aa7e4d0339d58279e663998091c24b5a6d4d026ea71166c06695034ffb5011d20f49c151c6a41481c6cb5648806ae5201bffcf4e2e49b6e7ec9375d9469 SHA512 22847329a9a431f222a2bde9c743aa5d76e737e2535b53273c31cb641c89fa4b73e51de12f84fb6da532b060a1daa084c5150502e3ab4e311eaff351f10617fa
 DIST modernc.org%2Fgolex%2F@v%2Fv1.0.0.mod 25 BLAKE2B 5ae90f4bebc5486b84fbad78cbb9e747a2b1710805a35eefb93fb5f860c7850242067bf79c38a7a076f9f5823995cb4a2fa0120491258cfee9e87fd5996cbbf2 SHA512 764e7459060a8e7e90c8b8714926cb8b1eeb130789d1d89eb52e4dec5be83298bfe03647720c0e84d5aa9cf293a38f041e1696ccfe60a87cd1ef7316190b41ac
 DIST modernc.org%2Fmathutil%2F@v%2Fv1.0.0.mod 28 BLAKE2B d93ac859fd33dd8b36dcb992876edf1470206d4a455f6dbfc3a8be76aa84cd3b1a16a12e23d857b090ee5b18ba51441c90bc5d6a4bb35430193d7f99d61a3725 SHA512 53b0f0324ef1cc51f322d535b2199362be3962aa8e2d1c32b0c58da2fd4f65f8f19450089d78fc58aa89ff5903500ae2cb60ba38d89373c9f58f075db0ba80fa
 DIST modernc.org%2Fstrutil%2F@v%2Fv1.0.0.mod 27 BLAKE2B 16f598b7535482c888f2e41038dd4280846bb4a04d796f5c5e57f23bc74f634273f28841eaf40cf911b1bc27046ca8471bc0b2f7e4f93f4b605240eb0d755d54 SHA512 ecd195420e68552b6abe9bc99447e47f63ad37bee567b2b143eb612b60796a087f7948491f83c2b95e22e7ff9467f779702a0bd8557368078675964dd3748c7a
 DIST modernc.org%2Fxc%2F@v%2Fv1.0.0.mod 22 BLAKE2B 27cf5be7229a20978f3b7e622f03e3d10c1a0feee65a7d785315ad461841e2cdad9cac5a932f014738d7240c0d1f42ad2fda7fafb3519463e6bdc6ce985dd139 SHA512 fa34823abcf78a4a884d7c0ce3807e519547389f0b9f5026ac6b600f4f22d336ebc93e2c28519c2b5aed7073f11c09234d694dc922d92fa3990c97f42d6cfa91
+DIST sigs.k8s.io%2Fapiserver-network-proxy%2Fkonnectivity-client%2F@v%2Fv0.0.7.mod 172 BLAKE2B 76dc350439e69f75cfc082d93ee6649320fa8e311933db45425d4489f0ea21aeb8c1342b13e86d1a40c092788592e3d31e55cb550f05a3079fb60dc87f2a739f SHA512 ab153a98f7ccba57905e02e1bebc462ef2e3a86b459c0cbf8d346a2aa8eb044fd474ad2a267dfa2421d1b31d51d6db6f1ba9739cfcef8ee8c02bef554a39a40e
 DIST sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.mod 29 BLAKE2B 6dcd5ffe918a42923b91bba22b5ed6da6b907cdb47dd93a471841ee92776606efcf74a0a788f188271a45682de307ac68cf68cd52089cf0398282256e3ef44a7 SHA512 2f557369d03b9991cb84462ac25e6fe937a543cae729e6dcdfd97d2e01d334d42124790442eda51dd1c87409e74d4047a523c020e4a5bf8b773dd065cd94bb69
 DIST sigs.k8s.io%2Fkustomize%2F@v%2Fv2.0.3+incompatible.zip 486035 BLAKE2B 9ab10ce74e3017ff57247747bc215b01c3da80539687369da2e12653c83a2f5336bdaec76f6ebde44187bade73372878578302f51337bc2b321c5b76f82ddf4a SHA512 a7c6ea8f2e9f5b321d4c9c1f85bca3e27a9ffe72a252227022299ba1f54634a93a36d021845ea6ac2c939eaf4e02edf345a70b740a124358b7f26b90ed0d2177
 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-20190817042607-6149e4549fca.mod 301 BLAKE2B 1a9f3ea463341847f42ae506081aa1ba856e540bec974f16aa2ebb1e0ba98de0a386d91dc34132ba770659eeefc1d54047797956b42fd56f39ab53e42aade670 SHA512 84ecf3cfe6093169a8f1f5e8cd2ffaa6d8cb9cc740c72ca004da57c427af46bb76f7de42c07702d1c23184c5bebb13fbd2c77570a936a15a46474d55515fa75c
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190817042607-6149e4549fca.zip 133465 BLAKE2B 396bf1e37fb75f4601de4975ce482889ddccb8e7c15644bcffa2dd3d14b86ac6b9f118a87f03030eeec86e88b0a8c8038e1e77b6b9b39b27b8b8e9a8f166441b SHA512 ef64fc39cb906ee6287dfc09890df8f8af5855d075286892089adc5ac7e97bc938e63f40758afc80e48472cf96485e31dd71a7c7fca4f95bcf7c86501768008f
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv1.0.1-0.20191108220359-b1b620dd3f06.mod 334 BLAKE2B 920b3fce37af000b4956b9eac7782f6000b91ce04c93fd67e709e8347d4e13b63d894b2c762d927940978455c6fe7a9b02f643f5050218a749a7fe40a28458ca SHA512 58b3f092f22d417aa0fdbc3795f9dbd244b63b9f888b51b335021402e725a9babeba56f101337f5726185b031b3400e3b022e4d76e3f1debaf5281d4360add42
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod 298 BLAKE2B c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b SHA512 d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod 298 BLAKE2B c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b SHA512 d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
+DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.zip 215199 BLAKE2B 10e6de70852ce1a49e1091f10305e217d873bf92d727ef5c773376eb5bd4fe7ed09f4bba82b59b8fddb7bb67709428f0ff02068bd025df35c196b29abf9d57ff SHA512 f61f3d2c31c00c2c016ebbf48f051920cb461429c8d0e46b2995efa18e5b03cbfaee429c2b545979546ac82cb3439274133f4e898d0d3f2c9e3636d673818f6c
 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 sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
+DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
 DIST 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-3.0.0.ebuild 7131 BLAKE2B 50e7fcd49e605386d35ac98266d89da63e0e2f91f8daf31eb80c21d599e1851ff5ab3f0f82ea4ae3f1c31382aa2966eb588150a16c1e7351851b7872d3dd4d2b SHA512 48411846df850bf94f360007e6605341cf41a9de739108b1d944306263d18161dc248ab1247689b128d837c32c840f4102abe585647325f5b3a275031a7df306
-EBUILD helm-3.0.1.ebuild 7057 BLAKE2B ea4a09c1ed7a18e03e258a674b6587d38f915161c8fed17b7c5d92e800cd547f17b633ace759dd3cce5d3f0d584cf373df949dbb1a951d771fa1b0457e62bc12 SHA512 af0fdc6f3fe0bc6f0f12050a6c78f285a88c20ea418a25f44437fe8cf12905f644f54f1210dd2a9b6b316b1f40d62d7018ca9c550c3bee9c569a8cbeef49a390
-EBUILD helm-3.0.2.ebuild 7057 BLAKE2B 35d906b9ff6ffabe35a88d069652c3efba27c4c3598713cb332cdd7b1835ebd47f50c5e6dbf0e62a13079ada2808e5aacce7167fb918d30ccbf0f6f8ac57627f SHA512 c05e5e8a9eee9a6a698af4c8fad82f5f664ec9a549001966f41f674451b4991c3bd3b1c11d0cd67dfb55152a072a1a4ef7e1251ba010e8a2a656b906557ad62b
 EBUILD helm-3.0.3.ebuild 38439 BLAKE2B 3827ab505c187340588ef4e2596e3b0913ea2e98f51c9fa23718c5f2e4b57a5623c9bf4244b589a195292978cbe134a2dfc6358dbabf701bfe8bf67de7a4a636 SHA512 b978278e59854245840bc4cd80cd1fe48835f685ed61015211d5c83267c437321454d1c4e380df8b1cbe20243317d3af0f5fba7a5dc2cf531b3e7d6d26f70a50
-EBUILD helm-3.1.1.ebuild 38892 BLAKE2B 911b9e3e4ba6bcb4659130811361f3c315e5301fefcf73a6e1074b6e5ed9f224168f3f620be57df9fd93b290d75e4c1a5bda85c5c40f3a753f98ba468ae4720c SHA512 3b9fd7ef4d45b0d08c537ce54d546ce621ffc54def9fe6ec7c2fa64618e742d2f6b785c80984cc0cc4dcd3cfff75f51af38fbb3a74d1ed10a11a9439abcbcfa6
 EBUILD helm-3.1.2.ebuild 38892 BLAKE2B e2a07d820e7d8659225e470c0f31adb7bdfcdf535467ce07fa83e9b341bce7fb50406dfb159fdf40812ef85a13c8ef3d1e359ae94a42fcaf564ab87ba67b0929 SHA512 ad66b6850a34be3db3f8f38b389d03a19d8c6d4261a8a97e2cad44e0c82065d69df13547785ac9a6c18565e63e335ab1265fb4ff5fb9d283e724100f0c445855
+EBUILD helm-3.1.3.ebuild 38892 BLAKE2B 493417be399a9fc153907fe0c3b574a8341c2e389a1560ae102c0fe893755251665d7b3b747237a2f4c448dcaf34cd927fb3e7102b0edf697f26fe456d48f4b4 SHA512 23e60f740118dda3ffde6a053daf0c98cada8fd79cffdb8d1bd456d5a3392a3e775ee8e63a3c4c90d08fe61eb66dd9eb11e3a837e1bbe8ee85293b052e5cd911
+EBUILD helm-3.2.0.ebuild 43316 BLAKE2B c9c2113386b22bd95c9f1610010bccc517877b0d1c499895473090c0482ff3f0c3f5c779dd6b538fd751f04969f478ccf102515e08ce83d91e2458557383ba9c SHA512 fd71682e549a63770638003c9d136442159ba275f858b67032297ced12adec3c758f13a61dff5216330c73b88082b9a8890d89581040c462d348875f4c05f658
 MISC metadata.xml 322 BLAKE2B b452dfaecaf6b32e7fc334ddb00444d739a618898f8e0d6905e8b3191acc7f0fc5e3929345405d86f9ab56e8ad80fbcd1dd46a0ea3ff5aaa2bb9f56407d10234 SHA512 ef4bb714213346e60a2a39833d0ab1987e10d2b34460a053b479775163e8778021ef3da63a8f5fede055281298dab88309a796cf3ad650c2d3ddeb17a7b0b4be
diff --git a/app-admin/helm/helm-3.0.0.ebuild b/app-admin/helm/helm-3.0.0.ebuild
deleted file mode 100644
index cc208bd7a447..000000000000
--- a/app-admin/helm/helm-3.0.0.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="helm.sh/helm"
-
-MY_PV=${PV/_rc/-rc.}
-
-EGO_VENDOR=(
-	"github.com/Nvveen/Gotty a8b993ba6abdb0e0c12b0125c603323a71c7790c github.com/ijc25/Gotty"
-	"cloud.google.com/go v0.38.0 github.com/GoogleCloudPlatform/gcloud-golang"
-	"github.com/Azure/go-ansiterm d6e3b3328b78"
-	"github.com/Azure/go-autorest v13.0.0"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/MakeNowJust/heredoc e9091a26100e"
-	"github.com/Masterminds/goutils v1.1.0"
-	"github.com/Masterminds/semver/v3 v3.0.1 github.com/Masterminds/semver"
-	"github.com/Masterminds/sprig/v3 v3.0.0 github.com/Masterminds/sprig"
-	"github.com/Masterminds/vcs v1.13.0"
-	"github.com/Microsoft/go-winio v0.4.12"
-	"github.com/Microsoft/hcsshim v0.8.6"
-	"github.com/PuerkitoBio/purell v1.1.1"
-	"github.com/PuerkitoBio/urlesc de5bf2ad4578"
-	"github.com/Shopify/logrus-bugsnag 577dee27f20d"
-	"github.com/asaskevich/govalidator f61b66f89f4a"
-	"github.com/beorn7/perks v1.0.1"
-	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1"
-	"github.com/bugsnag/bugsnag-go v1.5.0"
-	"github.com/bugsnag/panicwrap v1.2.0"
-	"github.com/cespare/xxhash/v2 v2.1.0 github.com/cespare/xxhash"
-	"github.com/containerd/containerd v1.3.0"
-	"github.com/containerd/continuity 004b46473808"
-	"github.com/cpuguy83/go-md2man v1.0.10"
-	"github.com/cyphar/filepath-securejoin v0.2.2"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/deislabs/oras v0.7.0"
-	"github.com/dgrijalva/jwt-go v3.2.0"
-	"github.com/docker/cli d88565df0c2d"
-	"github.com/docker/distribution v2.7.1"
-	"github.com/docker/docker 2cb26cfe9cbf"
-	"github.com/docker/docker-credential-helpers v0.6.1"
-	"github.com/docker/go-connections v0.4.0"
-	"github.com/docker/go-metrics b84716841b82"
-	"github.com/docker/go-units v0.4.0"
-	"github.com/docker/libtrust aabc10ec26b7"
-	"github.com/docker/spdystream 6480d4af844c"
-	"github.com/emicklei/go-restful v2.11.1"
-	"github.com/evanphx/json-patch v4.5.0"
-	"github.com/exponent-io/jsonpath d6023ce2651d"
-	"github.com/garyburd/redigo v1.6.0"
-	"github.com/ghodss/yaml v1.0.0"
-	"github.com/go-openapi/jsonpointer v0.19.3"
-	"github.com/go-openapi/jsonreference v0.19.3"
-	"github.com/go-openapi/spec v0.19.4"
-	"github.com/go-openapi/swag v0.19.5"
-	"github.com/gobwas/glob v0.2.3"
-	"github.com/gofrs/flock v0.7.1"
-	"github.com/gofrs/uuid v3.2.0"
-	"github.com/gogo/protobuf v1.3.1"
-	"github.com/golang/protobuf v1.3.2"
-	"github.com/google/btree v1.0.0"
-	"github.com/google/go-cmp v0.3.1"
-	"github.com/google/gofuzz v1.0.0"
-	"github.com/google/uuid v1.1.1"
-	"github.com/googleapis/gnostic v0.3.1"
-	"github.com/gophercloud/gophercloud v0.1.0"
-	"github.com/gorilla/handlers v1.4.0"
-	"github.com/gorilla/mux v1.7.0"
-	"github.com/gosuri/uitable v0.0.1"
-	"github.com/gregjones/httpcache c63ab54fda8f"
-	"github.com/hashicorp/golang-lru v0.5.3"
-	"github.com/huandu/xstrings v1.2.0"
-	"github.com/imdario/mergo v0.3.8"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/json-iterator/go v1.1.7"
-	"github.com/kardianos/osext ae77be60afb1"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-	"github.com/mailru/easyjson v0.7.0"
-	"github.com/mattn/go-runewidth v0.0.4"
-	"github.com/mattn/go-shellwords v1.0.5"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/miekg/dns 0d29b283ac0f"
-	"github.com/mitchellh/copystructure v1.0.0"
-	"github.com/mitchellh/go-wordwrap v1.0.0"
-	"github.com/mitchellh/reflectwalk v1.0.0"
-	"github.com/modern-go/concurrent bacd9c7ef1dd"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/morikuni/aec 39771216ff4c"
-	"github.com/opencontainers/go-digest v1.0.0-rc1"
-	"github.com/opencontainers/image-spec v1.0.1"
-	"github.com/opencontainers/runc v0.1.1"
-	"github.com/peterbourgon/diskv v2.0.1"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/prometheus/client_golang v1.2.1"
-	"github.com/prometheus/client_model 14fe0d1b01d4"
-	"github.com/prometheus/common v0.7.0"
-	"github.com/prometheus/procfs v0.0.5"
-	"github.com/russross/blackfriday v1.5.2"
-	"github.com/sirupsen/logrus v1.4.2"
-	"github.com/spf13/cast v1.3.0"
-	"github.com/spf13/cobra v0.0.5"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/stretchr/testify v1.4.0"
-	"github.com/xeipuuv/gojsonpointer 4e3ac2762d5f"
-	"github.com/xeipuuv/gojsonreference bd5ef7bd5415"
-	"github.com/xeipuuv/gojsonschema v1.1.0"
-	"github.com/xenolf/lego a9d8cec0e656"
-	"github.com/yvasiyarov/go-metrics c25f46c4b940"
-	"github.com/yvasiyarov/gorelic v0.0.6"
-	"github.com/yvasiyarov/newrelic_platform_go b21fdbd4370f"
-	"golang.org/x/crypto f83a4685e152 github.com/golang/crypto"
-	"golang.org/x/net fe3aa8a45271 github.com/golang/net"
-	"golang.org/x/oauth2 0f29369cfe45 github.com/golang/oauth2"
-	"golang.org/x/sync 112230192c58 github.com/golang/sync"
-	"golang.org/x/sys 195ce5e7f934 github.com/golang/sys"
-	"golang.org/x/text v0.3.2 github.com/golang/text"
-	"golang.org/x/time 555d28b269f0 github.com/golang/time"
-	"google.golang.org/appengine v1.6.5 github.com/golang/appengine"
-	"google.golang.org/genproto 919d9bdd9fe6 github.com/google/go-genproto"
-	"google.golang.org/grpc v1.24.0 github.com/grpc/grpc-go"
-	"gopkg.in/inf.v0 v0.9.1 github.com/go-inf/inf"
-	"gopkg.in/square/go-jose.v1 v1.1.2 github.com/square/go-jose"
-	"gopkg.in/yaml.v2 v2.2.4 github.com/go-yaml/yaml"
-	"k8s.io/api 35e52d86657a github.com/kubernetes/api"
-	"k8s.io/apiextensions-apiserver 5357c4baaf65 github.com/kubernetes/apiextensions-apiserver"
-	"k8s.io/apimachinery a2eda9f80ab8 github.com/kubernetes/apimachinery"
-	"k8s.io/cli-runtime 74ad18325ed5 github.com/kubernetes/cli-runtime"
-	"k8s.io/client-go bec269661e48 github.com/kubernetes/client-go"
-	"k8s.io/klog v1.0.0 github.com/kubernetes/klog"
-	"k8s.io/kube-openapi 0270cf2f1c1d github.com/kubernetes/kube-openapi"
-	"k8s.io/kubectl 2ed914427d51 github.com/kubernetes/kubectl"
-	"k8s.io/utils 8d271d903fe4 github.com/kubernetes/utils"
-	"rsc.io/letsencrypt v0.0.1 github.com/rsc/letsencrypt"
-	"sigs.k8s.io/kustomize v2.0.3 github.com/kubernetes-sigs/kustomize"
-	"sigs.k8s.io/yaml v1.1.0 github.com/kubernetes-sigs/yaml"
-)
-
-inherit go-module bash-completion-r1
-
-GIT_COMMIT="e29ce2a54e96cd02ccfce88bee4f58bb6e2a28b6"
-
-ARCHIVE_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	$(go-module_vendor_uris)"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Package Manager"
-HOMEPAGE="https://github.com/helm/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" || //' \
-		-e "/GOFLAGS    :=/d" Makefile || die
-}
-
-src_compile() {
-	emake build
-	bin/${PN} completion bash > ${PN}.bash || die
-	bin/${PN} completion zsh > ${PN}.zsh || die
-}
-
-src_install() {
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/app-admin/helm/helm-3.0.1.ebuild b/app-admin/helm/helm-3.0.1.ebuild
deleted file mode 100644
index 7dc4fe85e786..000000000000
--- a/app-admin/helm/helm-3.0.1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module bash-completion-r1
-
-DESCRIPTION="Kubernetes Package Manager"
-HOMEPAGE="https://github.com/helm/helm https://helm.sh"
-
-EGO_VENDOR=(
-	"github.com/Nvveen/Gotty a8b993ba6abdb0e0c12b0125c603323a71c7790c github.com/ijc25/Gotty"
-	"cloud.google.com/go v0.38.0 github.com/GoogleCloudPlatform/gcloud-golang"
-	"github.com/Azure/go-ansiterm d6e3b3328b78"
-	"github.com/Azure/go-autorest v13.0.0"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/MakeNowJust/heredoc e9091a26100e"
-	"github.com/Masterminds/goutils v1.1.0"
-	"github.com/Masterminds/semver/v3 v3.0.1 github.com/Masterminds/semver"
-	"github.com/Masterminds/sprig/v3 v3.0.0 github.com/Masterminds/sprig"
-	"github.com/Masterminds/vcs v1.13.0"
-	"github.com/Microsoft/go-winio v0.4.12"
-	"github.com/Microsoft/hcsshim v0.8.6"
-	"github.com/PuerkitoBio/purell v1.1.1"
-	"github.com/PuerkitoBio/urlesc de5bf2ad4578"
-	"github.com/Shopify/logrus-bugsnag 577dee27f20d"
-	"github.com/asaskevich/govalidator f61b66f89f4a"
-	"github.com/beorn7/perks v1.0.1"
-	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1"
-	"github.com/bugsnag/bugsnag-go v1.5.0"
-	"github.com/bugsnag/panicwrap v1.2.0"
-	"github.com/cespare/xxhash/v2 v2.1.0 github.com/cespare/xxhash"
-	"github.com/containerd/containerd v1.3.0"
-	"github.com/containerd/continuity 004b46473808"
-	"github.com/cpuguy83/go-md2man v1.0.10"
-	"github.com/cyphar/filepath-securejoin v0.2.2"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/deislabs/oras v0.7.0"
-	"github.com/dgrijalva/jwt-go v3.2.0"
-	"github.com/docker/cli d88565df0c2d"
-	"github.com/docker/distribution v2.7.1"
-	"github.com/docker/docker 2cb26cfe9cbf"
-	"github.com/docker/docker-credential-helpers v0.6.1"
-	"github.com/docker/go-connections v0.4.0"
-	"github.com/docker/go-metrics b84716841b82"
-	"github.com/docker/go-units v0.4.0"
-	"github.com/docker/libtrust aabc10ec26b7"
-	"github.com/docker/spdystream 6480d4af844c"
-	"github.com/emicklei/go-restful v2.11.1"
-	"github.com/evanphx/json-patch v4.5.0"
-	"github.com/exponent-io/jsonpath d6023ce2651d"
-	"github.com/garyburd/redigo v1.6.0"
-	"github.com/ghodss/yaml v1.0.0"
-	"github.com/go-openapi/jsonpointer v0.19.3"
-	"github.com/go-openapi/jsonreference v0.19.3"
-	"github.com/go-openapi/spec v0.19.4"
-	"github.com/go-openapi/swag v0.19.5"
-	"github.com/gobwas/glob v0.2.3"
-	"github.com/gofrs/flock v0.7.1"
-	"github.com/gofrs/uuid v3.2.0"
-	"github.com/gogo/protobuf v1.3.1"
-	"github.com/golang/protobuf v1.3.2"
-	"github.com/google/btree v1.0.0"
-	"github.com/google/go-cmp v0.3.1"
-	"github.com/google/gofuzz v1.0.0"
-	"github.com/google/uuid v1.1.1"
-	"github.com/googleapis/gnostic v0.3.1"
-	"github.com/gophercloud/gophercloud v0.1.0"
-	"github.com/gorilla/handlers v1.4.0"
-	"github.com/gorilla/mux v1.7.0"
-	"github.com/gosuri/uitable v0.0.1"
-	"github.com/gregjones/httpcache c63ab54fda8f"
-	"github.com/hashicorp/golang-lru v0.5.3"
-	"github.com/huandu/xstrings v1.2.0"
-	"github.com/imdario/mergo v0.3.8"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/json-iterator/go v1.1.7"
-	"github.com/kardianos/osext ae77be60afb1"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-	"github.com/mailru/easyjson v0.7.0"
-	"github.com/mattn/go-runewidth v0.0.4"
-	"github.com/mattn/go-shellwords v1.0.5"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/miekg/dns 0d29b283ac0f"
-	"github.com/mitchellh/copystructure v1.0.0"
-	"github.com/mitchellh/go-wordwrap v1.0.0"
-	"github.com/mitchellh/reflectwalk v1.0.0"
-	"github.com/modern-go/concurrent bacd9c7ef1dd"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/morikuni/aec 39771216ff4c"
-	"github.com/opencontainers/go-digest v1.0.0-rc1"
-	"github.com/opencontainers/image-spec v1.0.1"
-	"github.com/opencontainers/runc v0.1.1"
-	"github.com/peterbourgon/diskv v2.0.1"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/prometheus/client_golang v1.2.1"
-	"github.com/prometheus/client_model 14fe0d1b01d4"
-	"github.com/prometheus/common v0.7.0"
-	"github.com/prometheus/procfs v0.0.5"
-	"github.com/russross/blackfriday v1.5.2"
-	"github.com/sirupsen/logrus v1.4.2"
-	"github.com/spf13/cast v1.3.0"
-	"github.com/spf13/cobra v0.0.5"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/stretchr/testify v1.4.0"
-	"github.com/xeipuuv/gojsonpointer 4e3ac2762d5f"
-	"github.com/xeipuuv/gojsonreference bd5ef7bd5415"
-	"github.com/xeipuuv/gojsonschema v1.1.0"
-	"github.com/xenolf/lego a9d8cec0e656"
-	"github.com/yvasiyarov/go-metrics c25f46c4b940"
-	"github.com/yvasiyarov/gorelic v0.0.6"
-	"github.com/yvasiyarov/newrelic_platform_go b21fdbd4370f"
-	"golang.org/x/crypto f83a4685e152 github.com/golang/crypto"
-	"golang.org/x/net fe3aa8a45271 github.com/golang/net"
-	"golang.org/x/oauth2 0f29369cfe45 github.com/golang/oauth2"
-	"golang.org/x/sync 112230192c58 github.com/golang/sync"
-	"golang.org/x/sys 195ce5e7f934 github.com/golang/sys"
-	"golang.org/x/text v0.3.2 github.com/golang/text"
-	"golang.org/x/time 555d28b269f0 github.com/golang/time"
-	"google.golang.org/appengine v1.6.5 github.com/golang/appengine"
-	"google.golang.org/genproto 919d9bdd9fe6 github.com/google/go-genproto"
-	"google.golang.org/grpc v1.24.0 github.com/grpc/grpc-go"
-	"gopkg.in/inf.v0 v0.9.1 github.com/go-inf/inf"
-	"gopkg.in/square/go-jose.v1 v1.1.2 github.com/square/go-jose"
-	"gopkg.in/yaml.v2 v2.2.4 github.com/go-yaml/yaml"
-	"k8s.io/api 35e52d86657a github.com/kubernetes/api"
-	"k8s.io/apiextensions-apiserver 5357c4baaf65 github.com/kubernetes/apiextensions-apiserver"
-	"k8s.io/apimachinery a2eda9f80ab8 github.com/kubernetes/apimachinery"
-	"k8s.io/cli-runtime 74ad18325ed5 github.com/kubernetes/cli-runtime"
-	"k8s.io/client-go bec269661e48 github.com/kubernetes/client-go"
-	"k8s.io/klog v1.0.0 github.com/kubernetes/klog"
-	"k8s.io/kube-openapi 0270cf2f1c1d github.com/kubernetes/kube-openapi"
-	"k8s.io/kubectl 2ed914427d51 github.com/kubernetes/kubectl"
-	"k8s.io/utils 8d271d903fe4 github.com/kubernetes/utils"
-	"rsc.io/letsencrypt v0.0.1 github.com/rsc/letsencrypt"
-	"sigs.k8s.io/kustomize v2.0.3 github.com/kubernetes-sigs/kustomize"
-	"sigs.k8s.io/yaml v1.1.0 github.com/kubernetes-sigs/yaml"
-)
-
-MY_PV=${PV/_rc/-rc.}
-SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	$(go-module_vendor_uris)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip test"
-
-GIT_COMMIT=7c22ef9ce89e0ebeb7125ba2ebf7d421f3e82ffa
-
-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" || //' \
-		-e "/GOFLAGS    :=/d" \
-		Makefile || die
-}
-
-src_compile() {
-	emake LDFLAGS= build
-	bin/${PN} completion bash > ${PN}.bash || die
-	bin/${PN} completion zsh > ${PN}.zsh || die
-}
-
-src_install() {
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/app-admin/helm/helm-3.0.2.ebuild b/app-admin/helm/helm-3.0.2.ebuild
deleted file mode 100644
index d94e9eb08d80..000000000000
--- a/app-admin/helm/helm-3.0.2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module bash-completion-r1
-
-DESCRIPTION="Kubernetes Package Manager"
-HOMEPAGE="https://github.com/helm/helm https://helm.sh"
-
-EGO_VENDOR=(
-	"github.com/Nvveen/Gotty a8b993ba6abdb0e0c12b0125c603323a71c7790c github.com/ijc25/Gotty"
-	"cloud.google.com/go v0.38.0 github.com/GoogleCloudPlatform/gcloud-golang"
-	"github.com/Azure/go-ansiterm d6e3b3328b78"
-	"github.com/Azure/go-autorest v13.0.0"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/MakeNowJust/heredoc e9091a26100e"
-	"github.com/Masterminds/goutils v1.1.0"
-	"github.com/Masterminds/semver/v3 v3.0.3 github.com/Masterminds/semver"
-	"github.com/Masterminds/sprig/v3 v3.0.2 github.com/Masterminds/sprig"
-	"github.com/Masterminds/vcs v1.13.0"
-	"github.com/Microsoft/go-winio v0.4.12"
-	"github.com/Microsoft/hcsshim v0.8.6"
-	"github.com/PuerkitoBio/purell v1.1.1"
-	"github.com/PuerkitoBio/urlesc de5bf2ad4578"
-	"github.com/Shopify/logrus-bugsnag 577dee27f20d"
-	"github.com/asaskevich/govalidator f61b66f89f4a"
-	"github.com/beorn7/perks v1.0.1"
-	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1"
-	"github.com/bugsnag/bugsnag-go v1.5.0"
-	"github.com/bugsnag/panicwrap v1.2.0"
-	"github.com/cespare/xxhash/v2 v2.1.0 github.com/cespare/xxhash"
-	"github.com/containerd/containerd v1.3.0"
-	"github.com/containerd/continuity 004b46473808"
-	"github.com/cpuguy83/go-md2man v1.0.10"
-	"github.com/cyphar/filepath-securejoin v0.2.2"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/deislabs/oras v0.7.0"
-	"github.com/dgrijalva/jwt-go v3.2.0"
-	"github.com/docker/cli d88565df0c2d"
-	"github.com/docker/distribution v2.7.1"
-	"github.com/docker/docker 2cb26cfe9cbf"
-	"github.com/docker/docker-credential-helpers v0.6.1"
-	"github.com/docker/go-connections v0.4.0"
-	"github.com/docker/go-metrics b84716841b82"
-	"github.com/docker/go-units v0.4.0"
-	"github.com/docker/libtrust aabc10ec26b7"
-	"github.com/docker/spdystream 6480d4af844c"
-	"github.com/emicklei/go-restful v2.11.1"
-	"github.com/evanphx/json-patch v4.5.0"
-	"github.com/exponent-io/jsonpath d6023ce2651d"
-	"github.com/garyburd/redigo v1.6.0"
-	"github.com/ghodss/yaml v1.0.0"
-	"github.com/go-openapi/jsonpointer v0.19.3"
-	"github.com/go-openapi/jsonreference v0.19.3"
-	"github.com/go-openapi/spec v0.19.4"
-	"github.com/go-openapi/swag v0.19.5"
-	"github.com/gobwas/glob v0.2.3"
-	"github.com/gofrs/flock v0.7.1"
-	"github.com/gofrs/uuid v3.2.0"
-	"github.com/gogo/protobuf v1.3.1"
-	"github.com/golang/protobuf v1.3.2"
-	"github.com/google/btree v1.0.0"
-	"github.com/google/go-cmp v0.3.1"
-	"github.com/google/gofuzz v1.0.0"
-	"github.com/google/uuid v1.1.1"
-	"github.com/googleapis/gnostic v0.3.1"
-	"github.com/gophercloud/gophercloud v0.1.0"
-	"github.com/gorilla/handlers v1.4.0"
-	"github.com/gorilla/mux v1.7.0"
-	"github.com/gosuri/uitable v0.0.1"
-	"github.com/gregjones/httpcache c63ab54fda8f"
-	"github.com/hashicorp/golang-lru v0.5.3"
-	"github.com/huandu/xstrings v1.2.0"
-	"github.com/imdario/mergo v0.3.8"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/json-iterator/go v1.1.7"
-	"github.com/kardianos/osext ae77be60afb1"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-	"github.com/mailru/easyjson v0.7.0"
-	"github.com/mattn/go-runewidth v0.0.4"
-	"github.com/mattn/go-shellwords v1.0.5"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/miekg/dns 0d29b283ac0f"
-	"github.com/mitchellh/copystructure v1.0.0"
-	"github.com/mitchellh/go-wordwrap v1.0.0"
-	"github.com/mitchellh/reflectwalk v1.0.0"
-	"github.com/modern-go/concurrent bacd9c7ef1dd"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/morikuni/aec 39771216ff4c"
-	"github.com/opencontainers/go-digest v1.0.0-rc1"
-	"github.com/opencontainers/image-spec v1.0.1"
-	"github.com/opencontainers/runc v0.1.1"
-	"github.com/peterbourgon/diskv v2.0.1"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/prometheus/client_golang v1.2.1"
-	"github.com/prometheus/client_model 14fe0d1b01d4"
-	"github.com/prometheus/common v0.7.0"
-	"github.com/prometheus/procfs v0.0.5"
-	"github.com/russross/blackfriday v1.5.2"
-	"github.com/sirupsen/logrus v1.4.2"
-	"github.com/spf13/cast v1.3.0"
-	"github.com/spf13/cobra v0.0.5"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/stretchr/testify v1.4.0"
-	"github.com/xeipuuv/gojsonpointer 4e3ac2762d5f"
-	"github.com/xeipuuv/gojsonreference bd5ef7bd5415"
-	"github.com/xeipuuv/gojsonschema v1.1.0"
-	"github.com/xenolf/lego a9d8cec0e656"
-	"github.com/yvasiyarov/go-metrics c25f46c4b940"
-	"github.com/yvasiyarov/gorelic v0.0.6"
-	"github.com/yvasiyarov/newrelic_platform_go b21fdbd4370f"
-	"golang.org/x/crypto f83a4685e152 github.com/golang/crypto"
-	"golang.org/x/net fe3aa8a45271 github.com/golang/net"
-	"golang.org/x/oauth2 0f29369cfe45 github.com/golang/oauth2"
-	"golang.org/x/sync 112230192c58 github.com/golang/sync"
-	"golang.org/x/sys 195ce5e7f934 github.com/golang/sys"
-	"golang.org/x/text v0.3.2 github.com/golang/text"
-	"golang.org/x/time 555d28b269f0 github.com/golang/time"
-	"google.golang.org/appengine v1.6.5 github.com/golang/appengine"
-	"google.golang.org/genproto 919d9bdd9fe6 github.com/google/go-genproto"
-	"google.golang.org/grpc v1.24.0 github.com/grpc/grpc-go"
-	"gopkg.in/inf.v0 v0.9.1 github.com/go-inf/inf"
-	"gopkg.in/square/go-jose.v1 v1.1.2 github.com/square/go-jose"
-	"gopkg.in/yaml.v2 v2.2.4 github.com/go-yaml/yaml"
-	"k8s.io/api 35e52d86657a github.com/kubernetes/api"
-	"k8s.io/apiextensions-apiserver 5357c4baaf65 github.com/kubernetes/apiextensions-apiserver"
-	"k8s.io/apimachinery a2eda9f80ab8 github.com/kubernetes/apimachinery"
-	"k8s.io/cli-runtime 74ad18325ed5 github.com/kubernetes/cli-runtime"
-	"k8s.io/client-go bec269661e48 github.com/kubernetes/client-go"
-	"k8s.io/klog v1.0.0 github.com/kubernetes/klog"
-	"k8s.io/kube-openapi 0270cf2f1c1d github.com/kubernetes/kube-openapi"
-	"k8s.io/kubectl 2ed914427d51 github.com/kubernetes/kubectl"
-	"k8s.io/utils 8d271d903fe4 github.com/kubernetes/utils"
-	"rsc.io/letsencrypt v0.0.1 github.com/rsc/letsencrypt"
-	"sigs.k8s.io/kustomize v2.0.3 github.com/kubernetes-sigs/kustomize"
-	"sigs.k8s.io/yaml v1.1.0 github.com/kubernetes-sigs/yaml"
-)
-
-MY_PV=${PV/_rc/-rc.}
-SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	$(go-module_vendor_uris)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip test"
-
-GIT_COMMIT=19e47ee3283ae98139d98460de796c1be1e3975f
-
-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" || //' \
-		-e "/GOFLAGS    :=/d" \
-		Makefile || die
-}
-
-src_compile() {
-	emake LDFLAGS= build
-	bin/${PN} completion bash > ${PN}.bash || die
-	bin/${PN} completion zsh > ${PN}.zsh || die
-}
-
-src_install() {
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/app-admin/helm/helm-3.1.1.ebuild b/app-admin/helm/helm-3.1.3.ebuild
index 21fe413bbc9a..f8a6d1204f88 100644
--- a/app-admin/helm/helm-3.1.1.ebuild
+++ b/app-admin/helm/helm-3.1.3.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit go-module bash-completion-r1
-GIT_COMMIT=afe70585407b420d0097d07b21c47dc511525ac8
+inherit bash-completion-r1 go-module
+GIT_COMMIT=0a9a9a88e8afd6e77337a3e2ad744756e191429a
 MY_PV=${PV/_rc/-rc.}
 
 DESCRIPTION="Kubernetes Package Manager"
diff --git a/app-admin/helm/helm-3.2.0.ebuild b/app-admin/helm/helm-3.2.0.ebuild
new file mode 100644
index 000000000000..be47b68be553
--- /dev/null
+++ b/app-admin/helm/helm-3.2.0.ebuild
@@ -0,0 +1,835 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+GIT_COMMIT=e11b7ce3b12db2941e90399e874513fbd24bcb71
+MY_PV=${PV/_rc/-rc.}
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/helm/helm https://helm.sh"
+
+EGO_SUM=(
+	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-autorest v13.3.2+incompatible"
+	"github.com/Azure/go-autorest v13.3.2+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/logger v0.1.0"
+	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/tracing v0.5.0"
+	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/DATA-DOG/go-sqlmock v1.4.1"
+	"github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod"
+	"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd"
+	"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod"
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/semver/v3 v3.0.3"
+	"github.com/Masterminds/semver/v3 v3.0.3/go.mod"
+	"github.com/Masterminds/semver/v3 v3.1.0"
+	"github.com/Masterminds/semver/v3 v3.1.0/go.mod"
+	"github.com/Masterminds/sprig/v3 v3.1.0"
+	"github.com/Masterminds/sprig/v3 v3.1.0/go.mod"
+	"github.com/Masterminds/squirrel v1.2.0"
+	"github.com/Masterminds/squirrel v1.2.0/go.mod"
+	"github.com/Masterminds/vcs v1.13.1"
+	"github.com/Masterminds/vcs v1.13.1/go.mod"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.7"
+	"github.com/Microsoft/hcsshim v0.8.7/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+	"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d"
+	"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
+	"github.com/agnivade/levenshtein v1.0.1/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+	"github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496"
+	"github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.11/go.mod"
+	"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bitly/go-simplejson v0.5.0"
+	"github.com/bitly/go-simplejson v0.5.0/go.mod"
+	"github.com/blang/semver v3.1.0+incompatible/go.mod"
+	"github.com/blang/semver v3.5.0+incompatible/go.mod"
+	"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869"
+	"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod"
+	"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd"
+	"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
+	"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b"
+	"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
+	"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0"
+	"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0/go.mod"
+	"github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+	"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
+	"github.com/containerd/containerd v1.3.2"
+	"github.com/containerd/containerd v1.3.2/go.mod"
+	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41"
+	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod"
+	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+	"github.com/coreos/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/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.7/go.mod"
+	"github.com/cyphar/filepath-securejoin v0.2.2"
+	"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod"
+	"github.com/deislabs/oras v0.8.1"
+	"github.com/deislabs/oras v0.8.1/go.mod"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod"
+	"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
+	"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492"
+	"github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod"
+	"github.com/docker/distribution v0.0.0-20191216044856-a8371794149d"
+	"github.com/docker/distribution v0.0.0-20191216044856-a8371794149d/go.mod"
+	"github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod"
+	"github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce"
+	"github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce/go.mod"
+	"github.com/docker/docker-credential-helpers v0.6.3"
+	"github.com/docker/docker-credential-helpers v0.6.3/go.mod"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-connections v0.4.0/go.mod"
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916"
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod"
+	"github.com/docker/go-units v0.3.3/go.mod"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1"
+	"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e"
+	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/emicklei/go-restful v2.9.5+incompatible"
+	"github.com/emicklei/go-restful v2.9.5+incompatible/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/evanphx/json-patch v4.5.0+incompatible"
+	"github.com/evanphx/json-patch v4.5.0+incompatible/go.mod"
+	"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d"
+	"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod"
+	"github.com/fatih/camelcase v1.0.0/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7"
+	"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
+	"github.com/go-ini/ini v1.25.4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
+	"github.com/go-openapi/analysis v0.17.0/go.mod"
+	"github.com/go-openapi/analysis v0.18.0/go.mod"
+	"github.com/go-openapi/analysis v0.19.2/go.mod"
+	"github.com/go-openapi/analysis v0.19.5/go.mod"
+	"github.com/go-openapi/errors v0.17.0/go.mod"
+	"github.com/go-openapi/errors v0.18.0/go.mod"
+	"github.com/go-openapi/errors v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.3"
+	"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/jsonreference v0.17.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.18.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.3"
+	"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+	"github.com/go-openapi/loads v0.17.0/go.mod"
+	"github.com/go-openapi/loads v0.18.0/go.mod"
+	"github.com/go-openapi/loads v0.19.0/go.mod"
+	"github.com/go-openapi/loads v0.19.2/go.mod"
+	"github.com/go-openapi/loads v0.19.4/go.mod"
+	"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
+	"github.com/go-openapi/runtime v0.19.0/go.mod"
+	"github.com/go-openapi/runtime v0.19.4/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/spec v0.17.0/go.mod"
+	"github.com/go-openapi/spec v0.18.0/go.mod"
+	"github.com/go-openapi/spec v0.19.2/go.mod"
+	"github.com/go-openapi/spec v0.19.3"
+	"github.com/go-openapi/spec v0.19.3/go.mod"
+	"github.com/go-openapi/strfmt v0.17.0/go.mod"
+	"github.com/go-openapi/strfmt v0.18.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.3/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-openapi/swag v0.17.0/go.mod"
+	"github.com/go-openapi/swag v0.18.0/go.mod"
+	"github.com/go-openapi/swag v0.19.2/go.mod"
+	"github.com/go-openapi/swag v0.19.5"
+	"github.com/go-openapi/swag v0.19.5/go.mod"
+	"github.com/go-openapi/validate v0.18.0/go.mod"
+	"github.com/go-openapi/validate v0.19.2/go.mod"
+	"github.com/go-openapi/validate v0.19.5/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.1"
+	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobuffalo/envy v1.7.0/go.mod"
+	"github.com/gobuffalo/envy v1.7.1"
+	"github.com/gobuffalo/envy v1.7.1/go.mod"
+	"github.com/gobuffalo/logger v1.0.1"
+	"github.com/gobuffalo/logger v1.0.1/go.mod"
+	"github.com/gobuffalo/packd v0.3.0"
+	"github.com/gobuffalo/packd v0.3.0/go.mod"
+	"github.com/gobuffalo/packr/v2 v2.7.1"
+	"github.com/gobuffalo/packr/v2 v2.7.1/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
+	"github.com/gofrs/flock v0.7.1"
+	"github.com/gofrs/flock v0.7.1/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef"
+	"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/go.mod"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod"
+	"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod"
+	"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.4.0"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.1.0"
+	"github.com/google/gofuzz v1.1.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/googleapis/gnostic v0.1.0"
+	"github.com/googleapis/gnostic v0.1.0/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33"
+	"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
+	"github.com/gorilla/mux v1.7.2"
+	"github.com/gorilla/mux v1.7.2/go.mod"
+	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gosuri/uitable v0.0.4"
+	"github.com/gosuri/uitable v0.0.4/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/huandu/xstrings v1.2.0"
+	"github.com/huandu/xstrings v1.2.0/go.mod"
+	"github.com/huandu/xstrings v1.3.1"
+	"github.com/huandu/xstrings v1.3.1/go.mod"
+	"github.com/imdario/mergo v0.3.5/go.mod"
+	"github.com/imdario/mergo v0.3.7"
+	"github.com/imdario/mergo v0.3.7/go.mod"
+	"github.com/imdario/mergo v0.3.8"
+	"github.com/imdario/mergo v0.3.8/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod"
+	"github.com/jmoiron/sqlx v1.2.0"
+	"github.com/jmoiron/sqlx v1.2.0/go.mod"
+	"github.com/joho/godotenv v1.3.0"
+	"github.com/joho/godotenv v1.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.8"
+	"github.com/json-iterator/go v1.1.8/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/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"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.5/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lann/builder v0.0.0-20180802200727-47ae307949d0"
+	"github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod"
+	"github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0"
+	"github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod"
+	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/lib/pq v1.2.0/go.mod"
+	"github.com/lib/pq v1.3.0"
+	"github.com/lib/pq v1.3.0/go.mod"
+	"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de"
+	"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod"
+	"github.com/lithammer/dedent v1.1.0/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+	"github.com/mailru/easyjson v0.7.0"
+	"github.com/mailru/easyjson v0.7.0/go.mod"
+	"github.com/marstr/guid v1.1.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-shellwords v1.0.10"
+	"github.com/mattn/go-shellwords v1.0.10/go.mod"
+	"github.com/mattn/go-sqlite3 v1.9.0/go.mod"
+	"github.com/mattn/go-sqlite3 v1.12.0"
+	"github.com/mattn/go-sqlite3 v1.12.0/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f"
+	"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/morikuni/aec v1.0.0"
+	"github.com/morikuni/aec v1.0.0/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/ncw/swift v1.0.47/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.2/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.11.0"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.7.0"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1"
+	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+	"github.com/opencontainers/image-spec v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+	"github.com/opencontainers/runc v0.1.1"
+	"github.com/opencontainers/runc v0.1.1/go.mod"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+	"github.com/pborman/uuid v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2"
+	"github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod"
+	"github.com/pkg/errors v0.8.0/go.mod"
+	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
+	"github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3/go.mod"
+	"github.com/prometheus/client_golang v1.0.0"
+	"github.com/prometheus/client_golang v1.0.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.0/go.mod"
+	"github.com/prometheus/common v0.4.1"
+	"github.com/prometheus/common v0.4.1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.5"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.1.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.2/go.mod"
+	"github.com/rogpeppe/go-internal v1.4.0"
+	"github.com/rogpeppe/go-internal v1.4.0/go.mod"
+	"github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3"
+	"github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cast v1.3.1"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/cobra v0.0.5"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/cobra v1.0.0"
+	"github.com/spf13/cobra v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/spf13/viper v1.4.0/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.0/go.mod"
+	"github.com/stretchr/testify v1.2.2/go.mod"
+	"github.com/stretchr/testify v1.3.0/go.mod"
+	"github.com/stretchr/testify v1.4.0"
+	"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/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+	"github.com/tidwall/pretty v1.0.0/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/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/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/vektah/gqlparser v1.1.2/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+	"github.com/xeipuuv/gojsonschema v1.1.0"
+	"github.com/xeipuuv/gojsonschema v1.1.0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43"
+	"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
+	"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50"
+	"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
+	"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f"
+	"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
+	"github.com/ziutek/mymysql v1.5.4"
+	"github.com/ziutek/mymysql v1.5.4/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+	"go.mongodb.org/mongo-driver v1.0.3/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.1/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
+	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
+	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod"
+	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
+	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod"
+	"golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod"
+	"golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod"
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d"
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+	"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904"
+	"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod"
+	"golang.org/x/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/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod"
+	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+	"golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-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-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
+	"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
+	"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
+	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7"
+	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod"
+	"golang.org/x/tools v0.0.0-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-20190328211700-ab21143f2384/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod"
+	"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
+	"golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod"
+	"golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/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-20160322025152-9bf6e6e569ff/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.5"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.0/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.23.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/gorp.v1 v1.7.2"
+	"gopkg.in/gorp.v1 v1.7.2/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+	"gopkg.in/yaml.v2 v2.2.1/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.4/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"
+	"gotest.tools v2.2.0+incompatible"
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"k8s.io/api v0.18.0"
+	"k8s.io/api v0.18.0/go.mod"
+	"k8s.io/apiextensions-apiserver v0.18.0"
+	"k8s.io/apiextensions-apiserver v0.18.0/go.mod"
+	"k8s.io/apimachinery v0.18.0"
+	"k8s.io/apimachinery v0.18.0/go.mod"
+	"k8s.io/apiserver v0.18.0/go.mod"
+	"k8s.io/cli-runtime v0.18.0"
+	"k8s.io/cli-runtime v0.18.0/go.mod"
+	"k8s.io/client-go v0.18.0"
+	"k8s.io/client-go v0.18.0/go.mod"
+	"k8s.io/code-generator v0.18.0/go.mod"
+	"k8s.io/component-base v0.18.0"
+	"k8s.io/component-base v0.18.0/go.mod"
+	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
+	"k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod"
+	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
+	"k8s.io/klog v0.3.0/go.mod"
+	"k8s.io/klog v1.0.0"
+	"k8s.io/klog v1.0.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c"
+	"k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod"
+	"k8s.io/kubectl v0.18.0"
+	"k8s.io/kubectl v0.18.0/go.mod"
+	"k8s.io/kubernetes v1.13.0/go.mod"
+	"k8s.io/metrics v0.18.0/go.mod"
+	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89"
+	"k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod"
+	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod"
+	"sigs.k8s.io/kustomize v2.0.3+incompatible"
+	"sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0"
+	"sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod"
+	"sigs.k8s.io/yaml v1.1.0"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.2.0"
+	"sigs.k8s.io/yaml v1.2.0/go.mod"
+	"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# Makefile:
+	# - Remove GOFLAGS entirely
+	# - Remove -w & -s from LDFLAGS
+	# - Git spec will be passed later
+	sed -r -i \
+		-e "/^GOFLAGS[[:space:]]+:?=/d" \
+		-e '/^LDFLAGS[[:space:]]+:?=/{s,-[ws],,g;s,:=,=,g}' \
+		Makefile || die
+}
+
+src_compile() {
+	# Do not pass LDFLAGS directly here, as the upstream Makefile adds some
+	# data to it via +=
+	emake \
+		GOFLAGS="${GOFLAGS}" \
+		GIT_SHA=${GIT_COMMIT} \
+		GIT_COMMIT=${GIT_COMMIT:0:7} \
+		GIT_TAG=v${PV} \
+		GIT_DIRTY=clean \
+		build
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN}
+	dodoc README.md
+}
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 412beb639f5d..325ddada66d3 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,5 +1,7 @@
 AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45dadb5824f369a454a1126cb61293d55f86f9f01fb659932729dbc205a522aab32343dd87b74662927d60edc50750af602a959cc9 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae
 AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb
 DIST KeePass-2.44-Source.zip 5182922 BLAKE2B 092d1b982d748ea1b13f26fe5423a491855cb491c80cae7632429d488f80fd730df5d2f1613bab528d55a3aadcf0cb4f4055a637d2b14b68a468e4baf9ab1837 SHA512 ef2ca69e40c0787b63fc30a2b222dd77fd9f0addf8593511dcd0a47580cc8de5e0900c7d4e6f77c0e5a49d1728286cf1b5856cdc65ef175e4acfdd1ffc54b55e
+DIST KeePass-2.45-Source.zip 5011684 BLAKE2B cf7fafb2666f2e0005533e441f1855006aa64aca69b4829fa66117da88f92e6aa65d58b303a099221e796a500bc5abab5c3d0654e6fa53c3fe6f36d3cb18e381 SHA512 3f9b14e57fce047f8d8ae7c289fffd954545c5638fa20392e7864301073452a4353f487832730fb600e1729b1333360c1bce7e66fc8629788e666418a2afbf9a
 EBUILD keepass-2.44.ebuild 3228 BLAKE2B 58d0e7a54ee7aace849c916e08b45bd6e1e5e838982f54efaccecea3279eee65aefcbbe6a3291828bbb769f938b09ea5a644b4a85667f2420bda90a2743e1c7d SHA512 ea1e5e8addbf66756fe812bddc29d4c8da359bb68f03ba1322f517a36d6839e4e7972628676108efb23ffcec64a42266f848854c55a79a8f7a971a2ac904633c
+EBUILD keepass-2.45.ebuild 3230 BLAKE2B 9e3c55cb5220c18d7044de21d21cd96a1ad5f145ecf627d1db444ed5a187bc97aad27332c1e7a841c8153ae86eec2dc50f48a00567e681714b3354fc81b1c965 SHA512 b1c53ec9a3f97156823bb6c9265f0fa89b7c000a943557dfe3ba5a19eeec36657d537340692eeaccbf61b3af8508785b78cc0615595775b1e9074a285d53605a
 MISC metadata.xml 651 BLAKE2B 058fa70fb6ce35fb52464a84cf506ad117343a1376a40b003c4f55bdf94369136276d8bbb67f30490eb73cba4df6b03d78e8c2a65cf8141dd6cf64654c9b6358 SHA512 6251f546e631decbc7692ab00900d722031ce638f3d878771a2bcfebedba8e1fee9b3e54dfd4c3ae3c711006099fc5a772555ea7cc018d012de164755ba8b52c
diff --git a/app-admin/keepass/keepass-2.45.ebuild b/app-admin/keepass/keepass-2.45.ebuild
new file mode 100644
index 000000000000..db354f613661
--- /dev/null
+++ b/app-admin/keepass/keepass-2.45.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="https://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+# bug #687052
+# file generated by mono --aot where *FLAGS don't make sense
+QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so"
+
+src_prepare() {
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+	# This XSL file will not be upstreamed since the KeePass creator said that
+	# including this patch would break the Portable USB version of KeePass
+	# (which keeps/looks for xsl files in its own folder)
+	default
+
+	# Switch into build dir so the mono prepration script works correctly
+	pushd Build || die
+	source PrepMonoDev.sh || die
+	popd || die
+}
+
+src_compile() {
+	export MONO_REGISTRY_PATH=/dev/null # bug 659808
+
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto "/usr/share/${PN}/XSL"
+	doins Ext/XSL/*
+
+	insinto "/usr/$(get_libdir)/${PN}"
+	exeinto "/usr/$(get_libdir)/${PN}"
+
+	doins Ext/KeePass.exe.config
+
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}/${PN}.xml"
+
+	# sed, because patching this really sucks
+	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype/autofill)"
+	fi
+
+	elog "Some systems may experience issues with copy and paste operations."
+	elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 25eecbc6904c..3b4ce15f0473 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -2,6 +2,6 @@ AUX keepassxc-2.5.2-ccache_switch.patch 2274 BLAKE2B 640bd0bdbd56aa93a3f7d70b482
 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
 EBUILD keepassxc-2.5.3.ebuild 2183 BLAKE2B 68019fba5936cecc2f48e3c3ea5fb8f24e3385d5cc80f36fde0d7bea796d01c823d338c8d08600cd291cea880c57e78d3b7d20bfc32021598a05c32cb3a212e6 SHA512 b8c4efb3e662085c87357e65355a9b1957bdf06c265668d84cf071ed024f1f4d9f8083cf62f1f8882ef7ce5d44411764895d78e20c2f32c0ab44929f2662c80b
-EBUILD keepassxc-2.5.4.ebuild 2185 BLAKE2B f28738a5ca4db3750a375f40760add93b90f4291b3d58cd9b6efdd025972ce391392a25cf66dc28fa3e45329f01f2b52ef22e3a6a2f14d43b24b78e1c3dc3717 SHA512 5dfc6c8e7cb50e551d94e7f0a5c60cf27f933cf1d0a3cbc7adb05f1c48af18169ecf3444738902cd5b8b32025a024bb9b8107aa3eade93a8fd861b2accf111e6
+EBUILD keepassxc-2.5.4.ebuild 2192 BLAKE2B a5b7f02b21eb359363506717e91e746175a9c712f95e136bc121f2af69e21ccb27112d9c918032ca15203fc5bc905b79e7461833bd068e9fc79f8f1c8b71383f SHA512 73257b47cc6db0603dac4c5323ab521744af91034143b1d980aeca981024070220a67db0f2024728b8a80da2afec49158f6b20be45212fd3c024b0c1dfbdebef
 EBUILD keepassxc-9999.ebuild 2125 BLAKE2B de716370e41031cc3e9f373273a9360ad91ececa2272a0bc569edb771b54b6fedae04f25cdaa49c0441ee791b6d12c8c0b8e48a9d3a0c57e33c856381e9bcf8d SHA512 58882ac9cad8670f2f95ef0a41d238899eae9a17c0e145912e89f82799570f8be9b55bbcbd14efd3befe22317f3a27162c751c3ba37e360396fa329fb017dd70
 MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e
diff --git a/app-admin/keepassxc/keepassxc-2.5.4.ebuild b/app-admin/keepassxc/keepassxc-2.5.4.ebuild
index c3a08042f8f1..0930d877e6c9 100644
--- a/app-admin/keepassxc/keepassxc-2.5.4.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.5.4.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
diff --git a/app-admin/kpcli/Manifest b/app-admin/kpcli/Manifest
index 20623a519bf0..991c68fd3def 100644
--- a/app-admin/kpcli/Manifest
+++ b/app-admin/kpcli/Manifest
@@ -1,3 +1,5 @@
 DIST kpcli-3.3.pl 199249 BLAKE2B 6db8dff530c709600ac90ca77c8171bedb98dc0ff3822963cdd177000a0b23c46387613639205b85dfdcb710b5a9804fc5b2e205c1937952e8439f5bebae4900 SHA512 5a837891a29dc65f0900015124fe3fdd1b7b9878ed2094d7c299c24590feee8e704212bcabf45c63064f97deca1dd2da96aa80c5be4305692f181db45b7e241a
+DIST kpcli-3.4.pl 211243 BLAKE2B 4880d832554de1956e033bba2e2021b9dc0b77202585663b0f4ad2acca520bcb430ac974bbea00c21aa37c2c8e8fa8c5cf2e8131542c20ecc3c6b0ac6dd85d9a SHA512 1ec9ea46f769a6891700565a51c592fd4809a0f3bc1d2088ca694233b276652506b470328b8b840cd0876b945faad27a16a5685d8655868cd20760f24619ffaf
 EBUILD kpcli-3.3.ebuild 928 BLAKE2B 043d69d425d680d84d1f7029edc32bc577b1583b85981f47b41c00493baaab8382fa3ad4b745546e596baea733fca61510da88db51bacc5ef75b62de90e1b904 SHA512 5038f0521e53f7483f25716373d6ee608874dab26ae37a7e3061e1bbb7201033b4699e80eff9e95167e4cf90577414c89771b0aedceac781662b003778062503
+EBUILD kpcli-3.4.ebuild 959 BLAKE2B ffa08a521d01ffb15484f2aa041c4ab2991d30998563587dbc45c61fea232c86ad9f2641c24cf4091207acc5f6ecc41053375f1f16e677a834328ceba8b68b6b SHA512 8b827612cde96b35dd458f759aa325148d82b1b7ae4166b5b139ca18e24f32ae602a0b4664e46fe7dc9c4dd38bfb2e91ae4771e57f29c2384b1601e0b58cd3f4
 MISC metadata.xml 476 BLAKE2B 49c33b8c9713bf01f667d60e72900e99139ff425e1c10e74736bdeff840e66d7a507aa079ca334639abb9e8ef1899aa3ed37114cbf196f9309124d54ea13b774 SHA512 35280ba9f2eafc0e28b098ce0af3ec9fec17fbb956068b873516c0a28539c4d05cfecfdf71477a9fb78cf3238ad7363dc128ad149e91619485624959b780805b
diff --git a/app-admin/kpcli/kpcli-3.4.ebuild b/app-admin/kpcli/kpcli-3.4.ebuild
new file mode 100644
index 000000000000..f16419aa05a8
--- /dev/null
+++ b/app-admin/kpcli/kpcli-3.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="A command line interface to KeePass database files"
+HOMEPAGE="http://kpcli.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/project/kpcli/${P}.pl"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Clone
+	dev-perl/Crypt-Rijndael
+	dev-perl/TermReadKey
+	dev-perl/Sort-Naturally
+	dev-perl/Term-ShellUI
+	dev-perl/File-KeePass
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Digest-MD5
+	virtual/perl-Digest-SHA
+	virtual/perl-Data-Dumper
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Time-Piece
+	virtual/perl-Carp"
+
+src_unpack() {
+	mkdir "${S}" || die
+	cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin kpcli
+}
+
+pkg_postinst() {
+	optfeature "X clipboard support" "dev-perl/Capture-Tiny dev-perl/Clipboard"
+}
diff --git a/app-admin/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
index 9786d6f29309..a1ec31a1f17c 100644
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@@ -1,8 +1,9 @@
+AUX lastpass-cli-1.3.3-gcc10-fix.patch 2855 BLAKE2B 9d20c68d2d1349d557fef3d147e799cca1db7181e767011fcba73d2cb2639f2fa0e6a1f321561f0cffa39dfa365080984c923f10eff8fb9a3eeab19ca11418a3 SHA512 53d8d6842d21fad888597750d4ebef4de351621751befe791a09921210ddae13a2fbeb21e17aca759e60c3c6172ae786fbea42d8e9dbb379386033fe2b3a5bfa
 DIST lastpass-cli-1.3.1.tar.gz 114843 BLAKE2B 7983d4090092ef3443d8c502d157934fa2384426f0be22c796795cdf664be3ba396f64daa81cdf896cb6901d4063f93e54b62cda4349b14fa4d312a21c5bb76d SHA512 092d28dc459719e662fbb2c5e92e8cc75be108aa9d7b62569ee44cb34dd9588e78151fdc5ad114c30e8de21c0b8803edc41db9295548c7cbfe6e537c9a52aad2
 DIST lastpass-cli-1.3.2.tar.gz 116399 BLAKE2B d00ab9443935b90eab7337702a52e0ed2e7f2e67c20ed6764f72e25ae123e0420013aa9220ece8a57b7e3bbe2f243ff56bd054fecdbd064f086536bc5eaf0d88 SHA512 b293e86d70988aa5860a94fdc2bc65341bb253d2423c8f745730419400adc91ff860017d35657d283458c477c2385ff2532b8aefa752f886b207da8d10bf9018
 DIST lastpass-cli-1.3.3.tar.gz 116434 BLAKE2B 341f99a7a5edd157c271a0989a004ace8300f2121230b4c0b7c23152643ebc0e3f60717a057b4e6acc802fe641ccd84c770bfcb3d89c505713aea23692d1542b SHA512 9b9274cae1fe4045b7df4402170c522ab5765929739e76141b35a75ce3c8af824acd881e194face45e8721d6ce778bde97ff1a1ac23515de0c6dba28d61a8c7e
 DIST lastpass-cli-man-1.3.1.tar.xz 5700 BLAKE2B 736ab71ad55cfcb657c727f3dc9dc15775dab1a0232d1ffc51b8794e49911531c96a841b4a5ac0b31f0516cd7aa54027ac7d0eb096816730cdfd192c04d99449 SHA512 e60807683ecd681b3937ef447d3e6a487d25418fe99f51ba99e54bf643c5254dd18427a03e7f035198ef34ff578bbb6116baf04eb554f54d85e7d059b6bfed7e
 EBUILD lastpass-cli-1.3.1-r1.ebuild 1415 BLAKE2B c3a538042b71247b6b8d3c54219f9ba52b0d86c43fe8ab8a25f43b74d729dd6db4347647177aab2589ffa3f8dfb6cdc64aa8b3c25223144d9507fb53fac03102 SHA512 c17c165c9816c02b54d3b7182d70f43ec0f65ee0130ef6060d8e0fcb1140d4bce6ebf8e9253eafa251d569064fa9699a892cedf1bd6d929380d88d948fadc734
 EBUILD lastpass-cli-1.3.2.ebuild 1637 BLAKE2B 0f2ea3383ffa4f3a0ecb6d0ec7bf7d5d3846616f66dacb1782adda191c35d206289e0abdf86d5201c09dec82d1b42c6e3b5526531b075e57956a470e235f6414 SHA512 888df5219a4702fa9829d6792af7adb82ead09ad479fc51986da11688b3552d77a50e7a20bfea448a4e73f93dc1ccb3ba30937a26555929ab3f4d7a7ecba32e7
-EBUILD lastpass-cli-1.3.3.ebuild 1637 BLAKE2B 0f2ea3383ffa4f3a0ecb6d0ec7bf7d5d3846616f66dacb1782adda191c35d206289e0abdf86d5201c09dec82d1b42c6e3b5526531b075e57956a470e235f6414 SHA512 888df5219a4702fa9829d6792af7adb82ead09ad479fc51986da11688b3552d77a50e7a20bfea448a4e73f93dc1ccb3ba30937a26555929ab3f4d7a7ecba32e7
+EBUILD lastpass-cli-1.3.3.ebuild 1695 BLAKE2B 9f58fb5d95d82dd7ce549c88093da7a76c8a52a4770110f24b24920c82daaf1b0a5e629982fc2d452769902bb4a1475be636810ce8092a7f3694e90a50945c7c SHA512 6839ceef84878313f12663897878c0bb6505aefb0869a7504f68f061eabcdc1e753ce90d09cc414795014bf53b76e3568676d475ccd6534c3613c73c94565d0c
 MISC metadata.xml 643 BLAKE2B a5a01a1dbcc257692bd14369470d69eef33a00a9910ed5006c62f1f5fec2a9a261dd6ece42bcaa68345a21f6e26958f965f90459501324b0e7a168f3fcc4f7f9 SHA512 6b1a7f6566687384d328260576dad306dd07add06001b3746b4f37f05ff91b6ee72e1e2ecfd35463a5b78b4ba8dd1a7757503bdf992372dbd474967e4bf0e9f3
diff --git a/app-admin/lastpass-cli/files/lastpass-cli-1.3.3-gcc10-fix.patch b/app-admin/lastpass-cli/files/lastpass-cli-1.3.3-gcc10-fix.patch
new file mode 100644
index 000000000000..186d4a6a1a70
--- /dev/null
+++ b/app-admin/lastpass-cli/files/lastpass-cli-1.3.3-gcc10-fix.patch
@@ -0,0 +1,82 @@
+From 6b69a534863741734b550daf43b5d06c8d899b9a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Thu, 23 Jan 2020 00:25:50 +0100
+Subject: [PATCH] Mark global variable as extern
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC now defaults to -fno-common. As a result, global variable accesses
+are more efficient on various targets. In C, global variables with
+multiple tentative definitions now result in linker errors.
+
+Fix #532
+
+Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
+---
+ globals.c | 40 ++++++++++++++++++++++++++++++++++++++++
+ process.h |  4 ++--
+ 2 files changed, 42 insertions(+), 2 deletions(-)
+ create mode 100644 globals.c
+
+diff --git a/globals.c b/globals.c
+new file mode 100644
+index 0000000..59e9c30
+--- /dev/null
++++ b/globals.c
+@@ -0,0 +1,40 @@
++/*
++ *
++ * Copyright (C) 2014-2018 LastPass.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * In addition, as a special exception, the copyright holders give
++ * permission to link the code of portions of this program with the
++ * OpenSSL library under certain conditions as described in each
++ * individual source file, and distribute linked combinations
++ * including the two.
++ *
++ * You must obey the GNU General Public License in all respects
++ * for all of the code used other than OpenSSL.  If you modify
++ * file(s) with this exception, you may extend this exception to your
++ * version of the file(s), but you are not obligated to do so.  If you
++ * do not wish to do so, delete this exception statement from your
++ * version.  If you delete this exception statement from all source
++ * files in the program, then also delete it here.
++ *
++ * See LICENSE.OpenSSL for more details regarding this exception.
++ */
++
++#include "process.h"
++
++/* Globals */
++int ARGC;
++char **ARGV;
+diff --git a/process.h b/process.h
+index 58c2480..4cc2cf4 100644
+--- a/process.h
++++ b/process.h
+@@ -4,8 +4,8 @@
+ #include <stdbool.h>
+ #include <sys/types.h>
+ 
+-int ARGC;
+-char **ARGV;
++extern int ARGC;
++extern char **ARGV;
+ 
+ void process_set_name(const char *name);
+ void process_disable_ptrace(void);
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
index a8047a4f3661..fefda5aeb792 100644
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,6 +29,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-1.3.3-gcc10-fix.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index d462eadd28b2..23b37e18a0e9 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -9,4 +9,4 @@ DIST logrotate-3.16.0.tar.gz 221904 BLAKE2B 38bfde57e9e055b86d6f25f0dd7c49b5d358
 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
-MISC metadata.xml 1126 BLAKE2B 1655e4bbc549896f4faef7cab3c539a5dc2a9910c80eacc6ee5626d97f1b6a5df448a502f3899833afb1723ee42f0be01e025a5d23ea3af1bab2a0311f43760e SHA512 f895d0c5ed7b02c4b92af5596a160199b6d765564050dda45171ff6e81137c508da5a8ae5fece89f04b2355d0f1b41f839aac667e4a8d8119ff64f44f34c6084
+MISC metadata.xml 1197 BLAKE2B 57d74b7b0ec5dc17bc040c8f0db207b05a7c86722606f629b247747cf5f45a5db6e5acae25221d6b43450f1c1cc57e2308d9f045b606f6284dc7c9459a3b3ce1 SHA512 6a354d60895ced8d020a3c8df5cd0a7f294fe5d4d5dbb11c2698cfd3e666e3f8f4778262e5ce210c7e9ec31e6e6f50d0a98f6e3fa7fff8ef77078be8b4025e16
diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index 4d03c4b664a2..3c0571938ffd 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/metadata.xml
@@ -25,5 +25,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">logrotate/logrotate</remote-id>
+		<remote-id type="cpe">cpe:/a:logrotate_project:logrotate</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/logstalgia/Manifest b/app-admin/logstalgia/Manifest
index 8a2d9e756b6b..77fad2b17b7b 100644
--- a/app-admin/logstalgia/Manifest
+++ b/app-admin/logstalgia/Manifest
@@ -1,3 +1,3 @@
 DIST logstalgia-1.1.2.tar.gz 2330691 BLAKE2B 20fb549282dde860ef1db272c75360219ce4614838264a2ad7dbaa25cd3c8509f215d61ec88679165eda9619d8a3d83d9201796fa7691517ca822fa110f37d14 SHA512 e2bd41cbc6edabc1ff82d0da4ad6f749e0e6d44e5a23ea976c31d19339f56e5f693ba86b81ceee3c7590842df61d61fe69f1378711b8e7d1c30deff330cacb1e
-EBUILD logstalgia-1.1.2.ebuild 674 BLAKE2B cc9e01eeb3a80d0b7e8a60896e4341410cd99221e86f5d9bc72869c57c4eb5813b258c6ad7dc9bd8f9e9a589c3f0df943b34aab34c1c8b0e3c1e547a17071381 SHA512 aad07f7d2ccb0a5885103c866680d45c3a2aea7496581ffb8f1618fc710fda0214868b22c4addf562922987055218dca174e1df9c38a492e8a0cb0e1364b2682
+EBUILD logstalgia-1.1.2.ebuild 669 BLAKE2B f9df4fbdbb0999bfe677c632cc82f3b2ea87f4bde36fe432d53df27c41e7221093171f66917a072f56495b5ea27631d592be605b7d049e93fc99c7fc7c48f27e SHA512 59122eb20e054d9400097c919b8708f52d872dad015b70473d25ed0c14fefe5d037906eb2394b422a07027ce72f12052460b41f16b698650f1bd55c1459208fa
 MISC metadata.xml 399 BLAKE2B f6f66afb0eb1ddbca766a65035c4af929cf91714c18f4e0cb022ae04fda33bab7dd00739cfd4c1ac3413422dd6ab65d7ee3e5e8d05f0ddf360257212cdefa102 SHA512 0af3dd67c742ed83c332389f6ca3709d3382fe4bca940b6ce05b0271a08b2a5a7ee3d49789db4b8fb66831d17cc01acdff60d5064cb9ab4540e5b2f965ff2b41
diff --git a/app-admin/logstalgia/logstalgia-1.1.2.ebuild b/app-admin/logstalgia/logstalgia-1.1.2.ebuild
index be16497f71ac..d996c9d6102a 100644
--- a/app-admin/logstalgia/logstalgia-1.1.2.ebuild
+++ b/app-admin/logstalgia/logstalgia-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/acaudwell/Logstalgia/releases/download/${P}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-libs/libpcre
 	media-libs/freetype:2
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 3fc287447acb..00871a38d9f3 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,30 +1,16 @@
 AUX agent.conf.sample 409 BLAKE2B c97d35ccecedf47c234e2cb1b3bc20b5aea9254bed08f06e744f44e3567eaa88d232f487a8c185375fc8ba4ad9cc9b15f750649286f1e1c4431d732dc5847550 SHA512 fd9a5fc56d7329113b589f71de030e02c0e1d5575b4ac9fe340fdde6d65d44bc0408f67cc36b6ddb248beb22cb7059727a99f5dc5d92ba2f59816a023a915fd0
 AUX logstash-plugin.eselect 1768 BLAKE2B 539246fb1c6e00fa0928af146d3c32ef69f61e3d419ebba97e688ba151fc34b1cb4a77180c36cd02348616a5069d4c013302270c0127fbe7e836e3f866569d1d SHA512 c80c0f2942643dbdb56c21d2ae0679ac92fb5c84b4f51cb426108c1030434fb32bcadc7131bdaabfe34a458e2bf35965c4acccfb42b99c790a26c2b9ae2a24eb
-AUX logstash.confd 775 BLAKE2B fdcf55e1155c746764aa765350367c421f9ba84b6a1a1cdba94f482bbb3afc904af0995929d75326947e5fc0cfd51bc7608c19a04dd52018cb696d602c39094b SHA512 f0d9270f9158e39ee6b3f0a0e626c252e425246fa76098055161e97c9b4cbe14a9f4db2ea9c64636ef5adba7dd72ac3451af63cfcf4598517c29f8c5efcba14a
 AUX logstash.confd-r1 837 BLAKE2B dd8362a386c865b44e05dd4a244146c5b593e4497d876c23c64e2f2811155355fac51e1af7ec079a8dad7141c2ad3e0eecf3b58971efe3352d4e61d210b46400 SHA512 7a7dcbfe2a8f80804083099a942ca51b235440cd356c1e2310ed060c9260ca0ee7d970b0f5293c67290b17bab4e9c8e0669bdef98f51ed1a97f83ae444c7861e
 AUX logstash.confd-r2 767 BLAKE2B fa251570a13b2bc2d0779e0f00549f40bc957f211be0f4164829f7bf731221e5adabdb27341c703f1ea67b19455e8832f5d822fd41ffc64994007201690feff6 SHA512 83eecf30baa160041f33fd3dafce317c1692efaf676d0fdc9bee04965eafb15f1e01d07a09607d345665f6bebc4db90d17a0abd1c7fd4962d6926ac069f16768
-AUX logstash.initd 2091 BLAKE2B 980722c1c3cd0cc60cf440d5a06185c66ac4348c0e8990036812ad8f5cbd4e2561affab3ef1de2482990635169afdd10c0841167494d2bf024b28101a0df45fc SHA512 5592918e82182f638a02f6446f9103f70274fdf615573aa4463fde1dfcfa7955c715b0fdcb1f98de9c19ab86268b439d253a696b27f32e55d830cc3839231e30
 AUX logstash.initd-r1 2176 BLAKE2B 37c05148d3789c69805ae5151bed5e297d71b9d60d71ff98ed411ac59b73c4a2a9462e6223a2c960301c6228c84879460ae0f793a24806768fb727b01d982709 SHA512 392c8297c6429e0384dd75073773e1f8f51dd62fd155b2a524efd9e862df114b13cc63cf37237526aebe838b5ff26a8f26a3ad08058a56a723e25025df9a16af
 AUX logstash.initd-r2 1989 BLAKE2B efa16227a2cf1a42f1f9e27e110dae64c7eb6547e22e89a71b3394fe587e0f83468e361d335e28b15a1507959dc26c019ae8ac9bc110f1b8a6896ceb7f3ceecc SHA512 77c69600f22d31e7e08c2d953c99bea8a24ad83c7abdd578526b850ca37c963a91cfd245b70e4ddb8d405135230fbc641768de2dc4dad096a0db3d40313acb2f
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
 DIST logstash-5.6.15.tar.gz 110086992 BLAKE2B 3047259c4bc5d71b072fa004c44953f84860ec53e051641c4efc903e38243e85b8fdebeaf093c01f5410c1f05a78a8d8aa2282fc45cf5fd784a41ea66ff5b196 SHA512 405039ff988aee8878cbeca96ef0fcbadba762f877eaec36c8a75b010e56a943c2951a8f83f9279d7d9fea99c4f8a200c705f784813a2733289336c58c34ca1e
-DIST logstash-6.8.4.tar.gz 172186036 BLAKE2B b1219dab8dd1f88d01def54306ae09b3e9c1657adc7487e5c024f69e51ce24e66a9a713c8db357f84b19fda5ee3f824845858e34e8b75b8025f87b4d27b69b5d SHA512 6dc33099be2ee3670c00cb4162e3924a97e5548c1b978a50fe3d7ed0745c7f0a3422849c04e3d64f999ed9dcf8efee3fba05d9643fbb759c0e27643235667ee9
-DIST logstash-7.2.0.tar.gz 171299740 BLAKE2B cfdbabc11d6e0d182ea7bdff1d30ca3a5bfbfe036f952c0d944c105f563dfa1b444c8dd1e9f023301abfbf9a86708d6bde2689b462b28f00a34d09f78fe3898c SHA512 955358d504b6626ba9ac88a2d65b161044180c3085f8dbaedfb8b85b092ecc65721bbda73b750f7d8b78a052828a54f7ed7ad16ee7ec72f3ed5e428ba291a173
-DIST logstash-7.3.2.tar.gz 171783584 BLAKE2B 0a936edaa57ae5552b79bead754b75c8a8c7a920461b720c58dc8e32c2aae342f3639955b63264e8704093c0d30d5d801f468d1b391e9efb2c5d605dcb2ebf5e SHA512 311b849cb8e1f336908aefa1cb2f0e2d76b696410346dd3fa0560313f9cbd3f098c93aee68c9fead736a3edb39ca543161eb7de115597e034eb0a015904c7417
-DIST logstash-7.4.1.tar.gz 173284835 BLAKE2B d1d3fe199175d57e4b47fe50f26d6d54486182d6e69b6e50cccceecf1cf02484c6d9f1a8cd0ef72ea82b1da9550787cb5ac37bbf93a91b4d0518dde415479a1a SHA512 c89d530f16e5c6953d97708b6ff2f46bbb518a93652f11cad988841a73bf5862beb4a5326de1e63d0ffb65a498fc33235ab4fc950e8087aed5815b3a65e81ef6
-DIST logstash-7.5.2.tar.gz 166254387 BLAKE2B b93cc90ecb8e88cb3dd9970b4e67d950322ad500f94277963d1c7c58b61f0ad816ee030fac25cbff286847484f0d79cb0d34259ab7edc630026ce0fc58a23d7a SHA512 955e546372466fb557eb15b9f466decef24c520c7ff16afd5432d5a8d1dd1f061f11fb9178678bed74b3c16a2d5ee6cd72fc8e4d757c8af36747dc25522c443e
-DIST logstash-7.6.1.tar.gz 172679481 BLAKE2B 2385c5d11dde1f49d3872cfc175166f78a170c1c041117548a00e73876d6f26fa06d955d7c62f6b1102278fd0f46a9119e28b7e244d7f9331b79d44df9d333a1 SHA512 38fe03fbbc3e158925f16420f809e43040817ea2b81defe9a2d6afa821bf293b86764b3327c66e17cc06034af39b13cbfad024e9fec9a73f77fe1a9edb856658
-DIST logstash-oss-6.8.4.tar.gz 172055711 BLAKE2B 696769dbb94ed9a6c9a84fb54ba35fedff360bff39c61ba7ef6a9a5f00e59dbc3c8d15f6b9080e39ce87f17553f04b831f029e8f779c75f0f28b673a2aa2e697 SHA512 6f7fe35f6e84417332093d089dc737f89737f30718d5ce843dfe6d3ba85d098e2a01da6c191729b68a7a326d4d65f6bcbdfeb656d5120401478dacb96b1f0671
-DIST logstash-oss-7.2.0.tar.gz 171128040 BLAKE2B f0f3d4f0d5228918d8435c521d10ff5070e23561c25ce28e8d58997d499a7c7697354c1fb1cb70bf2bd832ad50c04afb00cbde4b3053f9f24d2619f3fbfffbdf SHA512 24120740bc727b6da50b865bb85bf61f013a38b6679d679ecc75a73c69766a5133fd47ad99fa0220d5dc6cceb506fbde206787adcee31483288c68c228edd1fd
-DIST logstash-oss-7.3.2.tar.gz 171613705 BLAKE2B e1a0c512cadd5855e1a1524e1c44214aeb792361493406c5cacde1bd72243178d03113c08a1fe0d1c2212cec5a2947074911bf19eaaedc636db754081c3fe32c SHA512 3aac74966b27d0d551f49c78c457b18a1a76d0e5a7b2fa1dc9a7776927145b28a6c02f51e4dd7e9ca49dabe5f63effd4227fc6980e522ab7da4ef847da6bda12
-DIST logstash-oss-7.4.1.tar.gz 173114578 BLAKE2B 5530e3275be095168d845381ac2ef92c3fa2e3783b7d9749d88465239751bc74d0483a51fd61ac75f46a569201c5fd34bd1553db32ca84e911dbf34ddd5e6b14 SHA512 26defcb5777c044030081e98cc47a040c72c7a8261f8f2cb9349181ec6a375b4969e1fbd00c8046da2c3fae5a6dea45e53c41d1c84325cd75af766f6a1d4b3c3
-DIST logstash-oss-7.5.2.tar.gz 166077841 BLAKE2B 93a66c1632a41029a954208b1aebb14802bb45c357cc484025d7e06cb11d30d31301dfe44318f1d8db423a9536802e3969a0643dbc4d27a01db45a89cfec5bfb SHA512 34b95e5d8001f1ba361ae41ac2aee495eb46432ecce44455e6dbf63cd9d2fe5175931a6e4eb8be227b28be420111e370599f2e8b1ba7a158ad8504a657e2b1d3
-DIST logstash-oss-7.6.1.tar.gz 172501067 BLAKE2B 119789d887f1d2b08ede33b491895e054be337b1a975815e64546379c21f7804cf2c05a646b22d321f8589c8e764eb62cfaaacb4a7176a39e4c6b1cdcd52eb35 SHA512 dc33fb120c3910ea2cb8616fa52c675fda2381cc0db677cd30950685f0e9df6419d2cc8136ed877eaad67d1b8ffbc07c6d14e86986ba710e2a5098bede89b903
+DIST logstash-6.8.8.tar.gz 179965893 BLAKE2B a56db7b09c7fd59a5496e076ab11bf273265cff7eedfc9c9dfaa117a16baeb9b9c8e97a71eb8ff2a80f379b242d08c2d997476d7a48bab802ff3380d8914f13c SHA512 11c0b9be1d51c3feff82181234d0b5cd838edff78678bdc410f306c52d6345393e9d6c4d6095c2e3aa044f8c5af35d98fa2570891e81e9e3c57907c2baed6100
+DIST logstash-7.6.2.tar.gz 172679447 BLAKE2B afeaab06178669559ff532cf72575f8063d07f95f2401060d33e0a99c87bb9e0c251e45634b9723efe456892ac19586accc89cf7272163e48eeaef438632b777 SHA512 c86dcf36cd0d578467c7013234040d5ea100f08ef69a185f6aa86c87dfa46936282abf10d0f495ffe649274136b735d17ab513ef3401205140c2d98bd9f91238
+DIST logstash-oss-6.8.8.tar.gz 179836007 BLAKE2B e278d8dd34341bceb506accb3424b4af6db0795b582e1370d60f4a4b68671372449c94ae28f4a7585b8d4f4e63dcf7d6fa80eed37fd4ef8e872414ae2cd15b80 SHA512 ceba8d798c1246c9fd3385bc4b64995fcf9083dc5149211fabc09bfa3208d56bba6d8ae4ab73da5f9968633f30c547e0132f76543e2f9a2a96675ee58df74b09
+DIST logstash-oss-7.6.2.tar.gz 172501347 BLAKE2B 2a83d7617c8e13a0b736ed0023a164d2191102f49e7d7174bf3ea9c56370c51e4fd760f7bb3aba97f1b9bd2ec122ba22e00dec9ac9636f7b79128c6bb2da548e SHA512 c425a9748964ef38fc58f67778cd88fc367df91087362353cfee316e54528e4a23407e1fc53d628008fd4c829b427061758112f10e7805cec88c0a1f0a966d2a
 EBUILD logstash-bin-5.6.15.ebuild 2195 BLAKE2B 1ef9e7d8a825109a85e850c2e9b971c3b16d435f1a0e3dce40e18b48f64c5b83a3cedd0d85a15d422a3accccb0ffcbe79b2a0812fda24c04fd0f07a0e37b9436 SHA512 6026cb3d76dbab56a4a495b1bc3abea2d0c4c731261047e76acf792840f3deb1fdd0fd181b5b6a599f2056f22b76920e7844f1e76516919c7404c1d10e1b7259
-EBUILD logstash-bin-6.8.4.ebuild 2099 BLAKE2B e7cd6249e76d9e3629cc640542aef942ad893d4643c803a10c789a1070775996364aa0caff337bf2eb18cdd2bdd534941a5637f23e44d370a87bc017bc931fde SHA512 aadfd4248e27c0c0134a7c7705dc3c8cfb9b031a963214174664c8c2438ba8e1e466025337fc9a9a531ff5f6bc16b7e1f25d3362205b0ca2793bdb8482a9e202
-EBUILD logstash-bin-7.2.0.ebuild 2102 BLAKE2B 4859b52ecbe2d3cb0fa31768cbfcfe59ff4ab1ccfb70ed1b0b30edf33415a7107a246ab902fc3c42897804482dd91a25bd8da6af29374c424bc53e700ed1b797 SHA512 3e346deb2bccc47fa55d2de9afbc6bea15f28d235e93fae323620a24a70aa6671072ab90f778d3157ba74c860056a1f76d5ad0ac678b6d658bd49ffbb8fdc3dc
-EBUILD logstash-bin-7.3.2.ebuild 2095 BLAKE2B 80aa953c2657cc0218b18df01e67279384fcc57f8fb3931121c787caf0c198e9d87c138bc2c6d809d0766fd67e8e5046d10ca0d4826047f845d89931bf63e5b5 SHA512 4db211818a819557d904ced91163c2bdfeb3ed9a1ae5ecc9873c1973b5137aca526164fe04c35984b9f97a56564c3e2627d4b952775dd3b0ca220c2cca37fe54
-EBUILD logstash-bin-7.4.1.ebuild 2095 BLAKE2B 80aa953c2657cc0218b18df01e67279384fcc57f8fb3931121c787caf0c198e9d87c138bc2c6d809d0766fd67e8e5046d10ca0d4826047f845d89931bf63e5b5 SHA512 4db211818a819557d904ced91163c2bdfeb3ed9a1ae5ecc9873c1973b5137aca526164fe04c35984b9f97a56564c3e2627d4b952775dd3b0ca220c2cca37fe54
-EBUILD logstash-bin-7.5.2.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
-EBUILD logstash-bin-7.6.1.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
+EBUILD logstash-bin-6.8.8.ebuild 2099 BLAKE2B f5902b9254e045789a41627c84b5a4e340268eedb1a96a266e20279a9d718ef28279e59b63320fc1d35b2e701acb5ce61a925687cd479d46a74981e92d744618 SHA512 74f8b2a81f63e5d41b373e5cb08f99560afa4f59133bfcd7955907105457ea94cf84fe07f5501e011bb2b69d388207e160057c79ec206589e7d195626fab75bb
+EBUILD logstash-bin-7.6.2.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/files/logstash.confd b/app-admin/logstash-bin/files/logstash.confd
deleted file mode 100644
index 6dbbe627a5ad..000000000000
--- a/app-admin/logstash-bin/files/logstash.confd
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################
-# Default settings for logstash
-###############################
-
-# Set a home directory
-#LS_HOME=/var/lib/logstash
-
-# Set data directory
-#LS_DATA_DIR=${LS_HOME}/data
-
-# Arguments to pass to logstash agent
-#LS_OPTS=""
-
-# Arguments to pass to java
-#LS_HEAP_SIZE="500m"
-#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"
-
-# user id to be invoked as
-#LS_USER=logstash
-#LS_GROUP=logstash
-
-# logstash logging
-#LS_LOG_DIR=/var/log/logstash
-#LS_USE_GC_LOGGING="true"
-
-# logstash configuration directory
-#LS_CONF_DIR=/etc/logstash/conf.d
-
-# Open file limit
-#LS_OPEN_FILES=16384
-
-# Nice level
-#LS_NICE=19
-
-# If this is set to 1, then when `stop` is called, if the process has
-# not exited within a reasonable time, SIGKILL will be sent next.
-KILL_ON_STOP_TIMEOUT=0
diff --git a/app-admin/logstash-bin/files/logstash.initd b/app-admin/logstash-bin/files/logstash.initd
deleted file mode 100644
index 2133421377d6..000000000000
--- a/app-admin/logstash-bin/files/logstash.initd
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-LS_USER=${LS_USER:-logstash}
-LS_GROUP=${LS_GROUP:-$LS_USER}
-LS_LOG_DIR=${LS_LOG_DIR:-/var/log/logstash}
-LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
-LS_HOME=${LS_HOME:-/var/lib/logstash}
-LS_DATA_DIR=${LS_DATA_DIR:-$LS_HOME/data}
-LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
-LS_NICE=${LS_NICE:-19}
-LS_JAVA_OPTS=${LS_JAVA_OPTS:-"-Djava.io.tmpdir=${LS_HOME}"}
-LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
-LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
-KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
-
-LS_INSTALL_DIR="/opt/logstash"
-
-command="${LS_INSTALL_DIR}/bin/logstash"
-command_args="--path.config ${LS_CONF_DIR} --path.logs ${LS_LOG_DIR} --path.data ${LS_DATA_DIR} ${LS_OPTS}"
-command_background="true"
-pidfile="/run/${RC_SVCNAME}.pid"
-
-start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
-	--chdir ${LS_HOME}
-	--nicelevel ${LS_NICE}
-	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}
-	--env LS_JAVA_OPTS=${LS_JAVA_OPTS}
-	--env LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING}"
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-checkconfig() {
-	if [ ! -f ${LS_CONF_DIR}/* ]; then
-		eerror "Please put your configuration in ${LS_CONF_DIR}"
-		exit 1
-	fi
-
-	ebegin "Checking your configuration"
-	${command} ${command_args} --path.logs "${LS_LOG_DIR}/configcheck" --config.test_and_exit
-	eend $? "Configuration error. Please fix your configuration files."
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading configuration"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
-
-start_pre() {
-	checkconfig || return 1
-
-	rc_ulimit="-n ${LS_OPEN_FILES}"
-
-	local d
-	for d in "${LS_HOME}" "${LS_DATA_DIR}" "${LS_DATA_DIR}/queue" "${LS_DATA_DIR}/dead_letter_queue" "${LS_LOG_DIR}"; do
-		checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
-	done
-}
-
-stop() {
-	ebegin "Stopping logstash"
-	if [ "${KILL_ON_STOP_TIMEOUT}" = "1" ]; then
-		start-stop-daemon --stop \
-			--pidfile=${pidfile} \
-			--retry=TERM/5/KILL/5
-	else
-		start-stop-daemon --stop \
-			--pidfile=${pidfile}
-	fi
-}
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.4.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.4.ebuild
deleted file mode 100644
index bc5b7769f9ee..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.8.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
-	acct-user/logstash
-	virtual/jre:1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-7.6.1.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.8.ebuild
index 9e7d19873de3..08167fb02874 100644
--- a/app-admin/logstash-bin/logstash-bin-7.6.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.8.8.ebuild
@@ -24,7 +24,7 @@ QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
 
 RDEPEND="acct-group/logstash
 	acct-user/logstash
-	virtual/jre"
+	virtual/jre:1.8"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild
deleted file mode 100644
index 16a1b994f632..000000000000
--- a/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit java-pkg-2 user
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
-	acct-user/logstash
-	virtual/jre"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-7.3.2.ebuild b/app-admin/logstash-bin/logstash-bin-7.3.2.ebuild
deleted file mode 100644
index 7b2c36e2a632..000000000000
--- a/app-admin/logstash-bin/logstash-bin-7.3.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
-	acct-user/logstash
-	virtual/jre"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-7.4.1.ebuild b/app-admin/logstash-bin/logstash-bin-7.4.1.ebuild
deleted file mode 100644
index 7b2c36e2a632..000000000000
--- a/app-admin/logstash-bin/logstash-bin-7.4.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
-	acct-user/logstash
-	virtual/jre"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-7.5.2.ebuild b/app-admin/logstash-bin/logstash-bin-7.6.2.ebuild
index 9e7d19873de3..9e7d19873de3 100644
--- a/app-admin/logstash-bin/logstash-bin-7.5.2.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.6.2.ebuild
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 8837bee7247c..76432421d9fb 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -19,5 +19,5 @@ EBUILD mongo-tools-4.0.14.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14
 EBUILD mongo-tools-4.0.16.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
 EBUILD mongo-tools-4.2.1.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-4.2.2.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
-EBUILD mongo-tools-4.2.3.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe75efb9dd51561f23853b3d03ea7f5b3f766ea8759c9bb7c33c36bcda71ae57ca917154d575efbf6557bc7563e649280 SHA512 f4b4ac41d14bb8ef5a3b61ea18877a9171300c577b14fad7b55957ab5c1baf36af979584d6b0cdfb4987f46e08b0b13b86ab4eb5c8a9aef304fbadf56204102c
+EBUILD mongo-tools-4.2.3.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-4.2.3.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.3.ebuild
index 86f626904b91..7d8cc9a0ebc2 100644
--- a/app-admin/mongo-tools/mongo-tools-4.2.3.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/mtail/Manifest b/app-admin/mtail/Manifest
index 7a78cd66d569..0956e253bc74 100644
--- a/app-admin/mtail/Manifest
+++ b/app-admin/mtail/Manifest
@@ -124,28 +124,6 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0
 DIST github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.15.0+incompatible.mod 40 BLAKE2B 5b237034cbfb2f1a2fcf7a15937c89241c76b74f8085486a24ac2b8082772af9e05274c3e6d46378492e8a478532c889bef2da72daea94ae413ee2fd54326806 SHA512 7a620df2c7dd83a7d5df69714186d055519d5422683147f6e02a19db4f12293ba0674091c3f361e0c11d9661ab9938b4f69c10892e9cd490403ef2bb748e5e8d
 DIST github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.22.1+incompatible.mod 40 BLAKE2B 5b237034cbfb2f1a2fcf7a15937c89241c76b74f8085486a24ac2b8082772af9e05274c3e6d46378492e8a478532c889bef2da72daea94ae413ee2fd54326806 SHA512 7a620df2c7dd83a7d5df69714186d055519d5422683147f6e02a19db4f12293ba0674091c3f361e0c11d9661ab9938b4f69c10892e9cd490403ef2bb748e5e8d
 DIST github.com%2Fuber%2Fjaeger-client-go%2F@v%2Fv2.22.1+incompatible.zip 336931 BLAKE2B 9f3710bb7904f0e510a5e5a7af9e763c93304cdef927d2cf3d2ee46fbfc4d0ed3a6d2904cc1bbab503daa1f5dd073203a18d60d0f78f6ed75f03065acb5c6229 SHA512 69f4f644b32d2c12beb7e409a23465026779153e3160bf6dea4dc92ca1015c9767d8fe8f2ab5c65fe01a5b66ec85cecb7d34a0340afa33c5ce92e3438868cc13
-DIST github.com-apache-thrift-v0.12.0.tar.gz 2960476 BLAKE2B 243b1691c0c3e52c13839d8170f959058c2c7851f53ce619c623e20b4c0c5e842ec877ebca8a18a285918643883f49759685936bcb89154946e214353db72f0d SHA512 b4154bca6ba9562d2d0aa7835aabfccbe1f065cea8b254539659bf357cd0d2f1044037e78c4030fa625853b544c1e36ac6b3a02983bb2b355ce9f6eebcecf8f2
-DIST github.com-beorn7-perks-v1.0.0.tar.gz 10866 BLAKE2B bebb0b77adef45fd5c89302ba637e3b5e8e918276ff798dbeb11fbf9d490f3efa760cf4685b21c8a736469fbe7ebce3f20bbcc66092766e418a654d149caa401 SHA512 23a6660dd9e806efc841fe3acf702dc3471808770c86cbfa3353adfa9d9534eb6d20591bb60be2c798ebf8823907b2d5188339869f4b0f61bb2e9ecf74b4ea77
-DIST github.com-census-ecosystem-opencensus-go-exporter-jaeger-v0.1.0.tar.gz 26965 BLAKE2B 5f962ca14b0c046f01d13ca129b6018e2554f2dafe49c508c0a830cad20d0c8e641563d3b96c46542f4997c892bc398cf7e6cdc10562e07681f398914e165bfc SHA512 752e05698d1d2429008c4a0f17f4ee982f26cd2ac84180a9b3bed82813b5f268e22f8d31f92ab1c812fdb0733e0d43bfcd378a3532957b007e300f3d15d59e4b
-DIST github.com-census-instrumentation-opencensus-go-v0.22.0.tar.gz 162290 BLAKE2B 24c2d2700b21fff2189cff831c7d7aebedce740b087219650cc38257a6a9589d37b209812bc2da476b04a5eeafa79dd2dd185460c908f6479b9154ac5eaff970 SHA512 e8b69381ac64750d259fb21c35aa80364d692ed02a15d7ba6ad29f43101290f0e36fca2feef52c29b1d2d83201495f6b374cf4f9f8208222d1f9609ba861dec3
-DIST github.com-fsnotify-fsnotify-v1.4.7.tar.gz 31139 BLAKE2B f2d0aaabfad525fb640beba78991a858ad23203a557a69fc15d2f017b2a693c64c244de435682b1cd9d59e89a97e4ba60c7f95fa99a6145a9dea73b0f334936e SHA512 840943043c49c837641f04b976f2ba610fc03bd31030ca6442744d51fa9241da1905730ea11466e249a5bd37437f1e2a433a012a64ce872a1562c941bd5bfcbf
-DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
-DIST github.com-golang-groupcache-869f871628b6baa9cfbc11732cdf6546b17c1298.tar.gz 26038 BLAKE2B 154828b6d5f8be97ee9b462a766834e36f8012e7e15a8d7d30f0a5a8a3d1773aeb9b103b3dd1470f7553fb5a5ddff52860565dc6d47f0c49af608309d1be67b2 SHA512 0245e645d9cdca84f8413d58f507a9bdcd8b047784aed2a9175cf31ecdd9de19a088afdd28a1079200fd13ad1ba6f647d29ba54bbeff10811af8cccdd0bc2837
-DIST github.com-golang-protobuf-v1.3.2.tar.gz 312285 BLAKE2B 381ae3c4bad3d3b3d489a3b66752e9e2405d17d9ed2c55aa1ec06ce6c18171b1c7625f6cc6e28490551a6410835f6e774a408de39f6e9ea9b3cddaf46e3b859a SHA512 ef9190f7773b18005760eb755a1dee25eff38c188687033362635e2431cf2c7372a59a3fec91acd6e4f63aa31d08391f7521a8dafef7895268b6a1a78735dd8a
-DIST github.com-golang-sync-112230192c580c3556b8cee6403af37a4fc5f28c.tar.gz 16835 BLAKE2B 51efe53ea7ab1f11f8ff078fbfa91526b97a1d918101bdbc755aa500424dda860d3a11195c1e44d033eaf7e0d09e7f327e404ad9af84f4b9747d8805b53dcf10 SHA512 bd90bb14e688fa7613d83dc8718bbb688a2f05cc8eb8c3dfbbf71daa7dc08e35044803c4bf8e5d5aab625a612e986e6f76c822c437f52132581ac37e0e2e92f9
-DIST github.com-golang-sys-51ab0e2deafac1f46c46ad59cf0921be2f180c3d.tar.gz 1457421 BLAKE2B be5b47b3cdbf71b3ae7ce7df7408e1b7d84781c449194fabec4058fdcc6f27420b6ec9076e13e26d2afe39b87dca0b223dcc88c32d62886258c8367fe472ada1 SHA512 7c092e95ecba7bf546f919ffbca2fa6cbb4baa54489566a05e1bb82c022213426d9f8d48f733481cd61bf7d9fb7f665ee8f1c2f98548630f0d1c2b3256068966
-DIST github.com-golang-tools-e713427fea3f98cb070e72a058c557a1a560cf22.tar.gz 2202687 BLAKE2B fb0d6f94112978c5e1fc77564df2476933003f6c08c5efb40623576d7fea71344b7795490eda34897e7a188e009c04e4c85085515094aaa706af11dfe5365569 SHA512 be3dea7cb99d8eaefc0fd821f87651f9c3e2a43519bc09d50c0cf58e062ed857f1e6f24bcd0d94e2b81dc08de82171798397d55495e1475a33b21fd7aeeec11b
-DIST github.com-google-go-cmp-v0.3.0.tar.gz 76127 BLAKE2B 8f9f20d328be91d5a2040fd0a27eaa98fcc533e0f600a8ecf9c21fbd023fe5428dc94055203fec6e4940e0ef7ef378ad8a0480ebc82b40e04beba1cdfbc86b04 SHA512 74c39cdf2b73cc9219082a20083ef2a104e77c539b34d697ad36d5e0a203fb77532fb5a9bac365c1d8957237a4d165dcb5ab31d32c96014e3090535f812ee1de
-DIST github.com-googleapis-go-genproto-c506a9f9061087022822e8da603a52fc387115a8.tar.gz 5250363 BLAKE2B d0f8bb5058d661f4addac86d56820b6260356689ebbf2b5488467a4e7e40f7873666ba1c9ec5d4d7c29500ebb0577992da13a6ba065eb2c8831cf49c4f0e8102 SHA512 6620b43a765ab1c6bd9508332eab94c6abb10f1d1bbe3d09d91e3298ccfd255ec19698ae043f4a4fa1143ac331a59e03ff72a70bdffef78db28786ab9398bcac
-DIST github.com-googleapis-google-api-go-client-v0.7.0.tar.gz 12103399 BLAKE2B 4aeae2edb1985eecc1e2d8708810e1499bff83f134aa05b26cec2949ceaf3268a5d0a8c5535b11bdaf2ffae9f08e68c39c419a9cc7c381185fe00de9970d4156 SHA512 10b23be943958914229b109aa188cb37edbed187cd7c2cf9c02ffb37dd51589abf4e6da765467b313cad3755b73ff875524cbb96fbf005a0b4886e3ea713197f
-DIST github.com-grpc-grpc-go-v1.22.0.tar.gz 742470 BLAKE2B c1bb056420fc1ab6b9bf0fc26b9457cc96f58afc3257b0dc58b204c4f6b0da443cd087f885ebe34c6a73f4e38cd52f9b1eecfc8f199214ee5211904a73bc7e25 SHA512 660cd0390cf160410b0079657155f76da2dd8be65b37b7bf588eb9035f2040a13220cbff595c451399490abcb53de34fa911f07f1aafd3c3779c99993a440aea
-DIST github.com-hashicorp-golang-lru-v0.5.1.tar.gz 12982 BLAKE2B 99a1a79d86162e6c528e1c985a39bbaf0d6adf272c155697efa868f8a0fff3b7c206a45ded6ae4436113d1fab8daab97d4596e3f888056af8a757f9440e1b802 SHA512 c71c35fee10d34f2d075e589e9d4a770e8b48dd5b09946a3fab34337b3680f1fbc20de1cb8ce52aa205c79bbfb1194c44391d7fbe746e7c676969ba8930d827b
-DIST github.com-matttproud-golang_protobuf_extensions-c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz 37541 BLAKE2B f78899afa1390aca6cb1b412271713c60107771d512ead83482e0bb1716d175b791b4b04bd24b7f469cc1a29176eadcf0545ac3bf166c5b350602420d3c05aec SHA512 141b1b781a4d1c59f5eb1af93c966343b80ed405a5f63774e6cda9f12c34536e892c7a84699d6cf2e9c775457a4c2ad5d5d0b4d302fc25a923ab81d46ad65580
-DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
-DIST github.com-prometheus-client_golang-v1.0.0.tar.gz 138046 BLAKE2B 17eff94ed0d813201fe69386d4050b19630ad086ffb7566158dddaa33fbb2aef0a8bbf8c40d0edbcf76503109998ca10ba15d3e8e26817f8b861f0870f166193 SHA512 ffe60ed4a5f00f39639b5218bfdde61bcb40c597e5af977fdd1ae2b0e57e5ae0c84baca36e85b13c1f4eed297fdc2055606112472c3a7bdb58cf61d1daf15abd
-DIST github.com-prometheus-client_model-fd36f4220a901265f90734c3183c5f0c91daa0b8.tar.gz 57542 BLAKE2B 16f73bf9a1dfde0dd3152e11ab4d3a49271209b02541951471664a1226c9211f1b77ef4a32faf3e184888b080d0c76e3d02d03e21d688399d7e3c14629df738f SHA512 bee4b4ffdb56633ac763dd624d03db5b0dae433e2a2d1e4ff925e34444d62cbdb879d68574c7f8133f11d718cce3bdc1d686508acfb470e7dea0109c98266b1d
-DIST github.com-prometheus-common-v0.6.0.tar.gz 99696 BLAKE2B 4d49d93ec732c963ce3784aa7a074e91f87ae58acea46a1e6b8b58b012332b6954f90df83041d097d86ed7bca992fb4214c1a05c11746d8f74f0001d4a822abb SHA512 9ed108c0e13d879921c9f9892713f1de1da5fccd03cd11bee2b4728fb09aa3eb8adfa98f2701a6d68fb35b8458c4d59027e48ec0e94e90a441cedb1d25c08945
-DIST github.com-prometheus-procfs-v0.0.3.tar.gz 91880 BLAKE2B 37c8cd63bd7cc6b00c591549a51352487166ce5c2e4fa0c2144288236f580598f48cfb6f83858b7ca5dbe00e550e3911b8dbba24405f6fa8efbd36050ea70d80 SHA512 4e74a7f5488b7d8c16de3311ea0db2d4e5612c30b90e7ea853afd3ff27ab76af4a40edc3c114d0a98f4b61f5ec730148e32c2fb0e7709cdadc8b87cc2b75895c
 DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
 DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
 DIST go.opencensus.io%2F@v%2Fv0.22.2.zip 296264 BLAKE2B 0b0e20eb2f10b81748d55b843f8489ffb8147a8b17c063cb21fe505fcdb46feb9cc0830f3b3a91ea7034b1e7ba78df27b0b235b8500b8c1ade19f6837366aaa1 SHA512 c98a43e1bfc9f4bd1e54847dfd6b07e9af14efdbcd8d61b70c9f9701541ee2405f800b1e33cf115615a43030accb735a1235e2b7d81f54efd127e2fe5c992326
@@ -248,8 +226,6 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLA
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-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 mtail-3.0.0_rc33.tar.gz 517922 BLAKE2B 4fb9e395cfc50adb3f6d04e955879edcd40437e4c05f3668af15751f4cd159e9130138ad6602b29e6746f9dbaf661e46eaf2887a50005efaa0ab728358c6ff32 SHA512 8c7359cf75e9b80f6cb4af4f8e1237da5eee23034f1415a7b627ea7695b72027c9e94261de972dce6bf2d50fe7f82d7dd836f0bae27a7083cd98af272252d4ad
 DIST mtail-3.0.0_rc35.tar.gz 528305 BLAKE2B 7eb72d20f11df1e8adcef22a1c08e812c483f1db836598331fbed7b0b5fb88c9c28eab7070c0e0e03cb221cbd8ba6343fe673db57516139cec88c859384fb0bc SHA512 b282c633561675b004b5d3f716b0efbb69e69f6bdcde42d4eda1dcf598adbbf47847c2d726ebe7d5726ea8638e92a27c4de6afee5c7e6cd02ae933a8aa03e1ea
-EBUILD mtail-3.0.0_rc33.ebuild 2586 BLAKE2B 1ba2c422a6a144528cb03c2d66f054d8ba26868afba5c9fb41330c97cc6787e7c4348699bac749b39337a8fecd5f060ceb4d1c4c6c38dac44c7d389f8406ada8 SHA512 3b2d70e97541c5e0cac47eebca7366913935eaf7d127202b0de08d27c14720bee1bccb0d65d6556419e96c5e696a898985e83638865f49ab89bd69036803f263
-EBUILD mtail-3.0.0_rc35.ebuild 13294 BLAKE2B b05af63c3498ed05ef1593d68a03537ad1f9a732b979763e2837bb8fcdd3173e298e613f1e6bab286c5dc75d1d70536041bf93147530bcbb281173eb6b5777aa SHA512 fd1ed7f38c97d9a9fb6517a9e7d9378ea332a11afad7038965a1713d39e017c215114697f52d3bcc0b7687fbf0e4c05105188bbedb3f8e76c9c1e6969c97e09d
+EBUILD mtail-3.0.0_rc35.ebuild 13295 BLAKE2B 113abf47b868f1e99ed08d681d2267501079452e39aef35b4bf7c2d565cb4a5a40dbe67b3951168cd5c75c729181189633fcf31baac370ad5bbd0c095dcbb0d1 SHA512 aab8aa83f79a99fd91f873f42e9145495bbca9b7912991fd782db1c52868bfdc75c513a32830a887372ec6e896e253479b1a89599c2241e46b8754035528c578
 MISC metadata.xml 295 BLAKE2B 83cc868475f40ef5e6bd8fa8824e8959615d7589fe4985273026ed4ce02b5eee2c631cbdce4f69e67f9a019252385bf4e0bcbef0e2f5083770955ca351be5961 SHA512 ed1a9cc5e20a4063111ebae0942a1f23b30363c91e22099046c9628d8636b9500cd204a11b22744c3e881d04ebcef9515f47efe636bc6a8a7d992fed9e2c6f95
diff --git a/app-admin/mtail/mtail-3.0.0_rc33.ebuild b/app-admin/mtail/mtail-3.0.0_rc33.ebuild
deleted file mode 100644
index 761acb2d4838..000000000000
--- a/app-admin/mtail/mtail-3.0.0_rc33.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_VENDOR=(
-	"contrib.go.opencensus.io/exporter/jaeger v0.1.0 github.com/census-ecosystem/opencensus-go-exporter-jaeger"
-	"github.com/apache/thrift v0.12.0"
-	"github.com/beorn7/perks v1.0.0"
-	"github.com/fsnotify/fsnotify v1.4.7"
-	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
-	"github.com/golang/groupcache 869f871628b6baa9cfbc11732cdf6546b17c1298"
-	"github.com/golang/protobuf v1.3.2"
-	"github.com/google/go-cmp v0.3.0"
-	"github.com/hashicorp/golang-lru v0.5.1"
-	"github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/prometheus/client_golang v1.0.0"
-	"github.com/prometheus/client_model fd36f4220a901265f90734c3183c5f0c91daa0b8"
-	"github.com/prometheus/common v0.6.0"
-	"github.com/prometheus/procfs v0.0.3"
-	"golang.org/x/sync 112230192c580c3556b8cee6403af37a4fc5f28c github.com/golang/sync"
-	"golang.org/x/sys 51ab0e2deafac1f46c46ad59cf0921be2f180c3d github.com/golang/sys"
-	"golang.org/x/tools e713427fea3f98cb070e72a058c557a1a560cf22 github.com/golang/tools"
-	"google.golang.org/api v0.7.0 github.com/googleapis/google-api-go-client"
-	"google.golang.org/genproto c506a9f9061087022822e8da603a52fc387115a8 github.com/googleapis/go-genproto"
-	"google.golang.org/grpc v1.22.0 github.com/grpc/grpc-go"
-	"go.opencensus.io v0.22.0 github.com/census-instrumentation/opencensus-go"
-)
-
-inherit golang-build golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGIT_COMMIT="aedde73f9c304e4d558a53ece22a5472c87a7fdb"
-EGO_PN="github.com/google/mtail"
-SRC_URI="https://${EGO_PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-DESCRIPTION="A tool for extracting metrics from application logs"
-HOMEPAGE="https://github.com/google/mtail"
-LICENSE="Apache-2.0 MPL-2.0 BSD BSD-2 MIT"
-SLOT="0"
-IUSE=""
-RDEPEND="!app-misc/mtail"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -e 's|GO111MODULE=on go build|go build|' \
-		-e '/go get/d' \
-		-e 's|^branch :=.*|branch := master|' \
-		-e "s|^version :=.*|version := v${PV/_/-}|" \
-		-e "s|^revision :=.*|revision := ${EGIT_COMMIT}|" \
-		-e "s|^release :=.*|release := v${PV/_/-}|" \
-		-i "src/${EGO_PN}/Makefile" || die
-}
-
-src_compile() {
-	export GOPATH="${S}"
-	export -n GOCACHE XDG_CACHE_HOME
-	go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/vendor/golang.org/x/tools/cmd/goyacc" || die
-	emake -C "src/${EGO_PN}"
-}
-
-src_install() {
-	dobin src/github.com/google/mtail/mtail
-	dodoc "src/${EGO_PN}/"{CONTRIBUTING.md,README.md,TODO}
-}
diff --git a/app-admin/mtail/mtail-3.0.0_rc35.ebuild b/app-admin/mtail/mtail-3.0.0_rc35.ebuild
index 17c8e690353e..8b1f83b9fd10 100644
--- a/app-admin/mtail/mtail-3.0.0_rc35.ebuild
+++ b/app-admin/mtail/mtail-3.0.0_rc35.ebuild
@@ -1,5 +1,6 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=7
 
 inherit go-module
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 599066b57d60..1710038f15aa 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -3,5 +3,8 @@ AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_6.14.0-1stretch_amd64.deb 22450130 BLAKE2B fe6e30d99357328a884944e59d7cb1c66ad9fc36642ba377ed99e23551c5cbf06cffc4336b47440389fee7a9f1996b8325d18335768187f5d052fcecae041f5b SHA512 41d87f1ab4ead019eb5ef90ad21e557db686729151618e4ec642ea6636feda383874f7d457de7e9e323cf44d9d410e7fb650edd6e69b186c2fdff5657955ac5a
 DIST puppet-agent_6.14.0-1stretch_i386.deb 22792198 BLAKE2B 7638fd1edfeb22377ab22484dd0fd5377bab6ee5e3e01c64ffd8eae29b08e0182204446db23d8cf68018a58c2419ce22c4dda4fd10a6dfac64356d68a5478bfa SHA512 dc787dfeb2565fde00da6e991fb94435c56e804657a38268ad49d72783b9857de4e359d6d9002525759684ddcb48a00e2fdb73f069cd79da74237bcb9530a116
+DIST puppet-agent_6.15.0-1stretch_amd64.deb 22581842 BLAKE2B 19c45427e56a41f6030836129a7fb2824ea47f1000745a8c74b0968c61f719d3cef9a0e02f51009b8e91c4ad66445c074ccc203754bb13d82007316a3d053c60 SHA512 4ec7e04fb6bab697bfccd369740a57f735476a4614dbfa1f7c893901f5ffb9d6ce3d79886b6e035805b1a8f2c3de3e0b9b468b08909881df6022c9700c7a2768
+DIST puppet-agent_6.15.0-1stretch_i386.deb 22917002 BLAKE2B 5bab2b6cdde11a46e64996074e8db50d48d004b601c0d08ddfde9c8dec0c0f62da1176b9148d084f0250b582460606b7cd0a97291d157a186b7a97dee4184c51 SHA512 89e676491f7b7b44c9c747b129166db7b025adf76d9911d12d7d026aa8d04de293d3d1c638ca309ee8ed45a37c49b4ab0076ea0c711ac0e43f4297084446784f
 EBUILD puppet-agent-6.14.0.ebuild 2016 BLAKE2B 4f4382314410a9401868382b65e5ce627e9c706120dc21a537b71b390bd56480988b36e51f000303542d8711f2aebd47860605e8f52087c895e9453d2992a84a SHA512 45a7eaf2fbd6c66b672943192a92826ee10da6f0ba3a4d8cdc6c9ad2103d2fa534587dc31f5505bc8c9a23474e604ac58af0b328723668cd772a1e75fe6d0d5f
+EBUILD puppet-agent-6.15.0.ebuild 2018 BLAKE2B 74f72ffb55bb069bca1a2ea3db686ae1d5236e8c180b3b14afd18f451c7718e51ff09413380abb0bc79497ccde9aa011d7de55a9f7f92ce213d9b8361dde3d50 SHA512 f4aa0379772aa69bc9bb75fd085000e1ea64a889919b025372244f8a72df2da2f5bd27d51844d34985a8f397e9d6b8159ac46da647f62ae7f9e1cb2ec25d7000
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-6.15.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.15.0.ebuild
new file mode 100644
index 000000000000..6ef508024129
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-6.15.0.ebuild
@@ -0,0 +1,75 @@
+# 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_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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/7
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+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
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index e82007c49015..0f3df0666362 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -5,7 +5,11 @@ AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 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-6.14.0.tar.gz 2842351 BLAKE2B db9a467d8e0f4f25d45c2f735ee9d11ac6ed4e47c16b95ded3ff9f1c5055ea866735bcda27c19c2988035d9592035e433ef0d79a19781c99f4e97388edf46b93 SHA512 066ad8de6393cb58b1f92fae450dc72dabcbe912cdbb3417848a66955fe17696a68abf67d86b107a2b1c54e7037d38da7264a9234a8833b56065c8e407ff57a4
+DIST puppet-6.15.0.tar.gz 2880562 BLAKE2B 082f6a6b0ee56cdb1cd98b8cade8b07b7970ae0a78a9cf7c80e9af945eb722ad156b28004ad565c51750a63fa5932e99b1dd39ac0d4008d3ed225868e7671a31 SHA512 ac7e17bd87ee924fd928d565389b424ff2ed45b9b08e1be4eff4dec3688545657e2dfede46adeb48faecf3875c640c99b07ed6e09906b3e66b4654bb984d9296
 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-6.14.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
+EBUILD puppet-6.15.0.ebuild 3639 BLAKE2B 818e60019ca433e92b51946d2ad453c16a844820a5edbd91d3acd1a08b654dfdeb441dffd52ea4ef1418b1e4e0194df2391aae93a9d959b4f9dbb4121182bb2c SHA512 85bc153ff019d9db4cbb5eb334662b2c39e293abb646480122d141fe1f84b49fbc98b3f255e8877b421d1274c7fc3946dc6cf28a3ff8dfda437e7b7661243678
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-5.5.20.ebuild b/app-admin/puppet/puppet-5.5.20.ebuild
new file mode 100644
index 000000000000..92e56e9b375a
--- /dev/null
+++ b/app-admin/puppet/puppet-5.5.20.ebuild
@@ -0,0 +1,140 @@
+# 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 ruby-fakegem eapi7-ver
+
+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.15.0.ebuild b/app-admin/puppet/puppet-6.15.0.ebuild
new file mode 100644
index 000000000000..f50ee1410b08
--- /dev/null
+++ b/app-admin/puppet/puppet-6.15.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 6be44eee5212..b3ebb9d149d6 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.9.1.tar.gz 44274016 BLAKE2B eaf1fe6ee88d2f4a1d147032db017eefd95a3edaba6fe5b114be6ac4ce37584ee58fa96c34fdac97b9b8b1aecd8abc982107024d2155bb78781d1c2c2f2112e1 SHA512 8db39c7571af597be2cff7e21ec5818d422f83f1c3188896e8eb9391e52d0f4bb1f85358a25998db599e9db2b93baec60415a43b519be3da600a9c1de0f073bc
+EBUILD puppetdb-6.10.0.ebuild 2649 BLAKE2B 61c2280603f62775d7e3c06142c0bad6d28795dfd396c45c73680e7d33b034e8f656994a21b304e438f89fc9d700e722bdbbc94dec544cda0f6abbe560c9d1e1 SHA512 1dbf062b0f95659020fcd4ec207aeb658a62e35e74f868d95c91ccabf1115b22536be505fb2de84427a6506c47ecd7cbb3ca0164f618e4d297b921a629065b6c
 EBUILD puppetdb-6.9.1.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.10.0.ebuild b/app-admin/puppetdb/puppetdb-6.10.0.ebuild
new file mode 100644
index 000000000000..5a7a32bcf49c
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-6.10.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+="acct-user/puppetdb
+	acct-group/puppetdb"
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index d08a7642fc0e..e5b568ca4742 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.9.1.tar.gz 59496176 BLAKE2B 1599380ebf731fb4d67c04abc06303647d5d29c99f2b9721d049972eaaf3d4c2b108c6ac2f1a45efce3c52e9a57ebd362c874c36093027ebca77a2ae1d4c0323 SHA512 3a794adfa48c7bf9bd241c9da0578ea192b8551e75093e4d95c7c10fa659ef59d59ae72b33561d13ac31e839245d266301a6067d30b466138a95a6c4879bc58a
+EBUILD puppetserver-6.11.0.ebuild 5329 BLAKE2B 5c95f3bb71eec4b03add549fb79d3217d8d27011039aa0cf4aa41e7e405713dbfe42134f1b4f28926d41acb2d8766c5b648c7ce508bd5141e6bbd409460c9aa8 SHA512 79e7cac0efab3c480be57f739c17bda61cc74d05cd8541de20be5d2ab64524c33ebf5793e9369d69fc65f55d6c46b8a6501163bd6e2ee4ffb78263094018e58a
 EBUILD puppetserver-6.9.1-r1.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
 MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-6.11.0.ebuild b/app-admin/puppetserver/puppetserver-6.11.0.ebuild
new file mode 100644
index 000000000000..94b63776bb90
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-6.11.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+="acct-user/puppet
+	acct-group/puppet"
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	dodir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+	insopts -m 0644
+	insinto /usr/lib/tmpfiles.d
+	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
+}
diff --git a/app-admin/pwcrypt/Manifest b/app-admin/pwcrypt/Manifest
index d211d51b223b..e4f869b3de07 100644
--- a/app-admin/pwcrypt/Manifest
+++ b/app-admin/pwcrypt/Manifest
@@ -1,3 +1,4 @@
+AUX pwcrypt-gcc-10.patch 2031 BLAKE2B 58df1816fd176cd486c46a96a56ad7c814b47d214a71292967fa02a30e5d8ced81d8483ce830993979f0f74ef747017d590955d67252e385a7a7b173a1a4300a SHA512 a0560fdd2f4ad82d3f63dbcba148255e8f451944961bb12e69f9dbe2566f02f3b1d853d2fe69a76c1fa94d0218ec9bc7c0bbafef1528a42f67f36bc3ee6d33be
 DIST pwcrypt-1.2.2.tar.gz 36902 BLAKE2B 3cb63bf2a907f4394a7bb5317c7c0bf9ac493de41a54f7107c01a46dea41d32c8e24631f5197e3c62c62d6d44d959f505874e0a3d6ab7c0fc04863165b37ec56 SHA512 41644e82f8306003e9346900d7a961e87a5b8103ebc411cf09b5e0e40d8253b4c38a83db57c60f09d2dd2663ecc2e2edc10ea2b6d095c102ee10ae251b471ddf
-EBUILD pwcrypt-1.2.2-r2.ebuild 603 BLAKE2B ac51bb99c0ab2e51d612cedefa18222b936c353b50233a399108257d7355a2f3355592ffe8906d91e9f1358189d5d470d652027521f51446936c16936d88c7e1 SHA512 88797f0e9d81baf5416ccb14c8ee302ffbb47c09f4dc6f69270acbe71285e2e962e26fa9da7b320a84611382986c6d65166525121aa523e2a1434a922a1d2409
-MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
+EBUILD pwcrypt-1.2.2-r2.ebuild 650 BLAKE2B cab7322ac9222927ff28a6f74c4b2a39db4116ab0e535b6aa105395e82e0142d0d3da7554fff06eb9fbde5d1a52e2965420aac7d07813164679d3df299b0ff07 SHA512 5fda491d896d9562e110f67c861546314b5b48582c70fa6f8d88672928329149becdb109fda87cd5cefcf340d5cc6bef5a1fbd8f9ee1d41f7beb76ca6bf27d8f
+MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/app-admin/pwcrypt/files/pwcrypt-gcc-10.patch b/app-admin/pwcrypt/files/pwcrypt-gcc-10.patch
new file mode 100644
index 000000000000..745c93f5d156
--- /dev/null
+++ b/app-admin/pwcrypt/files/pwcrypt-gcc-10.patch
@@ -0,0 +1,66 @@
+--- a/src/cli-crypt.h
++++ b/src/cli-crypt.h
+@@ -27,16 +27,16 @@
+ #define LSIZE	1024	/* our standard buffer size for static memory */
+ 
+ /* our global variables */
+-char cleartext_pass[LSIZE];	/* where do we store the initial cleartext of the password */
+-char encrypted_pass[LSIZE];	/* where we stuff our password once it's encrypted */
+-char salt_src[LSIZE];		/* a place we can store text to scramble to get our salt */
+-char salt[LSIZE];		/* the actual salt we end up with using in our call to crypt(); */
++extern char cleartext_pass[LSIZE];	/* where do we store the initial cleartext of the password */
++extern char encrypted_pass[LSIZE];	/* where we stuff our password once it's encrypted */
++extern char salt_src[LSIZE];		/* a place we can store text to scramble to get our salt */
++extern char salt[LSIZE];		/* the actual salt we end up with using in our call to crypt(); */
+ 
+ /* flags we use to determine how we're doing things */
+-short int md5;		/* we doing md5 passwords */
+-short int quiet;	/* are we to be quiet */
+-short int debug;	/* do we print debug info? */
+-short int do_salt;	/* do we need to provide a salt? */
++extern short int md5;		/* we doing md5 passwords */
++extern short int quiet;	/* are we to be quiet */
++extern short int debug;	/* do we print debug info? */
++extern short int do_salt;	/* do we need to provide a salt? */
+ 
+ 
+ /* from main.c */
+--- a/src/crypt.c
++++ b/src/crypt.c
+@@ -26,7 +26,7 @@
+ 
+ #include "include.h"
+ 
+-
++char encrypted_pass[LSIZE];
+ 
+ short int cr_crypt() {
+        	char *cp;
+--- a/src/getopt.c
++++ b/src/getopt.c
+@@ -25,6 +25,13 @@
+ 
+ #include "include.h"
+ 
++char cleartext_pass[LSIZE];
++
++short int md5;
++short int quiet;
++short int debug;
++short int do_salt;
++
+ void cr_version(char *me) {
+ 	/* some quick mutzing around to get the == of `basename $0` */
+ 	char lme[LSIZE];
+--- a/src/random.c
++++ b/src/random.c
+@@ -27,6 +27,9 @@
+ 
+ #include "include.h"
+ 
++char salt_src[LSIZE];
++char salt[LSIZE];
++
+ /* shared amongst the functions in this file */
+ long int rand_file;
+ 
diff --git a/app-admin/pwcrypt/metadata.xml b/app-admin/pwcrypt/metadata.xml
index 21dc8fdf43ff..7ffc4339bc56 100644
--- a/app-admin/pwcrypt/metadata.xml
+++ b/app-admin/pwcrypt/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hattya@gentoo.org</email>
-  </maintainer>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild b/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
index 7a0b4f3d0921..250ada02cb4d 100644
--- a/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
+++ b/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
@@ -1,23 +1,25 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit toolchain-funcs
 
 DESCRIPTION="An improved version of cli-crypt (encrypts data sent to it from the cli)"
 HOMEPAGE="http://xjack.org/pwcrypt/"
-SRC_URI="http://xjack.org/pwcrypt/downloads/${P}.tar.gz"
+SRC_URI="http://xjack.org/${PN}/downloads/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
+PATCHES=( "${FILESDIR}"/${PN}-gcc-10.patch )
 DOCS=( CREDITS README )
 
 src_prepare() {
 	default
+
 	sed -i "s/make\( \|$\)/\$(MAKE)\1/g" Makefile.in || die
 	sed -i \
 		-e "/^LDFLAGS/s/= /= @LDFLAGS@ /" \
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index e81cf09de746..1076bfc4aa00 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -1,7 +1,7 @@
 DIST restart-services-0.14.1.tgz 20909 BLAKE2B 2f6b74fc6094be83e1872d2a6ca7abb02a49b5db65d81cd37f8161bac148e5fe0614502f1f06356ff9cd6c6ba03c416dae1eec3a86f48dc011bc6e28c1b076e3 SHA512 3434c4b6cdf9d02b035eba2cc67cebe8e06a2cf31c2d8627063b84224dcb6d44e276e1fcb82221ad77ab7ee7e16fa7ee58fb94b7849d40e6786d3fcfb6087866
-DIST restart-services-0.14.2.tgz 21227 BLAKE2B 9a3f03bbd1995df6f583f8c4228914f098922828b1407c0c8069908ebdbef67599a8a7421b0c404adf2d330632ae83646300a965c514f6746bbd95674ab102ea SHA512 487e8d0a448954be7b79d1c95bffd00d5f875ccb908b8004e18e45752e593fe57713f97c0749e28367bf7606c5cf46556f31de6b018a151f7cd384c88277ca7c
 DIST restart-services-0.14.4.tgz 21781 BLAKE2B 0d23ef098a3f15fdae23c9964f892e7095b04042dfed4c9da4d35fde8454d3f1fe5606c6e3e0141cb9e8d869f86df6b495ae985a0cf23d53a3a6d8eaa8964969 SHA512 89bd5edf5175694b3438788759f9b747251431ba700ad199f43b8fa551faa23411f33688e1aa6b04ae6524e737c4073926b989fa1422ddfca94514f9afd8de66
+DIST restart-services-0.15.1.tgz 23515 BLAKE2B a05ef908b95ccf5903d6c26079aaf58586d1e2fde120499e573e93773ed434f374b002b985d3579e879aeb99ae1828aa4ca7ea87fccc842da3c157023f8de690 SHA512 aa24c47b19711e2e57640a0ce436a51507669bcea3413d3f724bb336400bec05fed67b1a099d6494c70bff2c78aeb2e02dc5bf0c9f4844bb0a8fda169e2928b2
 EBUILD restart-services-0.14.1.ebuild 2285 BLAKE2B 7eb13e920790aae88e74b10cce100923aa490726011cdc33f96d0a38be957a0cbdc44e13a52b51a8b3c8d30e33464f72073f49888ffc4c573a65287ed49624c7 SHA512 841a1c6fa9d4c8b435f015c1785dd7c39929c808d771b7095f89a2d2832664a5b8915b3dfe56db5d9e4898a3d21b93e2c8ae01fa4502f33e5396ec6508c55a53
-EBUILD restart-services-0.14.2.ebuild 1769 BLAKE2B 8190b85be93b2c844bd832ace2bb962d09dfa4f8da8c930c2cc9bfe12516c62a0f3be0d403d74ac7471e635b92689a95b5dc46aa13cf99fcf49141a6faf3534e SHA512 18cdbd8f6f3b2c12df2e083fc86b927dea6e5ea1072c6ce716b9d7ef57973e8385bbac643ee66bd175f950dbc05109d8992b08ea04ced2367cff94948613b642
 EBUILD restart-services-0.14.4.ebuild 1766 BLAKE2B f82fa1a2985a1117cd0c30034273d25a77a0a22cae158c14eea457325c8d1a8c484cb1ddd924f220f2e8cfe676e2f977a1eccbdd1e4a7c30e410f6b988bedb9b SHA512 c59d1640a3694bc0e420a0db6fc7e4fcbb8133bbd517d8b36e84037f668feab5e10d4fb36c3bde3e949aa74bf09c6e7f841537a4dbeb2a86e4fd0687ab1317a7
+EBUILD restart-services-0.15.1.ebuild 1793 BLAKE2B 7cba407e822b45ea90c5cc88ad767d232d4195f5e4b8d217237833f36679081ab7bf367d96d406e02adad4722a23d8826ee958bf6af70248e5d8156fd9951b66 SHA512 d958bd1e77eb7b68d89a55e34716d0f4f4dd2b1af407a3449d8d859484770747bd05ad9668c5e1ecc32636d8e63c692480a9d4316b8f8e5d25caa3740d1ec109
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/app-admin/restart-services/restart-services-0.14.2.ebuild b/app-admin/restart-services/restart-services-0.15.1.ebuild
index 86a6e7c0ebc9..874ac8f35520 100644
--- a/app-admin/restart-services/restart-services-0.14.2.ebuild
+++ b/app-admin/restart-services/restart-services-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ DEPEND=""
 RDEPEND="
 	app-admin/lib_users
 	sys-apps/openrc
+	app-portage/portage-utils
 "
 
 src_install() {
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index 73bf46386f8c..41eaa0f2ccf9 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -1,14 +1,6 @@
-DIST Rex-1.3.3.tar.gz 274725 BLAKE2B a87576a136baac488a040098f2089412e6b53bb9bc4da94b5d8233adce37d20f75d39960da5bd94dda99bac6c69b51d8834e9481aaef0afdd9d728b2c15b24eb SHA512 b2331e400027568f59496ff52f0a19bd009f66fea2a5b80ed9055859f59f0057afa50f61934cccd5af434c6f60dfa99700bc3904127b822a5ae684cb8bb6c70c
-DIST Rex-1.4.0.tar.gz 289330 BLAKE2B 70d74753e5b04b05ea7a5507f5c8c19ae953b4cc28e55e4d52dd57bbe2b3084ec00195d9f65f1a4c0ba712238ba8efe0cc4b33f236a7c4f9bb429ad2f98af652 SHA512 d14489157860df1b32dd2b4af7ce8148a9693d66f59bc0ee228c7c4ff57f38f7b308212c18fc7c0aff7a585a76028a9de0a7a96f8eb58c2455d19bd6b2713eab
-DIST Rex-1.4.1.tar.gz 317358 BLAKE2B 8c12d54e86684ec224a75693f82fd4728af32a986f166d530bccc2d06c5087fdb29f067d4419f3160244d37c12ace6cd29ba1322992bcc9f4a481c06e00efa51 SHA512 07e7d950326aaa60e05977f2acb2ac90f07efe0d56411ba202a4c60a890c37e984c6786383623ac67f8e36052cf8436e8430fd024dde282a7d2530425b420e8e
-DIST Rex-1.5.0.tar.gz 327424 BLAKE2B ea735ebeef7a4d879ec61783c7ee803f198b4091882bbdbaee1b415330fcb20ba408f082e7ecaaa5c63664d905690bd6b5601d2d726ff20f5dc9d1f8c6d470a4 SHA512 43a1e147e5d2dccdc641479f2bf5449b0051651d152823738caf946bb3ceecb444011c3273f0c70ca5feab737702f6cd609f5b211eec8261e1facd80c82b6c73
-DIST Rex-1.6.0.tar.gz 331330 BLAKE2B cb3a2895c1b7fd775aa762e8af7fbfdf3d14aac0d4ed5cd32bc65f4eb2b7794e438015daf9602cea3a852ed17dd207c9647303a106d8fff2cc89b5ce7a5ff0a2 SHA512 8e4421e034ddf7337266ce2002e96cad12a632ff37742991685d2919e3b11a4f6f3348097fd36717ab83a38e2e46aa974d0e56c67568a857c30f7ea673a51cda
+DIST Rex-1.10.0.tar.gz 332057 BLAKE2B fb8e22c25c6f5bbc696aa894cc2f77138e830bb7a41fcc42e677ae251b63fffc841d206a9c50dfda60e022fafccf4ca0181ba8ccb50151c74830994929cb70fa SHA512 eaebf722d741d028d1f89beefee756e0b2fa6e3ddb8c2d6196c4183aedb6b1dd0a7f5fd4bc4211e4da26f61138ee974aa689d84d909c8d63cc414f803227dcf2
 DIST Rex-1.9.0.tar.gz 331106 BLAKE2B 74bdf06be9454bc41c444a7d2bf576740e8ecfd2dd575d96172becaac5ee6031506b5ef111c6755a3bc3dcb1eb45722a14c050578cf816815954686a0e79a5ab SHA512 9f9f629d681cc9af3fabccbbb31a881ab7a0414b51e6f1fc45600772b5f7207f8bf27a757955576b15eb7e8e7339e9f4746c497e4111904ad57614ebf1e3cb55
-EBUILD rex-1.3.3.ebuild 1165 BLAKE2B 18d0b4b997e062eac059e348c19cc77f3dd20142f6b912ce9122029f9b020d06a757b6c42d36f9441c2d6f48649bbd93466d6eaad81325787b18a2bd124e1ca8 SHA512 f5a0e607a75089199e5a1979816916f3592844d8bf07eeced566aac2cf706b98096832e7303835cad200d2f8485c45bf5c1e92541beda4c321028c68e0884395
-EBUILD rex-1.4.0-r1.ebuild 1153 BLAKE2B b375b15001291702988f07603af9b54afc32c3762a5e78ea6f67706c943cc6af766e003dc1ad318bf299cf79a42f0e1c06c15de40d059487c0ee022958d0169a SHA512 819c53956bea6a3d165a9fe2528ddfb0b56743fe9d4389dae3f213432097a3cd30bfab396c96033c3cfc1cd6b0ed1d9594adaa026a0156cb8c4a38aa3a45bc76
-EBUILD rex-1.4.1.ebuild 1154 BLAKE2B 3f927f61e1d09229803df0e9e9fa9782ca819f4925b20e0b54ee9d4c3dc276d169c531ee0adc38bda25f6ef9834b70ab4c7b4e4d8712d501778e03a36df73d76 SHA512 0e3216353cd6861dfa8101599bf12e91fca589b0a085562d0b8aea95243506136725383a240a81bed32671e3e8d16cf2bc600a9cb31c81e55e75e2cd9433d273
-EBUILD rex-1.5.0.ebuild 3666 BLAKE2B f35b76024072e22c7252bc46fc568e6f16160e14ccce6aa684d177cfcd4febfe313aa4d3f5d13df9d1c43f48e62e4618cc226eccf408bfc2b65bd3c5270a11a6 SHA512 dc3f9ac8c3fa6c27ff6186950fd7a6af96839a4f52266a6a4749db85bcbc46d02f6806c35f8498f0a06e1c052deb3b882eb86b6403f599a91946ba1e156d388a
-EBUILD rex-1.6.0.ebuild 3690 BLAKE2B c7a716cdfaaae93100d0ad413ce33df190d73622502a2e75e2d21864dd60c5a03cef80ec6242af378c27594ae0f7ad303479d71cf5f2dffcc5e7081000daec46 SHA512 5421142ad66676135e369912ce069c01652b1d1436cd57030f282011e1c3fd7b695cc6ec2a446bd162e0eef31ff46cbe3ed4837c5505995e4b8ef04646fbac78
+EBUILD rex-1.10.0.ebuild 5099 BLAKE2B 03293ee5018b5dcee7561f30ce7527b9ca61714799b9855a1e4d08fa8ed9645f4cf9309a42cd18a951a079fbc85de769a9c38e90afcd84dcef84d9cb103f6dc6 SHA512 3584defd83a781332a3bd4e15d69525429bbfe4ed56f79b5b13dff38588c429e9881091b9cb41e75fbcd5315fbbb26036041ee2e9dc7a9756177703770779c81
 EBUILD rex-1.9.0.ebuild 5099 BLAKE2B 03c38fc711dd43055b32e4e29b9c8e095772d51e4e6c4e419da34e2b41b8d11fb469ef9b79ae94bcb85ac6472aea755c4d84bc9c702d72005e7f096f4c234c9e SHA512 99721ba1d4cd612aa6fe36af8d43e2ddd6087a999925676c3be4326a41092e0e92bd4b06bbcd3b064d9d3fc00ff450a2ecaecf37ca590d579f4eaf2cd9273f01
-EBUILD rex-9999.ebuild 5099 BLAKE2B 03c38fc711dd43055b32e4e29b9c8e095772d51e4e6c4e419da34e2b41b8d11fb469ef9b79ae94bcb85ac6472aea755c4d84bc9c702d72005e7f096f4c234c9e SHA512 99721ba1d4cd612aa6fe36af8d43e2ddd6087a999925676c3be4326a41092e0e92bd4b06bbcd3b064d9d3fc00ff450a2ecaecf37ca590d579f4eaf2cd9273f01
+EBUILD rex-9999.ebuild 5099 BLAKE2B 03293ee5018b5dcee7561f30ce7527b9ca61714799b9855a1e4d08fa8ed9645f4cf9309a42cd18a951a079fbc85de769a9c38e90afcd84dcef84d9cb103f6dc6 SHA512 3584defd83a781332a3bd4e15d69525429bbfe4ed56f79b5b13dff38588c429e9881091b9cb41e75fbcd5315fbbb26036041ee2e9dc7a9756177703770779c81
 MISC metadata.xml 24205 BLAKE2B 76aa5370179f64adaaf79cb730a4cc53deb191a27e97b10cbb26efd804572eb79d67d9abdb09c5e62d08d73d969848286516a2176099237feba2a5c855cd263d SHA512 a6cae05b4f46b10502da5acc2905f622b61a30329c300483cea39348e92d182d190dd61433c551a1948d4ac6a281b9f91c47b759f425055970e8c5a6349b8693
diff --git a/app-admin/rex/rex-1.6.0.ebuild b/app-admin/rex/rex-1.10.0.ebuild
index 796195929d6d..5cc3866dba75 100644
--- a/app-admin/rex/rex-1.6.0.ebuild
+++ b/app-admin/rex/rex-1.10.0.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == 9999 ]]; then
 	GITHUB_USER=RexOps
 	GITHUB_REPO=Rex
 	EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git"
-	EGIT_BRANCH="development-1.x"
+	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=JFRIED
+	DIST_AUTHOR=FERKI
 	DIST_NAME=Rex
 	KEYWORDS="~amd64 ~x86"
 fi
-
 inherit perl-module ${VCS_ECLASS}
 
-DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
+DESCRIPTION="(R)?ex, the friendly automation framework"
 
 SLOT="0"
 IUSE="test"
@@ -29,61 +28,69 @@ 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-Test-MinimumVersion
-	dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic
+	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
-	dev-perl/Digest-SHA1
+	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-XS
+	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
-	dev-perl/Test-Deep
+	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-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-Digest-MD5
-	virtual/perl-Exporter
-	virtual/perl-File-Spec
-	virtual/perl-MIME-Base64
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
+	virtual/perl-version
 "
 
-DEPEND="
+BDEPEND="
 	${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-7.110.100
 	test? (
-		dev-perl/JSON-MaybeXS
-		dev-perl/Test-UseAllModules
 		virtual/perl-File-Temp
+		dev-perl/Test-Deep
+		>=dev-perl/Test-UseAllModules-0.150.0
 	)
 "
 
-[[ ${PV} == 9999 ]] && DEPEND+=" ${DZIL_DEPENDS}"
+[[ ${PV} == 9999 ]] && BDEPEND+=" ${DZIL_DEPENDS}"
 
 src_unpack() {
 	if [[ $PV == 9999 ]]; then
@@ -94,6 +101,35 @@ src_unpack() {
 	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"
@@ -101,6 +137,9 @@ dzil_to_distdir() {
 
 	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}"
 
diff --git a/app-admin/rex/rex-1.3.3.ebuild b/app-admin/rex/rex-1.3.3.ebuild
deleted file mode 100644
index af414184c6c9..000000000000
--- a/app-admin/rex/rex-1.3.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=FERKI
-MODULE_A=Rex-${PV}.tar.gz
-
-inherit perl-module
-
-DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/DBI
-	dev-perl/Digest-HMAC
-	dev-perl/Digest-SHA1
-	dev-perl/Expect
-	dev-perl/Hash-Merge
-	dev-perl/IO-String
-	dev-perl/IO-Tty
-	dev-perl/IPC-Shareable
-	dev-perl/JSON-XS
-	dev-perl/List-MoreUtils
-	dev-perl/Net-OpenSSH
-	dev-perl/Net-SFTP-Foreign
-	dev-perl/Parallel-ForkManager
-	dev-perl/Sort-Naturally
-	dev-perl/String-Escape
-	dev-perl/TermReadKey
-	dev-perl/Text-Glob
-	dev-perl/URI
-	dev-perl/XML-LibXML
-	dev-perl/XML-Simple
-	dev-perl/libwww-perl
-	dev-perl/YAML
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-Digest-MD5
-	virtual/perl-Exporter
-	virtual/perl-File-Spec
-	virtual/perl-MIME-Base64
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-perl/Test-UseAllModules
-		virtual/perl-File-Temp
-	)
-"
-
-SRC_TEST="do"
-
-S="${WORKDIR}/Rex-${PV}"
diff --git a/app-admin/rex/rex-1.4.0-r1.ebuild b/app-admin/rex/rex-1.4.0-r1.ebuild
deleted file mode 100644
index 567130b86b33..000000000000
--- a/app-admin/rex/rex-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=FERKI
-DIST_NAME=Rex
-
-inherit perl-module
-
-DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/DBI
-	dev-perl/Devel-Caller
-	dev-perl/Digest-HMAC
-	dev-perl/Digest-SHA1
-	dev-perl/Expect
-	dev-perl/Hash-Merge
-	dev-perl/IO-String
-	dev-perl/IO-Tty
-	dev-perl/IPC-Shareable
-	dev-perl/JSON-XS
-	dev-perl/List-MoreUtils
-	dev-perl/Net-OpenSSH
-	dev-perl/Net-SFTP-Foreign
-	dev-perl/Parallel-ForkManager
-	dev-perl/Sort-Naturally
-	dev-perl/String-Escape
-	dev-perl/TermReadKey
-	dev-perl/Test-Deep
-	dev-perl/Text-Glob
-	dev-perl/URI
-	dev-perl/XML-LibXML
-	dev-perl/XML-Simple
-	dev-perl/libwww-perl
-	dev-perl/YAML
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-Digest-MD5
-	virtual/perl-Exporter
-	virtual/perl-File-Spec
-	virtual/perl-MIME-Base64
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-perl/Test-UseAllModules
-		virtual/perl-File-Temp
-	)
-"
diff --git a/app-admin/rex/rex-1.4.1.ebuild b/app-admin/rex/rex-1.4.1.ebuild
deleted file mode 100644
index 099a61a9bc6f..000000000000
--- a/app-admin/rex/rex-1.4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=JFRIED
-DIST_NAME=Rex
-
-inherit perl-module
-
-DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-perl/DBI
-	dev-perl/Devel-Caller
-	dev-perl/Digest-HMAC
-	dev-perl/Digest-SHA1
-	dev-perl/Expect
-	dev-perl/Hash-Merge
-	dev-perl/IO-String
-	dev-perl/IO-Tty
-	dev-perl/IPC-Shareable
-	dev-perl/JSON-XS
-	dev-perl/List-MoreUtils
-	dev-perl/Net-OpenSSH
-	dev-perl/Net-SFTP-Foreign
-	dev-perl/Parallel-ForkManager
-	dev-perl/Sort-Naturally
-	dev-perl/String-Escape
-	dev-perl/TermReadKey
-	dev-perl/Test-Deep
-	dev-perl/Text-Glob
-	dev-perl/URI
-	dev-perl/XML-LibXML
-	dev-perl/XML-Simple
-	dev-perl/libwww-perl
-	dev-perl/YAML
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-Digest-MD5
-	virtual/perl-Exporter
-	virtual/perl-File-Spec
-	virtual/perl-MIME-Base64
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-perl/Test-UseAllModules
-		virtual/perl-File-Temp
-	)
-"
diff --git a/app-admin/rex/rex-1.5.0.ebuild b/app-admin/rex/rex-1.5.0.ebuild
deleted file mode 100644
index 4eedb99641f8..000000000000
--- a/app-admin/rex/rex-1.5.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	GITHUB_USER=RexOps
-	GITHUB_REPO=Rex
-	EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git"
-	EGIT_BRANCH="development-1.x"
-	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=JFRIED
-	DIST_NAME=Rex
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit perl-module ${VCS_ECLASS}
-
-DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
-
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DZIL_DEPENDS="
-	dev-perl/Dist-Zilla
-	dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome
-	dev-perl/Dist-Zilla-Plugin-MetaProvides-Package
-	dev-perl/Dist-Zilla-Plugin-OSPrereqs
-	dev-perl/Dist-Zilla-Plugin-OurPkgVersion
-	dev-perl/Dist-Zilla-Plugin-Test-MinimumVersion
-	dev-perl/Dist-Zilla-Plugin-Test-Perl-Critic
-"
-
-RDEPEND="
-	dev-perl/Data-Validate-IP
-	dev-perl/DBI
-	dev-perl/Devel-Caller
-	dev-perl/Digest-HMAC
-	dev-perl/Digest-SHA1
-	dev-perl/Expect
-	dev-perl/Hash-Merge
-	dev-perl/IO-String
-	dev-perl/IO-Tty
-	dev-perl/IPC-Shareable
-	dev-perl/JSON-XS
-	dev-perl/List-MoreUtils
-	dev-perl/Net-OpenSSH
-	dev-perl/Net-SFTP-Foreign
-	dev-perl/Parallel-ForkManager
-	dev-perl/Sort-Naturally
-	dev-perl/String-Escape
-	dev-perl/TermReadKey
-	dev-perl/Test-Deep
-	dev-perl/Text-Glob
-	dev-perl/URI
-	dev-perl/XML-LibXML
-	dev-perl/XML-Simple
-	dev-perl/libwww-perl
-	dev-perl/YAML
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-Digest-MD5
-	virtual/perl-Exporter
-	virtual/perl-File-Spec
-	virtual/perl-MIME-Base64
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Storable
-	virtual/perl-Time-HiRes
-"
-
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-perl/Test-UseAllModules
-		virtual/perl-File-Temp
-	)
-"
-
-[[ ${PV} == 9999 ]] && DEPEND+=" ${DZIL_DEPENDS}"
-
-src_unpack() {
-	if [[ $PV == 9999 ]]; then
-		"${VCS_ECLASS}"_src_unpack
-		mkdir -p "${S}" || die "Can't make ${S}"
-	else
-		default
-	fi
-}
-
-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_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 26385e391279..5cc3866dba75 100644
--- a/app-admin/rex/rex-9999.ebuild
+++ b/app-admin/rex/rex-9999.ebuild
@@ -123,7 +123,7 @@ dzil_src_prep() {
 		-i dist.ini || die "Can't patch dist.ini"
 }
 dzil_env_setup() {
-	# NextVersion noise :(
+	# NextRelease noise :(
 	mkdir -p ~/.dzil/
 	local user="$(whoami)"
 	local host="$(hostname)"
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index d64192ad768a..f4588f81dea4 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,19 +1,14 @@
 AUX 50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3
 AUX README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
+AUX rsyslog-8.2004.0-skip-librelp-openssl-specific-tests.patch 3560 BLAKE2B 193303698968cc9e1174543f1e91dbbfb27c009c8c0ff93ed4995335bd29769ca9c45509d439b72849ca79730665cfb160210f253f58efcac085fb3985beebcb SHA512 5bc5238e7b224565e04e5118d36081e3e8af43dc91ad7e077c87cdec7fb5d1509a573e6d93b3ba5041d0a9aef890aefb8ebf88bbd4accbdf8309134859bf05b7
 AUX rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10728a8d2b8acf2c08f613cea9c2a74d78ed7b75333147a6b1a553fe281956990e044a9db651c7486690dee SHA512 5ca68b4eec5bebaed48edb69c85f8338273db847ab1cc6999ce7cfe06644dc3854c3040e0ebd8a4900c213b267b2a081e7901ceb4e58f9dfdc7dc036aff02b6c
 AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
 AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
-DIST rsyslog-8.1910.0.tar.gz 2957635 BLAKE2B ea350d3fb923c2f7d2799942fec6a77ef893fa12bc95a5b1428b8e280d96b562cd864469ebf13ee57e9ea89787765a4bb13d155460defc73a3a85b17ad6a5ab1 SHA512 85f5df91a6357ecb38708b4d569d26804a50ca28c928a636ac7749595f1a7105c3450fbd521835a436ebdfdcac33a33986e09a09026745ea4d1a2897406770d5
 DIST rsyslog-8.1911.0.tar.gz 2967162 BLAKE2B 6c15436cf6751267de38662b2c5d524dc7f90add4ed1aa7102811d197c2d86847316b58ed626fe0ab2b731c445fbcfb328464a2b1b7c4c3afedccb103267f772 SHA512 8414901a5072cb2cc28d35802c9e22d0f9c88f2ae15985a087a86b0e4053471b02d43bcc95d0c466719105e0a5ee683927af3842b9487f27ddddc1ca00ed713a
-DIST rsyslog-8.2001.0.tar.gz 2999701 BLAKE2B 8b0b0af6a9f8ea53540cd4869ad9ccc6f1adfea3349c4785222d72028101d8e095a7bb0c0496b5026b4144a64cd5d42f547294f03c75a205fa5724e67675ff6e SHA512 a68053630c43bea813cc3191ebff04473031df49899a6be2d5c331ac18882f373fc54fd7fb45c397fcbbcb269f246eeba5e9126911edd1bfe1c52f60921740d2
-DIST rsyslog-8.2002.0.tar.gz 3000861 BLAKE2B b05081eefc9a9c7a2a5815b472ebecb0214b1855c87e2428d2114c6d390e0251a71dda6ed80e8c4c8368e9a327a1c5d36a906b1eabd485a64078f490ad09a115 SHA512 a01bb2f67d21ab6d96dd1302bc351b509892834ef44956983db912a63ba23201653ca1e6b176a574c47568665b4d92579bb8bb0fe6911646bc841a3754c2754f
-DIST rsyslog-doc-8.1910.0.tar.gz 8158007 BLAKE2B 7a05cf7070ba350d0fb939350868ff0dd9d03be46ebd1b1261e54add70ab680afe0b356f563ea9e10148aed17667fc0b729e2fa8f7ff7cff3e4cec9d0da209a8 SHA512 e46f14e40ae690efbe3114a859c1c94c8f9573ca5ebdb533ad4b5ed76c3a930c887cc205e7279fcc546fda3ce624eae507ce08d5d10ee1eb167a957edd742bf2
+DIST rsyslog-8.2004.0.tar.gz 3002704 BLAKE2B b5049448e0d09e048a45f067b5f8de453721ac5d63233f251e6e24fe2a722469cb19a91e83aa405ffc21245942b824e0a28ecd4e6df431517c8775e7a322bcd3 SHA512 1d7fac65cc97975a6765a55732d413e892502e53566c6fb7c1bfc0107b173eae77dd04c0c9a7471296dff998ceb2fd5a2374368a5a8528f8eb0a89d1915b0214
 DIST rsyslog-doc-8.1911.0.tar.gz 8183360 BLAKE2B f5681945fb30ddf9c21a60ebafaf99698f10ef4790e76c9f6f329763215d5a1d47918008ade3e8ff8b7d4fb3ce1220cfc6f307ebc1dbf85697c3d92f7b855023 SHA512 2326550a0db108db407b701ff0b7b8545f94d06c1979bfbea3496a9a652de2a22bf49e9b95d4b2e6256bbf1f9db6a1c9822557c6ebd6a56bc00f096a642b19df
-DIST rsyslog-doc-8.2001.0.tar.gz 8200594 BLAKE2B ad0fda200749083a56fd4d731b03982e25ff32a7c6b4ff10f996ee42a46c6985f11fc8265e6992d1d5c86973541d0b0cf15c014460792a4658f45a1a310aee4f SHA512 6d58a67914f65d75eb77411e760b9e49be3723fb6e4ab8951ce28bf83372e3ec7805fac5aef49158fa47c6c4a9109e887bcc46ed3ca0cdc53de4e9b66472be14
-DIST rsyslog-doc-8.2002.0.tar.gz 8330832 BLAKE2B 1d27326dadcf06b158b28bbd66498559e4eb5012f84e073c63ab880b411e838550350b43cb0879f67f7b05541f6fcb659e406eaf5baf1d4d4b601d06e581d2bf SHA512 5d6bd8fe09b49644f000416c87c8600cd3df3facb07845afd85012279df203a44b234e94a7be90ad83709d5f2ad1a2bf8cb51571c5c0cd76383f76f81455945e
-EBUILD rsyslog-8.1910.0-r1.ebuild 12536 BLAKE2B aefb55649f1aaf7b98b5a9f85e87188dcd1546c149023190dcde3f292d7065bd4249f39e19459fbf1b0d34ceb28204ec5b201f4e3cc6b0946f70b46017554a84 SHA512 0bec3b0bdeb0f36b88569f74af758d43c8816955c53dffd74d991fff2f6c211c55a16c2ed09ad38cb34720439a9afa31198ebf4b585b3577576346018e88c931
+DIST rsyslog-doc-8.2004.0.tar.gz 8323570 BLAKE2B 76b6acc7614f1cbe0a4f99a2a27ff44e2706d1a570afb7d92c628154d49bde5b00a7a4ae1c7d9639f67270f3080a6637cbebb14eaa43484655b322def11b367f SHA512 1a95b334bfe4c2a1d4844983cf32e44205ec6b7cabf1a6914a9ebb335d3d8f78655caf2a55a8cf444352af7d9ae92daa09e8fdf36e520554ed4807a4ed5fd393
 EBUILD rsyslog-8.1911.0-r1.ebuild 12536 BLAKE2B aefb55649f1aaf7b98b5a9f85e87188dcd1546c149023190dcde3f292d7065bd4249f39e19459fbf1b0d34ceb28204ec5b201f4e3cc6b0946f70b46017554a84 SHA512 0bec3b0bdeb0f36b88569f74af758d43c8816955c53dffd74d991fff2f6c211c55a16c2ed09ad38cb34720439a9afa31198ebf4b585b3577576346018e88c931
-EBUILD rsyslog-8.2001.0.ebuild 12544 BLAKE2B 52720822eb3f460e33cfeff6a880f975c5c5ee9fbb9f537e7a549078f8433568c333d08c46ed149e452848b635f9371752ceec13e1e9d80d72274d89a03523a6 SHA512 1e65de1df79c2d3643a26c7642889e44647b7d1b5d95ca2083f554d272d8e0ba1a279e72b7dd3d5d002eee6158d90dff0d701f3f3bc54ee488cb1c23314289cd
-EBUILD rsyslog-8.2002.0.ebuild 12544 BLAKE2B 52720822eb3f460e33cfeff6a880f975c5c5ee9fbb9f537e7a549078f8433568c333d08c46ed149e452848b635f9371752ceec13e1e9d80d72274d89a03523a6 SHA512 1e65de1df79c2d3643a26c7642889e44647b7d1b5d95ca2083f554d272d8e0ba1a279e72b7dd3d5d002eee6158d90dff0d701f3f3bc54ee488cb1c23314289cd
+EBUILD rsyslog-8.2004.0.ebuild 12616 BLAKE2B 487e3ab8a313a20798e461ccd9cf5ac378a7f6d162beee236aed15a2d603c632d71e60ab30670e1a83f1e3201951bf32f960707b191ae558c1684ddea59b7275 SHA512 11b358a75f4de60eae5104782208c913fa9657376e5cf60d1d6ad51de3c990e8b5bedf7a611cb91a5806e341d1f6b70026a62dd46cdb6ae229fa5833b9493158
 MISC metadata.xml 3874 BLAKE2B c09a57dcbd88bda6c510ca741e1ee8c5207e5906843fe3ae21c8dd6575c7b104dae74e79e5a27c8bf9f0348673f5c33eb6c4b12fafbb1ba64f1a9f81bd374eaa SHA512 2f7a72017376018aa5d864deb33675d51ab50cd8481dffb7f1421b83d4e07f19a86a90705dbb6191686fc650284e2bcbe30ed0af07082b57eef46dd615778868
diff --git a/app-admin/rsyslog/files/rsyslog-8.2004.0-skip-librelp-openssl-specific-tests.patch b/app-admin/rsyslog/files/rsyslog-8.2004.0-skip-librelp-openssl-specific-tests.patch
new file mode 100644
index 000000000000..bc047a41a1ea
--- /dev/null
+++ b/app-admin/rsyslog/files/rsyslog-8.2004.0-skip-librelp-openssl-specific-tests.patch
@@ -0,0 +1,106 @@
+From 15f5a1bda22bc4586e7ad8d24222befd1933a822 Mon Sep 17 00:00:00 2001
+From: Andre lorbach <alorbach@adiscon.com>
+Date: Wed, 29 Apr 2020 09:24:10 +0200
+Subject: [PATCH] SKIP librelp tlscmd tests if librelp was build without
+ openssl support
+
+closes https://github.com/rsyslog/rsyslog/issues/4131
+---
+ tests/imrelp-tls-cfgcmd.sh      | 23 ++++++++++++-----------
+ tests/sndrcv_relp_tls-cfgcmd.sh | 25 +++++++++++++------------
+ 2 files changed, 25 insertions(+), 23 deletions(-)
+
+diff --git a/tests/imrelp-tls-cfgcmd.sh b/tests/imrelp-tls-cfgcmd.sh
+index bbd63c9cd3..bb1af4ec91 100755
+--- a/tests/imrelp-tls-cfgcmd.sh
++++ b/tests/imrelp-tls-cfgcmd.sh
+@@ -1,6 +1,7 @@
+ #!/bin/bash
+ # addd 2019-11-14 by alorbach, released under ASL 2.0
+ . ${srcdir:=.}/diag.sh init
++require_relpEngineSetTLSLibByName
+ export NUMMESSAGES=1000
+ export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout"
+ export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.receiver.debuglog"
+@@ -27,21 +28,21 @@ tcpflood --check-only -k "Protocol=-ALL,TLSv1.2" -u "openssl" -Trelp-tls -acertv
+ shutdown_when_empty
+ wait_shutdown
+ 
+-content_check --check-only "parameter tls.tlslib ignored" ${RSYSLOG_DEBUGLOG}
++content_check --check-only "relpTcpTLSSetPrio_gtls" ${RSYSLOG_DEBUGLOG}
+ ret=$?
+ if [ $ret == 0 ]; then
+-	echo "SKIP: Parameter tls.tlslib not supported"
++	echo "SKIP: LIBRELP was build without OPENSSL Support"
++	skip_test
++fi 
++
++content_check --check-only "OpenSSL Version too old" ${RSYSLOG_DEBUGLOG}
++ret=$?
++if [ $ret == 0 ]; then
++	echo "SKIP: OpenSSL Version too old"
+ 	skip_test
+ else
+-	content_check --check-only "OpenSSL Version too old" ${RSYSLOG_DEBUGLOG}
+-	ret=$?
+-	if [ $ret == 0 ]; then
+-		echo "SKIP: OpenSSL Version too old"
+-		skip_test
+-	else
+-		# Kindly check for a failed session
+-		content_check "relp connect failed with return 10031" ${RSYSLOG_DYNNAME}.tcpflood
+-	fi
++	# Kindly check for a failed session
++	content_check "relp connect failed with return 10031" ${RSYSLOG_DYNNAME}.tcpflood
+ fi
+ 
+ exit_test
+\ No newline at end of file
+diff --git a/tests/sndrcv_relp_tls-cfgcmd.sh b/tests/sndrcv_relp_tls-cfgcmd.sh
+index ff7b3bb75c..57e0f720f0 100755
+--- a/tests/sndrcv_relp_tls-cfgcmd.sh
++++ b/tests/sndrcv_relp_tls-cfgcmd.sh
+@@ -1,6 +1,7 @@
+ #!/bin/bash
+ # added 2019-11-13 by alorbach
+ . ${srcdir:=.}/diag.sh init
++require_relpEngineSetTLSLibByName
+ export PORT_RCVR="$(get_free_port)"
+ export RSYSLOG_DEBUG="debug nologfuncflow noprintmutexaction nostdout"
+ export RSYSLOG_DEBUGLOG="$RSYSLOG_DYNNAME.receiver.debuglog"
+@@ -40,22 +41,22 @@ wait_shutdown 2
+ shutdown_when_empty
+ wait_shutdown
+ 
+-content_check --check-only "parameter tls.tlslib ignored" ${RSYSLOG_DEBUGLOG}
++content_check --check-only "relpTcpConnectTLSInit_gnutls" ${RSYSLOG_DEBUGLOG}
+ ret=$?
+ if [ $ret == 0 ]; then
+-	echo "SKIP: Parameter tls.tlslib not supported"
++	echo "SKIP: LIBRELP was build without OPENSSL Support"
++	skip_test
++fi 
++
++content_check --check-only "OpenSSL Version too old" $RSYSLOG_DEBUGLOG
++ret=$?
++if [ $ret == 0 ]; then
++	echo "SKIP: OpenSSL Version too old"
+ 	skip_test
+ else
+-	content_check --check-only "OpenSSL Version too old" $RSYSLOG_DEBUGLOG
+-	ret=$?
+-	if [ $ret == 0 ]; then
+-		echo "SKIP: OpenSSL Version too old"
+-		skip_test
+-	else
+-		# Kindly check for a failed session
+-		content_check "librelp error 10031" $RSYSLOG_DEBUGLOG
+-	#	content_check "OpenSSL Error Stack:"
+-	fi
++	# Kindly check for a failed session
++	content_check "librelp error 10031" $RSYSLOG_DEBUGLOG
++#	content_check "OpenSSL Error Stack:"
+ fi
+ 
+ exit_test
+\ No newline at end of file
diff --git a/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
deleted file mode 100644
index 496ad7402056..000000000000
--- a/app-admin/rsyslog/rsyslog-8.1910.0-r1.ebuild
+++ /dev/null
@@ -1,462 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit autotools eutils linux-info ltprune python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="amd64 arm ~arm64 hppa x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
-IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
-IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	normalize? (
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/${PN}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/${PN}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.2002.0.ebuild b/app-admin/rsyslog/rsyslog-8.2002.0.ebuild
deleted file mode 100644
index e3157ed0808d..000000000000
--- a/app-admin/rsyslog/rsyslog-8.2002.0.ebuild
+++ /dev/null
@@ -1,462 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit autotools eutils linux-info ltprune python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
-IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
-IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	normalize? (
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/${PN}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/${PN}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.2001.0.ebuild b/app-admin/rsyslog/rsyslog-8.2004.0.ebuild
index e3157ed0808d..307fd0230e58 100644
--- a/app-admin/rsyslog/rsyslog-8.2001.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2004.0.ebuild
@@ -73,7 +73,7 @@ RDEPEND="
 	uuid? ( sys-apps/util-linux:0= )
 	xxhash? ( dev-libs/xxhash:= )
 	zeromq? (
-		>=net-libs/czmq-3.0.2
+		>=net-libs/czmq-4:=
 	)"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-archive-2015.02.24
@@ -98,6 +98,8 @@ if [[ ${PV} == "9999" ]]; then
 	DEPEND+=" >=dev-python/docutils-0.12"
 fi
 
+PATCHES=( "${FILESDIR}"/${P}-skip-librelp-openssl-specific-tests.patch )
+
 CONFIG_CHECK="~INOTIFY_USER"
 WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
 
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index d24d09176a4d..065dbd702e48 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -5,25 +5,26 @@ 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-2018.3.2-skip-zeromq-test-that-hangs.patch 2820 BLAKE2B e531bddf576322f8417e7e362bfed7aa21ce8f1edc1702074f250efc9118c755664bd2976282399b725c1f56362e37fa07064b9e4ac2a72c413a56b13d325cdd SHA512 72cbc1e7c8d59883bcbe8130fdbae6e1ccecfabe74069a7389e63f797609930036c593204ab441cff92933d3d35a24feb7db0dc76804d76608190e93a8bc6ed4
-AUX salt-2018.3.4-tests.patch 2944 BLAKE2B f41c1e53297e1828c840d0ff22a49e2d47b40932615006f1fcebf6732faf0fb79a3149cc0c1be1d6daae60ce6f93e338e7eddd7cb80e076c1fdb68d560928050 SHA512 6ab26d0ae06adeb590b0b4a77fc3d0273f3624a1e8adacbaffe1ec3ae7d1066e7be5116dcde3c4118f7008a940995665777eedf15dd17c42825d08f22a33a741
-AUX salt-2019.2.0-newer-deps.patch 9260 BLAKE2B 02234367c4de7586b72502126fec7392dca96a284058b6c21733d21e5a61e12e81da054454aae20b290b9179fc7790e74ac111c7b1b638b36a935806e367902f SHA512 1e999b302323c4880103f8e68aa4c471c280484c91af0c4ac8ae85270553d178bb79a4a7d33fcc4b3a0ba2a6d95a8199d411b15e35b87f33004821dea4a07360
 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
 AUX salt-2019.2.2-workaround-broken-mock-on-py2.patch 1224 BLAKE2B ea81b3a699220fd0084eb1f259e59d28c75b5bafb9ce0988b987f373265f58d8184a4703c5b2f36fddf7dad5e7be666280c1b4f5c4d6d11ce71c636cbc380b94 SHA512 2078c489080aa0731d0304835fbf9fdfa88bba4fca4fa8d19d708927e1583d3e3a17d49fbb233b6a41d079a921eb2cdf2f7fa9bd606005ca7259548cff7f66ae
+AUX salt-3000.1-tests.patch 2390 BLAKE2B f46b8a4aa2c57307385d6e56b54b54ebeb18bfa298b66804a64c7e64608fb07a8fea8eabeebb8ba1772936cf50541d6bea81eefcf9617ccb8074b534ac0ec1af SHA512 5e3a212995f8f4fae4e3c4c51519fd2e7bfa20b39492485e10788b3cf72ff9344681fdff4a2d6364e7e4b9c9554fd3efffb9d197aad445423950ce72c6455b2b
+AUX salt-3000.2-py38-abc.patch 2641 BLAKE2B 054fae62aee23528beaad9e4c9c8ac72c1f9a208e2b5d2d17af08ef0e810e7b2ba93522c110bf052a4d3d8831aa772eb3ab7fcb378034634a4b46f10af5c5c20 SHA512 b4feaa17cdbbb9cdf4ec7759b9fa201d731680939e199edd2e683ca6dc5b2cf99aa6fa8f87517dfbd5b6af2ccafbdb50cf9744345149131941f1bd107145cf69
+AUX salt-3000.2-py38-logwarn.patch 4875 BLAKE2B f0ced7bad98983296561d223405d512077c0b70de12a8af613d4069842d3cb6167dd0da49c30fc881e985594f755ce0b063df311bbe84ae9cfc37896670aca52 SHA512 94ca1f73cbeb9d3ab93cb1c7afd4abce5318022a267342e4b348066c5508016891a3c05bd0ea867ae868794684bdc1bfd3e7779c4ea2a9cd60626d6513f8ba4e
+AUX salt-3000.2-py38.patch 1739 BLAKE2B 49591845a247f3e9fc092229950518b6ccb10035bc961a6193358a4be5b84b1e3d6fae69a5763b85966b1e115e8cf38378e2e88c66c3e10699ef47587aa3e7d7 SHA512 4a537c0e45c3287ddc71b91637b4b7f1d54e0dd4e524e91f39cabad08dda14ce5d2467c1f87bc81a098c36f0da1312b8e627189e0574d0ccecab064cba19acb9
+AUX salt-3000.2-tests.patch 587 BLAKE2B 5eb647ffd159bc56ce823c80fb384e7cd33e79c46baa3e607a772c6de1e8019c53908a2eb5111dd770b638c8088b76bee6c17f8cea9e17f3f7b8d3ab93568839 SHA512 ef6c1cd995a03d49ac2aaf65b516f0dc1ac9764e32392c67febdfd31d23ca178bb4f29a903b4d67f8792fe0fb903c03596cbfd1c1223e993189de890aa41b0c3
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
 AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0
 AUX syndic-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
 AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4e887c1e6487682efce7f5b75d3bcf366ef706a9fb1578dce537ac5b50324239378cecbd0715ad5d SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef
-DIST salt-2018.3.4.tar.gz 14404085 BLAKE2B 932b30b1ba60aefd3a6874a8ebe4cb6c469d82e31f6acdbe8a5641d09e3316796b5403ef803a355cec6255c1aede8bac3b66af179bd1bbaa5418c7076229cef9 SHA512 f17e06fdbf4741f231d9e769be57de4f6079e9283881b4bafa0d23928d7626a1f9c02b9f49c654b29c3e6ee8ed3d3ddf42c21baecef158ad63a97dc87895b21b
-DIST salt-2019.2.0.tar.gz 14952746 BLAKE2B aa3bba4b7d9548a8d333c242fc0265a743f56ff1a259da7c8618d37b3b022e12f09ac594a09f0ceec80fd9d3a6b6b9ec35b33e879b7a124e6612f2ec2a63a01c SHA512 de5a976213d011c230e423a172952effddb87168367958b8657eaaaf8fd2a8bec8471f547b6ff9e896a17064a13d387dbc12e12c605c8a241062e3238bd19eca
-DIST salt-2019.2.2.tar.gz 14420887 BLAKE2B 84e8a0aa72b88a66a1020b695849926669728ee02f8cb51a14853b5e9c2ab692fe65810367e5d53268f7b234c10911f16d063ce665b3761432ab1d9c0aa52d16 SHA512 2bbf9765384f1f6c2336a3f421298c8900cf459e6d1ebc7fb89284014ef8db9f5215a68de2bb06dfa3404983160a0c4c589ffa3dc046611dd5409bd502938677
-DIST salt-2019.2.3.tar.gz 14572686 BLAKE2B 770b815f43ca8651408c1c057377b02c8037e673584c719e0a9b5c56c13c8db2db0e2c8641a17323f2b890d4a69d1508b0090624c7067869d9fa84303c2f8585 SHA512 cd694ca19696a84e3370e39c61da180e508592253713d99dd6dd5342b57c2814fee22e46bade30d7604f5730d9e1a736e59c3a512161f744d3f097f74a2836c5
-EBUILD salt-2018.3.4.ebuild 4666 BLAKE2B 449bc2fdf71f45ac66dc62d03b4353f9fe316267017b47669dc4086af4ecdb975f45054fc75979cb1bf42c56143ece607d61747fc94817456c2484b428f6dfd0 SHA512 7845ef6bb5558b83b1ea26f8206cfad90ecd2be4fdc926634a0126459e2fb4afbdac2a5b0554114bb252b598b6c83402346a90433980461639b3f0a2a7b97cd0
-EBUILD salt-2019.2.0-r1.ebuild 4840 BLAKE2B 86f8e060d7cc1b8ef537bdd4b2419081150ac3809302899ac074d08dc0af4b8e3ca37249bac4c07a7e510de7505fe13ed20632a3f458a0d18c72fc5b63dd9c7f SHA512 4fcdfdda9e31f9f873db96ac2bcba2b5ae6fb841e796a683adc249b4994930149faab8382b411e17348248b403ed116a3ad3343a21271dc17a7f1d41340cb891
-EBUILD salt-2019.2.2.ebuild 4831 BLAKE2B 511dd54c169e63b4a8daf0f94bffb522437f05cbd2b2197b7bae4964a3fcdba6f530adaa09b7e819dcb7fcbd85610d59d1dec9d682e410cac954bffe86716932 SHA512 61515279f77b9be51e4bdc3bd69884a3a6d4d23cd9b9b68f34ff31f214ed25e14f18528298a6d126f0198bc337fac5cf9d4da9fffb7c0d4462a3f1ac7cdad7eb
-EBUILD salt-2019.2.3.ebuild 4831 BLAKE2B 511dd54c169e63b4a8daf0f94bffb522437f05cbd2b2197b7bae4964a3fcdba6f530adaa09b7e819dcb7fcbd85610d59d1dec9d682e410cac954bffe86716932 SHA512 61515279f77b9be51e4bdc3bd69884a3a6d4d23cd9b9b68f34ff31f214ed25e14f18528298a6d126f0198bc337fac5cf9d4da9fffb7c0d4462a3f1ac7cdad7eb
-MISC metadata.xml 2200 BLAKE2B eab8763ef66f507d2c22280d0539ac86b6aacc150936d8f79acf9618ce377b16c5fa50217937ed64bc4e54911e59ad00e56c28e3d7d1bd14e60e6e2b1e9a80a5 SHA512 f2e9292a4e554ccf37205171629a001e740731b2929d20fa68c4e9736939684f072e01526cec30d201aab8d211d45444415acb3268ea5763dbc3fcc933c737cc
+DIST salt-2019.2.5.tar.gz 14574347 BLAKE2B d456dd493e79640260f3ad3c964fdaaa26dd7bdc8d5676bd70f9dd143647c62b63aba2052e7f223041b7dd6859cd923398ad22f9d2d1302b8f18b4c69fe7aafb SHA512 95445dff498bea2bc8e3f32749131302481166c8591f11a5f76a7786c3286cb608049a743bc4878c8fbd4e4d22d4949f243f57f1e53725e7076d39aea5ceea20
+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-3000.2-r4.ebuild 6322 BLAKE2B b87e6b61af4393ec76be147f60d8c20f5977efd90b9e3338deacc937b1f5fc2a62cadf5c15399bf9578174e7edf1d776804a8eb3a65a42f423ce9995a4fca957 SHA512 1476b8452edf8bdd5c17ec96caab5eaa03b7f313bf6c18525ea2d20791f79b19cfdb25f7ab091b294c966cd72f3f6ad7a2580f4376a6088688af86c359af38f2
+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-2018.3.2-skip-zeromq-test-that-hangs.patch b/app-admin/salt/files/salt-2018.3.2-skip-zeromq-test-that-hangs.patch
deleted file mode 100644
index 7b94fafd447d..000000000000
--- a/app-admin/salt/files/salt-2018.3.2-skip-zeromq-test-that-hangs.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff --git a/tests/unit/transport/test_zeromq.py b/tests/unit/transport/test_zeromq.py
-index ccb337462e..97d2962e5e 100644
---- a/tests/unit/transport/test_zeromq.py
-+++ b/tests/unit/transport/test_zeromq.py
-@@ -45,6 +45,10 @@ ON_SUSE = False
- if 'SuSE' in linux_distribution(full_distribution_name=False):
-     ON_SUSE = True
- 
-+ON_GENTOO = False
-+if 'Gentoo' in linux_distribution(full_distribution_name=False):
-+    ON_GENTOO = True
-+
- 
- class BaseZMQReqCase(TestCase, AdaptedConfigurationTestCaseMixin):
-     '''
-@@ -122,63 +126,6 @@ class BaseZMQReqCase(TestCase, AdaptedConfigurationTestCaseMixin):
-         return payload, {'fun': 'send_clear'}
- 
- 
--class ClearReqTestCases(BaseZMQReqCase, ReqChannelMixin):
--    '''
--    Test all of the clear msg stuff
--    '''
--    def setUp(self):
--        self.channel = salt.transport.client.ReqChannel.factory(self.minion_config, crypt='clear')
--
--    def tearDown(self):
--        del self.channel
--
--    @classmethod
--    @tornado.gen.coroutine
--    def _handle_payload(cls, payload):
--        '''
--        TODO: something besides echo
--        '''
--        raise tornado.gen.Return((payload, {'fun': 'send_clear'}))
--
--
--@flaky
--@skipIf(ON_SUSE, 'Skipping until https://github.com/saltstack/salt/issues/32902 gets fixed')
--class AESReqTestCases(BaseZMQReqCase, ReqChannelMixin):
--    def setUp(self):
--        self.channel = salt.transport.client.ReqChannel.factory(self.minion_config)
--
--    def tearDown(self):
--        del self.channel
--
--    @classmethod
--    @tornado.gen.coroutine
--    def _handle_payload(cls, payload):
--        '''
--        TODO: something besides echo
--        '''
--        raise tornado.gen.Return((payload, {'fun': 'send'}))
--
--    # TODO: make failed returns have a specific framing so we can raise the same exception
--    # on encrypted channels
--    #
--    #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--    #
--    # WARNING: This test will fail randomly on any system with > 1 CPU core!!!
--    #
--    #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--    def test_badload(self):
--        '''
--        Test a variety of bad requests, make sure that we get some sort of error
--        '''
--        # TODO: This test should be re-enabled when Jenkins moves to C7.
--        # Once the version of salt-testing is increased to something newer than the September
--        # release of salt-testing, the @flaky decorator should be applied to this test.
--        msgs = ['', [], tuple()]
--        for msg in msgs:
--            with self.assertRaises(salt.exceptions.AuthenticationError):
--                ret = self.channel.send(msg, timeout=5)
--
--
- class BaseZMQPubCase(AsyncTestCase, AdaptedConfigurationTestCaseMixin):
-     '''
-     Test the req server/client pair
diff --git a/app-admin/salt/files/salt-2018.3.4-tests.patch b/app-admin/salt/files/salt-2018.3.4-tests.patch
deleted file mode 100644
index ac3dbb845348..000000000000
--- a/app-admin/salt/files/salt-2018.3.4-tests.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py
-index 3874b0001c..40304075eb 100644
---- a/tests/unit/grains/test_core.py
-+++ b/tests/unit/grains/test_core.py
-@@ -685,22 +685,6 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
-                                 'Docker'
-                             )
- 
--    @skipIf(salt.utils.platform.is_windows(), 'System is Windows')
--    def test_xen_virtual(self):
--        '''
--        Test if OS grains are parsed correctly in Ubuntu Xenial Xerus
--        '''
--        with patch.object(os.path, 'isfile', MagicMock(return_value=False)):
--            with patch.dict(core.__salt__, {'cmd.run': MagicMock(return_value='')}), \
--                patch.object(os.path,
--                             'isfile',
--                             MagicMock(side_effect=lambda x: True if x == '/sys/bus/xen/drivers/xenconsole' else False)):
--                log.debug('Testing Xen')
--                self.assertEqual(
--                    core._virtual({'kernel': 'Linux'}).get('virtual_subtype'),
--                    'Xen PV DomU'
--                )
--
-     def _check_ipaddress(self, value, ip_v):
-         '''
-         check if ip address in a list is valid
-diff --git a/tests/unit/utils/test_asynchronous.py b/tests/unit/utils/test_asynchronous.py
-index 694a7aebfe..9e22c278e9 100644
---- a/tests/unit/utils/test_asynchronous.py
-+++ b/tests/unit/utils/test_asynchronous.py
-@@ -35,19 +35,6 @@ class HelperB(object):
- 
- 
- class TestSyncWrapper(AsyncTestCase):
--    @tornado.testing.gen_test
--    def test_helpers(self):
--        '''
--        Test that the helper classes do what we expect within a regular asynchronous env
--        '''
--        ha = HelperA()
--        ret = yield ha.sleep()
--        self.assertTrue(ret)
--
--        hb = HelperB()
--        ret = yield hb.sleep()
--        self.assertFalse(ret)
--
-     def test_basic_wrap(self):
-         '''
-         Test that we can wrap an asynchronous caller.
-@@ -55,24 +42,3 @@ class TestSyncWrapper(AsyncTestCase):
-         sync = asynchronous.SyncWrapper(HelperA)
-         ret = sync.sleep()
-         self.assertTrue(ret)
--
--    def test_double(self):
--        '''
--        Test when the asynchronous wrapper object itself creates a wrap of another thing
--
--        This works fine since the second wrap is based on the first's IOLoop so we
--        don't have to worry about complex start/stop mechanics
--        '''
--        sync = asynchronous.SyncWrapper(HelperB)
--        ret = sync.sleep()
--        self.assertFalse(ret)
--
--    def test_double_sameloop(self):
--        '''
--        Test asynchronous wrappers initiated from the same IOLoop, to ensure that
--        we don't wire up both to the same IOLoop (since it causes MANY problems).
--        '''
--        a = asynchronous.SyncWrapper(HelperA)
--        sync = asynchronous.SyncWrapper(HelperB, (a,))
--        ret = sync.sleep()
--        self.assertFalse(ret)
diff --git a/app-admin/salt/files/salt-2019.2.0-newer-deps.patch b/app-admin/salt/files/salt-2019.2.0-newer-deps.patch
deleted file mode 100644
index bdf95e210897..000000000000
--- a/app-admin/salt/files/salt-2019.2.0-newer-deps.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-diff --git a/salt/modules/dockercompose.py b/salt/modules/dockercompose.py
-index 61e937536c..0f37e0d43a 100644
---- a/salt/modules/dockercompose.py
-+++ b/salt/modules/dockercompose.py
-@@ -241,7 +241,7 @@ def __load_docker_compose(path):
-                                     None, None)
-     try:
-         with salt.utils.files.fopen(file_path, 'r') as fl:
--            loaded = yaml.load(fl)
-+            loaded = yaml.safe_load(fl)
-     except EnvironmentError:
-         return None, __standardize_result(False,
-                                     'Could not read {0}'.format(file_path),
-@@ -371,7 +371,7 @@ def __load_compose_definitions(path, definition):
-                                               None, None)
-     else:
-         try:
--            loaded_definition = yaml.load(definition)
-+            loaded_definition = yaml.safe_load(definition)
-         except yaml.YAMLError as yerr:
-             msg = 'Could not parse {0} {1}'.format(definition, yerr)
-             return None, None, __standardize_result(False, msg,
-diff --git a/salt/serializers/yaml.py b/salt/serializers/yaml.py
-index c95b40e48f..2154e5dcab 100644
---- a/salt/serializers/yaml.py
-+++ b/salt/serializers/yaml.py
-@@ -72,6 +72,7 @@ def serialize(obj, **options):
-     '''
- 
-     options.setdefault('Dumper', Dumper)
-+    options.setdefault('default_flow_style', None)
-     try:
-         response = yaml.dump(obj, **options)
-         if response.endswith('\n...\n'):
-diff --git a/salt/serializers/yamlex.py b/salt/serializers/yamlex.py
-index 2e4ba6fb2b..e42634f580 100644
---- a/salt/serializers/yamlex.py
-+++ b/salt/serializers/yamlex.py
-@@ -182,6 +182,7 @@ def serialize(obj, **options):
-     '''
- 
-     options.setdefault('Dumper', Dumper)
-+    options.setdefault('default_flow_style', None)
-     try:
-         response = yaml.dump(obj, **options)
-         if response.endswith('\n...\n'):
-diff --git a/salt/utils/yamldumper.py b/salt/utils/yamldumper.py
-index 9892c87d23..3692ea324a 100644
---- a/salt/utils/yamldumper.py
-+++ b/salt/utils/yamldumper.py
-@@ -115,6 +115,7 @@ def dump(data, stream=None, **kwargs):
-     '''
-     if 'allow_unicode' not in kwargs:
-         kwargs['allow_unicode'] = True
-+    kwargs.setdefault('default_flow_style', None)
-     return yaml.dump(data, stream, **kwargs)
- 
- 
-@@ -126,4 +127,5 @@ def safe_dump(data, stream=None, **kwargs):
-     '''
-     if 'allow_unicode' not in kwargs:
-         kwargs['allow_unicode'] = True
-+    kwargs.setdefault('default_flow_style', None)
-     return yaml.dump(data, stream, Dumper=SafeOrderedDumper, **kwargs)
-diff --git a/tests/integration/utils/test_win_runas.py b/tests/integration/utils/test_win_runas.py
-index 3042a77991..d4057a4d03 100644
---- a/tests/integration/utils/test_win_runas.py
-+++ b/tests/integration/utils/test_win_runas.py
-@@ -539,7 +539,7 @@ class RunAsTest(ModuleCase):
-         win32serviceutil.StartService('test service')
-         wait_for_service('test service')
-         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
--            ret = yaml.load(fp)
-+            ret = yaml.safe_load(fp)
-         assert ret['retcode'] == 1, ret
- 
-     @with_system_user('test-runas', on_existing='delete', delete=True,
-@@ -560,7 +560,7 @@ class RunAsTest(ModuleCase):
-         win32serviceutil.StartService('test service')
-         wait_for_service('test service')
-         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
--            ret = yaml.load(fp)
-+            ret = yaml.safe_load(fp)
-         assert ret['retcode'] == 1, ret
- 
-     @with_system_user('test-runas-admin', on_existing='delete', delete=True,
-@@ -581,7 +581,7 @@ class RunAsTest(ModuleCase):
-         win32serviceutil.StartService('test service')
-         wait_for_service('test service')
-         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
--            ret = yaml.load(fp)
-+            ret = yaml.safe_load(fp)
-         assert ret['retcode'] == 0, ret
- 
-     @with_system_user('test-runas-admin', on_existing='delete', delete=True,
-@@ -602,7 +602,7 @@ class RunAsTest(ModuleCase):
-         win32serviceutil.StartService('test service')
-         wait_for_service('test service')
-         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
--            ret = yaml.load(fp)
-+            ret = yaml.safe_load(fp)
-         assert ret['retcode'] == 0, ret
- 
-     def test_runas_service_system_user(self):
-@@ -621,5 +621,5 @@ class RunAsTest(ModuleCase):
-         win32serviceutil.StartService('test service')
-         wait_for_service('test service')
-         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
--            ret = yaml.load(fp)
-+            ret = yaml.safe_load(fp)
-         assert ret['retcode'] == 0, ret
-diff --git a/tests/unit/serializers/test_serializers.py b/tests/unit/serializers/test_serializers.py
-index 3bf42b67d7..ea42d617d7 100644
---- a/tests/unit/serializers/test_serializers.py
-+++ b/tests/unit/serializers/test_serializers.py
-@@ -68,9 +68,24 @@ class TestSerializers(TestCase):
-         serialized = yamlex.serialize(data)
-         assert serialized == '{foo: bar}', serialized
- 
-+        serialized = yamlex.serialize(data, default_flow_style=False)
-+        assert serialized == 'foo: bar', serialized
-+
-         deserialized = yamlex.deserialize(serialized)
-         assert deserialized == data, deserialized
- 
-+        serialized = yaml.serialize(data)
-+        assert serialized == '{foo: bar}', serialized
-+
-+        deserialized = yaml.deserialize(serialized)
-+        assert deserialized == data, deserialized
-+
-+        serialized = yaml.serialize(data, default_flow_style=False)
-+        assert serialized == 'foo: bar', serialized
-+
-+        deserialized = yaml.deserialize(serialized)
-+        assert deserialized == data, deserialized
-+
-     @skipIf(not yamlex.available, SKIP_MESSAGE % 'sls')
-     def test_serialize_complex_sls(self):
-         data = OrderedDict([
-@@ -84,6 +99,12 @@ class TestSerializers(TestCase):
-         deserialized = yamlex.deserialize(serialized)
-         assert deserialized == data, deserialized
- 
-+        serialized = yaml.serialize(data)
-+        assert serialized == '{bar: 2, baz: true, foo: 1}', serialized
-+
-+        deserialized = yaml.deserialize(serialized)
-+        assert deserialized == data, deserialized
-+
-     @skipIf(not yaml.available, SKIP_MESSAGE % 'yaml')
-     @skipIf(not yamlex.available, SKIP_MESSAGE % 'sls')
-     def test_compare_sls_vs_yaml(self):
-diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py
-index 677cd0778b..5c2f1fd8fd 100644
---- a/tests/unit/utils/test_schema.py
-+++ b/tests/unit/utils/test_schema.py
-@@ -5,6 +5,7 @@
- 
- # Import python libs
- from __future__ import absolute_import, print_function, unicode_literals
-+import sys
- import copy
- 
- # Import Salt Testing Libs
-@@ -506,7 +507,7 @@ class ConfigTestCase(TestCase):
-                 {'personal_access_token': 'foo'},
-                 Requirements.serialize()
-             )
--        self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
-+        self.assertIn("'ssh_key_file' is a required property", excinfo.exception.message)
- 
-     def test_boolean_config(self):
-         item = schema.BooleanItem(title='Hungry', description='Are you hungry?')
-@@ -1730,7 +1731,10 @@ class ConfigTestCase(TestCase):
- 
-         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
-             jsonschema.validate({'item': {'sides': '4', 'color': 'blue'}}, TestConf.serialize())
--        self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
-+        if sys.hexversion >= 0x03000000:
-+            self.assertIn("'4' is not of type 'boolean'", excinfo.exception.message)
-+        else:
-+            self.assertIn("u'4' is not of type u'boolean'", excinfo.exception.message)
- 
-         class TestConf(schema.Schema):
-             item = schema.DictItem(
-@@ -1833,7 +1837,10 @@ class ConfigTestCase(TestCase):
- 
-         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
-             jsonschema.validate({'item': ['maybe']}, TestConf.serialize())
--        self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
-+        if sys.hexversion >= 0x03000000:
-+            self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message)
-+        else:
-+            self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message)
- 
-         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
-             jsonschema.validate({'item': 2}, TestConf.serialize())
-@@ -1885,7 +1892,10 @@ class ConfigTestCase(TestCase):
- 
-         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
-             jsonschema.validate({'item': ['maybe']}, TestConf.serialize())
--        self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
-+        if sys.hexversion >= 0x03000000:
-+            self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message)
-+        else:
-+            self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message)
- 
-         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
-             jsonschema.validate({'item': 2}, TestConf.serialize())
diff --git a/app-admin/salt/files/salt-3000.1-tests.patch b/app-admin/salt/files/salt-3000.1-tests.patch
new file mode 100644
index 000000000000..12a2e7822b94
--- /dev/null
+++ b/app-admin/salt/files/salt-3000.1-tests.patch
@@ -0,0 +1,58 @@
+diff --git a/tests/unit/fileserver/test_roots.py b/tests/unit/fileserver/test_roots.py
+index e0d939a086..33a9b6dc35 100644
+--- a/tests/unit/fileserver/test_roots.py
++++ b/tests/unit/fileserver/test_roots.py
+@@ -11,7 +11,7 @@ import tempfile
+ 
+ # Import Salt Testing libs
+ from tests.support.mixins import AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin
+-from tests.support.unit import TestCase
++from tests.support.unit import TestCase, skipIf
+ from tests.support.mock import patch
+ from tests.support.runtests import RUNTIME_VARS
+ 
+@@ -165,6 +165,7 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix
+         self.assertIn('empty_dir', ret)
+         self.assertIn(UNICODE_DIRNAME, ret)
+ 
++    @skipIf(True, "doesn't like sandbox")
+     def test_symlink_list(self):
+         orig_file_roots = self.opts['file_roots']
+         try:
+diff --git a/tests/unit/modules/test_dockermod.py b/tests/unit/modules/test_dockermod.py
+index 191bfc123f..1956127f0b 100644
+--- a/tests/unit/modules/test_dockermod.py
++++ b/tests/unit/modules/test_dockermod.py
+@@ -793,6 +793,7 @@ class DockerTestCase(TestCase, LoaderModuleMockMixin):
+                 },
+                 ret)
+ 
++    @skipIf(True, "Doesn't work with sandbox")
+     def test_call_success(self):
+         '''
+         test module calling inside containers
+diff --git a/tests/unit/states/test_pip_state.py b/tests/unit/states/test_pip_state.py
+index 13c158b309..27e10e6161 100644
+--- a/tests/unit/states/test_pip_state.py
++++ b/tests/unit/states/test_pip_state.py
+@@ -384,6 +384,7 @@ class PipStateUtilsTest(TestCase):
+ 
+ 
+ @skipIf(salt.utils.path.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed')
++@skipIf(True, "Needs network access")
+ class PipStateInstallationErrorTest(TestCase):
+ 
+     def test_importable_installation_error(self):
+diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py
+index f48fa9d42c..bb57929cfa 100644
+--- a/tests/unit/utils/test_jinja.py
++++ b/tests/unit/utils/test_jinja.py
+@@ -1268,7 +1268,7 @@ class TestCustomExtensions(TestCase):
+                                      dict(opts=self.local_opts, saltenv='test', salt=self.local_salt))
+         self.assertEqual(rendered, '16777216')
+ 
+-    @flaky
++    @skipIf("True", "Needs network access")
+     def test_http_query(self):
+         '''
+         Test the `http_query` Jinja filter.
diff --git a/app-admin/salt/files/salt-3000.2-py38-abc.patch b/app-admin/salt/files/salt-3000.2-py38-abc.patch
new file mode 100644
index 000000000000..e9f64b664178
--- /dev/null
+++ b/app-admin/salt/files/salt-3000.2-py38-abc.patch
@@ -0,0 +1,79 @@
+From 11c23a526ae926ca082ee7ad92246e085c51b8e6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Blaisot?= <sebastien@blaisot.org>
+Date: Fri, 17 Jan 2020 17:06:42 +0100
+Subject: [PATCH] Import abstract base classes from collection.abc in python
+ 3.3+
+
+---
+ salt/modules/file.py     | 6 +++++-
+ salt/modules/win_file.py | 5 ++++-
+ salt/states/file.py      | 6 +++++-
+ salt/utils/dictdiffer.py | 5 ++++-
+ 4 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/salt/modules/file.py b/salt/modules/file.py
+index 771b204d63fe..d1ec5e4c295d 100644
+--- a/salt/modules/file.py
++++ b/salt/modules/file.py
+@@ -29,7 +29,11 @@
+ import glob
+ import hashlib
+ import mmap
+-from collections import Iterable, Mapping, namedtuple
++try:
++    from collections.abc import Iterable, Mapping
++except ImportError:
++    from collections import Iterable, Mapping
++from collections import namedtuple
+ from functools import reduce  # pylint: disable=redefined-builtin
+ 
+ # pylint: disable=import-error,no-name-in-module,redefined-builtin
+diff --git a/salt/modules/win_file.py b/salt/modules/win_file.py
+index 4fd3eebcdd81..5bc983786a98 100644
+--- a/salt/modules/win_file.py
++++ b/salt/modules/win_file.py
+@@ -17,7 +17,10 @@
+ import logging
+ # pylint: disable=W0611
+ import operator  # do not remove
+-from collections import Iterable, Mapping  # do not remove
++try:
++    from collections.abc import Iterable, Mapping  # do not remove
++except ImportError:
++    from collections import Iterable, Mapping  # do not remove
+ from functools import reduce  # do not remove
+ import datetime  # do not remove.
+ import tempfile  # do not remove. Used in salt.modules.file.__clean_tmp
+diff --git a/salt/states/file.py b/salt/states/file.py
+index 23c3d3c53955..36231c69cff6 100644
+--- a/salt/states/file.py
++++ b/salt/states/file.py
+@@ -291,7 +291,11 @@ def run():
+ import sys
+ import time
+ import traceback
+-from collections import Iterable, Mapping, defaultdict
++try:
++    from collections.abc import Iterable, Mapping
++except ImportError:
++    from collections import Iterable, Mapping
++from collections import defaultdict
+ from datetime import datetime, date   # python3 problem in the making?
+ 
+ # Import salt libs
+diff --git a/salt/utils/dictdiffer.py b/salt/utils/dictdiffer.py
+index 30e87e885436..da6bd5ed944c 100644
+--- a/salt/utils/dictdiffer.py
++++ b/salt/utils/dictdiffer.py
+@@ -13,7 +13,10 @@
+ '''
+ from __future__ import absolute_import, print_function, unicode_literals
+ import copy
+-from collections import Mapping
++try:
++    from collections.abc import Mapping
++except ImportError:
++    from collections import Mapping
+ from salt.ext import six
+ 
+ 
diff --git a/app-admin/salt/files/salt-3000.2-py38-logwarn.patch b/app-admin/salt/files/salt-3000.2-py38-logwarn.patch
new file mode 100644
index 000000000000..e77d2376ce1b
--- /dev/null
+++ b/app-admin/salt/files/salt-3000.2-py38-logwarn.patch
@@ -0,0 +1,116 @@
+diff --git a/salt/cloud/clouds/ec2.py b/salt/cloud/clouds/ec2.py
+index 68f752cb2d..fa2b96499d 100644
+--- a/salt/cloud/clouds/ec2.py
++++ b/salt/cloud/clouds/ec2.py
+@@ -4901,7 +4901,7 @@ def get_password_data(
+ 
+     if not HAS_M2 and not HAS_PYCRYPTO:
+         if 'key' in kwargs or 'key_file' in kwargs:
+-            log.warn("No crypto library is installed, can not decrypt password")
++            log.warning("No crypto library is installed, can not decrypt password")
+         return ret
+ 
+     if 'key' not in kwargs:
+diff --git a/salt/modules/gpg.py b/salt/modules/gpg.py
+index 9dd1007c1b..47c82a7141 100644
+--- a/salt/modules/gpg.py
++++ b/salt/modules/gpg.py
+@@ -1083,7 +1083,7 @@ def verify(text=None,
+ 
+     if trustmodel and trustmodel not in trustmodels:
+         msg = 'Invalid trustmodel defined: {}. Use one of: {}'.format(trustmodel, ', '.join(trustmodels))
+-        log.warn(msg)
++        log.warning(msg)
+         return {'res': False, 'message': msg}
+ 
+     extra_args = []
+diff --git a/salt/modules/network.py b/salt/modules/network.py
+index 38e2bc326e..f3a8a714cd 100644
+--- a/salt/modules/network.py
++++ b/salt/modules/network.py
+@@ -958,7 +958,7 @@ def traceroute(host):
+ 
+         ret.append(result)
+         if not result:
+-            log.warn('Cannot parse traceroute output line: %s', line)
++            log.warning('Cannot parse traceroute output line: %s', line)
+     return ret
+ 
+ 
+diff --git a/salt/modules/saltutil.py b/salt/modules/saltutil.py
+index 138a0fcf51..5f026b0f36 100644
+--- a/salt/modules/saltutil.py
++++ b/salt/modules/saltutil.py
+@@ -1096,7 +1096,7 @@ def refresh_pillar(wait=False, timeout=30):
+             tag='/salt/minion/minion_pillar_refresh_complete',
+             wait=timeout)
+         if not event_ret or event_ret['complete'] is False:
+-            log.warn("Pillar refresh did not complete within timeout %s", timeout)
++            log.warning("Pillar refresh did not complete within timeout %s", timeout)
+     return ret
+ 
+ 
+diff --git a/salt/transport/tcp.py b/salt/transport/tcp.py
+index 12ef24e86f..e83d1c927f 100644
+--- a/salt/transport/tcp.py
++++ b/salt/transport/tcp.py
+@@ -1073,7 +1073,7 @@ class SaltMessageClient(object):
+                 self._connecting_future.set_result(True)
+                 break
+             except Exception as exc:  # pylint: disable=broad-except
+-                log.warn('TCP Message Client encountered an exception %r', exc)
++                log.warning('TCP Message Client encountered an exception %r', exc)
+                 yield salt.ext.tornado.gen.sleep(1)  # TODO: backoff
+                 #self._connecting_future.set_exception(e)
+ 
+diff --git a/salt/utils/process.py b/salt/utils/process.py
+index 9626ac0cb2..18697ccf7c 100644
+--- a/salt/utils/process.py
++++ b/salt/utils/process.py
+@@ -124,7 +124,7 @@ def dup2(file1, file2):
+         try:
+             fno1 = file1.fileno()
+         except io.UnsupportedOperation:
+-            log.warn('Unsupported operation on file: %r', file1)
++            log.warning('Unsupported operation on file: %r', file1)
+             return
+     if isinstance(file2, int):
+         fno2 = file2
+@@ -132,7 +132,7 @@ def dup2(file1, file2):
+         try:
+             fno2 = file2.fileno()
+         except io.UnsupportedOperation:
+-            log.warn('Unsupported operation on file: %r', file2)
++            log.warning('Unsupported operation on file: %r', file2)
+             return
+     os.dup2(fno1, fno2)
+ 
+@@ -829,13 +829,13 @@ class SignalHandlingProcess(Process):
+                             if child.is_running():
+                                 child.terminate()
+                         except psutil.NoSuchProcess:
+-                            log.warn(
++                            log.warning(
+                                 'Unable to kill child of process %d, it does '
+                                 'not exist. My pid is %d',
+                                 self.pid, os.getpid()
+                             )
+             except psutil.NoSuchProcess:
+-                log.warn(
++                log.warning(
+                     'Unable to kill children of process %d, it does not exist.'
+                     'My pid is %d',
+                     self.pid, os.getpid()
+diff --git a/tests/integration/modules/test_state.py b/tests/integration/modules/test_state.py
+index 81b3b677b9..2f3bcaa613 100644
+--- a/tests/integration/modules/test_state.py
++++ b/tests/integration/modules/test_state.py
+@@ -2282,7 +2282,7 @@ class StateModuleTest(ModuleCase, SaltReturnAssertsMixin):
+                 try:
+                     os.remove(path)
+                 except OSError:
+-                    log.warn("Path not found: %s", path)
++                    log.warning("Path not found: %s", path)
+ 
+         with salt.utils.files.fopen(module_path, 'w') as fp:
+             fp.write('raise ImportError("No module named pip")')
diff --git a/app-admin/salt/files/salt-3000.2-py38.patch b/app-admin/salt/files/salt-3000.2-py38.patch
new file mode 100644
index 000000000000..1c543a085b10
--- /dev/null
+++ b/app-admin/salt/files/salt-3000.2-py38.patch
@@ -0,0 +1,60 @@
+From 5259ba8ef6e5949815641edc563deab67ba68582 Mon Sep 17 00:00:00 2001
+From: Mathias Fussenegger <f.mathias@zignar.net>
+Date: Fri, 22 Nov 2019 17:05:27 +0100
+Subject: [PATCH] Remove _supported_dists import for python-3.8 support
+
+`_supported_dists` has been removed from platform in Python 3.8:
+
+    https://github.com/python/cpython/commit/8b94b41ab7b12f745dea744e8940631318816935#diff-47c8e5750258a08a6dd9de3e9c3774acL267-L271
+
+This instead inlines all the values that have been there.
+
+Without this change running `salt-ssh` with Python 3.8 run into an
+import error.
+---
+ salt/grains/core.py | 31 +++++++++++++++++++++++++++----
+ 1 file changed, 27 insertions(+), 4 deletions(-)
+
+diff --git a/salt/grains/core.py b/salt/grains/core.py
+index 04c1ae91b5f5..77694abe84f9 100644
+--- a/salt/grains/core.py
++++ b/salt/grains/core.py
+@@ -35,11 +35,34 @@
+ __proxyenabled__ = ['*']
+ __FQDN__ = None
+ 
+-# Extend the default list of supported distros. This will be used for the
++# Default list of supported distros. This will be used for the
+ # /etc/DISTRO-release checking that is part of linux_distribution()
+-from platform import _supported_dists
+-_supported_dists += ('arch', 'mageia', 'meego', 'vmware', 'bluewhite64',
+-                     'slamd64', 'ovs', 'system', 'mint', 'oracle', 'void')
++_supported_dists = (
++    'SuSE',
++    'UnitedLinux',
++    'arch',
++    'bluewhite64',
++    'centos',
++    'debian',
++    'fedora',
++    'gentoo',
++    'mageia',
++    'mandrake',
++    'mandriva',
++    'meego',
++    'mint',
++    'oracle',
++    'ovs',
++    'redhat',
++    'rocks',
++    'slackware',
++    'slamd64',
++    'system',
++    'turbolinux',
++    'vmware',
++    'void',
++    'yellowdog',
++)
+ 
+ # linux_distribution deprecated in py3.7
+ try:
diff --git a/app-admin/salt/files/salt-3000.2-tests.patch b/app-admin/salt/files/salt-3000.2-tests.patch
new file mode 100644
index 000000000000..a562dee5bf94
--- /dev/null
+++ b/app-admin/salt/files/salt-3000.2-tests.patch
@@ -0,0 +1,18 @@
+--- salt-3000.2.orig/tests/unit/utils/test_verify.py	2020-04-29 16:57:02.775635698 -0700
++++ salt-3000.2/tests/unit/utils/test_verify.py	2020-04-29 16:57:58.042282147 -0700
+@@ -324,6 +324,7 @@
+         self.assertTrue(os.path.exists(path))
+
+
++@skipIf(True, "breaks under sandbox")
+ class TestCleanPath(TestCase):
+     '''
+     salt.utils.clean_path works as expected
+@@ -366,6 +367,7 @@
+         raise ctypes.WinError()
+
+
++@skipIf(True, "breaks under sandbox")
+ @skipIf(six.PY2 and salt.utils.platform.is_windows(), 'Skipped on windows py2')
+ class TestCleanPathLink(TestCase):
+     '''
diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
index e27805465b7e..91b468848999 100644
--- a/app-admin/salt/metadata.xml
+++ b/app-admin/salt/metadata.xml
@@ -21,9 +21,11 @@ Between the remote execution system, and state management Salt addresses the
 backbone of cloud and data center management.
   </longdescription>
   <use>
+    <flag name="cheetah">Enable support for <pkg>dev-python/cheetah3</pkg></flag>
     <flag name="cherrypy">Enable support for using cherrypy.</flag>
     <flag name="libcloud">Enable salt-cloud support via libcloud.</flag>
     <flag name="libvirt">Support managing virtual machines with app-emulation/libvirt.</flag>
+    <flag name="genshi">Enable support for <pkg>dev-python/genshi</pkg></flag>
     <flag name="gnupg">Enable support for gnupg via python-gnupg.</flag>
     <flag name="keyring">Enable support for keyrings via python-keyring.</flag>
     <flag name="mako">Add support for using the mako template engine for parsing salt states.</flag>
diff --git a/app-admin/salt/salt-2018.3.4.ebuild b/app-admin/salt/salt-2018.3.4.ebuild
deleted file mode 100644
index 20f68c64964c..000000000000
--- a/app-admin/salt/salt-2018.3.4.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
-	https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova"
-IUSE+=" openssl portage profile redis selinux test raet +zeromq vim-syntax"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-	<www-servers/tornado-5.0[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	openssl? (
-		dev-libs/openssl:0=[-bindist]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	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}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-salt[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/${PN}-2018.3.4-tests.patch"
-	"${FILESDIR}/${PN}-2018.3.2-skip-zeromq-test-that-hangs.patch"
-)
-
-python_prepare() {
-	# remove tests with external dependencies that may not be available
-	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
-	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
-	rm tests/unit/states/test_boto_vpc.py || die
-	rm tests/unit/modules/test_{kubernetes,vsphere}.py || die
-
-	# allow the use of the renamed msgpack
-	sed -i '/^msgpack/d' requirements/base.txt || die
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072 || die
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
-
-	(
-		cleanup() {
-			rm -f "${tempdir}"
-			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
-		}
-
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
-
-		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
-			TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose
-
-	) || die "testing failed"
-}
diff --git a/app-admin/salt/salt-2019.2.2.ebuild b/app-admin/salt/salt-2019.2.5.ebuild
index c6961f4ebef6..d8fbc93eb97c 100644
--- a/app-admin/salt/salt-2019.2.2.ebuild
+++ b/app-admin/salt/salt-2019.2.5.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_6 )
-
-inherit eutils systemd distutils-r1
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit systemd distutils-r1
 
 DESCRIPTION="Salt is a remote execution and configuration manager"
 HOMEPAGE="https://www.saltstack.com/resources/community/
@@ -15,7 +15,6 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -23,13 +22,15 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova"
-IUSE+=" openssl portage profile redis selinux test raet +zeromq vim-syntax"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova
+	openssl portage profile redis selinux test raet +zeromq vim-syntax"
 
-RDEPEND="sys-apps/pciutils
+RDEPEND="
+	sys-apps/pciutils
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/libnacl[${PYTHON_USEDEP}]
 	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	<dev-python/msgpack-1.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
@@ -64,22 +65,23 @@ RDEPEND="sys-apps/pciutils
 	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
 	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
 	vim-syntax? ( app-vim/salt-vim )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
 		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
+		<dev-python/pytest-salt-2020.0.0[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
 		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
 		${RDEPEND}
 	)"
 
@@ -131,20 +133,17 @@ python_test() {
 	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
 
 	(
-		cleanup() {
-			rm -f "${tempdir}"
-			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
-		}
+		cleanup() { rm -f "${tempdir}" || die; }
 
 		trap cleanup EXIT
 
 		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
 
 		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
 			TMPDIR="${tempdir}" \
 			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose
-
-	) || die "testing failed"
+			--unit-tests --no-report --verbose \
+			|| die "testing failed with ${EPYTHON}"
+	)
 }
diff --git a/app-admin/salt/salt-2019.2.0-r1.ebuild b/app-admin/salt/salt-3000.2-r4.ebuild
index dc4a1c91f8a8..cbd4ed11eadb 100644
--- a/app-admin/salt/salt-2019.2.0-r1.ebuild
+++ b/app-admin/salt/salt-3000.2-r4.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils systemd distutils-r1
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit systemd distutils-r1
 
 DESCRIPTION="Salt is a remote execution and configuration manager"
 HOMEPAGE="https://www.saltstack.com/resources/community/
@@ -15,31 +15,36 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
-	KEYWORDS=""
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+		https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova"
-IUSE+=" openssl portage profile redis selinux test raet +zeromq vim-syntax"
+IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax"
 
-RDEPEND="sys-apps/pciutils
+RDEPEND="
+	sys-apps/pciutils
+	dev-python/distro[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5[${PYTHON_USEDEP}]
+	<dev-python/msgpack-1.0[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-	<www-servers/tornado-5.0[${PYTHON_USEDEP}]
 	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
 	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
 	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	libvirt? (
+		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_7)
+	)
 	openssl? (
 		dev-libs/openssl:0=[-bindist]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
@@ -49,50 +54,65 @@ RDEPEND="sys-apps/pciutils
 		>=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}] )
+	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
 	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
 	selinux? ( sec-policy/selinux-salt )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	nova? (
+		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_7)
+	)
+	neutron? (
+		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_7)
+	)
 	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
 	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
 	test? (
-		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		${RDEPEND}
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
 		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
-		${RDEPEND}
 	)"
 
 DOCS=( README.rst AUTHORS )
 
-REQUIRED_USE="|| ( raet zeromq )"
+REQUIRED_USE="|| ( raet zeromq )
+	test? ( cheetah genshi )"
 RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/salt-2019.2.0-tests.patch"
-	"${FILESDIR}/salt-2018.3.2-skip-zeromq-test-that-hangs.patch"
 	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
-	"${FILESDIR}/salt-2019.2.0-newer-deps.patch"
+	"${FILESDIR}/salt-3000.1-tests.patch"
+	"${FILESDIR}/salt-3000.2-tests.patch"
+
+	# https://github.com/saltstack/salt/pull/55410
+	"${FILESDIR}/salt-3000.2-py38.patch"
+
+	# https://github.com/saltstack/salt/pull/55900
+	"${FILESDIR}/salt-3000.2-py38-abc.patch"
+
+	# misc py38 fixups
+	"${WORKDIR}/salt-3000.2-py38-misc.patch"
+	"${FILESDIR}/salt-3000.2-py38-logwarn.patch"
 )
 
 python_prepare() {
@@ -100,7 +120,17 @@ python_prepare() {
 	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
 	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
 	rm tests/unit/states/test_boto_vpc.py || die
-	rm tests/unit/modules/test_{kubernetes,vsphere}.py || die
+
+	# tests that require network access
+	rm tests/unit/{states,modules}/test_zcbuildout.py || die
+
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die
+
+	einfo "Fixing collections.abc warnings for ${EPYTHON}"
+	local abc
+	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
+	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
 
 	# allow the use of the renamed msgpack
 	sed -i '/^msgpack/d' requirements/base.txt || die
@@ -128,23 +158,36 @@ python_test() {
 	# ${T} is too long a path for the tests to work
 	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
 	mkdir "${T}/$(basename "${tempdir}")"
-	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
 
 	(
-		cleanup() {
-			rm -f "${tempdir}"
-			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
-		}
+		cleanup() { rm -f "${tempdir}" || die; }
 
 		trap cleanup EXIT
 
 		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
 
 		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
 			TMPDIR="${tempdir}" \
 			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose
+			--unit-tests --no-report --verbose \
+			|| die "testing failed with ${EPYTHON}"
+	)
+}
 
-	) || die "testing failed"
+pkg_postinst() {
+	if use python_targets_python3_8; then
+		if use nova; then
+			ewarn "Salt's nova functionality will not work with python3.8 since"
+			ewarn "dev-python/python-novaclient does not support it yet"
+		fi
+		if use neutron; then
+			ewarn "Salt's neutron functionality will not work with python3.8 since"
+			ewarn "dev-python/python-neutronclient does not support it yet"
+		fi
+		if use libvirt; then
+			ewarn "Salt's libvirt functionality will not work with python3.8 since"
+			ewarn "dev-python/libvirt-python does not support it yet"
+		fi
+	fi
 }
diff --git a/app-admin/salt/salt-2019.2.3.ebuild b/app-admin/salt/salt-3000.3.ebuild
index c6961f4ebef6..380351911ba9 100644
--- a/app-admin/salt/salt-2019.2.3.ebuild
+++ b/app-admin/salt/salt-3000.3.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils systemd distutils-r1
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit systemd distutils-r1
 
 DESCRIPTION="Salt is a remote execution and configuration manager"
 HOMEPAGE="https://www.saltstack.com/resources/community/
@@ -15,31 +15,36 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
-	KEYWORDS=""
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+		https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova"
-IUSE+=" openssl portage profile redis selinux test raet +zeromq vim-syntax"
+IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax"
 
-RDEPEND="sys-apps/pciutils
+RDEPEND="
+	sys-apps/pciutils
+	dev-python/distro[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5[${PYTHON_USEDEP}]
+	<dev-python/msgpack-1.0[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-	<www-servers/tornado-5.0[${PYTHON_USEDEP}]
 	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
 	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
 	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	libvirt? (
+		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_7)
+	)
 	openssl? (
 		dev-libs/openssl:0=[-bindist]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
@@ -49,51 +54,65 @@ RDEPEND="sys-apps/pciutils
 		>=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}] )
+	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
 	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
 	selinux? ( sec-policy/selinux-salt )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	nova? (
+		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_7)
+	)
+	neutron? (
+		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_7)
+	)
 	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
 	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
 	test? (
-		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
+		${RDEPEND}
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
 		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
 		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
-		${RDEPEND}
 	)"
 
 DOCS=( README.rst AUTHORS )
 
-REQUIRED_USE="|| ( raet zeromq )"
+REQUIRED_USE="|| ( raet zeromq )
+	test? ( cheetah genshi )"
 RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/salt-2019.2.0-tests.patch"
 	"${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-3000.1-tests.patch"
+	"${FILESDIR}/salt-3000.2-tests.patch"
+
+	# https://github.com/saltstack/salt/pull/55410
+	"${FILESDIR}/salt-3000.2-py38.patch"
+
+	# https://github.com/saltstack/salt/pull/55900
+	"${FILESDIR}/salt-3000.2-py38-abc.patch"
+
+	# misc py38 fixups
+	"${WORKDIR}/salt-3000.2-py38-misc.patch"
+	"${FILESDIR}/salt-3000.2-py38-logwarn.patch"
 )
 
 python_prepare() {
@@ -102,6 +121,17 @@ python_prepare() {
 	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
 	rm tests/unit/states/test_boto_vpc.py || die
 
+	# tests that require network access
+	rm tests/unit/{states,modules}/test_zcbuildout.py || die
+
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die
+
+	einfo "Fixing collections.abc warnings for ${EPYTHON}"
+	local abc
+	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
+	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
+
 	# allow the use of the renamed msgpack
 	sed -i '/^msgpack/d' requirements/base.txt || die
 }
@@ -128,23 +158,36 @@ python_test() {
 	# ${T} is too long a path for the tests to work
 	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
 	mkdir "${T}/$(basename "${tempdir}")"
-	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
 
 	(
-		cleanup() {
-			rm -f "${tempdir}"
-			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
-		}
+		cleanup() { rm -f "${tempdir}" || die; }
 
 		trap cleanup EXIT
 
 		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
 
 		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
 			TMPDIR="${tempdir}" \
 			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose
+			--unit-tests --no-report --verbose \
+			|| die "testing failed with ${EPYTHON}"
+	)
+}
 
-	) || die "testing failed"
+pkg_postinst() {
+	if use python_targets_python3_8; then
+		if use nova; then
+			ewarn "Salt's nova functionality will not work with python3.8 since"
+			ewarn "dev-python/python-novaclient does not support it yet"
+		fi
+		if use neutron; then
+			ewarn "Salt's neutron functionality will not work with python3.8 since"
+			ewarn "dev-python/python-neutronclient does not support it yet"
+		fi
+		if use libvirt; then
+			ewarn "Salt's libvirt functionality will not work with python3.8 since"
+			ewarn "dev-python/libvirt-python does not support it yet"
+		fi
+	fi
 }
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 431ab7a68f1e..92cd60490d7c 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,8 @@
 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.0rc2.tar.gz 3722476 BLAKE2B 490ecc4604c242a09d98bd1da3bb46c977f22d308d269a99c858f77576934e7d2fc27cd641bcca67323f74165eadbc6e63064e63759ba0e1d4a743b14b701bd7 SHA512 a68bd37e0d848dba1ea9e48313a3cac5153ea1be7635a1f5a342f245c183b486f2868f9217d2667dafed9d504a1442239c3a434b2bab2ff109aac980815e53fa
+DIST sudo-1.9.0.tar.gz 3743850 BLAKE2B 47d557afb13eee300d379ae31aae34cf7cf1e5ad140c6d7e599f687cca2cc259ec17f9ec0b3ca6f0badef81bb6e9d659e3e2bb77d9994218a9a3d88ec7ff2c19 SHA512 f2a191ea5fc65865718b110d4aca187cb5e2cd55c9c891fab32f21401e56f825f34c373e346c55c64fa49cec4d802efb63ccebf3d4a4e31d9a433077daf013b1
 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_rc2.ebuild 6818 BLAKE2B 7e4ab79b53a510067f52d4082ba38331b12083104b61c53d737d701ed1edd7150d7dd4302b42bd958175307fb0374496bd41a4ab683f363fb94e9dd8fcd12944 SHA512 4e1ab7142549eab298f1ef450877789d405c425abf9e13cf8b739c1805ed1c71a0bd2651273a928b57e113bbcb73734af754b730d4cd114c905651e3b1633296
+EBUILD sudo-1.9.0-r1.ebuild 6878 BLAKE2B d6ad927f05ef58e372c5d26c9cae06df0b939a25148a89f981fd460078708b681fa4d76f99353bf7fc6187e027b2552d26d46835e119eba1edfd5d72a49d8986 SHA512 8c6f351b9d8e450878c6ad70f26a1f0305a5691e6480e8ccba14d4d22c78a68f2e79a95e85d5f63981652fd847064f04964faa27cbea525b81deb5f4b18715f9
 EBUILD sudo-9999.ebuild 6818 BLAKE2B 7e4ab79b53a510067f52d4082ba38331b12083104b61c53d737d701ed1edd7150d7dd4302b42bd958175307fb0374496bd41a4ab683f363fb94e9dd8fcd12944 SHA512 4e1ab7142549eab298f1ef450877789d405c425abf9e13cf8b739c1805ed1c71a0bd2651273a928b57e113bbcb73734af754b730d4cd114c905651e3b1633296
 MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6
diff --git a/app-admin/sudo/sudo-1.9.0_rc2.ebuild b/app-admin/sudo/sudo-1.9.0-r1.ebuild
index cecc68448ea9..896554456b5a 100644
--- a/app-admin/sudo/sudo-1.9.0_rc2.ebuild
+++ b/app-admin/sudo/sudo-1.9.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit pam multilib libtool tmpfiles
+inherit pam multilib libtool systemd tmpfiles
 
 MY_P="${P/_/}"
 MY_P="${MY_P/beta/b}"
@@ -198,6 +198,7 @@ src_install() {
 	fi
 
 	pamd_mimic system-auth sudo auth account session
+	pamd_mimic system-auth sudo-i auth account session
 
 	keepdir /var/db/sudo/lectured
 	fperms 0700 /var/db/sudo/lectured
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index c43b3745ad01..48ace87e9304 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -4,6 +4,8 @@ AUX supervisord.conf 2525 BLAKE2B d36d6ef6b952a99ccfd61976c21eb54922555db4802288
 AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c45da2bb7017631bf4af4b858bc4d7964f1d64937e331728884bc21e62e9d01b11cca46aaea389372c6bad SHA512 0fe777d1f0bf70dc9b49132102ac90083261321850f80e9e323459c894c55f722ab8470eba3ba7bb35a9d69ad411a3247546066d6cba5801c9b289350ea4bed5
 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
 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
 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
new file mode 100644
index 000000000000..607c68383023
--- /dev/null
+++ b/app-admin/supervisor/supervisor-4.2.0.ebuild
@@ -0,0 +1,62 @@
+# 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} )
+# 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_prepare_all() {
+	# Skip one test that currently fails
+	# https://github.com/Supervisor/supervisor/issues/1346
+	sed -i 's/test_prepare_socket/_&/' \
+		supervisor/tests/test_socket_manager.py || die
+	distutils-r1_python_prepare_all
+}
+
+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/sysstat/Manifest b/app-admin/sysstat/Manifest
index 8bc3ce78bc9d..2f323fcd2f35 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -2,10 +2,14 @@ AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d8
 AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f49718cc0fb3c70bc681e8cdda29394ea5a75d871c76f658305b26d44d1034d09079f3b6306a4dd466cd0775b5514b2 SHA512 80dd658b06f2e1072a3a58bbe84770170f1cb6c3e2ae0d660713a007b0e9e59c45b710cc1484c94ec466759455ae18a7fbae237b6674ee9ddb43a7a4502cb0d5
 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
 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-999999.ebuild 1610 BLAKE2B beb0eb130dc39e72ddefb7016fb81a5ce0629baed38c1ccf23ff9ea97f8995097be44eb00635d21455bb0b1e6c9933f40ad7c17c2a6199d031520c638377aa4c SHA512 8212abdf2a37f4b0a92b09485c4a197d9673a8f524fbb07bc4dc5c4f32e754fbf697dc0219c707b3f4cc5a5472792296c7a31aac58ec11b044f9eabcf6676f70
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/app-admin/sysstat/sysstat-12.2.2.ebuild b/app-admin/sysstat/sysstat-12.2.2.ebuild
new file mode 100644
index 000000000000..70f1a5412854
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.2.2.ebuild
@@ -0,0 +1,81 @@
+# 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.3.ebuild b/app-admin/sysstat/sysstat-12.3.3.ebuild
new file mode 100644
index 000000000000..70f1a5412854
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.3.3.ebuild
@@ -0,0 +1,81 @@
+# 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/terraform/Manifest b/app-admin/terraform/Manifest
index 72ad7e4780e8..7de1752a4777 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -1,11 +1,3 @@
-DIST terraform-0.12.17.tar.gz 10508005 BLAKE2B facef6de57333586445ce8839c03ccd633fe9ac68619e384b71fff921afeaf260e01b8783d61e4cc04882aa644e8eb706b08c88216f093d85e0fd081363c4103 SHA512 6311fdbf6764e585126a1e177dc498634a799ba1a68ba98682e2be29d14b40c09d0a780555f10bbde0587445d31a1e0d9810226f9e6bd3fcb248428ceb864c87
-DIST terraform-0.12.20.tar.gz 10383312 BLAKE2B c9e9c7e8328cfbeb533d12a2acee133cc049b06e9a30c9fdc5708c674c272af264ae34c8c850924ae08885237a2e4d6c55d43d92b350104c6afe66d2f50e31ec SHA512 df92422426e7ebaf2c3a6b953de9fc9fcb461f7227835e728bbccf5b796995d818a39817913d6010fadb8b3618710f77f50e36eb6ce4176e7312b68c7d7f7e96
-DIST terraform-0.12.21.tar.gz 10420614 BLAKE2B 0c10cc7c33381330e7bbf20a1502019a6c651b0b0c5c3ca6713b76dd7f81a5f0d45affede0ba9ea9c2fe66585a87dc1e3be00c930d713a3eaabe865af1eb35ab SHA512 3b0dd3e6d8ae4b172d0be934ada6a8dcadc3024d0f27450ed107d55cf7f08b6b0b5eeb739a210fc9a76db42f7cc75ad5842ca7415afa3d7b17d9a34f23920a59
-DIST terraform-0.12.23.tar.gz 10426601 BLAKE2B 578338591f9cac9f21586e6b4eccf632da350986d14aadea95044a7f343d6e91c307f953459bf49eb7584e61d58c7a11152d56b2f0a84cd088eb91f174556040 SHA512 7598b45a76e0684594067921bc9cd5da954c4590f612dcaf29e77c40c372f15f690732896f90272666ec587a3cb2e07dc556e29e9d029fd019528ae3e3cb0abb
 DIST terraform-0.12.24.tar.gz 10427523 BLAKE2B 088d0cd249a065ef663b41690e0c1e27baf61706da3444d4677b3a1b24652c50882601e036841fb004377a57d38918a62a45eb84983f5d8f09138ae2c5b3e77e SHA512 026b4c30438459d5fa433ea606e8e020f2ff71ba6e14a5caeecef32f5800a0699cb192ece4bf9b5005b8e0fb2e375f70602d44d94b0b8efa3bac20f9a30e14e6
-EBUILD terraform-0.12.17.ebuild 1106 BLAKE2B 93d76a95bdb6ec98cab68cd32950208ed629736ed67f14db9b9939229c60b100ba3e9542f0ef892846e7df01bb6fe8778349598d99bf0f78506706a190510338 SHA512 57a8732da235be34eadf501bdaa0ecae0523a08a4f40250a1db8b0a03b5091458fe1754241e9109d307e4e9d2b78fb3770c0660d78a5fef36226cbd5e7e8737f
-EBUILD terraform-0.12.20.ebuild 1107 BLAKE2B e3512147aa9c4528641b465180d0c9678856b743b3852903ba77b284ba978c620f777aab6656132b8d9ce1258d1f6f6f1f9d6db94b76b1d49b9590619c937f5b SHA512 4d65da7087d667e3d5878d9a8377293f13d537b335478d666994d71d803b45385de1e8dda07c88498d46f3edbda41ebe2539e66f22cd1a4c8210ced449195125
-EBUILD terraform-0.12.21.ebuild 1107 BLAKE2B e3512147aa9c4528641b465180d0c9678856b743b3852903ba77b284ba978c620f777aab6656132b8d9ce1258d1f6f6f1f9d6db94b76b1d49b9590619c937f5b SHA512 4d65da7087d667e3d5878d9a8377293f13d537b335478d666994d71d803b45385de1e8dda07c88498d46f3edbda41ebe2539e66f22cd1a4c8210ced449195125
-EBUILD terraform-0.12.23.ebuild 1123 BLAKE2B 4413fc2f82932cf800cb95589fa67dc3df78f39d7ee7b28363d080b3a0535ca7b247d1adb7671d93f8f75d535996fecd71b6b232f8485a1708815631a8fb4cb4 SHA512 0caa440ef7175b523bffc0d884a5be427fb9a8fb56a971459c180bd0fcef8948e8cf7cc855047779bb66816470cf2788f504ef6142292839cf9acc60f52f22d9
-EBUILD terraform-0.12.24.ebuild 778 BLAKE2B 6cf03d01559398be632b8275e1300d120bc36104038dfa42067da7c1a9435a37173a32ab55404f3ea07d5cf92ec6726f8637cac44ff0d55ba395ce5d7d2a6939 SHA512 9a64442aa014f956fd533ea85215891e0b6d5e637e005674ad3a01f450a9ec9dddaa04cd57faa4c5afa9a284ef3ea5bf3ec93a9d5a12aa894ab0626c15f3b58f
+EBUILD terraform-0.12.24.ebuild 777 BLAKE2B 686b38d1df4e28c19f03812fcad15802193f11fc1c8da7ba263513122952ccb9f9d5d469b9ed5e44e1d147c4f7d4d7f1e225ed6345d9d1934cfc062df1be6713 SHA512 4f2f3cd4b891778209a279cd62954cbc91e440422ac5334b88b09e274804c24c1ce9a898d4cfdbeb9623c5e370b8ec9c72ce56801386e981030d821939a7ed91
 MISC metadata.xml 1074 BLAKE2B f14c6ede900b616f5a5514adc9735d25fa834dc879712ab79b68fe15a927cb3e8e77a7b30ee8af3b44551be9ec2368476757c4ec5e5b44fcd266367b485fc8bc SHA512 2e28b3de2b512246ddfb76b547151683c4202620992f9453747b4869db1a16d92996cbf810bf82f09e6895ddc7b23ecc2e0ecaf43d9c3ba9e8a2fb53baa995dc
diff --git a/app-admin/terraform/terraform-0.12.17.ebuild b/app-admin/terraform/terraform-0.12.17.ebuild
deleted file mode 100644
index 16e496f4ef87..000000000000
--- a/app-admin/terraform/terraform-0.12.17.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-base go-module
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-
-EGO_PN="github.com/hashicorp/${PN}"
-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"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_prepare() {
-	default
-	# the sed command is necessary to generate tests outside of the
-	# default git root of `terraform', in our case the working dir
-	# is `work/$PN-$PV'
-	# sed -i -e "s/!=\s\+\"terraform\"/!=\ \"${P}\"/" \
-	# 	./scripts/generate-plugins.go || die
-}
-
-src_compile() {
-	GOCACHE="${T}/go-cache" go build \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/terraform
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like to install shell completions please run:"
-	elog "    terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-0.12.20.ebuild b/app-admin/terraform/terraform-0.12.20.ebuild
deleted file mode 100644
index 4196f78931b6..000000000000
--- a/app-admin/terraform/terraform-0.12.20.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-base go-module
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-
-EGO_PN="github.com/hashicorp/${PN}"
-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"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_prepare() {
-	default
-	# the sed command is necessary to generate tests outside of the
-	# default git root of `terraform', in our case the working dir
-	# is `work/$PN-$PV'
-	# sed -i -e "s/!=\s\+\"terraform\"/!=\ \"${P}\"/" \
-	# 	./scripts/generate-plugins.go || die
-}
-
-src_compile() {
-	GOCACHE="${T}/go-cache" go build \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/terraform
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like to install shell completions please run:"
-	elog "    terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-0.12.21.ebuild b/app-admin/terraform/terraform-0.12.21.ebuild
deleted file mode 100644
index 4196f78931b6..000000000000
--- a/app-admin/terraform/terraform-0.12.21.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-base go-module
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-
-EGO_PN="github.com/hashicorp/${PN}"
-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"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_prepare() {
-	default
-	# the sed command is necessary to generate tests outside of the
-	# default git root of `terraform', in our case the working dir
-	# is `work/$PN-$PV'
-	# sed -i -e "s/!=\s\+\"terraform\"/!=\ \"${P}\"/" \
-	# 	./scripts/generate-plugins.go || die
-}
-
-src_compile() {
-	GOCACHE="${T}/go-cache" go build \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/terraform
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like to install shell completions please run:"
-	elog "    terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-0.12.23.ebuild b/app-admin/terraform/terraform-0.12.23.ebuild
deleted file mode 100644
index 02737dda10ce..000000000000
--- a/app-admin/terraform/terraform-0.12.23.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-base go-module
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-
-EGO_PN="github.com/hashicorp/${PN}"
-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"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_prepare() {
-	default
-	# the sed command is necessary to generate tests outside of the
-	# default git root of `terraform', in our case the working dir
-	# is `work/$PN-$PV'
-	# sed -i -e "s/!=\s\+\"terraform\"/!=\ \"${P}\"/" \
-	# 	./scripts/generate-plugins.go || die
-}
-
-src_compile() {
-	GOCACHE="${T}/go-cache" go build \
-		-mod vendor \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/terraform
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like to install shell completions please run:"
-	elog "    terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-0.12.24.ebuild b/app-admin/terraform/terraform-0.12.24.ebuild
index 3fd839630186..7d194e4e3804 100644
--- a/app-admin/terraform/terraform-0.12.24.ebuild
+++ b/app-admin/terraform/terraform-0.12.24.ebuild
@@ -11,7 +11,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/vault/Manifest b/app-admin/vault/Manifest
index b6b946d58851..665a6ec1af1e 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,16 +3,7 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 573 BLAKE2B 444541b8912910cf6b5d038e466e18baebb7dfd2905d802217baf9e861bb7f2a3e032716545c74e269782aa420fbd052745322576b4bcb8c4cf53ba07471b261 SHA512 11124e6fc656977c20b55b578e30fd76b8f6905760c2f17f93b960a317975f1914c6bd8d4ffd3741ba405bfe5aa0cecb68067f8ce52b2df9015863d31f9a7aad
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
-DIST vault-1.2.3-webui.tar.xz 1916848 BLAKE2B 503425336fac45645b837380dcf94be4bdbb3876b1408a6bbd6ccaca96fd93e47dd2fcaf9913a70cb69fc0c7c1c36a90680acb629be3d616fe77d95662d93ed0 SHA512 1e414143ea163dc021ffefba023ff827f8241db5c125c3aa5de407dc4ae476413d32bf3b150167ffb14026f07663a26f3ab62b142019758f751a4f115d438d87
-DIST vault-1.2.3.tar.gz 27773681 BLAKE2B 862b386c96e7d284c5b82a89dca5a0a8668a900a5b32758a472b5d7ea4ed995dce608dfda0398bcf15e703f21099ddc662abb585cca0e2d2f43a0863184e055c SHA512 9543e394f187cd9b06e88b64319504e07519041741650db3b7b905f1b34348ed7d9e22955ce2a456ffd2e06210e9e01b1a0ded459cde4840fbf5903ff6e21e75
-DIST vault-1.2.4-webui.tar.xz 1919024 BLAKE2B c1fc1460d70f33695ce9f7571a701035b02a376e4d336a9e368190a5ec08dc3ef417d2553a0e3ca5e745721eef49caeaaf294bd8b44550938ab02c7d63460744 SHA512 9b431083b1850e6e18b5212f04cc2d9305832c02594984caef298b2b33e176b6cc7f767e9e137208e005778d249410e482cfe4b6f6bfdb6f2ba54de9bcc4c7f6
-DIST vault-1.2.4.tar.gz 27778766 BLAKE2B 536dd114c0268f91eb6b5c13cc30d22cdb9d1085c1378c6e39a6fcffeb4d5313363d225c85073a4da124962d6f7de8e4800a6648e392909a9595341ac178d94a SHA512 35a91088ac6949863e2de651edac19d73586acc2f42d14e48d3b41236d9458c95e60f8ec2285b3846ff04ebe59a4d4b308686151d758b5af8caad711441e2ee4
-DIST vault-1.3.0-webui.tar.xz 2004176 BLAKE2B f17b51346e694e13cb51779f158116cd1e241ba1a90c5e384b40fafc916386fd12ae7e09e11b083f1ff8cb8aa89a94f811029edc10fceec2a08cbe8e65b1bac4 SHA512 2f3695134ffd9af478568b08fc66b593d00c0990178af2f3d0e8b27c53afeed1f7926d97afa688b21cca931665b435e85c036a9970f71355977815f214c66c0c
-DIST vault-1.3.0.tar.gz 31098388 BLAKE2B 81ac68f47eed4a9e0187774558d38701f4e1481b07bd8a6f310741741a112dcf8e8344e156b6cef2a05e115da998fafab9627d62e261ffb8995ebdd2468f770a SHA512 4011706c2d418e4e13369f5afa5541af8296d6731c12aa670ed0fce66cc4d950edb76a0d24722be6b63538dc3479dcf68bb89ce7d9f37437062635feb6432165
 DIST vault-1.4.0-webui.tar.xz 1211468 BLAKE2B 5a7b221f2339ca451f6bc2df7b1a4611a9f7786305ec0631d0e7130fb0287f764553d8a8a99ade5d28a2ae39fca1028b5a3c7299a5049acff0d1a3c1e9b8124f SHA512 3b17221e189f9e5fa73afbae3496e4d1105401a94ce5f99ff1c6975ca25b20485a05dc7f0b0c469d29d896524370d8fa23157d401d28e2e92a71a4813a4d9ba6
 DIST vault-1.4.0.tar.gz 33097110 BLAKE2B 837f23a50128b0fab6542fc6a596d911267a1e14453091f22171db2ccf6a1a3d0aacdb3f210ac0d07efc7ed5ce845a197f61dd4dab37c35ad6f0f47cefc09c9d SHA512 13c1fb901fe577d91f2734f8a0ae5e51083e1307e7fc32a4388a1be48f2c46cd3d121432fa7450d6f9b439285d3ad5819b123631f41bb347e8d75ce683d24a7e
-EBUILD vault-1.2.3.ebuild 2356 BLAKE2B c68a7cc7b1b93c93a9a0bb9e4e67ce6900071650f567054a9e4fe5b9b383ea106635ad4a595219f16c877c767ce751d8fbb679cb6d442c2098e5e7e9d7200079 SHA512 55f85e6d4781cd7ad278942f080081bfdc7a6587405a84f79a842680a6142b32a4e32d5547874790556279bd39d9e9279ff3735025552502ffe6ba56159ac4c7
-EBUILD vault-1.2.4.ebuild 2356 BLAKE2B c68a7cc7b1b93c93a9a0bb9e4e67ce6900071650f567054a9e4fe5b9b383ea106635ad4a595219f16c877c767ce751d8fbb679cb6d442c2098e5e7e9d7200079 SHA512 55f85e6d4781cd7ad278942f080081bfdc7a6587405a84f79a842680a6142b32a4e32d5547874790556279bd39d9e9279ff3735025552502ffe6ba56159ac4c7
-EBUILD vault-1.3.0.ebuild 2356 BLAKE2B c68a7cc7b1b93c93a9a0bb9e4e67ce6900071650f567054a9e4fe5b9b383ea106635ad4a595219f16c877c767ce751d8fbb679cb6d442c2098e5e7e9d7200079 SHA512 55f85e6d4781cd7ad278942f080081bfdc7a6587405a84f79a842680a6142b32a4e32d5547874790556279bd39d9e9279ff3735025552502ffe6ba56159ac4c7
 EBUILD vault-1.4.0.ebuild 1795 BLAKE2B 1c704c7490d92bb030f9618bcec13d71faa435fa4853ea1ee148fd1c3ba4ea84a0587dfae568e2a454ed8b31da101a2d77191112d2488a6f6885be6d8ad65366 SHA512 b963aeb24b07e20be4fc39068f0d3fbe14e89d568ccdbcbf7aaa3106a6706c7563171b77446bcd41a2c807385d1e0875629c635be1c19fca1a70ca50da0a5473
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.2.3.ebuild b/app-admin/vault/vault-1.2.3.ebuild
deleted file mode 100644
index ba761e123410..000000000000
--- a/app-admin/vault/vault-1.2.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-KEYWORDS="~amd64"
-IUSE="+webui"
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.12:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	if use webui; then
-		# The webui assets build has numerous nodejs dependencies,
-		# see https://github.com/hashicorp/vault/blob/master/ui/README.md
-		pushd "${S}/src/${EGO_PN}" >/dev/null || die
-		unpack "${VAULT_WEBUI_ARCHIVE}"
-		popd >/dev/null
-	fi
-}
-
-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 src/${EGO_PN}/scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-i src/${EGO_PN}/Makefile || die
-
-	# Avoid network-sandbox violations since go-1.13
-	rm src/${EGO_PN}/go.mod || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export -n GOCACHE XDG_CACHE_HOME #678970
-	export GOBIN=${S}/bin GOPATH=${S}
-	cd src/${EGO_PN} || die
-	# The fmt target may need to be executed if it was previously
-	# executed by an older version of go (bug 665438).
-	emake fmt
-	BUILD_TAGS="$(usex webui ui '')" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-}
diff --git a/app-admin/vault/vault-1.2.4.ebuild b/app-admin/vault/vault-1.2.4.ebuild
deleted file mode 100644
index ba761e123410..000000000000
--- a/app-admin/vault/vault-1.2.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-KEYWORDS="~amd64"
-IUSE="+webui"
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.12:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	if use webui; then
-		# The webui assets build has numerous nodejs dependencies,
-		# see https://github.com/hashicorp/vault/blob/master/ui/README.md
-		pushd "${S}/src/${EGO_PN}" >/dev/null || die
-		unpack "${VAULT_WEBUI_ARCHIVE}"
-		popd >/dev/null
-	fi
-}
-
-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 src/${EGO_PN}/scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-i src/${EGO_PN}/Makefile || die
-
-	# Avoid network-sandbox violations since go-1.13
-	rm src/${EGO_PN}/go.mod || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export -n GOCACHE XDG_CACHE_HOME #678970
-	export GOBIN=${S}/bin GOPATH=${S}
-	cd src/${EGO_PN} || die
-	# The fmt target may need to be executed if it was previously
-	# executed by an older version of go (bug 665438).
-	emake fmt
-	BUILD_TAGS="$(usex webui ui '')" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-}
diff --git a/app-admin/vault/vault-1.3.0.ebuild b/app-admin/vault/vault-1.3.0.ebuild
deleted file mode 100644
index ba761e123410..000000000000
--- a/app-admin/vault/vault-1.3.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-KEYWORDS="~amd64"
-IUSE="+webui"
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.12:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	if use webui; then
-		# The webui assets build has numerous nodejs dependencies,
-		# see https://github.com/hashicorp/vault/blob/master/ui/README.md
-		pushd "${S}/src/${EGO_PN}" >/dev/null || die
-		unpack "${VAULT_WEBUI_ARCHIVE}"
-		popd >/dev/null
-	fi
-}
-
-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 src/${EGO_PN}/scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-i src/${EGO_PN}/Makefile || die
-
-	# Avoid network-sandbox violations since go-1.13
-	rm src/${EGO_PN}/go.mod || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export -n GOCACHE XDG_CACHE_HOME #678970
-	export GOBIN=${S}/bin GOPATH=${S}
-	cd src/${EGO_PN} || die
-	# The fmt target may need to be executed if it was previously
-	# executed by an older version of go (bug 665438).
-	emake fmt
-	BUILD_TAGS="$(usex webui ui '')" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
commit	deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree	9a48f42594e1a9e6b2020d5535a784314434d7a7 /app-admin
parent	38423c67c8a23f6a1bc42038193182e2da3116eb (diff)