gentoo (valentine's day) resync : 14.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-13 21:41:11 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-13 21:41:11 +0000
commit: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
tree: c44943ee0563a3fa957716de909fed683117fcb9 /app-admin
parent: 69051588e2f955485fe5d45d45e616bc60a2de57 (diff)
107 files changed, 1346 insertions, 3700 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index bea4aa61ba3a..ab06ef0d0aa9 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index f5a2fc74fea6..663eefa06e6d 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1,5 +1,5 @@
 AUX apg-2.3.0b-crypt_password.patch 844 BLAKE2B c87ccb6002eac2c363a5b35dc033badf3968562956a4f49697c98368293aa98f2420ff56ac742a7308a2373183c3883c5bce30cd1d8cb72f6f788df2891f8275 SHA512 bde5b1bbc4084cd4d2630ea92ed73c970cd217554638d17980c4d56b0da2f55cd7cafbc76b5073bd0415a7698b70df9d357f0c1731353dae46990e9407d7bb94
 AUX apg-2.3.0b_p20150129-cracklib.patch 1485 BLAKE2B e6df97af3cfe408d68a86461733a060a7045d9cafd1a82821c56756b6c69d27aba5ba6b7b189346daf52cd407703e07ccff4a66965953f0a20c1ac19add4a064 SHA512 d7e3b210627ac6df34cb380c9b6bfdfd3eff790750082c7ebc40a837a88c73467f0e5847633a51b32c7634a57821b06c704bace511dfae18bc5d3e473f9e43ad
 DIST apg-2.3.0b_p20150129.tar.xz 313372 BLAKE2B f5a1b894a0379294c478020de512af047aec2e7c9d881cb2f4c79df88583707b5ce0e995623915b6bd11b720e60e0f8696e0ddce472441cb1d04f3bf7a818e32 SHA512 7be813368b4b6fe4ae2882d85c40b6cf80ad44b7aa7e46c8cb97926ef89edf4f59e9a4c76a7aa9f725ac6ce1f0df361f8b68ef6dce798e1e0a8d55767c7a16e8
-EBUILD apg-2.3.0b_p20150129.ebuild 830 BLAKE2B 85a870b95cfce7962738c907f484ce1556be1dda95c4f6c2e0f62b2349d4bca667e80c892488ea87af7cd9c989404797a6f3b416595331cefb88a2228f77fab6 SHA512 41a9838e7ab2933656a4bcf2bdc5eac3389e26f7269d0ed1194cb36b68111ef612c912d944f837115841c0a3dd4e4263acdbb687315b5baa0f24645e21434040
+EBUILD apg-2.3.0b_p20150129.ebuild 829 BLAKE2B 1c427d4e5dd0fec28687156dc73eafe7f9ea9db3b8c80dc9180793e9321237266e09108ae381a715a5531db59c60b91f29d130b477086982d648a0d93abf002f SHA512 ab6b277e0d41cc814d9b833d0ddbfe477f4a965e8e81e13b655b596dfd741d9b543ec762886d374268452d18ca6967b5f73dd667492a797baeded7eaa994bad4
 MISC metadata.xml 323 BLAKE2B 3b44b94032a0312054a8d1b5e1d77d8104646ca23a5ee93f20e34a93947184353a2c953141a1de172639fff8100eaf8eda38d1a65690ae99dbc3e533464dff6c SHA512 63dcf35a66f95ba538cc976762491f8e248d5679fe854f06f6c98394731c61f28f66f49bab54e5fad3d48a6cb8f611d2afb90f5ddf48a55eb60ca1b26a649926
diff --git a/app-admin/apg/apg-2.3.0b_p20150129.ebuild b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
index 776ab76cb32c..239110be3b68 100644
--- a/app-admin/apg/apg-2.3.0b_p20150129.ebuild
+++ b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cracklib"
 
 DEPEND="cracklib? ( sys-libs/cracklib )"
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 8ecb66977ddf..a475a6df5996 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -2,4 +2,4 @@ AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d9
 DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4 SHA512 30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222
 EBUILD calamares-3.2.32.1.ebuild 2181 BLAKE2B b371e28a165c6c80dee19e5b8e4076bcd70e399d76b43b8210dfe69aa6d6c1f29d48f858594482dbb1ea28c0d19571da907f22a082966d3fd9e0333431daa19f SHA512 484a41c3789eceac69e3aeaa1882a6585ce060411522f7a8d6f2604301d7b4c37636eb015bc6ca1e3383c044a9bcc9f77ffa12c64551f5af39978b96b44d0ca6
 EBUILD files/calamares-3.2.32.1-remove-broken-tests.ebuild 1682 BLAKE2B 1d41c22b99797d41066e55b21bd5b9957411c210be3d1a8c01470694211387aa7e8b931d5499143d7d2747657625ac1c3db17d67bac9f741aada25fde93f517a SHA512 1c4a5a2d8b6c96299f45d3ef7581dfdca81c0854c9c746e6636a07101fb4e0d05809a4d64d826180599969c6fe398175dc7f5322ab52ff6c61dac4925919f275
-MISC metadata.xml 970 BLAKE2B fc958c25bf44e37c32da53c4fe0bfabc0e2ba8ef6213f8c3b3d95a685c8f7bfb6806ab06719ea5b39f94800c03f9f3ef211408ad57f58f60d0d09e5fbb823c12 SHA512 b5ca20e1baddb3f7cb4f704d9becbb7163cdc90be23145367d0787cfa1f55a54f5740e4bb57231dbd4ced0a23406341a89e00cf03cee21808c5c26a1ead35712
+MISC metadata.xml 858 BLAKE2B b66d7a5fa62cc1a83bba80a4d166e3985fb0bae043b5fbf03328e2c838543ae072322aa376751da8ee3912e8c8cdfb9e5aec8ee4700346543464a117d57933f9 SHA512 b333853647f132719762811ecf38e8a9dd3794dee3b944d3771204849f8ebe60f179759c5c9bfed4ed358174921c16b45c175a7598074814342225134f0bb700
diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
index 8c2f79648746..f28035634d1a 100644
--- a/app-admin/calamares/metadata.xml
+++ b/app-admin/calamares/metadata.xml
@@ -5,10 +5,6 @@
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
 	<longdescription>
 		Calamares is a distribution-independent system installer, with an
 		advanced partitioning feature for both manual and automated
diff --git a/app-admin/cgmanager/Manifest b/app-admin/cgmanager/Manifest
deleted file mode 100644
index adaa8c20d372..000000000000
--- a/app-admin/cgmanager/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX cgmanager.initd-r1 331 BLAKE2B 725b5044fa567e7f7146bd62cc63a0674873d6fcb022eda77b7296dbe1af76645815b67b113a41eec8f83898aba90be3706a10f672a2565c7af26967c196fb54 SHA512 f50afaf471f9e9d500cbc909da1185c1342481699eb1887f694ef91bd49c7cd727d21871ff5d6c0b6046601cfa72a4ac167926c62920b2f3a4902ec817401948
-AUX cgproxy.initd-r1 661 BLAKE2B f84189b5fe16b6327cd1a6a2cd1805f1bbd75791d0f6f75a601ea58fa51d5a490d655371355205c499a51628b4e9cdf21f98431adcb3000397508cdacef2928b SHA512 7f43ea6369428d71d122a191c6a1718987ed09eafe2217ae326606ddf2a50f0500d0de0520fe21e5d2edefb8ddd4c3a85623d2aac1212e821ea922cb8256fffc
-DIST cgmanager-0.41.tar.gz 461805 BLAKE2B 22c779953d637012694c19490da9d3707b9e2a935f910d192fd1e6a44c27e933e93b6ae516399991924175a9e8e05fd650cf3117d3e7bde034a20bc083ebaa09 SHA512 e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd
-DIST cgmanager-0.42.tar.gz 467980 BLAKE2B 70df5ebda230773f3a2a4ed6f784e591126769122533182821b0fe2c157f9bd7b9fd58a3bb104b0ef089320b167d3136c379d760ea6c65dab0c88f46d41596cb SHA512 d92113a6748084f1c0708f75c8bdf5de484d534bf00f664a5288902be887c2a1c7cf3d91afaab3331f0d573a86fbc6edb2fa1d37c070250cf53e0621213d7d74
-EBUILD cgmanager-0.41.ebuild 1301 BLAKE2B e3dfc897fdc053f1ef4c040ff683e8961898fad8cd201dd8b699da7b92f12f5bc2fb7bcb0024aaa5935011296f568cffe51626b8f4dd324898f6125c550251f5 SHA512 9f45b44d501f7d4a5874c1f9bae738821b8af2777b12d8d6133a8dc1d30260060429acbf967ec72208fd603029a67f076d6c882f9b17b2bd7571685989a3f793
-EBUILD cgmanager-0.42.ebuild 1309 BLAKE2B 985d4a6688f42a7827b44bee2a32049a3737bca821f063390b3a4e0d53e52fcbd618a5a78fbdfd5dd837c5b8c5ea5cff2e33d7d6a701752d36709347eb198cc4 SHA512 bcae337c5d161982540b87aaee4fd9132d976ff0644534f50a032ade8673ad369fbd7d12b2c0744a13145c65f2dbb7712940380b2f8f2527e7c9ed884ae23697
-MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/app-admin/cgmanager/cgmanager-0.41.ebuild b/app-admin/cgmanager/cgmanager-0.41.ebuild
deleted file mode 100644
index 834e67e35d92..000000000000
--- a/app-admin/cgmanager/cgmanager-0.41.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools pam
-
-DESCRIPTION="Control Group manager daemon"
-HOMEPAGE="https://linuxcontainers.org/cgmanager/introduction/"
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
-IUSE="pam selinux"
-
-RDEPEND="sys-libs/libnih[dbus]
-	sys-apps/dbus
-	selinux? ( sec-policy/selinux-cgmanager )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eapply_user
-
-	# systemd expects files in /sbin but we will have them in /usr/sbin
-	pushd config/init/systemd > /dev/null || die
-	sed -i -e "s@sbin@usr/&@" {${PN},cgproxy}.service || \
-		die "Failed to fix paths in systemd service files"
-	popd > /dev/null || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-distro=gentoo \
-		--with-pamdir="$(usex pam $(getpam_mod_dir) none)" \
-		--with-init-script=systemd \
-		--disable-static
-}
-
-src_install() {
-	default
-
-	# I see no reason to have the tests in the filesystem. Drop them
-	rm -r "${D}"/usr/share/${PN}/tests || die "Failed to remove ${PN} tests"
-
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newinitd "${FILESDIR}"/cgproxy.initd-r1 cgproxy
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-admin/cgmanager/cgmanager-0.42.ebuild b/app-admin/cgmanager/cgmanager-0.42.ebuild
deleted file mode 100644
index da4663f6c806..000000000000
--- a/app-admin/cgmanager/cgmanager-0.42.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools pam
-
-DESCRIPTION="Control Group manager daemon"
-HOMEPAGE="https://linuxcontainers.org/cgmanager/introduction/"
-SRC_URI="https://linuxcontainers.org/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="pam selinux"
-
-RDEPEND="sys-libs/libnih[dbus]
-	sys-apps/dbus
-	selinux? ( sec-policy/selinux-cgmanager )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eapply_user
-
-	# systemd expects files in /sbin but we will have them in /usr/sbin
-	pushd config/init/systemd > /dev/null || die
-	sed -i -e "s@sbin@usr/&@" {${PN},cgproxy}.service || \
-		die "Failed to fix paths in systemd service files"
-	popd > /dev/null || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-distro=gentoo \
-		--with-pamdir="$(usex pam $(getpam_mod_dir) none)" \
-		--with-init-script=systemd \
-		--disable-static
-}
-
-src_install() {
-	default
-
-	# I see no reason to have the tests in the filesystem. Drop them
-	rm -r "${D}"/usr/share/${PN}/tests || die "Failed to remove ${PN} tests"
-
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newinitd "${FILESDIR}"/cgproxy.initd-r1 cgproxy
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-admin/cgmanager/files/cgmanager.initd-r1 b/app-admin/cgmanager/files/cgmanager.initd-r1
deleted file mode 100644
index 6efc80b7155a..000000000000
--- a/app-admin/cgmanager/files/cgmanager.initd-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Control Group manager daemon"
-pidfile="/run/cgmanager.pid"
-command="/usr/sbin/cgmanager"
-command_args="-m name=systemd"
-command_background="yes"
-retry="TERM/45"
-
-depend() {
-	before cgproxy
-}
diff --git a/app-admin/cgmanager/files/cgproxy.initd-r1 b/app-admin/cgmanager/files/cgproxy.initd-r1
deleted file mode 100644
index ceb075254a3f..000000000000
--- a/app-admin/cgmanager/files/cgproxy.initd-r1
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Control Group manager proxy"
-pidfile="/run/cgproxy.pid"
-command="/usr/sbin/cgproxy"
-command_args="--daemon"
-command_background="yes"
-retry="TERM/45"
-NESTED="${NESTED:-no}"
-
-depend() {
-	after cgmanager
-}
-
-start_pre() {
-	if ! /usr/sbin/cgproxy --check-master; then
-		ewarn "cgmanager is not running"
-		return 1
-	fi
-	# cgproxy should only run on container unless on older kernel
-	if [ -e /proc/self/ns/pid ] && [ "$NESTED" != "yes" ]; then
-		eerror "Too old kernel to support cgroup, please update to >3.8"
-		return 1
-	fi
-}
diff --git a/app-admin/cgmanager/metadata.xml b/app-admin/cgmanager/metadata.xml
deleted file mode 100644
index 76f45cdee0f4..000000000000
--- a/app-admin/cgmanager/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>perfinion@gentoo.org</email>
-		<name>Jason Zaman</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
index 241591d7cdf7..65f1528e25a2 100644
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@@ -2,8 +2,8 @@ DIST OpenDoas-6.0.tar.gz 28482 BLAKE2B 8d35a12f18609c9dd7746ff8ce7c39d16d7c5e595
 DIST OpenDoas-6.6.1.tar.gz 30783 BLAKE2B cf6dabddb9a0ef837355516f7344efca33a639ede126e54466644521b5b1a7073b6cfa96cc8573ef16221a748ae6395f7e4fef4ff912ca7889742fb46d1a4da5 SHA512 390e0e139a2641be22c4493c3ed755d9cb4091f4ab8d590123b7c8c4f2f116cea3b3500926ff191fb98d92192ca9e92118cbcbeb463a7833763e00c65603e678
 DIST OpenDoas-6.8.1.tar.gz 32398 BLAKE2B cdaa01efaf3d164bcf6993693c86039fa4866dc1ce619731b455985ca1ebb5ebec889b540f4720c590318202de8a4b2fdf5d715f2170346818e706857b5adfa3 SHA512 d96fe1cdd70e9211de9996ad05bcf7a127facd02af48f7ab2561869d9d16708f1b61722c6e6b9fe15a62e9ef501e09b1ba444b7b43a066f1895e543ebc9402e7
 DIST OpenDoas-6.8.tar.gz 32307 BLAKE2B f199e20ccd33ed215b280f325d10c36f1449a605aa25ca92c39b43e6d9118a2c2b09e351712489028a06e9c2c087593888a93bf0377a15d1b710c9d6f659cf81 SHA512 4a57079bba353247e645bc07a5d4e78fd01471d193e83751fd87b72cffa4e152c0f7ea172563f767a7193b14489f57bc066b4fee50842d30b5b7f7ce918434bb
-EBUILD doas-6.0.ebuild 757 BLAKE2B 5cc07f49c5d2d6cc265b64cec423210db1a9b7a23420452495a8872821dba52205222e6437abf23e57f948a95a8d3baccc66bc77b88866739d075a3f4275c6bd SHA512 e4ac22ef41bdc89438d4165a1552e4883b5eaa02a484a978f15ceeb07a9775bdbda6a1669feb7fdac5d5ac39396bdd1789c88af2189369cbe339617f9795c2cc
-EBUILD doas-6.6.1.ebuild 810 BLAKE2B 822909eff667a7cdd114699207c8060a4a78d1ec5b4b5c0848b3fb8dab7b3c68c014bcac7025de77cf23e8fdbd3b1e9b9a702050c9766db2ad5de300aead70ba SHA512 a9750e216c02ea8fce289265921bda02492571902e91b90d9b1ce88472b6b4b08c15dff399de6ba9b38e32face6037639b84901001cf8646025600115de7f942
-EBUILD doas-6.8.1.ebuild 1298 BLAKE2B b437057d344189d9d0ac35415f6160900758b92f2cb5bfa6898a720d8f845fa0c326e2ef97954b708be151bedf5e3ce99a9cd438947e7b4dba34c19728ccd58c SHA512 4ca25de76699c247f8d0d1d434382ef354120a740492986198333528f12ccebdbbaf2ad7bcf529ace007bd4ebb63a855ba9f2cae5398fd3697b4859eb2078f13
-EBUILD doas-6.8.ebuild 1298 BLAKE2B b437057d344189d9d0ac35415f6160900758b92f2cb5bfa6898a720d8f845fa0c326e2ef97954b708be151bedf5e3ce99a9cd438947e7b4dba34c19728ccd58c SHA512 4ca25de76699c247f8d0d1d434382ef354120a740492986198333528f12ccebdbbaf2ad7bcf529ace007bd4ebb63a855ba9f2cae5398fd3697b4859eb2078f13
+EBUILD doas-6.0.ebuild 757 BLAKE2B 6f1834ea1c4e299ab6a589263515894a7ad89810763cdf92bf4a6eecd168f9ee08aeb714828d8874f1c338bd1c8f2144909a3b44673444cba487fc8a87fa5aab SHA512 ac5f759a089d384f82ec637fd969f1b5367acb3f4706599d29a899b566384200c81df71539d4e92a93710424cc8f20c70009b14cb7c0498518ea69b1e9159d5b
+EBUILD doas-6.6.1.ebuild 810 BLAKE2B 5d80c92a11f4bc1d8f8d83d1639d18baec626306e784e1b0936909f28288a4054b3ab635ae8ea30ae3df769df5edf882f05471ab015f9d2c94189515923ced1d SHA512 dad89ad3615ed6d9c8df7c11ac253420ebeaf6abba28da7a1ae25b202d909305f42ab3c5f5d0902b7b5ceaf326f912e853f663f7748a5ef345866e6dfd5cb0f3
+EBUILD doas-6.8.1.ebuild 1319 BLAKE2B ad89f4854e0cbd3ff7b22f60a10c547ba77aaaf648a949b85fc6a3a0a83d3be014a1919cf15612ba6f4d2ff36370573701464eb72f6a12ea0b75b14ae7bd6f2a SHA512 d688ecb6fc805ed50954988647255141a07ecc5d302022c078fe0bdf19623565085e820e981f7c132c1b5f3bdc2a55faf19998e2f913d33890828b0b7f0d9ffb
+EBUILD doas-6.8.ebuild 1298 BLAKE2B 76194f60c28e2d39f9e82d36ffd23746c3287a4b1de76dc6201dfb18420d6e0ccbb0f5268816fc733d043544b71bae663e71ea4e9f407bcfc329a9856de600e6 SHA512 9e611fb642b2ed3365ec58e69dd5899953c25176685d9ab2dcf14ba2accf6e326b8022cf5f0f70a89d26da85b1afba7168920e57b2a1173696a00a8222f5ae1a
 MISC metadata.xml 527 BLAKE2B ec5f403c54f18989467cc64c023cc86f0ccdf3f4d974db83a0a0ed660b1f32caac090b43317e5e2b4de46fd7c92a38d622735f9718b0680020557d378a290630 SHA512 1cc9427b113968557fc9764a552138e5a17ed44ef1ed20cb087a8fb60865b8d3e9331baf1d172180409ff636143ad23e1a6d3e5de6af4a8e7b8a7b9bbdfac718
diff --git a/app-admin/doas/doas-6.0.ebuild b/app-admin/doas/doas-6.0.ebuild
index 5ee851f748f7..08f3406d2f0f 100644
--- a/app-admin/doas/doas-6.0.ebuild
+++ b/app-admin/doas/doas-6.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit toolchain-funcs
 
-DESCRIPTION="Run commands as super user or another user, alternative to sudo from OpenBSD"
+DESCRIPTION="Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)"
 
 MY_PN=OpenDoas
 MY_P=${MY_PN}-${PV}
diff --git a/app-admin/doas/doas-6.6.1.ebuild b/app-admin/doas/doas-6.6.1.ebuild
index 04fca0a26c79..45b4cea04e56 100644
--- a/app-admin/doas/doas-6.6.1.ebuild
+++ b/app-admin/doas/doas-6.6.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="Run commands as super user or another user, alternative to sudo from OpenBSD"
+DESCRIPTION="Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)"
 
 MY_PN=OpenDoas
 MY_P=${MY_PN}-${PV}
diff --git a/app-admin/doas/doas-6.8.1.ebuild b/app-admin/doas/doas-6.8.1.ebuild
index 294eda46cd60..70a39d061585 100644
--- a/app-admin/doas/doas-6.8.1.ebuild
+++ b/app-admin/doas/doas-6.8.1.ebuild
@@ -7,14 +7,14 @@ inherit toolchain-funcs
 
 MY_PN=OpenDoas
 MY_P=${MY_PN}-${PV}
-DESCRIPTION="Run commands as super user or another user, alternative to sudo from OpenBSD"
+DESCRIPTION="Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)"
 HOMEPAGE="https://github.com/Duncaen/OpenDoas"
 SRC_URI="https://github.com/Duncaen/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 S="${WORKDIR}"/${MY_P}
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="pam persist"
 
 BDEPEND="virtual/yacc"
diff --git a/app-admin/doas/doas-6.8.ebuild b/app-admin/doas/doas-6.8.ebuild
index 294eda46cd60..deb04261e4e8 100644
--- a/app-admin/doas/doas-6.8.ebuild
+++ b/app-admin/doas/doas-6.8.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 MY_PN=OpenDoas
 MY_P=${MY_PN}-${PV}
-DESCRIPTION="Run commands as super user or another user, alternative to sudo from OpenBSD"
+DESCRIPTION="Run commands as super/another user (alt sudo) (unofficial port from OpenBSD)"
 HOMEPAGE="https://github.com/Duncaen/OpenDoas"
 SRC_URI="https://github.com/Duncaen/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 S="${WORKDIR}"/${MY_P}
diff --git a/app-admin/doctl/Manifest b/app-admin/doctl/Manifest
new file mode 100644
index 000000000000..334772578b82
--- /dev/null
+++ b/app-admin/doctl/Manifest
@@ -0,0 +1,4 @@
+DIST doctl-1.55.0.tar.gz 5157504 BLAKE2B 1d3db2ee4ca71a459456e72f035648c5ba73c5372c3369b360e1ee3cc44ec1155295e5f425611c307371f902c7ffed7dbce2f959266f79ecb8f149144fc86596 SHA512 6cea86e184ea25d5a6740d4090148fbe053ce93ebe8f2344f5a2bf62283381ed2a9574862a5ba39f34a52bf85af550313b7dd316a321f31089673f898d37cf78
+EBUILD doctl-1.55.0.ebuild 1052 BLAKE2B 35c7455909cd2473f76475f8018a70f04d39797144dd066317c5169dddda96eff650360ed81bebe770afbfd65f35c72300200b7f87ac4a468a38891861f46dc9 SHA512 a1c6467a53f6367e2ae79c77777fa56f12d9b215b51043adc5729ee4dfb2fdcf00657af4616c0d4a0b28ad6e9652b5ddb3cc0a3a0c4807261d550a3130920de9
+EBUILD doctl-9999.ebuild 1070 BLAKE2B 7d2dc8ba1e8eeeaab13f95daa8ab64cbbe3e87e1467684696c51db6f59a9b61570aeb2475d3012218c0bea8710f01e80871f80cca7ec9cd0df8d363bfd03cbbf SHA512 9bcf8071bb9e09cc032bd3ef850899f208dd68d715fcdaeffdc9f8248289031af7942d16c9ec30d9aa3197c03db0c02f5898be50fe04418e39055ae024106642
+MISC metadata.xml 639 BLAKE2B f0d6454d5d90aca55ca539f51583c08c1a6dec8bf79586ce2bdf3140c8fedc20fd22da3db92565c856f507e983de12de6c798bd8116d998f43b06857b1c77a24 SHA512 c21ed1e14490427fb76174e8182bc2b960ea60aafe5f5218eebdb06d04a51497f18cc00e5ea264181440ca80e765f9856c362c0bf01e31531ca8980f5db074b7
diff --git a/app-admin/doctl/doctl-1.55.0.ebuild b/app-admin/doctl/doctl-1.55.0.ebuild
new file mode 100644
index 000000000000..8241168248ab
--- /dev/null
+++ b/app-admin/doctl/doctl-1.55.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="A command line tool for DigitalOcean services"
+HOMEPAGE="https://github.com/digitalocean/doctl"
+SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+	GOFLAGS="-v -x -mod=vendor" \
+		go build ./cmd/... || die "build failed"
+
+	./doctl completion bash > doctl.bash || die "completion for bash failed"
+	./doctl completion zsh > doctl.zsh || die "completion for sh failed"
+	./doctl completion fish > doctl.fish || die "completion for fish failed"
+}
+
+src_test() {
+	GOFLAGS="-v -x -mod=vendor" \
+		go test -work ./do/... ./pkg/... . || die "test failed"
+}
+
+src_install() {
+	einstalldocs
+	dobin doctl
+
+	newbashcomp doctl.bash doctl
+	insinto /usr/share/zsh/site-functions
+	newins doctl.zsh _doctl
+	insinto /usr/share/fish/completion
+	newins doctl.fish doctl
+}
diff --git a/app-admin/doctl/doctl-9999.ebuild b/app-admin/doctl/doctl-9999.ebuild
new file mode 100644
index 000000000000..59e3c4d9aa3c
--- /dev/null
+++ b/app-admin/doctl/doctl-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/digitalocean/${PN}.git"
+
+inherit bash-completion-r1 git-r3 go-module
+
+DESCRIPTION="A command line tool for DigitalOcean services"
+HOMEPAGE="https://github.com/digitalocean/doctl"
+SRC_URI=""
+
+LICENSE="Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+src_unpack() {
+	git-r3_src_unpack
+}
+
+src_compile() {
+	GOFLAGS="-v -x -mod=vendor" \
+		go build ./cmd/... || die "build failed"
+
+	./doctl completion bash > doctl.bash || die "completion for bash failed"
+	./doctl completion zsh > doctl.zsh || die "completion for sh failed"
+	./doctl completion fish > doctl.fish || die "completion for fish failed"
+}
+
+src_test() {
+	GOFLAGS="-v -x -mod=vendor" \
+		go test -work ./do/... ./pkg/... . || die "test failed"
+}
+
+src_install() {
+	einstalldocs
+	dobin doctl
+
+	newbashcomp doctl.bash doctl
+	insinto /usr/share/zsh/site-functions
+	newins doctl.zsh _doctl
+	insinto /usr/share/fish/completion
+	newins doctl.fish doctl
+}
diff --git a/app-admin/doctl/metadata.xml b/app-admin/doctl/metadata.xml
new file mode 100644
index 000000000000..02d7430b53ae
--- /dev/null
+++ b/app-admin/doctl/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	The official DigitalOcean command-line client,
+	which leverages the DigitalOcean API to provide access
+	to DigitalOcean services.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">digitalocean/doctl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/ec2-ami-tools/Manifest b/app-admin/ec2-ami-tools/Manifest
index ac1a1252e498..c32cb112e3de 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 0235a4bdde2cc30762e9f92689fe8d57d03a30b1b72c75a6e906dac0cfa0e2b1d65dfd0e2e4ab958f7d49ff083d8ab30e298b3c34d0a55d8c18e34ffceb541c0 SHA512 1b8e74ac8d228bfbfec7141501a299083c728fbb508e99d980b032405fda0c64d708b626bed77049a9593cfdcf15234c38ac9a8c2a3f4d91ae06428aecd72de0
+EBUILD ec2-ami-tools-1.5.7.ebuild 1108 BLAKE2B 5bba586456c664a124d7506bf623dbc0cf8734645660b4593699dd69f2b9838b4d14e43819774db3c8781efc17a437e0f7694c57f2aa71814e910aac8b4aca0e SHA512 c7ba490a4a89ac18b39dfca58a1810fc94c5d7b086ca574fb553e2802815172ca0bb8c0fa82b90f4fbc1942ce22b169679ad013c0f208c669eb29d3f64b619c5
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
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 6d52ba74c16f..26b313cc330b 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,18 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-single versionator
+inherit ruby-single
 
 DESCRIPTION="Command-line tools that serve as client interface to the Amazon EC2 web service"
 HOMEPAGE="https://aws.amazon.com/en/tools/"
 SRC_URI="http://s3.amazonaws.com/ec2-downloads/${P}.zip"
 
 LICENSE="Amazon
-	|| ( Ruby GPL-2 )"
+|| ( Ruby GPL-2 )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
@@ -27,7 +26,7 @@ src_prepare() {
 	# Remove a left behind license file.
 	rm -f lib/ec2/oem/LICENSE.txt || die 'Removal of LICENSE failed.'
 
-	eapply_user
+	default
 }
 
 src_install() {
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index b8bb99167ace..80b2c36d8d34 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,6 @@
 DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
 DIST eselect-1.4.17.tar.xz 178980 BLAKE2B d905ac88bc009080912af75e64c7920d745788866fa3cb35466d68a652efbbd6984d6e1efeed76d9a344aed94705b74c85aa43e9c037d4d548d2e24afa69bd7a SHA512 35dc4c52f44c4f64db9c0dc2aec57b3055a6d36760b1bbbd094ad11b3f9e71a731444802632817b89c3b511f1dc9bb92046b59322d177e13fdc501ed767b591e
 EBUILD eselect-1.4.16.ebuild 1548 BLAKE2B 01fa31bf8ddd0a4180d003a077431ad59579b6bba23f310c14021baf38f5de04142598f00478a91f88823fafbc3be2d0a653fbe105f1a3ffdef29e42b83daf8f SHA512 ef73f2ef644b9edc9154a7d1faa7a81ad2b53c4b7e6e02d57993499f16b0359d508e1c0d5923ace609fa5b52c2f0b6c6ea267cb8380aeb8d518d5702056bc8ce
-EBUILD eselect-1.4.17.ebuild 1543 BLAKE2B 209d0e4324070ca448aabe290e6fc017aed72951fd8469edf4659ff6c719267bc7006c947dffc816558c423720466ba5977d7cd57399625f3e1fb7092f3b34a0 SHA512 4ac01a2cdc0af8ef4e85bf80df4c5c372d8f181d1f20278c6c172495d7ba36bc002af81075cc897ad1aa48e4cea643c7eeaeb8a74ce7c207892c5cd2147e0b9a
+EBUILD eselect-1.4.17.ebuild 1537 BLAKE2B 472d1cd75b703b3222e35abb1a1082c5e2d3e2212481317ebc82f4b63b0d0453b85f09cd11f57ab9e3507fd96deb8997187e2a3b25b2ca52464ea74e11253654 SHA512 3d862e49dbb4c9358ce156ea6ccdb8e3dc7bb77aefb36b2dec7e6e691b3db1a6e25195a45e3452d8ddeae3ae8da5683c6bfb4a78c53c8e4dc9a3cefcc2bf25bd
 EBUILD eselect-9999.ebuild 1394 BLAKE2B fb62991371b697680959344974f4d7d4cdedba39337b12d004588d118632be5cd26c2026024fd6a2cc1e448f196c3367b82ba3fe347617149602c4730f8083d1 SHA512 78c75a30e9a8bfb370620b25cd200be9c6a8724858548cd1ab76926194f9d96a25c7441463d1dcb7a2aa3a6c947b1a656d6a0b455eb95e9ad9a1535f8cb349ce
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.17.ebuild b/app-admin/eselect/eselect-1.4.17.ebuild
index 40e4b07b1903..972d5e63fb09 100644
--- a/app-admin/eselect/eselect-1.4.17.ebuild
+++ b/app-admin/eselect/eselect-1.4.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 DEPEND="sys-apps/sed
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 5d039cdf1d63..98d2bce713c4 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,5 +1,3 @@
-DIST exo-1.22.2.tar.gz 4684092 BLAKE2B ee5ddab06438cbc7d177796917c97649fefa35630a0d8012da53042098b639f5bd580a676e30567981f55e7fc9a512069804b7c45fddb739ca54c4702cc09955 SHA512 325f9a902de424d197583bf921528bc08fc8336030f7d3d5fe4571ab26ffbdf42bf602331302124c3be1103bf3b645f05e6729752295d5ceaa3cf88f802cde99
-DIST exo-1.23.0.tar.gz 4690475 BLAKE2B 6f28c28dd4dbd015b48ee01aa5edd6b234bdd32702062844ed1e46da626bc411c87892c2b134db4ba0a3b30a77fecbf1b9458a190bf894c41f07f6c67e5e846c SHA512 f0fdb1147c9b9a062e68a1dab2aba797236bff480d44eee4eed07132cad71f1d2fdcf4d32b7ea13c012d74256342cab01c3c7b7bb9ce6af11cb79eb337a83c34
-EBUILD exo-1.22.2.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
-EBUILD exo-1.23.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
+DIST exo-1.24.0.tar.gz 4848942 BLAKE2B 20790b0e5ab26e13ec73191e50b086046869d41120536a92745b3a431ee0c335d827cf442f2fa7dfcb4cd1c695399efe69b98eab75eb1642ed5d84ea8fb9e784 SHA512 e25a5b74cb81e8d16db1267c6e17f8da6d94afe1701500b526a889d2a667b173fed76227c3adaca07f077225ab68a48c8b7ead5d8dc33597eff8a02bf579b547
+EBUILD exo-1.24.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.22.2.ebuild b/app-admin/exo/exo-1.22.2.ebuild
deleted file mode 100644
index 0c2c8d861fe4..000000000000
--- a/app-admin/exo/exo-1.22.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for everything at Exoscale: compute, storage, dns."
-HOMEPAGE="https://github.com/exoscale/cli"
-SRC_URI="https://github.com/exoscale/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-QA_FLAGS_IGNORED=".*"
-
-S="${WORKDIR}/cli-${PV}"
-
-src_compile() {
-	go build -mod vendor -o ${PN} || die "build failed"
-}
-
-src_test() {
-	# run at least 'exo version' for test
-	./exo version > /dev/null 2>&1
-	if [[ $? -ne 0 ]]
-	then
-		die "Test failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-admin/exo/exo-1.23.0.ebuild b/app-admin/exo/exo-1.24.0.ebuild
index 49b1772f318b..49b1772f318b 100644
--- a/app-admin/exo/exo-1.23.0.ebuild
+++ b/app-admin/exo/exo-1.24.0.ebuild
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index 17ecf0fb2c47..f657f0463e26 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -9,5 +9,5 @@ DIST fam_2.7.0-17.2.diff.gz 28826 BLAKE2B 880f8614304b048a24be03231ec26a02901bef
 DIST fam_2.7.0-17.3.diff.gz 28847 BLAKE2B d46e0d60d438459b43e24d2757771f02f3b5eec1b297f16a0359b26d14fbfba9701ebdc63d9b4dbbe2247cc7b38b9670ed9900a896224a3c4d8affc1481a8a79 SHA512 67d339e1cd4409897b044aa9b4c755a43b939982ee70c0ab5d99afd807994ad1f571a52bf04125a633cc3a735e99ff9e156caf2fb4288f5c008121a4eb9379b6
 DIST fam_2.7.0.orig.tar.gz 301945 BLAKE2B 9219c15b998bbac49e76eeac86f2de666ac49dca773c82ff6220c11ee77f0381b93ddbeeb500a7775bff3cc29ad6e7008e12304f0b0e361cbcc951d9f995a229 SHA512 dae6e883ef10214b1506d342e32cb5c59d0b4b7b66c1b099daa836958651ff3b04d526b4e516abd96e51587a97a8950e9517d1b38c6f7e6637ee3e7d20243531
 EBUILD fam-2.7.0_p17_p2.ebuild 1768 BLAKE2B a913d5b761c70f175d9f7e5f9666881f2f054fda5dbea96fa613bd0841eeba15ef5cc2905bd139d96af479f813b985c7e2e27a2312434ff0e50d99625b0d9a2a SHA512 38dad20f2f0b2a822ca6bb1f6df5e8339657e562f1cf19db2454901e0b817ea6d6ae5166fa57e47574199b7e4939c9687d1f8b23648922206cbbf5101c20bcf9
-EBUILD fam-2.7.0_p17_p3.ebuild 2003 BLAKE2B ea0435726b29f434a9b909bf54e89d78f23cc069a4faa0bac9a2c659d549e25c3460f8265d4f447c8d991e4edcad29d271a789c0236a31be9843494ce04ce78f SHA512 a0f1cf4708563f3203fa014a9799c9dc75814779371c0e7b6646093dc622a79da2504c7db11758ca9fa51fbd3782885da0310ac303118517e2302ceb1ce02555
+EBUILD fam-2.7.0_p17_p3.ebuild 1997 BLAKE2B 4c3ac414f63d97ffca1a466a95910b08e31b4b8bf0e21f6d9271c46d8afa4f2246d7df8b98f516b7345bcc62068266390e5a6d4e3af32029bcf803e3f6ac8ff8 SHA512 fdbbc9949864b1a16917d51069af9a5b46659d4cc248fb80f623bf8beb3a478d4a041c7a7c7b08c38200ad4259302c9428425021169a6cf387d621705380ec25
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/fam/fam-2.7.0_p17_p3.ebuild b/app-admin/fam/fam-2.7.0_p17_p3.ebuild
index 339c46f75395..953a5b1fef6a 100644
--- a/app-admin/fam/fam-2.7.0_p17_p3.ebuild
+++ b/app-admin/fam/fam-2.7.0_p17_p3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 4a3ec443b51f..e54c4ccd13d4 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -1185,5 +1185,5 @@ EBUILD filebeat-6.8.13.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd25213
 EBUILD filebeat-7.10.2.ebuild 56909 BLAKE2B 595e7681a5f2ad3e93220e36a93e67b567d512af7c33e8a725a5aec9f6c1c91d031ba8a758a0a8ece56a8405df881a8542c18547ede3cb2ab090dfaf003767e7 SHA512 b170ab66646578d55e94ad2832ca10b4cf52c2e449b4a552c254292be2ac94d4ec5aa35c8146d1c8c8249cedd3ba6dde083803146a5057ed25a14d2a3761d0d4
 EBUILD filebeat-7.8.1.ebuild 55905 BLAKE2B b50831f6da888a6204319de0eb870f9fc1cf08256b21f05b245e939388e40c0caaedd1ccb3ad2287b872a28c014b02c3637bf49b78ff0f995d512f29ce72560a SHA512 2ac4bffb8ce43de76dae510c1f49f395136a9318199200f09087ea93598e52073c506cc61b7c9803c641c8c6665e146906581548f87a10828956115085b74194
 EBUILD filebeat-7.9.2.ebuild 55141 BLAKE2B ceb892d7c4b4760490a59fb15a943d9e94c479ce13bc84f2faf87a5f983a8335b1477a0ffd3a5ff281bc26c3bb6311c03252933c7db92aad262b74d4738ae17a SHA512 6a79de1b6d1013eb4d2bfe8482bc370ce17a81f39c561f913bb3694e5dd50a752bea1775405b9cbdc7ae4d07f7c68579354134fcfaa0b1dc10f4006bed27a116
-EBUILD filebeat-7.9.3.ebuild 55141 BLAKE2B ceb892d7c4b4760490a59fb15a943d9e94c479ce13bc84f2faf87a5f983a8335b1477a0ffd3a5ff281bc26c3bb6311c03252933c7db92aad262b74d4738ae17a SHA512 6a79de1b6d1013eb4d2bfe8482bc370ce17a81f39c561f913bb3694e5dd50a752bea1775405b9cbdc7ae4d07f7c68579354134fcfaa0b1dc10f4006bed27a116
+EBUILD filebeat-7.9.3.ebuild 55140 BLAKE2B b5cf3c10c29f84b63bc35f85eb78871b7fdb18db5048f6aa4f8421f09b50479eb4da290716110de4f2e8b6abae5b1cb1702a032505a95f93bcb0332170ace241 SHA512 694ac3ace92424e7bd1153270d88a9bd204c605d9608e430c101beffa973a1ef2c476f0c2ed0666024ab8040cd99dda15b2a7c092f4a75f888b24232225cec3b
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-7.9.3.ebuild b/app-admin/filebeat/filebeat-7.9.3.ebuild
index d3785a811d9b..be347a2d4b55 100644
--- a/app-admin/filebeat/filebeat-7.9.3.ebuild
+++ b/app-admin/filebeat/filebeat-7.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -988,7 +988,7 @@ SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 S="${WORKDIR}/beats-${PV}"
diff --git a/app-admin/gentoo-perl-helpers/Manifest b/app-admin/gentoo-perl-helpers/Manifest
index 126e218f3545..c11fea7f11f4 100644
--- a/app-admin/gentoo-perl-helpers/Manifest
+++ b/app-admin/gentoo-perl-helpers/Manifest
@@ -2,4 +2,4 @@ DIST gentoo-perl-helpers-0.3.1.tar.xz 9420 BLAKE2B dea001473832f4412ae090afbc458
 DIST gentoo-perl-helpers-0.4.0.tar.xz 9580 BLAKE2B daea9e3f43bcd24ea34c9448294fb730595e8a021dffcbbf7f123ff5439455aa362c623affee29341266a0494f4744df0bf195d2db422d6276eb54fdca07149c SHA512 fbbd33122028ad12cbec7adbc97faaa32aa485ef21ca38dc2e1906610fdea7709e5da7e8164f5f86afa3607928837f3b35468274b6c626e3bd843432d780701b
 EBUILD gentoo-perl-helpers-0.3.1-r1.ebuild 1252 BLAKE2B 9798d956cd7993cbbc6dc7ae7d545cfcf76dd38e6982841220963b6378a60c5d45018a953ad863b68b61d6e7e101396239019a9f6b7fda226d4a7ca1794cf302 SHA512 9d721901468f8b4b8f885609ec3aebecab3cb2ad83cc3ba049d4d7bf367b4cadf4566e6e013102bd8c96cfdfa023f4e21c0666c99d196aee48e64991c21406ac
 EBUILD gentoo-perl-helpers-0.4.0.ebuild 1281 BLAKE2B 431c26224e45a47e6d66d61740a25d9ab0bc766d59104f967629fc597e88b56d49429d877e692d50962e41cf1ed3b69bf6eae11c90b7b2561da35408569ca77b SHA512 6ac9e6aea376c5d848282e67a55f0eb67deb9fda41da79e9565784dc338e6a51cdd3c3966a9e17f7c408cb117ab73a3c701bfc706b4bc585e4c668f424033f82
-MISC metadata.xml 453 BLAKE2B 0a9ea49a54e1b0ac4c4d98615b15251770556bfe672eea650b8b52ac7dc9a0492d3456b894b8724c033aa272567bb0c7ad4847451ed3f29fd5aa365ea2e2d315 SHA512 a32d375d6aa0ac38a20cdec805c887be0d6493be5d47572a0e950e1f4a8b28018ab364cd06668ff59c52fe89487853c9c4bffdf05b79913c691d99fdc848b201
+MISC metadata.xml 347 BLAKE2B da861fbe8419c1d07a7c18c439a868b8c2ef7dffed65e78a35c81424c74d5a7d743a6f86e89d6821f1f705a2075c9701ab6c5636fcbe8f3b10b855ed29425b25 SHA512 c8a95b19267332871dcc69c119dbb343ec7afc8f3a8049a2ba9b9b47620aeb886f118bd39f85ee8163a912f174a0671e6256b1b917fcb53fde874fcb6e4d6a13
diff --git a/app-admin/gentoo-perl-helpers/metadata.xml b/app-admin/gentoo-perl-helpers/metadata.xml
index ddfded172487..cf8e6e4e15d4 100644
--- a/app-admin/gentoo-perl-helpers/metadata.xml
+++ b/app-admin/gentoo-perl-helpers/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>kentnl@gentoo.org</email>
-		<name>Kent Fredric</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>perl@gentoo.org</email>
 		<name>Gentoo Perl Project</name>
diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index 5c5ac0bac733..877e6ce57ca9 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -1,9 +1,9 @@
 AUX graylog.confd 521 BLAKE2B b776c8c834358a426aab6e67b894ab3fc8e07b5d6d24f506312f41e76ea36bd39398d1eb424cf9f3fff633a26acb8af54dccd4a19642b55bf18d91fe92aff31c SHA512 3d8c3b6128f839809f14c7a1f2683ed5ac273efbabb1e0f50a2e9e90ef6c7cdc481bd84ef3372bf10f288b08f2b850a80d917838e057545851d3113c8f877512
 AUX graylog.initd 836 BLAKE2B 936e5e3c811fb01bc80dde2bf8bf67dd75b6a4a20fdc7fabd53789fca977dccd7aa2664225d848e4b63819d15666e6913058ce0a769413c58784e891366bdc36 SHA512 a6d63077aac5d35621f355811bd6380b34eee952f34446faa26250c0e83a6649673550e51169103a6735fb0002f808fed0e8764459e129027700c3849b3cb0e5
-DIST graylog-3.3.8.tgz 129314297 BLAKE2B 21eaf45b396b11ad5c42efad790390b643505ac7ecc24332813784443ba3b5aeed911fae07beb270f598341d577469f9a5fdbe92101e64939e6646884b7f7fc8 SHA512 feda3dafc3af249e54e8240ea20a8fd4e96c80901b45842cf8ec4ee7a5b33646a391a19a23a06b0e5fb4bf29c0d1c8d7cb87f2ee169ef17ac5b38fbd00682ead
+DIST graylog-3.3.10.tgz 129330433 BLAKE2B 6633a0c4ba9efa6bdece55cc9c3036a45bb78e10e6e80f29656fd5924176ee881b7f1dfb761ea7af9cac0c1cdace87335747c9fcb23bb49b51ebb400139118cf SHA512 0280f3e4f38542487e2c9a10b0aa0ea2db711a249f9e0ad241d136ee1df5aada13a4da543ac40ceb7c715273903d83a6d62ceddde5feb9ede99c95cc8325f5f2
 DIST graylog-3.3.9.tgz 129306340 BLAKE2B 91fd8195176b2e7d87b0bf29ffbe000b8cddac8efb238487a0e3cc1b1048e9ea9af36d1f5362c79ce0ba964886b336a43bbc7e64d52711bf00e3721d7253a3af SHA512 acbfd63974a700f7860e4acf706cc40f8c097546510ec7ed040bfbf50cb878fbd0a9f793eb88227e27205d5af40dbad3a4299354bf70bc2c26a6998b6c3bf0c6
-DIST graylog-4.0.1.tgz 163263748 BLAKE2B fdaf3055a76b49a637e2ce7a52af465195e8afb787f20632197a6839a0e6d134284ac3e5c5af76d7fe8bb9ec5de9ba47d5401e0392eb5c078728698fd1e208cd SHA512 a7fb3757cb9ac67a33b836634f73d08b06bc6c0ff50ae0e24da3616dbe8663740e64f07efeb8ac8578f283232df784c959b940f25dc6ab5a66483bc84cbab88e
-EBUILD graylog-3.3.8.ebuild 2235 BLAKE2B 3c5282354b4c1cd5281640baecbe4031ebc90e4abe2f2f6640964cb353bc19e4985d4f1657c1b1fc38cba18201de98120de1bda93c208e8bbad9e35a7375be0c SHA512 121c473f1039cc0010e0bda3624f366b49f7741424d57c983077b044fd2bf0895bb125cc97ee97fe4313dc1736a5c6714532705a5053e8e9c1bc5beb038e566a
+DIST graylog-4.0.2.tgz 163286730 BLAKE2B 102b410b89e776c43ce97442407e0e7a418b0e9c9ac82747e4e049b83e8c88a865861e365ecc57fcd45dd4dc7bd763ba9f8657038526523c3f341be73daf647a SHA512 535451f84bc28e9716d34138637b732a4ebe879970051f720997d93828846a2ac707a58a14f14e10fa0aa4e3aeed5694ac0339275ef2623d5ac01712067158ca
+EBUILD graylog-3.3.10.ebuild 2235 BLAKE2B 3c5282354b4c1cd5281640baecbe4031ebc90e4abe2f2f6640964cb353bc19e4985d4f1657c1b1fc38cba18201de98120de1bda93c208e8bbad9e35a7375be0c SHA512 121c473f1039cc0010e0bda3624f366b49f7741424d57c983077b044fd2bf0895bb125cc97ee97fe4313dc1736a5c6714532705a5053e8e9c1bc5beb038e566a
 EBUILD graylog-3.3.9.ebuild 2235 BLAKE2B 3c5282354b4c1cd5281640baecbe4031ebc90e4abe2f2f6640964cb353bc19e4985d4f1657c1b1fc38cba18201de98120de1bda93c208e8bbad9e35a7375be0c SHA512 121c473f1039cc0010e0bda3624f366b49f7741424d57c983077b044fd2bf0895bb125cc97ee97fe4313dc1736a5c6714532705a5053e8e9c1bc5beb038e566a
-EBUILD graylog-4.0.1.ebuild 2088 BLAKE2B 2d49f39cce74b6afb1073f34d310687f8bca88f22fa09b9ff438f6cae5a14768f26ab725200c960407ad82972e3efc9ecf85ad1d2c896961cab4ed849ff7361c SHA512 8ac4ed61c0804ae112955ca94a9f32149b76872e9a736d8195db32384a4c21391fd28162240c69413702f7d06c36668e2d408a4e2a328d2e6806d3d0cd2e24df
+EBUILD graylog-4.0.2.ebuild 2088 BLAKE2B 2d49f39cce74b6afb1073f34d310687f8bca88f22fa09b9ff438f6cae5a14768f26ab725200c960407ad82972e3efc9ecf85ad1d2c896961cab4ed849ff7361c SHA512 8ac4ed61c0804ae112955ca94a9f32149b76872e9a736d8195db32384a4c21391fd28162240c69413702f7d06c36668e2d408a4e2a328d2e6806d3d0cd2e24df
 MISC metadata.xml 584 BLAKE2B d19e09582932c7986c85059766f2a845c0e85d214b9af6c61d9c26005e31c208a8ab59e6d82e5870162314c2cb4a9d3e852f12c02551d399c1eb3063449501bb SHA512 c32525442e20550c7e3b0ac8b74d896f35b2de1e87d57befb152047840bf4811c8df135f828b1c95505b4a348f25478cd7b2b186c36f93c6055086437f257505
diff --git a/app-admin/graylog/graylog-3.3.8.ebuild b/app-admin/graylog/graylog-3.3.10.ebuild
index d9a5d3883577..d9a5d3883577 100644
--- a/app-admin/graylog/graylog-3.3.8.ebuild
+++ b/app-admin/graylog/graylog-3.3.10.ebuild
diff --git a/app-admin/graylog/graylog-4.0.1.ebuild b/app-admin/graylog/graylog-4.0.2.ebuild
index 4112c68bb70e..4112c68bb70e 100644
--- a/app-admin/graylog/graylog-4.0.1.ebuild
+++ b/app-admin/graylog/graylog-4.0.2.ebuild
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 08eebb1e702f..617d9e2b2ad0 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,8 +1,8 @@
-DIST keepassxc-2.6.1-src.tar.xz 5715948 BLAKE2B 5490757fd939b572f2f281dc6ecfcd6afc7f9a5b2ebf3cc0c8ae4a95bb982ad755a9363f6133fb0f4ac2a2b5e0a6c66a7dba954911cb5baf70d447fc8d6089bf SHA512 9fb2d01d80e2b61c847c0544c280c1f3bfca671268e2dbbe78e0f3c1264f38125a3767ceb4591261f3586cd71f4fff47ecc6eacaecf1e707cea5e8907542313a
 DIST keepassxc-2.6.2-src.tar.xz 5720788 BLAKE2B c6bcc0af594c3b697d8e74752edb0389c80c72008bd57dcc36d9606462ea4bc9c6012a9f3f31702a9c0f88004fdc66f1ee4fbebd8a501227f4579ea8f3f1078f SHA512 b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1
 DIST keepassxc-2.6.3-src.tar.xz 7562816 BLAKE2B 1b33850ed996a2f07b1665309bb4680329a0f858d89e9e89f7ca39a84f27f1a4364bd8526d1907b4fc4d5dd586b3dc48d9d9b6235b78b52edc4db08ca72d79fa SHA512 37f97c0851731badffc9c40ed2dcc5c8fc200ea96b32281c21cf199799681abbd74fb191140022ad7872d69ee139e12646e19697010f539690e4e0f0f1c92558
-EBUILD keepassxc-2.6.1.ebuild 2063 BLAKE2B a42e9515621416fe81b1724db430fa5d601fedd7de2830acf9d9993c9486206bd76d13c5f10c3040e7fd37b518f543ea03173cc2a64c36eab10bce13c0d628dc SHA512 c699ed6e099a04e8a3748ecf6b586ffc4ba1f46dcf5644bb89fb3ad37b8506e47cc1e41fd7d98a0689fbaa80fb6c08ecde1db2cffc868199b124a8ba76a307fe
+DIST keepassxc-2.6.4-src.tar.xz 7575164 BLAKE2B ca02e59c7355f7f7e14bb4fa318fab66d354e84d1025847b413b7e838dc5a42024b963dea1e3ba2060c51da7daed2ee5b220e5dab72b5813d39c04b49c6ba9ba SHA512 3bde0c8670ba14be80c6f3676bd447b0855a2af2915a395ee236c2d4c6e4b859936351643d679480aae1fcf55ed4315447ae927ac9bdedeb0332593cb4e9fedb
 EBUILD keepassxc-2.6.2.ebuild 2063 BLAKE2B 8f692d143bb7102d5b3ab2440b9d6ccc66dc08ce9753265592ecf125896852fa6c79745db673ecde2e55d1de84edb76d5118354173f05902695e628da357b1ba SHA512 d43414563780fac5c23f0b3f7dfadaada0af309e49a2366e83b288ea181be9d662b5f366d1d73b8c16ab8b5d8e1bb958c3dcef06a132ca1c16f66099811bb71b
-EBUILD keepassxc-2.6.3.ebuild 2065 BLAKE2B 9acee41f6a44dfab875466c68104c75395c878c51746dfcb2d4109fea79f46d8828b9856ee370e612abacaec1a3cfbd8779cec0b072d82ea8d9de0fab562536a SHA512 fbf3880f1a66356f1700a89dbf3d33814862a4cfdb2b8a51c7182afde6e405a88960a1a7aec987ee54531d718faf02a111afe5088f386a28f160e9f16a18a4e1
-EBUILD keepassxc-9999.ebuild 2065 BLAKE2B 80d76cb75cead9572075d8068567f280dc5dd6f940654b121e57379aac666a1513ba8026de0583f9a0a14f12a30394c488c803280154e3ad05d0a5b0d880091e SHA512 0d250a23c3c98683a6592ce9f39a9cb200e2053ee8852fabe1e11c04df9c14618c27b7d7fc589f2983c2bf198a0c8c435f932f330c532c936a433bd9e8ce8245
+EBUILD keepassxc-2.6.3.ebuild 2063 BLAKE2B 8f692d143bb7102d5b3ab2440b9d6ccc66dc08ce9753265592ecf125896852fa6c79745db673ecde2e55d1de84edb76d5118354173f05902695e628da357b1ba SHA512 d43414563780fac5c23f0b3f7dfadaada0af309e49a2366e83b288ea181be9d662b5f366d1d73b8c16ab8b5d8e1bb958c3dcef06a132ca1c16f66099811bb71b
+EBUILD keepassxc-2.6.4.ebuild 2159 BLAKE2B dd466bdd8ad1bffbcc491eeb4bfb54733bf25090a7203a7618e6ac12c01556a57d430942b4f74a3d8971d86dc38097bc6ba12fd39030bcab5a9fc59b850cd8cc SHA512 712ecd33e744d48841ba6ac82378a87dad09cf25d80a98c6097761563b56f73f96bacccab267bf78d1b4f75b2c15d81721d9ae918a9c1ad140b34d8cae9f2f2d
+EBUILD keepassxc-9999.ebuild 2159 BLAKE2B dd466bdd8ad1bffbcc491eeb4bfb54733bf25090a7203a7618e6ac12c01556a57d430942b4f74a3d8971d86dc38097bc6ba12fd39030bcab5a9fc59b850cd8cc SHA512 712ecd33e744d48841ba6ac82378a87dad09cf25d80a98c6097761563b56f73f96bacccab267bf78d1b4f75b2c15d81721d9ae918a9c1ad140b34d8cae9f2f2d
 MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e
diff --git a/app-admin/keepassxc/keepassxc-2.6.3.ebuild b/app-admin/keepassxc/keepassxc-2.6.3.ebuild
index 5fd7f39fa640..5b51acf9ec34 100644
--- a/app-admin/keepassxc/keepassxc-2.6.3.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.3.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then
 	else
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+		KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	fi
 else
 	inherit git-r3
diff --git a/app-admin/keepassxc/keepassxc-2.6.1.ebuild b/app-admin/keepassxc/keepassxc-2.6.4.ebuild
index d85bd1e36b75..8c4efa1bb14e 100644
--- a/app-admin/keepassxc/keepassxc-2.6.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then
 	else
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	fi
 else
 	inherit git-r3
@@ -69,6 +69,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# https://github.com/keepassxreboot/keepassxc/issues/5801
+	filter-flags -flto*
+
 	local mycmakeargs=(
 		-DWITH_CCACHE="$(usex ccache)"
 		-DWITH_GUI_TESTS=OFF
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 0511c16e1277..8c4efa1bb14e 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@@ -69,6 +69,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# https://github.com/keepassxreboot/keepassxc/issues/5801
+	filter-flags -flto*
+
 	local mycmakeargs=(
 		-DWITH_CCACHE="$(usex ccache)"
 		-DWITH_GUI_TESTS=OFF
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index d6cc26abd042..76cd19b51f81 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,3 +1,3 @@
 DIST lib_users-0.14.tar.gz 25746 BLAKE2B 4aa2dbbd7c53be13f79988a62c7997f0787ea9b773fc57681a021ff75ba9ff0988ac3032b21150c4e4958849a6195df09d388b6341e1ac139f34ce9555786233 SHA512 533c6e8f486e58d0fd22aea9a30adf91c3a8340a8a3719f6374ddfa8120d402c8202ab8ceb0e78aedd46e3e5875795392ed40497a66d51de5c2ca6a275a1a777
-EBUILD lib_users-0.14.ebuild 1080 BLAKE2B 8484d7563aa0283d4c4dc0630e3d7eb369c417a480c8c0fa1e08578036f930e2ade53076b64eee22b44a598ecccd71171d27aef0920ecb69e3843803b577dd0a SHA512 05ea3006a86ccca2020ffedd4c4bcef4e4d82f0b37c039ee3e811237fe50dc3395b7c2abbda50c2f7a792b9f43e0a4c50890d2762f98b3cfbfb5c19be299d23b
+EBUILD lib_users-0.14.ebuild 1087 BLAKE2B a8ef1300751630c29f683acf122797f3a9d8cd44534272d0663d5fc582a6a664354155f9f5e5bba31ed252d2847b80968393aee946e013c625fce1489ccddc6a SHA512 6287979968dda51be7cd908c75935f0a3fbb93ecffc9e8877efa43aa056c60333ff09907748a1611ae95171740af5356602a3b63a00a2a041bc8fcfa626856a3
 MISC metadata.xml 343 BLAKE2B 546650c71c7021908ec1f5ff61a835329bd7c9c870e9690565f9dd5dcfa2791c78334c3b7186cafb92f0f7b3900c44f37113062918346054bb11c4f54cb109d6 SHA512 890e9d42b29b85f62feae7d61cab7a0468a56df75fc0909bc0d5d0704bfe8052f9e524293011046fc2c8511378d3abb9928afa69ef35c51b79a4effae8ef9ebf
diff --git a/app-admin/lib_users/lib_users-0.14.ebuild b/app-admin/lib_users/lib_users-0.14.ebuild
index ef4b2302b546..e9fdd63d9ae6 100644
--- a/app-admin/lib_users/lib_users-0.14.ebuild
+++ b/app-admin/lib_users/lib_users-0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 99cce6b3a1fe..13f247b6ce01 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -6,5 +6,5 @@ DIST mcelog-174.tar.gz 313473 BLAKE2B 6ffbf6f53e4a08d0dbec04f6cfd96e6b564de5e85a
 DIST mcelog-175.tar.gz 315350 BLAKE2B a324af0f4961fb0f6f2af1b198e07a34c24fb5874edd550ca9bdfe452d84cf48d9565530a290a3cdba51eb4ad57f3bbe3d3c9b2beb6d3411195d6dccdb9dfd64 SHA512 992789817a3963a3f118121149bf9b217609f54d85a71c2adb671728cf04777ccb062033df68793afff5fb6a0080b50b4e6fa89cbcd0970d92ca4246155ea13a
 EBUILD mcelog-173-r1.ebuild 1353 BLAKE2B 2bd8f0d4bc17feb9fa7435c1056443639777a35803379019cbdf05aaa93d82a152495b7ba3d914665ec57a28441d00a3bf077bf93929916403ad26e3b664caea SHA512 32155344fb55a5a12ff14f56d1c6b392d4cae1bba1fba2e77f219fa35f054f7c60a45917189bb63c37551f4308b90ca4cd17fda0b22f7bb532f9d9cc1c2bca19
 EBUILD mcelog-174.ebuild 1355 BLAKE2B c1c875cfb1efeae3e9818a0c1393cca8e05e2444861c426959f212e3a6ffbe1efc3a6b5ad0bdee4f14e8eb0cbfa06fcccd87a8fa8d0cce112ad79a1474d17a76 SHA512 07f1dee935160cafe5a52ec266744b7911095d012eb91d403863e3a4996768c24ea7cf15cacf6600184ba02fec380d3c8bb7390ca92eb9d4066b34bb3fd16595
-EBUILD mcelog-175.ebuild 1355 BLAKE2B c1c875cfb1efeae3e9818a0c1393cca8e05e2444861c426959f212e3a6ffbe1efc3a6b5ad0bdee4f14e8eb0cbfa06fcccd87a8fa8d0cce112ad79a1474d17a76 SHA512 07f1dee935160cafe5a52ec266744b7911095d012eb91d403863e3a4996768c24ea7cf15cacf6600184ba02fec380d3c8bb7390ca92eb9d4066b34bb3fd16595
+EBUILD mcelog-175.ebuild 1353 BLAKE2B d6b73b5c2cba965f04baa24493349a8a9e20b584f36056d68905bf0072f53dc25dbf53096ff2484b501a2e143b7110718c8a97e983270350e72ac3d81523b36f SHA512 50587acc615805ef2b615ced31b64de5a614cd72afb5aa5953a03652fb98bb6d947deb3c86116ebb6c8db4822bbcb0e8a693c9d17cd1e36a25baab4ba9a6d295
 MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/mcelog-175.ebuild b/app-admin/mcelog/mcelog-175.ebuild
index 0fceee0d5f22..8077741bd91f 100644
--- a/app-admin/mcelog/mcelog-175.ebuild
+++ b/app-admin/mcelog/mcelog-175.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
diff --git a/app-admin/newsyslog/Manifest b/app-admin/newsyslog/Manifest
index a170eab95185..1dee86695aea 100644
--- a/app-admin/newsyslog/Manifest
+++ b/app-admin/newsyslog/Manifest
@@ -4,5 +4,5 @@ AUX newsyslog-1.1.0.81-html.patch 428 BLAKE2B f0861cb97bba4cc1a17983a1dbaac22381
 DIST newsyslog-1.1.0.81.tar.gz 174411 BLAKE2B d7916396ecf7dda9928891c3bd1020be45354c9623e53d9a52170567c811b3cad3e82efec8145f51a68ed851c46a6c3fb6e8bf944bedf935f2a6589e4b45d3e1 SHA512 de7ae2f71fb5a2a3fad0eaaa793da1ff2b36bc5757a30c70e8f740da8ea2647aea0422c13c1cc1a5e082e41938cbb590c8bb0ecf46d5d584466069f319db47c2
 DIST newsyslog-1.1.tar.gz 156371 BLAKE2B f9ac2de3059e377e61963af70591ca19bc335ffc96d1aa94770fec96cad7b8200d10edc6ac4ab115b697eb0527a998dd457ea1c0d5a1b529d5cbf5285d5ec138 SHA512 b321ae47ecacf6905858bedfaa5ca8c4230f7b6e5a715f8481331940c0ae53795769524a62d1670b4df27f9e263b407be83527a64ccd54b3ba75d55d3c5149b1
 EBUILD newsyslog-1.1-r1.ebuild 931 BLAKE2B b6f08d32e6a4a55007817fd7c90526328a1273e751bb063462d93fe82f6d05221fd3221c290167b91a88e03c148067caef442634646e08587403a80d59e9e5a7 SHA512 64a6bbbccb5b1487527e5511deb52f07647aac7e90d5a4b6caf095a21b705441ec4f22b94051809eb738cfec9009104b108f950ee66fb7b1f1e8d5400b84737a
-EBUILD newsyslog-1.1.0.81-r1.ebuild 1015 BLAKE2B 7f13bb3d0d874fc25caf54525ae61ae8fa8f8f3fb3a983b47aca9e1be9ce6c14a4a46bd96f83f8def19b608bbc360aceb21e33583fb56a0d00bfa9dd9a9a1eb9 SHA512 35f7c120a7c9c4bcee5e8cd98021735a2e8c839534a62fbda9ac9184537e493f4e66ef3dd10d29d8853ab2061f061815a0b7a1537d97eaac14bd5e83b35bb49c
+EBUILD newsyslog-1.1.0.81-r1.ebuild 1013 BLAKE2B 24982b5422d8c1f1d7096a704dd77f488b607c5851e1662ea35ed013a10aa905f147baa663b5e9b97c8c6f17ca059beaf1e837511526f03866a4ad91878b618e SHA512 f559cc1e7a6bcbfb76251797a66cf6dbafde874d599e680438768abfa36d9dbfe7c83ce882d2ed7d6d989a8f2088471ba5a562a04e4bfdd6a8241557a990f574
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild b/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild
index 3fb7cf3ec3a6..1ff6c82d2536 100644
--- a/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild
+++ b/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://download.openpkg.org/components/cache/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ppc64 ~sparc ~x86"
 
 BDEPEND="sys-apps/groff"
 RDEPEND="
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index abe670a12b47..9c8ec93e0e06 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,4 +1,4 @@
 AUX passwordsafe-1.06_beta-system-gtest.patch 2962 BLAKE2B 1ef77391d355364e55da568c2686c1988916da9eadc312c37d01016df3449535b88b503dfd3aeac2bf3c8e613141552bb1d97f5f5a733becc33f3c565a610940 SHA512 2fc6745b84ad810a550c2b221aca4cd10f87d4bc77282cb31b3d3070b61a3958c126ce0d3da4eaf550d80be470ca4c5aefaeb863caaf2f9fb285bf844f5705bb
 DIST passwordsafe-1.12.0.tar.gz 14937705 BLAKE2B 523e4496ffb99f8a53e62252117d43b771af867b3505f3a5b8c8f1119e8365f0661090e410a832abca89e2ce35816d2046d4bff0ba1e0f06c52c01eaac9051b2 SHA512 c20cb754a2174e3b3ab61edf99f2a31c333144550103fac50cc26cea89669fa3574db3bdd59996fcd87b83c7bf6dd1e9d2b087c17615183cd7111f151be5a94a
-EBUILD passwordsafe-1.12.0-r1.ebuild 1947 BLAKE2B 8ce56a738cbf43a3d7b7b00fb793b73ef63a5374c18d71cebadc9ec37a0a983bcb21f988c90e95fe603d6f11130f030c45b7ff95dd53b8b1702c89ed35e3a6c5 SHA512 a16f14f23aa589a11bfa956bf8bc9e38eceb6248ebece22e034d5773976722db3d40627b20907a638cd596c83c838b1d3344bd911606682cb0828b1ed6fe37e5
+EBUILD passwordsafe-1.12.0-r1.ebuild 1952 BLAKE2B ca0b8d7112408f3bb6ddbae81f910f22454246f8442b858e4f51108f9cb8b372c9d34d2375c60e102d5a811dd467b0b92faa8198401e961ca7a1c7775b8cec02 SHA512 3c830d1f384651b2f6153594bb589f954c0261a285f1df5c9ee7cff4e7c26904b7b246478761e7bd38ad395e0d542f66ef48974174406b486d75a8c28cf2ac85
 MISC metadata.xml 683 BLAKE2B 9db2240d92f852ed50085280e3ddb947261ed7aaa9ed04784cbdf71c8e29ae79e1730cae298bcbcb75f82ebb69bab96695ba1a519487c92da399e1c7a98014a4 SHA512 12f06658b68b46cec87fe6842a8b94cd3c35b9e1d81e4aa447ec488358dcd37f5b3779c87d9fe0e4271f5f7e69550aa44cb815653acd502e10446e1842899e82
diff --git a/app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild b/app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild
index 47a36e206ad1..343fe3239dfe 100644
--- a/app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="libressl qr test +xml yubikey"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index d9a4b5b54f48..4930d7848489 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,11 +1,10 @@
-AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
-AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
 AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf454a5163bae5cfa2b7af1a212b2e5bfcb4693c7291d5306e47e574d3c937aaedd02625dc954a9e SHA512 df93f7dbcf61eee9f42f4a0c2fa0e2dfc806ac737ba98329cee158e04150c9bf346abd9364b2a6824df4bb862e676be7b2c23f5947ef5aa589df745ac5c5cd03
-AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
 DIST puppet-agent_7.1.0-1focal_amd64.deb 20881084 BLAKE2B 1f16533e9f2da9971bfeaaab696bd0631d058928491c52e7cadba2c710af8373cfb89b4eaa4e293121857dfdad9bc694d562ebd9db8213198191c56fe94dd119 SHA512 3356810dd08baad373fd62669995cea17fed6baad3d3ae54dfd00c88a69602b5d4b8917b5e54aacc41fbd011a4e6877d1fd6c4a62d09648ddfaf26d898c3e7d6
 DIST puppet-agent_7.3.0-1focal_amd64.deb 20876192 BLAKE2B 2d7b9925771c31204f4fe12253ccff0fb68fb1c475856c31b1bf82b4c1ef3f93870660916702e9acfe57235a4293d7807c24f80789310bc4efb9784c86e895c5 SHA512 79c72664795c37fe0bbcc0d96116ff073cc07154b5713a904602308e3fadb37bc1bba04466bd29877340e0d7707475f3cc38348e1811660764d18ed3c1d53250
+DIST puppet-agent_7.4.0-1focal_amd64.deb 20897448 BLAKE2B 1ed2ad91dcba1851b5759591033cfd74ec9dc644b3da416f2c1f5598b89e7cfa1048f09331717fc2b72a479ae8a7137f8f0a074debfbc183aea1197ae31b5df4 SHA512 bd58032f38f349938843550bc1e238f1cadec685ab6f90969e12e47e021fcdf4ffd4aa7be98fd797976d7873045444ba20b4ad3d05f543897a8d3594949c55f4
 EBUILD puppet-agent-6.19.1-r1.ebuild 2063 BLAKE2B 046b9954bf6619f55a664eb77b6552fd23a8d6d8a0da3dc9f9f395d570bd852fc3222bfc92debce028b49919e2fce63115d8c84c4957c75e49ebf5857b33c1d5 SHA512 8d78af238e593ddd88498d4994afa6565c8d5e9dcbc4baf4e05238ed591847ad97b3eb452c1a4d688d8d9d64aad274826349c28797bad960f12ebe39be1c304b
 EBUILD puppet-agent-7.1.0.ebuild 1916 BLAKE2B 7ee5268c276c7166787b64d7b39d5c2066303d552dc3b9880285daa98846d1f92512e353f6ce7a270774cbbcc569781cddd391e3fb2e633188c5535a7e9d0098 SHA512 d1b5ffd018cc68f5e71084b7948fc5aba69cf1b66c50acee9d2ed4927f93f9dc9104c3a691654fc730dd6a0bf891ecaa08b2540201ca2157b0ab81626cff6b99
 EBUILD puppet-agent-7.3.0.ebuild 1917 BLAKE2B e66d42fea919e79bcc08e59ca9b2db83f7fabef3350d7d89bc0534297085e17bb786d638d90d87830317c038c2685278b4d96b63b39578e6512b7aa8b9c36ced SHA512 ed2c789f1ab7d8f35a0e10b2face6ad73ca08bdcd7a01165e7ec9dc38b78fa481c7c7dbe576f7854511f85eb0f318270c2fa991cc2a88a3a5f9b899a4a7951b6
+EBUILD puppet-agent-7.4.0.ebuild 1917 BLAKE2B e66d42fea919e79bcc08e59ca9b2db83f7fabef3350d7d89bc0534297085e17bb786d638d90d87830317c038c2685278b4d96b63b39578e6512b7aa8b9c36ced SHA512 ed2c789f1ab7d8f35a0e10b2face6ad73ca08bdcd7a01165e7ec9dc38b78fa481c7c7dbe576f7854511f85eb0f318270c2fa991cc2a88a3a5f9b899a4a7951b6
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/files/puppet-agent.conf.tmpfilesd b/app-admin/puppet-agent/files/puppet-agent.conf.tmpfilesd
deleted file mode 100644
index 42d082111940..000000000000
--- a/app-admin/puppet-agent/files/puppet-agent.conf.tmpfilesd
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/puppetlabs 0755 root root -
diff --git a/app-admin/puppet-agent/files/puppet.initd b/app-admin/puppet-agent/files/puppet.initd
deleted file mode 100644
index 1c366bcf9641..000000000000
--- a/app-admin/puppet-agent/files/puppet.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
-
-pidfile="${PUPPET_PID_DIR}/puppet.pid"
-PUPPET_LOG_DIR="/var/log/puppetlabs/puppet"
-
-command="/usr/bin/puppet"
-extra_started_commands="reload"
-
-command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet ${PUPPET_EXTRA_OPTS}"
-
-depend() {
-	need localmount
-	use dns logger puppetserver netmount nfsmount
-}
-
-start_pre() {
-	checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
-	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
-}
-
-reload() {
-	ebegin "Reloading $RC_SVCNAME"
-  start-stop-daemon --signal HUP --pidfile "${pidfile}"
-  eend $?
-}
diff --git a/app-admin/puppet-agent/files/puppet.service b/app-admin/puppet-agent/files/puppet.service
deleted file mode 100644
index 61b03134b331..000000000000
--- a/app-admin/puppet-agent/files/puppet.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Puppet agent
-Wants=basic.target
-After=basic.target network.target
-
-[Service]
-EnvironmentFile=-/etc/sysconfig/puppetagent
-EnvironmentFile=-/etc/sysconfig/puppet
-EnvironmentFile=-/etc/default/puppet
-ExecStart=/opt/puppetlabs/puppet/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/puppet-agent/puppet-agent-7.4.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.4.0.ebuild
new file mode 100644
index 000000000000..8a6e3a65de40
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-7.4.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils systemd unpacker
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	app-emulation/virt-what
+	acct-user/puppet
+	acct-group/puppet"
+
+DEPEND="
+	${CDEPEND}
+	app-admin/augeas"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/libselinux
+	sys-libs/glibc
+	sys-libs/readline:0/8
+	sys-libs/libxcrypt
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="*"
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	keepdir var/log/puppetlabs/puppet/
+	chmod 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd2" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	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 ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index ddafcc9bf973..41db1949f8b9 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -9,9 +9,11 @@ DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d5
 DIST puppet-6.19.1.tar.gz 2917976 BLAKE2B 06019b465699494c3c5045d8d3f617046583f8bb5ebff4e72991bcf5f1ca76b4e00f56af79bbcd7ab849439fc5e627840ef08b92f586441c0cb0bb3d51805f7f SHA512 4e8a3c8d46b6aa67c31da4b510dfc32a187937af213efb9f2f0b6625b29995cdfa8cbca384ad857c19e47ae4878127564756a809c2afdff4883038249395ff01
 DIST puppet-7.1.0.tar.gz 2827602 BLAKE2B 5e15c7304c7b91e40b95096482d6a71a3e9e1686f769c4c0334a533cd8b6faf31d4e126585c9b48c15bb524930e0410bff32201dd01d7faeb7487c29075f7477 SHA512 7cb5f8c472d28012a0b93893792611dd03081c7100be57e2fab60a0dabe164081fc40195d562ef8cf5e2d67f9d32f26704ecedee9cc772e568a116e12af70cda
 DIST puppet-7.3.0.tar.gz 2855997 BLAKE2B 38a02a036d82be3ae727f7433b80ee1bdbb66f6fe10dd2ac37d3191fa6bcacac8cff84ae048d449564703448a87860fd9debdc043a47e7dfbcab69f6dedf479f SHA512 811e2a182af7bc8038750d99feb526b261b6c3633d5492fc2e14ab9f8902bb54d3f651730efb6f06001b96f550a9957d8604ffd30d489f038200d1359d91e98d
+DIST puppet-7.4.0.tar.gz 2857763 BLAKE2B 980180d10c3329f8c94f02c6a8b403d88a3836fcc5567fd00eb4e2b4ae63d7a03709f3f14a337cdface62be04f9bb9082436f69b95f8d37996a9a933801a163a SHA512 ffb4ffb5121fcbd4b61ab1ad51fce96c1f2415b85ec785c858721a7f5604a6a8de4d595b6806657b9b1757e70763b2c495ca4d8ee694d668532cd15dd38a9c7f
 EBUILD puppet-5.5.19-r1.ebuild 3692 BLAKE2B 7aa03944368b7395b4c587230a39536db28d0a46352bd5c6f7ec457ca29a3e6d9a3672a9b74591d3382909dc4f9ecf6ec73853ad5722b26becafb5c1a1264912 SHA512 6012739c4d92cf576ea482f99e9d560633103116b40be7df8cc3a9e89f9efeef3e02317dbbed1207a91c5372ef7702d723c37207488ecd6ececad5d0df6de9a2
 EBUILD puppet-5.5.22.ebuild 3751 BLAKE2B bde3bbacdd70435fe0e804133106ebc887f72da5742c871bfdaed08a084866f178b68433453d392f7e98f8f5a2297ee10e7b6e035392fecd22a84780a2b431b2 SHA512 5bc024d0696e51de520ca6ba162cf312ddc9cca04ba5ee18f849ca48547f31e4a493664ffd0100022ef4fb69ad1c24b1efccf7a25d85652281da71c446b87f26
 EBUILD puppet-6.19.1.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
 EBUILD puppet-7.1.0.ebuild 3552 BLAKE2B 14aaaf8c7a30bf347ebd26aa83c000e329a63eec65b00927b8b2e53e5f44d610079fe38d1353e31467302f6c5aad558263ea045faaa564cfef4aa8995a8fea16 SHA512 29bd219cba5000e6a68f8e64bbd1db27e8df220d70288ac76b3258712c2343de636f327aa202e8be8d2dfd1a94aa0ef87cfb72438cbb501bce6162fb7f8a0ec0
 EBUILD puppet-7.3.0.ebuild 3554 BLAKE2B f9eddf609044df429b57035d3f2b19bcb90ce3f3a5c75d6196f96035c2d23b98ffad9fabba74178742bc65b78dfdc84ba7a7f20e9b4549862219183fc525fee1 SHA512 e27b1130decfe5da1b51cbcb9c915403b588e37c2ebd9bef78f2fbeed1595cd02f99d3bd73d3e0c3c24631656b4732b6e5a5a8bb63f2df17689d980c44493160
+EBUILD puppet-7.4.0.ebuild 3554 BLAKE2B f9eddf609044df429b57035d3f2b19bcb90ce3f3a5c75d6196f96035c2d23b98ffad9fabba74178742bc65b78dfdc84ba7a7f20e9b4549862219183fc525fee1 SHA512 e27b1130decfe5da1b51cbcb9c915403b588e37c2ebd9bef78f2fbeed1595cd02f99d3bd73d3e0c3c24631656b4732b6e5a5a8bb63f2df17689d980c44493160
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-7.4.0.ebuild b/app-admin/puppet/puppet-7.4.0.ebuild
new file mode 100644
index 000000000000..5b564665270e
--- /dev/null
+++ b/app-admin/puppet/puppet-7.4.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 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
+
+	# 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/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 0025d163cc99..974847845eec 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -2,10 +2,8 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-6.13.0.tar.gz 61890579 BLAKE2B be514b3c41dcc018715e949f1f1c86317499baa22fa70e5f7e8df89211b566651ab4de469afadf14fcd1dbc9b1d0b0c21452c313f74052eb8d65bbd591231194 SHA512 ab67ebf94c37a50999a5597e1ceeadf606296c2b6e557bd6ee2bb99ac44b7c8fe8df892f4e3bccb9f0e3822fc480f61a27d6799b7dfc8df12e058c7074d589f9
 DIST puppetserver-6.14.0.tar.gz 61960111 BLAKE2B 760fb2114aef78f1d96d41023f43f162eccd14ee0fa50f8ce4c7954450087dc395d9a9347629a968d99193ba6964b11a2650513c229b48159df67e9f9d63f541 SHA512 5d66b57a0f3c64ff889c33ccf94077a0ab142b84ca17faffaf4b885ba4794a52afb1b227f101eced36655999ac402913363897a3823a387f3c48948d38471c43
-DIST puppetserver-7.0.1.tar.gz 62214010 BLAKE2B e0272e8dfc910f503cbd8aca8d4c689656d1356a6198766c5c82ab6658b2e7f5e956eb10022ca5336fd1bd0d655ca4c87e5c43290229cfd26c74c9943210cdef SHA512 67f3ba07d1f607eeee0f0520054711f36d0f6e59477930a6115c5f5127b9fc7e00075d6f863bfe9e9f92e4f45fe13f452c80759e3b496aebdca6fd97e50f3774
-DIST puppetserver-7.0.2.tar.gz 62359801 BLAKE2B dbfc5c2c5ba05666dda2308647d9a164c32e3f2bbf6d290e0137882ee88a1358af6dc73ddde853bc5ef0fe61121ec4eb5993809d7ce5f0e0cf9ab5b50974475a SHA512 5e880d1c267f469d5c7be70b154e7d68fd78b1b3e3f30bc7539dd000f146f70262700e877a16c4699ba0db57f244fc271fd2ff8c8d3971f8272a99eba4ae6a83
+DIST puppetserver-7.0.3.tar.gz 62780509 BLAKE2B ca8762f503e69a8d22881218b1036aeaea19612a96a148999e1c32bb7a1bf53f1940051268896aed1e9c64c3552f4480bd45f2404eb6c4be7ad20b68d02ecff5 SHA512 eb849a4ee95c8f5545e0d92ed9c450ce77ffd327f7d88f320ef99245217ab0f5ecb55bafaef5a97047a5f7559e4f05d06fc4333f76ba0b6418b184e03c705733
 EBUILD puppetserver-6.13.0.ebuild 5323 BLAKE2B 0db7db207a85592c34ea08e7f2943a84ba799191e4481603b3448be95f26195c5419f465ee205d4c218c7d59c872d59ce42228437e9a4008d773eaf89c8334bb SHA512 b2424e2661072d77a7ccd535dc319000e1e2b8510428c4932bbd578c3e0d5189f8681d409daf194c801382ac730b45a916fae6c950ce059b8d0bf83de58a0c0f
 EBUILD puppetserver-6.14.0.ebuild 5323 BLAKE2B 0db7db207a85592c34ea08e7f2943a84ba799191e4481603b3448be95f26195c5419f465ee205d4c218c7d59c872d59ce42228437e9a4008d773eaf89c8334bb SHA512 b2424e2661072d77a7ccd535dc319000e1e2b8510428c4932bbd578c3e0d5189f8681d409daf194c801382ac730b45a916fae6c950ce059b8d0bf83de58a0c0f
-EBUILD puppetserver-7.0.1.ebuild 5325 BLAKE2B 63fbd9c252c64476df2b8592c34ccd2e67bcd39b41686ddf29f49cf860ccedbc3193b8e9adb95edb8cd3cd75da448e0dd9f202da5bbf0cb9bd1bbbe61f996a29 SHA512 191d5c6fa5dd735838814de6b7c62bf44c143c64d470aaef171f27eafa6e1576643b2614620cf7f07919a16388fbb58ad9b89124ada6bcbe287b4cd88d374bf9
-EBUILD puppetserver-7.0.2.ebuild 5326 BLAKE2B 1ac5bd0287581c9bdaf1de5cf664224f33041661f1c60f78cb62a16a3dc90861c6618b0b77bab7a8c62a29bd3f70ae8b33cba2a93aad586a24dd4926264aae63 SHA512 ac7582cb40523158a82ed01e696cdb34ffd86b34a846afe6424419541bf87d520d094279300c6ec681f637f7096069a13565aa43d0beb448547343ac7b3984db
+EBUILD puppetserver-7.0.3.ebuild 5325 BLAKE2B 63fbd9c252c64476df2b8592c34ccd2e67bcd39b41686ddf29f49cf860ccedbc3193b8e9adb95edb8cd3cd75da448e0dd9f202da5bbf0cb9bd1bbbe61f996a29 SHA512 191d5c6fa5dd735838814de6b7c62bf44c143c64d470aaef171f27eafa6e1576643b2614620cf7f07919a16388fbb58ad9b89124ada6bcbe287b4cd88d374bf9
 MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-7.0.2.ebuild b/app-admin/puppetserver/puppetserver-7.0.2.ebuild
deleted file mode 100644
index 0cf80aca0efb..000000000000
--- a/app-admin/puppetserver/puppetserver-7.0.2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2021 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"
-
-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
-	keepdir /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/puppetserver/puppetserver-7.0.1.ebuild b/app-admin/puppetserver/puppetserver-7.0.3.ebuild
index 4d5a6144923f..4d5a6144923f 100644
--- a/app-admin/puppetserver/puppetserver-7.0.1.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.0.3.ebuild
diff --git a/app-admin/radmind/Manifest b/app-admin/radmind/Manifest
index 937d9e3a3274..94d0e86acaa3 100644
--- a/app-admin/radmind/Manifest
+++ b/app-admin/radmind/Manifest
@@ -1,5 +1,7 @@
 AUX radmind-1.14.1-glibc225.patch 709 BLAKE2B 48890c31f0b2f4a8945f8cbf9c02cf842744949be10355f3f2b6aee0f56bfe9847b7293524151c72a5ed93e1fa1ca1957261c8b7d000668e4d10fed8bd5154b8 SHA512 faba25648305e3c5374f37037cf61f22bc2e6d1a3f40395e988f00f6c2335cd22fe962d0a9a6ae3ccfd879afb05965916f8f333fb677e89e7b7080f5c977a3b0
 AUX radmind-1.7.0-gentoo.patch 850 BLAKE2B 3ad977b414913caa868e6bb967f73fb0920c2a59fe91f22617f27aec89a7750e0b3b67cf8eaa383d3b3a5326f1033346b507ec46bfdb48fafda0a1551da549e5 SHA512 9eb98ce293fa9c1dae22ec596353deae2e9262427ead062890ef7848fb5fdff1e061b4bacef681465eee2b17d06c371b01c12e547538e0b9385ebfffb9b46a72
 DIST radmind-1.15.1.tar.gz 449653 BLAKE2B 8a516ede28d561a60f7c51424c6e48ea030dd571528fd3422fab3b23b4448ee898d408136c4845ebe9c5f9088fb425ed67b341f4d1721747a415183687e6daa6 SHA512 3dd9477d00083cf9912e2143adff52f9bc127665ff6705bc200b7323e53390fb76ac125733596ba309905fca3db062c7b1bc1d1372b77a3044c3794bacb96e6c
+DIST radmind-1.15.3.tar.gz 843033 BLAKE2B 3d4446e5ce9e668039277f63a16c014dbbecca870886e68603af4100cdbf4a0adf074d26c90985968ec1a680fb483395676b85020134ec56686318b3d0664d99 SHA512 121fa2ea4dc9532bdbb1440c3ee485db1d6a1e770bd01dc0e832d51ee26112441ff47bea8e7f063feffc4d5bf3cfc5ce53d316bb469ff4ff0a65ca5463c99d11
 EBUILD radmind-1.15.1.ebuild 805 BLAKE2B 031c240289284afe3fb43b771e8aaf2c97a6ae4d877744920f7049abb5ffc59cc11eeedc5195b497fcc410e5b46bb860d52c45d4533adfbabc7ef305a252be06 SHA512 07e7321e62b14200c44e4191406de5b8373f9afb8bc0ca4dd2c1974c18b22a64b0a280c6a9b83a2282b20cdf5173ffcc7c407160c7428bae605b22bb74fba8a6
+EBUILD radmind-1.15.3.ebuild 731 BLAKE2B 6c3f8535003661d58a13d6a82e9242260abce5fbdfe734a5ea214cc751a3dcabe50511541461980d3e01d72be7e0c9922b02286aa68497e568d280e80d4edcd3 SHA512 f38ee3e14612df68709d960d6bf48e286d34386e4a5310ff37234dbfc224730ff51789a5bcb16dbb6ad3afca3b6eaadc04c47dc08479874bb5aba17de5c400e5
 MISC metadata.xml 404 BLAKE2B 365cee5ab102123ebee500dc96ba31bc9b47b9e415c1a6b5f682adc011d62f460a09174888f444ecdd6136b86843a55aa64ab15dd9e7af00ffa628099b87b261 SHA512 cac73072027c59e6e34a3eee8cb602d72601306e5f1d8d4b4214d12b900320f0f7cc7f4a8f0a6590e2f6286799d0f96d3edf5c14d85b4f586ae9ad1293138577
diff --git a/app-admin/radmind/radmind-1.15.3.ebuild b/app-admin/radmind/radmind-1.15.3.ebuild
new file mode 100644
index 000000000000..7a4b40665a28
--- /dev/null
+++ b/app-admin/radmind/radmind-1.15.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line tools and server to remotely administer multiple Unix filesystems"
+HOMEPAGE="https://github.com/Radmind https://sourceforge.net/projects/radmind/"
+SRC_URI="https://github.com/voretaq7/radmind/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}
+	!dev-util/repo
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0-gentoo.patch
+	"${FILESDIR}"/${PN}-1.14.1-glibc225.patch
+)
+
+src_install() {
+	default
+	keepdir /var/radmind/{cert,client,postapply,preapply}
+}
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index 45bb1d355650..52646d3a96e1 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -5,5 +5,5 @@ DIST restart-services-0.17.0.tgz 25643 BLAKE2B 5999e12e38207d00266928504da05c004
 EBUILD restart-services-0.15.2.ebuild 1791 BLAKE2B dd068050b6902dae67edf63b00afc64e65b53225d14e7a201da6cee76dbed62af643625a7ed10a4021481f4e3a0a31f8534972ba6132cd468262af73947042c2 SHA512 74dc54132343203ab53b13d1649bd9e4b3a28d31040e5c54f32707b94267cb0d29873d48e3a3e00d70a7763a6f57d841518602c405599f575e359b5fa9f1e999
 EBUILD restart-services-0.16.0.ebuild 1793 BLAKE2B 7cba407e822b45ea90c5cc88ad767d232d4195f5e4b8d217237833f36679081ab7bf367d96d406e02adad4722a23d8826ee958bf6af70248e5d8156fd9951b66 SHA512 d958bd1e77eb7b68d89a55e34716d0f4f4dd2b1af407a3449d8d859484770747bd05ad9668c5e1ecc32636d8e63c692480a9d4316b8f8e5d25caa3740d1ec109
 EBUILD restart-services-0.16.1.ebuild 1793 BLAKE2B 7cba407e822b45ea90c5cc88ad767d232d4195f5e4b8d217237833f36679081ab7bf367d96d406e02adad4722a23d8826ee958bf6af70248e5d8156fd9951b66 SHA512 d958bd1e77eb7b68d89a55e34716d0f4f4dd2b1af407a3449d8d859484770747bd05ad9668c5e1ecc32636d8e63c692480a9d4316b8f8e5d25caa3740d1ec109
-EBUILD restart-services-0.17.0.ebuild 1827 BLAKE2B fb2c22d023257c526c671ae954f2a53c606e0d9729a8a52aab4f8695f3ab16fc8d72117a71e8501622eea6bc42d8e780b96d1a67964da76b74321999deae334e SHA512 2e16910ff5344812b00775961609fdeeac7a2c4e6b7ac4cf766104614116ab4c66e85fed0c994b3ec6415ffe17c71063168e46317cd14e24340ff160b933e546
+EBUILD restart-services-0.17.0.ebuild 1846 BLAKE2B c791ad0c9fba7583d226e880cce951c9944b6d29d9b98686bf7a6820d73379ebc0616c1a58c18926dc62c48af39e1490d5a5495c71499bdf5f079810128ceabb SHA512 52f1eb648331e80e0bae5defb6dd565d80c804470ba0bac09263a9e119c85608a7fe03897c884e48d477412f91292a67feb4dc6b35e791d698abc26f1ac3b495
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/app-admin/restart-services/restart-services-0.17.0.ebuild b/app-admin/restart-services/restart-services-0.17.0.ebuild
index 103bac6c6b27..a09752c0697d 100644
--- a/app-admin/restart-services/restart-services-0.17.0.ebuild
+++ b/app-admin/restart-services/restart-services-0.17.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 5e7fcf2a9bf7..0c03c5070311 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -4,6 +4,7 @@ AUX rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10
 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
+AUX rsyslog.service 469 BLAKE2B 0b4c60918381f51239158349789ff42f4ca24898338d66803339a0facfecced2372a67c1a2028cd1b3a5524a7a9beb7817c288aee8ef46ccfccbf315d51ee55b SHA512 de44d4109b73f8d1539d8c60e95008213267da8169d4698b47cb7108faadd7bf71b613c39d0c47cc8d0bb99e30b59d6b42103ea38e301ad3b830f1c406a104d4
 DIST rsyslog-8.2008.0.tar.gz 3051049 BLAKE2B abf9b7ec81cf62841c448f22c7aff45bc85ea6cdc7552e74295aac752c86380039bb28836e78e35e6eba3d0a062a0ae99ea22ba3d6e978175411a43ec9af6f9a SHA512 a077832de7076ac5e7d4c8f33edd044d0c18fd171a697ef68c1cd0f81f1938b3f008cddc1a61084181de512b643c15004744f0e79e6a44e9d239cec3d35f74fe
 DIST rsyslog-8.2010.0.tar.gz 3097606 BLAKE2B 06bfd54edc2126567ff9a460c272583d388a16a4db6f56603c8b9d2dd54bf4fe3b3b402eb4a9523b68e9d3a7602759fad57b35351d7cadab0b7f02771db5c40c SHA512 e3c8ed6b631053e38abfe8ce183a1544d04a0207dc988d36f5141a7ea8c987915f4c0429ccd094b7e374c277b7ee5b50e65e7205c156af01ffe9bdf8338831c8
 DIST rsyslog-8.2012.0.tar.gz 3118101 BLAKE2B 26550c90ff5502c051c30996f7a1eabfdd9e5ce229dbb33f91ac40f9af5c2d2b15f9dd8a3b0a31b00b1b510d91fe5ce177ceab5fa2af416a9de9acc4e4b24f6a SHA512 d279295c8d399be140bd5c30786c6a32b2ddfd0d90ca4cd285aa33622c66ad9e3a5b979c8041f6e736670fef8f2cd5571980eef1b1395d4ab30a112f2dd1270d
@@ -12,5 +13,6 @@ DIST rsyslog-doc-8.2010.0.tar.gz 8428326 BLAKE2B ee8eb2bdbb1f6c7122559b63ddc1ae6
 DIST rsyslog-doc-8.2012.0.tar.gz 6417145 BLAKE2B d8377f40b0311e8e7dcca274c251c0de7706490e3048c8d69d479120e06ca1e0b3ec9fce0a04928984d440da3aef196965f8c1b45afe8931c893b4baa72f4e87 SHA512 5647f499230276066abced34c2ca352268ba24fbd00cb7b5e3d0a2494977dd6f781cf8d1e7c7a9210d23c451ff162acda81ee93afa3f8f08fd555123e9daeece
 EBUILD rsyslog-8.2008.0.ebuild 12543 BLAKE2B 92426f314a29540d5b8c22cba2dc3a58a41494f51f75ee8bc54abb8628d2fd05182cbaec26b0279d3bea6251d1ebf86f207732db76459c7b7f856bae60de9027 SHA512 69f0d15c01fccafd62cf972f016d815b3bcb19677ce21a131a797ad1a20e64bc4ceb21fdfee145089db8b034cde891bb7fe7164b1ca74db192e316f4e3c20d97
 EBUILD rsyslog-8.2010.0.ebuild 12887 BLAKE2B 22d0a7646ae668dde9d45a3609ac4f51daa34234f1f92fa2050bc602ca5791f424c65b0e6c3017dd900688830c0c506bcd0034f1ee2fc3d14154af23ac8e0cf8 SHA512 bdf57551c70c727056127992c40c54843a4988d4fddbf70388986585ccb693ff9edc698f48f7ba2e76560962b4cb13c4b058271ab383d7a2671069830cd97f46
+EBUILD rsyslog-8.2012.0-r1.ebuild 12947 BLAKE2B bbfd82ee3a6c9c2d4c148f924060a7a908b2879d334c0fa011ef463d8a0b34338d9a497ce1906b10f33438772cdfb2bbd7cfa6319a3aa2a775f97cd433ce5271 SHA512 07c2930a418577132e0aaefe27546b668fbd7633aa461ac60af84825a86cf2a78615aca40c882709775ce1772b7441415c42b4a201e8a13f3be1c2324dc8bb94
 EBUILD rsyslog-8.2012.0.ebuild 12887 BLAKE2B 22d0a7646ae668dde9d45a3609ac4f51daa34234f1f92fa2050bc602ca5791f424c65b0e6c3017dd900688830c0c506bcd0034f1ee2fc3d14154af23ac8e0cf8 SHA512 bdf57551c70c727056127992c40c54843a4988d4fddbf70388986585ccb693ff9edc698f48f7ba2e76560962b4cb13c4b058271ab383d7a2671069830cd97f46
 MISC metadata.xml 4070 BLAKE2B 3fde04df2bf0b93058d14787780f7f78b5014cdaa303101ef0fb637d1f0b165e453885ae307f137d98052719f992cd1a3f46da2f923bc97030ba629801190d5d SHA512 df868d04339eade02eb55b218f43c85c9efe2bf70cadf2ec1d59dc9f0d546ba9dbcd9ac5e3f9cbad05a8f4629ce5979668aba1fb8b027c51c7f8468b2e9b732a
diff --git a/app-admin/rsyslog/files/rsyslog.service b/app-admin/rsyslog/files/rsyslog.service
new file mode 100644
index 000000000000..c64a9ea122a5
--- /dev/null
+++ b/app-admin/rsyslog/files/rsyslog.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=System Logging Service
+Requires=syslog.socket
+Documentation=man:rsyslogd(8)
+Documentation=man:rsyslog.conf(5)
+Documentation=https://www.rsyslog.com/doc/
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/rsyslogd -n -iNONE
+StandardOutput=null
+Restart=on-failure
+
+# Increase the default a bit in order to allow many simultaneous
+# files to be monitored, we might need a lot of fds.
+LimitNOFILE=16384
+
+[Install]
+WantedBy=multi-user.target
+Alias=syslog.service
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
new file mode 100644
index 000000000000..52cb79ec9ae0
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
@@ -0,0 +1,483 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+
+IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
+IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
+IUSE+=" systemd test usertools +uuid xxhash zeromq"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	imhttp? ( www-servers/civetweb )
+	impcap? ( net-libs/libpcap )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-4:=[drafts]
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-libs/liblogging-1.0.1[stdlog]
+	)"
+
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	BDEPEND+=" >=sys-devel/bison-2.4.3"
+	BDEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without depedencies
+		--enable-imbatchreport
+		--enable-imdiag
+		--enable-imfile
+		--enable-improg
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmtaghostname
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmdb2diag
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable imhttp)
+		$(use_enable impcap)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/${PN}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/${PN}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	if ! hash certtool &>/dev/null; then
+		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/sagan/Manifest b/app-admin/sagan/Manifest
index b95754387598..9fe16b6afdab 100644
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@@ -1,8 +1,8 @@
-AUX sagan-1.0.0-liblognorm-json-c.patch 2840 BLAKE2B 569957ec95bf5fc5bb1e844ba1d5f6a1c68415bd877551dbef03c62afbe66cde528fc4a2b80c3ca5faa92a3e97d2824a0e77b54add21e4a8092f6022b3e4c273 SHA512 1aa092351d317c373416a98ca6bbab19a070e43d0d4b82fe6dd1ac5a7cbb67741247ca2655e905a682ef5527fbf139c70a469a960be1dfdaa05c643a9749a4e9
+AUX sagan-1.0.0-liblognorm-json-c.patch 2472 BLAKE2B dc04f9949709523c3516d7b9693bba7aca5ff354c9c40df30fa16d668c3e08bb79f49f97806bc3659022ffb9a499f9ea843022c68045ffc2d43dcf7ac5e7ba42 SHA512 15308ca18901a9f6ca069f2067d83199b7461a6fcdfc54f171796ebf4578c2ccf19ecf2737aae0e03a21927f959aac1688e5c0e319b3dcf30a2dde4643b53ea5
 AUX sagan.confd 239 BLAKE2B 2ca76c1bd5bdb7b29f007a4d93602f020f76b10d6e4313e138e09b49de0b0c6796bc729f32e88831881bdcd52637bfb3a8e42481d89a09648a2833a000570ace SHA512 7ee746984d3bb3361e3155860d54e307f9b94b9e3f98c09c29b4259cd37d7aefe969b5b942c04048328ec23265a2689b22403c32e3552b8062201aca2ef3ac34
 AUX sagan.init 432 BLAKE2B 561344909a8f6610504f91bf72ba6fa89ac03fdacacd3189372f466b690b3421c3f1a8ce4750b747c53613c75f9b61696ec7b3c490597eb0eca36ebece23a26e SHA512 c5ec82e48ac33785a0e63deb6b2079e97a2f9b5f96682ccbf646b4deae5782cbceb5756b17fdff7af8cafd4e561e298d842c4c4f4aa5229ccc58f5f0fc06e6f7
 AUX sagan.init-r1 424 BLAKE2B e6fdd676e772d2abfca02215026a95321edecb41fcbeec3aa45afe15abd667e323ec2f21375d41c692b9648017002c0b410d551034dcbd3f060f5bb1e2f95026 SHA512 341754a9b18fa4b4082a852cec2eaa5ea78be33eb9d8cdef5b7ec61a9d67d3b264b2c6a2aef030bd85d3644539447345c88fd23ebe99145e40f990f565706809
 DIST sagan-1.0.0RC3.tar.gz 285207 BLAKE2B 7322ffc73a8e86f07ef106b04feb9140ba94a51b9e286ef0c0b0d3fa609e8e03cef4c75e1d32502c1b70a4c078d8601d2a1c58058137bb793c8a52cecc4be20b SHA512 29388a339b290bb4de2359c0c54b9e1d43ef207b223a499a1a4faa36de4d9590a777a796dd773948e995d052b71f3ef47ca5bad5c133116c4dbb53b4fe336123
-EBUILD sagan-1.0.0_rc3-r1.ebuild 2284 BLAKE2B abbb0774fa32f3cdddff3bb620cc7c373ec185b9cea8b2965867d782e170895e85cd1f76cdda510a53c0cee3ddefcce0eaf0d7b6632a067eea0bfde8654c0027 SHA512 3af52eabbc1b0a2f60d2d029d393c9aefc3d7a4cf85c0b7dd63dad3ea81b8360498b8d94d11a5679ce6b771df6ade7ad7e84e08c21e5057fbd3ce02d9aaa37a8
-EBUILD sagan-1.0.0_rc3.ebuild 2113 BLAKE2B 9990b426ca82edc3c3f994593ee1fbf8257b4ae881fcf5b85c23bc15b89f2e5e6e8745b35857cc868a67658e2615798dce133da642ec68e4ec518372f76d3cd5 SHA512 7551fcaef7971a2d1f059eb694b4f2fff4efb6368c030da70bb6d9b234e8924b52ba5a00e34ef9952b57689993590b89dfd77881711d6be6fe923c1e35f403e4
+EBUILD sagan-1.0.0_rc3-r1.ebuild 2240 BLAKE2B f19ab9234e2698a256d1a13a9447ccd29b8eea2fc6b70f869fc79993e4eab499430e8b359dc3c0b010e2f3e04a436d25b99ce529b1471b9949396b3324bc2530 SHA512 50244adcd1cfd9cbf36fa379ffa4c4328460d1a90ff62f05cec022605182d1244922a7c93e60f798e00a2bea1c1e496b522d901a831363c660070fcc147c62a8
+EBUILD sagan-1.0.0_rc3.ebuild 2066 BLAKE2B a7b9d6e3ecc1c8198505b72dd08328075aa545c5265d35f943c448075211cf2324c780b44bc75017fa34f91c6e87a284177fccc2f02b586b780b848b07c62544 SHA512 ef580c4525f352e7f774a5f65473769d752212d405229fce861cd10fd48aac3c2b21bd39f6c4876edd15a18ea975cadc07be0dd778b7c1c7c345ec30e9dbe7f9
 MISC metadata.xml 629 BLAKE2B ab8f452365cfd2ea879f2f83b6dedf059ba5ec7e686eed8b6135dc38775a2cf59ec46fdfe26638a092fbf1fb6d39567b0e302bf737bb45ff79b265c87941e163 SHA512 7e70965cff17dcb2a7c7fbebaab5e53a5c0b5050d02c00b5dc2e1e3ea0650726fda8456957c5d84b680d14aab0163bc0fcde99b40b4136f229ec254414003ca6
diff --git a/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch b/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
index f9540652717a..a1b3fb290f50 100644
--- a/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
+++ b/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
@@ -1,6 +1,5 @@
-diff -rupN old/sagan-1.0.0RC3/configure.ac new/sagan-1.0.0RC3/configure.ac
---- old/sagan-1.0.0RC3/configure.ac	2014-06-16 22:23:22.000000000 +0200
-+++ new/sagan-1.0.0RC3/configure.ac	2015-10-11 21:04:26.493632624 +0200
+--- a/configure.ac
++++ b/configure.ac
 @@ -192,29 +192,15 @@ If you're not interested in libesmtp sup
         fi
  
@@ -40,9 +39,8 @@ diff -rupN old/sagan-1.0.0RC3/configure.ac new/sagan-1.0.0RC3/configure.ac
  
  if test "$LIBPCAP" = "yes"; then
         AC_MSG_RESULT([------- libpcap support is enabled -------])
-diff -rupN old/sagan-1.0.0RC3/src/Makefile.am new/sagan-1.0.0RC3/src/Makefile.am
---- old/sagan-1.0.0RC3/src/Makefile.am	2014-06-16 22:23:22.000000000 +0200
-+++ new/sagan-1.0.0RC3/src/Makefile.am	2015-10-11 21:05:28.754492699 +0200
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -2,6 +2,9 @@ AUTOMAKE_OPIONS=foreign no-dependencies
  
  bin_PROGRAMS = sagan
diff --git a/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild b/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild
index c94068188114..5177f7debcaa 100644
--- a/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild
+++ b/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils user flag-o-matic
+inherit autotools flag-o-matic user
 
 DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
 HOMEPAGE="http://sagan.quadrantsec.com/"
 SRC_URI="http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.tar.gz"
+S="${WORKDIR}/sagan-1.0.0RC3/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="geoip +libdnet +lognorm mysql +pcap smtp snort"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="dev-libs/libpcre
 	app-admin/sagan-rules[lognorm?]
 	smtp? ( net-libs/libesmtp )
@@ -31,9 +30,7 @@ RDEPEND="dev-libs/libpcre
 	snort? ( >=net-analyzer/snortsam-2.50 )
 	geoip? ( dev-libs/geoip )
 	"
-
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
+DEPEND="${RDEPEND}"
 
 # Package no longer logs directly to a database
 # and relies on Unified2 format to accomplish it
@@ -42,14 +39,22 @@ RDEPEND="${RDEPEND} mysql? ( net-analyzer/barnyard2[mysql] )"
 REQUIRED_USE="mysql? ( libdnet )"
 
 DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
-PATCHES=( "${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch )
-S="${WORKDIR}/sagan-1.0.0RC3/"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch
+)
 
 pkg_setup() {
 	enewgroup sagan
 	enewuser sagan -1 -1 /dev/null sagan
 }
 
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
 src_configure() {
 	append-flags -fcommon
 
@@ -62,11 +67,11 @@ src_configure() {
 		$(use_enable geoip)
 	)
 
-	autotools-utils_src_configure
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	diropts -g sagan -o sagan -m 775
 
@@ -74,14 +79,14 @@ src_install() {
 
 	keepdir /var/log/sagan
 
-	touch "${ED}"/var/log/sagan/sagan.log
-	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
+	touch "${ED}"/var/log/sagan/sagan.log || die
+	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log || die
 
 	newinitd "${FILESDIR}"/sagan.init-r1 sagan
 	newconfd "${FILESDIR}"/sagan.confd sagan
 
-	insinto /usr/share/doc/${PF}/examples
-	doins -r extra/*
+	docinto examples
+	dodoc -r extra/*
 }
 
 pkg_postinst() {
diff --git a/app-admin/sagan/sagan-1.0.0_rc3.ebuild b/app-admin/sagan/sagan-1.0.0_rc3.ebuild
index 2fe8dd00f3cd..e03a2f39f7e4 100644
--- a/app-admin/sagan/sagan-1.0.0_rc3.ebuild
+++ b/app-admin/sagan/sagan-1.0.0_rc3.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils user flag-o-matic
+inherit autotools flag-o-matic user
 
 DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
 HOMEPAGE="http://sagan.quadrantsec.com/"
 SRC_URI="http://sagan.quadrantsec.com/download/sagan-1.0.0RC3.tar.gz"
+S="${WORKDIR}/sagan-1.0.0RC3/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="geoip +libdnet +lognorm mysql +pcap smtp snort"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="dev-libs/libpcre
 	app-admin/sagan-rules[lognorm?]
 	smtp? ( net-libs/libesmtp )
@@ -27,24 +26,30 @@ RDEPEND="dev-libs/libpcre
 		dev-libs/json-c:=
 		dev-libs/libee
 		dev-libs/libestr
-			)
+	)
 	libdnet? ( dev-libs/libdnet )
 	snort? ( >=net-analyzer/snortsam-2.50 )
 	geoip? ( dev-libs/geoip )
-	"
-
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
+"
+DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
-PATCHES=( "${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch )
-S="${WORKDIR}/sagan-1.0.0RC3/"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch
+)
 
 pkg_setup() {
 	enewgroup sagan
 	enewuser sagan -1 -1 /dev/null sagan
 }
 
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
 src_configure() {
 	append-flags -fcommon
 
@@ -57,11 +62,11 @@ src_configure() {
 		$(use_enable geoip)
 	)
 
-	autotools-utils_src_configure
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	diropts -g sagan -o sagan -m 775
 
@@ -69,14 +74,14 @@ src_install() {
 
 	keepdir /var/log/sagan
 
-	touch "${ED}"/var/log/sagan/sagan.log
-	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log
+	touch "${ED}"/var/log/sagan/sagan.log || die
+	chown sagan.sagan "${ED}"/var/log/sagan/sagan.log || die
 
 	newinitd "${FILESDIR}"/sagan.init-r1 sagan
 	newconfd "${FILESDIR}"/sagan.confd sagan
 
-	insinto /usr/share/doc/${PF}/examples
-	doins -r extra/*
+	docinto examples
+	dodoc -r extra/*
 }
 
 pkg_postinst() {
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index c011cb8d3e1c..c35a7264c5b6 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,9 +1,12 @@
-AUX api-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac35da7b64f6b2e4aba276e8920e7353bd2caeaffa3034349496b00622191793994bbd4d25faa3c3c SHA512 c58fc025a3654b59f79c6e23fe135d75ebad8b166bc5214f4842c3dd92192e3598480f9fd6960ad2dc36d3ee45ff971650c5e0156353c1c045650f86c9a68db9
+AUX api-confd-1 179 BLAKE2B d014cadfb5dd99c85b1dee0e743f413fc5d6eb05629045bad5df108e6e96104b3b4f5e3736518baff5473c68d94906bb90cb7fe8167e136dd6603eb1087cc01c SHA512 de1d70050c2f911abb306c1b2253f2fdaac505a5ddd34937d7bef9dc9b876e9c6ed06e330a816fcafa38feaf67837235e78f2d97d149fef9fe20a29d945f8f22
 AUX api-initd-4 302 BLAKE2B 385e678ea2fe06f413e68a3812350df823318a2807805373377e747c3a82e524af114aeccab8a6e6e36b1419a3e0a6bf025749db585483906487767e76274376 SHA512 098fb6e1ba83270abd31f9cc3afdc159149276962fcf73ce0ae943df87ec26d0883990652614cdeef48912778780731f91efc972a22a75c4b10f3bd79a251a90
+AUX api-initd-5 483 BLAKE2B 6ebe3d0c7511849c6e0dcea55303eac0684d70d660013d8fdcaa6630b5370faff7d07ec6a302b2dad5c4b0c5ade4752d87dd22da47d196178b414515ef53d6ed SHA512 b0afec231ef08bb55634aa994ea5e8b5024a0991125ec51cfd92b6d64cc5e09a0f881f49571db8a7947d9dfe2c09e4ffb8438f4c9c93d972def1631d83e9bbf1
 AUX master-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac35da7b64f6b2e4aba276e8920e7353bd2caeaffa3034349496b00622191793994bbd4d25faa3c3c SHA512 c58fc025a3654b59f79c6e23fe135d75ebad8b166bc5214f4842c3dd92192e3598480f9fd6960ad2dc36d3ee45ff971650c5e0156353c1c045650f86c9a68db9
 AUX master-initd-4 311 BLAKE2B 302e71b0328d47addd1508e1992ee56c719463d4b99af37b626835fefd28f9c3184e8441035f055992489b1084f1fdd45542466b359c206305e8174fef853478 SHA512 d44ea9fdf962ded6d0c6ac5a1f89ec8729a9a70517ba0f132c54696d32bc96030c64af09f48037867006bd3acdf4b6db759ca873717cd5a88701e42d06885bcc
+AUX master-initd-5 498 BLAKE2B dad96866c1146a2c584e00586b160a54b844922c140166402ce7e2d0605ee17e892a4a676177d2fec912813f68dbd2ff6beb87a5a14298c2d77c18b63b172545 SHA512 73eb1238bc5823640627e1776ea688b95d0afd321deaf95271eea33434bc20054944966b159dc5e1c8ec1e1458c6dd29e769729bad570300d5a6eea1c8d18fab
 AUX minion-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
 AUX minion-initd-4 317 BLAKE2B 4c207bd26a72d5dded38e40f7869f46263272a841b978f138248d016a06e837c3aebebabd15314e3896b404058c3f5dd5e6a1cca48450b07b88b6edef6a8d7d2 SHA512 80790ed1b5f86b713ca6384d60253676b16b10c122810ed07b7119c3860bedfe40102f6b7de86d832f084d84f87bf9405ec282629f981767a534d2a53144845f
+AUX minion-initd-5 504 BLAKE2B ff49376d596a49aeec649dffee3029be9b6f85663713a7e3bc03b45aee4ab78f31ef5e3b758078a551113ee1a06369c31fb5ef1acdbb30399be748524cd491fd SHA512 3a35e9cdd1fc7e2691f9d451b384982117f03374d40372ff3efca2b3ddba761dc49660004f4859fcc686513994daea538379584faf2a3b020ff8311a1aba9ee8
 AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17
 AUX salt-2019.2.0-skip-tests-that-oom-machine.patch 739 BLAKE2B c0e1b18c528ddcdc19e93061112d2c42aeca96f9091218e7ad6b4eadf11255079cecd6b9b9def576c663b4ba794d151db8fc32336b1c29c3da8e9c18c09582f3 SHA512 0bd8fc2ab73be8ffc9fdda65a60c7306dbfa9f76d874994ba09db7ef71678fca80c8fde5963d22b5bbbe3b933140a56f2173f4c109b47dd9e9c3c9a70062b0e3
 AUX salt-2019.2.8-ansible-roster-fix.patch 572 BLAKE2B c11106be76626673a0e6365dea7ac8593f420ffa2bc0ca02c24520240d863d69a7f0449f10b5d53f6292c247f434636a0f188338ffa3d81a27abc8db18059c92 SHA512 86a2fc107882855ef60b2722e7282de8e6ad57c5fe6809ff99843f934a193445da599d57d1cbc3d7d3443f93d52a7ba5922c6bd76579f85648f6256ce7a81c66
@@ -19,8 +22,9 @@ AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326c
 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-confd-1 188 BLAKE2B 98f13eb627963d65df26140f348c04eb8c253d444d36ecd1f5ef344ad89901b0a5ed62c64364e90595c2d2ee2766f30802a4a86a2555bbea343ab410292359af SHA512 35fe9bf4732c8a53b47099ffe5f9468d884ec3e2671451a6d52821dde6c70c63176b29ade0d700b99aaf47557f58179f780422843346bd3aa6513d9465ec9f58
 AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4e887c1e6487682efce7f5b75d3bcf366ef706a9fb1578dce537ac5b50324239378cecbd0715ad5d SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef
+AUX syndic-initd-5 498 BLAKE2B f31979e61a2d0f016beefd641cf666cc48d33a14a84f634e6112cdea86db9cb6eac4b312a6f526d38ed0a6e47e09a96a95b03104fac215ce2bac122c06bcbc3b SHA512 11b4332bd1b916b7764ed6b826bdda72192339d90f492e7df5b116e7aa5407129b787bda0a061c48fdb0a53b58558424225e9090b472c5f5cb36189120082459
 DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
 DIST salt-3000.5.tar.gz 15229450 BLAKE2B 135e9b9dcc461ac898231ce46e6a1359e6d60a43822320950bc0b83057f768dadf55320dd73df72d5bc917f324eef4661e6f75d8eb8e84aef958bd2df8924cfc SHA512 2579f65c24d22d77132057bd8cf37040d7d149624745dd68b4c44318be786580dcc34bf563f90d7de9ef5b726b2453bef4d8639bc8fbd9c5e691500520335317
 DIST salt-3000.6.tar.gz 15236781 BLAKE2B 5a532a6915b331fb532dc6e1651cf8fca3e1a5e9f29f6d75260fdb1162dbfeec755c65f7c6fc28b1cc7dc3ace978547830af31aafc1eee8419bbc7e695725787 SHA512 739e3671766c45a0ef1eb45933c7f00f14586e91f4c4a79cbed913a48961a48baee853206ba569491756e8a872d22f3635eb6bc1a366020e551c567b2334c508
@@ -30,4 +34,5 @@ EBUILD salt-3000.5.ebuild 6321 BLAKE2B ddaa02503b5d8301697bae784a4901348eec72152
 EBUILD salt-3000.6.ebuild 6377 BLAKE2B 39cb9ce06b9eed29d75ae8747f780221487565da34475b35659f4f5208910216016a02b1cfd52fe5df7662df20e2741f0028c67f3114b2d8d5833a7bca962b88 SHA512 24ce6c7b9364cb3824c218c8bad4fcc6c103767599e3b0c054391cc908ffc81aacc586039de3855bb5f862fe572971fede0890d79ad755e5bf9c9eaea5edb84d
 EBUILD salt-3001.4-r1.ebuild 6113 BLAKE2B bf84779e65c8f2017fa00c1f0eebd46d6e4030baa8fab11146000ce9ddc7e07a37d3d69f968b8daadce286cdc26cdcec16cf7a8e10240f5ee105ebaa5053074e SHA512 acfba7757f991cc6d4478c5095f53117878cb57d747eed2c4805dccc40aa8d3f5f5cc1c0a98402403ab649ea3cb77a8562456fccea96c7580ca7b34aa625c200
 EBUILD salt-3002.2-r2.ebuild 6149 BLAKE2B 52ba5031eb9949451ab830f29df925cdcd0c140c8c3a68e5f84d9ae66697f8f63306ae3bf61e61ba2510fc305c9e912c258cad030ae49afe01594273153cbb4a SHA512 81cbde2f580d885e2483d31ddfb1336ad58140946057565a5115c718e41c7d66c051af9a02d8931a559f71755e627ce95d226f64c5f8054759304a58f873be68
+EBUILD salt-3002.2-r3.ebuild 6149 BLAKE2B 02eeb59d8a9eb996e653587a44095694afd40a1b19e192e912bb42352f1442aacf1214f4dac2ac22b4d1c998f38df05177c67e1b2b6cc91b70ff351872ffc133 SHA512 07c91e84baa24ccc4c6deed13f3172715ee7fa5e1a1f6b4e5fea2487a20453029f7d63111ca3ae2989f901f541d580e86454cb63352230cb358d5a776e67274d
 MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5
diff --git a/app-admin/salt/files/api-confd-1 b/app-admin/salt/files/api-confd-1
index c70e8e766da0..84a1c6c71a0e 100644
--- a/app-admin/salt/files/api-confd-1
+++ b/app-admin/salt/files/api-confd-1
@@ -1,5 +1,5 @@
-# /etc/conf.d/salt-master: config file for /etc/init.d/salt-master
+# /etc/conf.d/salt-api: config file for /etc/init.d/salt-api
 
-# see man pages for salt-minion or run `salt-master --help`
+# see man pages for salt-minion or run `salt-api --help`
 # for valid cmdline options
 SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/api-initd-5 b/app-admin/salt/files/api-initd-5
new file mode 100644
index 000000000000..1fecd03275ee
--- /dev/null
+++ b/app-admin/salt/files/api-initd-5
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-api"
+command_args="${SALT_OPTS}"
+pidfile="/var/run/salt-api.pid"
+command_args_background="--daemon --pid-file=\"${pidfile}\""
+name="SALT API daemon"
+retry="20"
+
+supervisor=supervise-daemon
+output_logger="logger -p daemon.info -t salt-api.stdout --"
+error_logger="logger -p daemon.err -t salt-api.error --"
+
+depend() {
+	use net logger
+}
diff --git a/app-admin/salt/files/master-initd-5 b/app-admin/salt/files/master-initd-5
new file mode 100644
index 000000000000..13c8ad892284
--- /dev/null
+++ b/app-admin/salt/files/master-initd-5
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-master"
+command_args="${SALT_OPTS}"
+command_args_background="--daemon --pid-file=\"${pidfile}\""
+pidfile="/var/run/salt-master.pid"
+name="SALT master daemon"
+retry="20"
+
+supervisor=supervise-daemon
+output_logger="logger -p daemon.info -t salt-master.stdout --"
+error_logger="logger -p daemon.err -t salt-master.error --"
+
+depend() {
+	use net logger
+}
diff --git a/app-admin/salt/files/minion-initd-5 b/app-admin/salt/files/minion-initd-5
new file mode 100644
index 000000000000..e3a430b77fa4
--- /dev/null
+++ b/app-admin/salt/files/minion-initd-5
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-minion"
+command_args="${SALT_OPTS}"
+pidfile="/var/run/salt-minion.pid"
+command_args_background="--daemon --pid-file=\"${pidfile}\""
+name="SALT minion daemon"
+retry="20"
+
+supervisor=supervise-daemon
+output_logger="logger -p daemon.info -t salt-minion.stdout --"
+error_logger="logger -p daemon.err -t salt-minion.error --"
+
+depend() {
+	need net
+	use logger
+}
diff --git a/app-admin/salt/files/syndic-confd-1 b/app-admin/salt/files/syndic-confd-1
index d69d83fcd60d..e9c75b8bc787 100644
--- a/app-admin/salt/files/syndic-confd-1
+++ b/app-admin/salt/files/syndic-confd-1
@@ -1,5 +1,5 @@
-# /etc/conf.d/salt-minion: config file for /etc/init.d/salt-minion
+# /etc/conf.d/salt-syndic: config file for /etc/init.d/salt-syndic
 
-# see man pages for salt-minion or run `salt-minion --help`
+# see man pages for salt-minion or run `salt-syndic --help`
 # for valid cmdline options
 SALT_OPTS="--log-level=warning"
diff --git a/app-admin/salt/files/syndic-initd-5 b/app-admin/salt/files/syndic-initd-5
new file mode 100644
index 000000000000..7e43828bda47
--- /dev/null
+++ b/app-admin/salt/files/syndic-initd-5
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/salt-syndic"
+command_args="${SALT_OPTS}"
+pidfile="/var/run/salt-syndic.pid"
+command_args_background="--daemon --pid-file=\"${pidfile}\""
+name="SALT syndic daemon"
+retry="20"
+
+supervisor=supervise-daemon
+output_logger="logger -p daemon.info -t salt-syndic.stdout --"
+error_logger="logger -p daemon.err -t salt-syndic.error --"
+
+depend() {
+	use net logger
+}
diff --git a/app-admin/salt/salt-3002.2-r3.ebuild b/app-admin/salt/salt-3002.2-r3.ebuild
new file mode 100644
index 000000000000..7c65d1b19803
--- /dev/null
+++ b/app-admin/salt/salt-3002.2-r3.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax"
+
+RDEPEND="
+	sys-apps/pciutils
+	>=dev-python/distro-1.5[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.9.8[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_7)
+	)
+	openssl? (
+		dev-libs/openssl:0=[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	nova? (
+		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_7)
+	)
+	neutron? (
+		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_7)
+	)
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-factories-0.93.0[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )
+	test? ( cheetah genshi )"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-3002-dont-realpath-on-tmpdir.patch"
+	"${FILESDIR}/salt-3002-tests.patch"
+)
+
+python_prepare_all() {
+	# remove tests with external dependencies that may not be available
+	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+	rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
+
+	# tests that require network access
+	rm tests/unit/{states,modules}/test_zcbuildout.py || die
+
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	find "${S}" -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d ; /pycryptodomex/ d' -i || die
+	# pycryptodome rather than pycryptodomex
+	find "${S}" -name '*.py' -print0 | xargs -0 -- sed -i -e 's:Cryptodome:Crypto:g' -- || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+	einfo "Fixing collections.abc warnings for ${EPYTHON}"
+	local abc
+	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
+	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose \
+			|| die "testing failed with ${EPYTHON}"
+	)
+}
+
+pkg_postinst() {
+	if use python_targets_python3_8; then
+		if use nova; then
+			ewarn "Salt's nova functionality will not work with python3.8 since"
+			ewarn "dev-python/python-novaclient does not support it yet"
+		fi
+		if use neutron; then
+			ewarn "Salt's neutron functionality will not work with python3.8 since"
+			ewarn "dev-python/python-neutronclient does not support it yet"
+		fi
+		if use libvirt; then
+			ewarn "Salt's libvirt functionality will not work with python3.8 since"
+			ewarn "dev-python/libvirt-python does not support it yet"
+		fi
+	fi
+}
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index fdf855ff693b..9708d053ebe4 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1,9 +1,9 @@
 AUX sshguard-2.1.0-conf.patch 408 BLAKE2B bec9debaa542d7d2d7f21d5308cda162a75a639a85d712a1adfe253fed735a1b85d83b0b0297db96fada22e61e332f5847b2815280f8ddda105cbe6d9194bf6c SHA512 5edfbf3a6955d86233de10665bea527a2e8ebaaeb505d16073c861fa2883b32d0c655f5d4c99145af63df95612129dcd25ffae3710c8615709768bdcff9ef5bc
+AUX sshguard-2.4.1-conf.patch 1203 BLAKE2B db97df31d61de23622faaaffdef23c5f55dac3fbe6947f6ec9b2dd3129cefac047acaf1134fb2259bb1d643f7a4bc61f699bfbd8e7523fa42f0f775b22a8b233 SHA512 54279f52e84ab5d32c4af5d2953ca6927b9c4dee2b4b9dda50c11cbf83f5051cc5c02ee25b8822e3e2b035fb7a0620d17706f84b028cc4f249b2cd733f41272f
 AUX sshguard.confd 634 BLAKE2B f083e6d4f7df6cefae89ef382a82cd7c5863c6a2ded34aee61ab028f8320c35552b80d5d8222ed35adb13a70cf6096eb5d88749f5b5ff72ca483f27fd1c0de56 SHA512 72b2a9c995bcb604516525f8190eaf35fa57e18274f83a8d00fd5b223b598c0c4ffd8b7ce89b1139c89380e5a7181c8024a6041375c445edb29c8f8b49abee50
 AUX sshguard.initd-r2 389 BLAKE2B b4098e0baf82e1c1f1978d6b3916fe9f2e67891d02b7b842492558f9b44c1c0c23204d88c036f49e069c42b0fbbdba31d8292419a2d22e603f29926228a8a223 SHA512 951ea1479836d1b318c35be03c340e5101aa3663bf2581cd0d928de2fea36f0b7906e50d9abf1b6b11fa682427e8d72b45bc95bb8f40a85fb471bfe354108108
-DIST sshguard-2.4.0.tar.gz 771506 BLAKE2B 82e9caf70dc9a1ba9ef6ba1c0916424a74891c84069a4a879c9057f3baea32af68f35d8b31cacdd60d323f5ec7b02a6e12aff1ec72fc0291b74c4882cd441d93 SHA512 64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6
 DIST sshguard-2.4.1.tar.gz 723940 BLAKE2B 04e72b9959ef3ead418d2a6fe8029b0806a4d91c91f7cd36c236c7203cca1afc67305b21de0b1dee1594b188564f201ff2770d54d4c57c54b4d23db15e0298a0 SHA512 bae7485d963454f2a6dc4b7d96506b03fb49013fe3ab3d81e315ea88bd8067e7a2305cdf25e411720ac014a68ee9635cdbcef65a7dc806b7fc942f099a9d5ba8
-EBUILD sshguard-2.4.0.ebuild 746 BLAKE2B 0284fa3b1f9204fbca96a816efbe9c547556fd3b0cc18c5cf8b35d1e90bed01f4e0db7d0cf1705a575486ef11cbfd609deb8b06eb5c3a841415b853e62d96530 SHA512 8e6a32839fee40b4870ddd1b4308b44c8b3d3a0e9136f269bb935178e9f8551b8194a4a8e6f20f778c4a77ec261009928fa7267f357986ca27617d532360fddb
-EBUILD sshguard-2.4.1.ebuild 755 BLAKE2B 7604917bd565cf777a017f0385fd72e7cdcc3064b4c35d4884f9a6e3d1579a79fc1a7395a5a303bf6532d5c770ad194420e8b47f28b7af7e5edc3bfe4d6bf176 SHA512 92e4232be6d26e533e26265294cdb3da3b76a78e5d1b0559360a60e0fbff70dea032b9c6474ef65181908eca003132d4e7fef462d1902278408033bd050e6f31
+EBUILD sshguard-2.4.1-r1.ebuild 960 BLAKE2B 43cec652fbde0e0d569661bd52bba0ed35c7c5916b272de160df1abdd439ddd8c6f06c6d7beb7ccea5585241e4c5a2a6c431e953496e9a6366ca561fb1679fac SHA512 e35123be0d62e9d1858430b9ccc4a4457c9c1c31b8ebfcc7f274b11cbd72bdf7a24c4d71f84b056abfc42ed7a0da3cb437baf0d46b67866a0172c16ca5193060
+EBUILD sshguard-2.4.1.ebuild 753 BLAKE2B 71a9c76e2204a0c23a282c434d6514cfa0b828df4a0cf1e304d32835c0de525624258024cb0d81e559bd4f4666632fb01820fc55090a77fe4e487ac5f2a3e122 SHA512 99f02f936b5be1cee0865c613798730202f7464e4e4b437b9f0e962edb1a0b799f8959d578e36c7b38b25eb48f7e0a93048bbc368213a2fba145e40743ae5a3f
 EBUILD sshguard-99999.ebuild 799 BLAKE2B 38b307936f73e2926466241496fdf59a6cf7def5e60405674a1a07666cdbf0042310977e79078352e623244670e22a8cd41b2ff7969b2ca6577441beca55ca69 SHA512 a33dbdc779c7021aecfa9927eb7e41313ce8b82f3509f1a33e8beacae5597db7e8f5b1a1484edee7e03956fe07d9a39717673985bc8988dba0e20835cd722aea
-MISC metadata.xml 348 BLAKE2B 9dd6c721b71bc5c73a367a9a7e4ef55ee0f0805c917968e66788716241db4c4aa4479ceffdb881d26c7da8b53fd2a5db921c7ef4138e9ff5401e621124d0bc19 SHA512 b93ba2b6eb5371962e1565ef4a333b50ba0dc44ae4365486fd55b04bdac546c8ff68fedebbb7a01d3cb4810f48148bfb870bef952b631fca931cf149ea8429ec
+MISC metadata.xml 459 BLAKE2B 52a25ead1bb594b1929641a855e1ced3b2e9f8323892ff4f387f3f27cf329bfd6b89fe2ec567b9a4da3daf1792440421c466c95bdc206ac0d6a5e53339454fde SHA512 1389c2bbcfe412dcc96cb62f3e5a61aafa782adbef69e9861a380fc845f3f81d9412c6a1c3e8ac927fefd1e1959e4991dff450e4802cdff2c2924f1e350ae12c
diff --git a/app-admin/sshguard/files/sshguard-2.4.1-conf.patch b/app-admin/sshguard/files/sshguard-2.4.1-conf.patch
new file mode 100644
index 000000000000..8eb74a84db34
--- /dev/null
+++ b/app-admin/sshguard/files/sshguard-2.4.1-conf.patch
@@ -0,0 +1,25 @@
+diff --git a/examples/sshguard.conf.sample b/examples/sshguard.conf.sample
+index 556f1ec..a483b1e 100644
+--- a/examples/sshguard.conf.sample
++++ b/examples/sshguard.conf.sample
+@@ -6,14 +6,18 @@
+ 
+ #### REQUIRED CONFIGURATION ####
+ # Full path to backend executable (required, no default)
+-#BACKEND="/usr/local/libexec/sshg-fw-iptables"
++# Example 1: iptables backend
++#BACKEND="/usr/libexec/sshg-fw-iptables"
++# Example 2: firewalld backend; for firewalld configuration instructions see
++# https://www.ctrl.blog/entry/how-to-sshguard-firewalld.html#sshguard-section-firewalld
++#BACKEND="/usr/libexec/sshg-fw-firewalld"
+ 
+ # Space-separated list of log files to monitor. (optional, no default)
+ #FILES="/var/log/auth.log /var/log/authlog /var/log/maillog"
+ 
+ # Shell command that provides logs on standard output. (optional, no default)
+ # Example 1: ssh and sendmail from systemd journal:
+-#LOGREADER="LANG=C /usr/bin/journalctl -afb -p info -n1 -t sshd -t sendmail -o cat"
++#LOGREADER="LANG=C /bin/journalctl -afb -p info -n1 -t sshd -t sendmail -o cat"
+ # Example 2: ssh from os_log (macOS 10.12+)
+ #LOGREADER="/usr/bin/log stream --style syslog --predicate '(processImagePath contains \"sshd\")'"
+ 
diff --git a/app-admin/sshguard/metadata.xml b/app-admin/sshguard/metadata.xml
index 0daba0da53ea..683fe7aa81ea 100644
--- a/app-admin/sshguard/metadata.xml
+++ b/app-admin/sshguard/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>netmon@gentoo.org</email>
-<name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<upstream>
-<remote-id type="sourceforge">sshguard</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sshguard</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/sshguard/sshguard-2.4.0.ebuild b/app-admin/sshguard/sshguard-2.4.1-r1.ebuild
index 56a7c135e833..7def7a057974 100644
--- a/app-admin/sshguard/sshguard-2.4.0.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.1-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit systemd
 DESCRIPTION="protects hosts from brute force attacks against ssh"
 HOMEPAGE="https://www.sshguard.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="
 	sys-devel/flex
@@ -22,13 +23,19 @@ DOCS=(
 	CONTRIBUTING.rst
 	README.rst
 	examples/net.sshguard.plist
-	examples/sshguard.service
 	examples/whitelistfile.example
 )
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-conf.patch
+	"${FILESDIR}"/${PN}-2.4.1-conf.patch
 )
 
+src_prepare() {
+	default
+	sed -i -e "/ExecStartPre/s:/usr/sbin:/sbin:g" \
+		-e "/ExecStart/s:/usr/local/sbin:/usr/sbin:g" \
+		"${S}"/examples/${PN}.service || die
+}
+
 src_install() {
 	default
 
@@ -37,4 +44,6 @@ src_install() {
 
 	insinto /etc
 	newins examples/sshguard.conf.sample sshguard.conf
+
+	systemd_dounit "${S}"/examples/sshguard.service
 }
diff --git a/app-admin/sshguard/sshguard-2.4.1.ebuild b/app-admin/sshguard/sshguard-2.4.1.ebuild
index fc6a2cf36767..59ef3538accd 100644
--- a/app-admin/sshguard/sshguard-2.4.1.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DEPEND="
 	sys-devel/flex
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index 89b03d6b5dbb..89df51f03651 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1,5 +1,3 @@
-DIST stow-2.2.2.tar.gz 579324 BLAKE2B fc4ab7f386e8245b361cee5fc0decd91caec543ec6178c82720866c33a974ba9d68e999a68c3b7357d873ab1b58bb8b022bf02dad029972f42c317ffc288bd04 SHA512 8a3e5da6b5cb4c1ee1b512bae5a9859f83659d5de05f7a9af1dd09df2a32f6b8c6d43b79736db91232c43621d542041d4ef92eb088925796adad0676f200a9b5
 DIST stow-2.3.1.tar.gz 654191 BLAKE2B 9fd54fd3ff76aa7b72ed973cd6d70b8dc747fa3bb1ecc6bedd221b308d7d141a21a2f077c67efb432f2c7c4fb6bd126639038b196946206bf4a7f95040477ab2 SHA512 e9a7de1a6f10eaf7cdbe6737e0a8be1498e2eac46b6c57e65b83759b061efd1c0db45f7cba123e35428307e3aebe5baef9ea8bd4b5eb6ec5e1b159117a760441
-EBUILD stow-2.2.2-r1.ebuild 644 BLAKE2B 5df5695a345d135207741d67bea7c80b79de23b42297b93573ca587955307507ad91d6fd66c84d6554dd4395dd16e8f7c4088f9ba77e9e1eb17e02cc3deea07b SHA512 5767ac1057a4a7c9d897e500f78b3e2e355bedf758fbadb41f1864574e448f89abb24b976c2c4fd70024537a52c46906bff93c3cc03109e6e6e12f0dadc385e1
-EBUILD stow-2.3.1.ebuild 652 BLAKE2B 692023f140cca9ec4144a0b78f524528c7608b18837250b7bf5ed1416d86c1c9b62b90cddb94b4df68d73406884d3d4ccb929abdeb1611b309af5f7803f53975 SHA512 99d7bca792d4935fb3ab486f6e95b1bb577d45bfc24e4235e889252f5a75e02aeb0a3834fbabbad83d806325ab5030db9c18dba4fcb5ddd629f1b8eabadb54e0
+EBUILD stow-2.3.1.ebuild 694 BLAKE2B 14f6bc41c07a25167652eea7b9fc08ce6498403395bf5fc5a2a0679350b04c2d0066fff33f165a1331fbd94365d9b826e50bfcbc2ceba445346df4897663bf2a SHA512 26ba27b119c33986369169221455454a54a7e1ff737459e4cecfcb0844534cfb94d4e0b12aacfc9db12517f67b46e6f4eb093a1c24c960f2c2385df1f9f3db48
 MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
diff --git a/app-admin/stow/stow-2.2.2-r1.ebuild b/app-admin/stow/stow-2.2.2-r1.ebuild
deleted file mode 100644
index 5fc1dffc1261..000000000000
--- a/app-admin/stow/stow-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-functions
-
-DESCRIPTION="GNU Stow is a symlink farm manager"
-HOMEPAGE="https://www.gnu.org/software/stow/"
-SRC_URI="mirror://gnu/stow/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-lang/perl
-	test? (
-		dev-perl/IO-stringy
-		virtual/perl-Test-Harness
-		dev-perl/Test-Output
-	)"
-RDEPEND="dev-lang/perl:="
-
-src_configure() {
-	perl_set_version
-	econf "--with-pmdir=${VENDOR_LIB}"
-}
diff --git a/app-admin/stow/stow-2.3.1.ebuild b/app-admin/stow/stow-2.3.1.ebuild
index f6f37faefd1d..7c766a2724f7 100644
--- a/app-admin/stow/stow-2.3.1.ebuild
+++ b/app-admin/stow/stow-2.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit perl-functions
 
 DESCRIPTION="GNU Stow is a symlink farm manager"
-HOMEPAGE="https://www.gnu.org/software/stow/"
+HOMEPAGE="https://www.gnu.org/software/stow/ http://git.savannah.gnu.org/cgit/stow.git"
 SRC_URI="mirror://gnu/stow/${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 48c0633ecbbc..1398b995de0f 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -4,8 +4,8 @@ AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6
 DIST sysklogd-2.1.2.tar.gz 561286 BLAKE2B f70c2d116740930761677b9fdf715242844a583a59cd93c2e3408f985ce856d1a9eabc3ba736d18af44e8d154cdadec88035fc357db83eb504b4c6f800ea1f1d SHA512 dcd715939b4285e08ead0a1e797d09a8845156f456d3776cfcd0bcff7fbb9a306cb84a2b22731b430e2199d59ba42ab975fed6e675cf9d8a78833575c1490268
 DIST sysklogd-2.2.0.tar.gz 439595 BLAKE2B 82222b3993bd5f6d0b824152fe60aea97dcf1447282656692cf68576b576eacadc26f12af24f92e235f1eaf9cec243ce41f492f1e05f9fbad06d9e38854436e6 SHA512 36c4d1ae5c306195604f279c48bd837ba483deadd642e86d9eefbd0d1eefab5dc03053ad54f9751264117f9314ebbb5d492fa7bbb30b017539c6b98a7e44cf30
 DIST sysklogd-2.2.1.tar.gz 440182 BLAKE2B 7b926a45dc2aaa9cc57655c5a5cbbe3d1f91a29a136435a477d571f43b307d4f125672784319891b7498641c3ae265c3bda22d84beab99022ef7a870a4d3f1c8 SHA512 4b26e494bfdd82666718fc37c16577cfa45ad7235e4e7b9f605f1ae51dd595f0a01281ecfa04e31b9a79c2de9de3c64d02dab27924e33532da49844d8011b626
-EBUILD sysklogd-2.1.2.ebuild 2069 BLAKE2B 9224625d12497ab66b6eb628b0d8e95c2f106fe3894b6e1b147e71223d4c4e8c21d440b85090dba597adb2473934181241e250847921640938f24213c9c8cd30 SHA512 2f4726ac16f93df57893ecc421097715eaf6dc77eec4e66112d34bbfc56e8b01466b91ed0575385ef764e622c06b7164ac0db542854b5a51d14112c3d67fbac6
-EBUILD sysklogd-2.2.0.ebuild 2075 BLAKE2B 2c501bb6517b583508a3a6bead2878767f2bb1ca2f71e47fd071e438b73838db556f45ad2c6e12dc134f9095ffb6b9be2c9c4a3166b0b03cef881499a8443e0c SHA512 ce13e58f1ed10cf3614998b4119141e58af9e75f035df5f698a75ea7d283abbdd738ab7d450bbe33f1db307823950489cf8e398d731686d13104664034e6844a
-EBUILD sysklogd-2.2.1.ebuild 2075 BLAKE2B 2c501bb6517b583508a3a6bead2878767f2bb1ca2f71e47fd071e438b73838db556f45ad2c6e12dc134f9095ffb6b9be2c9c4a3166b0b03cef881499a8443e0c SHA512 ce13e58f1ed10cf3614998b4119141e58af9e75f035df5f698a75ea7d283abbdd738ab7d450bbe33f1db307823950489cf8e398d731686d13104664034e6844a
-EBUILD sysklogd-9999.ebuild 2075 BLAKE2B 2c501bb6517b583508a3a6bead2878767f2bb1ca2f71e47fd071e438b73838db556f45ad2c6e12dc134f9095ffb6b9be2c9c4a3166b0b03cef881499a8443e0c SHA512 ce13e58f1ed10cf3614998b4119141e58af9e75f035df5f698a75ea7d283abbdd738ab7d450bbe33f1db307823950489cf8e398d731686d13104664034e6844a
+EBUILD sysklogd-2.1.2.ebuild 2105 BLAKE2B d5b44d227c6d5b66ce0a19ca580f4cbc4d044c3c10ac991a0f50b9f9a5628cb274fcb9ae372e8007b85c9d8fe07ad99dae124b58e88bafda28b407cd0a5628cd SHA512 ea12b83058cfdbd1d7277b569cc2028588b7e95b6505511306e060b8da92d7e39cca6d9a298e0816c6e4d1b79f3245514c554e0bffdc2af1ba958261b7a12364
+EBUILD sysklogd-2.2.0.ebuild 2111 BLAKE2B 380deab4839155c659052403cd67e098c53717468ab8cb464d2bf274cfad0965f077cf8f82af8813090c748db3aeb5afb767c5924f871db4940bbf77d23569bf SHA512 541b2164b31189e74fc82de2717864e8ccfd7f4cd1b2b33524c2f239f64a24ff67ddc21f4dde18b88a87c31ec18ea397fcfcdcf19f0a1e4410c2d1b6a597be43
+EBUILD sysklogd-2.2.1.ebuild 2111 BLAKE2B 380deab4839155c659052403cd67e098c53717468ab8cb464d2bf274cfad0965f077cf8f82af8813090c748db3aeb5afb767c5924f871db4940bbf77d23569bf SHA512 541b2164b31189e74fc82de2717864e8ccfd7f4cd1b2b33524c2f239f64a24ff67ddc21f4dde18b88a87c31ec18ea397fcfcdcf19f0a1e4410c2d1b6a597be43
+EBUILD sysklogd-9999.ebuild 2111 BLAKE2B 380deab4839155c659052403cd67e098c53717468ab8cb464d2bf274cfad0965f077cf8f82af8813090c748db3aeb5afb767c5924f871db4940bbf77d23569bf SHA512 541b2164b31189e74fc82de2717864e8ccfd7f4cd1b2b33524c2f239f64a24ff67ddc21f4dde18b88a87c31ec18ea397fcfcdcf19f0a1e4410c2d1b6a597be43
 MISC metadata.xml 432 BLAKE2B 6333f9e73c96d80b69a0ae252660f93ae1466fc44fa379a461e7b611dae4841d0511887ce9a1ec3aa1f49bdb33a98fedce734be92b53580578f0e6a5ca67f192 SHA512 37d1ffbcdd86f5e94f5e38902bcb710fce1eb1c2702c06e05b00d56b02f51c6babbc05b8d1aa43317d336ab58af1df88e173dd152e4b62ca4fce411fe4a8ac23
diff --git a/app-admin/sysklogd/sysklogd-2.1.2.ebuild b/app-admin/sysklogd/sysklogd-2.1.2.ebuild
index 849a0fc7d68b..28b6cb446dec 100644
--- a/app-admin/sysklogd/sysklogd-2.1.2.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.1.2.ebuild
@@ -27,7 +27,8 @@ DEPEND="
 		!>=sys-apps/util-linux-2.34-r3[logger]
 	)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	logrotate? ( app-admin/logrotate )"
 
 DOCS=( ChangeLog.md README.md )
 
diff --git a/app-admin/sysklogd/sysklogd-2.2.0.ebuild b/app-admin/sysklogd/sysklogd-2.2.0.ebuild
index ff5b1d0d7b53..fcf8b445d160 100644
--- a/app-admin/sysklogd/sysklogd-2.2.0.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.2.0.ebuild
@@ -27,7 +27,8 @@ DEPEND="
 		!>=sys-apps/util-linux-2.34-r3[logger]
 	)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	logrotate? ( app-admin/logrotate )"
 
 DOCS=( ChangeLog.md README.md )
 
diff --git a/app-admin/sysklogd/sysklogd-2.2.1.ebuild b/app-admin/sysklogd/sysklogd-2.2.1.ebuild
index ff5b1d0d7b53..fcf8b445d160 100644
--- a/app-admin/sysklogd/sysklogd-2.2.1.ebuild
+++ b/app-admin/sysklogd/sysklogd-2.2.1.ebuild
@@ -27,7 +27,8 @@ DEPEND="
 		!>=sys-apps/util-linux-2.34-r3[logger]
 	)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	logrotate? ( app-admin/logrotate )"
 
 DOCS=( ChangeLog.md README.md )
 
diff --git a/app-admin/sysklogd/sysklogd-9999.ebuild b/app-admin/sysklogd/sysklogd-9999.ebuild
index ff5b1d0d7b53..fcf8b445d160 100644
--- a/app-admin/sysklogd/sysklogd-9999.ebuild
+++ b/app-admin/sysklogd/sysklogd-9999.ebuild
@@ -27,7 +27,8 @@ DEPEND="
 		!>=sys-apps/util-linux-2.34-r3[logger]
 	)
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	logrotate? ( app-admin/logrotate )"
 
 DOCS=( ChangeLog.md README.md )
 
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 119304bd3416..f31771245421 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -15,5 +15,5 @@ DIST syslog-ng-3.30.1.tar.gz 5707042 BLAKE2B 3e6ee58b3732ae4863de43c7d22799a7407
 EBUILD syslog-ng-3.26.1-r1.ebuild 4910 BLAKE2B 8b6ca27ed3d4f98d0ee40ad88b7143a50452103dab763067f996e76ef4631fce0e07153fa2251d5874231950cecfd46034f6875731c2fc39c5adf95a01a08787 SHA512 8c3187c2a7b1ed8d6fdf226b887d92674c3712ff19f60f6e0ed3466ec78043656de1df224d5ff2421fe34834cc33c5589b2188d7d817a2f153f41ab333f9993a
 EBUILD syslog-ng-3.28.1-r2.ebuild 4905 BLAKE2B a51992106f832abbfdcf876ba3472693e7d13594194b0fa165df8f593f32f6422d3fd8271808d41980350ffc5a50765eaaeaf1109aff4543e4fc9a426c6055f9 SHA512 3407603658ae6dd0869377921b383dfbff9a5e2b1d01cb5cd571254eb095c69f04acb01112ac3d40c137523fb0a2e4a45ae69e0aa4e29d828a2a107574a6bae3
 EBUILD syslog-ng-3.29.1.ebuild 4905 BLAKE2B a51992106f832abbfdcf876ba3472693e7d13594194b0fa165df8f593f32f6422d3fd8271808d41980350ffc5a50765eaaeaf1109aff4543e4fc9a426c6055f9 SHA512 3407603658ae6dd0869377921b383dfbff9a5e2b1d01cb5cd571254eb095c69f04acb01112ac3d40c137523fb0a2e4a45ae69e0aa4e29d828a2a107574a6bae3
-EBUILD syslog-ng-3.30.1.ebuild 4905 BLAKE2B a51992106f832abbfdcf876ba3472693e7d13594194b0fa165df8f593f32f6422d3fd8271808d41980350ffc5a50765eaaeaf1109aff4543e4fc9a426c6055f9 SHA512 3407603658ae6dd0869377921b383dfbff9a5e2b1d01cb5cd571254eb095c69f04acb01112ac3d40c137523fb0a2e4a45ae69e0aa4e29d828a2a107574a6bae3
+EBUILD syslog-ng-3.30.1.ebuild 4902 BLAKE2B ed98df7a9e2645b3c87e61b73f7bde2c7c8f516732deab119ccf39b078ec4fe09034b960eebab7dfb760745d37f4ef163ab01a6b3b723a5977a29bfcf7535f5d SHA512 d36688d365b4094c73d5ceca1e3860270f7990bc4588a57c12576b85652b5c5b419290cd673371c8d7ad39ce3d42f9f383f781eb64e9d8f0af0777194615d193
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
index a9abc617c791..e11079d05dd4 100644
--- a/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/app-admin/sysrqd/Manifest b/app-admin/sysrqd/Manifest
index f10c7ee7a709..79d5fdeb3f21 100644
--- a/app-admin/sysrqd/Manifest
+++ b/app-admin/sysrqd/Manifest
@@ -4,5 +4,4 @@ AUX sysrqd.init 700 BLAKE2B 2570aeb1b01d098bd8330a9e78c85708013d3ee09318f84a1e5f
 AUX sysrqd.service 166 BLAKE2B f6963ca6f1fac672aa400c40b899e56f436e674bcc88bccae63f2f529624fedfd193137da157b0088f8c9c14eb22d9ccc261b5f131451b0269e5742b7238c6ce SHA512 fbac57e9367872cd7289edb24d1fce259fb1b39c3ad5484c259cb7bcc56db84fb21019fb6402759025329db26360f427fc9235f743a49fe2198e44ac8443a69c
 DIST sysrqd-17.tar.gz 5232 BLAKE2B 4fd3baf7bce45b43577db7cd4a383161a8d69bd88e041afe20c33d3812235829729c57b748321195c2bccea819827655080199c0167bafad7252ca29b2a3a27c SHA512 fd0e42d2edd5e8548510aa823b2fef6339b2dc1dde1fe387585b9f2611e7d944fa6d73447e3f58a0aa00d45a88459c6e9cbb619428282abf367f62a8270e5d54
 EBUILD sysrqd-17-r1.ebuild 1350 BLAKE2B 41d94d29437692c868d8e8734c60317940130bfbd149597985ec170bb981eae63afc2a5d427f8dda93fd6035dea12235680814fe82611e2c2e06dce79c8a6230 SHA512 1ae634662ea246aa4d22b72f3897915de163eac159b4c9d05cebb6456b98a3daf890fc9fe0cf4e6908578833d9b3000bbfb34f978f4c72954ce85ea7f05503b2
-EBUILD sysrqd-17.ebuild 1316 BLAKE2B e0f1b6a31fb3418058a6e576b4f9f25855ec55e191dbccc9e49486d4ab52af129f9d71931dbd04566f33876131bd05b85cfbdf9a69c1f8c03dec4c40eee155f0 SHA512 213b573ebeb6e9cadb08e0641fa4c68a0513cc2e0bec9e77124c9972be3edc16745f4133442ec4641cbc527ad16e1d7c8fc703727f669b0aab88458d3bc9f8c3
-MISC metadata.xml 414 BLAKE2B eb2c97371677b4c978e210a3069e30cd453ebaf2249d01e80e52c116bb9dd4243f692cb4e4f384412191e691a67054a390f35143fb8fc403b595f11c3e09dd68 SHA512 e0c64a75f859353dd258c074a2353882ddba2955144297672ada48f29ebd742d4acd7193816aae859f7f7df1d4b23e9bd1176856aa801ee7a0035f8ce2224859
+MISC metadata.xml 488 BLAKE2B b042e47b646ca09a9acac8249ab7fde948b74e212605403eec3716404f8ca9f59c9cdb6c407b2565135ae2a599a112763fcc53ad12c93e87fc045a86da742d0e SHA512 35441cc9ec461401ef388c5496f45e9481fee27e6b6d7a35f44f605171294de12a3e7ca28b047de5fd12cd7090b09def956006301f06db7d3fc9a5e5c754c323
diff --git a/app-admin/sysrqd/metadata.xml b/app-admin/sysrqd/metadata.xml
index ff003efefc85..4df0c950f77b 100644
--- a/app-admin/sysrqd/metadata.xml
+++ b/app-admin/sysrqd/metadata.xml
@@ -7,5 +7,8 @@
 		Its philosophy is to be very responsive under heavy load and try to
 		be somehow reliable. Authentication is made by clear password.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">jd/sysrqd</remote-id>
+	</upstream>
 </pkgmetadata>
 
diff --git a/app-admin/sysrqd/sysrqd-17.ebuild b/app-admin/sysrqd/sysrqd-17.ebuild
deleted file mode 100644
index 541c67095fc1..000000000000
--- a/app-admin/sysrqd/sysrqd-17.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Daemon providing access to the kernel sysrq functions via network"
-HOMEPAGE="https://github.com/jd/sysrqd"
-SRC_URI="https://github.com/jd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-config.patch
-	"${FILESDIR}"/${P}-fix-build-system.patch
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dosbin sysrqd
-	newinitd "${FILESDIR}/sysrqd.init" sysrqd
-
-	local bindip='127.0.0.1' secret
-	declare -i secret
-	let secret="${RANDOM}*${RANDOM}*${RANDOM}*${RANDOM}"
-	echo "${bindip}" > sysrqd.bind || die
-	echo "${secret}" > sysrqd.secret || die
-
-	diropts -m 0700 -o root -g root
-	dodir /etc/sysrqd
-	insinto /etc/sysrqd
-	insopts -m 0600 -o root -g root
-	doins sysrqd.bind
-	doins sysrqd.secret
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog
-	elog "Be sure to change the initial secret in /etc/sysrqd/sysrqd.secret !"
-	elog "As a security precaution, sysrqd is configured to only listen on"
-	elog "127.0.0.1 by default. Change the content of /etc/sysrqd/sysrqd.bind"
-	elog "to an IPv4 address you want it to listen on or remove the file"
-	elog "to make it listen on any IP address (0.0.0.0)."
-	elog
-}
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index b494b8b33831..d6a91cbc4d3f 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,5 +1,3 @@
-DIST system-config-printer-1.5.13.tar.xz 974532 BLAKE2B 44e748d2fc20edefe58e1c8dd3781aff28af93e57356a9969e051813bf4f04f72c4e895b587e86614df6fb4984a4d610e8e1a1e17777801ae8912b6904679c72 SHA512 f4fbc1b20b35aa5b33bafdffc8a7490cc3c55e0b33bd9e925f1d3e01532c0a7bb87f80a04dd6da6fc492edd9fea74bacb0ce16ff64ceac622722fe1f9a77a6b7
 DIST system-config-printer-1.5.15.tar.xz 1005764 BLAKE2B 4919c555444829505b09b658ce0fd016ba235260f8c8b4db751e6a511afba5d5975e5f9570f5fe74fc35d158bbf2dd3ece99aa568ec1bb850096e5f12f0fc0b0 SHA512 b992f96f48c54350c11c5c629e77ee4409fe52fb17b386f226a42d532a95e17b6506319dcedeb70c0072555cb9ab464daaae22f295ce3d5181e5f49836f2ae2e
-EBUILD system-config-printer-1.5.13.ebuild 1942 BLAKE2B 26bd1079a01eebc8f49335d5756f310471b686bfe8966d5b993040c0636d6eaafee272eb8da305b07df0a8880e1db4899fdb61f9cd929ff1c829dc1e07c667f3 SHA512 e25caad24daf23975975b52bf2ea241e06b462573dd0e2129cebb9de467c94e035e5f3e64914d68123d0da8f40276071d9600888992b57ad9b316556a2bf1ab3
-EBUILD system-config-printer-1.5.15.ebuild 1943 BLAKE2B fb4b08219ad0a2bdc3efbf2428f27166463e01b54fd02df366e57f18a8518ae7d9ec60cbe95c4f8f8ef104f769c29610a4ec033c5b003c50984acc238c5f6588 SHA512 b8a374a81f1655394a3030dc8752229ac793cc2e86277920efa6a4c4dab2db33fc439b07b59100ed3b4f49ce6cb7029d4eaad8c71d927039ee88d138c4172615
+EBUILD system-config-printer-1.5.15.ebuild 1942 BLAKE2B 466e1c61ee073d76ee62706cb036d9d06ba3a5c5558e7d9146651617406deabe23430302eb2309424234c1a889b96cdd956d13d4a0ebd2aff61d8f9b5364402b SHA512 5157020f628fe7859f370ecf4b6673d7c62501416a0d95b571a0061d42f3f9dae0d151481c1e6da9e3f51289387d60a3f250b2d71a541ac94e254df451412ccb
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.13.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.13.ebuild
deleted file mode 100644
index f792380ee3b2..000000000000
--- a/app-admin/system-config-printer/system-config-printer-1.5.13.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="xml"
-inherit python-single-r1 systemd xdg
-
-DESCRIPTION="Graphical user interface for CUPS administration"
-HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
-SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="gnome-keyring policykit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-# Additional unhandled dependencies
-# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
-# python samba client: smbc
-# selinux: needed for troubleshooting
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	net-print/cups[dbus]
-	virtual/libusb:1
-	>=virtual/udev-172
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/xmlto-0.0.22
-	dev-perl/XML-Parser
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycups[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		dev-python/urllib3[${PYTHON_MULTI_USEDEP}]
-	')
-	gnome-keyring? ( app-crypt/libsecret[introspection] )
-	policykit? ( net-print/cups-pk-helper )
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-nls
-		--with-desktop-vendor=Gentoo
-		--with-udev-rules
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_fix_shebang "${ED}"
-	python_optimize
-}
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
index f5645ce026a8..e2494d75ec08 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="gnome-keyring policykit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 3a6eef0f5517..b1113544a873 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -34,9 +34,6 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb6
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
-DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv35.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
-DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
-DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.zip 31161655 BLAKE2B 8c07832d9023d7f932e15c51508983f1d539cdc0c67ba3ca65a41e2882ff007f88395298878d8e05ea3d5d9dc6df04849c6b81da0f5e2e151bda93495eb3d640 SHA512 74830cbdcd9ebb8eae4640098d2964cf5dbdaae3cd69eeaa5787ac340a0bde06576d54376595632dbc91a35bfb247d596c93e1511e7f473f458ba0fd8c4530b4
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv45.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv45.0.0+incompatible.zip 42831873 BLAKE2B 7b549b744f554c81fe149dbb6a22298e1a27c7f8aad8937539f8425765fea262cdc1ec9bfe8abd0cf5c4ad2a659fb70f8d833354560de3310d8e2e0c5e15394d SHA512 4bf91be0c152e3047073a5a74d8fb6b8e6eaee0c3cf1f138c169fa2e2efb03886fb0d9777da32b11f7f72fc644ec1d3b7190af021655d87f7af91a530ef7d072
 DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv11.1.2+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
@@ -44,45 +41,20 @@ DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod 36 BLAKE2
 DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.zip 24733 BLAKE2B 66be4a311f84fec9bf833da384747f93cded83fb7cfe07481ef9a8a5747b626c3da56437e24b687524403d463463599c193a0e4dd367f4afd4b7c41fee7dbea9 SHA512 b5615d6e8b8e3d1550218258027891063d3296af88918fd63559d2c108a5faad4ee1281c57dbbe51057f1c417ba94895a59e969550acc0ed276a7cf648ff6ac7
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.3.mod 366 BLAKE2B 97345e1c4c80024fd786edc92d87c2429bfb7562be7e96648e887d44bbc8d7b4a28da6510910feb8eafe4a390339e83a394ee64ce0686f18fbb291a4792d5c1e SHA512 bfb202512ad2101bd0d0bf6bd3e712f528a5f3b280ccaabe96c54ae06e5deb474cc0bdef0be5f3faae1dee6ca676531acfb4c4e53a5c34022a718e73f457c9e7
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.11.3.zip 107600 BLAKE2B 4dbc48d9fe69df9669db10d7f5508eb40ca277c7a38b9f9908bde3ed2a2b6b7055318646929c9dd9e497d8f0ae97b68a5f056b7a09e9bcfa6c0a6809271cac05 SHA512 5c18e8b07fc8a8e3a9f0fbf0f89b0fc0f295ab1ca14fd20f308395d85105f0c3db9d11949e3c12a8c28eedf7c0e379db06923b94be99c5a9d59c3b6dc0efa231
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.0.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.mod 315 BLAKE2B 08bd66cb04b1bd32588ef1eb6059f3a2cd208a20a9ba12816e50fa39f6258d1e50ced24d78da3df80f9ebbf19db7a6c42d04fa1934eb66637ec612da86704c6e SHA512 72bb5cdb3b87c148cf4b613f3976076ffa0f8406d0d85b92b8f0311ca260e643c7855a939292dd82c66a71d4c5a1419a90b13f886bd65c7138062c34eaeae0b8
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.zip 96994 BLAKE2B 7932efd0586b1f4a2a6142815d5bb64c0f88074eb43347b458daa1aab9f7989c192004fe7c27a58d830a847db2884d6bd8bf8e97e5a3c3d2def4e721600177da SHA512 639dd9dd5b670eec05d33224f9f025a67105ce34ba7d3b8cfae7a1fbd947312737d31a6575d839790b3373bd6eb1a6a11e264481c0292c50b6b4f4778855070b
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 BLAKE2B 1ff6851c8e73b2a566cfafdc2ebd259478b39258f785040407cd853433312ef10e492da8dc0dc9cbd4a2d2470e2715ef5ba4c05100c35f5b0664c9b23879e721 SHA512 61c06f593c1759bb078042d461319db2f91afcbddf50186d09195021eab865159ca5c017eb078d354d7db590365846e401ec3f91a2cbbf753bc32d7111683bd2
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.zip 38083 BLAKE2B e796f7659059c9bb04caa298c94a318fdcc3e251a4caccf71a973ec957899cf49ada77fa866b1883036aed3942f0887c88ef33b22da1387e55bb2847bfdfe0a4 SHA512 16ccb2211f3acb23181cfaa941e5d757dd975a8491cabb0b083411dc7c431c3230aaa7158c03d7ffd1dcba4535d4ab170a6d110c1b9d91ca2553d665767f53ca
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1-0.20191028180845-3492b2aff503.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1-0.20191028180845-3492b2aff503.zip 41301 BLAKE2B a4511c2b007ba0d066e7055c16580327b5a18aa2d49d954e300660072232c5e80b7be85b39d690e3a99d21478c507038793b56434b46537afb00288df18a4c16 SHA512 f11a9c09267aae2ec86600e9e6f5c2af6c345c7724f92cc11ba050a50ffefcd78b537c26f2b3bc92bce6b5a80458899d440564294659bcef8e4656f4ab544991
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.mod 376 BLAKE2B f7e3a3f97b6a61ca9d5497ff96984c9f445d2c138f9d90157658cc697d9531cace1a87f6e2a18414ee2f7f54eee81d7652b3006b8be6c0137a2c794d37bf845b SHA512 684a7c8f51caebd1bb90c7eac482ebf9a52228c57a5b31ea1b3d3019864bf669688742bf5f9159995e5a6ddb3786aad9dd10c37925767ce9f38641c9a7448e3b
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.9.0.zip 40365 BLAKE2B 8f9a653839de039ee80e8550983fc5281aa91c6cb6d724fd09fdbccc93df6a7ccaef2af9533cc60b1eb73dda4cf304ffae60d843fbbdbccf77b85e02c574a1c5 SHA512 8f27b41bacbcbae7234448b6c85fd77d9b5e70cbffc96e579125f19d0dc5b47357ff4aff968dfdd6a251cebae9ab0733f847af382032683e61a1c2e61f778b56
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.2.0.mod 256 BLAKE2B a3d6043ccd944a28dafb799df0122c4fb8a0f01ccc342d46c32198d8d3a10ac3466612ef5431a40b19a83ea5280c5563ad0a94a4da1472d5a0812640d00a4b8d SHA512 9572676471e1232439c03bc3be1b71c060117735ecaf42e3bca5fc6a838459d342279470107c8688cf1a1b0865cf873d805d771545fa1bdb28f9cc122f5881cc
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.2.0.zip 9359 BLAKE2B 840ec2a263e4e76efb7020900d04e1adde8d76bd30b0c035349b43be28022791046bca9984b6150e5cb390a5d36a46cacabcd93b44241c928c09eee0696a6f64 SHA512 dae57380e2fcb94bdfb3f61ad2df9239e158b38f3811f0bfce5f1ade80abc65525355aff312d0600dcbb450c4ad68193a1ed8903276c87086ef4a4e0f0d4a306
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.0.mod 307 BLAKE2B 6c70ad9ab3dae3c55241b402d1986fb10ba792f37298dd4b996a2860cde1f01ff7954431b74397c34ae3151af15f87191732708e6fc16f021d18e7b4532881a2 SHA512 21bd40b791b24d729380a1467a60758619dad88440f9a3b26fa6b933a109c6ffa2c821b13ba6eb6e73fe983c93e67cb32556ea8755c07e730be690f57adb9a10
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.4.0.zip 10567 BLAKE2B 0222885ddb3e920cc70f7af8583e8382038725452a42beebefe00a9ad0492c5b5a47cea2eb748ca376d97ddf450fad2f0c5ff2db8a7699de548c36d5752a1896 SHA512 c6d81b3c62bb7f0218ea7962ce131e21dc8c9e38d267294174220edffca5e92a453f983f22bcb3da45734f3b671bae07db20cfa1d106a864bd483cd43567fe4e
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.mod 59 BLAKE2B 7816ef9919ec514b2eafce6a859edeae85735475da10c34c64ecaf9a53a07748b02a424bd0a16b0413c499a2eacea0fcd6ce7807b651acd9f67ecd00b5fe55ce SHA512 d5eb17738399f8b8e1a1be409ba5b24520b848b3be5fced46c726499f9df5bf5a54233c6c0c9b8fe896834bcf5132f39ba0b91bac0ce6347b9aef7c8bf93f912
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.1.0.zip 17111 BLAKE2B 67e9376554073b3fe82834226831bd7ce92d34c9f75240c3423aa3db4e5ce3cee445bf2df4f0f24a61a4f3823c33fbb92e0986f0e5e6860dfd4f5d157e2c5047 SHA512 50182309e9823fe6a3af86a9beda7ea9a2ffd798cc0d9a97481324a205db8ca50f524ec1b482cd9d8ade987c6e7dcc511c2d6937f31d38195f4b496d42e63bd7
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.mod 113 BLAKE2B 7822bd4ddff863c4fe4e3caf59e722121828f61b08d5504216e1fea40401108199708fb07d7cef2b9dd7ddc7ed7d8feb4e0c823b8a7962217881601107404ca2 SHA512 08860dbcc27a83f322c07cb64b9fb1dad3810f8a7dda4ad5914b3fb8dcdc14fd20640e5aa78ad5dbd220c6dd95b8c9ab6e15c4bd75dc476db743f1c5df1fac95
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.2.0.zip 18897 BLAKE2B 984f84c50aa5024a3eb78369d669ad73e9b6a7ee6bc7a7ae95667d29706bbb7f6d1f06a8e8e98e037a1226ac9f9637e6072735a3d01b8467f3f21657ccbf7929 SHA512 3eb5646b62d06c1d610de05889dc4533e0bfe1ee5de2fd9feda4f4dea0606ddc7c667a41c73687460ab1f28f4fb17ea9b3f79b5c93ad6c4aaac6b0b9f15cd8ce
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.mod 118 BLAKE2B 6c3b0310b2a333471afa5fb1c2cee19265ab4180b71cbfaeb875ae27e5db270fdbd141eb8d498e0e8dc300e4e0d9ea681e99e1a2a3b52c891cad52155cb88a58 SHA512 d48c483ef76bb5ec8d721ba828cade25defd91bb2c0dfc3b44df36742b86e8e0650a2d010bc7843a0b4317633676c393f4044998cf7f953125bed93bb7fb9375
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fdate%2F@v%2Fv0.3.0.zip 18297 BLAKE2B 5691fe3176a689e7f79f39cac16d24e00334f2107892df1b4f38d0816a69decd6ad0a906a4932e0d79db60723f51d3a92a87b359bbb87df8b0ef2131dc097ef5 SHA512 9e4a0d741c735d4e285ce8b0fbb7f19e98424593cadc64a5b958e273bab208e8102140c4570069ee4e35ae3c1f5bcddba3cda854f7a6df6b50f736008a5a34a5
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.1.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.2.0.mod 60 BLAKE2B b5b6b8c4b80b9fb33bdabf18d6d34357cb207329df96da5fa36f85c18a62135da9d1550acc17eda531ec3fbf225781c5f9fa8f8c4a50730a8bda95e9fd567fe9 SHA512 98a8b2ccac214ef2a701c0bca2bb3512acdab19294d516ae6c8fe028d87393b055aa2e589cb273704ea4f612a1c949194014394aeb7d8ecd92233401e6ca35a6
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.mod 114 BLAKE2B fec15aa5a362d73dbe839818a965fbf0a0183e7de3fa5b739739e7dcac4e88ae037848ccd7e6a35a4f6c3d7bc26988e0e1219ef6a3527c2533598777a0e5fdd2 SHA512 a119491d5a5b513a2ec0d0f5960ce04d03c263842f35a86a3efcb3931b5fefd19ef74df546e4b79ec119fb20dfa62d0f251c7812f144bc8258bf3acd902b693e
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.3.0.zip 9849 BLAKE2B 710903822f31a6678941a4489984af5b5cb7a82a97476a642fbe35061d4df496ce79159a82e4e7871fb9dfdbc3cead15416d29ac8d293165bfeb29b4c973c546 SHA512 1529a7855dce3307332e12e3b717b8c6ed9c274637e357007801df890332304f88f7aa159da3bc3685701f49edd78cbd10895131daea9c6c034d7619d21847a5
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.mod 119 BLAKE2B 079ec8baac7694b3a9080e10de4b2b23ed2039493614e4b9080461b3ffb3e3c2521d8a8764388f56454b3654983f2f2554a2b1596a4c1ce37004423c6f420939 SHA512 6a9196afd0b5bcafef72c001742e1c8e45ffd0d7f53ad64ff33a8388b71d90917cff08687ffdcc80f5f64806269c120ffd3ae7d0d718c6fb8b2810b2fc2b5e28
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fmocks%2F@v%2Fv0.4.0.zip 9252 BLAKE2B 5c9751748d076ff53dcad7965907678162156a571cb8bf6fdcf4fcaa13253184fa1c355626470e146e73a12a0077fdcdc8a9fe24403a70741f947b5ade9f6253 SHA512 40298ea1077dfa8a550a9815d470f7e6fc4226e7e7a00794f2ffe3e2997692a7e6f47c33d605b4fd4ab8588575d51ec38bb9c6e2a453df304e63af2d43dda0d8
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.mod 111 BLAKE2B c5ae8e34a416406d265d2cacc6ebaf2e3f801eb0338d488eb413da396159a70b217309e4d560f1d50d173e3c717c7248f8969ba6da948bb86cba04ae0e30f32e SHA512 e3af601d732c07f5e995c21ea484fc2087aa693afacd77df8e9c1abf687c1476e41b50cd5178d07585672f0ef52cf454879ed13bd1a1ab6611428a320b73ea9d
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.3.0.zip 8761 BLAKE2B bff49ea7cc3b504f9d69bd3d06184ec123cd5d6f9d25368dbf194114925f343bd7f40874933a64e9ad16c6c887cb02df9764a502bc4b2114528a003c993bac7d SHA512 5d9abd4b8468b2ffb9feb70c9a87d2ca57dad721053759c016ba61034a05b72b5d5539a2def3b7f0dfe0f6caec415b0c5a5ff5a8e329554bbae4d85d61c8bef9
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.mod 116 BLAKE2B 064d7cb8cabde1b322a8bc6d6bcf80acb5e25573d4bb50d0b9753421412ffb140f8db409903aff01a67d399773c94a0eac85734f05dae36b98402d4bb2fc5bfd SHA512 1b6a8f2c23e225f4f83de03e4e23e2ad31357785ec5e8d23e8300f249048f7d8e14419f991b509f6a3c8a05cd5ffd61e2385703e950cf1eafffdab95df4a8b02
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fto%2F@v%2Fv0.4.0.zip 8129 BLAKE2B 235415e90169c74bc7a78bafbc4e98751fd7a57a6676e74bc05152d0c40b211cf7e9b27ebfb510952fa890c0e66d43f76e8585bdd12aea4ef0fad47df96b40c9 SHA512 4198cfaca3923afd7dfd6eb7ab5ea3fc01a03543b771995d38000f0bddf2ce02cc44f77782878ae05ab44f121bcf7ab4c5ba046e49807ca306883e9db410c8ad
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.mod 160 BLAKE2B 57c363c25bf42b884a85ac5a6f152745ba3138a2869041fb383de44432f6c38f39a8b11405ec9134a3e940d66d864d3686769686d81d7ce1e99c2dd22bec2cd1 SHA512 6fccb53dcdc93b44c1f2c071f09c27b0536f6ef071b6e96296c31b50e81eee3d4224e9d3e863f84c85fec70adb48f57324d363b735d4eb1ce5aa5709fd4889cf
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.2.0.zip 16166 BLAKE2B 506805cb5cfc3a2d4aee18916c7a31ab5c58749335a5c8d4ff56a14fec30a1dd0659fa59602ac679b4cb893271b3424a13fe4bb3fecf5d6260a7cbb5099133a6 SHA512 e5270951b7410810a10dd0dfea3424174903bd9189420e0e7b96a4802f2e5a356bd105c2710595dcea0331566e1c207b1de0899d1bf3f56b3c9ac49de75f3698
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.0.mod 165 BLAKE2B e9cebab5c6e8af36d160a6cc9afa1f857ddd347bc18d4c2f69fecdee2c6b612af20a3622abdb1d5336d4b1e9dda97a32ec89f4dd0792a2e4569cf8da1868443b SHA512 c71897f18a99fd5d01dfd6d2a6a4d1c451497e08d756a878a2f2c5b30dea3131f8cdee708e5d8eb6add7aa9c2ad789e6c413c35fbd20b7bee441207be93b95aa
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fvalidation%2F@v%2Fv0.3.0.zip 15540 BLAKE2B d6995cdb469da8bdbc3fc48cd3e7441a407ee6c1be8fd3f14d95c24de129a23e77e3979536fb93a8e652857ec993be36ea774fa7885376f9430bcdf9c7c39dc0 SHA512 cf01154a716b3f535c9135a36018e637aa85cee75e86fa3b7fa3a4f04d8be51c122bfdc8fc8c647bd49e201b44328f62d86382713597646839af49041182b04a
-DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.mod 52 BLAKE2B 83e3b09b165e45af373e2e62dc0b7799ac204794e1922b4134ebbeba4cf6cd9b6d883f6035624f2421e8ae613d071a2e281379ee4935e55b73540ad8104d79cd SHA512 ad433e42696f3b605cdb12c70438d3b1a4d4d52890cb28b8e76cb26bf1ae51f324e6dbe2043bd74bc9086efe743da65b8cbddd10618f4b59d27858e0898279d5
-DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.1.0.zip 9362 BLAKE2B aef4f369994d869906ca45a1051cc706579525324b8fe2a5c98dd4d80d4181366ff7e3cbb08f3274762a6f2ab2259a2770fa11a9b088b07ff3abf1a241d01814 SHA512 f81a070b61e026440ddd9b29174fd1d59241eb32d1fb4a2202c38fe80022aaff07b389ed6d75eff27da9408a7832f74c51f3c53866774cd9125e83c9f258bb61
 DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.mod 111 BLAKE2B d97433a5745f1479d4c0aa7ed6b6cdf09827fe8cfb41ec000a0aa6162ba01629c76abf9491904397650b65ff74caceae9255faa97f54d0fde0756cfb1b09b494 SHA512 bc44b8d16bbfa4fb5e5f6ad015165f03ca8c747096d4618aac083a22313451fb283f0061fab90e6148e5a52279e839101561feb358cfa77e26028fcfa5a4fc9d
 DIST github.com%2F!azure%2Fgo-autorest%2Flogger%2F@v%2Fv0.2.0.zip 10521 BLAKE2B 0b4ff7f99d953966ccf4f17cc32b3f0875bf7087ea5caf7bbeaece451fc8cb9fc4285e5d79d2880165e70f738edffe709efc54a32367a3c666d2a1b383b139c7 SHA512 45e35c16a3e2d0ba3e765f85e80ed2d8ac65c227bc260df910f0959a8642bf0bafd1ba20a2dcf0b69fc6a371bb4a4c8026e54bf15628119d68df4d063756bc3e
-DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.mod 53 BLAKE2B 6fab3fdcfa8f595bbd52845b0b4f7b0e47df93fc624820a661b38bff1d51e0a57c89b678e0cf271ac6575b6a77c48d3ca93d5307d6cad98b35f79f1142a27795 SHA512 b1f9bd825933cac8ecd5416f86748f26e5cde3fe87266e35ee794cd1f59ce0fa81c0e62169e838e70afa71b0680a89fd8f2beafb3c1411eceadf48a154a08f9d
-DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.5.0.zip 6278 BLAKE2B 1c42d23c77848911af642fd38f79aab655056e731f015a62374a23cdaade84b53f61b80f65f9416bd4f0e4b72a0b42203b56d659d30a44bb244a6ed5ed1869eb SHA512 f1a334ef91dd9410c57efbeece2ebef6ea326485e790e47de67efc9495d3e252cd7e981bd9da3f94f2f7e35c1bad9a8d5153e671a9b81758ad0584883c916155
 DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.mod 112 BLAKE2B 37e4e4987feb544f6382e506e0721975c975cfd239138221555dd238350b534400256fa7118705a7ded177877f3ead64275789839cbeff8c175aa3e4f8b9c8e5 SHA512 a513562aef7037e4f62d099d2fb3ee2015bb43d6bb32b734ef2597d32642d7cf7eb13f1e9a71edf424e274912d90de5db5c038b8cdc4276836740bc045cd1a90
 DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.6.0.zip 7440 BLAKE2B 51b84bff91f8490df83c9a013b58acc0cbc6fccb77ee765379e94797073521242aae7066de134c1064f460c15df57d9bce42e934d95336160413050c61b69276 SHA512 b602a1a658c95e12e71c814c40ca44356a615d48c1cc8f1aeb0130edf0c5eba10f2da2e335ff70989a1dbe4dfe789b86ff5f02424d6ae4ff3f5117e292951b3b
 DIST github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20180810175552-4a21cbd618b4.mod 35 BLAKE2B cb1abbb2d5d094d5946f868ec3fd1b6ce72721b5e220ddf2be7c8376195fda1659112b93b7af24b08c66b441c950e6d555c858e51e81c9d3d29bc5b72271379f SHA512 b9bb8b7bd45785e18073235507b6e570ae27df026d38676e0b36cb19bae6b53a085099fd23d4a0bc456dd9bcf3459f1f53d0e8d11b6bfc7e61a88f8673a3ca9c
@@ -99,17 +71,11 @@ DIST github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a
 DIST github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod 37 BLAKE2B 9aad8d876b88c7c8976667747135ea2496c21542d029e879d80490e9d979923ac3060f65ddc443044db8eff2f92e2eed6b18682822f6b5706c5605d8de92ecbb SHA512 8382734877c9dc6a9c8a59b12d9735b6f971ea72ddeeb9985ea0cd0573820991a4b936baa1a643d38b694f1df7395d7b0d119f4f52be8d947f00adba96773989
 DIST github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod 37 BLAKE2B 28c9393f5171487d23b732afcbb1d3d835d13d1a63b7e852fd3205925742fcf5a686c39b0600359e9052770360e9396f6bfe52a0000ecb51e3ed0a23611a2853 SHA512 a2b3211e3520fdef3d5c1991b5ad4b3745f4bb1b49be3afc5b1936c82b2a3058231b6cc17c63c85402cae0b80f037a70051d42738e89a708865e43dabf7b7b8a
 DIST github.com%2F!qcloud!api%2Fqcloud_sign_golang%2F@v%2Fv0.0.0-20141224014652-e4130a326409.mod 47 BLAKE2B 91859f0f4a7fec349c1a1403a76c651ebf3c56d6f5a62044ab9c87d41f6904c61888e77cc47adc9e8463b69320441a1ad10b5d1e7263b0fc0f6a10ea86a16fc9 SHA512 9d49d01de02c003ba65202b3bcf290afcfd3c301134085697f6bb3ea13a18826dfc0fee5e032b1701d1002151c44bca7db3fa575817864571640c4d4f2bb5732
-DIST github.com%2F!unknwon%2Fcom%2F@v%2Fv0.0.0-20151008135407-28b053d5a292.mod 30 BLAKE2B f6dfa75b9c11cd126f0d4bb1d000ed8cf2a95df64addb279c1cf647a82de6b817890ca4624cca8e1e26a606b70bfa1a8ee4f17baf47ebd4a0a2ecfb07c735e44 SHA512 91d239b6504a52a8a645270f7f1f5b4519ecac9082f994084a7b5ed4e8c320841449ba45c12333e623cfdc6b63762c96f4ff8839394bd95b72d6ecee5426f02e
-DIST github.com%2F!unknwon%2Fcom%2F@v%2Fv0.0.0-20151008135407-28b053d5a292.zip 40352 BLAKE2B 224d9bd57810fa8275bf060e72539727b5e648c50dc6df0e1cc4abb2ada8d29ffa6e6b40aeeb7c532e548f0c3a39ab5e81f9b021dc95c7f5b00edcaa4867e2f3 SHA512 ddea1fa6e10625c2418c9fea938d51363a9f08587d493e13d4b0dffabc9a4b168768d231b2ba8328f83294ab4cd870f32f53917be62364915346d90035a226dc
 DIST github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod 31 BLAKE2B 6ff35fdee07deeeee5ac0412b923e2a76ffb19646b121dcfa6b3bda5400b9813375f7659a42b8141ffa6c29e79a4f1009a946ad3bcbe943889f20550bba73627 SHA512 975a6684c6f7eebaec8a757656fb51a4bd9e7ebedce12bca267fd69ae505bd81fd6296fcec6a3b45973f841982defb9311e405aa349b2c7e664384ca05a920f0
 DIST github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip 7070 BLAKE2B 8a387a04a8d6cf7d548f2032820a02dfa7f0a078f3ad04b97643ff46ca3436776692d620e5424f51504519551a8c4e48135e37e47eb73bfa7f7de254ab9c9838 SHA512 05b98a368bd2a312fcc487a5d17cd051318f2234a570ef416464206193e62fd1a43169a150a5194f7416692771fc53132fc5352f05872cf95fc1e9402cea21ee
 DIST github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.1.mod 36 BLAKE2B 4fc95f5e7e11399321c64bb3b97234cb0dfde63e21e7bb174ca916917b66ab9ddb0a972c8b5800802f9a8e7e0a3848f2ed4095467c166727848f4213f942ce05 SHA512 b84b0edbabf81d86e47e159c035e900dfb0a2d640ef0f3eb6cd7c1934a301ef146492fee7742295ee0942f1cd41c175dd059d269b10780d5f11c18e405cce605
 DIST github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.mod 36 BLAKE2B 4fc95f5e7e11399321c64bb3b97234cb0dfde63e21e7bb174ca916917b66ab9ddb0a972c8b5800802f9a8e7e0a3848f2ed4095467c166727848f4213f942ce05 SHA512 b84b0edbabf81d86e47e159c035e900dfb0a2d640ef0f3eb6cd7c1934a301ef146492fee7742295ee0942f1cd41c175dd059d269b10780d5f11c18e405cce605
 DIST github.com%2Fagext%2Flevenshtein%2F@v%2Fv1.2.2.zip 18038 BLAKE2B e9c3c57cce998ff3230349fa06d098ab7d381c77c9331f97a671cac795afbb561602781e076a2929a0a9df3daf1a9e534ad7c534c2e5297c7aeb1f9346e885ad SHA512 92bc64c2e07506ef24b16ff82b2f8c60d5ad5f66343728488dabebbc4dec62ed290503b322941279af007891abc0a6b278fb916c2675494e21845372b93725a3
-DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20150830182803-278e1ec8e8a6.mod 30 BLAKE2B e89977c245471f14f3e2e9434d08e9683a9d4ad350dfde2055098d913fa41ca92c4cd8f26345f3c5b07ffea825b4a87d5d06f1ca99105456aa63091f00cba1ac SHA512 ae14432db61f891b7a8d6d8e51c47675deba7a13f0bd392536cecb625f6f9eab5b253d6744957dd0cca3464f84bbbcc3a41fd0f2bc25fe47e6d6b4ce51858930
-DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20150830182803-278e1ec8e8a6.zip 104685 BLAKE2B 74c7b36e96901f3f244a12d951df3dcb00d0fb7ac76dacb3a192d939de49657f3383044c102acd165921ec8c6be9a00a7093d7babbd165e147e14beb953a568f SHA512 99a869dea0e6525cb26e3f305b8da7f55eaed841174f05f8d1dacf7ec318154b83b0fbf7764b9c46e5803f70867c36c388c9abf95be9b58dbc913dd4f6cca04c
-DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.mod 30 BLAKE2B e89977c245471f14f3e2e9434d08e9683a9d4ad350dfde2055098d913fa41ca92c4cd8f26345f3c5b07ffea825b4a87d5d06f1ca99105456aa63091f00cba1ac SHA512 ae14432db61f891b7a8d6d8e51c47675deba7a13f0bd392536cecb625f6f9eab5b253d6744957dd0cca3464f84bbbcc3a41fd0f2bc25fe47e6d6b4ce51858930
-DIST github.com%2Fagl%2Fed25519%2F@v%2Fv0.0.0-20170116200512-5312a6153412.zip 104690 BLAKE2B 7c52d737b8bf2f9a4b4ad4a7b2a843b715cd991dc18d61b0c2c68ec25ef8f8bc00ee0b5cdc95b91a1c64715d1990597dafe29c070a090227b2b7d1244a8b80a0 SHA512 8d15276c2a6e82ae72d903946fbcb2adc6446b964492d8c5653fee885e4c1b1d75f119a3fdcb0a35044929810d31420ac218b7ec077d1d07acaf2f586d869854
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
 DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190329064014-6e358769c32a.mod 46 BLAKE2B 86188ba06e70b77421a7b156c3a1955d5a5f93dc3ac34d6c93247e5c12cab23d6c2e9f0f3486d91deb4e60df94e5e75cb7575ca32967ea9c8522f66f27831139 SHA512 cd235a247bbbec18565d56a2de766574c7a9d1e40f946d9c93e8b23c7642ac048389ecc57a1fe0a4ecc4724b007a2afe40f032e80f5da7e025931d50eca596cf
@@ -122,8 +88,6 @@ DIST github.com%2Fantchfx%2Fxpath%2F@v%2Fv0.0.0-20190129040759-c8489ed3251e.mod
 DIST github.com%2Fantchfx%2Fxpath%2F@v%2Fv0.0.0-20190129040759-c8489ed3251e.zip 28292 BLAKE2B e0484f73bb18dbe9a450ea1e61c56874a185f6b4cf5ed6f9ecec0ef744a4727bac5ea5332eca2c87357d90f7b613e838e3ebe9475e35ac16c20e2123b65c9f4d SHA512 8ce75cbb2f8f7ca69bc0a49ebaf5a137773c502da72cff369b3c776193e5d35e7002ffbaa141578d77b84d47ec52e4d9431d20f1b6dcecdc75a9318955607062
 DIST github.com%2Fantchfx%2Fxquery%2F@v%2Fv0.0.0-20180515051857-ad5b8c7a47b0.mod 33 BLAKE2B 61476295776f61181b3cf0f891ef4d75c378ef10fc13b39f2de8e2dbe15af050a125ac1aa8b7de545a20034cd6493b6753e0f2c1e122d72dff151abda9a3c804 SHA512 beb76a1d746806327172ab8ea18f928a187683b009b37d9038a032ccebd44521c9892d44028110cacb4d130fbf53c1d28a6b3c17e8915d70d643236851122b65
 DIST github.com%2Fantchfx%2Fxquery%2F@v%2Fv0.0.0-20180515051857-ad5b8c7a47b0.zip 56548 BLAKE2B 5feae94f043db57cb00db1ddcb0fd2c76eee2fd56c9e578336c860173fa523b8707eed73e3ab1af12ccb4a94f6e2f5ca13f85884d88c9b401a1da4ef5ba1842a SHA512 adbcccb6b4f876e6555c47fd23f9d4e93d5e39ec6dab869d6186103fd9f073bcb41c9f967fe9de8a56d4625348e902e2f50195ba52719554d803485bff28f8dc
-DIST github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.0.1.mod 41 BLAKE2B 7b2d1f7187a6d1d4335dab2107c1f3fae7ff9648116b002666a02b899916912d6b989aae93e8c80237711982651d81e84870304349034dd5e221d7a7d2fefa23 SHA512 ad732f316f45f146f7c1baf44bc7f3a167f1cd80a5494ec19b87400c839e7a326e396424cb72b2b6cb9236cf3d7b32a94a19705dd32ee097ac092d72efc4df5e
-DIST github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.0.1.zip 6967 BLAKE2B 2ee0f44fcd16e333f13bbec65f86bb9c6c896d43dd138773b062f3526d3d539d0668ff3b8d9caed47ffebbbf084aebb0c96b2a2aa0885214e71420a0a57cd589 SHA512 7f8cfc5c51311f851204d97c921c49faae77d88c7eb6e3772945c1c9f6358c065fc5ac9401ac2a8172bec67d2e10303d0e2eaa541b57b5c5a12744e8ec88e6a7
 DIST github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.1.0.mod 41 BLAKE2B 7b2d1f7187a6d1d4335dab2107c1f3fae7ff9648116b002666a02b899916912d6b989aae93e8c80237711982651d81e84870304349034dd5e221d7a7d2fefa23 SHA512 ad732f316f45f146f7c1baf44bc7f3a167f1cd80a5494ec19b87400c839e7a326e396424cb72b2b6cb9236cf3d7b32a94a19705dd32ee097ac092d72efc4df5e
 DIST github.com%2Fapparentlymart%2Fgo-cidr%2F@v%2Fv1.1.0.zip 7362 BLAKE2B 03ed1ec81ac43f7ec2eb22c937da19b5b98586018cf594fe948c7c283b55051e148bfc286fb476fc64895389c847efd8dad11a8e195ffb71ae1396deaa7bf140 SHA512 d56c78a56be618578e96f02fa31965e7b79e9d5d5a414eeaa18495881bb535967d0cef81cf6568598f394046c27218dccfbbfd2c080a43ef3eba96ee590dbc6d
 DIST github.com%2Fapparentlymart%2Fgo-dump%2F@v%2Fv0.0.0-20180507223929-23540a00eaa3.mod 41 BLAKE2B 92a4fb1da6a0a6a82e47382500de2198757bde5f430888faa91ea3723b0eef0f1fbfd3149b9c957fc0aa251e151e07d86bc412a22533384de0a9deeefb26511f SHA512 33bc2c426426b2fe25911154c63fffb0542943dae982c7e1fc0b054314969b94a470d9e75b5afee5273f7355a3d5400cb6a4c50c48d2b254fa5f3238ed32c18f
@@ -135,10 +99,6 @@ DIST github.com%2Fapparentlymart%2Fgo-textseg%2Fv12%2F@v%2Fv12.0.0.mod 57 BLAKE2
 DIST github.com%2Fapparentlymart%2Fgo-textseg%2Fv12%2F@v%2Fv12.0.0.zip 128469 BLAKE2B 360332f3ce1b23b65085e266cd7fd50ac8675fb18d8ad56368b68de7c8864f75a99aa7a95ae70d36bbd1d7380eed7d04b7f3b197db4fea213a0e5a510c465d2c SHA512 707b79ef4fceca4916f38bdaedf330c20db46452fb1c6d3369da3cc0a73d8bb4ca8eac75ea53b365e7a08d7f492345ba4169ee57588e4b85802d752835f2d565
 DIST github.com%2Fapparentlymart%2Fgo-userdirs%2F@v%2Fv0.0.0-20200915174352-b0c018a67c13.mod 153 BLAKE2B d12d3a3173a6534a84d2921cc4e27e0593e527f778fd03e70356ae37350c9af7e678f396652024463a4d49a4101c0ec28ef8f84c04bbe59b13a64e27453bbb6e SHA512 0f619e2e44fa4be820a049e365017ee91c8ad3267a350eb23509ff5aefb44cbf577a2952e230ca9b92e8411fbcdad0024051464bf6643a81ffbc9a164e666020
 DIST github.com%2Fapparentlymart%2Fgo-userdirs%2F@v%2Fv0.0.0-20200915174352-b0c018a67c13.zip 26060 BLAKE2B 86ee7f3b09bd9d6ab1bce34864c49d92dd6100c640110e660a9cb82030c8e7a3bb565587ca52809b0806baaaf420ff6e92e848f021105d53e17ac461ae0da0ca SHA512 cca58b434e05c30da17f09f94350187c2dba9ccc1d842558197810fae76c126d0b2dc19519249f711cf7bc516fde3874a2db68a724c255589ff5f1446ad95aef
-DIST github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv0.0.2-0.20180815153302-64b99f7cb171.mod 191 BLAKE2B d7b3a69969e42ffa19ebf7c9733bf856cdcad526cc08ac3a223394aed93325faf0a05321c2afaf69d4616c5440bc495c7afa31a4a0a261a8e481ee0a46cc1443 SHA512 6a11bdebf0de4bf63674dd98e3d0ec06ff15704bd5114b48cb1689b8672662a55922275714288d30c2fcbf82638c971ae6f54ab9efeb07e5d4c346aa7c00f89c
-DIST github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv0.0.2-0.20180815153302-64b99f7cb171.zip 50430 BLAKE2B 16bd26350a8d4cc27c671d24f4b735b9a902d91e6b486f8d91c982a901b6c1fb12cf754f11e448a858c7557ee9d508773290050e61bd5183000ff8381e3fe18c SHA512 70af625414965f96a036d806683e5ec3649540fec8122b71328fec4c6bcade4d321740985b254f21c8542a457b02a23b9f415d0e24a60bab574cf2dd66e8bdad
-DIST github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv1.0.0.mod 200 BLAKE2B 2b244b819ae5d198be2bce3a1bee79f97a8c90855652e236f3ae2e6f46293e6bac6899694f042e358b97288e80dbac889ddba4f393f654018057056ff32d20dc SHA512 12d04873a179e33143fe3a62644794c0172ecf32cf8edaa51ed610777d340eba89ac3163e5f3b771e580ffcbfcdb2a3cce843ab68ee05365c36c10c34840071d
-DIST github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv1.0.0.zip 48266 BLAKE2B b0de178dde7fc9d233d4192eee49fac5f71a11bd91c7083eb6a51c700ad7b2dca4312446539c1ab054873be91603d0b4faff343e7a7e4b8a9ba8aa37fe1ebf7f SHA512 b8f5b8f0e537c95c7b3fa2b24e91d52c1e23f72ec6371c553dbe60fbd218aabad0b3107d60ac59af40c20e28983fbd6a3e97861a052f24fc8e8bfdca29bbeb93
 DIST github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv1.0.1.mod 200 BLAKE2B 2b244b819ae5d198be2bce3a1bee79f97a8c90855652e236f3ae2e6f46293e6bac6899694f042e358b97288e80dbac889ddba4f393f654018057056ff32d20dc SHA512 12d04873a179e33143fe3a62644794c0172ecf32cf8edaa51ed610777d340eba89ac3163e5f3b771e580ffcbfcdb2a3cce843ab68ee05365c36c10c34840071d
 DIST github.com%2Fapparentlymart%2Fgo-versions%2F@v%2Fv1.0.1.zip 48345 BLAKE2B 40e82c1b1b0a4064f696ddc2b26d25d91e0abc23e52eaec740a0d9eefe3fa356290797138212723dc0bf55bf8f7e897348e3828a9be384cb61b7e8086adaa372 SHA512 97fa88562033018c734d6ced5507ca188ef944cbf1f9955210edd4d161d0dfef1e3b13928675bcec18c4ca7a9722bf06883f8940e57d4fc14f93c81f13a853d0
 DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20190214190532-5111143e8da2.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
@@ -149,12 +109,10 @@ DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip 7144 BLAKE2B d223f96d7bdb87d77573fde857a61d518336b60ab04e2a3cafbbfde23ecd65511553d9bd6360b1a9c17b394f77c7cd37e3c74df827a65b0e79580e1695723652 SHA512 c3d4056c34241f73d9f79801ea6a6d03697f2a6f151ceb5239458cf50c715dab693ccc0b5593f51cde8e2fff5f4959c72ab4e95197be3f65cae8185b6cbda06d
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.15.78.mod 114 BLAKE2B 174391b10d1b269f1bfc2995955c7a1bd05a961dc18954b3a44e35fd9c1b13514f775795f276e89f8899e3a91f38057ee1246f7d8822d2a677c1a6d3f8ee9912 SHA512 e206e387409636216342dabd4dd0acd21785440c3c0b245cf8894b0a367d7f1c9c2b113e99e668fb11545944ed024743242b9e7e5bda0a0860351f5898272fd4
-DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.3.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
-DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.3.zip 13141499 BLAKE2B ed68fc1e907a3b643174859d734b29b088ab009a527bdd0ebbece7e103dcff2e20f16983e000a3da3a020f76efa5e53ba7cdca9743626fd924933ebbdb94a963 SHA512 515e55c064659c1a9d06ef854b929c56ad7f6b822f932b41bb80b7a098760d1418964a2d77a5437f6d0e95f21639fcbea450fdf9cd7382cfb842857bd4d84b48
-DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.12.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e
-DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.12.zip 16027457 BLAKE2B 17fac96604cff1de4f63eaca53107a6eed97ed8bd1387983295590603c7784b473f4b9388662cea1f614663ef4f8bfb2a4f72654070e04bf6f18b88410f762a6 SHA512 bbcfed9c7fc835b7bd2228f0594b9d82d8e0a5299fdc0b4a3a2a53ee2014fb78ff03ef529a128c25ce9ec14fa1d349ae2c9808d0d1700865eed12eae13db6e64
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.9.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.31.9.zip 16363510 BLAKE2B 93d4e2f2f3a5007796ea867d33bd38c4504bed8fe48ba4add7f9abc353257d48ddfc6d55ab0a76e0adf55e81c62c645b57b0ce6b6a1869ad1d913f9729c10683 SHA512 e763c69d49755e88ecbff815788fdb67900070f5feb154907c33615978ab418bf2428d4e26794a128a1d39364da3ae3f9abdc7f30978419e611c1cae70e95684
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.0.mod 178 BLAKE2B 1aa7ac654a0577f654dd63b5950fe13b02c6b0cce274f43cef0c850b44e507fe37a78286cb3326a5eb1c6ce15e969381dee14ff2a474f7a183cc40e56d81efa3 SHA512 376db876c55dce630bbe0b3bc3898bbcca0169965e8d12a76a1018da34301e1654159957142b4e6f103c0d9e1713e9e158fcf598e5c87131a3904e4452f12a7b
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.37.0.zip 19798490 BLAKE2B 15703a40a370f5cf6f3a802f2f391edfe5512e2aa3043345bf5a55d1853f53f8d5132920be1e9c0d67828a0a461472734c3cd914461500da1e6523127cdf14f0 SHA512 4620bd5427dbf0deca4e0851ce036d301048d157e49f04057aca48c53cec4943e5a387a810d9e6a6b96b57e44aebb9fa93f328ea960cf4c32da036b0ee7d5e5d
 DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod 45 BLAKE2B 224d034afb0473cdf6f065978a0b8cbaea268a46e3dc6b1b8ea89bed2d013ff52bd32408bb6d768097d3ddb20f95e35953b9b679439309ff832b2481d4e35401 SHA512 b398c531571bc397b2d97f369731fb7bbe8e07328f95043dec62c9be4a9f09562a0ef0faebeb05f1bafd488a77c30e6e957189d54548ddb94b9dc115b85dff53
 DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.zip 7657 BLAKE2B 068727abe4a8d862a04d3d269d431af59cf048d596dfa951112c40e249b623278eaa74aab6a0afeab45bb62d77ce7fa3c5f341d3236c4ebe1c7c92fe48984b31 SHA512 c147af6f868c87dc6b1b311f5c78496dc8cc65e2cc3c3984651751f58a1762941d555f74936554a0beab1bb8530f7c6e8c249d83548a348fe83918644b89303c
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
@@ -163,8 +121,6 @@ DIST github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.m
 DIST github.com%2Fbgentry%2Fgo-netrc%2F@v%2Fv0.0.0-20140422174119-9fd32a8b3d3d.zip 10363 BLAKE2B 00106cd55d9f8b6bd6799713be177e95cdc6e549d06a5bc954048d822d246e41ec77c2f87b46a571329356af24ad3af25f8c12ac612e43c0a7f8e7172cad3cb5 SHA512 9ff25645bf0a60fd37839b98171adba445869762b73c1582f939fb924bf8007d02777a95b152e0d706d3a53b3c55e672e369ea0cd0c938d22fbf0dc1c6aac610
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip 9262 BLAKE2B 50feca006319c5a8d957976be1c02a0a6a7247441fa0e903b1a03de85859f2afd0c93cf8599f60974686f47bdb7f0c94e58c6ec01ffa3fc33cf5d04da3bfd08d SHA512 0e52838ad73009c795d6a43d7d52d082b0ec134e0f07015fa51caab7d1dd141b19df7807a7ab146312848567f8635966c6ce7ac22b934a630e0131383caef9cf
-DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
-DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip 19948 BLAKE2B 3f604e82647eb2a4a4c309622080fd07701d032a430999f13da727cc01d455cd3d0e31a7079e0bd833fd17d84a228f9e3f588719c4491ba83e50aa442080acf3 SHA512 e1c0c9251b0c7f05bcfad6f73cab4215cbd550d98065ccf8553dc04a56d7f6153ee70a477230a0e7cd8adc3707c8bfba279676902300537eb056fd912d75b51c
 DIST github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.mod 46 BLAKE2B 314694b2f3ebfb6ce520a9107468ec388a94c5a667ffc679c3864666232a98435a92b468372695359fd4bc05860ddbc98e1a837bf43fa5e5ce6eaf88da0a8c37 SHA512 194965a0934a42f643a21c9a54a538e63c448314dffe7094b632efeb035a554124e7488645e6277362edcb0ccccab83bf1c57ddd8fa23d23aa1320b5e5e92b64
 DIST github.com%2Fbmatcuk%2Fdoublestar%2F@v%2Fv1.1.5.zip 10210 BLAKE2B 8bc8ef109441a34d2771fb28bee2158cb3ec241a3b4f08b225a919e2a569f1c614897024a5347f99ee46c2220e2da4b946eec53eda917b06a71b41c90e3e9722 SHA512 c767f7bcf1c937005f4dd019bb02f770d803a3b8baa0748d8720db9fe2c29d114d075f91761237916df74eed15751e90ac1c1bacabadfa55b4411b87ad5c8dd6
 DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f
@@ -198,8 +154,6 @@ DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B a
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod 35 BLAKE2B 4e9e86f0f7f18e47c80b9f4a0abff3f07d47814a9c54b297a2419265fd91b16c2780e170ded80589dac290cc3262aad162911b789510703d973f3f891d5e0849 SHA512 6a786a38aae43d8a7532621bac8c4c053624f39573a37bd66fef9048a7eff36ea55778ac8a4bf3d18cc1e6faf352dc2365e6f819053359df9ac98129e16f422f
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip 9787 BLAKE2B bf52b08f028e5117fe9cf9554ffcfbddec214b1dc972e8be2511b5571fa15cd433b3528ddf9c8805b3a71455a94f859d3aa90348e4648300121be269d2ad5f84 SHA512 83a35ee1aaa0aa34e86db32471f18c2ecee57c8962eacd44ce492a29cd9f630318411535d3474ad10c5ec5a5634caf619eae8a06e911c37c6e8fc8d022aebe3e
-DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180920040454-5637cf3d8a31.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
-DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180920040454-5637cf3d8a31.zip 25454 BLAKE2B 9faa435a37b9da461243d1040e45036135259b9f19e7ddb15f4909dd19c2e3e81be14d6aab13413025c68f10624f1d1fb5967f0d6932c69069a492e1afd4d7cd SHA512 8712f5d38a03a64f1cec212e010ca689ed63f6f9344e9a8323aeb3e26f0b414473236176094f90b27f46b37ca29c849b93786927293112d477fd6ee4ca2a04b9
 DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod 36 BLAKE2B d46b14a3eed14f8d5886e333deada157d9484ad3bab124d3d57d9fd6a39242c2272417df8bb31e08361f2be8b11dda9e96600aa800879f393c8753330eac4e68 SHA512 7ffd6ce59d5c5fffc6ee8e8f48e1e7114628ee2631abbb1a3591b794c23b2ce6dab10f67b8b76bf82c73e1cd8614313b2bb1152b829a8875425f1a603ee394d4
 DIST github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.mod 35 BLAKE2B 18effbab22ec81323de6616d2177fac8d3d81a02de8fe8cdc427a969e6ca54d5c6c84898598fb0970ac12c4577ad10db1b04715fcaaaa1515ca291b7fc4f289f SHA512 f49d53dcb97d48267dbb282392bfb57a39ca600e4e61bd0483e27573dbe80e60334e3b023a6db6d86d86681a88ea25061d6724d656b1fe8ff5d02bb3edbcff85
 DIST github.com%2Fdylanmei%2Fiso8601%2F@v%2Fv0.1.0.zip 3006 BLAKE2B 78b6c92a698fe1bc7d870b5219da44e4249b9ec12a31eaf9b438c0a1f421f273cb1b11a40dba55022c90af217c4afed112e5991655b14b2a04991764c117c65f SHA512 5f7eaa50e67ef3ccb02ca7d21eb2660395d08f2c86cb2c45bac07a3fb38d7bb783688c4ed7202ee86312b4efd488defdee2893b80a78bfd1046306c4b787614b
@@ -240,15 +194,11 @@ DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.mod 29 BLAKE2B 5311a22
 DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.3.0+incompatible.zip 37788 BLAKE2B c23c30419fd55a14451ffcd5b95ac35ff704ad6d1d0d4b3d344c9e3e0afe3adcc619ee2d99630dd9343229a890d8331183806eaf0e012b8597d7a5d285ec3b57 SHA512 2d8bb8c9051997cf18289857515a09c6a5b2475bdb6a54206bfd1cb213d1e3516d50f3fc8879d69174dc5f91b0b81d23e834095684b39d4d850c0aef5321e3fd
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv0.0.0-20171007142547-342cbe0a0415.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
-DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.zip 2638262 BLAKE2B 36e2ee7f35b229e77d6574d45712f6bee214e604cf1be37e0217e5d1eeb68863f8c0e3269bbc17487ee49105bd18d202615ba7f93fb40eee5eed42aad53ca770 SHA512 24c8b22b1cb07fe19e1648894ca9439afd87bab73aa627dd319330aeb5e83eae5a8c4b155f1325dde3b31bf040da6a162b9845c1a11b375aa0b969bde845f055
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.mod 139 BLAKE2B 0c793b0070acfae7ad92de8d8e177d6b9a2519d521bb397da4dc2610927374e4c010db6a4454783556edaabf64e585b00112aea05820874c49f9bb4c4f049fb4 SHA512 232bef55468d9ff66ef7f446d8096a44a0a947533c8665f0f018300b7ec1804a634299a1a6ab64deaa67f1475e9ef68e7be233dc72fb2d9173559800f01af142
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.2-0.20190723190241-65acae22fc9d.zip 2737734 BLAKE2B 6d5345f7334008fd717d25d3a3d8f18b77408de943a1deb60ec3fc488ead17a2d41fb2f91ee174195b87f01446fcb61106fa2798acbfd2c477863e7a1740a71f SHA512 b86f02e94eccf0d66190b6ce8025774e2c9d181d4308a4725c2dcd3e7234e71965250826c6ef604665922a2986c3c7e54309b22004fddafe8ebbabe33baafbe1
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
-DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20180513044358-24b0969c4cb7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
-DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20180513044358-24b0969c4cb7.zip 39653 BLAKE2B 9b547d2792e07aa81123297fa72df889d1c4e695dd6376e0930b242361c5cda59d32702481e40b29148fd47df25679a8a1a75f3aa66c75aec6be416a5b5e1749 SHA512 1627f509fd7d9a18a913af9787d043d66dd10e1fc51cad4f9e08306cfbeb8f0d7df023d20f46c31b424ce79e337788df10c37285659db6f1be118a27b6083303
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
@@ -267,7 +217,6 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.1.0.mod 34 BLAKE2B a4239cba934b6e8
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 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%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.zip 458318 BLAKE2B 04daa21a72a6b8662d746828ccea97421d645e109afb6a6f48f1f56b614a8c014d2ba764b80f9601f3928b3573339936b9b522ba02ad7bcfb7c8f8323c3fc102 SHA512 dcdae1a76ed6795a7e223d3b1aae5ba2a1c2bc058d07dacca08673e484e1e18825aaa301dfe03fb8d8ce4eba253d61e1236058761eb1335ac45fefb2409417b8
@@ -280,15 +229,12 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c87
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip 206762 BLAKE2B 13c74350dfc3bf39540c37f6b7771f18930d6bfd6a5c83c27c723065da6458e0de544a6fa4d57c027e6c67eb528493c620228a56249b889f00d67a064218dbb0 SHA512 3d92469995664037149e3e11363db685b3175fff01f4ef3b578ada273853a16131b3c97899b497ab75ffbeb6191fe59a28f073779828f719681b8e15182b6211
-DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
-DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.zip 70555 BLAKE2B d83b37593eea44bbd11100af9c0c41bc2b55e14d06ef1fae1dce5242bf8cea1574c97a7148e7878385fd4bafbb433aa26fb4fcaa47e766353b2b6c179ddda124 SHA512 3ecebc76ab8e8f3cb65a95065639f3e90b5d722ba1aa564b42104e83ea4bd67af65e52c73a33b9b327b9934553f2c5b7324be8229f2c2e95c495065360a37c54
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20160524151835-7d79101e329e.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.zip 17644 BLAKE2B 2ab156c678ef5120adab042c415b287bfa6ebf901181837122bbf83867ff312900a16a24c0f375708f915628ae5bac93b42f659663cf827b81e5e6c4c6e47769 SHA512 b54c7f94aef24c769a0478aea5dedbf67309dc3f59a5d7cf52ea8b49e81783d87bf80e5bcfa36f1f95a65e64bdd8312d20ebf81cd73952af5481b2f1f3619eb9
 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%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
@@ -324,13 +270,9 @@ DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.zip 16077 BLAKE2B f05e4
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod 37 BLAKE2B 80edfcae1f7fa1ded69a583baaca5b236f4f9539d6e63b3b59557a8407bedd0bc3cab897d50292cb7d2a75bb52b67435f4bdda71e9cc55d901cbe574f16f3cb7 SHA512 c69dc49bd88fca7c67f4b866008d9f253387c1806c55fe82bbca0c99136b58020058e0681659e74b8f96e53d74d39d5ccbf11eec6291a0e0eac1998ba39f4d50
 DIST github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.zip 411726 BLAKE2B 6ee260803ad6b9edfa2cae99d831be8ca468f58463aead297358e3f6857b97503de8253b61e1fb9c0489526fa9937d6dbe57a50cebc31296d219ba7b834574d8 SHA512 413d7e0ef65ea9a6315a393a72caad1288b4b9a78f545d1bf930622404540af6550e0f3fa405ded6902099a271475d8196de7d5dbcfbb66e89c5fa1f7b2b41da
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190126172459-c818fa66e4c8.mod 42 BLAKE2B d45f19486e49c3288bd7f55b18dd296a05c8264b6eb2880269e778dad0b13bf178803311ec2accce3e1bbdf14ebe07be28d72de8647db82c81f062111962359b SHA512 355b395b1a48d208a8de8ee47662146556565d6a8b1753c45528617b77d0cb4ee06e8af500292666516e305e68e7aec31172c2ec271208ea9d5c759faf56284a
-DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190208042652-bc37892e1968.mod 42 BLAKE2B d45f19486e49c3288bd7f55b18dd296a05c8264b6eb2880269e778dad0b13bf178803311ec2accce3e1bbdf14ebe07be28d72de8647db82c81f062111962359b SHA512 355b395b1a48d208a8de8ee47662146556565d6a8b1753c45528617b77d0cb4ee06e8af500292666516e305e68e7aec31172c2ec271208ea9d5c759faf56284a
-DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20190208042652-bc37892e1968.zip 1669798 BLAKE2B bfaef686346be22d778c28dfe59f41ea1021f62ab0fe7e46bbe01034b4bf36ab600b3242f2d81c448200f1110073ad7f7c4f2fde3c4a9ca8425ec522b64c4a80 SHA512 46f02a38ea6aa94fc8df0f1c8e5e04cb25fdb0808ec197d975149a8dcee4250ca26b5438004a7b1d85297d78d76629c33cb1a21d6d585224e9352ebd87f0daff
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.10.1-0.20200424014253-c3bfe50899e5.mod 572 BLAKE2B 7d42f91a8230c31654878829577a0160bc3fc3f954d4ff246220b7ad8ea18f564a9d11a94fbd2a7c3f9663da5c5da4ef058f69e4e3778e42bb829ccc9ec9275b SHA512 b364b013c82f9f20de89cf5fdec98c666bd2301b064abfaf51f92d229d83838c249fb81687dfc0cfe636405a260283b85aa80fdf6f6224d7883d235225299695
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.10.1-0.20200424014253-c3bfe50899e5.zip 2025041 BLAKE2B 8d34799bed7b742576cf0f226ff365e97e23c3cf0a717e78c1b6781c17568fa1584b80f07c0465552ebadf3391f8bf5b8540e26b01b2938496d734e0a7448d92 SHA512 8c86cc76db18f9e45955238c6f4dfa48c30200e3297a218614dc84cae83a84f4f4565496f94853aef55bfe14281bca8bbfa233071d177b6d35114a271791ebb4
 DIST github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.6.1-0.20191122030953-d8ac278c1c9d.mod 136 BLAKE2B 30918ff7a9fe07deb706dae946872ae188d15a1c30096e7b907a4c57ccbbe6624dabecb2f26444e7fb84a1e428bf104d299ff2f8805b88b6124deec7ac786a19 SHA512 4e76c8f5be6ca281057dd42021db748d9fc38ed5886a4959c0212677210b172e3e50b180c0bf2f3800f8240f5115b5c7d37f669f36f5e12f9907073ffd6ea8ae
-DIST github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20190128072930-fbb6ab446f01.mod 36 BLAKE2B 565fd7830e103217512df5132ddd118ee71efb8bb9efe75c30cbb64cf2334586be260ab5c53000d0b554edc78c04e178f21a3783a9ac7800b6df575309d44238 SHA512 62d129cb7d3e56784afc55455ede7fc27a47309646966f31186796b1cc651f7f8f0eeffe64f7109448e9aae2adfc9943bb1f40bf18e3b615a9ecda458b2688b5
-DIST github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20190128072930-fbb6ab446f01.zip 80095 BLAKE2B a7a6e20d2eca38f4990a5efd06a428c0e8d3257ff44730c391563a4baabaa6a29e0482e3f51410f9582763c5689e79aa2bf8cb404904181453e4489aa7ddb725 SHA512 565b97d95f359379c1c04aa67060478e99cd912edd8f368054e60d3fc1ba2786380ab622e379b0e2df670cfb258b97d037ee7c536c30af018aa6f28a92f918f3
 DIST github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20200423144003-7c72efc7435d.mod 233 BLAKE2B b3089e71c2fd5e1b9699f7fac1aadf25a41b1050be2ea588da7c44e54b06960f8b40966e8a9954a451d0dad46eb060877483ad68245bf2df5f5bd63d7d0b02d2 SHA512 f885bb6d2e316d43653899fc2c729ac0ec10570a29705f9ceb15aca8fccaae321f3abfef5b3a9d3195f2c0d2c39d7f2d7d9572eb0161d00bc4bb7face4d0e9f3
 DIST github.com%2Fgophercloud%2Futils%2F@v%2Fv0.0.0-20200423144003-7c72efc7435d.zip 140573 BLAKE2B d83e9e4d33e001154553680f53021b02beceff30d8ab7eecfbac78eb3f8fc05b52a3a49a1e26fca059ec273bad551db1eafed915f0937d53cf033277241886f0 SHA512 0ffa5cd9bc91aeb97e429d1be7f49ff54318b704cdfb7b22ec207d1c1b79ec4b5337af887cc7396aceac61cd4807e6aaed9649388401147ec4684fe9a4cfd40c
 DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
@@ -344,31 +286,22 @@ DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE
 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.8.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.zip 421304 BLAKE2B 4c4754375d5603517ed3c272832b5f15958c17806266bed6582d9996d952e7870cd17b547faa6ca9a1e34c98885641c39554816d24f4ed0edf106c518b16fa52 SHA512 c1e49a03098892179f8fa98aa5873085aa3268e782501e83cef88fa909a05336c61dba5fd7094d49f03fd163169028af661699f63ccd6836a67762d7453da77b
-DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.4.0.mod 337 BLAKE2B 91f4d390615c5b479ef339c74bc9c9a460031103eba8af9e570029068cb1f6dd51d3369290bf31e472bfd426cebb29a193fa7830398660a60b83fda3dace5791 SHA512 8c72241f9497d69f4af2ba25f0a9870888cc877a3c287a7a28e891a5ece956afda06d4792dcba852a87d40910b392c0ada9a9961b55498869d4989aa326bc13f
-DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.4.0.zip 27150 BLAKE2B 0e73c40928d73128501176720c08b4964f124189cdd4d9947b409094ada3f9fe356d1fef86bad5fefc275971a487392f22279c59a78fe3939dd684eb56eea2ac SHA512 552c8e942208b9757b6ee2aaf32d1e52c178afd48e3fdac65bbbc436e9f45ed72ba3b2e5d87d0853788b48b6169e679c514015a5bee009c8d1ec2a9d445d3c7a
 DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.6.0.mod 226 BLAKE2B f7f023e293b358c278ecca07bb202f1bd82d11cd79e3549b1a9cbcf2028271ce2f40fff8c8b59cf4a5b2c0af4f92f08a07e71e1251fe9b4ffcf7b29538f97b9a SHA512 28a25ca24c618a16d228634c3330de7aa8a90b3199c56e4bd6bd27e67ca29e4a62ccdf4282fbfee6a4d7a6dbe84d43ad778d5cd883505472920cf939a0719dc7
 DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.6.0.zip 40186 BLAKE2B c9cdd3ecaf2f5ce3301c3275b30425d4448f15a5da4a1ccd3d5c04795e25fbc580791c790b32acdb9bc3aad17dcefee88e59fe8e7cb49705648a8473f9aa780a SHA512 3ea5c6e9705cc3c1241d8caaf15b140d1674a1ccd29781cce0e6502703ebeb09603b9f5552b115729a1a924e7d32c6d662ca460aac32344216b2092454ffa755
 DIST github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.mod 35 BLAKE2B abe58b21d1d4bfd808722eedf7c5539a14f98cf479cca98e38905373a84b0d230168d22f6cade1576e145585289a01a69597d1158a893db6b8393a203d4b295a SHA512 30a341d9047bc35fa2911b119514c68e9a29ac0b57ab84e820b5a52f968fa7968d662777dbdabf06f96f0a4398339ab4d25c714ab7addb833e5c4d6e938a9fb9
 DIST github.com%2Fhashicorp%2Fconsul%2F@v%2Fv0.0.0-20171026175957-610f3c86a089.zip 4331704 BLAKE2B 28dfc37ee0383d7cbaa5145641a36d63f1700d33c0a7dbe6172547302f6df0f79f5eaa8c5d4dc2838665ddc80594266c965966330cb7a501d53a0dfc6ed875e6 SHA512 78519356b3201b506c561b94946fcdeddfa2aba82fee86d860c3ea151b8aed954ead7e0aec13a0c94e24e13874afb87da7895e1def2153bdf09a8582a377135b
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d
-DIST github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.10.0.mod 582 BLAKE2B 2d8283278ff4de7a94eea01e4b2e96c49e2eb0452361a93468c2a511607265dd7a8eb3d698eecb2896fac654102be12b43d2ef12245eaedef92a8ab4c376611e SHA512 0f54eccc2a8e9eafaeeeabd51e0427b31cc7eb828846835affae7149814b86a5b6b4836710e75053baba390c74911286c95bd41c89c7bbf8606b3abc28b94853
-DIST github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.10.0.zip 43063 BLAKE2B 4011cc0a3eda61f79bf15e5da9d81b45025e6d6519cc50090687838c76d2c17b8be39fda54b248e061b8bf00d3d3973c8ce32d897606b50b88c98369e8c02438 SHA512 7a5016d906562436a1a8367bdaaa41f624f412dfd5b8839aaef81c202045dd2994b8894a6e5eb28d52f50f2f07526d1b8e50482eca5b548a2097986f51067182
 DIST github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.12.0.mod 553 BLAKE2B c1a8390795781f0a63816e585b23cc0415a743c1c3d9dfac12f67af0ec69af8badad5b18b160f946ee4d1e953efb9615f37ded3a8766caa494ad86c8718b859a SHA512 f445fb3a803afc82325747ebba8c8888c0e4bdc5450aa5da4a1a7f82e9e1627ec8ff8e46347290e37b9097e59da92e6f97bc6e7019e5adc11402fbeb61c22379
 DIST github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.12.0.zip 39617 BLAKE2B 36aeecd83d07d9f2b5384ff840996344f85c43d98c8eeeaf0dce8d4d843c633065ce6a1c2cbefe03d80d8b2ff2fcd914c6795f1f338504598c59ae4c7714c7ec SHA512 6a8938abae8552f0a4cd7e6408efc93ed42566122514c021450365543bd9e4ff523f5dd8e875a620b8e9af23b7801f0c4836535dd4ee948606af23cc7dba1938
 DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod 134 BLAKE2B 484477f336780669d2467c673d49aba38a44868ae2e3535282c19631fc7767c36bf3bb46d3ce27aa8173e1167e7d56a206303f73b671b49e999839832b14ae17 SHA512 32745c37e703a050b2d475ba122956a1278450a852f1b101e5900f62f0d0fc2e499f2e156b3640e76b2c4c368e3eacb8bf215b4ece5c55b7f8db3fa941309bda
 DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip 15916 BLAKE2B f206df5f4f898d04fccc38e95a4d2d05cde33762f1585aa673b60fb7f4b7c1d5b9d103ac7b07ddf9aa34e3a79c90a51c6434a1a9542341f050f0422135786340 SHA512 25e6d14319a8b26bba1fae08123aea772246aabe9c7bc0bd401226bfbfff6662c28c694231d8ed9b7c0a1d41b7b6d50a889f09dfd58f09121bbc8715b2838f9d
 DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
-DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.zip 9548 BLAKE2B 42b7838560a999f9e5993ddb0d2c56df785334d7a53a66a1165acfcdad1d61c74711f70963bcc606e8dc20635cef940e1f0f921310bd25731923be21d79d1490 SHA512 ab85daa699ca551b48699cb4e41e449f9ce46bc8921c7aa149b6148499e0b369d60df79de1568119c20cfbed7b2febd7ce2df3800f73315da3357b2a373d7cf4
 DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
 DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip 9560 BLAKE2B 2c8039854037c0f11590c80605cd30bce58baed3e8ba11840e98e8b450d0b2303704d1a55252589529021af473fe1f47f7bf6a3edab5ecab4de4888088843b2a SHA512 d439e95bfd858cf71659e8ce905748749e9e15cf577b98b66d7d8dd6adbff8262219d0c26bbbe9a24021ed5d683d7b81dc560eec4a97f09a1b44fb8983a4177b
-DIST github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.4.2-0.20200106182914-9813cbd4eb02.mod 867 BLAKE2B d0efbc99d605ba60f89c4a2eb7cdf943b8f4da5f0d8e09e45f8e58ea0f492e47308c7e17ac090291ab673f5f32c1f281527d370da55571ea06bf1cb17b6c87c7 SHA512 23b1e033f75e68d59e43f0b1f0f0692f0ad15c7ba8d25326f2805eaf4af5e2a841550007dffba81cfcd8f1a9754fb08b5fec407384b7adb06d62f1321340f555
-DIST github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.4.2-0.20200106182914-9813cbd4eb02.zip 143778 BLAKE2B be83f65434a7762b7130492a944b7f7153fe2f5af00ec6fcc3768ae29c4a1aae2a15233a756f4e100847399f45fce4d576a24203cfdcc9904fe4b7814acd22d8 SHA512 f396883fb7fc2e9d10e3ae2d9043b2613350f4ca41f027ab8745ec0fe40e828dcd4443427ab7d5390ce470a12c4b07a867ca58599635df0acbeacfc02f4db816
 DIST github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.5.1.mod 876 BLAKE2B 9333834c2bd04db3ed14958c7ba57c6b7677dd5ae549041e99046b8d47b4044a7730424e3eca52212aee31eae7f950a931205e62ebdb9e97f8507d4a12ffa8d1 SHA512 19731929735f8a98e9ca14c01ac3ff6de333e72c803781c15cef4eefc44524401ca3018a9a7352d14659a4631d6d0b281e71331a2b235779df966bd2ffe11a07
 DIST github.com%2Fhashicorp%2Fgo-getter%2F@v%2Fv1.5.1.zip 139421 BLAKE2B c15d3b30eefb47335c281b33494ba5a90170379f816781ca3fadefae4457e9e67ee88aed59c40e1f744e5a273efd23074d87ad26f73170576b17a136ae2ec3fd SHA512 f39d97157897988159c6a053e3d29709e8be8d7e02374741f11b4517f15f0344e48aa08034217ef15135d6fbacfe49302dccbdc569a0ff0b86806cbeffc7ec09
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod 37 BLAKE2B 3e6a6550c5fd7b237c484b2d7ff9d4fdcf02eeef8be89f18169d50c0ca7c58849c362d363428893035a5720d094cceb407c8565ed680ff248c305cd4acf886b2 SHA512 f2a0acca0b74daa85f1b49e2a56bf2d58c17570379d80c696428e31c028ace8436bd734b032996b2e3a52396d90cfaf3c0a99fd414c10fe1d67727a0da962ac0
-DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20181001195459-61d530d6c27f.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
-DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20181001195459-61d530d6c27f.zip 17539 BLAKE2B b90c7a23da87d5082b8a1ec8371a6c19c8d34ecc729211c2d206101ac5b3a1b3e8750cb75e1085a213b3e4a461a8321958ac1378807ee23457467f22db14124e SHA512 512322f2fe5c67e7f4b331babbee61cfd9fffa13e14e2e17297ceb5292a5181d4b4091405b9419bc20d875de7885086877c5a6d4c36a5d0ae4ee999521ae4535
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
 DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.2.zip 35171 BLAKE2B d5f7278b148d56258773ef2b7add6efeaeb98ff9f551b3944e0e418f381a12f9ecefbd0988604d71e076da0d598eaeee123d30e93bdf30370ffac0a26bc33469 SHA512 b2a0b596bbd10fb8393459ddbeb2e4ac59b1ccc30226b158e81bfc9bdf686760d212afedf957ba11e8c4354c2ec3abe75bdc40dffc97d5dc70366c54f209a884
 DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv0.0.0-20180129170900-7f3cd4390caa.mod 47 BLAKE2B 3806ab2f6eb5f3ae860f62ae6c116a332e7c5a5f4ee3110e68317f0818ec6926130d794ea52882f1858ece1c5d8aeed690338ae8cae4a4ab1e4df7461602f140 SHA512 53e8bf4b7db2447d188559e227c18799b6e8581deecadd94d79fd825c830d9d49ca340a20750bdb61b88552d0e9911cb1fd911a933e8d977c6b9662418ba66c5
@@ -396,7 +329,6 @@ DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9
 DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
-DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip 15533 BLAKE2B 68044230c48b4076c3d87d9c46cd96d3b0f293683129f72c6612f0091aac8e7d722945ade6e689c4174baabe37a9f9cd78d722d9a61bc304034525e8605522d9 SHA512 b0d8eb07cb45a5d0e048956fad5c1c822e15d4b5544f59eb2ce925d8e9cc14a8de072f3f4a1792706b293b1d9a0530391f2243234dbeead9bdd77f229ebfba8c
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
 DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip 15917 BLAKE2B 66bf9607834472667be4da679727ff2b004e95dc52e4c69d1470586244387b3cb2afb792b8f7d858c4edb3f73151771eed8d7509c7da91ad31655a945ac4d326 SHA512 b1267266cdb9895cfc0707dcfbb3dbcc8e3a53adb297811ee70d20f6a77d080f5cb0c4b8438e68d933a7ebf701c0c3e3f9a1b881916fbdf5b4832d5ae790ebe8
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
@@ -405,26 +337,16 @@ DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 19548 BLAKE2B fe48c3d
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.mod 32 BLAKE2B 8b645c7230638dd2b30ad68a01a18237d6bbc0ae6d2fc671706a7785c9ff50eedbb3beb06e0ebd28b7053fd20ff648606a54226ba95fda6e9deafaf5cab367be SHA512 748afdd4b790c0fa1464b492b79164ef83ae56cdcde204d19adee8b24a755455921132a71af714d78f726cfd7621dc03f85b383d6f26adf9501457573dce26af
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20170504190234-a4b07c25de5f.zip 131062 BLAKE2B fa5e4a026abb6f9af086a0353a739fcb240e5dc74190cf46f2d2eb26af4641acf71ee26ae7f8577c1618f42c2ec97f62cfdc87a06b62320ba933d493f5bbea85 SHA512 103a752af9ef6fb2746c6aa7b405e3d69b23e072869eca1cfbfa0bbdcc61d4c4c157e4e5e09f89c40807994dd61618cfd00d414cb326e6aa7f44886bd0b47c9a
 DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.0.0.mod 819 BLAKE2B d92365f486528e4ee8abf0a03ec17a4177ee070de453b1bf02af7eb13a944fe85ba81976a5d61cb3e1fdb422e188ebbe62e5db6435eee56bb81ef8f5d5fafbb1 SHA512 f87d8a710287fc690267862806a9a2c320ad0ad6a3b1e80ce5c0c9f23a2cba416599fe855bd4e852384c885fa8dd92345311e652f19eb2c67984eafe3fba322a
-DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.3.0.mod 819 BLAKE2B b350f3a61b049f663433ca0e8c81d8286b0ee7ab1cae8bc427ca0fa5a58ec36320f865bae4664eeb5f97967faa42b966602c06f27d97b021f6594ee33b78c14b SHA512 43f38c0bd9aa60bef8b7befe6f13eb17727fb46ff97806c4914a107b69b183e55e381d055d4502b838d3819e335fe35c56e8b4356ae5187977611c5dbd3bee3a
-DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.3.0.zip 506189 BLAKE2B 2fe00f838565201360ff7d37aa6beb501ddd18b63a92b398b188e9c7893af43a2db34f634cc84426e57c7a97981cf015eb8f634e0c218a02287c23af6de49beb SHA512 9cf90e319d8e80005e207bb61f3fff34f0b3fa3534ade94f0b85731f9fe8f1f9bce5f2891d6fbece97f409ac09c13b1b8524785c42eacd0ed2482ccc0d6b9615
-DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.6.0.mod 833 BLAKE2B 63324b64f017b8f90b5ad3417c05fa31cb6789e39080e30cc4b00ad295b3ec506e9ce9fa6d2ba62b132d6adf55f5fa6969d7407fc45ab89333ac5fe9b6d790a5 SHA512 2d35aaf54e9e7b34a6713acd772e4a177052dadc906cba2d7af08aa4882d391216eee1e19748944e9e5c6b873c1325add9e062836ffee3ec1c872095a9a981bf
-DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.6.0.zip 519810 BLAKE2B 055eb01ebb4326c0be6529ca67863c99279604d0ece283415e4ce7f9c09e1496ca4a47e4d64727cfb08b57553a4fb9948e8c0f6c5b3a9c0b2761b630fb0fda58 SHA512 cda0a56da459e9532679f4b4b7b67af75dd7f8f77919c1965fa29f1305dab9d46cdca9d75401d920566b98b7cf49d1681b2121da58fad4f022e6d64c6e67f35a
 DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.8.2.mod 833 BLAKE2B 63324b64f017b8f90b5ad3417c05fa31cb6789e39080e30cc4b00ad295b3ec506e9ce9fa6d2ba62b132d6adf55f5fa6969d7407fc45ab89333ac5fe9b6d790a5 SHA512 2d35aaf54e9e7b34a6713acd772e4a177052dadc906cba2d7af08aa4882d391216eee1e19748944e9e5c6b873c1325add9e062836ffee3ec1c872095a9a981bf
 DIST github.com%2Fhashicorp%2Fhcl%2Fv2%2F@v%2Fv2.8.2.zip 528374 BLAKE2B 00c99374acdbc9840171ffb28cb82427274b8de662c4e7c154577137246739db55dad2bd513e116f09f3633cf5cfeeeaf7aee17bcbf01f0cec4b9dd87241b8ed SHA512 2e31f798000d99fa592875a3a2e87b1a12512821ba60913300006d94b7080bc6eb48ed7a4fae565ed447e7f939db97a2554b60fb8969835c539af65ec25a71cd
-DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20190212112733-ab17b08d6590.mod 128 BLAKE2B 1eb83fbb14a562b773bab2b3a7935d400cfc3921c643e9854c593bef8b55a82e19d88f0bdcf5fb814536a85d52a8ba53a55295631dbd5d6aac9d51a547d1b966 SHA512 107d9cdeca3151466c4b6833d8b39808ac5f3e05308ce9d78bb8afa18623bb91248ebd156f78343c4af95ddb91bbeab33515d7e414f5244753970b8b9948b498
-DIST github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20190212112733-ab17b08d6590.zip 75802 BLAKE2B b3fb61bbc3320c9e45ae5a13ab59dbea15b7c2ead09cdfadcd0d9f57e9cb086bd228b70d655055bf64ee2654bc5198722cf85ad0d39e6ef9a52cdb44661d8865 SHA512 d3ff93e46991144635d29fd6ac46b5922480d4f77b66e741dcf9939f977c1a5f6065303410bd5aaeb6e495cf741ebffca205a89d723e02e31f6d6b9a15f85845
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.mod 39 BLAKE2B c11742f4aa49d10e9a7acbaf0ace6c42549eae13b5107286dd45432b5f83c45d6b87ec8ce57730f232ea21ddf22bcf28a9f4cdfbfc46f9067df311c34dd44361 SHA512 4fd06e96314b6f8b94b8c73af586a934a6a6e9733111fb9253860ae8e65d190a71be0b902f2c0b3b35141499fda55de3e294c317ca1abc5286c4d6570b22a565
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.0.zip 90161 BLAKE2B 901155819b7ac4ac892bb581567e4b8ed014fcd6e4b48451ba4696d27ee39df668727415b887ba297d3194bc9a96df6980351c6f8348be7425bb48b348c5a249 SHA512 c84820d4f452ac15e16b8c9bb48bf2a481d94c5403b9a889e98213ba8be43b79f0afa166645b66625ac95beadc9a22710445f9425219b8b20c3f196ddd3db41d
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.0.0-20160124182025-e4ec8cc423bb.mod 33 BLAKE2B 2afbed06d8fdb0b51c45d20761df6eb7567fbb6e71bc9c2496118a18fcb317022aec325c46367fa2e043a281b80b0249f3cd6d1f9665b15378426c460dd68297 SHA512 fa1952ff68a6c2b0b16f7eda3fa87aeabf4990c565910c85619f8befe88db3c97a75c3eeb5f7585c0d2a763bd88f63e5b053320ae112e74cf3f92e2721c906f5
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.0.0-20160124182025-e4ec8cc423bb.zip 767764 BLAKE2B 33221dd6c687d740c5f594684e6e9335b1d8eeb67f752f4fc128cadcf166d603e9415c64a2cb41f00a5df66b5c30c5b75a0f59bc5d4451b57411b6865efa0057 SHA512 0032bb1f29a00c9e91d0e40fea52cb95dc904a6f18d97a1506d6491c5a064fd55470e5bdf57dec540913d3993fddf2ce77b0377c7c41f22088cb6f9244403fde
 DIST github.com%2Fhashicorp%2Fterraform-config-inspect%2F@v%2Fv0.0.0-20191212124732-c6ae6269b9d7.mod 505 BLAKE2B 3d62d6caf2e9ef92de89d734382fb47920ad059a7ee854ff7fd9e9dc1179518a457541980db2f59feaa3ce2da6c81906c3d6eb701b837703060437d3b7f42936 SHA512 0dc0f9ea94e6ca6a7e2010ac38c25bf2f3ee64cc96d60782c1f301a382fc380a32dcf1f8e59a87c4b7ebd7a49da8e8d8fee4570f0474000795e008819309b8a3
 DIST github.com%2Fhashicorp%2Fterraform-config-inspect%2F@v%2Fv0.0.0-20191212124732-c6ae6269b9d7.zip 51630 BLAKE2B 87371945e5a7e8ea87a3e9748bd3daef005521b496b2ff94c295508fbd34fb3fbba677a445413aa65edee8f9e01863906074dfabef0614880ccce0eadad05dcc SHA512 ecbe8faea33eb032dbad4a82427247169836312c968e9440b18386fb0b5d6c6ca789e94b0664463fa10af701883f42e91ff318dc1381dd9a1073e1abbcbd8c3e
-DIST github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20191011084731-65d371908596.mod 326 BLAKE2B 9883a7b0e00fa84d549354c0c7d919b8e0a06259475c220e3bb6c37d61919dd10cb7df6b44c6378be209a88a398027453bc727050d0d405014b08e275fea38c4 SHA512 55e47a94e5fcab3d78b934d601d1151491b0b6f6cb0c8bd3bd8d211d5691fd2608dfd8c41c42d7f1cd09fa2ed0b2b5477b24c75d6d34f6ce729636f77a49820a
-DIST github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20191011084731-65d371908596.zip 33653 BLAKE2B ee7eb2b0a715b2fac8b758666aefb6ddcf01d45411571ca523cca59165a4d65887a2b20c0f624d504be00b4136787f4d3c916f9cc8220ab15317d85282021eaf SHA512 f0e7c10354b6c7285122b313b05613493cfad2a40d3855886bd679bd27800b2ba206de9239859bff9da6ac16a1f3d1029198f5c74f7896394d1312f4d82a6749
 DIST github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20200729002733-f050f53b9734.mod 326 BLAKE2B 9883a7b0e00fa84d549354c0c7d919b8e0a06259475c220e3bb6c37d61919dd10cb7df6b44c6378be209a88a398027453bc727050d0d405014b08e275fea38c4 SHA512 55e47a94e5fcab3d78b934d601d1151491b0b6f6cb0c8bd3bd8d211d5691fd2608dfd8c41c42d7f1cd09fa2ed0b2b5477b24c75d6d34f6ce729636f77a49820a
 DIST github.com%2Fhashicorp%2Fterraform-svchost%2F@v%2Fv0.0.0-20200729002733-f050f53b9734.zip 39444 BLAKE2B a1cb43d1b7d4cbff4318abb3ec21fec5128eaf85dd89001919eb47de3e96cd7baef51e5927a0e001cb65d89df15ef0d715af056dd74f95a3afe37b2e01c8d84f SHA512 1793c955563bf02b152c8fb2e74b053cc296eb2039a7b465d3f395cffd3dc16bdf8227b75b2e5de1b0ae4c54a6cd77c2355a8c75aee1c2b243e9c0d42fb34b4e
-DIST github.com%2Fhashicorp%2Fvault%2F@v%2Fv0.10.4.mod 34 BLAKE2B 5d90bddb6c15fe62dcde1fd8d340cefcd59aecd538c4b970309bcecfe1adb2566e811e85eca012ad21d88cdce0447bd8139b40aee69087f45242ee0c79774ed3 SHA512 7f8e66cafe4723848294b06d6254ba9b7b41b6239ac18f1338c8094a037644671f36fd04a2e942783dca54d08c9a740e857a5823bd1435adfcb49792a38a9731
-DIST github.com%2Fhashicorp%2Fvault%2F@v%2Fv0.10.4.zip 12479370 BLAKE2B fcd2a5f6e8f5713513bde04c197791f8abfe76f23ff3cb407f574cdd9c79596693f8d1f48814132f0bb391594b2f7ccba916a9a37c8e4318214c276ab2aea318 SHA512 691d3ced283223e2a6b0c5303980232cfec200277696654b980d3a966c1e099d9d849487d0323f86c308db2582efe75bd8d52198f0756f3d823cc989c785a44f
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.zip 27916 BLAKE2B 03c96600c9cb255c97c2d4f6a51bedf5730509de4746dc32d2970ce772a1d7970734d005a56c188f38f754294a2b336cd0aff65b4291e8e4870f4ce99df065ac SHA512 49efd0e004ef2d630807f4ddf1af45521805d21ea57b1413e8cec7c67c37b6ac2562d21873138009d98bbc530f496c6ab43f6e73c960fe98014e2bfbf897b73e
 DIST github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod 34 BLAKE2B a6b62a3bba7dfe36ff9628bd3d8924ed8e74d32cda866170cd7d78d472ddffe771c1b202a1a905392736a0bf42cb2485b8178eece7f523a01e8acbe3ca1b6fa7 SHA512 9336813b2b20fc7f8f9fd9275f534f30dbe1f232df91aa58817c8a1b8aa46face6073e06721688058b223dcfaf73ea920b84f102542a050ebc51fa5da152fe37
@@ -437,18 +359,18 @@ DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.9.zip 30042 BLAKE2B b14fbf7999bbdd
 DIST github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.0.mod 270 BLAKE2B 5549706699b1adfc2d01e7fe9e2bb7f7ce3f58fa81c921f3eb57dc7b2f418d3e8a690b1c4e68ce49a5e722a9c800a7a68c55ca453d60fb171d2442a2abfa6531 SHA512 9ffc97ac538d2bbd9ffd19857bbbd42846987022919e1da5f7b779bb95a1bb9e13b84c4397e2df796a4e43982e79465063b910b4cd9220b6119a2550a0f1cc5a
 DIST github.com%2Fjhump%2Fprotoreflect%2F@v%2Fv1.6.0.zip 643347 BLAKE2B e1a5a00ddb690f18811b7c304704fced71d8775aac45757b2e6d1fe0c5f0b142ef91e7e047896deacc9a28e41fc38051eb8f51fddc380efc604e886ad380b306 SHA512 2dc9e5fffb23adcd89ab91efe3846ca9563a0e9b650a72f37331e323c59bed070ef6c4e4169ffcad257b1e529b6a47fb0d2687efa48502b665567c49a00ba6ce
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20160202185014-0b12d6b521d8.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
-DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
-DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip 231432 BLAKE2B 99b12826322d86b39d622bba690286fbc43b9e0336161d5218e6620caac0580fc7b3a021e60047a19815e35a4821d31066bf1ee6ca0e49f7bbfb1df10df21380 SHA512 331f1c4fa97173f022210d15719a9ae8a0dcc1c7574e1f019959070bd8cc3f77e34dba16d78e8d9e0083fee2ac24751aa36d5cdc0b2d1303a5118156ea514b7f
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod 92 BLAKE2B 8b5eebcb883871ea090297a64f2ac5171b87eb4881fab71e73fc737e2ca4c301d8fa3a14f184d5c468120ea4b3f22c89867c952795fedbea7abc9b7e618d14c1 SHA512 8361dae50e9bc2db7887bd94f516f817dfc1a3c509c776640b0f9380343236d52a3f43a5ca0093a49a4ab6b5474ec2ad24a4c8549d5949e4f5fed0b322b83c21
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.zip 195553 BLAKE2B 82dfb1c701a06e1759c91bede2d7ac9614b92909431a1619d6bbb2dc2977d7628379c6ed622b57562ff6f2a1b063f1d8bf325435c85bc66f1a684adc29011a95 SHA512 8eba43cd8e422879a1b92a672826867a89691207b99cde00ed906c4fd6fa87b5c2ba4b0e58f5f1b1dd79bf7376aa790aa18b1d3eaec4b144cc1d789ff763c4f4
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.mod 113 BLAKE2B 7ea9e809aab218e2d044bdd2e5994eb3489fd36cf7709613b6cc98b4c1acd6882ecb35b27cfc214779ef3fbeefc930d5803999e12440458af7d1314ec0eb2998 SHA512 50c1339c7ab002f6ceb599f51ec49717e88cc2c5ae1193fccc9431440a531dea27d54e1d0a87b987825545d106a2bbf0dbdbcfb9883fd0e8decad70d88514d68
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.4.0.zip 195725 BLAKE2B d41015982c16856e2ec6710fc7f4c40e7bd11f5b5dc365e8bca6c45fe5055185395724ceff5e35147ab7d493f41db1e7a1dcf90d386444367c1c04dc75abeede SHA512 133747a475094107084d3d8fdf03db36e88eb4673e7781e8779fc9e99da77ecc95dd8c22ac87e80d62cd10c2b6228be449544d1f33d22afb6b978a061b953895
+DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.mod 209 BLAKE2B 00b0c468a857190cd26890babb3e946e9ebbe5ebf0b94ae01519ba32a96f3d99b031140d6de003caee9ca076b33736c96fe4474fb715def44f6ea1eda3ef258c SHA512 8e54b9d01e16e47686cd7aa3b4b184b61a24b7d54fb83a37897c8b76621b3f4594fa86f05b8f08908f6999862e741309c49dcd90bcc928501be084b5667ddfbc
+DIST github.com%2Fjmespath%2Fgo-jmespath%2Finternal%2Ftestify%2F@v%2Fv1.5.1.zip 94054 BLAKE2B 33e25f87bb306decf63ba4d67e841b59b5fe1410ab5a75829f5f33f396b74335d28876bd0c3deba8edd37e7d5f938ec3fafc3982dea464958fd0d34f419bfafb SHA512 297e929f6acaed88fa197463d38b50725f8f3d953faf813da2c1aba2e179191cc1863e3b0910159d419c842eb319268985aaba4ed4486d5ef9b9c4173e02fcb6
 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%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.mod 35 BLAKE2B 58f9081333c4d484056fc9fbc8be7f41cd1f059a20c2786635176a283c47a1d526fe2b5718fc03832a4879c70b9523c9cc3fa6a3d75081778621911e7123af0c SHA512 cb340ca055291eefd8e3f05764d45dc8f11fc25486e8ecc7f4510ef925d0d6a1b81f29c23aebed0e03beb6bd3bbab45ab9ee9344e9d4cf3f4407c2a7031e2ebd
 DIST github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180313100802-d8f9c0314926.zip 161148 BLAKE2B bfa0b01c4e9fb0b576b1ac3b96d4045591ff9b64c7d6c0626dd1a315eaa270889f5634cefce54bcad390faa6d3e1bdd940ca09304d4fbd38580f17e166ad6e47 SHA512 e56b1ebdebeaa8c48d2ab2a934ea5be6f5622a8d2d64e0d8621d054b64f81fc5239ef95b1a0589505a67303844757be6c98116abfcbb200ca71b297dd5dc4b40
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180612202835-f2b4162afba3.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv0.0.0-20180701071628-ab8a2e0c74be.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
-DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
-DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip 128914 BLAKE2B 0584ab3dce388bdfa32846c4eb13a143565cbce8f884e5ac50efb194934d82790f6fabebff4f20ca88dd96b0ac0f1d352b30c51037040d1e4e6bb427960cae67 SHA512 28ccf98d677a0ac08bbc2d8e8c94e5880f2c612e891487c8a4a051b67b9d1ff71fd47eecb357ed2c3f7ea25b6444dd1ead2d9942a45ade8c0927de18cec54060
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.zip 131514 BLAKE2B 477f1ba8434036d96652435c432190539006ee38ccf606671cf319e356c6047c3913c6dffad6e4af13e023dbcb6ce93455797e37d3e5b9524b75ddbcbe0e906e SHA512 e64c91926d1e3688151b4f511f506fe4c2acd0a2ab839a43d12c77145e23215e7ce3ea281651f46bb945a07e04a1d2b6bccdfc3d862b3b7cce074e5817ac014e
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
@@ -459,8 +381,6 @@ DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.zip 9872 BLAKE2B 50868
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
 DIST github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.mod 34 BLAKE2B 478d9f3a5b214f002fcd08abafc3b9738ee5a997c612d017bf40def473be58c81d69489ecf546cae460f2ee38c9489ccb1c3bcbf1c27ca572169425b059c3019 SHA512 535a205c3f8b1d8c1c0cfd13ad5881f0174977c0de81ab5927d5c23c99f067eebc8f5c371530234f9626252f52832c3e8d229ab3c0dd6472bd570ac4464c7e36
 DIST github.com%2Fkardianos%2Fosext%2F@v%2Fv0.0.0-20190222173326-2bc1f35cddc0.zip 8274 BLAKE2B 9f7261226e45d83c0c0645eb1df0e99fcfd3e5de3e0f4bdfdb702aa81f6e4f9b9d0e5a36023c2c723893e10697acce9b32e8a806e9e231d9d150340299f9224e SHA512 0ca91b5d7133f7e71ba33e41f5d87b39eee842986f7c356c1751d03377ca266743b1b00ac912631b8c96f82de03109e3141273730accf160f1a2b91791bdf016
-DIST github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20161004153544-93f5b35093ba.mod 36 BLAKE2B 47002df6c177371a992c98e6e821e8ee94926bd256b81470e1d06fcbb48ab7ed843e76e4ef1e23ca40e4238d2a3844b5890649c52ae1cf79e8275e58b52c17c6 SHA512 f634e17321bd57c29ef906f01294b53f3af7a8b4e191c87c61c10520800bdcbc43f57e21bc445008c49f41adaa3dabb0ba61461e416907a2ce6ea5cd78b01bd0
-DIST github.com%2Fkeybase%2Fgo-crypto%2F@v%2Fv0.0.0-20161004153544-93f5b35093ba.zip 1332306 BLAKE2B e48d8483acf2ac14f213b1d32d5ca700a90d07a9c5eb115b9573bf842976ced5de0f97001714aa252b4f643326b96fd6c8f4b926420ce463fe31a822f9eb8981 SHA512 813f00c09b94c1b4459604d874967fe00a5ecb971af594b86c7f078202baca441f0927665e29395480aa5f8db51f9674e62fd7fa6919044db6641af9f792aa22
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
@@ -493,8 +413,6 @@ DIST github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20160608183007-4572e39b1ab
 DIST github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20160608183007-4572e39b1ab9.zip 8193 BLAKE2B a603ef11c065eae9b49fe7336fd7dc115392f6384693f598507f0f267190c85725ac175aba71e81c7fd6bf8c03a0e8cb183c4578db2f5e63dbd9adedda63f506 SHA512 7f5d2566bd58c56a4145153ecf667d00ecfcaff0f359b9657279f89d8cc211efcbfb196afcb018cd5b1c53aabfaac40f1a9519f486c5f7371efa8b4b93b547c4
 DIST github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20190410153822-31eea3082786.mod 38 BLAKE2B d0228217f6928e5e181f254b9d4ceebee6bfd4c4ffa388a2dd18a5b761a41130af97f5725e447feb7fc40169ee017c69a43565a70f3a17c46e56097ab2674b64 SHA512 7c39bf919ec24040eeeec3892f7f5cc2042c09abcc5c6899ebd42d0d8c3c8ccea052ee2afa01d32dae81aabef64da0e831e19033092ea06b69f3077381c6ded2
 DIST github.com%2Fmasterzen%2Fsimplexml%2F@v%2Fv0.0.0-20190410153822-31eea3082786.zip 8152 BLAKE2B 8c0485351d1adbd657c3d21214b5e905bd7fc19e42562fec5c7fe5f868c66750995cb0b582d9d04f9aae2e511a9e743f2bd99d946a4d25a81f025b5da0ddafde SHA512 4a4133e27e90aa6c2b0bc33adc7fcf5aaafe0e1f0d0941893dd14ce910398144a37d4bd1ace60bf506fb56b9c8ff704539d9e54d4baeb05cad7ffdf93155ce88
-DIST github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20190223112901-5e5c9a7fe54b.mod 576 BLAKE2B 886987c87f91c1da62ce9d1698687e49f9bc50f9a1f50eeda2e19e8a951cbfa897e5631550825e8986bc367ef86edfdbc9950a0743762ee838bbe07a3cfd933f SHA512 fa1e280e5b93f647c417109a902e2959668437201e971e942561960462594f153046b32bcaf4c1b7884f6e001e3b2bf791d13e83128337ea34d97668b76ca904
-DIST github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20190223112901-5e5c9a7fe54b.zip 51831 BLAKE2B a216f66f3055c1dc043e09edafbd71877eda7e12fe244533136268d6af75c41d79110471fd13f81de83fb42f4e52b47ada8df8ef68da6607b0af4f85103e05ad SHA512 77d6e575be7fe2a9b95b8f7765bd5c1bbb559d004b750c6819cef707d029531b4d275bd55b6e3b052bcedffaf6ea3ae84d85816152c50655c08672d9c91aa930
 DIST github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20200615185753-c42b5136ff88.mod 565 BLAKE2B a001f1a8c50cca5022dc8dc687537b186591147f6fe1e81046e0ab66c8292d3d531ceda5d16bdcecc8c033087419c3da95441b5179018637e8f2d578af9ffc7a SHA512 c91c496c17f05fe987b3c0ec20afc5c26db4fefca9f86109db3cc2a335870126433b56033f4ab12638ad02f9d33bffadf212ce1c943636bf22492bf24a502359
 DIST github.com%2Fmasterzen%2Fwinrm%2F@v%2Fv0.0.0-20200615185753-c42b5136ff88.zip 52370 BLAKE2B 6b571dfe67246ce1446df354445ff6767abd06e5b98c32912cdc0cf2bdcd4f89e2d865d350730b6d117aee26d173f0fa8980aaededb0bce66e269e81c8ee7a2b SHA512 38caf289fa67f169d67589e88bb85d1583b39cc0625784468627af869331ec3a09f4cf45f4e72810dc8d44ae8f940f4917d11e17ed38d8e6ae524d280f171d44
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
@@ -511,8 +429,6 @@ DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 B
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.8.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.8.zip 186888 BLAKE2B bf39f5d488c10729073fc20a8a5f959edd0515c2b6d7178ad898393b74385dbf0ffcd7af30853dce55e4fb1f56c80e78cdc382e8d1d8ed6e77ca268a2c06e0d9 SHA512 57d7b4bba18e5842354223ba6df17d665c207f5aa79daf7ad27b22d99a708e51ab098938df280b19941b94dd02c74468a3b7a5461a26f23e8663017946165fba
-DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
-DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.zip 30028 BLAKE2B 2d6bd9a97203fa6b04ff50734a1f7da69641cc4fab3830aef9820c63f680182efebc9802ab33aa471c4701bce8ae571cb1ca13a8f48f820358b921ca19ef98ee SHA512 37d61427d0ff8e8b7f9183046aaaf829e5006abb3b0e3824c0dfab2c96f03dbecbaab9ea983a8835da953ec664cc6074097f13382edd4fb19ee7eeb21cff4668
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod 425 BLAKE2B 8e9c5ee0d4795def5f031ec58ce255227d2d17c80e0ebe028218e3022bb7c5b2cb831981a3247279a5405f36a061e7f0ec717f7d71ae96f33b56d20d0dbea520 SHA512 743b2f950677b8d24423a2491cfd67edcfb45d032e6995a743ebb1f3d6ec6f407f2e4d1d56b2bd14cbe4c519523ee83470f3e594f2da6e0b3fe7c2dfbad9c961
 DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip 30608 BLAKE2B 68db36e6420be62aa1594d415cc95da064c3f80e220891bc747ab61d1bada168fa8c33875bb8f5a1b3cbfcae6b9f48cc28fd792b884f7378b797f5f7445c268a SHA512 41d05b304a7325dbb01dc2704407f5a7c7f7c1255c58cfde66b1d9668b15e1b5e83b5159b25a6ad7d6fed90e64446b32c1633135a018bbb4357c495e3efc8a83
 DIST github.com%2Fmitchellh%2Fcolorstring%2F@v%2Fv0.0.0-20190213212951-d06e56a500db.mod 40 BLAKE2B 0f9e6ab0f72f5158dd93a5c57ac4be060f15d7be491b8bca4c5ce0844d79756d25b78a70e5258e77db4d7b9ea7dc39e7eb0ffdf41e0cf6ab193c71a5192d9ebc SHA512 54abe3375058c36dc4e31eca46d3d4a3382ddd027afb15ab161cf2ee32d6e14d5ae643a75d7a911d55f3c065bde539cb24ec9e9366cb6f365b541a72b62d677a
@@ -532,8 +448,6 @@ DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod 40 BLAKE2B 089a3d8f8
 DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.zip 3587 BLAKE2B afcc45c660601467eb2d23942c845c71f5e61277308f9ed56fd86794f2577f9c61f0fe00b6d04d348e16e94616484cc4156ca2cd017eb25dcb5e985958a47cad SHA512 d08d8446d425286a94cdef1eaf227eb61d942e95499c5d4b5dc83b5e0b7a9a50eab2734016a8f57414acb8db8ca159b55900159f6c6ca67a51bee10c3a2d4356
 DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod 121 BLAKE2B 1bcc532c14adaa320767f5d35d1493bfc9a6cf1404bb1ad7c5f5c7fc940b529ec6afa0effdc757aa20640b601b11fffd9f0ca07e1b3ca2cd5128717b9fabb5ce SHA512 a0cc03f0157608eb5e9a26c6496d60446de5493c66d81b2fb7c20c6c029db2e4a9026d22c77c2906e1995d4ed2abf3b353c7bdf34cefd4e57d94499fe159efe3
 DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip 23850 BLAKE2B 4cba89eb304fabbe0fb2e5108f0385b28b32e9a18daf7b766f1446a051948abaa4412bf9a17a7d6ca44d9315c47fb5c509856eaa0675263b916dd0b2accdf694 SHA512 6fb395119184b78061f3517739e05a3ecd98d8dae3f790a1e52563a3e10f9aecaa6a65dcf2fb52a8aae6ad27ad8939d2446a47ee66a866bf72a866f8eead6436
-DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.mod 42 BLAKE2B 8ffe9f17b9bfd55d7f3b44a0571132809a2d18960cad73780b88d31a723fb380b82c2c3952030a0bb4802929b625583e8aec8875c36a2720c0135ed8b59fe4d1 SHA512 414c86e4d26a8cd2f215353f04ca7ba0eaa17af36e3d3708164cb3698b8d198355bc7bf57897fb9d96cfa822ed50681a18157540a752998060c1549348791755
-DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv1.0.0.zip 8207 BLAKE2B e83d1907a09b00eac0ff79803983863e643961fefe9ff69fe0c8ca7ea590d0878d416109df385eddaa7eaea4cbb86fa60ad0df16a09254fc16d06cadfab82219 SHA512 c4d665252984e51420039cea5d2fb7e435b31cf8df3fc915bf01eb19b739514ccfd632c6e4b4f93df575b0e1fb02ed7ea822a5e02790442bae4e421b7cff44b4
 DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
 DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.zip 2536 BLAKE2B 5f26ee7bc9146338a1bea319bd563161f921017bb208967b7745a06e7482232f00f7c32f23cd526efb44211e9275d0fd27556f77ad3fbb033677b12e79d520ea SHA512 c27fae2305ad9b3dabd7bf99214b86540ad21a6b2bc746c67251813769da9d49aea1cfe473fb4effa9ab7ed9e1397c36c9906445a68e84be1215ed2b3148ab9c
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
@@ -568,8 +482,6 @@ DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.8.0.mod 30 BLAKE2B 54980427295e87f99bc
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20190113212917-5533ce8a0da3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.5.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
-DIST github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180102160824-81144009af58.mod 43 BLAKE2B ece3eccf99be110812adcf17b957ee6330c1c490b128a25c1ba6a69f57f0d9efd4c8c030645c750e41f676ab33aab05278149d0875e91010f2dcd1efec08d4df SHA512 10dcc16784bf12ecbdbfd7bc27bc4fd478c4ee09883d80ff8f64b74f0dc92de37366f5bcb81246622110766b693c77e5562519f908ee1453dda84d83afb5ce12
-DIST github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180102160824-81144009af58.zip 10489 BLAKE2B af26e3711479d14bbffa351c5fd53c842874ac8e26ad3622b23c3a8eaa2ec04abaf9427ed2cfcc646dc37dc194c30c80e2e811fcb5f715cfa67f0daac3f70a30 SHA512 6c5791f40f2f97ff327c0129d270a6e4486978d12faa5b522fdf65e317b2f7fc635a7cb45774b24274d406fa8b8576e4350020f660bd07e435a5c741b0109d69
 DIST github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180921211025-c76d91c1e7db.mod 43 BLAKE2B ece3eccf99be110812adcf17b957ee6330c1c490b128a25c1ba6a69f57f0d9efd4c8c030645c750e41f676ab33aab05278149d0875e91010f2dcd1efec08d4df SHA512 10dcc16784bf12ecbdbfd7bc27bc4fd478c4ee09883d80ff8f64b74f0dc92de37366f5bcb81246622110766b693c77e5562519f908ee1453dda84d83afb5ce12
 DIST github.com%2Fpacker-community%2Fwinrmcp%2F@v%2Fv0.0.0-20180921211025-c76d91c1e7db.zip 10517 BLAKE2B acfea0b53e17986ba19cfb2d2aa11c7c01e3ed7eacc00f9ec515af9535aee31a6278d0bbd670f9dfdf5aa43144c0ae7fd2d5eb6a999650e08ba4322668ed00d8 SHA512 f3186e973e7fd05bacc9816a60feb6a011576b0f863523770c0be7cf4b174ee7e8d7d133229b98f839bddfdda8347bddb717a9893901084be29a6fcd883de130
 DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
@@ -578,7 +490,6 @@ DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B
 DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.mod 30 BLAKE2B 3addf97309c342e8d5bcf397c7c22cdf02eaa571e0632595f9268678a2ca0ef9818cad13ccb3444547d001994d137325cb2cae16fed3c080aa6e62f206a3f059 SHA512 c084d8b2c486f343a891b3b2d21200f80161f2ba1303ae17f7a482949b1c10562e7f87ca44b4258d32a1743b0eb66f842bc184d80fe349e9deb965215ab98b2c
 DIST github.com%2Fpkg%2Fbrowser%2F@v%2Fv0.0.0-20180916011732-0a3d74bf9ce4.zip 5869 BLAKE2B 5aa5d1f38eae51f3728c284ac81ff9de00b0ccdc17d78a73e006ba384b204192aaef056aa872504ed5887496a817f99c6d8f88414b44ebe8eba0db960d94387c SHA512 a6b0274e65e084f59bd33088dd3fb6658e0824ab9d8249c2417a2f9396d4461ad9dd7e3a1d5ff5008bc0edf7f835bd426f1447c1bbb8fb81cade200d0c891579
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip 14743 BLAKE2B c0c06d296c0583be2a6eb06359659b50941ea516bc768833bbfe252b73a2d81616dbe2d2db1991bd196b4a615b253c60046bbc6d56ca7268ded5b0ff40a4dc81 SHA512 2975fb8868fddaff560951be41194b82b631138d617705c3f6162acb76ace8697cc8ebc8f610ca1fb1a5167c6b6b0ecc87c150133a757447831463a0da18f392
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv0.0.0-20151028094244-d8ed2627bdf0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
@@ -592,7 +503,6 @@ DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c44
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.zip 203807 BLAKE2B 38f6971c3cde204ef50304cce44c09a0e8b6f4bfd793a50255edc97fa28358259943fe8892427eefcc74d96aebb2378e655b90247d54e39802f3161a1d9b15ef SHA512 0d5c11527f2c8d41dcc962a3750bc8b6e25acc8e53089c9394744bc85690aa132f961cba7ecd5c7a41b1a8b338b8d6badcf13810ad640900e3fdbd0d4f0e5c31
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
-DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.zip 68327 BLAKE2B 9450f4f080ab5390bcd480cbdf8735965e2f67309b39a82febf5cef1186cb5f24e6e7cb5eff4f5b4b2dbfe84d0c41c9e167f92580f5b7e22c36ea9c5e1f29a1e SHA512 c94590036dafeea7cb96d34a1a5db1e5a4d087d164f784d89ddd8d3c5a89326b8d9d78a2862e88ec0abee639d03e210b638640d9754ddd35c357e7ca1a61183d
 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%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
@@ -616,8 +526,6 @@ DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.zip 1526595 BLAKE2B 3742d9543c9149072eabfe65841df7b9f684c9eb57c12036d62eb085811e18bddf17cb22a16986c44bfdf14e0ecc0796d423fb3b753ea1433c93ac0bd7f684b6 SHA512 a8ed78675612f30aca890d42154fd6d6f530a991069dcc048e66244bdb4c4345e31a60c4ecfebcd36b5756df7ad4694222d58397a21d704ed5629deac7d24eae
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.zip 26744 BLAKE2B dbc7578fcac5c616d1cb5dd7cae959ee8df0496532db36d78d617ff265f213e4e5a336d33b795e793100c1b8e604919ca6fabb1736bcea0c02bdd0f8f0cc931a SHA512 dc990fd4f640acaa66baed26f2e82e0a6c46e293b016bd1573e72600e1256146f1b8abf746ebd96771bad4f3d95dded70c9f884908580ffffc4162efa0450735
-DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
-DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.1.zip 68422 BLAKE2B 6a49cd89113a3558267baa933e779eef70de69f4b722005553451c226e66071105b6dcbf491410fa78bacdbd0fa586459f4df5d655ce102b5365aecac731d4af SHA512 8c253cfd9317a6bafd1395c102b1defa5bd67f30171a3d7c85fef05512bad16596c605ff340fe2246b7751600f15d37222c4755e0faa7e5e45d0826791ab9eec
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.zip 68547 BLAKE2B 608b2dc4f6e135b208d273d5e6de884f02eb15ca5d790104c4b2c449595c3c8984238cd4889215472cc2383968ea4d78f75771a2c66b7041980b8f76884b54f8 SHA512 6be9a4d700abf43f9eb8279b601339ff2290f6278fbbaeb308a9d51d621881e613308595dffb8d843d070bc3e21caca3ebaf20ffcbc60cdb2f8590cdcd30c595
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
@@ -630,7 +538,6 @@ DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
@@ -640,22 +547,16 @@ DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.82+incompatible
 DIST github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.82+incompatible.zip 1055465 BLAKE2B 8eb9d4803d5f2b068d828efc077d655b49d417f22b6acd792d20387d5300b7d5fd04f402b6b129dd1e8f8ddea0dbd1f22a16758312b6d4b4c75d68ee6a625ed9 SHA512 23eab9397742e7005b245b30e0647f2d74a09c5d3626e506535e5cf631c51ba356c75eefe69dfd0d201f8ac5dce81a22626587320f813a573a65728643bedefa
 DIST github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.0.0-20190808065407-f07404cefc8c.mod 261 BLAKE2B 78ddfe52eff9aaaf32470021e4992bafc9afc11d73bc1993fbf29fe5b768457d24d1ae62eaeb97178ea8acf3125ae16c2661a498ece00f2ad182c62ea86ce8c8 SHA512 41e72852cf26bb446a8b0792d777eaaacfac7a1c5604185f892c1a89edf974d538181065d99e38cf1a7b28e232d570c3328c4a97a6ecb3347753791370e35308
 DIST github.com%2Ftencentyun%2Fcos-go-sdk-v5%2F@v%2Fv0.0.0-20190808065407-f07404cefc8c.zip 101665 BLAKE2B 0741fe0249d4b9eceacfb4083cf6eca6fbdc862caa11808f9554f4f5a203d02160703e816f1ff8161e38c9111ca371388571b4a674a60266cfec643c1a46d267 SHA512 4cf5248af38da717c032d78d06a9457ec2a2faa7a1ba15f83f7baeff517eb8f7a2b2f72fb5010f5c608201a5951268f0a9746307699969162470ca95384a0b0e
-DIST github.com%2Fterraform-providers%2Fterraform-provider-openstack%2F@v%2Fv1.15.0.mod 67 BLAKE2B 6993090cc14fed97405da3d346e64f06390567aaa99762c4b543b0d1ef975e931c36e08d57281f6671e46dc9dacd857c94aa1515f9c4501c28aa9aadf4d8b9d8 SHA512 ecb8878cb0f4b8b872c7c6a78e830c9ca002b12bdd102fda21e8a461ea6bd01cdcf34dedaf40234282a45be9101e690357d27796675a67f1b4ba4dfc0295cc0c
-DIST github.com%2Fterraform-providers%2Fterraform-provider-openstack%2F@v%2Fv1.15.0.zip 687432 BLAKE2B 736719aa41cae88ecceeb0bb403b1e66549aa13f55c50ad5140a9a4d12ce55f214a3f6d43d270c594cf95b260194fa572c8b8c727c6352063202896870c29d96 SHA512 c2734b7bad81095ad1332210e563b54784c0ab3acc97016f61e253cdbc8189beeff8ba6897573c8ddcec6af528dd1bb7d86b54895dcb34eafcd50f557d3a9357
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.zip 13531 BLAKE2B 7da23f76d1f6cfdb578c6826a9746381c6227706fdd4658f30bd088883def6662c17d3c06363ea4b9007fad4e7c14b7add0e96380bbe4f5b7feb03125bc830b1 SHA512 6142450cb34a7688845cfeecfff68957118b039d9117ab75584132e34f8ce12ad8ffd24578d1d602c7a98fb2b6b494693ed4e509df2d6130e1d47c5bebcbb420
 DIST github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.12.0.mod 389 BLAKE2B 555f8d3d381c55c4f2879545bd0b39f68539fbe3191f13e05141e250b97ce0b691578e5a4ce3ee7e5d240da2ba629f743b688a4027e5b1a3c51418a7bfde6387 SHA512 eaf483275fe2605f1d12f5d2cae8e80b0257ec6a9e8d52257f67dabd7215b9b42b2e5260363276c2db17a63cf3bcc18aea5b0aa36109d98b40a04b24ffc3b410
 DIST github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.12.0.zip 729715 BLAKE2B a0970226f00ff2eb82dcdba7d9f2143fe0129c553eb41660a6aa110af92a7a14c6c1d0b2209dec19172bee663f34ecbfc49483314abb4e9953f1e0ca17df0180 SHA512 d575a099c6f14ed363e1e64ff4c44d18f151c59d3cad88a07efaa700f4f27db4138ad44b39989f92123a78a3d49cdf1c4b411ac055632095ef2aee522a64b61b
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.mod 28 BLAKE2B 4d0512f0c014baf150880e5a0322d1fffc7b726106a54fe1bfe2ce5926081af697f6ce74fe000ddfe18e2e6d44799346272c704644ea4f1fb44232ae02b09725 SHA512 65d5e7c1e6f710fdf6b475ad898c14466064c86e4aed61e44aa23ff699cf3a9a631f255ec298c8b3d7414ba640d8d5117a06386fe2cfa5cee47d183b03ba3bbf
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.zip 355151 BLAKE2B 845d552a6f36dd795cb634fbfca8b7fb3b70f783bba125827ef11729296621cabcdd1ad5e605f9d6c6148e1dd401efb4c80c7f2de4fe8143e05f7c5dc6e607fc SHA512 1c7d0944948442d15a2befc4d5817883a72b95d9bb0320be569863a64139bb45df5f0a06805f9893de657c6ac78cf6f3e4793d78cd2c674eb1eba86305faee66
-DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.mod 31 BLAKE2B f8ed4b103891625af3043d86905f693014b245198a180911efb7e33480d81b93babd35912c5768df62cd26199e3a742f94365a82de619a97385d7407baa22424 SHA512 33639405743ddf22f19ca03d348c47d9cf963aa151fdab9e7303679ccd5cec373ceebce456eb96ef52dcf933f96e4ef7d4a8099822dfc183996d8cd4f09cba2e
-DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.zip 508602 BLAKE2B e490d835edcf37e31ae1efc155f0b2e418f78760ff1c3c80d45972abbecff3674c58553b631918bb9477c3d0826321321ff6e5b4a5ca4625fab4c4de12176102 SHA512 e4323f1101acab6d76d312fa969f694f2252568bafd83071ed5db9edc66d097feed8422f7c57db57afb3a00236026f7eea3ddc73ae14eafd4f220b7a1eb3e1da
 DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.8.mod 40 BLAKE2B cda2535ba0a3160edbe7d8908e254248e06311ace58d75f6e0b2c75fe1e68f534f68ddaf77a0eef2844b87c2b0234323d8b36a04ce39910cd5e3c0701073f350 SHA512 fc06f111ad8fe91b6233781e300d3abe760140633f45c51fc7b93c744b870f66727d12132e692b5d59526fddd1f728d7a18976e392052d9fe362d3a39149cbb1
 DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.8.zip 511586 BLAKE2B d4050d69ee4cc166f7ff244a5fc91afefbf2174f08af5db760205ab57cb547ba3ddf3e1e5cb0466db4d5559834ebc798d635f9c9083b19468be2dcaeaabc84b5 SHA512 f728a00642c34c8e665f5443b86940b9c00b590df5192c3acd5f6b20cb3b1d94125e3e194f017a99b8e56437b5530e3db2f97454d6c19c0bb2acf8097a4300ae
 DIST github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv3.3.3+incompatible.mod 38 BLAKE2B ad63f2622bcdf456d30122d1d6d93400d706923ecdffe13656683c5b6937708f7700c4632e3cf23992f46f35b74ed133849e42a70c85d2197a8c6a37a7e483ac SHA512 12e2b25a46cd8c1c59f7120b0728115e0586d453a57ad6c387798adc6fcb9c3536841527503fd4acc0be79b951fd389a7a50f1708cda0697e8fca46ff17f86b2
 DIST github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv3.3.3+incompatible.zip 38424 BLAKE2B 94fd5e9da2c5aee5cb65bef9e1a28731608565365bb91d630ea4fe7a8776956c1868dccf6933aedf2d003c031621961aeab59d67ee9c0ff00a0a26eb4654db08 SHA512 665321c09469854f87f352d6d83b2492a994dea0ed90c14a88853b2a053fb96899b5a1ae1a79d8f8e14c307f460854d23a63aae1e7f647271ce2c2fb090f835a
-DIST github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv4.0.1+incompatible.mod 38 BLAKE2B ad63f2622bcdf456d30122d1d6d93400d706923ecdffe13656683c5b6937708f7700c4632e3cf23992f46f35b74ed133849e42a70c85d2197a8c6a37a7e483ac SHA512 12e2b25a46cd8c1c59f7120b0728115e0586d453a57ad6c387798adc6fcb9c3536841527503fd4acc0be79b951fd389a7a50f1708cda0697e8fca46ff17f86b2
-DIST github.com%2Fvmihailenco%2Fmsgpack%2F@v%2Fv4.0.1+incompatible.zip 39554 BLAKE2B 4332cf7c5cc929a3cb7ba9feceb09c337428da161befa8aa4dd68f8b344594f8e973834a012f94c3f0be0d62ec26de4f4d765d4f70f72f8a34d10c95610556af SHA512 33a57ccedd20658c7c616c2a83a9690572714fc461f53f7dad4e737bc97cc79d77c6c122234d38b728149f2f3549521fd4a717352b4820c2953ed6d413d877d8
 DIST github.com%2Fvmihailenco%2Fmsgpack%2Fv4%2F@v%2Fv4.3.12.mod 382 BLAKE2B 6f41d1e7f377e399c8744e0cc6ebd6bfa3bbf716061e40dbafe8710440beb4d577907263e88ef25a96fe35c261791860c469d46546ba22f795403ed4ad2eb618 SHA512 59caca36c98f86ec974b2fb0d4787a2d112e5803c40495f97e482021aaee53807819a72dcc4cea8b5b849bd5c108cd635028d42958014304c2bf307095cff16e
 DIST github.com%2Fvmihailenco%2Fmsgpack%2Fv4%2F@v%2Fv4.3.12.zip 45567 BLAKE2B de9b7f23d89c7946b6f406bec7e5bd43320abac8ab3ecaf2268d0010f2b6e14bce43bd1ae5bf32e021c6f155ae4d002b193c5c9e605b02b6a9db7c8ecb1e09fa SHA512 207856349a548e42eed57284a67f145374bfef7b3f4fdca3bfe1fdb8c90194d622681f2d008bb143d7f547e5b6a2e8f5b68f4934f8e63ac9103580d5a40ddfa6
 DIST github.com%2Fvmihailenco%2Ftagparser%2F@v%2Fv0.1.1.mod 49 BLAKE2B 2e7d51fc92b731f735cbe882454b412a97ebbb6f6c19e98596156f26f99f55103e6568cebded8f319cb8a56601af378d3870358e7d1a63a952d2ed6478b8c4e8 SHA512 8d238d62e6108c0b7495909ca512ab36ef7d36f36caf8e14354f9ca3e098fcb65ba44051fd0a5bb3cdb4aaf0a7cbaa2b71a1f368833eb3aa226d12aac3227fd6
@@ -672,17 +573,9 @@ DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod 41 BLAKE2B 44917ea3a6fc5339
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.0.0.mod 568 BLAKE2B 12b73afcd7376480c316ad5912040275ee1d9cb69c44df8dee6b66039eed44e3e15bf2f2667e5311ed5de896a87335e1369a6258abf57305640ee9ed94a34c1d SHA512 a5461300e9290c382084daab8f5117d73fbc923d264c7832e8da09e9e768ca93702a858739f26727129482de67ba62078e64bcb04c47aa680383351fba2fe5fb
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.1.0.mod 568 BLAKE2B 12b73afcd7376480c316ad5912040275ee1d9cb69c44df8dee6b66039eed44e3e15bf2f2667e5311ed5de896a87335e1369a6258abf57305640ee9ed94a34c1d SHA512 a5461300e9290c382084daab8f5117d73fbc923d264c7832e8da09e9e768ca93702a858739f26727129482de67ba62078e64bcb04c47aa680383351fba2fe5fb
-DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.1.0.zip 203261 BLAKE2B 0e5507105d38288a2f8a5fa27298469c4c6f82949ff2925572caf6baa34f745e09ca1afb2f5deb36f49d431159b4d60a488a29aba9ea5789ff14a2430c984e34 SHA512 f0b269b9e0eaec6171fbd90c867cf803a2071dba348aed01f7380b87e9438c3c5dfbc39ab503a4bc80b3779c7eb43be81a84da13bfc3eb3de12aa54991177dd5
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.0.mod 601 BLAKE2B ea57e572a8fa50a2bea579915eaea6caeefaf85d2dbc68ebfd468e514a05d5e0ce5e0d19fde245f0a83bc8cd80803f18b640539bb3e072759ae331d01577ee36 SHA512 d71075f8e5fd435020a7e27b20df1026b1c841c06b5235bd6414faecbff4f67ff9812eebb8c21f8735dcd1ad605fb36e662692ff67bf3ee4bf2c06d97ed71aee
-DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.0.zip 222764 BLAKE2B 3388f9eda2946e53a85f864bd1fcbd79a10ace6d340cece015a94ff05d8585f38528009d535a2e3c3ec135481905ffc1640fdb2c97e0342c9c2c85c39e3c36ed SHA512 37803075932f25cd124481a9eec295cb69881d13b5ad025228cf66cbb8692dd8ef1f6b745b9c264b04984c79d5e9cddc893ca61ba287cb455b87e66822a5dba1
-DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.1.mod 601 BLAKE2B ea57e572a8fa50a2bea579915eaea6caeefaf85d2dbc68ebfd468e514a05d5e0ce5e0d19fde245f0a83bc8cd80803f18b640539bb3e072759ae331d01577ee36 SHA512 d71075f8e5fd435020a7e27b20df1026b1c841c06b5235bd6414faecbff4f67ff9812eebb8c21f8735dcd1ad605fb36e662692ff67bf3ee4bf2c06d97ed71aee
-DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.2.1.zip 223098 BLAKE2B 79609e80b13e36790dd88a2a0c63e74003cb04ca0ae67200daa3cf9e64517fac06dda81c56161728bc7da55c76c9f61410c1640b3eeaca38443853c20724648b SHA512 fc34a477dae8b2f47fe2bf9e25528ffd57832fa737a33aefd4ba9df22ddda9bebeb76dc511f64779f4333c9b02bb4ef446cfe068c39e65b3e7f3a0d0ca53421a
-DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.5.1.mod 549 BLAKE2B df283746e9dc0e249b15fdd39ff88fe97bf78012b3f0727413566bc76e4fa39c383ec0f5cb3167ad4fba5e7418a155af7145e08c9832158e0de6a366e23b6b7c SHA512 494c91b0a0e52ac0fa7d64ffebc60fb53c64c0e2a9faf3450a7744c9bb6d853010c5565951eb7af92dff96d631dae2db3047939d86857082cc16651a58267dc8
-DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.5.1.zip 247987 BLAKE2B ab35bfe4d2347c4a620c055c8c16e2e84a079d061cc0544d4b0c0762d8f6b5f25c0b904ac0d13163210d6b8703504018b052a7868a7670ba1ffd2b8773f0dcc3 SHA512 b5f0146ff0dbff6db20c07e184b09997643cb0b4a5f5cd1d15b56f9fb7baef35b54558decbe7274bb4a5bdd3bbec58283caa9f6dd688a475ed0d6f63f2fc1e7c
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.7.1.mod 207 BLAKE2B 80cf246c7a6be686a51b903818edd11a663030991d63561cdbfaef94f16bdfe9fb3802a17f5409fbea893da5dbf03d1096efead04fe19e952b6e9a5002df6a59 SHA512 8f6928730d772ba0779c491c0f5f0ee6bb5751f8f2e0d6bc9dcbda487590b730e162a18f72201e613ace6f10ff3c329f9d7ff3c0af81746b5cea0986ca151fbb
 DIST github.com%2Fzclconf%2Fgo-cty%2F@v%2Fv1.7.1.zip 259288 BLAKE2B 97a871cfa42812d6b4e8d2972c7e5a14b0ab6178f33b000c03ede29d50ead00da72ad35381cf7f025dc4c2154056af3ca85dc38c45c3ac92bfeb8be67befe05a SHA512 9351f6f191509f74ff015591ca5c3bbe81d4d367dc633e36548b1bd9adfbb9da65142e30645067ec246bb809e17367619359ce8b0f5b1b05f6ca40f3b58ee1b1
-DIST github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.1.mod 80 BLAKE2B 792b829d635e212603aa59faf482b301b95e5465e5544f28fd3810393bd270001fee6679a08567963e366d01e0f1fc9e8da9db5727669b6fe262f9d0f2db1431 SHA512 52f4cda625bf8ceda19e65dee204e30b1ceaa68b0a0815e925b22d41a02fce6b44e9e73b6d1e957c7826257dfecfe3d17b5c46da5668384957eb6b723e8024fc
-DIST github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.1.zip 68122 BLAKE2B 4b999c18fb98aef02c9248f1c878d844d57ed88aa1e77c81e7d4399172078e50dd4cdfa124a5d6fe9f60a4462c69a25bd2681d0abfc9ac0f6c9962a9df3ac8a0 SHA512 50036e6ed162b1a498062a2601c30e33f833f17a0e3f87a7b12512018e701925311380de89087012a5f72918af0bf6d9d84a84614ba0381353bc81d622551b16
 DIST github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.2.mod 80 BLAKE2B 792b829d635e212603aa59faf482b301b95e5465e5544f28fd3810393bd270001fee6679a08567963e366d01e0f1fc9e8da9db5727669b6fe262f9d0f2db1431 SHA512 52f4cda625bf8ceda19e65dee204e30b1ceaa68b0a0815e925b22d41a02fce6b44e9e73b6d1e957c7826257dfecfe3d17b5c46da5668384957eb6b723e8024fc
 DIST github.com%2Fzclconf%2Fgo-cty-yaml%2F@v%2Fv1.0.2.zip 68523 BLAKE2B a90db518f6eccf2664b55221e860ac52037ebebba5e69129497ff86cbe7f7f4890ebb78930feff7f987a5f14af1ee00a4c0febc23787afa2617f92ac4a11c26d SHA512 536f2184e0f721374b4e739096a57cba35d06ac5594ea1d3712d373a18d5f98a0fd479c3d1dd723612a8a23b1d83337c8823dbd039e9f825a8df747feeda7181
 DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
@@ -708,8 +601,6 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 B
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191202143827-86a70503ff7e.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip 1871909 BLAKE2B fa2d419a5bdff43385f70e3c6e61f8c1b3528b6c4e21c3105f66dc358515b6336673188ff68b27a792be9ae69d77cd26c82b7e30605b974e4435634f961c7583 SHA512 de179d887c4ed6ebba0a1cdcfa67b8312b8b2dcd9bd04589d581c872f6fa7a8606ad1376dc6933dec41938781218a91f31fa27331d80cbda30542b8cd14c5af1
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
@@ -763,12 +654,10 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip 1421786 BLAKE2B 15782d84b4fd3576df5ae0c6540880b3a87f5ed47d66527ad88bbdd5e96cd1b0fb321b896b686de67d4518d3c6eecd008f1e49f48fa29df962a4d01f6e08653f SHA512 e79353b8f6b6866a14236eed278aae32ccb02eed040a557dda219cd96eecdc0174a8ac29a5509a33f6f0f9e5aa16f7d1c6861167d9798a5cb1eb01aabcee56f2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190628185345-da137c7871d7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190812203447-cdfb69ac37fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191009170851-d66e71096ffb.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191009170851-d66e71096ffb.zip 1424478 BLAKE2B 8c855bc381cd29e62046296d7e94dd75628a7e03b37a5ace2a51af8f49ba565d7ef084cdbd3528d88b8722150be142d6b1f55531b06f3f1b4ede6e8374ef69e7 SHA512 4d93e5adf1b09f1821772034571658bc43b7b330fda25ee7ff52cc0954e481ae0980e199657e96f5943f09d95c2e149307f1efcf7bb0cb834eff7f1259a06a20
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191126235420-ef20fe5d7933.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191209160850-c0dbc17a3553.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200114155413-6afb5195e5aa.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
@@ -782,13 +671,13 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200501053045-e0ff5e5a1de5.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200506145744-7e3656a0809f.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200513185701-a91f0712d120.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200602114024-627f9648deb9.zip 1503269 BLAKE2B afc7425e8a2354a2ea7de4b9e007d7091796edc22fe2783f2ec1cac2d0554d87aafbcf49fb838b1ae4f0193f936fc4cbb87fad4ceb4e5cf4e2b020b73db7c648 SHA512 66fe99252beeb16a4a8b3e37da32343955f1727043bde2ab9e5797d1e6b65b85c97292b43ba0f19587e03e02d6bffa7b8cb0986ebb714e992b9d91571dfdfa6b
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.zip 1503642 BLAKE2B 459cd4c9e103f489e029f1d7a4073b9af288c7feb34a7290a4b2c430d7cef6d8d8f85904d13e2549dc64ce47b9b3741c3082c46827988f085d3b32fa44eb81a3 SHA512 3f81ba470596bf5801cb9c80cb3ad84b61ae8d9b7a43d43b6c81bad14a2f7c9f08609a3205811ef7b4bf67d06f3474a7cacf6b42c06b5c9c88082f68082db67d
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.zip 1580428 BLAKE2B 3bc05480dc51b5f2b1b67473a4955a40218100e989f6dff8d1bb337cee52b451554f743448f8b39c3df73066c30f0b7740303807141ff2580a0a9a5b96e3ff21 SHA512 d2d645328924c9e9eb76e267cb47a7397f5cb200ee0a1a295eac1b0da4ba87657c64a7b8f2fc8aea3a359c4f44255e8d44fc06e40c65db539f50f9738b55cb47
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190402181905-9f3314589c9a.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
@@ -827,8 +716,6 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190804053845-51ab0e2deafa.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190804053845-51ab0e2deafa.zip 1817976 BLAKE2B b5b4fc1b562771c9a52c5b2ba34a76520d11cf7876f58e9edbfb288926ae1fe9f560a1e64b7861157dd13a8eefa1face651e8d1705b94ded06019c5ff845ea53 SHA512 ea18bcafe72e397ace410e342ecf19c8d62ea7b9fdf07ec5ee8d6659e41c4c82a9d27c718118aa0df7c5b6f1d8ce45cdc798bcc94c56d559051edda8cc84c5f3
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191128015809-6d18c012aee9.zip 1905524 BLAKE2B b8270bef80476bd3eb4eccb3ad100a434e5dd6fe51bec02c33abe193d264d873b7b969fc87066cf00a918955b34c6662e753a71b3e37d9446d7701c63e8c1b43 SHA512 e3cb3a0e1a744f0ebb2164ecf61ec8049dc55b53c1a9f29aa90836de645a2fc4bb2111477e4ae4488761c959a354a2f09a37b43a15bdfbf8392f60d10aa1665f
@@ -880,7 +767,6 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.zip 2727853 BLAKE2B fddbbc97d7f84ee9c80e93815c3893f7cd7ea009ed9199272ad79c5e66d4790748f0b514a7d886fc8a576d751453938f4a61053bc93b05a32dad247f84df4f00 SHA512 2d9d072e62ed56ec47f76ea6e0bbebbdff15ae7fc94782ff1b25e80507a8d2fbc5f9f1bfa630ed816a95f7e64ee764628c24e3f75092691fcaf0b7f09c8ca745
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
@@ -985,7 +871,6 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200904004341-0bd0a958aa1d.zip
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
-DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.zip 1027160 BLAKE2B 9cc654c2155c5306cbea34e57f9c6e527cd8504278921bb46186c9997a3dd15278a6cda877df9cdac8368a03dd793a071fdc55ab7591cb9d6bd26dcfbed469bd SHA512 8cd3c2d502dbf4955b29e3b0bc5439b7c9ea82c0bdbc2749bd378d5dd30eea81631dffb4aa3306ee4633b0c988f45e73103aeb5ef38d6cc63e6622886456fd06
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.25.1.mod 532 BLAKE2B 4c46c03905fc660d54c7acdb5cd614db9429b0e1add087fa5068f41a72d04b2f776e8326d1181e63ce29078f075d2312f9b0baeaeb048ea3d73f2fdba111e35d SHA512 0171fadf89079d7c0f18b1401aedfd886888d0a4ec4e107aec191c3875c640990532e1f57a3f5306a2e5705ddcf7e09ab2ce4953710347c09deb1d9d5f2d3c1f
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
@@ -1012,7 +897,6 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
 DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.27.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
@@ -1027,7 +911,6 @@ DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
@@ -1063,16 +946,8 @@ DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
-DIST terraform-0.12.28.tar.gz 10637713 BLAKE2B 218d8316c004c363bce39f1e4547cdf4a6d73cfd1b1c0e3810b5759ea509ddd6307f2694f9673c1b6b8668c1a869bc04a81be600a38c5d2c5868e2e1962a231f SHA512 cadd2a5527b4c4ee6dd0385d962435e15ac72f99bc0d3e8193f78a49a474e491dab73f9280c77f37f34e516873b12a7f1af23cd437cb2f9d0afb2bef9966c836
-DIST terraform-0.13.3.tar.gz 12801673 BLAKE2B 2e966dc17195acf500690a60cb98e6643578c7ebc214669982dbe9e5bdfdabe58af1a82b778503fcaef7df47ff2da0a1f09e0b8dd969c9ff413c16fbdba27778 SHA512 64ee5e74e592265e47778dbc5ad2decc61f5e79514c26782128931be180131ef2ab611dbf4cf46875419157b2957b54688ed4026a80812faf3678cb26c2d7f27
-DIST terraform-0.13.4.tar.gz 12800024 BLAKE2B af158e318c335d750e4fdefa4ce18e150202aeadf26f389ef27dd83669946957799e9e3f38e6cba0bc48ab96721109fb408b01493e733159c15a57ba6a767e96 SHA512 e02cb2a9967a923b918e64acd2ffa6f8a8a03676e5207d238a6cf215f4e5cb0e1db3ac9760792187757a8f18d9d23cbfd44c1ce5d6d5bacf70786ef473824dc3
-DIST terraform-0.13.5.tar.gz 12802967 BLAKE2B a70c3209a17e75c8c5f68deacade8e7b1b85c68d1d978933ab1fa32d6b64b2298f9ea5fe11fdc040ba40c7b73480d6da4020b58602e9a5f963ef0dd287540ed7 SHA512 d8af93023275b5aa50ef0dbb66fcc834593ad598300a1c38bfcf2b9bd43bc84eab81a5e63bef29701b2a078019e4b7223cae2a846ef7680a6105b5f90790b41c
-DIST terraform-0.14.4.tar.gz 2804977 BLAKE2B 28a2f1acb4f1f11d81bebd2b120c0fc7230ace921aa9feb382a5338d248697e1d7a9f6721932cd2803dac387b844c8fade793cd1645c8837bb90013141c139a3 SHA512 b39d081e03a9a2272ba979ae236049d1b5825110e0cae35961de42464e98d531a8be8b4c1fae150c10d148583cada30ff820f8a09cd71e2ea7bae43e8367f2c4
 DIST terraform-0.14.5.tar.gz 2807756 BLAKE2B 0edc56fb36a3aa560c7fe7031fedc2591cc12cd6f0dd874b5cdfb68b5be97a56f6b2c3f315bead51ff40270a8609a024e60ff80c5880432c22d17411a555b34f SHA512 f18744d32006c2ecf0217d1710c2134d7aa2c2eacbbc2cfa445e786611250d14508b13fef763a1c4820f357481eebc21649cef8f8c7d3774ff62680d2fc7f2d5
-EBUILD terraform-0.12.28.ebuild 33302 BLAKE2B 9ca5f33aa00c5eacbb82d25fc06cc6a90d16474fe85e0e087dd91edac361188ffcf853b21fd543d07a2836c3d2b6cf47c0c367406c533fb19c5c9ecedc4ef230 SHA512 e521a4cc67ca85de383eb06e2bdace2acf1adba81a66999a744436ce42314c20a9aec78a79795a3c88ee0234e7eb481ffa3778b998692c26ad7783b01ae20bf2
-EBUILD terraform-0.13.3.ebuild 39681 BLAKE2B ea27dcb2cdfa1f12cc7fc362fdd5535d34c71a1694d9f04ae9bba66db61ed7f0b5fc6b3dec689ce34211305db5ffd4df503f2608f8f52f0310a3370d2bc18911 SHA512 e383c04ab131872fed9ac88419902305ad2d464209a390bf643c93646400e01dc21e7d068e92188a333528defa72d563780d1bf8c5f188e111a7aae99cb9498b
-EBUILD terraform-0.13.4.ebuild 39681 BLAKE2B ea27dcb2cdfa1f12cc7fc362fdd5535d34c71a1694d9f04ae9bba66db61ed7f0b5fc6b3dec689ce34211305db5ffd4df503f2608f8f52f0310a3370d2bc18911 SHA512 e383c04ab131872fed9ac88419902305ad2d464209a390bf643c93646400e01dc21e7d068e92188a333528defa72d563780d1bf8c5f188e111a7aae99cb9498b
-EBUILD terraform-0.13.5.ebuild 39681 BLAKE2B ea27dcb2cdfa1f12cc7fc362fdd5535d34c71a1694d9f04ae9bba66db61ed7f0b5fc6b3dec689ce34211305db5ffd4df503f2608f8f52f0310a3370d2bc18911 SHA512 e383c04ab131872fed9ac88419902305ad2d464209a390bf643c93646400e01dc21e7d068e92188a333528defa72d563780d1bf8c5f188e111a7aae99cb9498b
-EBUILD terraform-0.14.4.ebuild 52988 BLAKE2B d440453021711f2265d1644bb4d2c2b9a1966abd94be589606347a3fa92c600fb3127aeadc4b9fccc4bb47098982f6057fbb451249a9576dca538a24308463a8 SHA512 4ca67532d87350a9c37c1755db7aac8364251f4e7d8ad290604e7b44aa64954b78c90242d4e081b2492fe406901736f1432525acdbea5324ed5a8f53566d4a73
-EBUILD terraform-0.14.5.ebuild 53051 BLAKE2B 529791ae856c0638c1d6448af8d428da2a18be28aaba568f2ddff5ef2d48fff23157e04b87e09193bcea6eaf61e0e2ed84f259fdd123a650a4774ea4f6fa61a2 SHA512 9ae83163a7de78836f99cd46f32429232ec55c439ea501655fffc303d2cacc0a6b4240d0401480e6c963ca32909ebac5ab0ff123dfcef2340dc98943b01f5153
+DIST terraform-0.14.6.tar.gz 2796079 BLAKE2B 7e6ce929b9545cdaba00d0e6ecd7d807311947d60ee4b445d0b5fbadafe909de835bccd214e96c3dea0d269f89a64c4449a948845c040f9808ea5f70b91cedd2 SHA512 84b9761e3d6627383f79744c6a0200320a23de5d6478de7c857eee8761e8caba43399506be4a06bd6f02650991b5de9dc05ebd81ac22fa38402d7d7f78318ab6
+EBUILD terraform-0.14.5.ebuild 53050 BLAKE2B c60224261df05577b6b4a91bd4c002fe2fe8a00453fa7dd31c40f5192b49a3dbf44d63c22d77ca2d4d7caf3363227c08eb50faecb82e6edd47565d7093788e2d SHA512 4d3fd5634be431d347a2866a1fde0c4a58c8472dd1caba985240d83d74415ad43ee1266f4a46cabf55de5175f4c5769af08429ffeb9bfae3970522a4ead77c57
+EBUILD terraform-0.14.6.ebuild 52031 BLAKE2B 58857d47be3a8633e4154a0bc4956efbacb1ddf8d2473181dc77363ea4f369f54e9126f4ece8a53b2c0bc2837df0d8c222c2d777225f04254ab15803f06040d5 SHA512 6a01b423ed0adbb61fff24bde0602d85a5d3f92751b61e9d6d4da2081804a022aec7e12931083c67f1c6c98654a80f7941cf941aecfd897466e36290a7c46099
 MISC metadata.xml 1074 BLAKE2B f14c6ede900b616f5a5514adc9735d25fa834dc879712ab79b68fe15a927cb3e8e77a7b30ee8af3b44551be9ec2368476757c4ec5e5b44fcd266367b485fc8bc SHA512 2e28b3de2b512246ddfb76b547151683c4202620992f9453747b4869db1a16d92996cbf810bf82f09e6895ddc7b23ecc2e0ecaf43d9c3ba9e8a2fb53baa995dc
diff --git a/app-admin/terraform/terraform-0.12.28.ebuild b/app-admin/terraform/terraform-0.12.28.ebuild
deleted file mode 100644
index 9736011384e6..000000000000
--- a/app-admin/terraform/terraform-0.12.28.ebuild
+++ /dev/null
@@ -1,628 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"cloud.google.com/go v0.44.1/go.mod"
-	"cloud.google.com/go v0.44.2/go.mod"
-	"cloud.google.com/go v0.45.1"
-	"cloud.google.com/go v0.45.1/go.mod"
-	"cloud.google.com/go/bigquery v1.0.1/go.mod"
-	"cloud.google.com/go/datastore v1.0.0/go.mod"
-	"github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod"
-	"github.com/Azure/azure-sdk-for-go v36.2.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v36.2.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.2"
-	"github.com/Azure/go-autorest/autorest v0.9.2/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.2.0"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4"
-	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
-	"github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod"
-	"github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292"
-	"github.com/Unknwon/com v0.0.0-20151008135407-28b053d5a292/go.mod"
-	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
-	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
-	"github.com/agext/levenshtein v1.2.1/go.mod"
-	"github.com/agext/levenshtein v1.2.2"
-	"github.com/agext/levenshtein v1.2.2/go.mod"
-	"github.com/agl/ed25519 v0.0.0-20150830182803-278e1ec8e8a6"
-	"github.com/agl/ed25519 v0.0.0-20150830182803-278e1ec8e8a6/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a"
-	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod"
-	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70"
-	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod"
-	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible"
-	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod"
-	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e"
-	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod"
-	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
-	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
-	"github.com/apparentlymart/go-cidr v1.0.1"
-	"github.com/apparentlymart/go-cidr v1.0.1/go.mod"
-	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
-	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0"
-	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod"
-	"github.com/apparentlymart/go-textseg v1.0.0"
-	"github.com/apparentlymart/go-textseg v1.0.0/go.mod"
-	"github.com/apparentlymart/go-versions v0.0.2-0.20180815153302-64b99f7cb171"
-	"github.com/apparentlymart/go-versions v0.0.2-0.20180815153302-64b99f7cb171/go.mod"
-	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
-	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/armon/go-radix v1.0.0"
-	"github.com/armon/go-radix v1.0.0/go.mod"
-	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
-	"github.com/aws/aws-sdk-go v1.25.3"
-	"github.com/aws/aws-sdk-go v1.25.3/go.mod"
-	"github.com/aws/aws-sdk-go v1.30.12"
-	"github.com/aws/aws-sdk-go v1.30.12/go.mod"
-	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
-	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
-	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
-	"github.com/bgentry/speakeasy v0.1.0"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/blang/semver v3.5.1+incompatible"
-	"github.com/blang/semver v3.5.1+incompatible/go.mod"
-	"github.com/bmatcuk/doublestar v1.1.5"
-	"github.com/bmatcuk/doublestar v1.1.5/go.mod"
-	"github.com/boltdb/bolt v1.3.1"
-	"github.com/boltdb/bolt v1.3.1/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cheggaaa/pb v1.0.27/go.mod"
-	"github.com/chzyer/logex v1.1.10"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/coreos/bbolt v1.3.0"
-	"github.com/coreos/bbolt v1.3.0/go.mod"
-	"github.com/coreos/etcd v3.3.10+incompatible"
-	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-	"github.com/coreos/go-semver v0.2.0"
-	"github.com/coreos/go-semver v0.2.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
-	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/dnaeon/go-vcr v0.0.0-20180920040454-5637cf3d8a31"
-	"github.com/dnaeon/go-vcr v0.0.0-20180920040454-5637cf3d8a31/go.mod"
-	"github.com/dylanmei/iso8601 v0.1.0"
-	"github.com/dylanmei/iso8601 v0.1.0/go.mod"
-	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1"
-	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/ghodss/yaml v1.0.0"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/go-test/deep v1.0.1/go.mod"
-	"github.com/go-test/deep v1.0.3"
-	"github.com/go-test/deep v1.0.3/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.0"
-	"github.com/gogo/protobuf v1.2.0/go.mod"
-	"github.com/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-20180513044358-24b0969c4cb7"
-	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/mock v1.3.1"
-	"github.com/golang/mock v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.1.0/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.3.4"
-	"github.com/golang/protobuf v1.3.4/go.mod"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/btree v1.0.0"
-	"github.com/google/btree v1.0.0/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-	"github.com/google/uuid v1.1.1"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.5"
-	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/gophercloud/gophercloud v0.0.0-20190208042652-bc37892e1968"
-	"github.com/gophercloud/gophercloud v0.0.0-20190208042652-bc37892e1968/go.mod"
-	"github.com/gophercloud/utils v0.0.0-20190128072930-fbb6ab446f01"
-	"github.com/gophercloud/utils v0.0.0-20190128072930-fbb6ab446f01/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorilla/websocket v1.4.0"
-	"github.com/gorilla/websocket v1.4.0/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.8.5"
-	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
-	"github.com/hashicorp/aws-sdk-go-base v0.4.0"
-	"github.com/hashicorp/aws-sdk-go-base v0.4.0/go.mod"
-	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
-	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-azure-helpers v0.10.0"
-	"github.com/hashicorp/go-azure-helpers v0.10.0/go.mod"
-	"github.com/hashicorp/go-checkpoint v0.5.0"
-	"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.0"
-	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02"
-	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod"
-	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-	"github.com/hashicorp/go-hclog v0.0.0-20181001195459-61d530d6c27f"
-	"github.com/hashicorp/go-hclog v0.0.0-20181001195459-61d530d6c27f/go.mod"
-	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa"
-	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.4"
-	"github.com/hashicorp/go-msgpack v0.5.4/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-plugin v1.3.0"
-	"github.com/hashicorp/go-plugin v1.3.0/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.2"
-	"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.0"
-	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-	"github.com/hashicorp/go-safetemp v1.0.0"
-	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
-	"github.com/hashicorp/go-slug v0.4.1"
-	"github.com/hashicorp/go-slug v0.4.1/go.mod"
-	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86"
-	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod"
-	"github.com/hashicorp/go-tfe v0.8.1"
-	"github.com/hashicorp/go-tfe v0.8.1/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/hashicorp/go-version v1.1.0"
-	"github.com/hashicorp/go-version v1.1.0/go.mod"
-	"github.com/hashicorp/go-version v1.2.0"
-	"github.com/hashicorp/go-version v1.2.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f"
-	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod"
-	"github.com/hashicorp/hcl/v2 v2.0.0/go.mod"
-	"github.com/hashicorp/hcl/v2 v2.3.0"
-	"github.com/hashicorp/hcl/v2 v2.3.0/go.mod"
-	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590"
-	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590/go.mod"
-	"github.com/hashicorp/memberlist v0.1.0"
-	"github.com/hashicorp/memberlist v0.1.0/go.mod"
-	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb"
-	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod"
-	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7"
-	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod"
-	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596"
-	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod"
-	"github.com/hashicorp/vault v0.10.4"
-	"github.com/hashicorp/vault v0.10.4/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-	"github.com/jhump/protoreflect v1.6.0"
-	"github.com/jhump/protoreflect v1.6.0/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/jmespath/go-jmespath v0.3.0"
-	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
-	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod"
-	"github.com/json-iterator/go v1.1.5"
-	"github.com/json-iterator/go v1.1.5/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jtolds/gls v4.2.1+incompatible"
-	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
-	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
-	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba"
-	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
-	"github.com/kylelemons/godebug v1.1.0"
-	"github.com/kylelemons/godebug v1.1.0/go.mod"
-	"github.com/lib/pq v1.0.0"
-	"github.com/lib/pq v1.0.0/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
-	"github.com/likexian/gokit v0.20.15"
-	"github.com/likexian/gokit v0.20.15/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
-	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
-	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
-	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9"
-	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
-	"github.com/masterzen/winrm v0.0.0-20190223112901-5e5c9a7fe54b"
-	"github.com/masterzen/winrm v0.0.0-20190223112901-5e5c9a7fe54b/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.1"
-	"github.com/mattn/go-colorable v0.1.1/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.5"
-	"github.com/mattn/go-isatty v0.0.5/go.mod"
-	"github.com/mattn/go-runewidth v0.0.4/go.mod"
-	"github.com/mattn/go-shellwords v1.0.4"
-	"github.com/mattn/go-shellwords v1.0.4/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/miekg/dns v1.0.8"
-	"github.com/miekg/dns v1.0.8/go.mod"
-	"github.com/mitchellh/cli v1.0.0"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
-	"github.com/mitchellh/copystructure v1.0.0"
-	"github.com/mitchellh/copystructure v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb"
-	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod"
-	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
-	"github.com/mitchellh/go-wordwrap v1.0.0"
-	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-	"github.com/mitchellh/hashstructure v1.0.0"
-	"github.com/mitchellh/hashstructure v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/mitchellh/panicwrap v1.0.0"
-	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
-	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51"
-	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.0"
-	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-	"github.com/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 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/mozillazg/go-httpheader v0.2.1"
-	"github.com/mozillazg/go-httpheader v0.2.1/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
-	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
-	"github.com/oklog/run v1.0.0"
-	"github.com/oklog/run v1.0.0/go.mod"
-	"github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58"
-	"github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
-	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
-	"github.com/pkg/errors v0.8.0"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/posener/complete v1.2.1"
-	"github.com/posener/complete v1.2.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829"
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f"
-	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/prometheus/common v0.2.0"
-	"github.com/prometheus/common v0.2.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1"
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/satori/go.uuid v1.2.0"
-	"github.com/satori/go.uuid v1.2.0/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/sergi/go-diff v1.0.0"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/sirupsen/logrus v1.2.0"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
-	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
-	"github.com/soheilhy/cmux v0.1.4"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/spf13/afero v1.2.1"
-	"github.com/spf13/afero v1.2.1/go.mod"
-	"github.com/spf13/pflag v1.0.2/go.mod"
-	"github.com/spf13/pflag v1.0.3"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.5.1"
-	"github.com/stretchr/testify v1.5.1/go.mod"
-	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
-	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
-	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible"
-	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod"
-	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c"
-	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod"
-	"github.com/terraform-providers/terraform-provider-openstack v1.15.0"
-	"github.com/terraform-providers/terraform-provider-openstack v1.15.0/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod"
-	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5"
-	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod"
-	"github.com/ulikunitz/xz v0.5.5"
-	"github.com/ulikunitz/xz v0.5.5/go.mod"
-	"github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
-	"github.com/vmihailenco/msgpack v4.0.1+incompatible"
-	"github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod"
-	"github.com/xanzy/ssh-agent v0.2.1"
-	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
-	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18"
-	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod"
-	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
-	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod"
-	"github.com/zclconf/go-cty v1.0.0/go.mod"
-	"github.com/zclconf/go-cty v1.1.0"
-	"github.com/zclconf/go-cty v1.1.0/go.mod"
-	"github.com/zclconf/go-cty v1.2.0"
-	"github.com/zclconf/go-cty v1.2.0/go.mod"
-	"github.com/zclconf/go-cty v1.2.1"
-	"github.com/zclconf/go-cty v1.2.1/go.mod"
-	"github.com/zclconf/go-cty-yaml v1.0.1"
-	"github.com/zclconf/go-cty-yaml v1.0.1/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0"
-	"go.opencensus.io v0.22.0/go.mod"
-	"go.uber.org/atomic v1.3.2"
-	"go.uber.org/atomic v1.3.2/go.mod"
-	"go.uber.org/multierr v1.1.0"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/zap v1.9.1"
-	"go.uber.org/zap v1.9.1/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
-	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37"
-	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-	"golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb"
-	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-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/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-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
-	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
-	"golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa"
-	"golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0"
-	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.7.0/go.mod"
-	"google.golang.org/api v0.8.0/go.mod"
-	"google.golang.org/api v0.9.0"
-	"google.golang.org/api v0.9.0/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/appengine v1.5.0/go.mod"
-	"google.golang.org/appengine v1.6.1"
-	"google.golang.org/appengine v1.6.1/go.mod"
-	"google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/grpc v1.8.0/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.1"
-	"google.golang.org/grpc v1.21.1/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.27.1"
-	"google.golang.org/grpc v1.27.1/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
-	"gopkg.in/ini.v1 v1.42.0"
-	"gopkg.in/ini.v1 v1.42.0/go.mod"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-	"rsc.io/binaryregexp v0.2.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
-SLOT="0"
-KEYWORDS="amd64"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
-	go build \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/terraform
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like to install shell completions please run:"
-	elog "    terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-0.13.3.ebuild b/app-admin/terraform/terraform-0.13.3.ebuild
deleted file mode 100644
index b9df790c598c..000000000000
--- a/app-admin/terraform/terraform-0.13.3.ebuild
+++ /dev/null
@@ -1,736 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"cloud.google.com/go v0.44.1/go.mod"
-	"cloud.google.com/go v0.44.2/go.mod"
-	"cloud.google.com/go v0.45.1"
-	"cloud.google.com/go v0.45.1/go.mod"
-	"cloud.google.com/go/bigquery v1.0.1/go.mod"
-	"cloud.google.com/go/datastore v1.0.0/go.mod"
-	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest v11.1.2+incompatible/go.mod"
-	"github.com/Azure/go-autorest v14.2.0+incompatible"
-	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.11.3"
-	"github.com/Azure/go-autorest/autorest v0.11.3/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.9.0"
-	"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.3.0"
-	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.4.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/to v0.4.0"
-	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/validation v0.3.0"
-	"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.2.0"
-	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.6.0"
-	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
-	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4"
-	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d/go.mod"
-	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-	"github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod"
-	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
-	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
-	"github.com/agext/levenshtein v1.2.1/go.mod"
-	"github.com/agext/levenshtein v1.2.2"
-	"github.com/agext/levenshtein v1.2.2/go.mod"
-	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412"
-	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a"
-	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod"
-	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70"
-	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod"
-	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible"
-	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod"
-	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e"
-	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod"
-	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
-	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
-	"github.com/apparentlymart/go-cidr v1.1.0"
-	"github.com/apparentlymart/go-cidr v1.1.0/go.mod"
-	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
-	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0"
-	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod"
-	"github.com/apparentlymart/go-textseg v1.0.0"
-	"github.com/apparentlymart/go-textseg v1.0.0/go.mod"
-	"github.com/apparentlymart/go-textseg/v12 v12.0.0"
-	"github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod"
-	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13"
-	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod"
-	"github.com/apparentlymart/go-versions v1.0.0"
-	"github.com/apparentlymart/go-versions v1.0.0/go.mod"
-	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
-	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/armon/go-radix v1.0.0"
-	"github.com/armon/go-radix v1.0.0/go.mod"
-	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
-	"github.com/aws/aws-sdk-go v1.31.9"
-	"github.com/aws/aws-sdk-go v1.31.9/go.mod"
-	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
-	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
-	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
-	"github.com/bgentry/speakeasy v0.1.0"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/bmatcuk/doublestar v1.1.5"
-	"github.com/bmatcuk/doublestar v1.1.5/go.mod"
-	"github.com/boltdb/bolt v1.3.1"
-	"github.com/boltdb/bolt v1.3.1/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cheggaaa/pb v1.0.27/go.mod"
-	"github.com/chzyer/logex v1.1.10"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/coreos/bbolt v1.3.0"
-	"github.com/coreos/bbolt v1.3.0/go.mod"
-	"github.com/coreos/etcd v3.3.10+incompatible"
-	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-	"github.com/coreos/go-semver v0.2.0"
-	"github.com/coreos/go-semver v0.2.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
-	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-	"github.com/dylanmei/iso8601 v0.1.0"
-	"github.com/dylanmei/iso8601 v0.1.0/go.mod"
-	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1"
-	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod"
-	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
-	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-	"github.com/ghodss/yaml v1.0.0"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logr/logr v0.1.0/go.mod"
-	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/go-test/deep v1.0.1/go.mod"
-	"github.com/go-test/deep v1.0.3"
-	"github.com/go-test/deep v1.0.3/go.mod"
-	"github.com/gofrs/uuid v3.2.0+incompatible"
-	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
-	"github.com/gofrs/uuid v3.3.0+incompatible"
-	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
-	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
-	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7"
-	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/mock v1.3.1"
-	"github.com/golang/mock v1.3.1/go.mod"
-	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-	"github.com/golang/protobuf v1.1.0/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.3.4"
-	"github.com/golang/protobuf v1.3.4/go.mod"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
-	"github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/btree v1.0.0"
-	"github.com/google/btree v1.0.0/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
-	"github.com/google/gofuzz v1.0.0"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-	"github.com/google/uuid v1.0.0/go.mod"
-	"github.com/google/uuid v1.1.1"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.5"
-	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-	"github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
-	"github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod"
-	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5"
-	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5/go.mod"
-	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d"
-	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorilla/websocket v1.4.0"
-	"github.com/gorilla/websocket v1.4.0/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.8.5"
-	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
-	"github.com/hashicorp/aws-sdk-go-base v0.6.0"
-	"github.com/hashicorp/aws-sdk-go-base v0.6.0/go.mod"
-	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
-	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-azure-helpers v0.12.0"
-	"github.com/hashicorp/go-azure-helpers v0.12.0/go.mod"
-	"github.com/hashicorp/go-checkpoint v0.5.0"
-	"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02"
-	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod"
-	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-	"github.com/hashicorp/go-hclog v0.9.2"
-	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
-	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa"
-	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.4"
-	"github.com/hashicorp/go-msgpack v0.5.4/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-plugin v1.3.0"
-	"github.com/hashicorp/go-plugin v1.3.0/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.2"
-	"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.0"
-	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-	"github.com/hashicorp/go-safetemp v1.0.0"
-	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
-	"github.com/hashicorp/go-slug v0.4.1"
-	"github.com/hashicorp/go-slug v0.4.1/go.mod"
-	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86"
-	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod"
-	"github.com/hashicorp/go-tfe v0.8.1"
-	"github.com/hashicorp/go-tfe v0.8.1/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/hashicorp/go-version v1.0.0/go.mod"
-	"github.com/hashicorp/go-version v1.1.0/go.mod"
-	"github.com/hashicorp/go-version v1.2.0"
-	"github.com/hashicorp/go-version v1.2.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f"
-	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod"
-	"github.com/hashicorp/hcl/v2 v2.0.0/go.mod"
-	"github.com/hashicorp/hcl/v2 v2.6.0"
-	"github.com/hashicorp/hcl/v2 v2.6.0/go.mod"
-	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590"
-	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590/go.mod"
-	"github.com/hashicorp/memberlist v0.1.0"
-	"github.com/hashicorp/memberlist v0.1.0/go.mod"
-	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb"
-	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod"
-	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7"
-	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod"
-	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596"
-	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod"
-	"github.com/hashicorp/vault v0.10.4"
-	"github.com/hashicorp/vault v0.10.4/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/imdario/mergo v0.3.5/go.mod"
-	"github.com/imdario/mergo v0.3.9"
-	"github.com/imdario/mergo v0.3.9/go.mod"
-	"github.com/jhump/protoreflect v1.6.0"
-	"github.com/jhump/protoreflect v1.6.0/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
-	"github.com/jmespath/go-jmespath v0.3.0"
-	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
-	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
-	"github.com/json-iterator/go v1.1.7"
-	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jtolds/gls v4.2.1+incompatible"
-	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
-	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
-	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba"
-	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/go.mod"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
-	"github.com/kylelemons/godebug v1.1.0"
-	"github.com/kylelemons/godebug v1.1.0/go.mod"
-	"github.com/lib/pq v1.0.0"
-	"github.com/lib/pq v1.0.0/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
-	"github.com/likexian/gokit v0.20.15"
-	"github.com/likexian/gokit v0.20.15/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
-	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
-	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9"
-	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
-	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786"
-	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod"
-	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88"
-	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.1"
-	"github.com/mattn/go-colorable v0.1.1/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.5"
-	"github.com/mattn/go-isatty v0.0.5/go.mod"
-	"github.com/mattn/go-runewidth v0.0.4/go.mod"
-	"github.com/mattn/go-shellwords v1.0.4"
-	"github.com/mattn/go-shellwords v1.0.4/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/miekg/dns v1.0.8"
-	"github.com/miekg/dns v1.0.8/go.mod"
-	"github.com/mitchellh/cli v1.0.0"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
-	"github.com/mitchellh/copystructure v1.0.0"
-	"github.com/mitchellh/copystructure v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb"
-	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod"
-	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
-	"github.com/mitchellh/go-wordwrap v1.0.0"
-	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-	"github.com/mitchellh/gox v1.0.1"
-	"github.com/mitchellh/gox v1.0.1/go.mod"
-	"github.com/mitchellh/iochan v1.0.0"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/mitchellh/panicwrap v1.0.0"
-	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
-	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51"
-	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.0"
-	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.1"
-	"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/mozillazg/go-httpheader v0.2.1"
-	"github.com/mozillazg/go-httpheader v0.2.1/go.mod"
-	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
-	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
-	"github.com/oklog/run v1.0.0"
-	"github.com/oklog/run v1.0.0/go.mod"
-	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.8.0/go.mod"
-	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
-	"github.com/onsi/gomega v1.5.0/go.mod"
-	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db"
-	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
-	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/posener/complete v1.2.1"
-	"github.com/posener/complete v1.2.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829"
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/prometheus/common v0.2.0"
-	"github.com/prometheus/common v0.2.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1"
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/satori/go.uuid v1.2.0"
-	"github.com/satori/go.uuid v1.2.0/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/sergi/go-diff v1.0.0"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/sirupsen/logrus v1.2.0"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
-	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
-	"github.com/soheilhy/cmux v0.1.4"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/spf13/afero v1.2.2"
-	"github.com/spf13/afero v1.2.2/go.mod"
-	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-	"github.com/spf13/pflag v1.0.1/go.mod"
-	"github.com/spf13/pflag v1.0.2/go.mod"
-	"github.com/spf13/pflag v1.0.3"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.5.1"
-	"github.com/stretchr/testify v1.5.1/go.mod"
-	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
-	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
-	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible"
-	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod"
-	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c"
-	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod"
-	"github.com/tombuildsstuff/giovanni v0.12.0"
-	"github.com/tombuildsstuff/giovanni v0.12.0/go.mod"
-	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5"
-	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod"
-	"github.com/ulikunitz/xz v0.5.5"
-	"github.com/ulikunitz/xz v0.5.5/go.mod"
-	"github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
-	"github.com/vmihailenco/msgpack v4.0.1+incompatible"
-	"github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod"
-	"github.com/xanzy/ssh-agent v0.2.1"
-	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
-	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18"
-	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod"
-	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
-	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod"
-	"github.com/zclconf/go-cty v1.0.0/go.mod"
-	"github.com/zclconf/go-cty v1.1.0/go.mod"
-	"github.com/zclconf/go-cty v1.2.0/go.mod"
-	"github.com/zclconf/go-cty v1.5.1"
-	"github.com/zclconf/go-cty v1.5.1/go.mod"
-	"github.com/zclconf/go-cty-yaml v1.0.2"
-	"github.com/zclconf/go-cty-yaml v1.0.2/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0"
-	"go.opencensus.io v0.22.0/go.mod"
-	"go.uber.org/atomic v1.3.2"
-	"go.uber.org/atomic v1.3.2/go.mod"
-	"go.uber.org/multierr v1.1.0"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/zap v1.9.1"
-	"go.uber.org/zap v1.9.1/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
-	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
-	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-	"golang.org/x/mod v0.2.0"
-	"golang.org/x/mod v0.2.0/go.mod"
-	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-	"golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
-	"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod"
-	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod"
-	"golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9"
-	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
-	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-	"golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod"
-	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
-	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
-	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9"
-	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371"
-	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.7.0/go.mod"
-	"google.golang.org/api v0.8.0/go.mod"
-	"google.golang.org/api v0.9.0"
-	"google.golang.org/api v0.9.0/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/appengine v1.5.0/go.mod"
-	"google.golang.org/appengine v1.6.1"
-	"google.golang.org/appengine v1.6.1/go.mod"
-	"google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/grpc v1.8.0/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.1/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.27.1"
-	"google.golang.org/grpc v1.27.1/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/inf.v0 v0.9.0"
-	"gopkg.in/inf.v0 v0.9.0/go.mod"
-	"gopkg.in/ini.v1 v1.42.0"
-	"gopkg.in/ini.v1 v1.42.0/go.mod"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711"
-	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655"
-	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
-	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-	"k8s.io/klog v0.3.1/go.mod"
-	"k8s.io/klog v0.4.0"
-	"k8s.io/klog v0.4.0/go.mod"
-	"k8s.io/klog/v2 v2.0.0/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
-	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
-	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4"
-	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4/go.mod"
-	"rsc.io/binaryregexp v0.2.0/go.mod"
-	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
-	"sigs.k8s.io/yaml v1.1.0"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
-	go build \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/terraform
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like to install shell completions please run:"
-	elog "    terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-0.13.4.ebuild b/app-admin/terraform/terraform-0.13.4.ebuild
deleted file mode 100644
index b9df790c598c..000000000000
--- a/app-admin/terraform/terraform-0.13.4.ebuild
+++ /dev/null
@@ -1,736 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"cloud.google.com/go v0.44.1/go.mod"
-	"cloud.google.com/go v0.44.2/go.mod"
-	"cloud.google.com/go v0.45.1"
-	"cloud.google.com/go v0.45.1/go.mod"
-	"cloud.google.com/go/bigquery v1.0.1/go.mod"
-	"cloud.google.com/go/datastore v1.0.0/go.mod"
-	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest v11.1.2+incompatible/go.mod"
-	"github.com/Azure/go-autorest v14.2.0+incompatible"
-	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.11.3"
-	"github.com/Azure/go-autorest/autorest v0.11.3/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.9.0"
-	"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.3.0"
-	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.4.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/to v0.4.0"
-	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/validation v0.3.0"
-	"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.2.0"
-	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.6.0"
-	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
-	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4"
-	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d/go.mod"
-	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-	"github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod"
-	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
-	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
-	"github.com/agext/levenshtein v1.2.1/go.mod"
-	"github.com/agext/levenshtein v1.2.2"
-	"github.com/agext/levenshtein v1.2.2/go.mod"
-	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412"
-	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a"
-	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod"
-	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70"
-	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod"
-	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible"
-	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod"
-	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e"
-	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod"
-	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
-	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
-	"github.com/apparentlymart/go-cidr v1.1.0"
-	"github.com/apparentlymart/go-cidr v1.1.0/go.mod"
-	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
-	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0"
-	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod"
-	"github.com/apparentlymart/go-textseg v1.0.0"
-	"github.com/apparentlymart/go-textseg v1.0.0/go.mod"
-	"github.com/apparentlymart/go-textseg/v12 v12.0.0"
-	"github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod"
-	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13"
-	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod"
-	"github.com/apparentlymart/go-versions v1.0.0"
-	"github.com/apparentlymart/go-versions v1.0.0/go.mod"
-	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
-	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/armon/go-radix v1.0.0"
-	"github.com/armon/go-radix v1.0.0/go.mod"
-	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
-	"github.com/aws/aws-sdk-go v1.31.9"
-	"github.com/aws/aws-sdk-go v1.31.9/go.mod"
-	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
-	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
-	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
-	"github.com/bgentry/speakeasy v0.1.0"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/bmatcuk/doublestar v1.1.5"
-	"github.com/bmatcuk/doublestar v1.1.5/go.mod"
-	"github.com/boltdb/bolt v1.3.1"
-	"github.com/boltdb/bolt v1.3.1/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cheggaaa/pb v1.0.27/go.mod"
-	"github.com/chzyer/logex v1.1.10"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/coreos/bbolt v1.3.0"
-	"github.com/coreos/bbolt v1.3.0/go.mod"
-	"github.com/coreos/etcd v3.3.10+incompatible"
-	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-	"github.com/coreos/go-semver v0.2.0"
-	"github.com/coreos/go-semver v0.2.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
-	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-	"github.com/dylanmei/iso8601 v0.1.0"
-	"github.com/dylanmei/iso8601 v0.1.0/go.mod"
-	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1"
-	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod"
-	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
-	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-	"github.com/ghodss/yaml v1.0.0"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logr/logr v0.1.0/go.mod"
-	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/go-test/deep v1.0.1/go.mod"
-	"github.com/go-test/deep v1.0.3"
-	"github.com/go-test/deep v1.0.3/go.mod"
-	"github.com/gofrs/uuid v3.2.0+incompatible"
-	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
-	"github.com/gofrs/uuid v3.3.0+incompatible"
-	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
-	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
-	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7"
-	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/mock v1.3.1"
-	"github.com/golang/mock v1.3.1/go.mod"
-	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-	"github.com/golang/protobuf v1.1.0/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.3.4"
-	"github.com/golang/protobuf v1.3.4/go.mod"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
-	"github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/btree v1.0.0"
-	"github.com/google/btree v1.0.0/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
-	"github.com/google/gofuzz v1.0.0"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-	"github.com/google/uuid v1.0.0/go.mod"
-	"github.com/google/uuid v1.1.1"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.5"
-	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-	"github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
-	"github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod"
-	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5"
-	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5/go.mod"
-	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d"
-	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorilla/websocket v1.4.0"
-	"github.com/gorilla/websocket v1.4.0/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.8.5"
-	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
-	"github.com/hashicorp/aws-sdk-go-base v0.6.0"
-	"github.com/hashicorp/aws-sdk-go-base v0.6.0/go.mod"
-	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
-	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-azure-helpers v0.12.0"
-	"github.com/hashicorp/go-azure-helpers v0.12.0/go.mod"
-	"github.com/hashicorp/go-checkpoint v0.5.0"
-	"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02"
-	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod"
-	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-	"github.com/hashicorp/go-hclog v0.9.2"
-	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
-	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa"
-	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.4"
-	"github.com/hashicorp/go-msgpack v0.5.4/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-plugin v1.3.0"
-	"github.com/hashicorp/go-plugin v1.3.0/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.2"
-	"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.0"
-	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-	"github.com/hashicorp/go-safetemp v1.0.0"
-	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
-	"github.com/hashicorp/go-slug v0.4.1"
-	"github.com/hashicorp/go-slug v0.4.1/go.mod"
-	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86"
-	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod"
-	"github.com/hashicorp/go-tfe v0.8.1"
-	"github.com/hashicorp/go-tfe v0.8.1/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/hashicorp/go-version v1.0.0/go.mod"
-	"github.com/hashicorp/go-version v1.1.0/go.mod"
-	"github.com/hashicorp/go-version v1.2.0"
-	"github.com/hashicorp/go-version v1.2.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f"
-	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod"
-	"github.com/hashicorp/hcl/v2 v2.0.0/go.mod"
-	"github.com/hashicorp/hcl/v2 v2.6.0"
-	"github.com/hashicorp/hcl/v2 v2.6.0/go.mod"
-	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590"
-	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590/go.mod"
-	"github.com/hashicorp/memberlist v0.1.0"
-	"github.com/hashicorp/memberlist v0.1.0/go.mod"
-	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb"
-	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod"
-	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7"
-	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod"
-	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596"
-	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod"
-	"github.com/hashicorp/vault v0.10.4"
-	"github.com/hashicorp/vault v0.10.4/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/imdario/mergo v0.3.5/go.mod"
-	"github.com/imdario/mergo v0.3.9"
-	"github.com/imdario/mergo v0.3.9/go.mod"
-	"github.com/jhump/protoreflect v1.6.0"
-	"github.com/jhump/protoreflect v1.6.0/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
-	"github.com/jmespath/go-jmespath v0.3.0"
-	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
-	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
-	"github.com/json-iterator/go v1.1.7"
-	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jtolds/gls v4.2.1+incompatible"
-	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
-	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
-	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba"
-	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/go.mod"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
-	"github.com/kylelemons/godebug v1.1.0"
-	"github.com/kylelemons/godebug v1.1.0/go.mod"
-	"github.com/lib/pq v1.0.0"
-	"github.com/lib/pq v1.0.0/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
-	"github.com/likexian/gokit v0.20.15"
-	"github.com/likexian/gokit v0.20.15/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
-	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
-	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9"
-	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
-	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786"
-	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod"
-	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88"
-	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.1"
-	"github.com/mattn/go-colorable v0.1.1/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.5"
-	"github.com/mattn/go-isatty v0.0.5/go.mod"
-	"github.com/mattn/go-runewidth v0.0.4/go.mod"
-	"github.com/mattn/go-shellwords v1.0.4"
-	"github.com/mattn/go-shellwords v1.0.4/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/miekg/dns v1.0.8"
-	"github.com/miekg/dns v1.0.8/go.mod"
-	"github.com/mitchellh/cli v1.0.0"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
-	"github.com/mitchellh/copystructure v1.0.0"
-	"github.com/mitchellh/copystructure v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb"
-	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod"
-	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
-	"github.com/mitchellh/go-wordwrap v1.0.0"
-	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-	"github.com/mitchellh/gox v1.0.1"
-	"github.com/mitchellh/gox v1.0.1/go.mod"
-	"github.com/mitchellh/iochan v1.0.0"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/mitchellh/panicwrap v1.0.0"
-	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
-	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51"
-	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.0"
-	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.1"
-	"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/mozillazg/go-httpheader v0.2.1"
-	"github.com/mozillazg/go-httpheader v0.2.1/go.mod"
-	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
-	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
-	"github.com/oklog/run v1.0.0"
-	"github.com/oklog/run v1.0.0/go.mod"
-	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.8.0/go.mod"
-	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
-	"github.com/onsi/gomega v1.5.0/go.mod"
-	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db"
-	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
-	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/posener/complete v1.2.1"
-	"github.com/posener/complete v1.2.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829"
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/prometheus/common v0.2.0"
-	"github.com/prometheus/common v0.2.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1"
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/satori/go.uuid v1.2.0"
-	"github.com/satori/go.uuid v1.2.0/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/sergi/go-diff v1.0.0"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/sirupsen/logrus v1.2.0"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
-	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
-	"github.com/soheilhy/cmux v0.1.4"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/spf13/afero v1.2.2"
-	"github.com/spf13/afero v1.2.2/go.mod"
-	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-	"github.com/spf13/pflag v1.0.1/go.mod"
-	"github.com/spf13/pflag v1.0.2/go.mod"
-	"github.com/spf13/pflag v1.0.3"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.5.1"
-	"github.com/stretchr/testify v1.5.1/go.mod"
-	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
-	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
-	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible"
-	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod"
-	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c"
-	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod"
-	"github.com/tombuildsstuff/giovanni v0.12.0"
-	"github.com/tombuildsstuff/giovanni v0.12.0/go.mod"
-	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5"
-	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod"
-	"github.com/ulikunitz/xz v0.5.5"
-	"github.com/ulikunitz/xz v0.5.5/go.mod"
-	"github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
-	"github.com/vmihailenco/msgpack v4.0.1+incompatible"
-	"github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod"
-	"github.com/xanzy/ssh-agent v0.2.1"
-	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
-	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18"
-	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod"
-	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
-	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod"
-	"github.com/zclconf/go-cty v1.0.0/go.mod"
-	"github.com/zclconf/go-cty v1.1.0/go.mod"
-	"github.com/zclconf/go-cty v1.2.0/go.mod"
-	"github.com/zclconf/go-cty v1.5.1"
-	"github.com/zclconf/go-cty v1.5.1/go.mod"
-	"github.com/zclconf/go-cty-yaml v1.0.2"
-	"github.com/zclconf/go-cty-yaml v1.0.2/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0"
-	"go.opencensus.io v0.22.0/go.mod"
-	"go.uber.org/atomic v1.3.2"
-	"go.uber.org/atomic v1.3.2/go.mod"
-	"go.uber.org/multierr v1.1.0"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/zap v1.9.1"
-	"go.uber.org/zap v1.9.1/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
-	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
-	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-	"golang.org/x/mod v0.2.0"
-	"golang.org/x/mod v0.2.0/go.mod"
-	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-	"golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
-	"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod"
-	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod"
-	"golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9"
-	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
-	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-	"golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod"
-	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
-	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
-	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9"
-	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371"
-	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.7.0/go.mod"
-	"google.golang.org/api v0.8.0/go.mod"
-	"google.golang.org/api v0.9.0"
-	"google.golang.org/api v0.9.0/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/appengine v1.5.0/go.mod"
-	"google.golang.org/appengine v1.6.1"
-	"google.golang.org/appengine v1.6.1/go.mod"
-	"google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/grpc v1.8.0/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.1/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.27.1"
-	"google.golang.org/grpc v1.27.1/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/inf.v0 v0.9.0"
-	"gopkg.in/inf.v0 v0.9.0/go.mod"
-	"gopkg.in/ini.v1 v1.42.0"
-	"gopkg.in/ini.v1 v1.42.0/go.mod"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711"
-	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655"
-	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
-	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-	"k8s.io/klog v0.3.1/go.mod"
-	"k8s.io/klog v0.4.0"
-	"k8s.io/klog v0.4.0/go.mod"
-	"k8s.io/klog/v2 v2.0.0/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
-	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
-	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4"
-	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4/go.mod"
-	"rsc.io/binaryregexp v0.2.0/go.mod"
-	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
-	"sigs.k8s.io/yaml v1.1.0"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
-	go build \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/terraform
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like to install shell completions please run:"
-	elog "    terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-0.13.5.ebuild b/app-admin/terraform/terraform-0.13.5.ebuild
deleted file mode 100644
index b9df790c598c..000000000000
--- a/app-admin/terraform/terraform-0.13.5.ebuild
+++ /dev/null
@@ -1,736 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"cloud.google.com/go v0.44.1/go.mod"
-	"cloud.google.com/go v0.44.2/go.mod"
-	"cloud.google.com/go v0.45.1"
-	"cloud.google.com/go v0.45.1/go.mod"
-	"cloud.google.com/go/bigquery v1.0.1/go.mod"
-	"cloud.google.com/go/datastore v1.0.0/go.mod"
-	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest v11.1.2+incompatible/go.mod"
-	"github.com/Azure/go-autorest v14.2.0+incompatible"
-	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.11.3"
-	"github.com/Azure/go-autorest/autorest v0.11.3/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.9.0"
-	"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.3.0"
-	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.4.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/to v0.4.0"
-	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/validation v0.3.0"
-	"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.2.0"
-	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.6.0"
-	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
-	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4"
-	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d/go.mod"
-	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-	"github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod"
-	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
-	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
-	"github.com/agext/levenshtein v1.2.1/go.mod"
-	"github.com/agext/levenshtein v1.2.2"
-	"github.com/agext/levenshtein v1.2.2/go.mod"
-	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412"
-	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a"
-	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod"
-	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70"
-	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod"
-	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible"
-	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod"
-	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e"
-	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod"
-	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
-	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
-	"github.com/apparentlymart/go-cidr v1.1.0"
-	"github.com/apparentlymart/go-cidr v1.1.0/go.mod"
-	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
-	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0"
-	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod"
-	"github.com/apparentlymart/go-textseg v1.0.0"
-	"github.com/apparentlymart/go-textseg v1.0.0/go.mod"
-	"github.com/apparentlymart/go-textseg/v12 v12.0.0"
-	"github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod"
-	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13"
-	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod"
-	"github.com/apparentlymart/go-versions v1.0.0"
-	"github.com/apparentlymart/go-versions v1.0.0/go.mod"
-	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
-	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/armon/go-radix v1.0.0"
-	"github.com/armon/go-radix v1.0.0/go.mod"
-	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
-	"github.com/aws/aws-sdk-go v1.31.9"
-	"github.com/aws/aws-sdk-go v1.31.9/go.mod"
-	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
-	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
-	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
-	"github.com/bgentry/speakeasy v0.1.0"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/bmatcuk/doublestar v1.1.5"
-	"github.com/bmatcuk/doublestar v1.1.5/go.mod"
-	"github.com/boltdb/bolt v1.3.1"
-	"github.com/boltdb/bolt v1.3.1/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cheggaaa/pb v1.0.27/go.mod"
-	"github.com/chzyer/logex v1.1.10"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/coreos/bbolt v1.3.0"
-	"github.com/coreos/bbolt v1.3.0/go.mod"
-	"github.com/coreos/etcd v3.3.10+incompatible"
-	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-	"github.com/coreos/go-semver v0.2.0"
-	"github.com/coreos/go-semver v0.2.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
-	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-	"github.com/dylanmei/iso8601 v0.1.0"
-	"github.com/dylanmei/iso8601 v0.1.0/go.mod"
-	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1"
-	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod"
-	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
-	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-	"github.com/ghodss/yaml v1.0.0"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logr/logr v0.1.0/go.mod"
-	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/go-test/deep v1.0.1/go.mod"
-	"github.com/go-test/deep v1.0.3"
-	"github.com/go-test/deep v1.0.3/go.mod"
-	"github.com/gofrs/uuid v3.2.0+incompatible"
-	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
-	"github.com/gofrs/uuid v3.3.0+incompatible"
-	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
-	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
-	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7"
-	"github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/mock v1.3.1"
-	"github.com/golang/mock v1.3.1/go.mod"
-	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-	"github.com/golang/protobuf v1.1.0/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.3.4"
-	"github.com/golang/protobuf v1.3.4/go.mod"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db"
-	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
-	"github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/btree v1.0.0"
-	"github.com/google/btree v1.0.0/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
-	"github.com/google/gofuzz v1.0.0"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-	"github.com/google/uuid v1.0.0/go.mod"
-	"github.com/google/uuid v1.1.1"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.5"
-	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-	"github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
-	"github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod"
-	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5"
-	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5/go.mod"
-	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d"
-	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorilla/websocket v1.4.0"
-	"github.com/gorilla/websocket v1.4.0/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.8.5"
-	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
-	"github.com/hashicorp/aws-sdk-go-base v0.6.0"
-	"github.com/hashicorp/aws-sdk-go-base v0.6.0/go.mod"
-	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
-	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-azure-helpers v0.12.0"
-	"github.com/hashicorp/go-azure-helpers v0.12.0/go.mod"
-	"github.com/hashicorp/go-checkpoint v0.5.0"
-	"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02"
-	"github.com/hashicorp/go-getter v1.4.2-0.20200106182914-9813cbd4eb02/go.mod"
-	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-	"github.com/hashicorp/go-hclog v0.9.2"
-	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
-	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa"
-	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.4"
-	"github.com/hashicorp/go-msgpack v0.5.4/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-plugin v1.3.0"
-	"github.com/hashicorp/go-plugin v1.3.0/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.2"
-	"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.0"
-	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-	"github.com/hashicorp/go-safetemp v1.0.0"
-	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
-	"github.com/hashicorp/go-slug v0.4.1"
-	"github.com/hashicorp/go-slug v0.4.1/go.mod"
-	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86"
-	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod"
-	"github.com/hashicorp/go-tfe v0.8.1"
-	"github.com/hashicorp/go-tfe v0.8.1/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/hashicorp/go-version v1.0.0/go.mod"
-	"github.com/hashicorp/go-version v1.1.0/go.mod"
-	"github.com/hashicorp/go-version v1.2.0"
-	"github.com/hashicorp/go-version v1.2.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f"
-	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod"
-	"github.com/hashicorp/hcl/v2 v2.0.0/go.mod"
-	"github.com/hashicorp/hcl/v2 v2.6.0"
-	"github.com/hashicorp/hcl/v2 v2.6.0/go.mod"
-	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590"
-	"github.com/hashicorp/hil v0.0.0-20190212112733-ab17b08d6590/go.mod"
-	"github.com/hashicorp/memberlist v0.1.0"
-	"github.com/hashicorp/memberlist v0.1.0/go.mod"
-	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb"
-	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod"
-	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7"
-	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod"
-	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596"
-	"github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod"
-	"github.com/hashicorp/vault v0.10.4"
-	"github.com/hashicorp/vault v0.10.4/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/imdario/mergo v0.3.5/go.mod"
-	"github.com/imdario/mergo v0.3.9"
-	"github.com/imdario/mergo v0.3.9/go.mod"
-	"github.com/jhump/protoreflect v1.6.0"
-	"github.com/jhump/protoreflect v1.6.0/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
-	"github.com/jmespath/go-jmespath v0.3.0"
-	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
-	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
-	"github.com/json-iterator/go v1.1.7"
-	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jtolds/gls v4.2.1+incompatible"
-	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
-	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
-	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba"
-	"github.com/keybase/go-crypto v0.0.0-20161004153544-93f5b35093ba/go.mod"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
-	"github.com/kylelemons/godebug v1.1.0"
-	"github.com/kylelemons/godebug v1.1.0/go.mod"
-	"github.com/lib/pq v1.0.0"
-	"github.com/lib/pq v1.0.0/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
-	"github.com/likexian/gokit v0.20.15"
-	"github.com/likexian/gokit v0.20.15/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
-	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
-	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9"
-	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
-	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786"
-	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod"
-	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88"
-	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.1"
-	"github.com/mattn/go-colorable v0.1.1/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.5"
-	"github.com/mattn/go-isatty v0.0.5/go.mod"
-	"github.com/mattn/go-runewidth v0.0.4/go.mod"
-	"github.com/mattn/go-shellwords v1.0.4"
-	"github.com/mattn/go-shellwords v1.0.4/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/miekg/dns v1.0.8"
-	"github.com/miekg/dns v1.0.8/go.mod"
-	"github.com/mitchellh/cli v1.0.0"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
-	"github.com/mitchellh/copystructure v1.0.0"
-	"github.com/mitchellh/copystructure v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb"
-	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod"
-	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
-	"github.com/mitchellh/go-wordwrap v1.0.0"
-	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-	"github.com/mitchellh/gox v1.0.1"
-	"github.com/mitchellh/gox v1.0.1/go.mod"
-	"github.com/mitchellh/iochan v1.0.0"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/mitchellh/panicwrap v1.0.0"
-	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
-	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51"
-	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.0"
-	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.1"
-	"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/mozillazg/go-httpheader v0.2.1"
-	"github.com/mozillazg/go-httpheader v0.2.1/go.mod"
-	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
-	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
-	"github.com/oklog/run v1.0.0"
-	"github.com/oklog/run v1.0.0/go.mod"
-	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.8.0/go.mod"
-	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
-	"github.com/onsi/gomega v1.5.0/go.mod"
-	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db"
-	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
-	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/posener/complete v1.2.1"
-	"github.com/posener/complete v1.2.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829"
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/prometheus/common v0.2.0"
-	"github.com/prometheus/common v0.2.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1"
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/satori/go.uuid v1.2.0"
-	"github.com/satori/go.uuid v1.2.0/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/sergi/go-diff v1.0.0"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/sirupsen/logrus v1.2.0"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
-	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
-	"github.com/soheilhy/cmux v0.1.4"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/spf13/afero v1.2.2"
-	"github.com/spf13/afero v1.2.2/go.mod"
-	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-	"github.com/spf13/pflag v1.0.1/go.mod"
-	"github.com/spf13/pflag v1.0.2/go.mod"
-	"github.com/spf13/pflag v1.0.3"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.5.1"
-	"github.com/stretchr/testify v1.5.1/go.mod"
-	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
-	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
-	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible"
-	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod"
-	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c"
-	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod"
-	"github.com/tombuildsstuff/giovanni v0.12.0"
-	"github.com/tombuildsstuff/giovanni v0.12.0/go.mod"
-	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5"
-	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod"
-	"github.com/ulikunitz/xz v0.5.5"
-	"github.com/ulikunitz/xz v0.5.5/go.mod"
-	"github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
-	"github.com/vmihailenco/msgpack v4.0.1+incompatible"
-	"github.com/vmihailenco/msgpack v4.0.1+incompatible/go.mod"
-	"github.com/xanzy/ssh-agent v0.2.1"
-	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
-	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18"
-	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod"
-	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
-	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod"
-	"github.com/zclconf/go-cty v1.0.0/go.mod"
-	"github.com/zclconf/go-cty v1.1.0/go.mod"
-	"github.com/zclconf/go-cty v1.2.0/go.mod"
-	"github.com/zclconf/go-cty v1.5.1"
-	"github.com/zclconf/go-cty v1.5.1/go.mod"
-	"github.com/zclconf/go-cty-yaml v1.0.2"
-	"github.com/zclconf/go-cty-yaml v1.0.2/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0"
-	"go.opencensus.io v0.22.0/go.mod"
-	"go.uber.org/atomic v1.3.2"
-	"go.uber.org/atomic v1.3.2/go.mod"
-	"go.uber.org/multierr v1.1.0"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/zap v1.9.1"
-	"go.uber.org/zap v1.9.1/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
-	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
-	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-	"golang.org/x/mod v0.2.0"
-	"golang.org/x/mod v0.2.0/go.mod"
-	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-	"golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
-	"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod"
-	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod"
-	"golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9"
-	"golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
-	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-	"golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod"
-	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
-	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
-	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9"
-	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371"
-	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.7.0/go.mod"
-	"google.golang.org/api v0.8.0/go.mod"
-	"google.golang.org/api v0.9.0"
-	"google.golang.org/api v0.9.0/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/appengine v1.5.0/go.mod"
-	"google.golang.org/appengine v1.6.1"
-	"google.golang.org/appengine v1.6.1/go.mod"
-	"google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/grpc v1.8.0/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.1/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.27.1"
-	"google.golang.org/grpc v1.27.1/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/inf.v0 v0.9.0"
-	"gopkg.in/inf.v0 v0.9.0/go.mod"
-	"gopkg.in/ini.v1 v1.42.0"
-	"gopkg.in/ini.v1 v1.42.0/go.mod"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711"
-	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655"
-	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
-	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-	"k8s.io/klog v0.3.1/go.mod"
-	"k8s.io/klog v0.4.0"
-	"k8s.io/klog v0.4.0/go.mod"
-	"k8s.io/klog/v2 v2.0.0/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
-	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
-	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4"
-	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4/go.mod"
-	"rsc.io/binaryregexp v0.2.0/go.mod"
-	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
-	"sigs.k8s.io/yaml v1.1.0"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
-	go build \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/terraform
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like to install shell completions please run:"
-	elog "    terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-0.14.5.ebuild b/app-admin/terraform/terraform-0.14.5.ebuild
index cd3ef080dbc7..4f1b7c6c8a29 100644
--- a/app-admin/terraform/terraform-0.14.5.ebuild
+++ b/app-admin/terraform/terraform-0.14.5.ebuild
@@ -959,7 +959,7 @@ SRC_URI+="${EGO_SUM_SRC_URI}"
 
 LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RESTRICT="test"
 
diff --git a/app-admin/terraform/terraform-0.14.4.ebuild b/app-admin/terraform/terraform-0.14.6.ebuild
index e19f0d1cab78..8b36693adbac 100644
--- a/app-admin/terraform/terraform-0.14.4.ebuild
+++ b/app-admin/terraform/terraform-0.14.6.ebuild
@@ -11,7 +11,6 @@ EGO_SUM=(
 	"cloud.google.com/go v0.38.0/go.mod"
 	"cloud.google.com/go v0.44.1/go.mod"
 	"cloud.google.com/go v0.44.2/go.mod"
-	"cloud.google.com/go v0.45.1"
 	"cloud.google.com/go v0.45.1/go.mod"
 	"cloud.google.com/go v0.46.3/go.mod"
 	"cloud.google.com/go v0.50.0/go.mod"
@@ -65,13 +64,11 @@ EGO_SUM=(
 	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
 	"github.com/Azure/go-autorest/tracing v0.6.0"
 	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
-	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4"
 	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
 	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
 	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
 	"github.com/BurntSushi/toml v0.3.1/go.mod"
 	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022"
 	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
 	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d"
 	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d/go.mod"
@@ -117,8 +114,9 @@ EGO_SUM=(
 	"github.com/armon/go-radix v1.0.0"
 	"github.com/armon/go-radix v1.0.0/go.mod"
 	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
-	"github.com/aws/aws-sdk-go v1.31.9"
 	"github.com/aws/aws-sdk-go v1.31.9/go.mod"
+	"github.com/aws/aws-sdk-go v1.37.0"
+	"github.com/aws/aws-sdk-go v1.37.0/go.mod"
 	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
 	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
 	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
@@ -194,7 +192,6 @@ EGO_SUM=(
 	"github.com/go-test/deep v1.0.1/go.mod"
 	"github.com/go-test/deep v1.0.3"
 	"github.com/go-test/deep v1.0.3/go.mod"
-	"github.com/gofrs/uuid v3.2.0+incompatible"
 	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
 	"github.com/gofrs/uuid v3.3.0+incompatible"
 	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
@@ -211,7 +208,6 @@ EGO_SUM=(
 	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
 	"github.com/golang/mock v1.1.1/go.mod"
 	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/mock v1.3.1"
 	"github.com/golang/mock v1.3.1/go.mod"
 	"github.com/golang/mock v1.4.0/go.mod"
 	"github.com/golang/mock v1.4.1/go.mod"
@@ -224,7 +220,6 @@ EGO_SUM=(
 	"github.com/golang/protobuf v1.3.1/go.mod"
 	"github.com/golang/protobuf v1.3.2/go.mod"
 	"github.com/golang/protobuf v1.3.3/go.mod"
-	"github.com/golang/protobuf v1.3.4"
 	"github.com/golang/protobuf v1.3.4/go.mod"
 	"github.com/golang/protobuf v1.3.5/go.mod"
 	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
@@ -241,7 +236,6 @@ EGO_SUM=(
 	"github.com/google/btree v1.0.0/go.mod"
 	"github.com/google/go-cmp v0.2.0/go.mod"
 	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1"
 	"github.com/google/go-cmp v0.3.1/go.mod"
 	"github.com/google/go-cmp v0.4.0/go.mod"
 	"github.com/google/go-cmp v0.4.1/go.mod"
@@ -353,7 +347,6 @@ EGO_SUM=(
 	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod"
 	"github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734"
 	"github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb"
 	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
 	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
 	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
@@ -365,8 +358,11 @@ EGO_SUM=(
 	"github.com/jhump/protoreflect v1.6.0"
 	"github.com/jhump/protoreflect v1.6.0/go.mod"
 	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
-	"github.com/jmespath/go-jmespath v0.3.0"
 	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.4.0"
+	"github.com/jmespath/go-jmespath v0.4.0/go.mod"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
+	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
 	"github.com/jonboulle/clockwork v0.1.0"
 	"github.com/jonboulle/clockwork v0.1.0/go.mod"
 	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
@@ -396,8 +392,8 @@ EGO_SUM=(
 	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
 	"github.com/kylelemons/godebug v1.1.0"
 	"github.com/kylelemons/godebug v1.1.0/go.mod"
-	"github.com/lib/pq v1.0.0"
-	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/lib/pq v1.8.0"
+	"github.com/lib/pq v1.8.0/go.mod"
 	"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
 	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
 	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
@@ -409,7 +405,6 @@ EGO_SUM=(
 	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
 	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
 	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9"
 	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
 	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786"
 	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod"
@@ -456,7 +451,6 @@ EGO_SUM=(
 	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
 	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51"
 	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.0"
 	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
 	"github.com/mitchellh/reflectwalk v1.0.1"
 	"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
@@ -579,7 +573,6 @@ EGO_SUM=(
 	"github.com/zclconf/go-cty-yaml v1.0.2"
 	"github.com/zclconf/go-cty-yaml v1.0.2/go.mod"
 	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0"
 	"go.opencensus.io v0.22.0/go.mod"
 	"go.opencensus.io v0.22.2/go.mod"
 	"go.opencensus.io v0.22.3/go.mod"
@@ -632,7 +625,6 @@ EGO_SUM=(
 	"golang.org/x/mod v0.1.0/go.mod"
 	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
 	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
-	"golang.org/x/mod v0.2.0"
 	"golang.org/x/mod v0.2.0/go.mod"
 	"golang.org/x/mod v0.3.0"
 	"golang.org/x/mod v0.3.0/go.mod"
@@ -661,7 +653,6 @@ EGO_SUM=(
 	"golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod"
 	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
 	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
 	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
 	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
 	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
@@ -674,12 +665,12 @@ EGO_SUM=(
 	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
 	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
 	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
-	"golang.org/x/net v0.0.0-20201021035429-f5854403a974"
 	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b"
+	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
 	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
 	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
 	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
 	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
 	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
 	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
@@ -715,7 +706,6 @@ EGO_SUM=(
 	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
 	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
 	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
-	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9"
 	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
 	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
 	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
@@ -725,7 +715,6 @@ EGO_SUM=(
 	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
 	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
 	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
 	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
 	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
 	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
@@ -741,13 +730,11 @@ EGO_SUM=(
 	"golang.org/x/text v0.3.0/go.mod"
 	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
 	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
-	"golang.org/x/text v0.3.2"
 	"golang.org/x/text v0.3.2/go.mod"
 	"golang.org/x/text v0.3.3"
 	"golang.org/x/text v0.3.3/go.mod"
 	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
 	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
 	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
 	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
 	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
@@ -773,7 +760,6 @@ EGO_SUM=(
 	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
 	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
 	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
-	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371"
 	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod"
 	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
 	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
@@ -795,20 +781,17 @@ EGO_SUM=(
 	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
 	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
 	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
-	"golang.org/x/tools v0.0.0-20200904185747-39188db58858"
 	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
 	"golang.org/x/tools v0.0.0-20201028111035-eafbe7b904eb"
 	"golang.org/x/tools v0.0.0-20201028111035-eafbe7b904eb/go.mod"
 	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
 	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
 	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
 	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
 	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
 	"google.golang.org/api v0.4.0/go.mod"
 	"google.golang.org/api v0.7.0/go.mod"
 	"google.golang.org/api v0.8.0/go.mod"
-	"google.golang.org/api v0.9.0"
 	"google.golang.org/api v0.9.0/go.mod"
 	"google.golang.org/api v0.13.0/go.mod"
 	"google.golang.org/api v0.14.0/go.mod"
@@ -827,9 +810,7 @@ EGO_SUM=(
 	"google.golang.org/appengine v1.1.0/go.mod"
 	"google.golang.org/appengine v1.4.0/go.mod"
 	"google.golang.org/appengine v1.5.0/go.mod"
-	"google.golang.org/appengine v1.6.1"
 	"google.golang.org/appengine v1.6.1/go.mod"
-	"google.golang.org/appengine v1.6.5"
 	"google.golang.org/appengine v1.6.5/go.mod"
 	"google.golang.org/appengine v1.6.6"
 	"google.golang.org/appengine v1.6.6/go.mod"
@@ -840,7 +821,6 @@ EGO_SUM=(
 	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
 	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
 	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
 	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
 	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
 	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
@@ -872,7 +852,6 @@ EGO_SUM=(
 	"google.golang.org/grpc v1.21.1/go.mod"
 	"google.golang.org/grpc v1.23.0/go.mod"
 	"google.golang.org/grpc v1.25.1/go.mod"
-	"google.golang.org/grpc v1.26.0"
 	"google.golang.org/grpc v1.26.0/go.mod"
 	"google.golang.org/grpc v1.27.0/go.mod"
 	"google.golang.org/grpc v1.27.1"
diff --git a/app-admin/usbview/Manifest b/app-admin/usbview/Manifest
index d91760ed9bd3..33b35ea5be94 100644
--- a/app-admin/usbview/Manifest
+++ b/app-admin/usbview/Manifest
@@ -1,3 +1,3 @@
 DIST usbview-2.0.tar.gz 366337 BLAKE2B d3ce8f3b97ebb650f7cc8b47d7a4c4b985022811f55b43b41a65aaa120450aa187ce2dfc2671315575dfcbd108b68ca50420145a6c59ab85f7c4fcfc53a233f9 SHA512 87b3d0b0c734c94e5527f19575c0460f5c0b894dac29936a759d573058c9c007ad59c9be32a5c6d485cba258193efe4ca15bdd6f3ca31df321ed230778b5404f
 EBUILD usbview-2.0.ebuild 686 BLAKE2B 70ece8cbf300f8300cc70c621c9da4e8d117e02da3a3dfa83f5af7fa3abef43af9d99578104a9b3510f6b2401eb9d822be43faceca42c6207f630a7c4e9d9073 SHA512 cd8a78a4ac41cc15c80608a22576b05a4927c0171b91a555d067785ae7b56c1b8eb4c53ada052b9f510f409dc2bcf30c452646cc01c9b1ebe7d0ba09d5c03947
-MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/usbview/metadata.xml b/app-admin/usbview/metadata.xml
index 2ba8e9e851e4..7a38bb900964 100644
--- a/app-admin/usbview/metadata.xml
+++ b/app-admin/usbview/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>desktop-misc@gentoo.org</email>
-		<name>Gentoo Desktop Miscellaneous Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-13 21:41:11 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-13 21:41:11 +0000
commit	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
tree	c44943ee0563a3fa957716de909fed683117fcb9 /app-admin
parent	69051588e2f955485fe5d45d45e616bc60a2de57 (diff)