gentoo resync : 23.09.2020

49 files changed, 337 insertions, 2202 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index e3b851a81028..3e2db2a5f379 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index 13f2d4c4cf16..96437737fdb5 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,5 +1,5 @@
 DIST ansible-base-2.10.0.tar.gz 5775091 BLAKE2B 2a087b1a9d675c5218e8700f5b455ff280a5dc6e66b575a47755b9936c54594300e3c22acadbe14acfd335c3be788e3d63f6ad3c5c51650cbc036c77ceec41ef SHA512 f9e9631f9ce77e55b06d01814422cbc0ca170e3fbbbd5886e4f87065b68b4d7eefe1c782f6dce14241cc548192c7b06ef778446636be02a342d4bd112000126e
 DIST ansible-base-2.10.1.tar.gz 5980851 BLAKE2B 478c9ca6ebf423dea98830ed0447201dfb8db24f963f2fc849e0eab395611c1fb923c5060c397e12138c3e98d7118e367c4713f44ad07ca914e20c3044e74bba SHA512 77bc2f3f6b924299add7e3a57beaf4a0517b036027a785c177874ae6a07a06679de65770a296f81ab0022cb0b495f17e2ceb772f906172fbf46fb65609be1ce2
-EBUILD ansible-base-2.10.0.ebuild 1837 BLAKE2B be0a57437cefaeaf73ea7c3e1e51e0e537fbb84e3f33eeb49944c4ed4a1de1847e268048a0bb9514a564e51f09986d5d7f85017e898cac23700b9df5bed24e90 SHA512 6e62368737955d8fd9c9ab1aead4c7ae15ac9cde7636314348317e6d9b4059c39dd057d14b2de1e30a640f9a6aaddc2050290e4430f1ad7970bc035908de9b6d
-EBUILD ansible-base-2.10.1.ebuild 1839 BLAKE2B 0b9988118a4af77919bc62493f5857183670b9e8f9794f82b91a334099509f9ed26ae0021072efd5b815da792decded27d5d35ea0007cd80b72739063530d36e SHA512 68e107f805147a0adb738852ffabda2b7c1bedd73533d7b01ad169f49e793a2bce95462aa4d7dfb2f6f7a8738b0aca51bad9f761840d29fb80cbc66820b596d2
-MISC metadata.xml 1265 BLAKE2B 94811a3b6776a4ea3c775279b44101d9491871ad3f85fd023b40c3e3195f9b8ae9bb49fd10c3541774da693ec8520f0634888b32a5afaa2de99ccec1ad68d701 SHA512 19e505adfaebf46c83e92c8e5629fe18043a4bb33ef4b1b294234db89714bf8184f4922d5dbfbf5171c05505ef31d810de21da2fced98fa5536052108d29652b
+EBUILD ansible-base-2.10.0.ebuild 1877 BLAKE2B 41d5f94fbd49411c1d796dad14cfddf8c1279e043500360d6daf7ca445d7b460388a7eac22ee7a3fbaddd9f3e125b3523821706e61c7014f070581a3f44d4756 SHA512 9a02e1576700fcb9fed6ee86d90b6bd9ce533a354ea37c6012ac007e706aa64ed1862f2502c8f95121dc01ddfd89d86de12f3136b63fd4006799dcc15ae938e2
+EBUILD ansible-base-2.10.1.ebuild 1879 BLAKE2B f6b0bd28b79238cff7d918209757a8cf8b37ce9d3b23644e242afb799ae7d4fe5eb7978ceeb49ab1644fc7dab068035578217e5afe9962e408d8da34b552e7df SHA512 99ae5fa5f41f025a8483c561fcdfa33211e7c0ee44dd351fb5dce8c0e71104b6b27a62ee91310840271a374ec6ac0f89a9ceeba9800f521e22f879c16734878f
+MISC metadata.xml 1266 BLAKE2B 449ac5109e0fb6b64d32185f0660ce6e8c3828a830f8516d680f47ebc25aef880ab5116103d67cfba02e04b1ad496917fbf67252b7bfc062d828e22f15b961fd SHA512 95d52b68b5b3efad6d8575741430b2d1c18a7c7b41a1374229763fea7c599f3ff2b46dee51845e20388829faa4246e5a05011e61254e91d10709457a4b822f0f
diff --git a/app-admin/ansible-base/ansible-base-2.10.0.ebuild b/app-admin/ansible-base/ansible-base-2.10.0.ebuild
index 3cc5cd35c7bb..3610e3b40b00 100644
--- a/app-admin/ansible-base/ansible-base-2.10.0.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.0.ebuild
@@ -29,8 +29,10 @@ RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
+	!app-admin/ansible
 "
 DEPEND="
+	!app-admin/ansible
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	doc? (
diff --git a/app-admin/ansible-base/ansible-base-2.10.1.ebuild b/app-admin/ansible-base/ansible-base-2.10.1.ebuild
index 4abf588a0449..2cfa0593cbec 100644
--- a/app-admin/ansible-base/ansible-base-2.10.1.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.1.ebuild
@@ -29,8 +29,10 @@ RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
+	!app-admin/ansible
 "
 DEPEND="
+	!app-admin/ansible
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	doc? (
diff --git a/app-admin/ansible-base/metadata.xml b/app-admin/ansible-base/metadata.xml
index eb7c38b1c2e3..8e285e3eb63a 100644
--- a/app-admin/ansible-base/metadata.xml
+++ b/app-admin/ansible-base/metadata.xml
@@ -18,7 +18,7 @@
     <name>Patrice Clement</name>
   </maintainer>
   <upstream>
-	<remote-id type="pypi">ansible-base</remote-id>
+  <remote-id type="pypi">ansible-base</remote-id>
     <remote-id type="github">ansible/ansible</remote-id>
     <bugs-to>https://github.com/ansible/ansible/issues</bugs-to>
   </upstream>
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 579173ca5596..a7dd03edd54a 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,8 +1,6 @@
 DIST ansible-2.9.12.tar.gz 14260349 BLAKE2B 6d7fdc82489df755196b890b39c166e9639c94e4238b4bf33686a3ab17fcc92c6b3a05f80e1276795b966aaa318ec7d9003099950102c014adb1a5d730928633 SHA512 6c05c49e363d4d68516dfea448cead3e2c281d1288c9467a0b6dd083504f303df694ed1c5957ae6582b28acc937d12d13333254328e13bac430b9b7fa4354f23
 DIST ansible-2.9.13.tar.gz 14261322 BLAKE2B 5de939a99cd703eaf240f536a9a4b707e3931364647782dde2bbebd5b755253594cbb1cf8c4e9f22a14fca85c9f018ee6ea26bce1cbe2145ba72e5f5ec313670 SHA512 cb08adf62df0f3650425a5d960baadd7439c7c1e95b8f9df3d08e7504f9622b9e5f7104b8700b0f1e9fe318d349a6a5728e9178f0193fb4a190456e30a2f1eb2
-DIST ansible-base-2.10.0.tar.gz 5775091 BLAKE2B 2a087b1a9d675c5218e8700f5b455ff280a5dc6e66b575a47755b9936c54594300e3c22acadbe14acfd335c3be788e3d63f6ad3c5c51650cbc036c77ceec41ef SHA512 f9e9631f9ce77e55b06d01814422cbc0ca170e3fbbbd5886e4f87065b68b4d7eefe1c782f6dce14241cc548192c7b06ef778446636be02a342d4bd112000126e
-EBUILD ansible-2.10.0.ebuild 1881 BLAKE2B 98ff3e7d64e49b774fe82458424ea6b33c97a9dff05bdebb117d546ea499b14f322be259dde840da6503b76b2145dea5e32d57726fea3c0a50267e3a8dabfb3a SHA512 9d8fd4a7bb7d027c3dd3401892bbd8088d80ecc5e179ffa9873ae9401962445d0c99ba48a7b0e3496808c50f717bd1e20c462b830fe213394ddc6c193148b1e3
-EBUILD ansible-2.9.12.ebuild 1711 BLAKE2B 1697739493cf880bc2b0374ca2afc1e4fae28d0740afd9f237ad2507a3f69e7c837ccabdaf9cae2f66ba99536da0bcc83f6b5b364a63d41e89395c2e43d6add7 SHA512 719e35eba96cc4ef0d4558a508f553b63efe60151bed4e69671247b21f789090e34e75380a7267ac40639b75920cf3054ba6aeeee891adac98bec1d0c2243538
-EBUILD ansible-2.9.13.ebuild 1713 BLAKE2B a888274e71e059297c58d463de427aa3cc2c04ebf1bc272f98830cefe96c2a2dfeca7e3d5bf26b9724f1840631c586fab0753caf2d799e18dc94f23cdb63acdc SHA512 4582bd23813d31dee689dabd84f020e20249582dd8c51e7aa4221bbe21237e92ae5c48305e6bb0380dfafa754ff3cd56ff243a1e1ce93ffd9f89786e8fa42ce4
-EBUILD ansible-9999.ebuild 1697 BLAKE2B da48c9b97787143e815cc768b5aebbf7bf005ac8a8562a3420f4d4594214e601e90cab78a447017de45b7217952c5c2b0922e37c2e7770b2e786632089230b22 SHA512 0276bdacbfef27725a2714d8cc56d05c2c64d2b37fcbe77d7cbeebaf30828364a7ecf86ea960327d01ae1e3202387777b32d5903152b405036c2541bc38c7f9f
+EBUILD ansible-2.9.12.ebuild 1761 BLAKE2B 6107712ccf535e58d00972c73b6a07b40d09b1b3180a69a4cbb0909d9de532d1f4c2699e51ad2b280fa66ff854d69a5e65c01530a527f600e45ba31c5fba8f5e SHA512 a53f8f993f8f77ddbeb41948a2a1dc1943f86784984ecad49ccd099d65af2faba7467f927193fa25bee6125baf9c9ee460986ea7d04ff7e78cd588c9e4a1621e
+EBUILD ansible-2.9.13.ebuild 1763 BLAKE2B 968a38a35b853ead47f04d4094cb86be79972d5d13415272472776403e63e160842a6cc7e3d1c936efc80a6945fd580d56cfdad185f9efa7ad2ce161b58c4b2e SHA512 bb0dbd464c6c3edfb4aad153e1b558b1e1e4bc076b6ca787b17aed61b9d7a21505c65a3b345a02528a41598bf9a558f5ea4f300152fefa7aa8a5af008d294b9a
+EBUILD ansible-9999.ebuild 1747 BLAKE2B 8f93eabc728ab74ad23a341e1d58bedd9547562532eb55f43d1045d67a17a9ea4bc4cc8c8a386b4791bc5010713d1d4769970dc660ea126499fb172f2fc1fcb5 SHA512 e36d1d4adc1136e01a294c361ec18cd611dc2e7ac4061d139efb6fda14b3e396a3503200fa2c371865c78c38ec8b27db3c24e9329785d2f833da95e6f2cd7532
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.10.0.ebuild b/app-admin/ansible/ansible-2.10.0.ebuild
deleted file mode 100644
index 1477fa51b693..000000000000
--- a/app-admin/ansible/ansible-2.10.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}-base/${PN}-base-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-base-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile() {
-	# disable version checks on upgrade
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.9.12.ebuild b/app-admin/ansible/ansible-2.9.12.ebuild
index 2a5dea9c0317..7d5eb95e9a9e 100644
--- a/app-admin/ansible/ansible-2.9.12.ebuild
+++ b/app-admin/ansible/ansible-2.9.12.ebuild
@@ -29,8 +29,10 @@ RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
+	!app-admin/ansible-base
 "
 DEPEND="
+	!app-admin/ansible-base
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	doc? (
diff --git a/app-admin/ansible/ansible-2.9.13.ebuild b/app-admin/ansible/ansible-2.9.13.ebuild
index 8c8b3a948043..7a568caa73b3 100644
--- a/app-admin/ansible/ansible-2.9.13.ebuild
+++ b/app-admin/ansible/ansible-2.9.13.ebuild
@@ -29,8 +29,10 @@ RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
+	!app-admin/ansible-base
 "
 DEPEND="
+	!app-admin/ansible-base
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	doc? (
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 308ff48bd206..6ff1f27cd47b 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -30,8 +30,10 @@ RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
+	!app-admin/ansible-base
 "
 DEPEND="
+	!app-admin/ansible-base
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
 	doc? (
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 580294a6300d..996e77bfd793 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -6,8 +6,8 @@ AUX conky-1.10.8-virtual-sinks.patch 2054 BLAKE2B e047348df61b00dec0de151422a891
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
 DIST conky-1.11.5.tar.gz 2400965 BLAKE2B 06b6817ed3cb4bb638b5fa7f9a5f8544c9d274560dbef2bc8f8c10ed681b83d0ab27988f60bed70cd0c13cd4947a2bd9b70ad66c38dbb6f516f5d57165ef5765 SHA512 71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be
 DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
-EBUILD conky-1.10.8-r10.ebuild 4820 BLAKE2B 8900e0e3752030f9e6f5e4af8f8d0670afec4f2dea2eb10c7f7b1db8ee3662349307d347a432dd0856ca097415bfff753a13694ff6092152ea909097b2cc3ae9 SHA512 564e081243c567097107f06ed79ef8adadbb7ecf8a4c4a13ac6d33ce550769b971c34a7b8565ce750ba046fd643fe4ae84434fb0b0ad7407432596e84afa1402
-EBUILD conky-1.10.8-r9.ebuild 4775 BLAKE2B d26874074e404db1402fe0f524173c1e3f3dd3933fac5079057f39fd8d31de1072fe7addb11f3a8f766286d3241158db43639e825418caa731e304d66b10663b SHA512 68543176a72084c976383b7898a06dce3b1048066d1e2a22e814d43bcc690dd119cee5aaa94bf173b0e723bb04cacfbf5aa0b7da18ad9bbb051b59e064dd8dcb
-EBUILD conky-1.11.5.ebuild 4624 BLAKE2B 13d0ece3795f69587deec1f07f1f2030ae54e358fcaf2a34307f74945070f15746d88ad38a21a85d958c6cbddc439e41c6bccb0bf1e1f2c3fc68b011f2acaa7d SHA512 02feb735ef9f20febea1ecd1f61d53c292e952c5040afaaa9000a7ae337b96afb4c91b97971ec21e1b023dbc272fc95412774a9b6fcbf52a3215f9bfa2a9b43d
-EBUILD conky-1.11.6.ebuild 4624 BLAKE2B 13d0ece3795f69587deec1f07f1f2030ae54e358fcaf2a34307f74945070f15746d88ad38a21a85d958c6cbddc439e41c6bccb0bf1e1f2c3fc68b011f2acaa7d SHA512 02feb735ef9f20febea1ecd1f61d53c292e952c5040afaaa9000a7ae337b96afb4c91b97971ec21e1b023dbc272fc95412774a9b6fcbf52a3215f9bfa2a9b43d
+EBUILD conky-1.10.8-r10.ebuild 4822 BLAKE2B 9632e70138cbe4323adc317bccc856db9f2e3cd1599b0f4d390f46f3079ff4db626963374a0dcb00f431bd3938f94ca60e2e37a94dec402d7f6e013bcf34041e SHA512 d21b88ca76c9c7d32050b76a270748bfa96ba620a0061a2a392b55bb3e85caa7fe7053266c33639340e54e17fc0aa359a3ef9df18e8188d4c1713994658fc687
+EBUILD conky-1.10.8-r9.ebuild 4777 BLAKE2B 42eff9a8b3bb93f1620b301c6b4c313415c39ca4c4f9c81ee860fd15314ab4d12b2a1cbc1b58b58cd533f6dd9c69ce45a527a6e00c337aae9108ed73f9729b08 SHA512 612d3d918499ad3c51816256fb826d432e45be4634cd810d623a26a3138e7feef80639fb98206a8f590ab37f4a90e08bc3352627f5fce2abda0579f75f551d65
+EBUILD conky-1.11.5.ebuild 4626 BLAKE2B 4253a66bfa4639def23e37d97f8b8b9500ae50ca3bde4ed9ccfaacae1d4d1a66f56de536f2f1dc1ba5283ef2b71ddb87680d9adbcdec2ed89ab2a3b6213604e2 SHA512 83fc0bad524ad97e2b796f4023d249497a1b616e47d62fd448a33fc0a263a29e20a832c00745686a58b379a186f464e7363c864fec0147cb5c103561e52d298c
+EBUILD conky-1.11.6.ebuild 4626 BLAKE2B 4253a66bfa4639def23e37d97f8b8b9500ae50ca3bde4ed9ccfaacae1d4d1a66f56de536f2f1dc1ba5283ef2b71ddb87680d9adbcdec2ed89ab2a3b6213604e2 SHA512 83fc0bad524ad97e2b796f4023d249497a1b616e47d62fd448a33fc0a263a29e20a832c00745686a58b379a186f464e7363c864fec0147cb5c103561e52d298c
 MISC metadata.xml 2469 BLAKE2B 15947c03593a9d5215a9c1dd142458aeb84f61c77a669bbfa4abe256c94e28650516a0226350323f56bbc225c5edc5e9b9e3310d7957e072b6701e77e40623ce SHA512 75e2d5bd8f4848779c03fd983d995d8216f4bc35ca1d3af47cf004d1d43e36c2924523d286e13ea82c720a51a63d91e03af795e6c31471af71716b4c5ce46c4e
diff --git a/app-admin/conky/conky-1.10.8-r10.ebuild b/app-admin/conky/conky-1.10.8-r10.ebuild
index d84975354f05..4097461fbccc 100644
--- a/app-admin/conky/conky-1.10.8-r10.ebuild
+++ b/app-admin/conky/conky-1.10.8-r10.ebuild
@@ -61,7 +61,7 @@ DEPEND="
 	app-text/docbook2X
 "
 
-CONFIG_CHECK=~IPV6
+CONFIG_CHECK="~IPV6"
 
 DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
 
diff --git a/app-admin/conky/conky-1.10.8-r9.ebuild b/app-admin/conky/conky-1.10.8-r9.ebuild
index 647b0da5a8bb..3a8ea98b8989 100644
--- a/app-admin/conky/conky-1.10.8-r9.ebuild
+++ b/app-admin/conky/conky-1.10.8-r9.ebuild
@@ -61,7 +61,7 @@ DEPEND="
 	app-text/docbook2X
 "
 
-CONFIG_CHECK=~IPV6
+CONFIG_CHECK="~IPV6"
 
 DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
 
diff --git a/app-admin/conky/conky-1.11.5.ebuild b/app-admin/conky/conky-1.11.5.ebuild
index fcd0a6637700..78607b854ef4 100644
--- a/app-admin/conky/conky-1.11.5.ebuild
+++ b/app-admin/conky/conky-1.11.5.ebuild
@@ -69,7 +69,7 @@ REQUIRED_USE="
 	lua-rsvg? ( X  bundled-toluapp )
 "
 
-CONFIG_CHECK=~IPV6
+CONFIG_CHECK="~IPV6"
 
 DOCS=( README.md AUTHORS )
 
diff --git a/app-admin/conky/conky-1.11.6.ebuild b/app-admin/conky/conky-1.11.6.ebuild
index fcd0a6637700..78607b854ef4 100644
--- a/app-admin/conky/conky-1.11.6.ebuild
+++ b/app-admin/conky/conky-1.11.6.ebuild
@@ -69,7 +69,7 @@ REQUIRED_USE="
 	lua-rsvg? ( X  bundled-toluapp )
 "
 
-CONFIG_CHECK=~IPV6
+CONFIG_CHECK="~IPV6"
 
 DOCS=( README.md AUTHORS )
 
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index cd07ba720257..d682cc217a49 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -1,8 +1,10 @@
 DIST eclean-kernel-0.4.3.tar.gz 10650 BLAKE2B 228d17cfc5bed34e892dd6340498b87cbc32f22e83aff70824ef24f88836e3ad2306eda8704e25b7cfbadb33984edee8effd613dad67ada25519c601ec6b6ec7 SHA512 a2ffbfe800672ad0cd105425497dae72c0779ec9da5ba6a6b4efd8846762467acf6b8e70c67744e7c7639d5ba2ba4643ad344aae193e72d12d12f48b1793ff4c
 DIST eclean-kernel-1.99.4.tar.bz2 78909 BLAKE2B 0cac3a001c3180c57bdf9a63366d9950928690328fd560f984c1d35bcf88712e897462a153bc3f0250ebbbb42518798e3407c3533351543ff32bd68ecee2ee5e SHA512 f3263b83b36878104e21fe122eb96a16c5c5a930b062fdd62d6a574db597644222d5a19d7833cbb894a955076b06bcb1a22c94d5f87c2787420dd1de32d0f789
 DIST eclean-kernel-2.99.1.tar.gz 18608 BLAKE2B 3573df9b90e35fb9ac9ee4f5522daae5e9287ecd8cf612a3b984d2db663bc692e0a0eb05dcbc8ada63c69d43c821a55be11ccc3167a8a0e88f261d86dff173b5 SHA512 a9d6ccd6b5fe75f25fdd00f4cee3fe1d1c8be950958a2a28941a634e119a1715471ef129c20e077cc21e3a3925f2b8584b901265183fe75ff18e42d43ca52e14
+DIST eclean-kernel-2.99.2.tar.gz 18743 BLAKE2B 493a3f54e92821c76dde0228b382dbca0f9e9d69543e0af2269bdcfb736ef7450179d804f1a97b9e7700d812110c5f32b2667724f7c60e3377a8384e557b2f5c SHA512 48bb628be93922698483208471ec76b47615e80b5a7dead108d4f938664c72b080aa3f54f67056ce4b661ef92fff74f93ef842da1e177225793d13f8a3e16032
 EBUILD eclean-kernel-0.4.3.ebuild 504 BLAKE2B c655f9fcd2ed91fea54d637d0d4f04275d7b8bbccb82ecc07f70b8a48b9307037fe2243013fcb180232b6a8e55c1634084a9ddf651eda2bd05a5b71bbc9429dd SHA512 6a3675baf96a4c883f14b9f2d21a4d4f2aaa26d7ffb773de9df7d159510a9fc23592b155d35dcaf45337350a1fc49e2c2b82b8f86e978cf4b052f3f736d9c346
 EBUILD eclean-kernel-1.99.4.ebuild 362 BLAKE2B 20894519cc3270ab4880c0373894638d18ecfeb34fa49a7f801e4889d22f78702c87201c3cba929092b38149f3b14109b058f95f597eea8c1507011af37b14d8 SHA512 61b64ce5d1f0e842de988f1d62bb41af6e16ef73a05ab35b90d97410292c5409c3873fac6dbd9a09e4be033cd19e70a283cfd6be48183409822c29ef26abdc85
 EBUILD eclean-kernel-2.99.1.ebuild 542 BLAKE2B 60fbfa52a815f7ac57167e033f5a94e67295882c0a8d52bc5713209846946444005b33c69dc1112b32075c9043eb6cb567600a32e32d900c43251ac350e73355 SHA512 88f6c6f8cdafcba4eeec381a069f87f4eb5fa080cf3e5670d3f4d572badd6bcac0ea4978ed4985177efbbab97e8097b5e382d565e022495dc5c415d207ce69fc
+EBUILD eclean-kernel-2.99.2.ebuild 542 BLAKE2B 60fbfa52a815f7ac57167e033f5a94e67295882c0a8d52bc5713209846946444005b33c69dc1112b32075c9043eb6cb567600a32e32d900c43251ac350e73355 SHA512 88f6c6f8cdafcba4eeec381a069f87f4eb5fa080cf3e5670d3f4d572badd6bcac0ea4978ed4985177efbbab97e8097b5e382d565e022495dc5c415d207ce69fc
 EBUILD eclean-kernel-9999.ebuild 511 BLAKE2B f19c47829c9f0a644d0b3a44655ef9afa52ba1f428e71176449f19128f33d99ae38c3651d133a8b6bc15e2ae9b3693201f4f2425014212698d0468a1b9d1bf6c SHA512 aa71821ee76230407ee479c45b7780d94ae36c96c50ddd4fb9bd880e5ee0e7b154275ff0c31af1e96e8c59f47ff0959cd23e2682e4e1b365bc6136396ecde166
 MISC metadata.xml 539 BLAKE2B 23dbdae146e666b8698181642673dc708027ddac7c33a9f53edc9cbf1d1e1ce62e8d4531a6962098bdd6cd2029369b587823b2f9630e285b43c0db340b29e70f SHA512 2a74b715ba28178d042f907014b02fd181e0e481f4eb9230b15ef542be61b2e1fce17efba4819b6d06de09ed7988b39047b59182b6c4de86a2a05ad0350635dd
diff --git a/app-admin/eclean-kernel/eclean-kernel-2.99.2.ebuild b/app-admin/eclean-kernel/eclean-kernel-2.99.2.ebuild
new file mode 100644
index 000000000000..80c233f40feb
--- /dev/null
+++ b/app-admin/eclean-kernel/eclean-kernel-2.99.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Remove outdated built kernels"
+HOMEPAGE="https://github.com/mgorny/eclean-kernel/"
+SRC_URI="https://github.com/mgorny/eclean-kernel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="kernel_linux? ( dev-python/pymountboot[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 31faf2463c49..8858c29a05d5 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,7 +1,5 @@
-DIST entr-4.3.tar.gz 23756 BLAKE2B 0272b0185932d7c388818df0cc615e991c9545473a823c478ad9f0b6a23c97c0f4b2727b109a7bb18e2b0792f18d94d188d4a5d3fc90c479628ea078b1288f96 SHA512 f65dfc3f106e25ec4ff39eaec94222d8a547eb35390c654f6a741f92541c1b86d7d303a795308fcbfced44ac8eca6ad67e70393802ac9d46153e037dc1eab902
-DIST entr-4.4.tar.gz 24125 BLAKE2B c77b4a862c0b4a2861d7e2784fbaa3f60899a9934314a5cf3abb01d70df946e3786957cbaa9ed58cea7171390d115157f0d9a48093f6e7a8c05bcabf34da9792 SHA512 355bc19cfee9a9b5a460b136d8db014a1d129b6e4c95d905c1c4557cf7d845a076d260798ae8b84221563c049a9bd6d81974f00eea681abaf2eac2f2f5e6d087
 DIST entr-4.5.tar.gz 24674 BLAKE2B ee9ce841c5b3adb2bddb5742c73311b6924e914b896297d56ca3397812e8d528a25276b2b6882e2391f649106e4bf1ebc81bc1cec837b8ce1056e2575eae20da SHA512 db9499d78385df5056a30a4e3262fb436090acc5410ddfc529a7cfe4e10e304e13787abfc31dd38dbf8b9f01fa3369ef32d20c9fb903fa35763f41791bdda9c7
-EBUILD entr-4.3.ebuild 578 BLAKE2B 65f1c99b403ee686a265ce41713faf013e0badcb545a1fef69bf7617af35538aa4c37100cceca603f9cf98a2162d81db4fc43c1e65b15a539d7e4d05a9ffd6a0 SHA512 1560373ff2342ae3726efd781dc538c558a46767b910feda4b04bb281827d4d4009cf35b654ea6978ce5ac31176b2bc6c58118b43a9c270c8d98c439e1e94c2e
-EBUILD entr-4.4.ebuild 578 BLAKE2B fca2962c24f9694e63fd97a6456fe7c628205016df398c79ed1e8cdd03a9fa8e7701f240747c1602a3e2f7449434f12f135d1122064c32b462a52905e466fc7a SHA512 94290e46fc8b37b5b4673bb105bb5bcbe039b97d1049d4a12ba2b00b18db4fe9806bb3525af8c55e2ef79b19398a07717c5d262fd174379fd3a65803bb05aed2
-EBUILD entr-4.5.ebuild 578 BLAKE2B fca2962c24f9694e63fd97a6456fe7c628205016df398c79ed1e8cdd03a9fa8e7701f240747c1602a3e2f7449434f12f135d1122064c32b462a52905e466fc7a SHA512 94290e46fc8b37b5b4673bb105bb5bcbe039b97d1049d4a12ba2b00b18db4fe9806bb3525af8c55e2ef79b19398a07717c5d262fd174379fd3a65803bb05aed2
+DIST entr-4.6.tar.gz 24909 BLAKE2B e6c1eb5da1a3b94d593297f9975c36ea98d88c5b6ac17c34934c8d4678fb1c247699b8ff3d481a3972a67fd0abba75687b11489258be98990713e2041a12c2d0 SHA512 41e8c2311c7833a778193b13d1e0b1bb18ece54f5e20b8b5b0b4a2308ba1cc1a8b8378700dbac83ee68822b5f847a3fa9c47822d22a22d45da792d2408f48378
+EBUILD entr-4.5.ebuild 574 BLAKE2B 62e54855ee13304a42fc9c3008bba21b5958debbc3f6beeb4dd4444a6b21689baa52b68a4f3e0cfce3cd313c49dfedec4b7c37d103a28a7d2b6819cbbc2c1c45 SHA512 d01cf7128540b816837035b222713937d86da67592d5ae87ffe89a3990741e1c8be565570844f2978b21d287a487a323822b018ed57690afe50873654f9ab474
+EBUILD entr-4.6.ebuild 578 BLAKE2B fca2962c24f9694e63fd97a6456fe7c628205016df398c79ed1e8cdd03a9fa8e7701f240747c1602a3e2f7449434f12f135d1122064c32b462a52905e466fc7a SHA512 94290e46fc8b37b5b4673bb105bb5bcbe039b97d1049d4a12ba2b00b18db4fe9806bb3525af8c55e2ef79b19398a07717c5d262fd174379fd3a65803bb05aed2
 MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-admin/entr/entr-4.3.ebuild b/app-admin/entr/entr-4.3.ebuild
deleted file mode 100644
index c2fb5be80105..000000000000
--- a/app-admin/entr/entr-4.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Run arbitrary commands when files change"
-HOMEPAGE="http://entrproject.org"
-SRC_URI="http://entrproject.org/code/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	sh configure || die
-	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
-}
-
-src_compile() {
-	export CC=$(tc-getCC)
-	default
-}
-
-src_test() {
-	export CC=$(tc-getCC)
-	default
-}
diff --git a/app-admin/entr/entr-4.5.ebuild b/app-admin/entr/entr-4.5.ebuild
index b86dea0ffd94..6440b0ac6005 100644
--- a/app-admin/entr/entr-4.5.ebuild
+++ b/app-admin/entr/entr-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://entrproject.org/code/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/entr/entr-4.4.ebuild b/app-admin/entr/entr-4.6.ebuild
index b86dea0ffd94..b86dea0ffd94 100644
--- a/app-admin/entr/entr-4.4.ebuild
+++ b/app-admin/entr/entr-4.6.ebuild
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 4d57131cf123..c13ae6612d26 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -1164,6 +1164,6 @@ EBUILD filebeat-6.8.12.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd25213
 EBUILD filebeat-7.3.2.ebuild 1497 BLAKE2B b130f2fa0916e4b37b238fb87ef6ab80f4d94bee5df788873537b9031a718c4300d3582d7fd070421f06a8b034b853d3b4a89353d572006160a660cf8882ee8d SHA512 900e496e61e21a2ccbc5eb657161c03021f0b95315d688ace1d4ef1c00b73d20f015aec5e562d7d3d72a139daf3b342501d2515d782635bbd64fd2752641a422
 EBUILD filebeat-7.6.1.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd2521334c42434e30ac0a29b7647930c9265dacafb517d681746e919db3ad67fa07f142bef3a7e302e826137957af5131 SHA512 7a8a32a3e8f1677c496df38b22764340f7ded39500a6dcd9f9c28fd82eaae0131e9d17ad43b4952744e9b486ad868ad779bd696af203bf1663c1d5143dbe5cf9
 EBUILD filebeat-7.7.0.ebuild 52042 BLAKE2B 6ee271360e4e29757e9b45afa6a8db0cef2c8ee9bcb75392408d9ccfd4f8c9bd4d4db7a8d897d3b794d1136235f4db7e8dd72de5f3da4ed1b93f25d6d64ad23f SHA512 2ef37ed61908f01ed4aab65f55befb7ddc2f4224ea703ea8f6d3e3991ae4fe5c473b363b73cf1935c4f597811479a1d486da0ed2858664add8a94dd8a4f8f1a6
-EBUILD filebeat-7.8.1.ebuild 55906 BLAKE2B e2e6704ce324b9dbd9d64385812e4cd098308366ed05627fa1214382ab9f8e4deb5461fe77276310ebaef2a89c6eeea039d472b890be122560f18fc938049883 SHA512 37353b75c3abf9c5ceeef094443320ca9915c580b5c83f7fd7f55cd1312a118e7ea8aacb9d5c5a4e3e59f29d4f5cc09a1d7ea5ba2a864702475f5fc36dd554d4
+EBUILD filebeat-7.8.1.ebuild 55905 BLAKE2B b50831f6da888a6204319de0eb870f9fc1cf08256b21f05b245e939388e40c0caaedd1ccb3ad2287b872a28c014b02c3637bf49b78ff0f995d512f29ce72560a SHA512 2ac4bffb8ce43de76dae510c1f49f395136a9318199200f09087ea93598e52073c506cc61b7c9803c641c8c6665e146906581548f87a10828956115085b74194
 EBUILD filebeat-7.9.1.ebuild 55141 BLAKE2B ceb892d7c4b4760490a59fb15a943d9e94c479ce13bc84f2faf87a5f983a8335b1477a0ffd3a5ff281bc26c3bb6311c03252933c7db92aad262b74d4738ae17a SHA512 6a79de1b6d1013eb4d2bfe8482bc370ce17a81f39c561f913bb3694e5dd50a752bea1775405b9cbdc7ae4d07f7c68579354134fcfaa0b1dc10f4006bed27a116
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-7.8.1.ebuild b/app-admin/filebeat/filebeat-7.8.1.ebuild
index 901d955ad21f..7ce027c621b3 100644
--- a/app-admin/filebeat/filebeat-7.8.1.ebuild
+++ b/app-admin/filebeat/filebeat-7.8.1.ebuild
@@ -984,7 +984,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/keepass/Manifest b/app-admin/keepass/Manifest
index 6acd98bf5516..0c961cfdcdb2 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -2,6 +2,8 @@ AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45d
 AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb
 DIST KeePass-2.44-Source.zip 5182922 BLAKE2B 092d1b982d748ea1b13f26fe5423a491855cb491c80cae7632429d488f80fd730df5d2f1613bab528d55a3aadcf0cb4f4055a637d2b14b68a468e4baf9ab1837 SHA512 ef2ca69e40c0787b63fc30a2b222dd77fd9f0addf8593511dcd0a47580cc8de5e0900c7d4e6f77c0e5a49d1728286cf1b5856cdc65ef175e4acfdd1ffc54b55e
 DIST KeePass-2.45-Source.zip 5011684 BLAKE2B cf7fafb2666f2e0005533e441f1855006aa64aca69b4829fa66117da88f92e6aa65d58b303a099221e796a500bc5abab5c3d0654e6fa53c3fe6f36d3cb18e381 SHA512 3f9b14e57fce047f8d8ae7c289fffd954545c5638fa20392e7864301073452a4353f487832730fb600e1729b1333360c1bce7e66fc8629788e666418a2afbf9a
+DIST KeePass-2.46-Source.zip 5054069 BLAKE2B 81567ab4589e53ae5cc1b75fa42cc61d9d0f390edfa8f8d860dd118a95185a8d2ca417b30b29e2b544b1d4eeeb0069fab2f0be7900fd4d7fb87d41c417b99876 SHA512 ca045cb7363092f948d72243991fe398836b13183cc2685477d7ce5dd629213b5803b4216134c7ba6451726b79ca43d1e93a1934c9cbff46293fa916b9348219
 EBUILD keepass-2.44.ebuild 3228 BLAKE2B 58d0e7a54ee7aace849c916e08b45bd6e1e5e838982f54efaccecea3279eee65aefcbbe6a3291828bbb769f938b09ea5a644b4a85667f2420bda90a2743e1c7d SHA512 ea1e5e8addbf66756fe812bddc29d4c8da359bb68f03ba1322f517a36d6839e4e7972628676108efb23ffcec64a42266f848854c55a79a8f7a971a2ac904633c
 EBUILD keepass-2.45.ebuild 3229 BLAKE2B 804f64ae148cb8fc30a9278b9dd1e90e2e9fbc966432e708bdfe3210f4bbd7863ab4fce8f4131d788525331777a3991b02ebe1202e4365414dd57370987a4b6e SHA512 12fa7978a687562145af54e3730ab832f50f732b56b3c76927e3286cf1fb24c0f7dac3ba2ac984560c56449b3845c073ac99aba457d5b51bda1eccd14ed5a6e2
+EBUILD keepass-2.46.ebuild 3230 BLAKE2B 9e3c55cb5220c18d7044de21d21cd96a1ad5f145ecf627d1db444ed5a187bc97aad27332c1e7a841c8153ae86eec2dc50f48a00567e681714b3354fc81b1c965 SHA512 b1c53ec9a3f97156823bb6c9265f0fa89b7c000a943557dfe3ba5a19eeec36657d537340692eeaccbf61b3af8508785b78cc0615595775b1e9074a285d53605a
 MISC metadata.xml 651 BLAKE2B 058fa70fb6ce35fb52464a84cf506ad117343a1376a40b003c4f55bdf94369136276d8bbb67f30490eb73cba4df6b03d78e8c2a65cf8141dd6cf64654c9b6358 SHA512 6251f546e631decbc7692ab00900d722031ce638f3d878771a2bcfebedba8e1fee9b3e54dfd4c3ae3c711006099fc5a772555ea7cc018d012de164755ba8b52c
diff --git a/app-admin/keepass/keepass-2.46.ebuild b/app-admin/keepass/keepass-2.46.ebuild
new file mode 100644
index 000000000000..db354f613661
--- /dev/null
+++ b/app-admin/keepass/keepass-2.46.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="https://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+# bug #687052
+# file generated by mono --aot where *FLAGS don't make sense
+QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so"
+
+src_prepare() {
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+	# This XSL file will not be upstreamed since the KeePass creator said that
+	# including this patch would break the Portable USB version of KeePass
+	# (which keeps/looks for xsl files in its own folder)
+	default
+
+	# Switch into build dir so the mono prepration script works correctly
+	pushd Build || die
+	source PrepMonoDev.sh || die
+	popd || die
+}
+
+src_compile() {
+	export MONO_REGISTRY_PATH=/dev/null # bug 659808
+
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto "/usr/share/${PN}/XSL"
+	doins Ext/XSL/*
+
+	insinto "/usr/$(get_libdir)/${PN}"
+	exeinto "/usr/$(get_libdir)/${PN}"
+
+	doins Ext/KeePass.exe.config
+
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}/${PN}.xml"
+
+	# sed, because patching this really sucks
+	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype/autofill)"
+	fi
+
+	elog "Some systems may experience issues with copy and paste operations."
+	elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-admin/kpcli/Manifest b/app-admin/kpcli/Manifest
index a11defeefeb6..8bf190a941f0 100644
--- a/app-admin/kpcli/Manifest
+++ b/app-admin/kpcli/Manifest
@@ -1,3 +1,5 @@
 DIST kpcli-3.4.pl 211243 BLAKE2B 4880d832554de1956e033bba2e2021b9dc0b77202585663b0f4ad2acca520bcb430ac974bbea00c21aa37c2c8e8fa8c5cf2e8131542c20ecc3c6b0ac6dd85d9a SHA512 1ec9ea46f769a6891700565a51c592fd4809a0f3bc1d2088ca694233b276652506b470328b8b840cd0876b945faad27a16a5685d8655868cd20760f24619ffaf
+DIST kpcli-3.5.pl 223904 BLAKE2B 1d2a497c0225980eabf0c95d9fa2e89e7d94e4422f97744fb325d41393b80ecaf423b67666014c2c41076b9b2e85c41e761e72b3b89800b405d26b67f49f9afc SHA512 d9454d47cd90e647ec0695b9a571c64c389569a676e1d172fd6b6a6dfd1170ca63bb23ca2c00dc35e93984fad409864c13d5562484a1a513a152008b27cf9c0b
 EBUILD kpcli-3.4.ebuild 961 BLAKE2B 7977700e35b9de9a1aca2f8b78d70fe24dffd24bcb5129cb1973f79cd57a432fd8543018824f7d5fc747ee7886db2a2237649389b2eee38dfed10aa55d0ffedb SHA512 095dc8d271e2ae90b6910eaff98e290febfca02a7586fd44e5badd8c924b2f02ef80796983f285d6c7cc547c3cfbb4cf084e256850cad08e23fc6a8b7fb86ad7
+EBUILD kpcli-3.5.ebuild 1140 BLAKE2B 07eb14c737947896db21c4858e9dfdcacd87f6f5937b2e3183445a0437d1671b96213b77a736830ec433be84c1ceb806cc2090c66f3be4d590cedddb5ea754f9 SHA512 46b3fa3048af8f7bad8354fa874dcb53d2c736694c8d2626eac221f66fc137d203d1fb76d429c303e4dc751026c566737066539631a339d1a348cbf7ec85fab2
 MISC metadata.xml 476 BLAKE2B 49c33b8c9713bf01f667d60e72900e99139ff425e1c10e74736bdeff840e66d7a507aa079ca334639abb9e8ef1899aa3ed37114cbf196f9309124d54ea13b774 SHA512 35280ba9f2eafc0e28b098ce0af3ec9fec17fbb956068b873516c0a28539c4d05cfecfdf71477a9fb78cf3238ad7363dc128ad149e91619485624959b780805b
diff --git a/app-admin/kpcli/kpcli-3.5.ebuild b/app-admin/kpcli/kpcli-3.5.ebuild
new file mode 100644
index 000000000000..73dabd93e84a
--- /dev/null
+++ b/app-admin/kpcli/kpcli-3.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature
+
+DESCRIPTION="A command line interface to KeePass database files"
+HOMEPAGE="http://kpcli.sourceforge.net"
+SRC_URI="https://downloads.sourceforge.net/project/kpcli/${P}.pl"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-perl/Clone
+	dev-perl/Crypt-Rijndael
+	dev-perl/File-KeePass
+	dev-perl/Math-Random-ISAAC
+	dev-perl/Sort-Naturally
+	dev-perl/Sub-Install
+	dev-perl/TermReadKey
+	dev-perl/Term-ReadLine-Gnu
+	dev-perl/Term-ShellUI"
+
+src_unpack() {
+	mkdir "${S}" || die
+	cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin kpcli
+}
+
+pkg_postinst() {
+	optfeature "time-based-one-time-only password support" "dev-perl/Authen-OATH dev-perl/Convert-Base32"
+	optfeature "X clipboard support" "dev-perl/Capture-Tiny dev-perl/Clipboard"
+	optfeature "password quality check" dev-perl/Data-Password
+	optfeature "better password quality check" dev-perl/Data-Password-passwdqc
+	optfeature "importing Password Safe v3 databases" dev-perl/Crypt-PWSafe3
+}
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index a0ca1956407c..50b8d98b58e1 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -3,5 +3,7 @@ AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de412158
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
 AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84e914a82cce16782b2c9dfdc83123d609cabd4e9e60eb38a9e43fe7a22a2afca8f53c3dc8e65ac87 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75
 DIST mcelog-170.tar.gz 312911 BLAKE2B bab27c60fca937442a0f07929eaedd392c3e8de3e5f705f717d787652b6c0fa91e42169b835ea2527729c487773c7baabfceeebd3fd58d64a853ff17d8fdd8a8 SHA512 f5d29bde88cd3925c0e629850adce7f1040ecc4703c45427424f5d56f28a0add1fb24538e5c4e0749743c92479d3ea6da583c23bb41eb6a8d899626d818cb6a4
+DIST mcelog-172.tar.gz 313103 BLAKE2B f3acf5a5ebd1db92f7cddfa0e8a848bd6fbd361932ae52400c26f5aeaf7727f6dfd278ab7c1282229d9208474add124401a4665a4febe0debffad7818bcf6223 SHA512 adfde12b9f6f21ec6276c55d3554a3cdbf156e44df2f85c28d9d608418fa57b3f4a0bfcbacd13e92b77eddc1efdaeacfe3c89d203b8cbd3757f35fe419806547
 EBUILD mcelog-170.ebuild 1367 BLAKE2B 420ec47206fdc6484a7aafc47005ff34a82bd689da636958c99df79fd884fc25f353aee6a63a3673c4357d0f6e5716309251704a26865766d0ea8d135cbc2c15 SHA512 7f980c2058ea1a07c2934a2cc49b8bdb083b6a4fd3a6c1eaf2a9889fbc845f36a6f6c3b27a6b69162badf71824d219bcad047265f77b064a15cb3ad8ffd4a6cb
+EBUILD mcelog-172.ebuild 1369 BLAKE2B 28898352135feee6b52597bc287a9662dedcda130127b27d504641117f102422da9c41cc6dbdc70bebbe50f8c43f63ef997199406c4618e9ac1a58a985d74e33 SHA512 ed1b2bc475a69db7772e5ee18b56766ca7cb4776f09fa14ff7baefd369127be5167ccf56e038d6e793277a0928b1f8b25437ab7b6aa103ef1608acc15450dc21
 MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/mcelog-172.ebuild b/app-admin/mcelog/mcelog-172.ebuild
new file mode 100644
index 000000000000..e0b67a2d755e
--- /dev/null
+++ b/app-admin/mcelog/mcelog-172.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	insinto /etc/cron.daily
+	newins ${PN}.cron ${PN}
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodoc *.pdf
+}
+
+pkg_postinst() {
+	einfo "The default configuration set is now installed in /etc/${PN}"
+	einfo "you might want to edit those files."
+	einfo
+	einfo "A sample cronjob is installed into /etc/cron.daily"
+	einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/rcm/Manifest b/app-admin/rcm/Manifest
index 478595c0f8d5..364418e93692 100644
--- a/app-admin/rcm/Manifest
+++ b/app-admin/rcm/Manifest
@@ -1,5 +1,5 @@
-DIST rcm-1.3.1.tar.gz 89437 BLAKE2B d897b793158da3a5e3975e283bd209f43f98eeb085bfb235802e8f1e3249ce2e09de2d8c391f89f4684afb78adc6c0b2bd91267cc32dcfe87b6b22296b47f309 SHA512 1fd8ad6f8bee16177444469bddbef8d9b99f0b2bedc82c9833523370dfda4583c425f1ab8f2195f11236d1385553a2a49ead6d4c5f0803deeb56737b6836a0d9
 DIST rcm-1.3.3.tar.gz 92193 BLAKE2B 42634fad58bf75b622ddf593cf83749113ffd35cba6b91f370b98b1211f5cb61274acd6f23e0be2ba7a49e966bb14c767b636aecc6c9a90b5802f13a2b123b53 SHA512 aa00edd76ab494a65cf3e97103d3bfffa427af83e57391cbe8e07ad2516b910c85d2e99a24405390fd27feee20752bab4b4856eeb8bac48eeb6f5707875df99a
-EBUILD rcm-1.3.1.ebuild 416 BLAKE2B 85848bef660645e77648d5b43a08db67bac029f715ca6881120ee0a90778b8327aed1352ec306de4b38eccb5db9aa0a37114e26892d2fcc84cc2e8604d72cb53 SHA512 8e1a547e68565ca4ddc011e716116dae636f6cebdb7f1f2627897fa6a8d087fcb49364add248891d2260932df95d0e90189b8fb93ae4bde472606268386f19b7
+DIST rcm-1.3.4.tar.gz 93200 BLAKE2B 13ed8694e67fd38e9547e310d50b917566889c74b133446b4384f80084036d62130ffac0b3e17ca6020eb8909193f6095ac42a9d360c7f2d529b31253b87e2d3 SHA512 347facbb99c08ead942a299ef981a22e4e1578235d256343a91d1f0e9ffcda8e8053d6470861538a7435fdff2a176221a17222858eb5e0e8c5c4930b399e7fc5
 EBUILD rcm-1.3.3.ebuild 416 BLAKE2B 85848bef660645e77648d5b43a08db67bac029f715ca6881120ee0a90778b8327aed1352ec306de4b38eccb5db9aa0a37114e26892d2fcc84cc2e8604d72cb53 SHA512 8e1a547e68565ca4ddc011e716116dae636f6cebdb7f1f2627897fa6a8d087fcb49364add248891d2260932df95d0e90189b8fb93ae4bde472606268386f19b7
+EBUILD rcm-1.3.4.ebuild 416 BLAKE2B 4c1212c558b43b96fb992f32458999cc83256c6d3044294e84212fdf15d862f41ddf5b9c91ea9e1c148c303d09e3f4fc2868550c2f7ab489547cf989358b1dd7 SHA512 62f70fef380fa10e2e55824808bc262571a9725ff71a71d625c872ec615f897c026843d1a9ed7bc0775f685bbe7c5bb80b1c3ecf6d9cad3a98198b1f8d74634f
 MISC metadata.xml 440 BLAKE2B 1edcf43bc0d329398cee6c04622b7bcc00d6fab4477cf99f63a7eba25b43daeef01a6f5bc59bb0b57718c0a5975f823e1abab3a95a6d1765c5b819eff27c5384 SHA512 55fa56c5a9130a6be54237acc017b15e2316006522985906788a4a33078f2580b705bc53f2d488b3b5ec6ab4a08dc0749658315cbba812fb5d9cbd04bba5be11
diff --git a/app-admin/rcm/rcm-1.3.1.ebuild b/app-admin/rcm/rcm-1.3.4.ebuild
index b83724655d3c..f2ce408773d9 100644
--- a/app-admin/rcm/rcm-1.3.1.ebuild
+++ b/app-admin/rcm/rcm-1.3.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="rc file (dotfile) management"
 HOMEPAGE="https://github.com/thoughtbot/rcm"
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index e9cefe457bb4..86588a3c666b 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -1,5 +1,5 @@
-DIST restart-services-0.14.1.tgz 20909 BLAKE2B 2f6b74fc6094be83e1872d2a6ca7abb02a49b5db65d81cd37f8161bac148e5fe0614502f1f06356ff9cd6c6ba03c416dae1eec3a86f48dc011bc6e28c1b076e3 SHA512 3434c4b6cdf9d02b035eba2cc67cebe8e06a2cf31c2d8627063b84224dcb6d44e276e1fcb82221ad77ab7ee7e16fa7ee58fb94b7849d40e6786d3fcfb6087866
 DIST restart-services-0.15.2.tgz 23688 BLAKE2B e043b872d55109ad176a6437006cf581a993e72e460bb034625ed612f9ceca85ef91a20e90f23bcecc964caa527cfa4bc39d97c52487b7bf92eec21dc2e35c48 SHA512 afe7c96aabf61d664460d5d68447df09b3d9a54098887727db796821220f5ddd5a3b5030d995d5a6c3128e4a2b8494b9a0a3b86b5c805d56c0e201058ad04327
-EBUILD restart-services-0.14.1.ebuild 2285 BLAKE2B 7eb13e920790aae88e74b10cce100923aa490726011cdc33f96d0a38be957a0cbdc44e13a52b51a8b3c8d30e33464f72073f49888ffc4c573a65287ed49624c7 SHA512 841a1c6fa9d4c8b435f015c1785dd7c39929c808d771b7095f89a2d2832664a5b8915b3dfe56db5d9e4898a3d21b93e2c8ae01fa4502f33e5396ec6508c55a53
+DIST restart-services-0.16.0.tgz 24531 BLAKE2B fea233755d214a502096551226078a7fe15a75ccf937bbf8a75c78b7a294b5977da453f54f37e3d7e65f131e49e018bf08bec6245a3aa46ec6c3bec94019f5ad SHA512 57b3514132c02839cafbfd9152445a6482cf3591e22d18436a4d894061b59d2495863a912a87495559e9945a39715e7e798dca44dafd52c26b5412d749f37cc2
 EBUILD restart-services-0.15.2.ebuild 1791 BLAKE2B dd068050b6902dae67edf63b00afc64e65b53225d14e7a201da6cee76dbed62af643625a7ed10a4021481f4e3a0a31f8534972ba6132cd468262af73947042c2 SHA512 74dc54132343203ab53b13d1649bd9e4b3a28d31040e5c54f32707b94267cb0d29873d48e3a3e00d70a7763a6f57d841518602c405599f575e359b5fa9f1e999
+EBUILD restart-services-0.16.0.ebuild 1793 BLAKE2B 7cba407e822b45ea90c5cc88ad767d232d4195f5e4b8d217237833f36679081ab7bf367d96d406e02adad4722a23d8826ee958bf6af70248e5d8156fd9951b66 SHA512 d958bd1e77eb7b68d89a55e34716d0f4f4dd2b1af407a3449d8d859484770747bd05ad9668c5e1ecc32636d8e63c692480a9d4316b8f8e5d25caa3740d1ec109
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/app-admin/restart-services/restart-services-0.14.1.ebuild b/app-admin/restart-services/restart-services-0.16.0.ebuild
index d83a7fafc540..874ac8f35520 100644
--- a/app-admin/restart-services/restart-services-0.14.1.ebuild
+++ b/app-admin/restart-services/restart-services-0.16.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Tool to manage OpenRC services that need to be restarted"
 HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/"
@@ -9,13 +9,14 @@ SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
 RDEPEND="
 	app-admin/lib_users
 	sys-apps/openrc
+	app-portage/portage-utils
 "
 
 src_install() {
@@ -26,9 +27,6 @@ src_install() {
 	doins restart-services.conf
 	dodoc README CHANGES
 
-	# remove after 2018/07/01
-	dosym restart-services /usr/sbin/restart_services
-
 	sed -i 's/^#include/include/' "${D}"/etc/restart-services.conf
 	cat>"${D}"/etc/restart-services.d/00-local.conf<<-EOF
 	# You may put your local changes here or in any other *.conf file
@@ -48,34 +46,16 @@ pkg_postinst() {
 		MINOR=${MINOR#*.}
 
 		if [[ $MAJOR -eq 0 && $MINOR -lt 14 ]]; then
-			einfo "Migrating config"
-			if [[ -e /etc/restart-services.d ]]; then
-				ewarn "/etc/restart-services.d already exists?!"
-				return
-			fi
-			if [[ -e /etc/restart-services.conf ]]; then
-				ewarn "/etc/restart-services.conf already exists?!"
-				return
-			fi
-
-			if [[ -f /etc/restart_services.d/00-local.conf ]]; then
-				sed -i 's/restart_services/restart-services/g' \
-					/etc/restart_services.d/00-local.conf
-			fi
-			if [[ $(ls /etc/restart_services.d/) ]]; then
-				mv -v /etc/restart_services.d/* /etc/restart-services.d/
-			fi
-			if [[ -f /etc/restart_services.d/.keep_app-admin_restart_services-0 ]]; then
-				rm -v /etc/restart_services.d/.keep_app-admin_restart_services-0
+			einfo "Checking for old config"
+			if [[ -f /etc/restart_services.conf ]]; then
+				ewarn "Old config file found: /etc/restart_services.conf"
+				ewarn "It will be ignored so please migrate settings to a file in"
+				ewarn "/etc/restart-services.d/ and/or remove /etc/restart_services.conf"
 			fi
 			if [[ -d /etc/restart_services.d ]]; then
-				rmdir -v /etc/restart_services.d
-			fi
-
-			if [[ -f /etc/restart_services.conf ]]; then
-				sed -i 's/restart_services/restart-services/g' \
-					/etc/restart_services.conf
-				mv /etc/restart_services.conf /etc/restart-services.conf
+				ewarn "Old config directory found: /etc/restart_services.d"
+				ewarn "It will be ignored so please migrate files to /etc/restart-services.d"
+				ewarn "and/or remove /etc/restart_services.d"
 			fi
 			einfo "done"
 		fi
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index b5e30b4712c2..3283a88b84b8 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -30,5 +30,5 @@ DIST salt-3001.1.tar.gz 14556156 BLAKE2B 3088955a07b6ff95588f5b6235e0bae9cea366e
 EBUILD salt-2019.2.5-r1.ebuild 4910 BLAKE2B 67e56a9029c3157a31525c8ea41a957b82a3d2c846ae68756c8ea67261d6ea6346a98bbafd785fe519640ceef2e3495e58b0ec262858be30016eba10f1392567 SHA512 75e9eb392f3619b714a0ba43d64c5e08c51f512e71d98f1be763cb443d1c8a6c429ef5c2d272c162db34f3e274aebdf2f0c4866a32925232d134b9f91a4765ef
 EBUILD salt-3000.2-r4.ebuild 6321 BLAKE2B ddaa02503b5d8301697bae784a4901348eec72152e9d91d21eff82640d3609b093aa2acd818554d96edf86921cfcdbf9cc39b3e0f9292fff919f903919a6c250 SHA512 6b405a1bd5234500907b8da8865ec0aa2583efe7700fb3f09776297a4592352fe13ab199ff1fd9bf50421e2f11b363b804f41823d6fbf8d993d56bf6a1d07ed6
 EBUILD salt-3000.3.ebuild 6323 BLAKE2B 8b051bae3bb397bb25bcfe341730b5c0670ca011fad15f268d9c9b33a27f9fc1c95cad659e797b1d5bca75ad9fd09d3667d7d2d7e43a1880955a70c4f40559d4 SHA512 76d5b24985a68a6c4f67c937a71c3bcbf89407ec9ceb0f40bc92cc8196d53830a3ac4000457dc2a5b9660d59a7d6fed79d646e521bcc6ddc9bb29b172eca130c
-EBUILD salt-3001.1-r1.ebuild 6039 BLAKE2B 04364921fa1cd776c9507bb767ee0edd00662e43de0c0fedd81bca98001a241e26e9612dc23c83af4e080642e248344d075fb9fdb20834c277039a8f2f3b16a2 SHA512 91d9168e09426680218556b327de3544919627ff3e05fe38229bb30fdd4640f1005503ebbe3660746eacda9928ccd80f21dedfc4bd4687431745dbc2e0267067
+EBUILD salt-3001.1-r2.ebuild 5998 BLAKE2B 1fff765f1d003ccfda9061db9a2bd7d3a30d28b954308ff989eede8ab6c41fac72868523b1ed271f936f0ffdf2c7009f89373ecb49164a7a13bb65f574976ec8 SHA512 e9f94f0233f7f3df4a6b7f556942b63e4203f6ae5456d77cbe0b5dbc9a56666cbbd6e2984d77c8ae421f71c4c5cee6d513b48136869802266b0182e7104ec65f
 MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5
diff --git a/app-admin/salt/salt-3001.1-r1.ebuild b/app-admin/salt/salt-3001.1-r2.ebuild
index 09299dcc1d09..e5a0fb3ec15b 100644
--- a/app-admin/salt/salt-3001.1-r1.ebuild
+++ b/app-admin/salt/salt-3001.1-r2.ebuild
@@ -31,8 +31,7 @@ RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5[${PYTHON_USEDEP}]
-	<dev-python/msgpack-1.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pycryptodome-3.9.7[${PYTHON_USEDEP}]
 	dev-python/pycryptodomex[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 3e1276d10824..d26b326a5386 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,12 +1,8 @@
 AUX sudo-1.9.2-glibc-2.32.patch 10057 BLAKE2B 2027bbef7db5f4a523959e9456ebe625028f55607a22869bcc7deb9ec3787d28d3955fc0a0670976c557f070fa31a56bb167d1c6618f955163a240f852c5a4f6 SHA512 de7147130e923ce083637231f5e5a6dcf41cdd1a2bf901754b573239898d144938ebaaa55a8b1cd44138f313bfa59de6b8eac5d18ecb7c61e501dc0213f144b6
-DIST sudo-1.8.31.tar.gz 3350674 BLAKE2B de5a968732fdd58933b4c513d13c43a08cb50075a00c3e0d338c9892570a416a2b3a8f19940c0893715f4eeab991e804831a87ef656ffd91e7f1ba047c119261 SHA512 b9e408a322938c7a712458e9012d8a5f648fba5b23a5057cf5d8372c7f931262595f1575c32c32b9cb1a04af670ff4611e7df48d197e5c4cc038d6b65439a28a
-DIST sudo-1.8.31p1.tar.gz 3351312 BLAKE2B 85775ef574a3a1a9cc749809fe81f8350f7a4e3f46a905bc3392790b20bb7bc8e3c99fb504e01776f3a92aa6afa7972d3ff1c071aadd3a08ee1d2281f8b9ba50 SHA512 9344fd1d8a8445e8afb9c5628cdc832fe32ea29199f071f35fb6ec694371801556df560f4382afec199f468b1f3264ad5e3a89e964612e571b8d911f823724cc
-DIST sudo-1.8.31p2.tar.gz 3353538 BLAKE2B 274c72232e18c8ff5006b61ad4d384582ec0296af6326377f08ff4e59c6a4a4fc5e2245874bf9a7c6b010addae600dd41f042660d5bf9c4bc8eb98983704a5da SHA512 ad1bbbde74d3ab6e947071c6f21e436ebabcf5af11ecc75cde8f0c01ca0b8c6ae1cce2ff42f21612816c636e96722a2a14daa57757644ceab6577091f82242be
 DIST sudo-1.9.2.tar.gz 3890859 BLAKE2B 879917b8045c999a17ef36006732509aa546ee6bb04de77191fb637aa0420d54f9e51ec69b697c22119d638393e9c84efcc1ca5e6e8ee5f0c08bb1ca07f3acea SHA512 20afdf2604b1c93395157382b24f225cd1ff88d3a892362e2d69fecd240c4e7171f05032c08be1778cd1dea6e460025e4241f57272fac0ea3550e220b6d73d21
-EBUILD sudo-1.8.31.ebuild 6863 BLAKE2B 605dcb95b2668e74e9fbc915c98aad1c787919036b450476e9c9d50e2151489154d2232d0c1e445bfc6647cccecc240f508c2ef636e64331fcfbce385025ad72 SHA512 ccf9c659c89e469ad9cd0282ef2165a549344734dd3638226506944e39a39574af5f56d96ff0108880571a56a9eb457077fd2e73889fbb9c27a0e766b88f9abc
-EBUILD sudo-1.8.31_p1.ebuild 6872 BLAKE2B df4b0b8974bebc5683f9e1e1331c1e25f8c2dea63bd8162a3906dda75c92197a35007d3fb3fb257cee91643918be81222cf0141ab13f28a3a789c0c96053cc1b SHA512 688162c59941c57261c7a15726bb5a368bbc40a990c98d18d7d46f67fd0aef3f1a332703a79691f0c133af0202beeaf0af1e8249a8ab6fad0879899698f40f89
-EBUILD sudo-1.8.31_p2.ebuild 6872 BLAKE2B df4b0b8974bebc5683f9e1e1331c1e25f8c2dea63bd8162a3906dda75c92197a35007d3fb3fb257cee91643918be81222cf0141ab13f28a3a789c0c96053cc1b SHA512 688162c59941c57261c7a15726bb5a368bbc40a990c98d18d7d46f67fd0aef3f1a332703a79691f0c133af0202beeaf0af1e8249a8ab6fad0879899698f40f89
+DIST sudo-1.9.3.tar.gz 3956793 BLAKE2B 9bfd486806513ee9163c0904dac790a88b11ac8cf620ef08563984454fa51a9fab945300c8040f83a2a5a9264faa521deda7b76efa0b15e5f28374db8d5a26aa SHA512 21b59aa20240ea45dc7211ca7851cce104da462dd237081f9a79bcb8362280f6ea264c1c54d59de58d1375d45d8e10827848591bcfd3ec889c66126bee438544
 EBUILD sudo-1.9.2-r1.ebuild 7013 BLAKE2B db8445fef0e42c472efeae9210c773b89145b2a578a6705ab77b8dcfe56ce976e5f0a747bb3884dbd8741facc6ba7051517315a644cfbfc01a90958b271e336e SHA512 e76ff722a7dea45b23f7144fce001c05ce1fa12348ca8ec0e586160b69dacc99e9bc8b877962b525b94255517f7d1d862590e1a73cd436791f7b8985dc17a7a8
-EBUILD sudo-1.9.2.ebuild 6923 BLAKE2B a01c1479303ff907e6e698f667ea6ead96b75db8c95fd1239b66a8e5b3b781bf5784c2abb439322b1145aadb010dedb2e6261820b21db78a6dfaf54684ea9f9e SHA512 f0b9c27e15e12f02d72426c515a10ce95abfeedae66ad5429536da0aa572c7bf4a758eadd2627b0bb8c8509637707c00211a1492a5bbc89303ee59d7e3a9dec5
+EBUILD sudo-1.9.2.ebuild 6922 BLAKE2B ca1543dde3d569c92ea36d494ac8c11eb9c6fccfaf1c34696cbf7e37e8f88009c9805fccf658423fe6898493289383d3dfb1562a6a99e8f17fab9b4d7e84c76c SHA512 8559891753c2ee5679edefffb878a21be2c861fd07427a760d79e6aecbfa0cabba3a8ab8a1bcd56b5c1e1ca5d454c657360ef00ad1de9f0c868d32627a3a9ddc
+EBUILD sudo-1.9.3.ebuild 6931 BLAKE2B 3e606d2d8186da9b882969e864f90c34bb0b473589abd9e114550fe945a60076e159262085cb3766d14ba061806334ceba3665b2fc37f22e2f589c819335c9f6 SHA512 ff619dd0a8d6842a2bae2cf564cf58797c3ce63bb3acd1fbfe14ebfd511018ea8c3fe993002ed1278fda4403f9e413198c19a69623f0e6548dfb6597c554f357
 EBUILD sudo-9999.ebuild 6821 BLAKE2B 6ec4c8325e4275d902df02e971ca9b3e87a24b312cabcec7909c8ce94c4662aabada79fe550305603ad92151483bb3ba02a92b1ac49807ed0ba6fa7b14da0f12 SHA512 92536adcffa6e1c62e701d7a00a9032a60d559aa114d196e9851f198321ea8d027e9f7caf598f9d0eae2182362520a3c1ba62117d13b8e8b8ed6c5d9f212e7ac
-MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6
+MISC metadata.xml 1161 BLAKE2B 0c501bf06edca82993ece857f9f7565f99da15df36c916bc9dc57e78bccf2b247c382e97dd6c97cc7f5375e1a0513c1a30ecbf097516e96319fd1797257fb117 SHA512 d6bc9cf11ea1bd28c19bfe167580556af517d92c958d63cd7872ab5076840eca39a7ab3d1f56e84fc0fcfb675d7a89c23ccdd3629f665c45232be1140eb950ac
diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
index 72faa0680c32..a99f4f7e613f 100644
--- a/app-admin/sudo/metadata.xml
+++ b/app-admin/sudo/metadata.xml
@@ -18,10 +18,6 @@
 		<flag name="sendmail">Allow sudo to send emails with sendmail</flag>
 		<flag name="sssd">Add System Security Services Daemon support</flag>
 		<flag name="secure-path">Replace PATH variable with compile time secure paths</flag>
-		<flag name="system-digest">
-			Use message digest functions from <pkg>dev-libs/libgcrypt</pkg>, <pkg>dev-libs/libressl</pkg>
-			or <pkg>dev-libs/openssl</pkg> instead of sudo's internal SHA2 implementation
-		</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:todd_miller:sudo</remote-id>
diff --git a/app-admin/sudo/sudo-1.8.31.ebuild b/app-admin/sudo/sudo-1.8.31.ebuild
deleted file mode 100644
index 03a5d2da16b9..000000000000
--- a/app-admin/sudo/sudo-1.8.31.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam multilib libtool tmpfiles
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} == "9999" ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
-	uri_prefix=
-	case ${P} in
-		*_beta*|*_rc*) uri_prefix=beta/ ;;
-	esac
-
-	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris"
-	fi
-fi
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest"
-
-DEPEND="
-	sys-libs/zlib:=
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1
-		sasl? (
-			dev-libs/cyrus-sasl
-			net-nds/openldap[sasl]
-		)
-	)
-	pam? ( sys-libs/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	sssd? ( sys-auth/sssd[sudo] )
-	system-digest? (
-		gcrypt? ( dev-libs/libgcrypt:= )
-		!gcrypt? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-"
-RDEPEND="
-	${DEPEND}
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	selinux? ( sec-policy/selinux-sudo )
-	sendmail? ( virtual/mta )
-"
-BDEPEND="
-	sys-devel/bison
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	pam? ( !skey )
-	skey? ( !pam )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-set_secure_path() {
-	# FIXME: secure_path is a compile time setting. using PATH or
-	# ROOTPATH is not perfect, env-update may invalidate this, but until it
-	# is available as a sudoers setting this will have to do.
-	einfo "Setting secure_path ..."
-
-	# first extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
-		echo "${ROOTPATH}")
-		case "${SECURE_PATH}" in
-			*/usr/sbin*) ;;
-			*) SECURE_PATH=$(unset PATH;
-				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-				;;
-		esac
-	if [[ -z ${SECURE_PATH} ]] ; then
-		ewarn "	Failed to detect SECURE_PATH, please report this"
-	fi
-
-	# then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:${thisp}
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
-	# finally, strip gcc paths #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${SECURE_PATH} ; do
-			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
-			newpath+=:${thisp}
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-
-	einfo "... done"
-}
-
-src_configure() {
-	local SECURE_PATH
-	set_secure_path
-
-	# audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	myeconfargs=(
-		--enable-zlib=system
-		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/run/sudo
-		$(use_with secure-path secure-path "${SECURE_PATH}")
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable sasl)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with ldap)
-		$(use_with pam)
-		$(use_with skey)
-		$(use_with sssd)
-		$(use_with selinux)
-		$(use_with sendmail)
-	)
-
-	if use system-digest && ! use gcrypt; then
-		myeconfargs+=("--enable-openssl")
-	else
-		myeconfargs+=("--disable-openssl")
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		if use sasl ; then
-			cat <<-EOF >> "${T}"/ldap.conf.sudo
-
-			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
-			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
-			EOF
-		fi
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins doc/schema.OpenLDAP sudo.schema
-	fi
-
-	pamd_mimic system-auth sudo auth account session
-
-	keepdir /var/db/sudo/lectured
-	fperms 0700 /var/db/sudo/lectured
-	fperms 0711 /var/db/sudo #652958
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED}"/run
-
-	find "${ED}" -type f -name "*.la" -delete || die #697812
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	#652958
-	local sudo_db="${EROOT}/var/db/sudo"
-	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
-		chmod 711 "${sudo_db}" || die
-	fi
-
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in /etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.8.31_p2.ebuild b/app-admin/sudo/sudo-1.8.31_p2.ebuild
deleted file mode 100644
index f0df8a6c9e22..000000000000
--- a/app-admin/sudo/sudo-1.8.31_p2.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam multilib libtool tmpfiles
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/b}"
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} == "9999" ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-else
-	uri_prefix=
-	case ${P} in
-		*_beta*|*_rc*) uri_prefix=beta/ ;;
-	esac
-
-	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
-		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
-	fi
-fi
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest"
-
-DEPEND="
-	sys-libs/zlib:=
-	ldap? (
-		>=net-nds/openldap-2.1.30-r1
-		sasl? (
-			dev-libs/cyrus-sasl
-			net-nds/openldap[sasl]
-		)
-	)
-	pam? ( sys-libs/pam )
-	sasl? ( dev-libs/cyrus-sasl )
-	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	sssd? ( sys-auth/sssd[sudo] )
-	system-digest? (
-		gcrypt? ( dev-libs/libgcrypt:= )
-		!gcrypt? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-"
-RDEPEND="
-	${DEPEND}
-	>=app-misc/editor-wrapper-3
-	virtual/editor
-	ldap? ( dev-lang/perl )
-	pam? ( sys-auth/pambase )
-	selinux? ( sec-policy/selinux-sudo )
-	sendmail? ( virtual/mta )
-"
-BDEPEND="
-	sys-devel/bison
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	pam? ( !skey )
-	skey? ( !pam )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-set_secure_path() {
-	# FIXME: secure_path is a compile time setting. using PATH or
-	# ROOTPATH is not perfect, env-update may invalidate this, but until it
-	# is available as a sudoers setting this will have to do.
-	einfo "Setting secure_path ..."
-
-	# first extract the default ROOTPATH from build env
-	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
-		echo "${ROOTPATH}")
-		case "${SECURE_PATH}" in
-			*/usr/sbin*) ;;
-			*) SECURE_PATH=$(unset PATH;
-				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
-				;;
-		esac
-	if [[ -z ${SECURE_PATH} ]] ; then
-		ewarn "	Failed to detect SECURE_PATH, please report this"
-	fi
-
-	# then remove duplicate path entries
-	cleanpath() {
-		local newpath thisp IFS=:
-		for thisp in $1 ; do
-			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:${thisp}
-			else
-				einfo "   Duplicate entry ${thisp} removed..."
-			fi
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
-
-	# finally, strip gcc paths #136027
-	rmpath() {
-		local e newpath thisp IFS=:
-		for thisp in ${SECURE_PATH} ; do
-			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
-			newpath+=:${thisp}
-		done
-		SECURE_PATH=${newpath#:}
-	}
-	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-
-	einfo "... done"
-}
-
-src_configure() {
-	local SECURE_PATH
-	set_secure_path
-
-	# audit: somebody got to explain me how I can test this before I
-	# enable it.. - Diego
-	# plugindir: autoconf code is crappy and does not delay evaluation
-	# until `make` time, so we have to use a full path here rather than
-	# basing off other values.
-	myeconfargs=(
-		--enable-zlib=system
-		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-		--with-env-editor
-		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
-		--with-rundir="${EPREFIX}"/run/sudo
-		$(use_with secure-path secure-path "${SECURE_PATH}")
-		--with-vardir="${EPREFIX}"/var/db/sudo
-		--without-linux-audit
-		--without-opie
-		$(use_enable gcrypt)
-		$(use_enable nls)
-		$(use_enable sasl)
-		$(use_with offensive insults)
-		$(use_with offensive all-insults)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with ldap)
-		$(use_with pam)
-		$(use_with skey)
-		$(use_with sssd)
-		$(use_with selinux)
-		$(use_with sendmail)
-	)
-
-	if use system-digest && ! use gcrypt; then
-		myeconfargs+=("--enable-openssl")
-	else
-		myeconfargs+=("--disable-openssl")
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use ldap ; then
-		dodoc README.LDAP
-
-		cat <<-EOF > "${T}"/ldap.conf.sudo
-		# See ldap.conf(5) and README.LDAP for details
-		# This file should only be readable by root
-
-		# supported directives: host, port, ssl, ldap_version
-		# uri, binddn, bindpw, sudoers_base, sudoers_debug
-		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
-		EOF
-
-		if use sasl ; then
-			cat <<-EOF >> "${T}"/ldap.conf.sudo
-
-			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
-			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
-			EOF
-		fi
-
-		insinto /etc
-		doins "${T}"/ldap.conf.sudo
-		fperms 0440 /etc/ldap.conf.sudo
-
-		insinto /etc/openldap/schema
-		newins doc/schema.OpenLDAP sudo.schema
-	fi
-
-	pamd_mimic system-auth sudo auth account session
-
-	keepdir /var/db/sudo/lectured
-	fperms 0700 /var/db/sudo/lectured
-	fperms 0711 /var/db/sudo #652958
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED}"/run
-
-	find "${ED}" -type f -name "*.la" -delete || die #697812
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	#652958
-	local sudo_db="${EROOT}/var/db/sudo"
-	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
-		chmod 711 "${sudo_db}" || die
-	fi
-
-	if use ldap ; then
-		ewarn
-		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
-		ewarn
-		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
-			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
-			ewarn "configured in /etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo, you need to change file ownership and permissions"
-		ewarn "with root privileges, as follows:"
-		ewarn
-		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
-		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
-		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
-		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
-		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
-		ewarn
-	fi
-
-	elog "To use the -A (askpass) option, you need to install a compatible"
-	elog "password program from the following list. Starred packages will"
-	elog "automatically register for the use with sudo (but will not force"
-	elog "the -A option):"
-	elog ""
-	elog " [*] net-misc/ssh-askpass-fullscreen"
-	elog "     net-misc/x11-ssh-askpass"
-	elog ""
-	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
-	elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.9.2.ebuild b/app-admin/sudo/sudo-1.9.2.ebuild
index 78ba5eaf6cbc..ff902d2d4e1d 100644
--- a/app-admin/sudo/sudo-1.9.2.ebuild
+++ b/app-admin/sudo/sudo-1.9.2.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~sparc-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris"
 	fi
 fi
 
diff --git a/app-admin/sudo/sudo-1.8.31_p1.ebuild b/app-admin/sudo/sudo-1.9.3.ebuild
index f0df8a6c9e22..d0873828489a 100644
--- a/app-admin/sudo/sudo-1.8.31_p1.ebuild
+++ b/app-admin/sudo/sudo-1.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit pam multilib libtool tmpfiles
+inherit pam multilib libtool systemd tmpfiles
 
 MY_P="${P/_/}"
 MY_P="${MY_P/beta/b}"
@@ -30,10 +30,11 @@ fi
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest"
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
 
 DEPEND="
 	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:= )
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
 		sasl? (
@@ -44,14 +45,11 @@ DEPEND="
 	pam? ( sys-libs/pam )
 	sasl? ( dev-libs/cyrus-sasl )
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
-	sssd? ( sys-auth/sssd[sudo] )
-	system-digest? (
-		gcrypt? ( dev-libs/libgcrypt:= )
-		!gcrypt? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 	)
+	sssd? ( sys-auth/sssd[sudo] )
 "
 RDEPEND="
 	${DEPEND}
@@ -64,6 +62,7 @@ RDEPEND="
 "
 BDEPEND="
 	sys-devel/bison
+	virtual/pkgconfig
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -73,6 +72,8 @@ REQUIRED_USE="
 	skey? ( !pam )
 "
 
+REQUIRED_USE="?? ( gcrypt ssl )"
+
 MAKEOPTS+=" SAMPLES="
 
 src_prepare() {
@@ -137,36 +138,34 @@ src_configure() {
 	# until `make` time, so we have to use a full path here rather than
 	# basing off other values.
 	myeconfargs=(
-		--enable-zlib=system
+		# requires some python eclass
+		--disable-python
 		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+		--enable-zlib=system
 		--with-editor="${EPREFIX}"/usr/libexec/editor
 		--with-env-editor
 		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
 		--with-rundir="${EPREFIX}"/run/sudo
-		$(use_with secure-path secure-path "${SECURE_PATH}")
 		--with-vardir="${EPREFIX}"/var/db/sudo
 		--without-linux-audit
 		--without-opie
 		$(use_enable gcrypt)
 		$(use_enable nls)
 		$(use_enable sasl)
+		$(use_enable ssl openssl)
+		$(use_with ldap)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
 		$(use_with offensive insults)
 		$(use_with offensive all-insults)
-		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
-		$(use_with ldap)
 		$(use_with pam)
-		$(use_with skey)
-		$(use_with sssd)
+		$(use_with pam pam-login)
+		$(use_with secure-path secure-path "${SECURE_PATH}")
 		$(use_with selinux)
 		$(use_with sendmail)
+		$(use_with skey)
+		$(use_with sssd)
 	)
 
-	if use system-digest && ! use gcrypt; then
-		myeconfargs+=("--enable-openssl")
-	else
-		myeconfargs+=("--disable-openssl")
-	fi
-
 	econf "${myeconfargs[@]}"
 }
 
@@ -202,6 +201,7 @@ src_install() {
 	fi
 
 	pamd_mimic system-auth sudo auth account session
+	pamd_mimic system-auth sudo-i auth account session
 
 	keepdir /var/db/sudo/lectured
 	fperms 0700 /var/db/sudo/lectured
@@ -209,7 +209,7 @@ src_install() {
 
 	# Don't install into /run as that is a tmpfs most of the time
 	# (bug #504854)
-	rm -rf "${ED}"/run
+	rm -rf "${ED}"/run || die
 
 	find "${ED}" -type f -name "*.la" -delete || die #697812
 }
diff --git a/app-admin/syslog-summary/Manifest b/app-admin/syslog-summary/Manifest
index 75a40257bf53..ac786b525e48 100644
--- a/app-admin/syslog-summary/Manifest
+++ b/app-admin/syslog-summary/Manifest
@@ -6,5 +6,5 @@ EBUILD syslog-summary-1.14-r1.ebuild 766 BLAKE2B 036754524dd9c11b985c2ef5777636a
 EBUILD syslog-summary-1.14-r2.ebuild 944 BLAKE2B ef4dde4b5da0ce5ae1b28e9200d2d51fbca075f30bb72a6f1bb49104d980da37ea44c872901ee207e392cf5f06a3f4a9a5bc032da5f4d50a9fc8805c12366c66 SHA512 47fe494a2bc164750e4804b6c6e8dfa9328b072ab9e7ca0e77e1f2bc4d253387f4e3ed13bfd1d84cc729d15f71faf58660484803ae2c38dcd61d77c2ef79ff5a
 EBUILD syslog-summary-1.14-r3.ebuild 991 BLAKE2B 9086206934c07f3d810faec448a65cd24492bdd986d7832c95579aaba61136595b6b9c4f4d8fd5d406e32cd15ad9369d095b2e3c68e762267c894738bff5be6f SHA512 c127aa0387176e078d31b46729c9b437e4537b2821ec7b4eda4d7c742e31e014ce1d33f3d3ef3666ccee1de0a21759f27f5feaaf778ee0f26ee703bd26ddd94b
 EBUILD syslog-summary-1.14-r4.ebuild 843 BLAKE2B 7937d374d41d63881205b78d45e73ee5c11ac7a8b21437048e1596c8ac10fb4d7402ea8686a84ad4ab5379b197ff4ed4dc74f1f8d6b2ca06ec32aa5463c70cf4 SHA512 d5b54c48351a7cb82f6c988138621633008367b8a3a8fb02ee05f52a7975cb9799757d04ca17ff0a031ed6354f01c98c22ab8d1188a842cdb354a9cbdbe09c17
-EBUILD syslog-summary-1.14-r5.ebuild 890 BLAKE2B 4a3e7c6eb9edba0f835e7159f5e92de927322bdf2eb57e74e14a75b83fcf3db4e8193c6c2f2dc68a021388191a2f9332b44029650e19285d971a97146068bf3e SHA512 07665a4f8b723cdf0c273eddbd04b48d004933ea8af666fdcd73b506671b89cb8622a25c35469a07868ef9273a186930986dec9a5bf6af9478693f7696a770d1
-MISC metadata.xml 464 BLAKE2B 862ef04e25fe1aa6609e2ea68c9d61a9c201d43ffab9db6a02244ca9192f4fd11a1f1f4e4d6f7e365660c4043b28a959d5da9783f3c6f0ed4f69eb625784763c SHA512 64073e0ef15c4fbe057f51c09505ea3db8d5e1427c2d581b55137e7fba37f5fef13103cfe4d0e58c74052601d4bae0ed26e36346d497653ea080fe5649f956eb
+EBUILD syslog-summary-1.14-r5.ebuild 889 BLAKE2B 84179ad32080c72d4e38fc03056134379ab4d6727f99c199acf0e346fdc7eaf0506d8c3ee585b558a4b1942bf0949637c08486d177902019a99e6a2e86b415f7 SHA512 407e3b5a902b8630e6bfeaf4271d70f67b54f2cee5b21c0a7a4004127c2d6bf53fd50b631c7f8be27ced65dc08ee46922922441f725e70d1085a5a88ccb22162
+MISC metadata.xml 489 BLAKE2B 876fbf72b343b5de47fa5c0eaabecce3d0436a4873d2415c3303581aa4644e4019bc56e00f4530635969b19ad86d8c787e5678412472ad74dfc036529036dc6c SHA512 b21eb3d90346279b7d2b976e6a1700bc36ce8c15d47300de8fdf380aca09cbbc2680b6f9cdec55a97d14cedd8353ac472a9638e7517bbc897c294410929e1426
diff --git a/app-admin/syslog-summary/metadata.xml b/app-admin/syslog-summary/metadata.xml
index 52456916eab7..1a3b253f9a1a 100644
--- a/app-admin/syslog-summary/metadata.xml
+++ b/app-admin/syslog-summary/metadata.xml
@@ -9,6 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">dpaleino/syslog-summary</remote-id>
   </upstream>
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
index b419bb9212bc..4275cdaa85be 100644
--- a/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~sparc x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 3f376c0ba38f..e07b2c8f6294 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -7,18 +7,12 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db1213
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.zip 2156000 BLAKE2B b637b0c50932848e72fca02c604a1cca227e92e5a9c706bed9a1f6a1e561f6f02f9f03ea9a420c12fb5e4b4a635af53f5c68ae9bebca367756fcb645816aadd2 SHA512 c6a5042af61a2617139c9081066086e9f94e49bf083d29a8c8ddca31c2c0d3124a937688571fbde5998c47d0dd9ff44692643117a45875fabc4943d5658f044b
 DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
 DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
-DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv21.3.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
-DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv32.5.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv35.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv36.2.0+incompatible.zip 31161655 BLAKE2B 8c07832d9023d7f932e15c51508983f1d539cdc0c67ba3ca65a41e2882ff007f88395298878d8e05ea3d5d9dc6df04849c6b81da0f5e2e151bda93495eb3d640 SHA512 74830cbdcd9ebb8eae4640098d2964cf5dbdaae3cd69eeaa5787ac340a0bde06576d54376595632dbc91a35bfb247d596c93e1511e7f473f458ba0fd8c4530b4
-DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
-DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.zip 34780090 BLAKE2B 7a465854f74837c79c1b2166116d89b2156645f9ae80b13f0cd860eafddd17caf1a34f7876f54c5ede094fe808eb39f4a1bec54e02efc53fd0bd897c80bde21f SHA512 88a7e1ba6ac2bd373d82f0a6381565c24014b0cd339efcd815ce93dc9f223354f561cbe7bd021fd5635599331a23b7e9ca084754325c68edeecd6f5e1cc47227
 DIST github.com%2F!azure%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
-DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.1.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
-DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv12.1.0+incompatible.zip 21291 BLAKE2B 960b3ab8ff81fd7105fde92e6d30e6b96811d6efcb56ae1b35a1b70315c13f671558b75f0964578a9b9e6c5ea0d185ebcbe68e9a2af5a460144b5886638ba148 SHA512 975bcb9aaf364f9b4852f496dfe3d141e2b645cd992565d6c2e43bf38e18c444c09b25746db174d9f511acec2a1ac3443b6281cf8d4974bed4aeefce182cfecc
 DIST github.com%2F!azure%2Fgo-autorest%2F@v%2Fv14.2.0+incompatible.mod 36 BLAKE2B 71643bf27cc23617d54777e18c77d9015af83e9e9c1ec846c333d91760e70e57e51e3b9fb0b6ec8bae5140893237ae6f08bfd6a50b452145d6bd635a4abfec12 SHA512 d7c80a07fa3633acb681d54fae5743c6aab0d5f1f9e1edc3f7037a7abcf12c5536c524e856f9ea3d876b2b0fdf2884fa307ed16fd9758aba17a3d28766df1377
 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
@@ -28,18 +22,12 @@ DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.mod 315 BLAKE2B
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2F@v%2Fv0.9.2.zip 96994 BLAKE2B 7932efd0586b1f4a2a6142815d5bb64c0f88074eb43347b458daa1aab9f7989c192004fe7c27a58d830a847db2884d6bd8bf8e97e5a3c3d2def4e721600177da SHA512 639dd9dd5b670eec05d33224f9f025a67105ce34ba7d3b8cfae7a1fbd947312737d31a6575d839790b3373bd6eb1a6a11e264481c0292c50b6b4f4778855070b
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.mod 325 BLAKE2B 1ff6851c8e73b2a566cfafdc2ebd259478b39258f785040407cd853433312ef10e492da8dc0dc9cbd4a2d2470e2715ef5ba4c05100c35f5b0664c9b23879e721 SHA512 61c06f593c1759bb078042d461319db2f91afcbddf50186d09195021eab865159ca5c017eb078d354d7db590365846e401ec3f91a2cbbf753bc32d7111683bd2
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.5.0.zip 38083 BLAKE2B e796f7659059c9bb04caa298c94a318fdcc3e251a4caccf71a973ec957899cf49ada77fa866b1883036aed3942f0887c88ef33b22da1387e55bb2847bfdfe0a4 SHA512 16ccb2211f3acb23181cfaa941e5d757dd975a8491cabb0b083411dc7c431c3230aaa7158c03d7ffd1dcba4535d4ab170a6d110c1b9d91ca2553d665767f53ca
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.6.0.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.0.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1-0.20191028180845-3492b2aff503.mod 371 BLAKE2B cd0bcfc08f429e4c64a921f2df9a243f4198bea6fd7d80f74d9bab21f4d9891ba4a9c40ea3b389c9953c722b46a95d17e39f09e735e3c5850dc4565116fcfd16 SHA512 6c4daa23efdfe8ba8d2a9e31cbffade7636519c56af858f24c7ab154924fb5915c13030e5ce1aff2a7f23e99b0b48dc692744109fce7da66e77ab12fe45980c6
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.1-0.20191028180845-3492b2aff503.zip 41301 BLAKE2B a4511c2b007ba0d066e7055c16580327b5a18aa2d49d954e300660072232c5e80b7be85b39d690e3a99d21478c507038793b56434b46537afb00288df18a4c16 SHA512 f11a9c09267aae2ec86600e9e6f5c2af6c345c7724f92cc11ba050a50ffefcd78b537c26f2b3bc92bce6b5a80458899d440564294659bcef8e4656f4ab544991
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.mod 371 BLAKE2B 778ec4567ccf1533e9815f0f855933c94c2a4aed6285f10815258c71a39fb706ed130db03c85f8b944b764978ae584f7cc675cdd3688e6a93961f4437bf3aca2 SHA512 02605c296a8277e72074a0b3049ef0ee87597b67ba8d1e008d17746ee2dfc2551e2517e60f972135d368b27b899452e1c768c3b13afb9315da48173733450fe7
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fadal%2F@v%2Fv0.8.2.zip 40633 BLAKE2B 8ffe2bba80daeadc1a27198e4c6cbe39bf4219340686899460c4c217966d97583bcbe10ff7182a0bb27ad01550690ccdd12a1b53a91264bdaf3d6febe30adfd5 SHA512 d0f6392ef14fde8128709adaeeae7c4109a2c81830bbc107b8fca4ea6145bf68434a171f1d145536d78ea5e2fbc316cd21fabbb99008604a276974405274bea6
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%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.3.0.mod 302 BLAKE2B afe841f1cdb7364a3da99230e3cbdd500630d16f78147862122885f0af683aac1207e6790e751bc282eaf3beab6de08c9420b4dce3af4e4492903f2133217c43 SHA512 54a5cc08f53b1caa34cb2d26519fae2e23b0c48806588085b95fc9a4951ed9bd5ab7158fd97345fb004984cbedcd4c14e5a6912c31062d8628edb1cb9616c699
-DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%2Fazure%2Fcli%2F@v%2Fv0.3.0.zip 10602 BLAKE2B 7fc9f52e62d13d63c797893693e5153f4eb0af301421f1947ed4ac579e62ee4ab1a7f40ac8518190fce86da4ce15ba68010cd75316a71bb42d802982fc6ea211 SHA512 8e0d2c2cf4f0f6eaae2a07c7a2e31eb159732363db3f8aef2337946955f02b64947968e61316d76d40d383c78cf60ad9c32e31c1407a2c4797357f6e3f47a468
 DIST github.com%2F!azure%2Fgo-autorest%2Fautorest%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
@@ -118,8 +106,8 @@ DIST github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.mod 44 BLAKE2B 770e1
 DIST github.com%2Fapparentlymart%2Fgo-textseg%2F@v%2Fv1.0.0.zip 133293 BLAKE2B 9d62348e8118a4099568f5ffb309d9b83763fe06466d408611279edf1c0412147cd6aeeb8966df2bf7eba4251e9ca5cb62272b6c25e97f0d36e9207b2204e101 SHA512 80fd9f8b561a3caa7198f064892008cb2549e228e48d83440b3a2648426e834d5909c3685e97ae0cf7fccd0efdc489665789b521a2f6501e171c6a69c73bb6e5
 DIST github.com%2Fapparentlymart%2Fgo-textseg%2Fv12%2F@v%2Fv12.0.0.mod 57 BLAKE2B 59143290eb1b5bd14d2132acf39e0bce9135370ba9fdd69d311fd8b53b2a26c4606438191b71255716ddaf7dcf7555bd202a8af522fcd1871e81d338d7296372 SHA512 cb6c6194e179fdc5bacc742dcc56d29e04eeb87b9a494fa1588c9a7f7e158e2837e3199c7fece5b7e0b0d03f2026930dac355914a5be8a6f7bc99616467f68fd
 DIST github.com%2Fapparentlymart%2Fgo-textseg%2Fv12%2F@v%2Fv12.0.0.zip 128469 BLAKE2B 360332f3ce1b23b65085e266cd7fd50ac8675fb18d8ad56368b68de7c8864f75a99aa7a95ae70d36bbd1d7380eed7d04b7f3b197db4fea213a0e5a510c465d2c SHA512 707b79ef4fceca4916f38bdaedf330c20db46452fb1c6d3369da3cc0a73d8bb4ca8eac75ea53b365e7a08d7f492345ba4169ee57588e4b85802d752835f2d565
-DIST github.com%2Fapparentlymart%2Fgo-userdirs%2F@v%2Fv0.0.0-20190512014041-4a23807e62b9.mod 153 BLAKE2B d12d3a3173a6534a84d2921cc4e27e0593e527f778fd03e70356ae37350c9af7e678f396652024463a4d49a4101c0ec28ef8f84c04bbe59b13a64e27453bbb6e SHA512 0f619e2e44fa4be820a049e365017ee91c8ad3267a350eb23509ff5aefb44cbf577a2952e230ca9b92e8411fbcdad0024051464bf6643a81ffbc9a164e666020
-DIST github.com%2Fapparentlymart%2Fgo-userdirs%2F@v%2Fv0.0.0-20190512014041-4a23807e62b9.zip 26041 BLAKE2B c592c47192ec388e002154b518302832f7a5a500d63cf02c75ae83f124ad9495eefb5cb6b7bf9eaf3c447d0eef1b806be1c646f9592d62562a84b35803236406 SHA512 7f816354fe9669532d89de774945261705f8045e554ca0f3aad2f4d8c0edc65b5d29421ed1087e5c6309899f576d647a0bce989475ba47be506bf0d6b6b888c1
+DIST github.com%2Fapparentlymart%2Fgo-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
@@ -178,7 +166,6 @@ DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv0.0.0-20160705203006-01aeca54ebda.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2
-DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.0.0.mod 35 BLAKE2B 4e9e86f0f7f18e47c80b9f4a0abff3f07d47814a9c54b297a2419265fd91b16c2780e170ded80589dac290cc3262aad162911b789510703d973f3f891d5e0849 SHA512 6a786a38aae43d8a7532621bac8c4c053624f39573a37bd66fef9048a7eff36ea55778ac8a4bf3d18cc1e6faf352dc2365e6f819053359df9ac98129e16f422f
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod 35 BLAKE2B 4e9e86f0f7f18e47c80b9f4a0abff3f07d47814a9c54b297a2419265fd91b16c2780e170ded80589dac290cc3262aad162911b789510703d973f3f891d5e0849 SHA512 6a786a38aae43d8a7532621bac8c4c053624f39573a37bd66fef9048a7eff36ea55778ac8a4bf3d18cc1e6faf352dc2365e6f819053359df9ac98129e16f422f
 DIST github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip 9787 BLAKE2B bf52b08f028e5117fe9cf9554ffcfbddec214b1dc972e8be2511b5571fa15cd433b3528ddf9c8805b3a71455a94f859d3aa90348e4648300121be269d2ad5f84 SHA512 83a35ee1aaa0aa34e86db32471f18c2ecee57c8962eacd44ce492a29cd9f630318411535d3474ad10c5ec5a5634caf619eae8a06e911c37c6e8fc8d022aebe3e
 DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180920040454-5637cf3d8a31.mod 32 BLAKE2B c96afb14f9809bf9dae22bd2260c31921b0435d4459b4386ee016514b84580aaec258fb1f8347fa6447524376de742135ff87b170f40cbaadaa41c41b553ae25 SHA512 320a96424fcf2296f59f8ba247cc9dfa43c35e2e500fc1dd990a69316d4ccb68437e4c4f98e849173161490cad216c15eee039134b3028afa7dcf82d9b8e6423
@@ -291,8 +278,6 @@ DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod 661 BLAKE2B c7
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.zip 421304 BLAKE2B 4c4754375d5603517ed3c272832b5f15958c17806266bed6582d9996d952e7870cd17b547faa6ca9a1e34c98885641c39554816d24f4ed0edf106c518b16fa52 SHA512 c1e49a03098892179f8fa98aa5873085aa3268e782501e83cef88fa909a05336c61dba5fd7094d49f03fd163169028af661699f63ccd6836a67762d7453da77b
 DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.4.0.mod 337 BLAKE2B 91f4d390615c5b479ef339c74bc9c9a460031103eba8af9e570029068cb1f6dd51d3369290bf31e472bfd426cebb29a193fa7830398660a60b83fda3dace5791 SHA512 8c72241f9497d69f4af2ba25f0a9870888cc877a3c287a7a28e891a5ece956afda06d4792dcba852a87d40910b392c0ada9a9961b55498869d4989aa326bc13f
 DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.4.0.zip 27150 BLAKE2B 0e73c40928d73128501176720c08b4964f124189cdd4d9947b409094ada3f9fe356d1fef86bad5fefc275971a487392f22279c59a78fe3939dd684eb56eea2ac SHA512 552c8e942208b9757b6ee2aaf32d1e52c178afd48e3fdac65bbbc436e9f45ed72ba3b2e5d87d0853788b48b6169e679c514015a5bee009c8d1ec2a9d445d3c7a
-DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.5.0.mod 226 BLAKE2B f7f023e293b358c278ecca07bb202f1bd82d11cd79e3549b1a9cbcf2028271ce2f40fff8c8b59cf4a5b2c0af4f92f08a07e71e1251fe9b4ffcf7b29538f97b9a SHA512 28a25ca24c618a16d228634c3330de7aa8a90b3199c56e4bd6bd27e67ca29e4a62ccdf4282fbfee6a4d7a6dbe84d43ad778d5cd883505472920cf939a0719dc7
-DIST github.com%2Fhashicorp%2Faws-sdk-go-base%2F@v%2Fv0.5.0.zip 38254 BLAKE2B 1fbf40317e848a93bd071850e6cbcc00986b988da3c487250f02acc50c29133cb08f758d38001b6cfdaaf0e9d250b988af09431c3ec00392d336c2ab4106978e SHA512 6f5504326df5a2a67d718df6da1cc01b4dfc969863689806526d79e84b3f8897798ae098e262ab3c0ce3f6ec4aa201ff6c36497602cedb10c947258ab2a5107c
 DIST github.com%2Fhashicorp%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
@@ -303,7 +288,6 @@ DIST github.com%2Fhashicorp%2Fgo-azure-helpers%2F@v%2Fv0.10.0.mod 582 BLAKE2B 2d
 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-azure-helpers%2F@v%2Fv0.4.1.mod 475 BLAKE2B 5fa6b03722c1e8c2fb37b62364c33966e2a6fd83a834e969931bdeacc278031aa8ba574c0ec4ddf3a79dfe3c68f3c364ef7d5bba3230b44ef9207d2fda607525 SHA512 6131d39d0da32fff61e5c653456cd8bbb9984b164a9093789aa63c7cbbd9e348be0a86e93611c83e9b81299e10ae073ebe17c901ca9aa223ff67e656850b3f93
 DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.mod 134 BLAKE2B 484477f336780669d2467c673d49aba38a44868ae2e3535282c19631fc7767c36bf3bb46d3ce27aa8173e1167e7d56a206303f73b671b49e999839832b14ae17 SHA512 32745c37e703a050b2d475ba122956a1278450a852f1b101e5900f62f0d0fc2e499f2e156b3640e76b2c4c368e3eacb8bf215b4ece5c55b7f8db3fa941309bda
 DIST github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.5.0.zip 15916 BLAKE2B f206df5f4f898d04fccc38e95a4d2d05cde33762f1585aa673b60fb7f4b7c1d5b9d103ac7b07ddf9aa34e3a79c90a51c6434a1a9542341f050f0422135786340 SHA512 25e6d14319a8b26bba1fae08123aea772246aabe9c7bc0bd401226bfbfff6662c28c694231d8ed9b7c0a1d41b7b6d50a889f09dfd58f09121bbc8715b2838f9d
 DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
@@ -577,14 +561,8 @@ DIST github.com%2Fterraform-providers%2Fterraform-provider-openstack%2F@v%2Fv1.1
 DIST github.com%2Fterraform-providers%2Fterraform-provider-openstack%2F@v%2Fv1.15.0.zip 687432 BLAKE2B 736719aa41cae88ecceeb0bb403b1e66549aa13f55c50ad5140a9a4d12ce55f214a3f6d43d270c594cf95b260194fa572c8b8c727c6352063202896870c29d96 SHA512 c2734b7bad81095ad1332210e563b54784c0ab3acc97016f61e253cdbc8189beeff8ba6897573c8ddcec6af528dd1bb7d86b54895dcb34eafcd50f557d3a9357
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20171017195756-830351dc03c6.zip 13531 BLAKE2B 7da23f76d1f6cfdb578c6826a9746381c6227706fdd4658f30bd088883def6662c17d3c06363ea4b9007fad4e7c14b7add0e96380bbe4f5b7feb03125bc830b1 SHA512 6142450cb34a7688845cfeecfff68957118b039d9117ab75584132e34f8ce12ad8ffd24578d1d602c7a98fb2b6b494693ed4e509df2d6130e1d47c5bebcbb420
-DIST github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.10.1.mod 611 BLAKE2B f3670639a943f405818687cb0eb32e7ccd85d94a25c9d3c096922431498f6bcd0f48c7adb8c9b202911d51ad8869708ae22c72f240e8b02a5f3d76e135e1da06 SHA512 1be1bb1626d3a12deb398a1f57bbc3dcd3477ca4b4cadd4cbfb715f40bedfc7461d870e482bfe5805e106f861c3790783aeb955495d563e90f10d682eb0ded0e
-DIST github.com%2Ftombuildsstuff%2Fgiovanni%2F@v%2Fv0.10.1.zip 708099 BLAKE2B 22f0a9f459124f10b2c5b84a7e211af3c73292719ade71756babeea9488ebf7c903a00d011ba9d3be89c4c013663507fd644db16d28b0361ecb946af932e8f4b SHA512 dc1417f24c15d1c36688653c7345b46aebd282fa101e463e5ee4a59d971dd8201c6fdc9c26ea0adb0cca235184f160811471cbba184ac42af691fcf5b7c22053
 DIST github.com%2Ftombuildsstuff%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%2Ftombuildsstuff%2Fgo-autorest%2F@v%2Fv14.0.1-0.20200416184303-d4e299a3c04a+incompatible.mod 45 BLAKE2B 4c6da05924de7b0482e5bf9d8a1eee79486205f6c7650cf3b4acfa3fcdafbc2d3a37261838e8053b8e2f59fc3129fcb4780ed9493f80667c94dd5f72f1c6ee46 SHA512 ca20186c5b7114bfa0c14ff41ec20f8b8219fe78d41d110176995d88d76c88c57775ceeeb0d7a04b7eaf168965214d98b8cc6952c7db774d008bbe0d4c33a68b
-DIST github.com%2Ftombuildsstuff%2Fgo-autorest%2F@v%2Fv14.0.1-0.20200416184303-d4e299a3c04a+incompatible.zip 24547 BLAKE2B edf95fd5b6f797f6087c61caec3474a89b82e90a9fd6de36d2fc3ba2e6f643b3e7604d0f2094ee1cf22c7c31fedec1bdde53853c004ca73600d00302fcb9303e SHA512 376023de5a62b8544bebc5d08e477aa361b96008215c1167db2c616e4cbc82df21879e38ead297f7407a2f695a31635df33054d9f07928bb9a66f39875ad393c
-DIST github.com%2Ftombuildsstuff%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.1-0.20200416184303-d4e299a3c04a.mod 315 BLAKE2B 649b180d4b41279bde5a3ad4e7a8380b3e23d9428af2b2904612abfce99e5abf53ab7fa27ac7805faff0be8c2d52d685c7edc1380b909ad2c033beaae87be7f3 SHA512 eca3516d2491afa621522aae14e0e5c8632b984d8c6daff3a69df9b2b46416eeacdbd11de8cbc2247fb1119051466d24a4c178b065b630a684be8476be1ef15c
-DIST github.com%2Ftombuildsstuff%2Fgo-autorest%2Fautorest%2F@v%2Fv0.10.1-0.20200416184303-d4e299a3c04a.zip 109776 BLAKE2B 2217d9342efd3ceb7b0959b021c7788468253caaacea88586210dee8df06c388e8623579f99bff90073d08fa476b5cbd04b3ae4fa43db55dead9c881725e6e5c SHA512 0779a4a93b5dceeb2a1b742aca3af741b12a97da85ccee044e02c63adb0dc51fc504443ae6093661c6cd7f4b87d78beb57cd45c365b5ca9bd5d27bd396c2f3f7
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.mod 28 BLAKE2B 4d0512f0c014baf150880e5a0322d1fffc7b726106a54fe1bfe2ce5926081af697f6ce74fe000ddfe18e2e6d44799346272c704644ea4f1fb44232ae02b09725 SHA512 65d5e7c1e6f710fdf6b475ad898c14466064c86e4aed61e44aa23ff699cf3a9a631f255ec298c8b3d7414ba640d8d5117a06386fe2cfa5cee47d183b03ba3bbf
 DIST github.com%2Fugorji%2Fgo%2F@v%2Fv0.0.0-20180813092308-00b869d2f4a5.zip 355151 BLAKE2B 845d552a6f36dd795cb634fbfca8b7fb3b70f783bba125827ef11729296621cabcdd1ad5e605f9d6c6148e1dd401efb4c80c7f2de4fe8143e05f7c5dc6e607fc SHA512 1c7d0944948442d15a2befc4d5817883a72b95d9bb0320be569863a64139bb45df5f0a06805f9893de657c6ac78cf6f3e4793d78cd2c674eb1eba86305faee66
 DIST github.com%2Fulikunitz%2Fxz%2F@v%2Fv0.5.5.mod 31 BLAKE2B f8ed4b103891625af3043d86905f693014b245198a180911efb7e33480d81b93babd35912c5768df62cd26199e3a742f94365a82de619a97385d7407baa22424 SHA512 33639405743ddf22f19ca03d348c47d9cf963aa151fdab9e7303679ccd5cec373ceebce456eb96ef52dcf933f96e4ef7d4a8099822dfc183996d8cd4f09cba2e
@@ -622,7 +600,6 @@ DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b10
 DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.zip 221108 BLAKE2B 9f03d8b356ccff8e8dda9a4885d7fa79eeccb614415b1bc50ec206458f650456a9e1ade1401908b53c37a3b293cd3b7503b84104555250bc801e5c74b8fb9122 SHA512 259b357d0f31ae6ad5dd1b841d69d934b1d9d441617944d4b46269f43fb4de1cbf15750dac9dc87cf4260902ad2f4e4560e6e023375212e554d150fd65af5f9d
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181025213731-e84da0312774.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181112202954-3d3f9f413869.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190222235706-ffb98f73852f.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
@@ -630,11 +607,8 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.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-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip 1871909 BLAKE2B fa2d419a5bdff43385f70e3c6e61f8c1b3528b6c4e21c3105f66dc358515b6336673188ff68b27a792be9ae69d77cd26c82b7e30605b974e4435634f961c7583 SHA512 de179d887c4ed6ebba0a1cdcfa67b8312b8b2dcd9bd04589d581c872f6fa7a8606ad1376dc6933dec41938781218a91f31fa27331d80cbda30542b8cd14c5af1
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200604202706-70a84ac30bf9.zip 1874278 BLAKE2B c9d8d7150f589d4b313bff96b41e1a24616db4e9a6447f1a20b81e15c35d6dd966507f5b24564afb904e81768f6c226ee73d3bf4ac3ce736c0276eaabc38a139 SHA512 61a5eb5e3af434483bfdd470a028b10c7ea6bf149e0cb4d4443cb8325417cf5b4e85d2fb2e6335dba74d366b80d4bf0b6d6450dbcb3f3e06714c2bc4b0ef6f75
 DIST golang.org%2Fx%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
@@ -815,14 +789,8 @@ DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8
 DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b2352e.mod 74 BLAKE2B c2d88e59e640cf540f7547fa0b67caeecd7424a1dc243681a020d233fab5126dc11f73c18032e0eb8edc7bf9d32dc2902183bf76af255f60f186f16c97055e2d SHA512 94785a6d41763ef86959d6ba291cfb34eb7b35f6599042299604fe6f35a666fa388e9d7bcac282d1370dcc5f99c6ac22f2b677ff9b9920aae8f0d9097ea224c5
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
-DIST terraform-0.12.24.tar.gz 10427523 BLAKE2B 088d0cd249a065ef663b41690e0c1e27baf61706da3444d4677b3a1b24652c50882601e036841fb004377a57d38918a62a45eb84983f5d8f09138ae2c5b3e77e SHA512 026b4c30438459d5fa433ea606e8e020f2ff71ba6e14a5caeecef32f5800a0699cb192ece4bf9b5005b8e0fb2e375f70602d44d94b0b8efa3bac20f9a30e14e6
 DIST terraform-0.12.28.tar.gz 10637713 BLAKE2B 218d8316c004c363bce39f1e4547cdf4a6d73cfd1b1c0e3810b5759ea509ddd6307f2694f9673c1b6b8668c1a869bc04a81be600a38c5d2c5868e2e1962a231f SHA512 cadd2a5527b4c4ee6dd0385d962435e15ac72f99bc0d3e8193f78a49a474e491dab73f9280c77f37f34e516873b12a7f1af23cd437cb2f9d0afb2bef9966c836
-DIST terraform-0.12.29.tar.gz 10640549 BLAKE2B 877ef798dfe67d60a4030fd138a96eff796e24efeca451388f5c1ea7ec3fc9a1eb1824732a13dbb700342fab37296f8e4636de036f862a106bc2b6fc8cf10b33 SHA512 f1c05af299025b350f6748f832eb046156f97668f235281e446d9a2c400b7361c51e8195d8825a54558554cfbf907e562fb75ac27e296468c950e12f212979b5
-DIST terraform-0.13.0.tar.gz 12804812 BLAKE2B 75b6514efa73ccb438726973d1c89021c2b25736e958f3f61c79e713b0dd2dd4e21d590db4c5d6eaf2e797d3de28d0b51b6b3857dac30ad3c6ceb7e9717aaf1c SHA512 9f789b89466b74128ad75dd6b34c1ccf0f7d2b233ea6a6866a09014dd8c7023c1e5c156bcc9e0834c8fdf06e62694d81d4585fee4829c6fd95129c6cd8645798
-DIST terraform-0.13.2.tar.gz 12810056 BLAKE2B c8e01cd3e3bc822cb3cc1158adfcd582642c9c6f174f21f1ba1b415f87527a9379231805731cf65de2071486598dcb9478f84cfa080125c9cd4c9e95e7f343be SHA512 db6ab93c4a6a07ef407ee97aa6e01acb937670c88225b0ad5ae1c51d99f69e863204a4b82c39dbd161f9af530997527c6aeee02c8b96fb33da91b9c4b472697f
-EBUILD terraform-0.12.24.ebuild 777 BLAKE2B 686b38d1df4e28c19f03812fcad15802193f11fc1c8da7ba263513122952ccb9f9d5d469b9ed5e44e1d147c4f7d4d7f1e225ed6345d9d1934cfc062df1be6713 SHA512 4f2f3cd4b891778209a279cd62954cbc91e440422ac5334b88b09e274804c24c1ce9a898d4cfdbeb9623c5e370b8ec9c72ce56801386e981030d821939a7ed91
+DIST terraform-0.13.3.tar.gz 12801673 BLAKE2B 2e966dc17195acf500690a60cb98e6643578c7ebc214669982dbe9e5bdfdabe58af1a82b778503fcaef7df47ff2da0a1f09e0b8dd969c9ff413c16fbdba27778 SHA512 64ee5e74e592265e47778dbc5ad2decc61f5e79514c26782128931be180131ef2ab611dbf4cf46875419157b2957b54688ed4026a80812faf3678cb26c2d7f27
 EBUILD terraform-0.12.28.ebuild 33302 BLAKE2B 9ca5f33aa00c5eacbb82d25fc06cc6a90d16474fe85e0e087dd91edac361188ffcf853b21fd543d07a2836c3d2b6cf47c0c367406c533fb19c5c9ecedc4ef230 SHA512 e521a4cc67ca85de383eb06e2bdace2acf1adba81a66999a744436ce42314c20a9aec78a79795a3c88ee0234e7eb481ffa3778b998692c26ad7783b01ae20bf2
-EBUILD terraform-0.12.29.ebuild 33303 BLAKE2B 4c0259ea3d2abbf4339caf96cd8428128f6fe15a9dfe7290f00ac39997796867db7b3861f99e8c8a4ddf28a3382c3d443bbde7ae22cb0b04e74b41a7f20004e7 SHA512 9114f7a5a1f532d4302ba792a2721b8d6b3e5ebbff504b4f48f406fd3de9933b2d57bd888a53fe5cad165d99e1e26f05865e7a46139ab34862dc805f59929add
-EBUILD terraform-0.13.0.ebuild 41229 BLAKE2B 5cf91bdb2608f3590790071ada4cf4b85ae0a85f69af276767385196a30734bbf0cbf71282ed75edb973b2a8cd6819157a859dfe98ecbc99f9c49a5b04a05753 SHA512 52a093e28f057f3da780e8559592e79051abf79754d9493f05216fc8654c25f0e4822227081df8b8a44eeaaf8218f946517e61a7b7a32298590b907e218bc000
-EBUILD terraform-0.13.2.ebuild 39892 BLAKE2B d51dab818c74e4c7bedba8521da79dda9562d59dd377982cd50f14f162305ac7a81c81a1620d27605b284571fa329f79a709539b7e87ff4ccbe2a6829a034cc5 SHA512 bc01136c15d20525276d25885f5de5d8588b5967de21fee7f5017df91fbfa91efa944a43833c0dd3fba89a08fd52176c277ecfd562e1a9694c20f6c1257b094f
+EBUILD terraform-0.13.3.ebuild 39681 BLAKE2B ea27dcb2cdfa1f12cc7fc362fdd5535d34c71a1694d9f04ae9bba66db61ed7f0b5fc6b3dec689ce34211305db5ffd4df503f2608f8f52f0310a3370d2bc18911 SHA512 e383c04ab131872fed9ac88419902305ad2d464209a390bf643c93646400e01dc21e7d068e92188a333528defa72d563780d1bf8c5f188e111a7aae99cb9498b
 MISC metadata.xml 1074 BLAKE2B f14c6ede900b616f5a5514adc9735d25fa834dc879712ab79b68fe15a927cb3e8e77a7b30ee8af3b44551be9ec2368476757c4ec5e5b44fcd266367b485fc8bc SHA512 2e28b3de2b512246ddfb76b547151683c4202620992f9453747b4869db1a16d92996cbf810bf82f09e6895ddc7b23ecc2e0ecaf43d9c3ba9e8a2fb53baa995dc
diff --git a/app-admin/terraform/terraform-0.12.24.ebuild b/app-admin/terraform/terraform-0.12.24.ebuild
deleted file mode 100644
index 7d194e4e3804..000000000000
--- a/app-admin/terraform/terraform-0.12.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-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"
-
-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 \
-		-mod vendor \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/terraform
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like to install shell completions please run:"
-	elog "    terraform -install-autocomplete"
-}
diff --git a/app-admin/terraform/terraform-0.12.29.ebuild b/app-admin/terraform/terraform-0.12.29.ebuild
deleted file mode 100644
index 7abd310fc46d..000000000000
--- a/app-admin/terraform/terraform-0.12.29.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.0.ebuild b/app-admin/terraform/terraform-0.13.0.ebuild
deleted file mode 100644
index 9d7cb6350848..000000000000
--- a/app-admin/terraform/terraform-0.13.0.ebuild
+++ /dev/null
@@ -1,759 +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 v21.3.0+incompatible/go.mod"
-	"github.com/Azure/azure-sdk-for-go v32.5.0+incompatible/go.mod"
-	"github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod"
-	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest v12.1.0+incompatible"
-	"github.com/Azure/go-autorest v12.1.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.6.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.2"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.2.0"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.0"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.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/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.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-textseg/v12 v12.0.0"
-	"github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod"
-	"github.com/apparentlymart/go-userdirs v0.0.0-20190512014041-4a23807e62b9"
-	"github.com/apparentlymart/go-userdirs v0.0.0-20190512014041-4a23807e62b9/go.mod"
-	"github.com/apparentlymart/go-versions v1.0.0"
-	"github.com/apparentlymart/go-versions v1.0.0/go.mod"
-	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
-	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
-	"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/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 v0.0.0-20151105211317-5215b55f46b2/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dimchansky/utfbom v1.0.0/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/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.5.0"
-	"github.com/hashicorp/aws-sdk-go-base v0.5.0/go.mod"
-	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
-	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-azure-helpers v0.4.1/go.mod"
-	"github.com/hashicorp/go-azure-helpers v0.10.0"
-	"github.com/hashicorp/go-azure-helpers v0.10.0/go.mod"
-	"github.com/hashicorp/go-checkpoint v0.5.0"
-	"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.0/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/hashstructure v1.0.0"
-	"github.com/mitchellh/hashstructure v1.0.0/go.mod"
-	"github.com/mitchellh/iochan v1.0.0"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/mitchellh/panicwrap v1.0.0"
-	"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.10.1"
-	"github.com/tombuildsstuff/giovanni v0.10.1/go.mod"
-	"github.com/tombuildsstuff/go-autorest v14.0.1-0.20200416184303-d4e299a3c04a+incompatible"
-	"github.com/tombuildsstuff/go-autorest v14.0.1-0.20200416184303-d4e299a3c04a+incompatible/go.mod"
-	"github.com/tombuildsstuff/go-autorest/autorest v0.10.1-0.20200416184303-d4e299a3c04a"
-	"github.com/tombuildsstuff/go-autorest/autorest v0.10.1-0.20200416184303-d4e299a3c04a/go.mod"
-	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5"
-	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod"
-	"github.com/ulikunitz/xz v0.5.5"
-	"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-20181112202954-3d3f9f413869/go.mod"
-	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
-	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod"
-	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9"
-	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-	"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 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.2.ebuild b/app-admin/terraform/terraform-0.13.3.ebuild
index 75a77c9c8731..b9df790c598c 100644
--- a/app-admin/terraform/terraform-0.13.2.ebuild
+++ b/app-admin/terraform/terraform-0.13.3.ebuild
@@ -80,8 +80,8 @@ EGO_SUM=(
 	"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-20190512014041-4a23807e62b9"
-	"github.com/apparentlymart/go-userdirs v0.0.0-20190512014041-4a23807e62b9/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"
@@ -102,8 +102,6 @@ EGO_SUM=(
 	"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"
@@ -393,8 +391,6 @@ EGO_SUM=(
 	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
 	"github.com/mitchellh/gox v1.0.1"
 	"github.com/mitchellh/gox v1.0.1/go.mod"
-	"github.com/mitchellh/hashstructure v1.0.0"
-	"github.com/mitchellh/hashstructure v1.0.0/go.mod"
 	"github.com/mitchellh/iochan v1.0.0"
 	"github.com/mitchellh/iochan v1.0.0/go.mod"
 	"github.com/mitchellh/mapstructure v1.1.2"
@@ -706,7 +702,6 @@ EGO_SUM=(
 	"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
@@ -716,7 +711,7 @@ 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"
+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"