gentoo resync : 16.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-16 09:32:48 +0100
commit: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree: b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /app-admin
parent: b17a3ef12038de50228bade1f05502c74e135321 (diff)
123 files changed, 1590 insertions, 4391 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 56af1ad591d0..e3b851a81028 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
new file mode 100644
index 000000000000..13f2d4c4cf16
--- /dev/null
+++ b/app-admin/ansible-base/Manifest
@@ -0,0 +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
diff --git a/app-admin/ansible-base/ansible-base-2.10.0.ebuild b/app-admin/ansible-base/ansible-base-2.10.0.ebuild
new file mode 100644
index 000000000000..3cc5cd35c7bb
--- /dev/null
+++ b/app-admin/ansible-base/ansible-base-2.10.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	# 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-base/ansible-base-2.10.1.ebuild b/app-admin/ansible-base/ansible-base-2.10.1.ebuild
new file mode 100644
index 000000000000..4abf588a0449
--- /dev/null
+++ b/app-admin/ansible-base/ansible-base-2.10.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	# 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-base/metadata.xml b/app-admin/ansible-base/metadata.xml
new file mode 100644
index 000000000000..eb7c38b1c2e3
--- /dev/null
+++ b/app-admin/ansible-base/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>calchan@gentoo.org</email>
+    <name>Denis Dupeyron</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>monsieurp@gentoo.org</email>
+    <name>Patrice Clement</name>
+  </maintainer>
+  <upstream>
+	<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>
+  <longdescription lang="en">
+Radically simple deployment, model-driven configuration management, and
+command execution framework.
+
+This is a minimal installation of Ansible which contains the core programs,
+some documentation, and a tiny subset of modules and plugins to allow for a
+functioning controller. All other modules, including most of those
+bundled with in Ansible 2.9 and older, must be installed separately,
+e.g. from collections.
+</longdescription>
+</pkgmetadata>
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 07691833a1ea..579173ca5596 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,6 +1,8 @@
 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 1883 BLAKE2B 0760346b3069ef22ef95fdedc724d4a184093dcde221df1222b29bec1012386d1a25f79e5c04aee920d0248b021a64c7ca392923afb624ef2df1d3ef61da60dc SHA512 4945d7b0263547f492b4f428aab8972f18fc7c1b540ed3b3f8f5c0c0cd3911120fd7fff9949e6eff6478eeda46de09f511b854f9617ab76b14764b4a31b0a7bf
+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
 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
index 79e643cf99f7..1477fa51b693 100644
--- a/app-admin/ansible/ansible-2.10.0.ebuild
+++ b/app-admin/ansible/ansible-2.10.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-base-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
diff --git a/app-admin/ansible/ansible-2.9.13.ebuild b/app-admin/ansible/ansible-2.9.13.ebuild
new file mode 100644
index 000000000000..8c8b3a948043
--- /dev/null
+++ b/app-admin/ansible/ansible-2.9.13.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	dodoc -r examples
+}
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
index bcec1a0db7a0..01b0183d2153 100644
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -1,15 +1,3 @@
-AUX apachetop-0.12.6-ac_config_header.patch 458 BLAKE2B 714adf5ee34629abae9cfe38d630e4e1c0829a99c823bc00a5276fe424264378316e18274976c71b974e970a25329413ab720f6621dcf3a6dcf61f02bc7d46d7 SHA512 dc10e46cac980a3544579222c5859d8baf4a1b5fd86a4700b07661e202270ff59b746b14661ca548d83322965e789bf70c7eddf8bf07b51d97d9e13256040109
-AUX apachetop-0.12.6-configure.patch 2884 BLAKE2B 34310a487b0dc68e184c9facce01d8ca95364c6c8ed041fa5ccf9dbbdce3ca4ac944fff91aafb4866e7086e8fd9ebeb961026f84bd3c77ccaabdbc5e1be97997 SHA512 7c399fd434476291504cd7674fe63559c59a7b32628477ad4fbd1386e936be4d1f49d4faa2d8d95839c74908e755d50400ab8f4f30163967b94dc058456c9c15
-AUX apachetop-0.12.6-gcc41.patch 247 BLAKE2B f193def780fc35322d49af0e13898a5dd95ecb49f8c0f4039260eb6b2aaf6e5a45131682d68d38f474d384b9d6d35c27a5233b57949da8b6ff54d29b9634c86e SHA512 710b8e3b381dcf9aac58544f9afe0f2a3cc598b38e87145caad29404fc19983bc683b160f0f80dd003ffa57d246fbc5b0fa5754aa1012e985b4c2ffc7e01f50f
-AUX apachetop-0.12.6-maxpathlen.patch 1577 BLAKE2B 97c046e1bf9f7cd67aaf95f9ed755bc3f12774756da35b31cd7b38db22b2860400bcbc9626a37ea795dc454c46b90dd2a53f41c42124e9d777a7da7a75da3a4c SHA512 c0e4562b9789168acbea68b4f19eb32238244d8003bd4d0df458582b095d9680f2e20b592990f0bebe5ae17fcbcbfd2154e74169788a8d3a31498f26776f6f36
-AUX apachetop-0.12.6-ncurses.patch 5392 BLAKE2B bfbe54d1a3b32157cda1a22aba83829948233df7d18d6f54c9ec6f9b4e987c9c201d1bc5af43c3ce0edd8af5d83f14b229725f68b44e8e9ab202da961d628542 SHA512 2c4759a1a8c4a54fb10d75779c23bfadfdb789be1a790add29adc2cb9ba1829f57239da568057ddbfaf0cea5468a74a3fdf20b1fd35b0bf51e8c8ab9e6027b6d
-AUX apachetop-0.18.4-tinfo.patch 313 BLAKE2B 389a6d0715b00de166dff543b53abda45a52497497d66c4d0b4b2e4b0c4407a8dee90d7401088f9b99e408738d523211741f579b70ca8f64826e3dbd46619fd1 SHA512 0a9ef0782498e67cca07b642e796b1abaffad3bc3b330ca83b579d75a34fba1225453a52aadd720a830d8b51d342d34ed87c3b10cb8441bcf4c71b375ee03e66
-DIST apachetop-0.12.6.tar.gz 126930 BLAKE2B 06d12cc72791920c959fa4ef8e18aa90f1f29a616389329685abf445f416cde9ce6edd2db5aaadaba51488033148e8109245200086a11422436ffe0aab1b4a40 SHA512 35081772f817c6a83a1fcf78790d2a288a9e4e48234c4b3163a09ad15f49a78d649b77f41aa002940fb9416c263cea159c5092a9b87285488eb450964c823c3a
-DIST apachetop-0.17.4.tar.gz 128153 BLAKE2B 7601ce98618d041f6fc67e528775ce79b63a726b765ff298d1d74a1dd22a4451be6c36669c7ab9bf82fb8c120a6930d2bbf03823de02a216c558c358c53c07be SHA512 b5115048f79c694344fd341631fe7739567ba3ce6e18514d0be250cb6f42e04c54d35cc023dea5258725fcbfbb6debdaa51b91d64ae3120e70f5b78a7989a330
-DIST apachetop-0.18.4.tar.gz 128849 BLAKE2B 912f060984da326b2e005cc0e3eb99c28182bc6a0930e6781d5a0a990dbbe56b5dbfe871baea1c86a5ac2bc02faa1e583ca104d3c8bd00cc3617599601b2d8bd SHA512 e32f94ab6223578aa5b8c11083de762e8f916ba6d057d93f99208333632a8362b421c41fff76bf60a52f0b377a70d69c17ed02abfb95f86474ad3719016e59f7
 DIST apachetop-0.19.7.tar.gz 132665 BLAKE2B 248247c361d1585de68a0a9adae22f98db72991babfb4a75f01fa67ef28443a3c04cf1da9c1ea34ed923599955b58959528cc9e0a881fbb7b463b1d64c0cb7bd SHA512 40d546facee23a9914483c06323940e219602518751d80f729d835c4dbf991c7d1dd9bcebcaa4ca6a2d64799d48c8a00d421bc324afc2959691c962113386969
-EBUILD apachetop-0.12.6-r2.ebuild 896 BLAKE2B d8fa75f505641c95219c94f0fb09bbb8382a4797c08be644ac17958c4c804c2594c3c5809c9b82fc413010230f5a83a70a74f4616fce507a1726bcbed204e231 SHA512 b5368a948c0b4f4e6c2d754335de9dd20cb263985192631703d437f7f1c833758b11e4a17cd18fa6f5d09a2edba8de91966d9d72c453e17c6145012686ad68ca
-EBUILD apachetop-0.17.4.ebuild 726 BLAKE2B 2979fc7c056474d3e6e968eb7f8a9729a9dcd83137020f50f45c14d1dae27a567dc03e189878e7a2edaa5fb9c68a4ddb4b9211c4d2f5089a98f4850bc67185da SHA512 3e7bcd2561a0dcbdf8d494e3e41c4735e1d08b6893d2c1889dc7590edb83ba729d42b73327284eb50f7c313f0c4b7d07a7c2e63cc5cc01544fa593eebdd8a072
-EBUILD apachetop-0.18.4.ebuild 756 BLAKE2B 5dfdc856a095e583b707fbfeb2afa79f7a7f9486c8792a814bbb2823d8e92cbd3f78b1aa2fff34a2cf236923abe189e7e7ebc00cf2841cc5b100c0e43fd64391 SHA512 07fd2b11883cccc65befd13045f5d4fdf454e6dede3b2a97f46dc3487364daab176777d928aa575118c63806b1a8b7997c55961d895359504f02e97e20df5ba2
-EBUILD apachetop-0.19.7.ebuild 669 BLAKE2B 1f9df2058e40543b50f678e4323aa22bb9465d8fdba922fa1d21daf4979b53bbdc0f9c5bc9b17a70f0ffa7daef29cdd7514dd639407d3d15d1814819dda29b5d SHA512 273cda324222fc816102c0d8302da0f915f634d7e664273358fc82de12494bb3129b084118c5a7eac8ed0b85a6b113d0b525684fcc59dba07f8973480ffb9069
+EBUILD apachetop-0.19.7.ebuild 667 BLAKE2B 5ddffed81f4dd1398477e08a2a9a7267af9a68a3eaaa6fb078c73a81fa4113b43eb1dd5398724b6fb713b502903555dd023b273395d3608365f38120dfbc4998 SHA512 7c5a9554291d6cbe44642efe119702618b64a8e0c78afa84933f2db9775eb263a75540d192203e8dcfdfeccbe831e30c60d8b845cfeff69d0f12b1831ce4d3ac
 MISC metadata.xml 169 BLAKE2B 21efaa2ec5fcac1a8cf109ad11001875d2c1327d6765bf71d06666699dc6eab3eed845895cc55a6a1d57358bfe6a6fefcbef1f616d6c259ee725a526e10b5a05 SHA512 5192868b5508b672a7e4e119ffd5a730dca1630781ec37fd20b74e2370521c83dd9020d7bb1379cf911f643a57e4a1e6578f89b64b6e3486571b58fd06e7b88d
diff --git a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
deleted file mode 100644
index 00e66ae0691c..000000000000
--- a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A realtime Apache log analyzer"
-HOMEPAGE="https://github.com/tessus/apachetop"
-SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc sparc x86"
-IUSE="fam pcre"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	fam? ( virtual/fam )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc41.patch
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-maxpathlen.patch
-	"${FILESDIR}"/${P}-ac_config_header.patch
-	"${FILESDIR}"/${P}-ncurses.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
-		--without-adns \
-		$(use_with fam) \
-		$(use_with pcre)
-}
diff --git a/app-admin/apachetop/apachetop-0.17.4.ebuild b/app-admin/apachetop/apachetop-0.17.4.ebuild
deleted file mode 100644
index 2f5954eb82bf..000000000000
--- a/app-admin/apachetop/apachetop-0.17.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A realtime Apache log analyzer"
-HOMEPAGE="https://github.com/tessus/apachetop"
-SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="fam pcre"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	fam? ( virtual/fam )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
-		--without-adns \
-		$(use_with fam) \
-		$(use_with pcre)
-}
diff --git a/app-admin/apachetop/apachetop-0.18.4.ebuild b/app-admin/apachetop/apachetop-0.18.4.ebuild
deleted file mode 100644
index c0a18315d1da..000000000000
--- a/app-admin/apachetop/apachetop-0.18.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A realtime Apache log analyzer"
-HOMEPAGE="https://github.com/tessus/apachetop"
-SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="fam pcre"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	fam? ( virtual/fam )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.4-tinfo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
-		--without-adns \
-		$(use_with fam) \
-		$(use_with pcre)
-}
diff --git a/app-admin/apachetop/apachetop-0.19.7.ebuild b/app-admin/apachetop/apachetop-0.19.7.ebuild
index 52ec4864333f..f02920cb2954 100644
--- a/app-admin/apachetop/apachetop-0.19.7.ebuild
+++ b/app-admin/apachetop/apachetop-0.19.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~mips ~ppc sparc x86"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86"
 IUSE="fam pcre"
 
 RDEPEND="
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch b/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch
deleted file mode 100644
index aabdb13d75f3..000000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr apachetop-0.12.6.orig/configure.ac apachetop-0.12.6/configure.ac
---- apachetop-0.12.6.orig/configure.ac	2013-07-09 14:06:14.000000000 -0400
-+++ apachetop-0.12.6/configure.ac	2013-07-09 14:07:36.000000000 -0400
-@@ -6,7 +6,7 @@
- AC_CONFIG_AUX_DIR(config)
- #AC_CONFIG_MACRO_DIR(m4) # 2.58
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- AM_INIT_AUTOMAKE(apachetop, 0.12.6) # 2.53 only?
- 
- # Add non-standard directories to the include path
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-configure.patch b/app-admin/apachetop/files/apachetop-0.12.6-configure.patch
deleted file mode 100644
index 38a1fc7f6a1a..000000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-configure.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Index: apachetop-0.12.6/configure.ac
-===================================================================
---- apachetop-0.12.6.orig/configure.ac
-+++ apachetop-0.12.6/configure.ac
-@@ -52,48 +52,60 @@ AC_FUNC_VPRINTF
- AC_CHECK_FUNCS([inet_aton memset strchr strdup kqueue strerror strstr])
- 
- # pcre {{{
--AC_ARG_WITH(pcre,
--	[  --with-pcre=<path>      prefix of pcre installation (eg /usr/local)],
--	[
--		CPPFLAGS="$CPPFLAGS -I $withval/include"
--		LDFLAGS="$LDFLAGS -L $withval/lib"
--	]
--)
--
--AC_CHECK_HEADERS(pcre.h,
--	AC_SEARCH_LIBS([pcre_compile], [pcre]) ,
--	AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre])
--)
-+AC_ARG_WITH([pcre],
-+			[  --with-pcre=<path>      prefix of pcre installation (eg /usr/local)],
-+			[case "${withval}" in
-+			  yes) with_pcre="/usr";;
-+			  no)  with_pcre="no";;
-+			  *)   with_pcre="/usr";;
-+			 esac],
-+			 [with_pcre="/usr"])
-+
-+if test x$with_pcre != xno; then
-+	CPPFLAGS="$CPPFLAGS -I $withval/include"
-+	LDFLAGS="$LDFLAGS -L $withval/lib"
-+	AC_CHECK_HEADERS(pcre.h,
-+					 AC_SEARCH_LIBS([pcre_compile], [pcre]),
-+					 AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre]))
-+fi
- # }}}
- 
- # fam {{{
--AC_ARG_WITH(fam,
--	[  --with-fam=<path>      prefix of fam installation (eg /usr/local)],
--	[
--		CPPFLAGS="$CPPFLAGS -I $withval/include"
--		LDFLAGS="$LDFLAGS -L $withval/lib"
--	]
--)
--
--AC_CHECK_HEADERS(fam.h,
--	AC_SEARCH_LIBS([FAMOpen], [fam]) ,
--	AC_MSG_WARN([*** fam.h not found -- consider using --with-fam])
--)
-+AC_ARG_WITH([fam],
-+			[  --with-fam=<path>      prefix of fam installation (eg /usr/local)],
-+			[case "${withval}" in
-+			  yes) with_fam="/usr";;
-+			  no)  with_fam="no";;
-+			  *)   with_fam="/usr";;
-+			 esac],
-+			 [with_fam="/usr"])
-+
-+if test x$with_fam != xno; then
-+	CPPFLAGS="$CPPFLAGS -I $with_fam/include"
-+	LDFLAGS="$LDFLAGS -L $with_fam/lib"
-+	AC_CHECK_HEADERS(fam.h,
-+					 AC_SEARCH_LIBS([FAMOpen], [fam]),
-+					 AC_MSG_WARN([*** fam.h not found -- consider using --with-fam]))
-+fi
- # }}}
- 
- # adns {{{
--AC_ARG_WITH(adns,
--	[  --with-adns=<path>     prefix of adns installation (eg /usr/local)],
--	[
--		CPPFLAGS="$CPPFLAGS -I $withval/include"
--		LDFLAGS="$LDFLAGS -L $withval/lib"
--	]
--)
--
--AC_CHECK_HEADERS(adns.h,
--	AC_SEARCH_LIBS([adns_submit], [adns]) ,
--	AC_MSG_WARN([*** adns.h not found -- consider using --with-adns])
--)
-+AC_ARG_WITH([adns],
-+			[  --with-adns=<path>     prefix of adns installation (eg /usr/local)],
-+			[case "${withval}" in
-+			  yes) with_adns="/usr";;
-+			  no)  with_adns="no";;
-+			  *)   with_adns="/usr";;
-+			 esac],
-+			 [with_adns="/usr"])
-+
-+if test x$with_adns != xno; then
-+	CPPFLAGS="$CPPFLAGS -I $with_adns/include"
-+	LDFLAGS="$LDFLAGS -L $with_adns/lib"
-+	AC_CHECK_HEADERS(adns.h,
-+					 AC_SEARCH_LIBS([adns_submit], [adns]),
-+					 AC_MSG_WARN([*** adns.h not found -- consider using --with-adns]))
-+fi
- # }}}
- 
- # --with-logfile {{{
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
deleted file mode 100644
index 6bfb49d9f9d8..000000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/resolver.h
-+++ b/src/resolver.h
-@@ -10,8 +10,8 @@
- class Resolver
- {
- 	public:
--	Resolver::Resolver(void);
--	Resolver::~Resolver(void);
-+	Resolver(void);
-+	~Resolver(void);
- 	int add_request(char *request, enum resolver_action act);
- 
- 
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch b/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch
deleted file mode 100644
index b648b07cbfc5..000000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for apachetop <= 0.12.6, which
-adds some includes in order to have a real change to get MAXPATHLEN defined with
-a valid value. Once MAXPATHLEN really gets filled with 128, it will just cause a
-buffer overflow.
-
-See Red Hat Bugzilla #446199 (https://bugzilla.redhat.com/show_bug.cgi?id=446199)
-for more information. This patch should solve the mentioned bug report and should
-be sane enough to get included by upstream of apachetop for the next release. It
-is important to run autoheader before ./configure to get these changes activated.
-
---- apachetop-0.12.6/configure.ac		2005-10-27 18:39:25.000000000 +0200
-+++ apachetop-0.12.6/configure.ac.maxpathlen	2008-06-21 16:00:38.000000000 +0200
-@@ -34,7 +34,8 @@
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h \
--		string.h strings.h sys/socket.h time.h sys/time.h])
-+		string.h strings.h sys/socket.h time.h sys/time.h \
-+		limits.h sys/param.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- #AC_HEADER_STDBOOL # not in 2.53?
---- apachetop-0.12.6/src/apachetop.h		2005-10-15 18:10:01.000000000 +0200
-+++ apachetop-0.12.6/src/apachetop.h.maxpatlen	2008-06-21 16:02:00.000000000 +0200
-@@ -89,8 +89,12 @@
- #define getMIN(a,b) (a < b ? a : b)
- #define getMAX(a,b) (a > b ? a : b)
- 
--#ifndef MAXPATHLEN
--# define MAXPATHLEN 128
-+#ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+#endif
-+ 
-+#if HAVE_LIMITS_H
-+# include <limits.h>
- #endif
- 
- /* upon startup, each input file is put into an element of this array,
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch b/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch
deleted file mode 100644
index f12c989c3407..000000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch
+++ /dev/null
@@ -1,166 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,7 @@
- AC_CONFIG_SRCDIR(src/apachetop.cc)
- 
- AC_CONFIG_AUX_DIR(config)
--#AC_CONFIG_MACRO_DIR(m4) # 2.58
-+AC_CONFIG_MACRO_DIR(m4)
- 
- AC_CONFIG_HEADER(config.h)
- AM_INIT_AUTOMAKE(apachetop, 0.12.6) # 2.53 only?
-@@ -29,7 +29,6 @@
- #AC_PROG_CC
- #AC_PROG_CPP
- AC_PROG_CXX
--AC_LANG_CPLUSPLUS
- 
- # Checks for header files.
- AC_HEADER_STDC
-@@ -120,24 +119,9 @@
- 
- AC_SEARCH_LIBS([socket], [socket])
- AC_SEARCH_LIBS([inet_addr], [nsl])
--AC_SEARCH_LIBS([attron], [ncurses])
--AC_SEARCH_LIBS([tgetstr], [termcap])
--AC_SEARCH_LIBS([mvprintw], [curses ncurses] ,
--	[] ,
--	[
--		AC_MSG_ERROR([No useful curses library found!])
--	]
--)
- 
--AC_SEARCH_LIBS([readline], [readline],
--	[
--		AC_DEFINE(HAVE_READLINE,1,[Define if you have readline library])
--		AC_SUBST(HAVE_READLINE)
--	] ,
--	[
--		AC_MSG_ERROR(readline library not found)
--	]
--)
-+PKG_CHECK_MODULES([NCURSES], [ncurses])
-+AX_LIB_READLINE
- 
- 
- # everything is in CPPFLAGS up to this point, now we move to CXXFLAGS
---- a/m4/ax_lib_readline.m4
-+++ b/m4/ax_lib_readline.m4
-@@ -0,0 +1,107 @@
-+# ===========================================================================
-+#     https://www.gnu.org/software/autoconf-archive/ax_lib_readline.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_LIB_READLINE
-+#
-+# DESCRIPTION
-+#
-+#   Searches for a readline compatible library. If found, defines
-+#   `HAVE_LIBREADLINE'. If the found library has the `add_history' function,
-+#   sets also `HAVE_READLINE_HISTORY'. Also checks for the locations of the
-+#   necessary include files and sets `HAVE_READLINE_H' or
-+#   `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or
-+#   'HAVE_HISTORY_H' if the corresponding include files exists.
-+#
-+#   The libraries that may be readline compatible are `libedit',
-+#   `libeditline' and `libreadline'. Sometimes we need to link a termcap
-+#   library for readline to work, this macro tests these cases too by trying
-+#   to link with `libtermcap', `libcurses' or `libncurses' before giving up.
-+#
-+#   Here is an example of how to use the information provided by this macro
-+#   to perform the necessary includes or declarations in a C file:
-+#
-+#     #ifdef HAVE_LIBREADLINE
-+#     #  if defined(HAVE_READLINE_READLINE_H)
-+#     #    include <readline/readline.h>
-+#     #  elif defined(HAVE_READLINE_H)
-+#     #    include <readline.h>
-+#     #  else /* !defined(HAVE_READLINE_H) */
-+#     extern char *readline ();
-+#     #  endif /* !defined(HAVE_READLINE_H) */
-+#     char *cmdline = NULL;
-+#     #else /* !defined(HAVE_READLINE_READLINE_H) */
-+#       /* no readline */
-+#     #endif /* HAVE_LIBREADLINE */
-+#
-+#     #ifdef HAVE_READLINE_HISTORY
-+#     #  if defined(HAVE_READLINE_HISTORY_H)
-+#     #    include <readline/history.h>
-+#     #  elif defined(HAVE_HISTORY_H)
-+#     #    include <history.h>
-+#     #  else /* !defined(HAVE_HISTORY_H) */
-+#     extern void add_history ();
-+#     extern int write_history ();
-+#     extern int read_history ();
-+#     #  endif /* defined(HAVE_READLINE_HISTORY_H) */
-+#       /* no history */
-+#     #endif /* HAVE_READLINE_HISTORY */
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Ville Laurikari <vl@iki.fi>
-+#
-+#   Copying and distribution of this file, with or without modification, are
-+#   permitted in any medium without royalty provided the copyright notice
-+#   and this notice are preserved. This file is offered as-is, without any
-+#   warranty.
-+
-+#serial 7
-+
-+AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE])
-+AC_DEFUN([AX_LIB_READLINE], [
-+  AC_CACHE_CHECK([for a readline compatible library],
-+                 ax_cv_lib_readline, [
-+    ORIG_LIBS="$LIBS"
-+    for readline_lib in readline edit editline; do
-+      for termcap_lib in "" termcap curses ncurses; do
-+        if test -z "$termcap_lib"; then
-+          TRY_LIB="-l$readline_lib"
-+        else
-+          TRY_LIB="-l$readline_lib -l$termcap_lib"
-+        fi
-+        LIBS="$ORIG_LIBS $TRY_LIB"
-+        AC_TRY_LINK_FUNC(readline, ax_cv_lib_readline="$TRY_LIB")
-+        if test -n "$ax_cv_lib_readline"; then
-+          break
-+        fi
-+      done
-+      if test -n "$ax_cv_lib_readline"; then
-+        break
-+      fi
-+    done
-+    if test -z "$ax_cv_lib_readline"; then
-+      ax_cv_lib_readline="no"
-+    fi
-+    LIBS="$ORIG_LIBS"
-+  ])
-+
-+  if test "$ax_cv_lib_readline" != "no"; then
-+    LIBS="$LIBS $ax_cv_lib_readline"
-+    AC_DEFINE(HAVE_LIBREADLINE, 1,
-+              [Define if you have a readline compatible library])
-+    AC_CHECK_HEADERS(readline.h readline/readline.h)
-+    AC_CACHE_CHECK([whether readline supports history],
-+                   ax_cv_lib_readline_history, [
-+      ax_cv_lib_readline_history="no"
-+      AC_TRY_LINK_FUNC(add_history, ax_cv_lib_readline_history="yes")
-+    ])
-+    if test "$ax_cv_lib_readline_history" = "yes"; then
-+      AC_DEFINE(HAVE_READLINE_HISTORY, 1,
-+                [Define if your readline library has \`add_history'])
-+      AC_CHECK_HEADERS(history.h readline/history.h)
-+    fi
-+  fi
-+])dnl
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,6 +6,7 @@
-                     display.cc hits_circle.cc timed_circle.cc filters.cc \
- 		    resolver.cc
- 
-+apachetop_LDADD = $(NCURSES_LIBS)
- 
- noinst_HEADERS = apachetop.h log.h ohtbl.h map.h queue.h \
-                  display.h hits_circle.h circle.h timed_circle.h filters.h \
diff --git a/app-admin/apachetop/files/apachetop-0.18.4-tinfo.patch b/app-admin/apachetop/files/apachetop-0.18.4-tinfo.patch
deleted file mode 100644
index d975a430914f..000000000000
--- a/app-admin/apachetop/files/apachetop-0.18.4-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -133,7 +133,7 @@
- AC_SEARCH_LIBS([socket], [socket])
- AC_SEARCH_LIBS([inet_addr], [nsl])
- AC_SEARCH_LIBS([attron], [ncurses])
--AC_SEARCH_LIBS([tgetstr], [termcap])
-+AC_SEARCH_LIBS([tgetstr], [tinfo termcap])
- AC_SEARCH_LIBS([mvprintw], [curses ncurses] ,
-     [] ,
-     [
diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest
index 9c50372ca39c..f0a11caf0fb2 100644
--- a/app-admin/bastille/Manifest
+++ b/app-admin/bastille/Manifest
@@ -5,4 +5,4 @@ DIST Bastille-3.0.9.tar.bz2 319045 BLAKE2B 480288c6e9fc5462e8e6ca84665d5769aab42
 DIST bastille-3.0.9-gentoo-0.2.patch.bz2 14117 BLAKE2B 9c4383eae9e27cc4e110553a21424cd2811172c32609b0d3bcc72ccc3f61ba7cd76bfdbee969de5a89c22d0c1dd91b9ba92ce27ea5ac2b7260e5c0e1ce424be5 SHA512 a4ecfc064d6cf8c12b6f53c81dea841931df270293b03c39266861121f3def28fcbc4127b3bc9374028983e584736fb85361443badaadec7441cfb1570bdea8f
 EBUILD bastille-3.0.9-r1.ebuild 1571 BLAKE2B 1c6d3bf7b0bb37dd60ada30354a097e3cbfc8b80d0f8dccda92a983241cfb759dc97f4c550ee0edfdf674b2249b1ca9629f9808e1b9447693056224d95e6489c SHA512 ff9048baa2a2a47bb7848c298bebe7bca41b249c3ff37ccbd313a0d8930e310de2edd14ecae0abd4043245a0d9564002ae7b8ed4cd4737f6ec51679555297daf
 EBUILD bastille-3.0.9-r2.ebuild 1713 BLAKE2B 751966d54e66ab1d86caf0bcd81eec1ad1642677d69598c8a44ca7b4151888c0975bd2f64307714c62e1b7ec27b7db6e80c89e7e235061205c9510883ac0243b SHA512 7b250fa0d0dd26662c5547d1aac700200baa139e5b439d9401b2613893b95775bdf3131ef9dc91a83748ad0ca51b550bbceaadb3975429b81976089cea154b12
-MISC metadata.xml 459 BLAKE2B ef04f8221c3a19d7efded571376315032035b3ba4e4cb9cb9e3ecf2930e1ecfbf8bddec92485d8bd91655a68afb3f29aaae88f3a017bc5b56a083dcd31ce0257 SHA512 5c339c93e1aba939528018b1b4a6f21b3f87c93efc60471300064c85c9c0723474fcd5092d6367b02ac1d21564451b319f4ba6c261fa890def1e58a1647f4fc9
+MISC metadata.xml 335 BLAKE2B c697944d835cd494f8b523f6ff035eb704cece47594480dcdc41c26bb958fb35a7a2c00e7195c0647cf308e7fe963cbcd334aaa49822a53b27bec76d31a34f88 SHA512 d87baaebf80becdabfaf4214b7ea268455eaa806353a53e51a4342ed9a13ea981b4f4c7169ad323fc21fff69e314f3e397981701271db66447c17ad2440892d5
diff --git a/app-admin/bastille/metadata.xml b/app-admin/bastille/metadata.xml
index fb9c3ca6f9ff..9747fec76ce8 100644
--- a/app-admin/bastille/metadata.xml
+++ b/app-admin/bastille/metadata.xml
@@ -5,7 +5,6 @@
 		<email>hardened@gentoo.org</email>
 		<name>Gentoo Hardened</name>
 	</maintainer>
-	<longdescription>The Bastille Hardening System attempts to "harden" or "tighten" Unix operating systems.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">bastille-linux</remote-id>
 	</upstream>
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index e2964ac70ee6..8f60689f9c5c 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -11,12 +11,10 @@ DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa62
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.zip 2721920 BLAKE2B f3fde8f5cc53496dc314bcae822a415cf00950da0a03b968de00685371e7a2e84ffa304fb176e791c85c930728859687e768ff785829f0751ae919546bd3326d SHA512 8981a08b1ba0226854567b0977d8a349abe2b58420421ab1dccdaf9c98e7657cb2140ad1a38767d25cb54249b61f162ecd51d401374a29f7368a550b19196595
 DIST consul-1.7.4.tar.gz 22787889 BLAKE2B cb7a813beac2fd752858046d5a92f898662ea986f09d660c65173eb68e7523e9f1c6a8fc267275b2170490dc1e897d9c8d0df57dd898e58f0197e835c759919a SHA512 50466c6ded9d46ade57df252cda3cfc24ff321c13455d789dc7ea300ba037386aca73c6a47be9c5817985ff9678e04daa3295aff5ae83c97afa297451456bc4b
-DIST consul-1.7.6.tar.gz 22797398 BLAKE2B 12ed9d4730d0b4392a60431c7975d42a1d151df75ee734f3c71210d51839e1be67b7662141b02f8a1b96da0914221ce5c4a8a2bfc08bb44a4d40e55a88213aac SHA512 5d6f65090d3dbcb6d64fa91af4d0885223caa80055c47ebda3e9444f254f2bc6eaf8c2ab9d148dabcbc3d1447b1841277ad2aca12d32ea290d8b22d96d3d885e
 DIST consul-1.7.7.tar.gz 22797355 BLAKE2B 659fec61fa9933c19d49c406a13305f2e33c064d9ff1df3d2c3dc28ca7f2e98be02aabcc110f741a2819022c6199d42284c8002c12594798be544295d7a2a23b SHA512 9a97ee452bac2cdf4cf9dbdab3b7b769f38d0d8082b419dbcc5b11a6041945f62ec7bbbd15f11e49c117215ff2ea6b986d754dbb50806631d6a0771741965d4f
-DIST consul-1.8.0.tar.gz 24065255 BLAKE2B 2e6dd72d5cfb235b5574fdadee9dde44c602604409ffe023d7032d56e7285a82efa51df26bee09ac07116daa87738867fc6fb8052339c35011962f3a178f68c7 SHA512 29f678bfe9012304f5eb49a47c2f2e799268bb4e98262d38b21de88a8bbd51d7035bc0eac8fb72d0a78526e1c2f83d34e897023476871198c543cb9ac43308f1
-DIST consul-1.8.1.tar.gz 24233215 BLAKE2B 55647f845165cced83df395c98df78706245f7a01de26b2e9eeb31576c66612c476b4c4d38811c10b2c4a827408ab77dcabf2682a9e70dee7c050a0b330f25f2 SHA512 4a1839949e2428ae8c1565c1230feec4bf9f737fd0fcd164c1d1f5960ea30a809c8d97bbcf628f19a12dedab444c3cb08eee28671929e611e5d508b7363586bf
-DIST consul-1.8.2.tar.gz 24237536 BLAKE2B d2983601564f5196903f3e60390f0d2095333f4ebce7fcf9ca0bdf0d4bf4dd8d3ccbeedd5665ad875065a2b6d7d34edd907dac3738e6c492b33aaffb7d9aabaf SHA512 c222d0989390fb256a07365844aa42aa7672087d29cb86b4fd486fc7ffd9a59ff35eac9ff5dca761194011d127489e38aa70d04232a8299c7b325d4d1d322cf2
+DIST consul-1.7.8.tar.gz 22799862 BLAKE2B 94a091dab7eb4a2379b4c426fa47e0baeaa016066fb161fba540af2cf6811fdc225d18181d99d8d0e674c9503ae6d9facc15e0e35dccbad509ba143aa1b9f497 SHA512 2ca89bdcf576910697a4c52040cd0eebd5b0600a717e2170132c65c2f66696dcad23ab9923c43c8c9213263d8da1dc681ef2fc52f97d9f582643c036473fb10e
 DIST consul-1.8.3.tar.gz 24240809 BLAKE2B ac3740541e37dd0546e719a359b3943ddd5c330b2c7e35dead1a8c849a434e935566edb1898d15a95892b35509885e02ba406d0bbeb4969e96146386c8b7e760 SHA512 841c21319b8937d1bccfc49c254db4d040368e678884c12fa67e8918e36c030c855c2b10fa7e372125c86345f0c6623fe7de54a4e657334db4a305752b7fd369
+DIST consul-1.8.4.tar.gz 28576916 BLAKE2B b5d65831e569dc1e997617642f82d040f0d3a1490c8a31f10e94ba50ca1a0b3abb4a3bcf57e369c7afacf8c31949ab0f7e687d887bb1c51641d9ee266e333b87 SHA512 f8bf566cfcad21e26c39e88667c383dc07569376b00c326938b685b082fe79f4e312c37132018a65f37ee2a70d2260c6a2e5dffb81cc8aaae77b3318e82fd7cd
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip 16060635 BLAKE2B 6c358031305d8c8245b52bc58ed08cea5cb07c3e80cb3043f369ac6faf893a95d66c31fec38f07fe9029f53239c509bc060cfdebda8ac8d5ae556dfa0d6851e3 SHA512 bfd8f9859e519d6e45f2324e3907f88a1e661ca597f8bb3b7ae772246ba9972e09d0883abc887346fed55928f5d8422cf4212e32377e9900137cd63f0f9a93b8
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv40.3.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
@@ -81,8 +79,6 @@ DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.m
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip 37264 BLAKE2B 13a34ae8ce6866da183bb7f9f5dcdb702ffe846a3c5e789e99f6e112a1e64b1dbbe8777727e5678b4bdcac75ec32ddc52ff303b95b5ee3fd22423eaab44809c2 SHA512 e1b8ad2c09c16599c6e5053f871df9f66698c7a632276c1e68c80c9737216751939b7b7024449ed63da0a292688b4d7a441d64512aa4bd8684e418f4e5da4446
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod 582 BLAKE2B 92aab40d86d733eb8f751fb23e40621b5b3bbfbd8b1d194bc6e689b6df763b4030aa83ab78654dc8e536274af6de247b8fc7e4e35e6cbf2f6fb5532291deec6b SHA512 aa43d2e262a603661ac3dc7aef111aea6e348e11c5384840d2be06224a6c2c580fcc0e3c6645a0d48b48826b0aff92562f0c6504eae980ff5610d2ffd2255d88
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip 41353 BLAKE2B 850ec7d356246c8b47c8594aaba8db95d979ca7fb50b383ec02c6802faf089bb170ea7e86f7e1fe8f95fbed4208c6f39c307871d74b8052de5ccd9d6ae29d49e SHA512 b533a51ecc7709cb74da88cd3dea70b3605e75a88b93d16aca5aafa100352002f5b1c1c6d9c33d6c93ce74663d27b7cf82c8fa8db7aadca4d42e8a7f6354f78e
-DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
-DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.3.zip 44404 BLAKE2B d1706e84ea1345f4e4b76abe2455a85f798dca31fc628a83545f15aed99b2174bf07b2f62bfff7a4baf6c250e0c8d8009991194ac80a7cfeee73c9ef78d07340 SHA512 3f51d990b087a3762eb6895c8afc118a62af946f889a9f4bae0dc74b33bfa43c7a8e7ee50e97013871d67914a7f1986e500501ca7462547af301526f427f2853
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
 DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip 44812 BLAKE2B ba556ac48b565838fd1686825e0bf8417d0473cdd1d0c9f28ce88cbda83b9e61bdfc9cc8b86351d0ad1d57b2aeb978800200bb023d9cd1bdbd013237e1813d92 SHA512 6a71cedd6356d9e17ffa7af4e005a7d17f1c004b6b68f487ac75b13668d22f18c06ea0c0e4c9b62d5d60b27054a3afa0e73d4adbab6ad46ede4b4387500c27d4
 DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
@@ -328,8 +324,6 @@ DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod 328 BLAKE2B 5d3c1f5b839250a69efe71d633601e076be84d2adbf5f69067118851ec76b6044728cfe23644a8fba03502e476bc40ee79ef3e0c3385ab8ee2c3103321753deb SHA512 ed46a1036f3f7a7c2c5d55440ac93f468b5b4282fb5bee31a0c1a746b00426922544acd55ca6ca539d9d6927a23888e81aa360d2140036e84dc895b5a97c9b43
 DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip 14557 BLAKE2B 7b306a1151cda04a778b2606fbd7e5257a80da359ee6f02374bcf7199f16e3513be56c706d8af2fe2e683c46b80f9680e6831f0e022f3c8dbc5e0c16020d7a72 SHA512 96125081b3fe8233d3c2885c52cbd46c7091f4dbe7ff3e542f934c21c75f498b6bbb89200f9ed27dcc572b16dcb31bd400bb4d74b4e75e171c565ce7c1ecb3cd
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
-DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.0.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
-DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.0.zip 112061 BLAKE2B 96727caa4d00da2a8e9faf0ce2586fed181f3d84525ac585f7eab9a6770c90ee77958a0b446d958b6a9a7e86a40785d16da9b96ebed90f5f212c9b4ad532e9a4 SHA512 127c3b69c4375748a0ce4ef094788b17cb27979099160b933a88c87aa08e2b6c52ae0bf5ab68f028eb64e27ad7f25172e85e2efc326c001a5ec180013c75a4f5
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod 666 BLAKE2B 08fb3e2246113cf7bafaec3440000e224723f5947d6cb6656d31a36a033b968243c6e05dbbc89d87231b02e18f1d7c6200813ababc3e43b14c5407e980e5e75c SHA512 8b5cf65d942a763e666773ce3d9f1bfc88ed6ca051ccaa036d0236f52d383cea94bfe280ed62cf0e2dbc2af586dbd5008e1a62b958d434045933513fade28e88
 DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip 114585 BLAKE2B 846541b55472ef94a8d2606e9cccc82fc52d189e48bd94aef69871455088915595bcc21224ef7728750ac1ba8e3caef7c303446671416f71b74d03de647a3f23 SHA512 13275b8246248b1c3001acba9ea6178a10263fb8ff3cc205d2cccb86682eccad96695bac455a32f2407f7fbd9a4bc3b68cacab722bcc242c606248753efba3d1
 DIST github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod 47 BLAKE2B 67dc6ab625743aeecd408ea7bf04f70243ffb0a997cfc49206db31f0de98b3a30ef06afcc69726d771512585ea9f855bd42306de4a15ae99c07f49138cb79c20 SHA512 d1ab435b05bfa15b854c2ad3ead3678f0671f79fe9ec7d1352122438e62e40fcae32501a0f539f10747cc8762e8d94c0535d176f89c626c650beacb9c4f82f49
@@ -340,12 +334,12 @@ DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip 156422 BLAKE2B 18071e2808ed
 DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod 40 BLAKE2B 77f35128903a84139dfc23055bf87c4fd8b4843953c764f0ec004a8a2b10599de19bd767a569080422179bd8ad66218d3639025cf1d83eb5cab22599b5da2c3a SHA512 76ce93f04caa8045ed49fccbbbfe76fc278bb7d94c973e408d0695e8c9c5e569b3dc9d4af8722f13c4718753aa72fea76a238dc8243aff34bbfd10d4b684e38a
 DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip 12245 BLAKE2B a83d39eea2c911303550703d23c6c6be3e71c47c008d9bfc947303b5efe87f60983ba00a5fa3d28359959940ccf299a82971cc4cea9ab0bc28e7214db83398df SHA512 6b88063dd61b36a5bce08e49fa630d2a59d9e3617c9f9b5b747993cc66029209597e296dcdb38c126559226139bacb57dacf451bda3e50d6e85c7b4953e4dc80
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
-DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.0.mod 637 BLAKE2B 66ea021f5ca48fabeff8d0fb0049fd5b90c044102bbb492120aa91630dd4fd37f315020ec6cae4559ea4ab45cf826ffd41448e8b21e1eb41ba1c8f145bb2696a SHA512 5afbf9a96e8fc302d4f4ce11482a54f6fe015e94579334d8a8f3e080b7fb84ea25f5a41248991f6f1f02edb23ac737c01c18580ec5b44b74c3c182a54f88f508
-DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.0.zip 548050 BLAKE2B 3c0d1ac113ab2219fad328e7935ef425bf4d5d824dc3ca530d5b39d55fcbe02bae261be2d100d43a3086129afa9094532c32d426ccb7d4fd3ae3a7667780aed2 SHA512 0dd3888646caabe9e65c4d7b0465fa42b76147405dda435f2bfbf688c2b8cdebf3c6e960108f2d0727a1f333b2fd4aae11d75511c56839757671c8033291cad0
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.2.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.2.zip 549210 BLAKE2B 72ed5b7d30dd04c6fe9bff0811d0cd85790379850fa3b635a9371057097716f1171e70e1a8e1ed54d3e577a28a600de1dc51d263a7534a0b92a8faca97f8700d SHA512 6b4e0ff25e43c00d063c54827b4683732de82cd09366152fa8cfea74cbe874155e8b8323f4878dbd1c5ea208843a24af71bac009362ce23872767208788f17f0
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
 DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.3.zip 550154 BLAKE2B e085f5b4c23e656f548e9d92cc3ecddb47a2431569240977ff7d7c2786c090115d5e360d478c3faa30b16a31a99f05959777144b9225f32afef69d77d9a9ab57 SHA512 818dfed4d0813bcc28c4b383daf039515593039e9171e1d970809e4fc5688dbf053bdb5b8b068ea9159397e0c240efacf0138d464699451406178569f77b6148
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.mod 831 BLAKE2B dd6e545fc4ad948b65363b0f0103006761b944d99e0b627eda3994a7548031bbe31996d39ace7bec504f4952d610c4153ca3a9b75901c0eeca39d9476e481ba1 SHA512 175744788ef938ee696ef7f706261fe1200ab134e27f7957641f74dd9606424f68c479c0ed9a9f3c1e9fb1bcd23dbf7edde7d02c4a45160cb8dc2c251734905e
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.4.zip 550550 BLAKE2B e871add76e92ff6d4f3a708ffe644e99f61126ee6008260249f1e76372a5449832e14583ee1b54109d52d6678f1267bff795fc5a7b0298cb63c8eb751433cab1 SHA512 487de808f4ee33a22ffe1b6c3c57e102e54c2162ad1016fdb243a16f2dd1555dc8d978d636b03d2ec5eff30fa436771ade7719c4a650472533b36c0868c418c6
 DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod 577 BLAKE2B 6966cd924bfb433dee02347599c131e85701a7ad37be76369b3a72ba8d6d3927abf1337426eb508a5a27c77f5005240a08ade70e93e546ed752a70fee483a3ef SHA512 78b71a31222bb3bcb5310c929587b13f19343f6aae9284654bdc3ebee9249c9a8440d428af8273acba18ff144265bcb2e8cccbcec6e18b9cbec2fb0f73dd3abf
 DIST github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip 72918 BLAKE2B 13c10ae1ffb312d91cc1a4dbcb072ca3e9ab4cba3758a04c6c4ea0d7b875453819fa8188861bf6f284f57e44a70f8d6c436699289f44a33082ed8088b1323bd3 SHA512 c4d0ef607d0116b64507ebf631d5190bc6cd2c5508ccf060b226ab7c4798a45b595fae0d132968918ccdb644cf05335d7de76c84ac7a188f4b7aafe8068d725d
 DIST github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod 1594 BLAKE2B c6b069c73847f3b115faacacc323ab407df86f81a9056347ebbd15eb12ac642d8e8a7b0410afbd076f18b704c18830144a4bed5a98e6f31d67c14fd1219fa7a0 SHA512 c4a38235e1b91838e6743f4bff89ba737e6427a65e9a2d34c750b63a75ea86b7ce13243b93d13d34f9f384dbf678fbae5c5b5e056eeece9d17511b9e197444e9
@@ -715,6 +709,8 @@ DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAK
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip 11671 BLAKE2B 0a73cd55380594ca4bac71bee0207b51979e62407ec3c828f975e8091a20e2b9a6cc331dea88cf0ff44ff3a6c7d1cfd2844651acd1d957c0d725de525a58985f SHA512 ccd129fd4ce8e4067d0ad4b164cd8c4fb7ba65d5022bb656dfdb50dd2d467152bb83760f3d94c465b6d4c29c29931c8be6c697e1634ccbab4eb3a53edca7dc4a
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20200416051211-89c76fbcd5d1.zip 11992 BLAKE2B f5b83bee24babf643a85b1ad338c9cda760634c279e495f2faae96138854cf433abd98552ecf7e4fb815bce96f38a8cb2601dcca0966f244d6e55e9622a95542 SHA512 3b325af08ffac024bf39a06676e4daf051b82bc765803224fd14c3251b87c5d4376269eb4ad6f2a511b72e065b062bc41823400cde602013cc1d3e687509f85c
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
@@ -749,8 +745,6 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
-DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.zip 5368804 BLAKE2B e90b748f207fbfe06043e6fd048295453416c364f6b1de925ccc06652738f050c64e357a0fc25374ddf21151cdc43430200f71c5228dc9fd35f5e63df62366a2 SHA512 f1b58eaa7b6ffe7a4c9fff15546b4409b5b66649078a8f64e659b37c5088f09bcd2c2c4315fce80876be4a5c069261478214cae28e0afa803f8afbf745e4d321
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.zip 7435365 BLAKE2B 7698ddb8160d66abd158a526a71371ffc975215c78fcb187171399c0a7f68b840b2e3d9b9ff631bd57d4e5aab7afb782acd137d41b68cfe8a7dcde60b7564249 SHA512 ad0e0016a55319377b549a55cead8f3d39916dbc2acd22ef7b9a93eb455e52f58ea46e306838a908054e6438b1f2006d1a74fe0dbeee9f3fba9e727fdd42deae
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
@@ -822,10 +816,8 @@ DIST sigs.k8s.io%2Fstructured-merge-diff%2F@v%2Fv0.0.0-20190525122527-15d366b235
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.zip 18120 BLAKE2B 244d3089322264e2fab71fa27e6e49396f724026674970eac309bb027d7bbc7030e9780fbc1c3803b20d893b8621f4e24d5c7824e0315440c14ceb850ec391f9 SHA512 c6e23fe09971b82d52e14d67e68458d3884b0f1d56a7fa9131fe4dafbfa971dd1f134f2d9eeab2599eae02c96132502036fd6b37eda92cd62f3129de6e04e7c3
 EBUILD consul-1.7.4.ebuild 25708 BLAKE2B eb083e6c49e6c4d062bb15a475dc88fdbeaafd394d396d17c245bd14eeaa62c31dcd598b9baf7e2508dd78e0c1f0ba8b05415509b38caedb9e3ca759ed74822a SHA512 7791c5ec933ab4cae9f108c04506d0e57a0abffa4b3a0956cbf4cabef13af69decf000ae1ff2e273585b80ceb61849bb4ef8c31fa8c4dd35b0423fb794f87937
-EBUILD consul-1.7.6.ebuild 29316 BLAKE2B 603871fec0629e42226b1bd6668bb51fb5a368fe5ce340ac6631c34c4f5da0d5d2bdc639bf5bbe8d7acec8ee97e48f23f3b5d66678629ec10595c7b4812ea6d9 SHA512 a34e6c1db4c1377fcc2dd4928c9539c57fcbc3ecc956a03355b366782663a215344c30d1da47eb8b1e383f03c5163fb00a738c9f1d74a3d92b2ac01aee7e7816
 EBUILD consul-1.7.7.ebuild 29316 BLAKE2B 401e2ec84a03556864bd3d30524df4aa3140695e8eea0295907d52b2a7f495f402fde0330c04ac49f4ce683078d43a3d3d2229d2fbf244462da351fb40351892 SHA512 4f1d667ef96b590b78074d33aed04a918bf5eda2fd608dc0aca845261247d3b64a8cb5c756660d9397283b4a6d146d1c2d886be2a21cd2984fa54b2518d6a563
-EBUILD consul-1.8.0.ebuild 36543 BLAKE2B 334022150f621a6c27db79789164c8b618a9cc0f0863357c8b37ff5cb9e242b4c0e146cb56255476dde9e607067d97b6b89f9682466a154f2f5d28747d9e01b4 SHA512 470377dc362892d28e412efb6ee7caedb15f02096a668b395550bae90909ea18763157979ec0ac9f637188bdf67a0ecde006561aeb1b250e52bb1b79a4601be5
-EBUILD consul-1.8.1.ebuild 38943 BLAKE2B 5942f501455a6ae5560049a8db5f59641d3d713026b209fd2b0f54ca03eabea94b15e1eb6c91628105b5a18bc5a1cc49bbed42905a750329ee434be9243d8040 SHA512 d33bf362152b7882c8f3e3a96b366aac394440c62d89e78a8daa1b19ee3c275e84d5b692af53c0f515a034501c66168769c5e1a8fb6ed57b30a0ca75455575dc
-EBUILD consul-1.8.2.ebuild 38943 BLAKE2B e6cafee946b167e013f1024aaf17fd8571868d932efbbd6b2c54f2209063620c68d7d686a69112f7317cdf58b1634635967f2e1fbe8b0eb475f68e6233a2145a SHA512 e2bbe9c9ec68a4c9c87557cc7fa13a7b87d5c9879133effbd48408c71302d69beab59a7dd308c88cca89871569f47c7b62b21276f808925e941a4cf5460c8842
+EBUILD consul-1.7.8.ebuild 29316 BLAKE2B de9965792339523296d5100929c79c0f25354f099e2eb6cb380e846c106aafa54022e2a0dc0112f5ffce6c0bb6d0c7ebfde5fc80315b3ea78df4f633171d653f SHA512 5c1cf184a171fecc567ba2d076904a7f38e03e0ea82058bd70f1abca644738e50f0d2a008b01d1dd898cab381c7c8b0822d30a3afc80ef9db27ac16400572e09
 EBUILD consul-1.8.3.ebuild 38943 BLAKE2B 148de37f39b0214b9e0604a15ff0fc14f612409ed2924743d4e091336c2807d216f6229f7beec88b1893a5af5a9fd28e650726b7c9b12d7badf8172ebe199b43 SHA512 c062dfbf9fa8eca1b4508794aed52054980c339c41a19b2b5a5e963e6d64eea1d4e8a00992cdf33e8f7db0d94116f625ee4e55d9c38fd7c4a67a3d0878678a80
+EBUILD consul-1.8.4.ebuild 39141 BLAKE2B 4ccb00d34160791f496f79f6a80e9d0913bd9bd8179eddd59f3dffa58e47e2c945e526220ffc9c2138d04c7eef93fd29befc9ae096572b42211211bee4c3977e SHA512 2ea7cfec7a649b5453d456f17ef6995dba4755556f62a0d32cd4abdc9f45cd5f60c842e0aca577180b96b33b896ad560fc7de0c4de1319560cacf10961941f47
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.7.6.ebuild b/app-admin/consul/consul-1.7.8.ebuild
index 547fac7e158c..e2cd0113ea70 100644
--- a/app-admin/consul/consul-1.7.6.ebuild
+++ b/app-admin/consul/consul-1.7.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit go-module systemd
-GIT_COMMIT=819b21dbb
+GIT_COMMIT=9a5a12184
 
 DESCRIPTION="A tool for service discovery, monitoring and configuration"
 HOMEPAGE="https://www.consul.io"
@@ -42,9 +42,9 @@ EGO_SUM=(
 	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
 	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
 	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
-	"github.com/armon/go-metrics v0.3.3"
-	"github.com/armon/go-metrics v0.3.3/go.mod"
 	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310"
+	"github.com/armon/go-metrics v0.3.4"
+	"github.com/armon/go-metrics v0.3.4/go.mod"
 	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
 	"github.com/armon/go-radix v1.0.0"
 	"github.com/armon/go-radix v1.0.0/go.mod"
diff --git a/app-admin/consul/consul-1.8.0.ebuild b/app-admin/consul/consul-1.8.0.ebuild
deleted file mode 100644
index 8bd7586aaa41..000000000000
--- a/app-admin/consul/consul-1.8.0.ebuild
+++ /dev/null
@@ -1,708 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-GIT_COMMIT=3111cb8c7
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-
-# Upstream doesn't use "-mod=vendor" in their build system, and the
-# vendor directory is incomplete.
-# On the next bump, remove this if they have added "-mod=vendor"
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.38.0"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.10.0"
-	"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.2"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/DataDog/datadog-go v2.2.0+incompatible"
-	"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
-	"github.com/Microsoft/go-winio v0.4.3"
-	"github.com/Microsoft/go-winio v0.4.3/go.mod"
-	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-	"github.com/NYTimes/gziphandler v1.0.1"
-	"github.com/NYTimes/gziphandler v1.0.1/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
-	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
-	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
-	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
-	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
-	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/armon/go-radix v1.0.0"
-	"github.com/armon/go-radix v1.0.0/go.mod"
-	"github.com/aws/aws-sdk-go v1.25.41"
-	"github.com/aws/aws-sdk-go v1.25.41/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/beorn7/perks v1.0.0"
-	"github.com/beorn7/perks v1.0.0/go.mod"
-	"github.com/bgentry/speakeasy v0.1.0"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/boltdb/bolt v1.3.1"
-	"github.com/boltdb/bolt v1.3.1/go.mod"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
-	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
-	"github.com/circonus-labs/circonusllhist v0.1.3"
-	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cockroachdb/apd v1.1.0/go.mod"
-	"github.com/coredns/coredns v1.1.2"
-	"github.com/coredns/coredns v1.1.2/go.mod"
-	"github.com/coreos/bbolt v1.3.2/go.mod"
-	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
-	"github.com/coreos/go-oidc v2.1.0+incompatible"
-	"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
-	"github.com/coreos/go-semver v0.2.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
-	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
-	"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-	"github.com/digitalocean/godo v1.1.1/go.mod"
-	"github.com/digitalocean/godo v1.10.0"
-	"github.com/digitalocean/godo v1.10.0/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/dnaeon/go-vcr v1.0.1"
-	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
-	"github.com/docker/go-connections v0.3.0"
-	"github.com/docker/go-connections v0.3.0/go.mod"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-	"github.com/dustin/go-humanize v1.0.0/go.mod"
-	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
-	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
-	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.8.0"
-	"github.com/envoyproxy/go-control-plane v0.8.0/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.0.14"
-	"github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod"
-	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fatih/color v1.9.0"
-	"github.com/fatih/color v1.9.0/go.mod"
-	"github.com/fatih/structs v1.1.0/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-	"github.com/ghodss/yaml v1.0.0"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-ldap/ldap v3.0.2+incompatible/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-	"github.com/go-logr/logr v0.1.0/go.mod"
-	"github.com/go-ole/go-ole v1.2.1"
-	"github.com/go-ole/go-ole v1.2.1/go.mod"
-	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
-	"github.com/go-test/deep v1.0.2"
-	"github.com/go-test/deep v1.0.2/go.mod"
-	"github.com/gogo/googleapis v1.1.0"
-	"github.com/gogo/googleapis v1.1.0/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
-	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/snappy v0.0.1"
-	"github.com/golang/snappy v0.0.1/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/btree v1.0.0"
-	"github.com/google/btree v1.0.0/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-	"github.com/google/gofuzz v1.0.0"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
-	"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-	"github.com/googleapis/gnostic v0.2.0"
-	"github.com/googleapis/gnostic v0.2.0/go.mod"
-	"github.com/gophercloud/gophercloud v0.1.0"
-	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
-	"github.com/gorilla/websocket v1.4.0/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
-	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-bexpr v0.1.2"
-	"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
-	"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
-	"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-connlimit v0.2.0"
-	"github.com/hashicorp/go-connlimit v0.2.0/go.mod"
-	"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
-	"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
-	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-	"github.com/hashicorp/go-hclog v0.8.0/go.mod"
-	"github.com/hashicorp/go-hclog v0.9.1/go.mod"
-	"github.com/hashicorp/go-hclog v0.12.0"
-	"github.com/hashicorp/go-hclog v0.12.0/go.mod"
-	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-	"github.com/hashicorp/go-immutable-radix v1.1.0"
-	"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
-	"github.com/hashicorp/go-memdb v1.0.3"
-	"github.com/hashicorp/go-memdb v1.0.3/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.5"
-	"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-multierror v1.1.0"
-	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-	"github.com/hashicorp/go-plugin v1.0.1/go.mod"
-	"github.com/hashicorp/go-raftchunking v0.6.1"
-	"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.4"
-	"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.2"
-	"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
-	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-	"github.com/hashicorp/go-sockaddr v1.0.2"
-	"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
-	"github.com/hashicorp/go-syslog v1.0.0"
-	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.2"
-	"github.com/hashicorp/go-uuid v1.0.2/go.mod"
-	"github.com/hashicorp/go-version v1.1.0/go.mod"
-	"github.com/hashicorp/go-version v1.2.0"
-	"github.com/hashicorp/go-version v1.2.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/hcl v1.0.0"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
-	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
-	"github.com/hashicorp/logutils v1.0.0/go.mod"
-	"github.com/hashicorp/mdns v1.0.1"
-	"github.com/hashicorp/mdns v1.0.1/go.mod"
-	"github.com/hashicorp/memberlist v0.2.0"
-	"github.com/hashicorp/memberlist v0.2.0/go.mod"
-	"github.com/hashicorp/memberlist v0.2.2"
-	"github.com/hashicorp/memberlist v0.2.2/go.mod"
-	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
-	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
-	"github.com/hashicorp/raft v1.1.1/go.mod"
-	"github.com/hashicorp/raft v1.1.2"
-	"github.com/hashicorp/raft v1.1.2/go.mod"
-	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
-	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
-	"github.com/hashicorp/serf v0.9.0"
-	"github.com/hashicorp/serf v0.9.0/go.mod"
-	"github.com/hashicorp/serf v0.9.2"
-	"github.com/hashicorp/serf v0.9.2/go.mod"
-	"github.com/hashicorp/vault/api v1.0.4"
-	"github.com/hashicorp/vault/api v1.0.4/go.mod"
-	"github.com/hashicorp/vault/sdk v0.1.13"
-	"github.com/hashicorp/vault/sdk v0.1.13/go.mod"
-	"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
-	"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/imdario/mergo v0.3.5/go.mod"
-	"github.com/imdario/mergo v0.3.6"
-	"github.com/imdario/mergo v0.3.6/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/istio/gogo-genproto v0.0.0-20190124151557-6d926a6e6feb/go.mod"
-	"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
-	"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
-	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
-	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
-	"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
-	"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/json-iterator/go v1.1.7"
-	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pretty v0.2.0"
-	"github.com/kr/pretty v0.2.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/lib/pq v1.1.1/go.mod"
-	"github.com/linode/linodego v0.7.1"
-	"github.com/linode/linodego v0.7.1/go.mod"
-	"github.com/magiconair/properties v1.8.0/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.4"
-	"github.com/mattn/go-colorable v0.1.4/go.mod"
-	"github.com/mattn/go-colorable v0.1.6"
-	"github.com/mattn/go-colorable v0.1.6/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.10/go.mod"
-	"github.com/mattn/go-isatty v0.0.11/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.3/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/miekg/dns v1.0.14/go.mod"
-	"github.com/miekg/dns v1.1.26"
-	"github.com/miekg/dns v1.1.26/go.mod"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/cli v1.1.0"
-	"github.com/mitchellh/cli v1.1.0/go.mod"
-	"github.com/mitchellh/copystructure v1.0.0"
-	"github.com/mitchellh/copystructure v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.14.0"
-	"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
-	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
-	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
-	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/mitchellh/mapstructure v1.2.3"
-	"github.com/mitchellh/mapstructure v1.2.3/go.mod"
-	"github.com/mitchellh/pointerstructure v1.0.0"
-	"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.1"
-	"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-	"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
-	"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
-	"github.com/oklog/run v1.0.0/go.mod"
-	"github.com/oklog/ulid v1.3.1/go.mod"
-	"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
-	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.8.0/go.mod"
-	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-	"github.com/onsi/gomega v1.5.0/go.mod"
-	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
-	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/pascaldekloe/goe v0.1.0"
-	"github.com/pascaldekloe/goe v0.1.0/go.mod"
-	"github.com/patrickmn/go-cache v2.1.0+incompatible"
-	"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
-	"github.com/pelletier/go-toml v1.2.0/go.mod"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-	"github.com/pierrec/lz4 v2.0.5+incompatible"
-	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/posener/complete v1.2.3"
-	"github.com/posener/complete v1.2.3/go.mod"
-	"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
-	"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.2/go.mod"
-	"github.com/prometheus/client_golang v0.9.3/go.mod"
-	"github.com/prometheus/client_golang v1.0.0"
-	"github.com/prometheus/client_golang v1.0.0/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
-	"github.com/prometheus/common v0.4.0/go.mod"
-	"github.com/prometheus/common v0.4.1"
-	"github.com/prometheus/common v0.4.1/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-	"github.com/prometheus/procfs v0.0.2"
-	"github.com/prometheus/procfs v0.0.2/go.mod"
-	"github.com/prometheus/tsdb v0.7.1/go.mod"
-	"github.com/rboyer/safeio v0.2.1"
-	"github.com/rboyer/safeio v0.2.1/go.mod"
-	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
-	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/rs/zerolog v1.4.0/go.mod"
-	"github.com/russross/blackfriday v1.5.2/go.mod"
-	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-	"github.com/ryanuber/columnize v2.1.0+incompatible"
-	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
-	"github.com/ryanuber/go-glob v1.0.0"
-	"github.com/ryanuber/go-glob v1.0.0/go.mod"
-	"github.com/satori/go.uuid v1.2.0/go.mod"
-	"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
-	"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880"
-	"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod"
-	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4"
-	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
-	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
-	"github.com/sirupsen/logrus v1.0.6/go.mod"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/sirupsen/logrus v1.4.2"
-	"github.com/sirupsen/logrus v1.4.2/go.mod"
-	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
-	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-	"github.com/spf13/afero v1.1.2/go.mod"
-	"github.com/spf13/afero v1.2.1/go.mod"
-	"github.com/spf13/afero v1.2.2/go.mod"
-	"github.com/spf13/cast v1.3.0/go.mod"
-	"github.com/spf13/cobra v0.0.5/go.mod"
-	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/spf13/viper v1.3.2/go.mod"
-	"github.com/spf13/viper v1.4.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
-	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
-	"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
-	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-	"github.com/ugorji/go v1.1.4/go.mod"
-	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
-	"github.com/vmware/govmomi v0.18.0"
-	"github.com/vmware/govmomi v0.18.0/go.mod"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
-	"go.etcd.io/bbolt v1.3.2/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0"
-	"go.opencensus.io v0.22.0/go.mod"
-	"go.uber.org/atomic v1.4.0/go.mod"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/zap v1.10.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
-	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
-	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
-	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
-	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
-	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
-	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
-	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
-	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-	"golang.org/x/sys v0.0.0-20190508220229-2d0786266e9c/go.mod"
-	"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
-	"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
-	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
-	"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
-	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
-	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9"
-	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.7.0"
-	"google.golang.org/api v0.7.0/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/appengine v1.5.0/go.mod"
-	"google.golang.org/appengine v1.6.0"
-	"google.golang.org/appengine v1.6.0/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-	"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
-	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-	"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101"
-	"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
-	"google.golang.org/grpc v1.14.0/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.19.1/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.0/go.mod"
-	"google.golang.org/grpc v1.22.0/go.mod"
-	"google.golang.org/grpc v1.23.0"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-	"gopkg.in/inf.v0 v0.9.1"
-	"gopkg.in/inf.v0 v0.9.1/go.mod"
-	"gopkg.in/resty.v1 v1.12.0"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/square/go-jose.v2 v2.3.1"
-	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
-	"gopkg.in/square/go-jose.v2 v2.4.1"
-	"gopkg.in/square/go-jose.v2 v2.4.1/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-	"k8s.io/api v0.16.9"
-	"k8s.io/api v0.16.9/go.mod"
-	"k8s.io/apimachinery v0.16.9"
-	"k8s.io/apimachinery v0.16.9/go.mod"
-	"k8s.io/client-go v0.16.9"
-	"k8s.io/client-go v0.16.9/go.mod"
-	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-	"k8s.io/klog v0.3.0/go.mod"
-	"k8s.io/klog v1.0.0"
-	"k8s.io/klog v1.0.0/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
-	"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
-	"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod"
-	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
-	"sigs.k8s.io/yaml v1.1.0"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-	)
-go-module_set_globals
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
-	acct-group/consul
-	acct-user/consul"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake dev-build
-}
-
-src_install() {
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/consul
-	fowners consul:consul /var/log/consul
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.8.2.ebuild b/app-admin/consul/consul-1.8.2.ebuild
deleted file mode 100644
index f192eee4f343..000000000000
--- a/app-admin/consul/consul-1.8.2.ebuild
+++ /dev/null
@@ -1,756 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-GIT_COMMIT=ba7d9435e
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-
-# Upstream doesn't use "-mod=vendor" in their build system, and the
-# vendor directory is incomplete.
-# On the next bump, remove this if they have added "-mod=vendor"
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.38.0"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.10.0"
-	"github.com/Azure/go-autorest/autorest v0.10.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.2"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/DataDog/datadog-go v2.2.0+incompatible"
-	"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
-	"github.com/DataDog/datadog-go v3.2.0+incompatible"
-	"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
-	"github.com/Microsoft/go-winio v0.4.3"
-	"github.com/Microsoft/go-winio v0.4.3/go.mod"
-	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-	"github.com/NYTimes/gziphandler v1.0.1"
-	"github.com/NYTimes/gziphandler v1.0.1/go.mod"
-	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
-	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6"
-	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
-	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
-	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e"
-	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
-	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
-	"github.com/armon/go-metrics v0.3.3"
-	"github.com/armon/go-metrics v0.3.3/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/armon/go-radix v1.0.0"
-	"github.com/armon/go-radix v1.0.0/go.mod"
-	"github.com/aws/aws-sdk-go v1.25.41"
-	"github.com/aws/aws-sdk-go v1.25.41/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/beorn7/perks v1.0.0"
-	"github.com/beorn7/perks v1.0.0/go.mod"
-	"github.com/beorn7/perks v1.0.1"
-	"github.com/beorn7/perks v1.0.1/go.mod"
-	"github.com/bgentry/speakeasy v0.1.0"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/boltdb/bolt v1.3.1"
-	"github.com/boltdb/bolt v1.3.1/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cespare/xxhash v1.1.0"
-	"github.com/cespare/xxhash v1.1.0/go.mod"
-	"github.com/cespare/xxhash/v2 v2.1.1"
-	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible"
-	"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
-	"github.com/circonus-labs/circonusllhist v0.1.3"
-	"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533"
-	"github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod"
-	"github.com/cockroachdb/apd v1.1.0/go.mod"
-	"github.com/coredns/coredns v1.1.2"
-	"github.com/coredns/coredns v1.1.2/go.mod"
-	"github.com/coreos/bbolt v1.3.2/go.mod"
-	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
-	"github.com/coreos/go-oidc v2.1.0+incompatible"
-	"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
-	"github.com/coreos/go-semver v0.2.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
-	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661"
-	"github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
-	"github.com/digitalocean/godo v1.1.1/go.mod"
-	"github.com/digitalocean/godo v1.10.0"
-	"github.com/digitalocean/godo v1.10.0/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/dnaeon/go-vcr v1.0.1"
-	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
-	"github.com/docker/go-connections v0.3.0"
-	"github.com/docker/go-connections v0.3.0/go.mod"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-	"github.com/dustin/go-humanize v1.0.0/go.mod"
-	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0"
-	"github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0/go.mod"
-	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.5"
-	"github.com/envoyproxy/go-control-plane v0.9.5/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fatih/color v1.9.0"
-	"github.com/fatih/color v1.9.0/go.mod"
-	"github.com/fatih/structs v1.1.0/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-	"github.com/ghodss/yaml v1.0.0"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-kit/kit v0.9.0/go.mod"
-	"github.com/go-ldap/ldap v3.0.2+incompatible/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-	"github.com/go-logr/logr v0.1.0/go.mod"
-	"github.com/go-ole/go-ole v1.2.1"
-	"github.com/go-ole/go-ole v1.2.1/go.mod"
-	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod"
-	"github.com/go-test/deep v1.0.2"
-	"github.com/go-test/deep v1.0.2/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
-	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/snappy v0.0.1"
-	"github.com/golang/snappy v0.0.1/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/btree v1.0.0"
-	"github.com/google/btree v1.0.0/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-cmp v0.4.0"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-	"github.com/google/gofuzz v1.0.0"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2"
-	"github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-	"github.com/googleapis/gnostic v0.2.0"
-	"github.com/googleapis/gnostic v0.2.0/go.mod"
-	"github.com/gophercloud/gophercloud v0.1.0"
-	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
-	"github.com/gorilla/websocket v1.4.0/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
-	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-bexpr v0.1.2"
-	"github.com/hashicorp/go-bexpr v0.1.2/go.mod"
-	"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de"
-	"github.com/hashicorp/go-checkpoint v0.0.0-20171009173528-1545e56e46de/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-connlimit v0.2.0"
-	"github.com/hashicorp/go-connlimit v0.2.0/go.mod"
-	"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088"
-	"github.com/hashicorp/go-discover v0.0.0-20200501174627-ad1e96bde088/go.mod"
-	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-	"github.com/hashicorp/go-hclog v0.8.0/go.mod"
-	"github.com/hashicorp/go-hclog v0.9.1/go.mod"
-	"github.com/hashicorp/go-hclog v0.12.0"
-	"github.com/hashicorp/go-hclog v0.12.0/go.mod"
-	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-	"github.com/hashicorp/go-immutable-radix v1.1.0"
-	"github.com/hashicorp/go-immutable-radix v1.1.0/go.mod"
-	"github.com/hashicorp/go-immutable-radix v1.2.0"
-	"github.com/hashicorp/go-immutable-radix v1.2.0/go.mod"
-	"github.com/hashicorp/go-memdb v1.0.3"
-	"github.com/hashicorp/go-memdb v1.0.3/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.5"
-	"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-multierror v1.1.0"
-	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-	"github.com/hashicorp/go-plugin v1.0.1/go.mod"
-	"github.com/hashicorp/go-raftchunking v0.6.1"
-	"github.com/hashicorp/go-raftchunking v0.6.1/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.4"
-	"github.com/hashicorp/go-retryablehttp v0.5.4/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.1/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.2"
-	"github.com/hashicorp/go-rootcerts v1.0.2/go.mod"
-	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-	"github.com/hashicorp/go-sockaddr v1.0.2"
-	"github.com/hashicorp/go-sockaddr v1.0.2/go.mod"
-	"github.com/hashicorp/go-syslog v1.0.0"
-	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.2"
-	"github.com/hashicorp/go-uuid v1.0.2/go.mod"
-	"github.com/hashicorp/go-version v1.1.0/go.mod"
-	"github.com/hashicorp/go-version v1.2.0"
-	"github.com/hashicorp/go-version v1.2.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.4"
-	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-	"github.com/hashicorp/hcl v1.0.0"
-	"github.com/hashicorp/hcl v1.0.0/go.mod"
-	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5"
-	"github.com/hashicorp/hil v0.0.0-20160711231837-1e86c6b523c5/go.mod"
-	"github.com/hashicorp/logutils v1.0.0/go.mod"
-	"github.com/hashicorp/mdns v1.0.1"
-	"github.com/hashicorp/mdns v1.0.1/go.mod"
-	"github.com/hashicorp/memberlist v0.2.2"
-	"github.com/hashicorp/memberlist v0.2.2/go.mod"
-	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69"
-	"github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69/go.mod"
-	"github.com/hashicorp/raft v1.1.1/go.mod"
-	"github.com/hashicorp/raft v1.1.2"
-	"github.com/hashicorp/raft v1.1.2/go.mod"
-	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea"
-	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
-	"github.com/hashicorp/serf v0.9.3"
-	"github.com/hashicorp/serf v0.9.3/go.mod"
-	"github.com/hashicorp/vault/api v1.0.4"
-	"github.com/hashicorp/vault/api v1.0.4/go.mod"
-	"github.com/hashicorp/vault/sdk v0.1.13"
-	"github.com/hashicorp/vault/sdk v0.1.13/go.mod"
-	"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443"
-	"github.com/hashicorp/vic v1.5.1-0.20190403131502-bbfe86ec9443/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/imdario/mergo v0.3.5/go.mod"
-	"github.com/imdario/mergo v0.3.6"
-	"github.com/imdario/mergo v0.3.6/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
-	"github.com/jackc/pgx v3.3.0+incompatible/go.mod"
-	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da"
-	"github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/joyent/triton-go v0.0.0-20180628001255-830d2b111e62/go.mod"
-	"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f"
-	"github.com/joyent/triton-go v1.7.1-0.20200416154420-6801d15b779f/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/json-iterator/go v1.1.7"
-	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/json-iterator/go v1.1.9"
-	"github.com/json-iterator/go v1.1.9/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pretty v0.2.0"
-	"github.com/kr/pretty v0.2.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/lib/pq v1.1.1/go.mod"
-	"github.com/linode/linodego v0.7.1"
-	"github.com/linode/linodego v0.7.1/go.mod"
-	"github.com/magiconair/properties v1.8.0/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.4"
-	"github.com/mattn/go-colorable v0.1.4/go.mod"
-	"github.com/mattn/go-colorable v0.1.6"
-	"github.com/mattn/go-colorable v0.1.6/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.10/go.mod"
-	"github.com/mattn/go-isatty v0.0.11/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.3/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/miekg/dns v1.0.14/go.mod"
-	"github.com/miekg/dns v1.1.26"
-	"github.com/miekg/dns v1.1.26/go.mod"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/cli v1.1.0"
-	"github.com/mitchellh/cli v1.1.0/go.mod"
-	"github.com/mitchellh/copystructure v1.0.0"
-	"github.com/mitchellh/copystructure v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.14.0"
-	"github.com/mitchellh/go-testing-interface v1.14.0/go.mod"
-	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452"
-	"github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod"
-	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/mitchellh/mapstructure v1.3.3"
-	"github.com/mitchellh/mapstructure v1.3.3/go.mod"
-	"github.com/mitchellh/pointerstructure v1.0.0"
-	"github.com/mitchellh/pointerstructure v1.0.0/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.1"
-	"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-	"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2"
-	"github.com/nicolai86/scaleway-sdk v1.10.2-0.20180628010248-798f60e20bb2/go.mod"
-	"github.com/oklog/run v1.0.0/go.mod"
-	"github.com/oklog/ulid v1.3.1/go.mod"
-	"github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod"
-	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.8.0/go.mod"
-	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-	"github.com/onsi/gomega v1.5.0/go.mod"
-	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c"
-	"github.com/packethost/packngo v0.1.1-0.20180711074735-b9cb5096f54c/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/pascaldekloe/goe v0.1.0"
-	"github.com/pascaldekloe/goe v0.1.0/go.mod"
-	"github.com/patrickmn/go-cache v2.1.0+incompatible"
-	"github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod"
-	"github.com/pelletier/go-toml v1.2.0/go.mod"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-	"github.com/pierrec/lz4 v2.0.5+incompatible"
-	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/posener/complete v1.2.3"
-	"github.com/posener/complete v1.2.3/go.mod"
-	"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35"
-	"github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.2/go.mod"
-	"github.com/prometheus/client_golang v0.9.3/go.mod"
-	"github.com/prometheus/client_golang v1.0.0"
-	"github.com/prometheus/client_golang v1.0.0/go.mod"
-	"github.com/prometheus/client_golang v1.4.0"
-	"github.com/prometheus/client_golang v1.4.0/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/prometheus/client_model v0.2.0"
-	"github.com/prometheus/client_model v0.2.0/go.mod"
-	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
-	"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
-	"github.com/prometheus/common v0.4.0/go.mod"
-	"github.com/prometheus/common v0.4.1"
-	"github.com/prometheus/common v0.4.1/go.mod"
-	"github.com/prometheus/common v0.9.1"
-	"github.com/prometheus/common v0.9.1/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
-	"github.com/prometheus/procfs v0.0.2"
-	"github.com/prometheus/procfs v0.0.2/go.mod"
-	"github.com/prometheus/procfs v0.0.8"
-	"github.com/prometheus/procfs v0.0.8/go.mod"
-	"github.com/prometheus/tsdb v0.7.1/go.mod"
-	"github.com/rboyer/safeio v0.2.1"
-	"github.com/rboyer/safeio v0.2.1/go.mod"
-	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03"
-	"github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/rs/zerolog v1.4.0/go.mod"
-	"github.com/russross/blackfriday v1.5.2/go.mod"
-	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-	"github.com/ryanuber/columnize v2.1.0+incompatible"
-	"github.com/ryanuber/columnize v2.1.0+incompatible/go.mod"
-	"github.com/ryanuber/go-glob v1.0.0"
-	"github.com/ryanuber/go-glob v1.0.0/go.mod"
-	"github.com/satori/go.uuid v1.2.0/go.mod"
-	"github.com/sean-/conswriter v0.0.0-20180208195008-f5ae3917a627/go.mod"
-	"github.com/sean-/pager v0.0.0-20180208200047-666be9bf53b5/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880"
-	"github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod"
-	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4"
-	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod"
-	"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
-	"github.com/sirupsen/logrus v1.0.6/go.mod"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/sirupsen/logrus v1.4.2"
-	"github.com/sirupsen/logrus v1.4.2/go.mod"
-	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d"
-	"github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d/go.mod"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
-	"github.com/spf13/afero v1.1.2/go.mod"
-	"github.com/spf13/afero v1.2.1/go.mod"
-	"github.com/spf13/afero v1.2.2/go.mod"
-	"github.com/spf13/cast v1.3.0/go.mod"
-	"github.com/spf13/cobra v0.0.5/go.mod"
-	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
-	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/spf13/pflag v1.0.5"
-	"github.com/spf13/pflag v1.0.5/go.mod"
-	"github.com/spf13/viper v1.3.2/go.mod"
-	"github.com/spf13/viper v1.4.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/stretchr/testify v1.5.1"
-	"github.com/stretchr/testify v1.5.1/go.mod"
-	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible"
-	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible/go.mod"
-	"github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
-	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926"
-	"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
-	"github.com/ugorji/go v1.1.4/go.mod"
-	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
-	"github.com/vmware/govmomi v0.18.0"
-	"github.com/vmware/govmomi v0.18.0/go.mod"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
-	"go.etcd.io/bbolt v1.3.2/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0"
-	"go.opencensus.io v0.22.0/go.mod"
-	"go.uber.org/atomic v1.4.0/go.mod"
-	"go.uber.org/goleak v1.0.0"
-	"go.uber.org/goleak v1.0.0/go.mod"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/zap v1.10.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod"
-	"golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod"
-	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
-	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
-	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod"
-	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
-	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
-	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
-	"golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod"
-	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-	"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
-	"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
-	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
-	"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
-	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
-	"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
-	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9"
-	"golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod"
-	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11"
-	"golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.7.0"
-	"google.golang.org/api v0.7.0/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/appengine v1.5.0/go.mod"
-	"google.golang.org/appengine v1.6.0"
-	"google.golang.org/appengine v1.6.0/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-	"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
-	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/grpc v1.14.0/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.0/go.mod"
-	"google.golang.org/grpc v1.22.0/go.mod"
-	"google.golang.org/grpc v1.23.0"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.25.1"
-	"google.golang.org/grpc v1.25.1/go.mod"
-	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-	"gopkg.in/inf.v0 v0.9.1"
-	"gopkg.in/inf.v0 v0.9.1/go.mod"
-	"gopkg.in/resty.v1 v1.12.0"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/square/go-jose.v2 v2.3.1"
-	"gopkg.in/square/go-jose.v2 v2.3.1/go.mod"
-	"gopkg.in/square/go-jose.v2 v2.4.1"
-	"gopkg.in/square/go-jose.v2 v2.4.1/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.5/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-	"k8s.io/api v0.16.9"
-	"k8s.io/api v0.16.9/go.mod"
-	"k8s.io/apimachinery v0.16.9"
-	"k8s.io/apimachinery v0.16.9/go.mod"
-	"k8s.io/client-go v0.16.9"
-	"k8s.io/client-go v0.16.9/go.mod"
-	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-	"k8s.io/klog v0.3.0/go.mod"
-	"k8s.io/klog v1.0.0"
-	"k8s.io/klog v1.0.0/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
-	"k8s.io/utils v0.0.0-20190801114015-581e00157fb1"
-	"k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod"
-	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
-	"sigs.k8s.io/yaml v1.1.0"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-	)
-go-module_set_globals
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
-	acct-group/consul
-	acct-user/consul"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake dev-build
-}
-
-src_install() {
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/consul
-	fowners consul:consul /var/log/consul
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.8.1.ebuild b/app-admin/consul/consul-1.8.4.ebuild
index 164d786e8cd5..e95ff9dfbf88 100644
--- a/app-admin/consul/consul-1.8.1.ebuild
+++ b/app-admin/consul/consul-1.8.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 inherit go-module systemd
-GIT_COMMIT=12f574c9d
+GIT_COMMIT=12b16df32
 
 DESCRIPTION="A tool for service discovery, monitoring and configuration"
 HOMEPAGE="https://www.consul.io"
@@ -74,8 +74,8 @@ EGO_SUM=(
 	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
 	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
 	"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
-	"github.com/armon/go-metrics v0.3.3"
-	"github.com/armon/go-metrics v0.3.3/go.mod"
+	"github.com/armon/go-metrics v0.3.4"
+	"github.com/armon/go-metrics v0.3.4/go.mod"
 	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
 	"github.com/armon/go-radix v1.0.0"
 	"github.com/armon/go-radix v1.0.0/go.mod"
@@ -297,6 +297,8 @@ EGO_SUM=(
 	"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
 	"github.com/hashicorp/serf v0.9.3"
 	"github.com/hashicorp/serf v0.9.3/go.mod"
+	"github.com/hashicorp/serf v0.9.4"
+	"github.com/hashicorp/serf v0.9.4/go.mod"
 	"github.com/hashicorp/vault/api v1.0.4"
 	"github.com/hashicorp/vault/api v1.0.4/go.mod"
 	"github.com/hashicorp/vault/sdk v0.1.13"
@@ -624,6 +626,8 @@ EGO_SUM=(
 	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
 	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
 	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1"
+	"golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod"
 	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
 	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
 	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
diff --git a/app-admin/ec2-ami-tools/Manifest b/app-admin/ec2-ami-tools/Manifest
index 9430939d0544..ac1a1252e498 100644
--- a/app-admin/ec2-ami-tools/Manifest
+++ b/app-admin/ec2-ami-tools/Manifest
@@ -1,3 +1,3 @@
 DIST ec2-ami-tools-1.5.7.zip 156611 BLAKE2B f3e4c05a1f25e1d47a6981981b92db551953028f0621e3f175e3ab5db8823d72f56d2145376c52dc6d134ec2a167c14d64997e969785991589f9c97b93277f78 SHA512 2754ded47cbe842f58e12207c4bb7f81c8cd366dc506cbadfa9bda74d91fd5f8e1cafbb117612b14833368ff5943c4943a072d1679f23f591c15f2f49b61b4c2
 EBUILD ec2-ami-tools-1.5.7.ebuild 1128 BLAKE2B 0235a4bdde2cc30762e9f92689fe8d57d03a30b1b72c75a6e906dac0cfa0e2b1d65dfd0e2e4ab958f7d49ff083d8ab30e298b3c34d0a55d8c18e34ffceb541c0 SHA512 1b8e74ac8d228bfbfec7141501a299083c728fbb508e99d980b032405fda0c64d708b626bed77049a9593cfdcf15234c38ac9a8c2a3f4d91ae06428aecd72de0
-MISC metadata.xml 299 BLAKE2B 3fb7a374afb6ce5b06c3272f2cb25ef4f05614ed59835b4d28b8e9f97a8027a349779215c26c6bccc1d26ef0413d9b662eddb9ba1e0b7dc6085818994fa72ac6 SHA512 32d0280896d9452574a1ca6ef923aee59cf559e2b9023a4b6986c735bc327df57eb2c73183f5cb660a991e2f41268f0477b24a7e68a81d283fd68c1d2a6ff6a8
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-admin/ec2-ami-tools/metadata.xml b/app-admin/ec2-ami-tools/metadata.xml
index 73ba6fbc9254..1b2becffa26c 100644
--- a/app-admin/ec2-ami-tools/metadata.xml
+++ b/app-admin/ec2-ami-tools/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
-  <longdescription>
-    These command-line tools serve as the client interface to the Amazon EC2 web service.
-  </longdescription>
 </pkgmetadata>
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 0e4772bf2dab..e993367bcc9a 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.16.1.tar.gz 4247537 BLAKE2B e7990c51abec26ee486fa3ed08af168f2dc2ae5747cc8770d9bca2baeb151caa8075c903c742c3a19431587e483e1ec324ae46b95bdf71901f5e5cb4baac2f57 SHA512 63caf78a3c79d47dac956b3b35d0e84e86782f6d2c3bb57c2435dc457c91dab26cb5754fdd41bff80c5a336c81031d138a88519a38fb639b511b6692066d8d90
-EBUILD exo-1.16.1.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
+DIST exo-1.17.0.tar.gz 4399134 BLAKE2B d065cdbe698792afe19e1058c3e0e6c112c8ed66a0fdab8b182918022cc10cf51d4d1eb8eff42c2ff27250cbde56b627110f9b581e73d7ccbe32746081bf6de7 SHA512 2a60c80c87d9ca33dc3708c4c60b6219431751a522a9e5869fe255c1c68247c0863e9f098cc85c4652ad1ffde08386634d5374c4ddb2c82828f201a37a214075
+EBUILD exo-1.17.0.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.16.1.ebuild b/app-admin/exo/exo-1.17.0.ebuild
index 0c2c8d861fe4..0c2c8d861fe4 100644
--- a/app-admin/exo/exo-1.16.1.ebuild
+++ b/app-admin/exo/exo-1.17.0.ebuild
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 0b5b5309e9fe..4d57131cf123 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -33,14 +33,11 @@ DIST code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.m
 DIST code.cloudfoundry.org%2Frfc5424%2F@v%2Fv0.0.0-20180905210152-236a6d29298a.zip 12973 BLAKE2B 761863ec1f123172069a000a43a5aa2e60a07bae4b8ece617450608603121ac81b12b771f9ae3ab0f3eb9cf14c2d2c23319a31e4f8cd49e93d5e19f5a6dc2c12 SHA512 d39f126bbd0bc0ce86098d3eb4e14ff02d0b6b053cb2e63ba202d5fed007d673ef39d2653d29751ee0b7107e96ad32d48c66944d55815dab4f7b9c778c531c55
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
 DIST filebeat-6.8.12.tar.gz 35567860 BLAKE2B d9650806ec4889bbcf511f1433a6b85678852c79aaba0a1f3493ff1451d012a1e3c6d2ca613a627a0c2c43c5ad43467c23fbb6993003bb9e836ac49ab8ab6539 SHA512 7d322506949e365046411beefbf87c45da4b9e2fa4b5a8b8820f97be73d48a9ae75fc85fe209602752eb18e21784f6b8f3bc7f83881efa91ad4995f07a773bd2
-DIST filebeat-6.8.4.tar.gz 35552503 BLAKE2B 165edceffa71318d77363e4e8e737663eb45e5c3d20148dffd8111187eb3d07eb7998c068b3a3da315ff582f7687d75183ae9828f8b9c87d0c025d450936e00d SHA512 4739481a2ec0307804b797369050b81668f531793bdd1c72304b963e8ab4662b40820dfab211c7fdeeef5deb431f5a0e6ef2680841b4748d352ee8724b2bac42
 DIST filebeat-7.3.2.tar.gz 49977990 BLAKE2B 6219a382b415572fdea2ff4b0aa3f02b3c1e500d77ed5200b6d5b4334a08b8e91d389ea41b3afe98355f8b20e7f8ecaccf5996f0bb7aad5f10e0f0d69400a0d6 SHA512 75943b251343d28f478f2f19665e4ba31f5bc6e4b26f6e6da8aa062322da4ab8e134c87a9557a97677ba3b22484c44ebaeaeeb87866e0f12e67f1647fe34131a
-DIST filebeat-7.5.2.tar.gz 64360149 BLAKE2B 2bcbe19b9354c7039c652e6edd4b2cac688b136188f55caaf070dc9d60bd775eb2f0a4016725bf48baa5d26a056f74226d6bec09d1909fcbaf36ad2703d06f2e SHA512 8911e05b489e07f4ec6ee6397e916186ad618bfe97c43c509d564a828a1938eeea6c57cf66f2e93216b5d6b3958e0450d3aab24b65ef7209f0040f66ee36e74a
 DIST filebeat-7.6.1.tar.gz 77795975 BLAKE2B 2ca420b339b96baefff5042dba456fe1086dfdc5ccc1503609ff1989d79952709347662be60b18591e2b1a9f6557bfb942429b9aa6412dc02072331c8918c95c SHA512 c4f8daff002fe393b95f00b47df1ecb5566a69a9345bbbe1caceffecd8d413e3e9886f30cd4f2914579526db3de92c036c78fb37d703d447567fe921275b5fac
 DIST filebeat-7.7.0.tar.gz 90104462 BLAKE2B d044ec00bcae08745d012e49fc3cf9369b201da68ee2bfca2ce7f91ecd74c78e7c48d2045e539b6752c164e4c3f6cba38a00f1ee7a82493e008f6be49581b5d5 SHA512 1e0c7cc77b90cb3764d62db23a5a66ac3214c97a2f305c46f568ccc91a21f247c9e42c91a0771c9fc7500f6d0769e3d224b81a2c76399fd2bc6edd5afa1cb367
-DIST filebeat-7.8.0.tar.gz 95390157 BLAKE2B 47f321e4515a0b6346c210eafc5dfe21e9c5d6ba896e19d1fa73758822a6c5a2d029030ce8a2f81d1516bc884167f77ceb671d78f991e3c055444c7417e0819b SHA512 a17b39b590d6bc7e23b74a63f4cc3dcb5defe26dbe1af1cc5dc007bcfc5b316a6b562889be572d2f9f0669db19e58b8920e06faad3c1280a8c0045481776afc1
 DIST filebeat-7.8.1.tar.gz 95430122 BLAKE2B ca79479ae8bec318a69b49fa8ba08c460755b356348ac5aa067ae90ffdd1d4e0c38b05938a80920a2d6886dc08fc0ccda0153c8a3299aafc5d2c2dab4c4fbdec SHA512 ccbf8fbbd2c094400b24e5cf8a40a910c69f4ae1bc858c496118519f5424b03b192f4852620ad1b9b8dc14f627c0d0548127406b015cc2a3d7b624801196ea60
-DIST filebeat-7.9.0.tar.gz 83098992 BLAKE2B ffa2274590074deb3e6bb1064c597521b71a1d86f48f2d9288ef909c2706c01a4a6fa163f3effd10eeb4a017b2bad0408b709cf9b101340a554494227900c871 SHA512 6141aa4504a94bd7de9d869bb9d81ede4fa5c7db964643cb5578d133982c81639e9fb7a1de62bde673fc5a2aeb0b5785f0cd0fc54fc2063cb64674535a0eef51
+DIST filebeat-7.9.1.tar.gz 82853636 BLAKE2B c995e4cfe8a51b0597116d9e218360c574b4eee3f0b2174bddaacca5da7a286005bb9fb9b0b4f6de4202be95e390f32924755461b3b2cc03c4b88331e8a2329f SHA512 ae113efca9ff997dc77b44b6d1962653ef2b752a2d1b77e3131b94d7139db5672e29d02d02c8c7447f3a53a13126beb7dbfaaf228261053b6520acfaaf13ab23
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod 372 BLAKE2B 80a7e0aac984acb79239b3309290cd8ef1eeca8d9f53b3c91628cbe6dd112706d2313c47e33ac52ea9e8a6417289dacae8e2e72a03e679836d3ed89cb86c0aee SHA512 6db1a52bbab1332ab7e761532cb110394afa1dd69cc5f7443c3fb733c7d95fa712cf6bf8a78fc3f51d89b2d368a248e532bab06bc93e2e663b8f836c91aef0de
 DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip 29788 BLAKE2B c1e493471bca24ac64c8119e624ea077a74678a492b036deb907ede12b5e93c3ef699820cb2ec9468a98d00e83d84c6bb45cf274b4812a0f319a0248610a4d2c SHA512 a412fbe597ab0c47223d733303ed2277656fe35866f52e4ed1f25cc03b691f15f5592cb07b3c5fb39d4cb98c6d73dbc8e1e7869cea17241a33dfc29db0a1d121
 DIST github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.mod 916 BLAKE2B eda68c483b29b920a2a3efafcf5b36b7d4f1c01bc5f55fefafc3ff9805cbf62a9a83a9d8f870319776a53f55d21efd52de8174ecb45c1c648e65d5e187be21fa SHA512 6fd1c6d13559028e1fac3c9cd3de1a914e5cd0607519de8b71e622b187168c377dc8bcc3de87c4905f0a7ed846b123885fc2dd9b8a4a6d9a49f7781a61ef53bb
@@ -300,8 +297,6 @@ DIST github.com%2Felastic%2Fsarama%2F@v%2Fv0.0.0-20191122160421-355d120d0970.mod
 DIST github.com%2Felastic%2Fsarama%2F@v%2Fv0.0.0-20191122160421-355d120d0970.zip 368799 BLAKE2B c5b3fe0346ad2c2978f13c5db9de073a91e70c7ea66e6c848946b6a9642e23668ce1d3de7f816de4d4f81d436ef7dfa2f84fae05d3258d727fbe678f8b779fe3 SHA512 f59e798714e5e5f02e50d44f6728b3bf464ff77704c5b67f8b704f11318d29ea5c883c78f5909e65a907ab23d036e2d64a63e6369d5dbaed565f27d8fae04517
 DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.mod 1375 BLAKE2B 2078c8e8bb7e18fc469ef77acbfefbd44e6d76c492bd18a8008adf28c5d1fae9cc60d4fc8503a7d66b16a74299e56f673ed6701b34d7a9840afa2fa61be0d2c6 SHA512 31a41e1f8a619aa9dd438be4dcc185d75984a1dd6d7efc5bfd37bf74f63be6a6fb2ca3b4d584bb66f343ca1693b59a2156745689fee29588395ab369fbe32391
 DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.19.1-0.20200629123429-0e7b69039eec.zip 393905 BLAKE2B 91e13d3eaa5fbae1d48d5e02a64fcf2c12237eedb2f5a171795ddee5c1830b2e3006576d37f58468bcbae3fe65ee7a37b1ee8a4c1f78869d5d0b1f9c877e3fc5 SHA512 599747a3a5deac56741c09bd0655c7dea2a3e6e25c1c2d5a851472a6b5cec4bc599d9ed873d6f71fc27a1956ebbf9c30c84ab0d11954d3e02de7352839d2d2eb
-DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.24.1-elastic.0.20200519143807-cbc80333a91e.mod 1375 BLAKE2B 2078c8e8bb7e18fc469ef77acbfefbd44e6d76c492bd18a8008adf28c5d1fae9cc60d4fc8503a7d66b16a74299e56f673ed6701b34d7a9840afa2fa61be0d2c6 SHA512 31a41e1f8a619aa9dd438be4dcc185d75984a1dd6d7efc5bfd37bf74f63be6a6fb2ca3b4d584bb66f343ca1693b59a2156745689fee29588395ab369fbe32391
-DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.24.1-elastic.0.20200519143807-cbc80333a91e.zip 396086 BLAKE2B 3f0aac8224ab251f34b857800f8ab4f764f480b11cfb7a3a7acdf4d6e30c0a70ba4547c773116fa7acda3fce2bb8ec603391d24d19ce62a12dc5f19559c274f1 SHA512 adf9a9fd4ec8ddb449be16161176501260ba8e6c9b34d3b41768520258d07b5fd0b76b4f8d17f32076b9a4b252de4f40e3f3dc71155378092c8f216d4ab0131a
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.zip 123357 BLAKE2B f90cde27ee435ad6c035c1f5d5e5269730bf04c3328ac75e05f10d4023455e73b1a6bee17685393bfd32ca14e4887eadfba2d882bd0d84ad7a3a9575f7b31dfa SHA512 18c021a4cff23572c12fab0f163cd775c9cc046d5216e37d18ac461ea113e1032d504c8877c240bb3d1461665f926dca9b42015991688fe99389a55e2e2ae797
 DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
@@ -1166,12 +1161,9 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.1-0.20190704183835-4cd0c284b15f.zip 21792 BL
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
 EBUILD filebeat-6.8.12.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd2521334c42434e30ac0a29b7647930c9265dacafb517d681746e919db3ad67fa07f142bef3a7e302e826137957af5131 SHA512 7a8a32a3e8f1677c496df38b22764340f7ded39500a6dcd9f9c28fd82eaae0131e9d17ad43b4952744e9b486ad868ad779bd696af203bf1663c1d5143dbe5cf9
-EBUILD filebeat-6.8.4.ebuild 1508 BLAKE2B e83622851a3dcdc4bb54c20f8f3e62c682a5bcda3e6fd4165bc6551724c5fae6da3fd1f818fc23b64f3b07b2891c270730ea66da66e53ef35b17942bc872c75b SHA512 3e0d35163aa280ac21092c0f9bfef094fdaa6716e92089add9775c07d37fbaa127766fc60c202222f6e25fea919d2473a80e6f0944219da55a886572ee3bb11e
 EBUILD filebeat-7.3.2.ebuild 1497 BLAKE2B b130f2fa0916e4b37b238fb87ef6ab80f4d94bee5df788873537b9031a718c4300d3582d7fd070421f06a8b034b853d3b4a89353d572006160a660cf8882ee8d SHA512 900e496e61e21a2ccbc5eb657161c03021f0b95315d688ace1d4ef1c00b73d20f015aec5e562d7d3d72a139daf3b342501d2515d782635bbd64fd2752641a422
-EBUILD filebeat-7.5.2.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd2521334c42434e30ac0a29b7647930c9265dacafb517d681746e919db3ad67fa07f142bef3a7e302e826137957af5131 SHA512 7a8a32a3e8f1677c496df38b22764340f7ded39500a6dcd9f9c28fd82eaae0131e9d17ad43b4952744e9b486ad868ad779bd696af203bf1663c1d5143dbe5cf9
 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.0.ebuild 55345 BLAKE2B a4f298fb0d0ec3ce5639cee82c1bf481dc625e748dc7e8ca168ad64466506bb38323e80d4d42ada7e74ea70f0515e6e2b89cee63cf7416e7f33e3db7fcf176a0 SHA512 187c1b52d7f7e4d680945f73f9676da8bdc5f2e8ba5c917e405691344e58c2a025fa0604de264ea0cd36a5112dd77cf3cda6402bdca17a59bfecf0614001d3f8
 EBUILD filebeat-7.8.1.ebuild 55906 BLAKE2B e2e6704ce324b9dbd9d64385812e4cd098308366ed05627fa1214382ab9f8e4deb5461fe77276310ebaef2a89c6eeea039d472b890be122560f18fc938049883 SHA512 37353b75c3abf9c5ceeef094443320ca9915c580b5c83f7fd7f55cd1312a118e7ea8aacb9d5c5a4e3e59f29d4f5cc09a1d7ea5ba2a864702475f5fc36dd554d4
-EBUILD filebeat-7.9.0.ebuild 55141 BLAKE2B ceb892d7c4b4760490a59fb15a943d9e94c479ce13bc84f2faf87a5f983a8335b1477a0ffd3a5ff281bc26c3bb6311c03252933c7db92aad262b74d4738ae17a SHA512 6a79de1b6d1013eb4d2bfe8482bc370ce17a81f39c561f913bb3694e5dd50a752bea1775405b9cbdc7ae4d07f7c68579354134fcfaa0b1dc10f4006bed27a116
+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-6.8.4.ebuild b/app-admin/filebeat/filebeat-6.8.4.ebuild
deleted file mode 100644
index 916728450cc4..000000000000
--- a/app-admin/filebeat/filebeat-6.8.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.12.9"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}
diff --git a/app-admin/filebeat/filebeat-7.5.2.ebuild b/app-admin/filebeat/filebeat-7.5.2.ebuild
deleted file mode 100644
index 8836479b860d..000000000000
--- a/app-admin/filebeat/filebeat-7.5.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.12.9"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}
diff --git a/app-admin/filebeat/filebeat-7.8.0.ebuild b/app-admin/filebeat/filebeat-7.8.0.ebuild
deleted file mode 100644
index ad82014eecdb..000000000000
--- a/app-admin/filebeat/filebeat-7.8.0.ebuild
+++ /dev/null
@@ -1,1019 +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=(
-	"4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f"
-	"4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f/go.mod"
-	"4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b"
-	"4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b/go.mod"
-	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"cloud.google.com/go v0.44.1/go.mod"
-	"cloud.google.com/go v0.44.2/go.mod"
-	"cloud.google.com/go v0.45.1/go.mod"
-	"cloud.google.com/go v0.46.3/go.mod"
-	"cloud.google.com/go v0.51.0"
-	"cloud.google.com/go v0.51.0/go.mod"
-	"cloud.google.com/go/bigquery v1.0.1"
-	"cloud.google.com/go/bigquery v1.0.1/go.mod"
-	"cloud.google.com/go/datastore v1.0.0"
-	"cloud.google.com/go/datastore v1.0.0/go.mod"
-	"cloud.google.com/go/pubsub v1.0.1"
-	"cloud.google.com/go/pubsub v1.0.1/go.mod"
-	"cloud.google.com/go/storage v1.0.0"
-	"cloud.google.com/go/storage v1.0.0/go.mod"
-	"code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee"
-	"code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee/go.mod"
-	"code.cloudfoundry.org/go-loggregator v7.4.0+incompatible"
-	"code.cloudfoundry.org/go-loggregator v7.4.0+incompatible/go.mod"
-	"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f"
-	"code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod"
-	"code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a"
-	"code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a/go.mod"
-	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
-	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0"
-	"github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod"
-	"github.com/Azure/azure-event-hubs-go/v3 v3.1.2"
-	"github.com/Azure/azure-event-hubs-go/v3 v3.1.2/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.1.8/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.1.9/go.mod"
-	"github.com/Azure/azure-pipeline-go v0.2.1"
-	"github.com/Azure/azure-pipeline-go v0.2.1/go.mod"
-	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod"
-	"github.com/Azure/azure-storage-blob-go v0.6.0/go.mod"
-	"github.com/Azure/azure-storage-blob-go v0.8.0"
-	"github.com/Azure/azure-storage-blob-go v0.8.0/go.mod"
-	"github.com/Azure/go-amqp v0.12.6"
-	"github.com/Azure/go-amqp v0.12.6/go.mod"
-	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
-	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
-	"github.com/Azure/go-autorest v12.2.0+incompatible"
-	"github.com/Azure/go-autorest v12.2.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.3/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.9.4"
-	"github.com/Azure/go-autorest/autorest v0.9.4/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.1"
-	"github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2"
-	"github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0"
-	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0"
-	"github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0"
-	"github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.1.0"
-	"github.com/Azure/go-autorest/logger v0.1.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.5.0"
-	"github.com/Azure/go-autorest/tracing v0.5.0/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-	"github.com/Masterminds/semver v1.4.2"
-	"github.com/Masterminds/semver v1.4.2/go.mod"
-	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5"
-	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
-	"github.com/Microsoft/hcsshim v0.8.7"
-	"github.com/Microsoft/hcsshim v0.8.7/go.mod"
-	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible"
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
-	"github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6"
-	"github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6/go.mod"
-	"github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d"
-	"github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d/go.mod"
-	"github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41"
-	"github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41/go.mod"
-	"github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc"
-	"github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc/go.mod"
-	"github.com/akavel/rsrc v0.8.0"
-	"github.com/akavel/rsrc v0.8.0/go.mod"
-	"github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20"
-	"github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod"
-	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43"
-	"github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43/go.mod"
-	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
-	"github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod"
-	"github.com/antlr/antlr4 v0.0.0-20200326173327-a4c66dc863bb"
-	"github.com/antlr/antlr4 v0.0.0-20200326173327-a4c66dc863bb/go.mod"
-	"github.com/armon/go-radix v1.0.0"
-	"github.com/armon/go-radix v1.0.0/go.mod"
-	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5"
-	"github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod"
-	"github.com/aws/aws-lambda-go v1.6.0"
-	"github.com/aws/aws-lambda-go v1.6.0/go.mod"
-	"github.com/aws/aws-sdk-go-v2 v0.9.0"
-	"github.com/aws/aws-sdk-go-v2 v0.9.0/go.mod"
-	"github.com/awslabs/goformation/v3 v3.1.0/go.mod"
-	"github.com/awslabs/goformation/v4 v4.1.0"
-	"github.com/awslabs/goformation/v4 v4.1.0/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/beorn7/perks v1.0.0/go.mod"
-	"github.com/beorn7/perks v1.0.1"
-	"github.com/beorn7/perks v1.0.1/go.mod"
-	"github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2"
-	"github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod"
-	"github.com/blang/semver v3.1.0+incompatible/go.mod"
-	"github.com/bradleyfalzon/ghinstallation v1.1.0"
-	"github.com/bradleyfalzon/ghinstallation v1.1.0/go.mod"
-	"github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible"
-	"github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible/go.mod"
-	"github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e"
-	"github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e/go.mod"
-	"github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e"
-	"github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cespare/xxhash/v2 v2.1.1"
-	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f"
-	"github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f/go.mod"
-	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4"
-	"github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod"
-	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
-	"github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
-	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
-	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
-	"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
-	"github.com/containerd/containerd v1.3.3"
-	"github.com/containerd/containerd v1.3.3/go.mod"
-	"github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
-	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41"
-	"github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod"
-	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
-	"github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c"
-	"github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c/go.mod"
-	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
-	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
-	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
-	"github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98"
-	"github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
-	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
-	"github.com/coreos/go-systemd/v22 v22.0.0"
-	"github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea"
-	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
-	"github.com/creack/pty v1.1.7/go.mod"
-	"github.com/cucumber/godog v0.8.1"
-	"github.com/cucumber/godog v0.8.1/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/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892"
-	"github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod"
-	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e"
-	"github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/go.mod"
-	"github.com/devigned/tab v0.1.1/go.mod"
-	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2"
-	"github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2/go.mod"
-	"github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible/go.mod"
-	"github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1"
-	"github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf"
-	"github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf/go.mod"
-	"github.com/docker/distribution v2.7.1+incompatible"
-	"github.com/docker/distribution v2.7.1+incompatible/go.mod"
-	"github.com/docker/engine v0.0.0-20191113042239-ea84732a7725"
-	"github.com/docker/engine v0.0.0-20191113042239-ea84732a7725/go.mod"
-	"github.com/docker/go-connections v0.4.0"
-	"github.com/docker/go-connections v0.4.0/go.mod"
-	"github.com/docker/go-metrics v0.0.1"
-	"github.com/docker/go-metrics v0.0.1/go.mod"
-	"github.com/docker/go-units v0.4.0"
-	"github.com/docker/go-units v0.4.0/go.mod"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6"
-	"github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6/go.mod"
-	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4"
-	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-	"github.com/eapache/go-resiliency v1.2.0"
-	"github.com/eapache/go-resiliency v1.2.0/go.mod"
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21"
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
-	"github.com/eapache/queue v1.1.0"
-	"github.com/eapache/queue v1.1.0/go.mod"
-	"github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2"
-	"github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod"
-	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3"
-	"github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod"
-	"github.com/elastic/ecs v1.5.0"
-	"github.com/elastic/ecs v1.5.0/go.mod"
-	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270"
-	"github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270/go.mod"
-	"github.com/elastic/go-libaudit v0.4.0"
-	"github.com/elastic/go-libaudit v0.4.0/go.mod"
-	"github.com/elastic/go-licenser v0.2.1"
-	"github.com/elastic/go-licenser v0.2.1/go.mod"
-	"github.com/elastic/go-lookslike v0.3.0"
-	"github.com/elastic/go-lookslike v0.3.0/go.mod"
-	"github.com/elastic/go-lumber v0.1.0"
-	"github.com/elastic/go-lumber v0.1.0/go.mod"
-	"github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595"
-	"github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595/go.mod"
-	"github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f"
-	"github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f/go.mod"
-	"github.com/elastic/go-seccomp-bpf v1.1.0"
-	"github.com/elastic/go-seccomp-bpf v1.1.0/go.mod"
-	"github.com/elastic/go-structform v0.0.6"
-	"github.com/elastic/go-structform v0.0.6/go.mod"
-	"github.com/elastic/go-sysinfo v1.1.1/go.mod"
-	"github.com/elastic/go-sysinfo v1.3.0"
-	"github.com/elastic/go-sysinfo v1.3.0/go.mod"
-	"github.com/elastic/go-txfile v0.0.7"
-	"github.com/elastic/go-txfile v0.0.7/go.mod"
-	"github.com/elastic/go-ucfg v0.7.0/go.mod"
-	"github.com/elastic/go-ucfg v0.8.3"
-	"github.com/elastic/go-ucfg v0.8.3/go.mod"
-	"github.com/elastic/go-windows v1.0.0/go.mod"
-	"github.com/elastic/go-windows v1.0.1"
-	"github.com/elastic/go-windows v1.0.1/go.mod"
-	"github.com/elastic/gosigar v0.10.5"
-	"github.com/elastic/gosigar v0.10.5/go.mod"
-	"github.com/elastic/sarama v1.24.1-elastic.0.20200519143807-cbc80333a91e"
-	"github.com/elastic/sarama v1.24.1-elastic.0.20200519143807-cbc80333a91e/go.mod"
-	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e"
-	"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/emirpasic/gods v1.12.0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
-	"github.com/evanphx/json-patch v4.2.0+incompatible"
-	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-	"github.com/fatih/color v1.5.0"
-	"github.com/fatih/color v1.5.0/go.mod"
-	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
-	"github.com/fortytw2/leaktest v1.3.0"
-	"github.com/fortytw2/leaktest v1.3.0/go.mod"
-	"github.com/frankban/quicktest v1.7.2"
-	"github.com/frankban/quicktest v1.7.2/go.mod"
-	"github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24"
-	"github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24/go.mod"
-	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/gliderlabs/ssh v0.2.2/go.mod"
-	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-kit/kit v0.9.0"
-	"github.com/go-kit/kit v0.9.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.4.0"
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-	"github.com/go-logr/logr v0.1.0/go.mod"
-	"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab"
-	"github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
-	"github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647"
-	"github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647/go.mod"
-	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible"
-	"github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod"
-	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
-	"github.com/go-sql-driver/mysql v1.4.1"
-	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
-	"github.com/go-stack/stack v1.8.0"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be"
-	"github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be/go.mod"
-	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e"
-	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
-	"github.com/godbus/dbus/v5 v5.0.3"
-	"github.com/godbus/dbus/v5 v5.0.3/go.mod"
-	"github.com/godror/godror v0.10.4"
-	"github.com/godror/godror v0.10.4/go.mod"
-	"github.com/gofrs/flock v0.7.1/go.mod"
-	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b"
-	"github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b/go.mod"
-	"github.com/gofrs/uuid v3.2.0+incompatible"
-	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
-	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
-	"github.com/gogo/protobuf v1.0.0/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gogo/protobuf v1.3.1"
-	"github.com/gogo/protobuf v1.3.1/go.mod"
-	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
-	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
-	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/mock v1.3.1/go.mod"
-	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/snappy v0.0.1"
-	"github.com/golang/snappy v0.0.1/go.mod"
-	"github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/btree v1.0.0/go.mod"
-	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9"
-	"github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-cmp v0.4.0"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/go-github/v28 v28.1.1"
-	"github.com/google/go-github/v28 v28.1.1/go.mod"
-	"github.com/google/go-github/v29 v29.0.2"
-	"github.com/google/go-github/v29 v29.0.2/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz 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/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
-	"github.com/google/renameio v0.1.0/go.mod"
-	"github.com/google/subcommands v1.0.1/go.mod"
-	"github.com/google/uuid v1.0.0/go.mod"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f"
-	"github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.5"
-	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-	"github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985"
-	"github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985/go.mod"
-	"github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a"
-	"github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a/go.mod"
-	"github.com/gorilla/mux v1.7.2"
-	"github.com/gorilla/mux v1.7.2/go.mod"
-	"github.com/gorilla/websocket v1.4.1"
-	"github.com/gorilla/websocket v1.4.1/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.13.0"
-	"github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod"
-	"github.com/h2non/filetype v1.0.12"
-	"github.com/h2non/filetype v1.0.12/go.mod"
-	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce"
-	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874"
-	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.2"
-	"github.com/hashicorp/go-uuid v1.0.2/go.mod"
-	"github.com/hashicorp/go-version v1.0.0"
-	"github.com/hashicorp/go-version v1.0.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d"
-	"github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d/go.mod"
-	"github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01"
-	"github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01/go.mod"
-	"github.com/haya14busa/go-checkstyle v0.0.0-20170303121022-5e9d09f51fa1/go.mod"
-	"github.com/haya14busa/secretbox v0.0.0-20180525171038-07c7ecf409f5/go.mod"
-	"github.com/hpcloud/tail v1.0.0"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
-	"github.com/imdario/mergo v0.3.5/go.mod"
-	"github.com/imdario/mergo v0.3.6"
-	"github.com/imdario/mergo v0.3.6/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod"
-	"github.com/jcmturner/gofork v1.0.0"
-	"github.com/jcmturner/gofork v1.0.0/go.mod"
-	"github.com/jessevdk/go-flags v1.4.0/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5"
-	"github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod"
-	"github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901"
-	"github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod"
-	"github.com/joho/godotenv v1.3.0"
-	"github.com/joho/godotenv v1.3.0/go.mod"
-	"github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca"
-	"github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca/go.mod"
-	"github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod"
-	"github.com/jpillora/backoff v1.0.0"
-	"github.com/jpillora/backoff v1.0.0/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
-	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/json-iterator/go v1.1.7"
-	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jstemmer/go-junit-report v0.9.1"
-	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
-	"github.com/jtolds/gls v4.20.0+incompatible"
-	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/justinas/nosurf v1.1.0/go.mod"
-	"github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod"
-	"github.com/kisielk/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/klauspost/compress v1.9.8"
-	"github.com/klauspost/compress v1.9.8/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pretty v0.2.0"
-	"github.com/kr/pretty v0.2.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/pty v1.1.8/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kylelemons/godebug v1.1.0"
-	"github.com/kylelemons/godebug v1.1.0/go.mod"
-	"github.com/lib/pq v1.0.0/go.mod"
-	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01"
-	"github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01/go.mod"
-	"github.com/magefile/mage v1.9.0"
-	"github.com/magefile/mage v1.9.0/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-	"github.com/mailru/easyjson v0.7.1"
-	"github.com/mailru/easyjson v0.7.1/go.mod"
-	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
-	"github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
-	"github.com/mattn/go-colorable v0.0.8"
-	"github.com/mattn/go-colorable v0.0.8/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
-	"github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe"
-	"github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe/go.mod"
-	"github.com/mattn/go-isatty v0.0.2"
-	"github.com/mattn/go-isatty v0.0.2/go.mod"
-	"github.com/mattn/go-shellwords v1.0.7"
-	"github.com/mattn/go-shellwords v1.0.7/go.mod"
-	"github.com/mattn/go-sqlite3 v1.9.0"
-	"github.com/mattn/go-sqlite3 v1.9.0/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
-	"github.com/miekg/dns v1.1.15"
-	"github.com/miekg/dns v1.1.15/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/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 v0.0.0-20170116052023-ab25296c0f51"
-	"github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51/go.mod"
-	"github.com/mitchellh/iochan v1.0.0"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-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/morikuni/aec v1.0.0"
-	"github.com/morikuni/aec v1.0.0/go.mod"
-	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-	"github.com/oklog/ulid v1.3.1"
-	"github.com/oklog/ulid v1.3.1/go.mod"
-	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-	"github.com/onsi/ginkgo v1.5.0/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.8.0/go.mod"
-	"github.com/onsi/ginkgo v1.10.1"
-	"github.com/onsi/ginkgo v1.10.1/go.mod"
-	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
-	"github.com/onsi/gomega v1.2.0/go.mod"
-	"github.com/onsi/gomega v1.4.3/go.mod"
-	"github.com/onsi/gomega v1.5.0/go.mod"
-	"github.com/onsi/gomega v1.7.0"
-	"github.com/onsi/gomega v1.7.0/go.mod"
-	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
-	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
-	"github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483"
-	"github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483/go.mod"
-	"github.com/opencontainers/image-spec v1.0.1/go.mod"
-	"github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6"
-	"github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod"
-	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
-	"github.com/opencontainers/runc v1.0.0-rc9"
-	"github.com/opencontainers/runc v1.0.0-rc9/go.mod"
-	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
-	"github.com/opencontainers/runtime-spec v1.0.1/go.mod"
-	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
-	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
-	"github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
-	"github.com/pelletier/go-buffruneio v0.2.0/go.mod"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-	"github.com/pierrec/lz4 v2.4.1+incompatible"
-	"github.com/pierrec/lz4 v2.4.1+incompatible/go.mod"
-	"github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338"
-	"github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib 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/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v1.0.0/go.mod"
-	"github.com/prometheus/client_golang v1.1.0/go.mod"
-	"github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc"
-	"github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/prometheus/common v0.4.1/go.mod"
-	"github.com/prometheus/common v0.6.0/go.mod"
-	"github.com/prometheus/common v0.7.0"
-	"github.com/prometheus/common v0.7.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod"
-	"github.com/prometheus/procfs v0.0.2/go.mod"
-	"github.com/prometheus/procfs v0.0.3/go.mod"
-	"github.com/prometheus/procfs v0.0.5/go.mod"
-	"github.com/prometheus/procfs v0.0.11"
-	"github.com/prometheus/procfs v0.0.11/go.mod"
-	"github.com/prometheus/prometheus v2.5.0+incompatible"
-	"github.com/prometheus/prometheus v2.5.0+incompatible/go.mod"
-	"github.com/rakyll/statik v0.1.6/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563"
-	"github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod"
-	"github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd"
-	"github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd/go.mod"
-	"github.com/reviewdog/reviewdog v0.9.17"
-	"github.com/reviewdog/reviewdog v0.9.17/go.mod"
-	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-	"github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e"
-	"github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e/go.mod"
-	"github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54"
-	"github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54/go.mod"
-	"github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b"
-	"github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod"
-	"github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod"
-	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522"
-	"github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522/go.mod"
-	"github.com/santhosh-tekuri/jsonschema v1.2.4"
-	"github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shirou/gopsutil v2.19.11+incompatible"
-	"github.com/shirou/gopsutil v2.19.11+incompatible/go.mod"
-	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/sirupsen/logrus v1.4.1/go.mod"
-	"github.com/sirupsen/logrus v1.4.2"
-	"github.com/sirupsen/logrus v1.4.2/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
-	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
-	"github.com/spf13/afero v1.2.2/go.mod"
-	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
-	"github.com/spf13/cobra v0.0.3"
-	"github.com/spf13/cobra v0.0.3/go.mod"
-	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
-	"github.com/spf13/pflag v1.0.1/go.mod"
-	"github.com/spf13/pflag v1.0.3"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/src-d/gcfg v1.4.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/objx v0.2.0"
-	"github.com/stretchr/objx v0.2.0/go.mod"
-	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/stretchr/testify v1.5.0"
-	"github.com/stretchr/testify v1.5.0/go.mod"
-	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
-	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b"
-	"github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b/go.mod"
-	"github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a"
-	"github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a/go.mod"
-	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
-	"github.com/urso/diag v0.0.0-20200125202105-ffdc32ff5518/go.mod"
-	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797"
-	"github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797/go.mod"
-	"github.com/urso/diag-ecs v0.0.0-20200210114345-ab085841dcb9"
-	"github.com/urso/diag-ecs v0.0.0-20200210114345-ab085841dcb9/go.mod"
-	"github.com/urso/ecslog v0.0.1"
-	"github.com/urso/ecslog v0.0.1/go.mod"
-	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e"
-	"github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e/go.mod"
-	"github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230/go.mod"
-	"github.com/urso/magetools v0.0.0-20200125210132-c2e338f92f3a"
-	"github.com/urso/magetools v0.0.0-20200125210132-c2e338f92f3a/go.mod"
-	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4"
-	"github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4/go.mod"
-	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec"
-	"github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec/go.mod"
-	"github.com/vbatts/tar-split v0.11.1/go.mod"
-	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41"
-	"github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41/go.mod"
-	"github.com/xanzy/go-gitlab v0.22.3"
-	"github.com/xanzy/go-gitlab v0.22.3/go.mod"
-	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
-	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
-	"github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
-	"github.com/xdg/stringprep v1.0.0"
-	"github.com/xdg/stringprep v1.0.0/go.mod"
-	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
-	"github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb"
-	"github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod"
-	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
-	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
-	"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
-	"github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56"
-	"github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod"
-	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7"
-	"github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7/go.mod"
-	"go.elastic.co/apm v1.7.2"
-	"go.elastic.co/apm v1.7.2/go.mod"
-	"go.elastic.co/apm/module/apmelasticsearch v1.7.2"
-	"go.elastic.co/apm/module/apmelasticsearch v1.7.2/go.mod"
-	"go.elastic.co/apm/module/apmhttp v1.7.2"
-	"go.elastic.co/apm/module/apmhttp v1.7.2/go.mod"
-	"go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193"
-	"go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193/go.mod"
-	"go.elastic.co/fastjson v1.0.0"
-	"go.elastic.co/fastjson v1.0.0/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0/go.mod"
-	"go.opencensus.io v0.22.2"
-	"go.opencensus.io v0.22.2/go.mod"
-	"go.uber.org/atomic v1.5.0"
-	"go.uber.org/atomic v1.5.0/go.mod"
-	"go.uber.org/multierr v1.3.0"
-	"go.uber.org/multierr v1.3.0/go.mod"
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
-	"go.uber.org/zap v1.14.0"
-	"go.uber.org/zap v1.14.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
-	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod"
-	"golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod"
-	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37"
-	"golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
-	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
-	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299"
-	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
-	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f"
-	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
-	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
-	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-	"golang.org/x/mod v0.1.0/go.mod"
-	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
-	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-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-20190522155817-f3200d17e092/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
-	"golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod"
-	"golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod"
-	"golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
-	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
-	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
-	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
-	"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-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
-	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
-	"golang.org/x/sys v0.0.0-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-20190726091711-fc99dfbffb4e/go.mod"
-	"golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
-	"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
-	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
-	"golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod"
-	"golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
-	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
-	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
-	"golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c"
-	"golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c/go.mod"
-	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e"
-	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
-	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
-	"golang.org/x/text v0.3.2"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-	"golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod"
-	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
-	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
-	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
-	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
-	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
-	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
-	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4"
-	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.7.0/go.mod"
-	"google.golang.org/api v0.8.0/go.mod"
-	"google.golang.org/api v0.9.0/go.mod"
-	"google.golang.org/api v0.15.0"
-	"google.golang.org/api v0.15.0/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.2.0/go.mod"
-	"google.golang.org/appengine v1.3.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/appengine v1.5.0/go.mod"
-	"google.golang.org/appengine v1.6.1/go.mod"
-	"google.golang.org/appengine v1.6.5"
-	"google.golang.org/appengine v1.6.5/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
-	"google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod"
-	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb"
-	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.1/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.24.0/go.mod"
-	"google.golang.org/grpc v1.26.0/go.mod"
-	"google.golang.org/grpc v1.27.1"
-	"google.golang.org/grpc v1.27.1/go.mod"
-	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
-	"gopkg.in/inf.v0 v0.9.0"
-	"gopkg.in/inf.v0 v0.9.0/go.mod"
-	"gopkg.in/jcmturner/aescts.v1 v1.0.1"
-	"gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
-	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
-	"gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
-	"gopkg.in/jcmturner/goidentity.v3 v3.0.0"
-	"gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0"
-	"gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod"
-	"gopkg.in/jcmturner/rpc.v1 v1.1.0"
-	"gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
-	"gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528"
-	"gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528/go.mod"
-	"gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod"
-	"gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod"
-	"gopkg.in/src-d/go-git.v4 v4.13.1/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/warnings.v0 v0.1.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.3/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"gotest.tools v2.2.0+incompatible"
-	"gotest.tools v2.2.0+incompatible/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-	"honnef.co/go/tools v0.0.1-2019.2.3"
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-	"howett.net/plist v0.0.0-20181124034731-591f970eefbb"
-	"howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod"
-	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
-	"k8s.io/api v0.0.0-20190722141453-b90922c02518"
-	"k8s.io/api v0.0.0-20190722141453-b90922c02518/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8"
-	"k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8/go.mod"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
-	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-	"k8s.io/klog v0.3.0/go.mod"
-	"k8s.io/klog v0.3.1/go.mod"
-	"k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09"
-	"k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058"
-	"k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058/go.mod"
-	"k8s.io/kubernetes v1.13.0/go.mod"
-	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
-	"k8s.io/utils v0.0.0-20190712204705-3dccf664f023"
-	"k8s.io/utils v0.0.0-20190712204705-3dccf664f023/go.mod"
-	"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/go.mod"
-	"sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f"
-	"sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-S="${WORKDIR}/beats-${PV}"
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}
diff --git a/app-admin/filebeat/filebeat-7.9.0.ebuild b/app-admin/filebeat/filebeat-7.9.1.ebuild
index d3785a811d9b..d3785a811d9b 100644
--- a/app-admin/filebeat/filebeat-7.9.0.ebuild
+++ b/app-admin/filebeat/filebeat-7.9.1.ebuild
diff --git a/app-admin/genromfs/Manifest b/app-admin/genromfs/Manifest
index 0ae69f90107d..a2256e93f841 100644
--- a/app-admin/genromfs/Manifest
+++ b/app-admin/genromfs/Manifest
@@ -1,4 +1,4 @@
 AUX genromfs-0.5.2-build.patch 551 BLAKE2B 9574a6285b2d6335fe32894bf42a51822625498a3f6a3fa3c227195251903baefdd86f3a6106f4a10c45e7618a16b5160c9c4a64f9bc7eb3d8ced587903bd2a6 SHA512 d7cda99be9e675951bcf6c3dc42e9aeccea01fe5fb32c5c072798af5d700ba7126164105c6fb05eefefb63e69e3f6b8404d3d00655541155238465ba1f8e0d23
 DIST genromfs-0.5.2.tar.gz 21069 BLAKE2B 350ebf11b8ef068053217b75ac995af1199e4c4c11823df584e8169c260dbd851d4f44ba6d23ac1f5f4cd9c2ca7ae7fd268d02ba19529da90003a697efc3e06a SHA512 7fa2f362e4a61ab38f5262fc5a716119312d3029f93cf0a514313c5a3c956d687d777a826da2f4ad95edaf5eab014464635b0afbaaa11f9b495efb6f03fbec2f
 EBUILD genromfs-0.5.2.ebuild 537 BLAKE2B 5dd1d5bfa2871d1cd94d8820f03bba10d9ff5a0ea8f08f4840b673917220665ee7d1ac778665a9a6649b39a266a59029c3d53dd147910b0f1af707a721095a80 SHA512 8d2412a193c14183323979c3b633714314273d5aca09bf4a9f677697a548333c40d5b75a4b463738a7214dc53d9e0eea2d30acddae61e35af4d104e1b2632b03
-MISC metadata.xml 349 BLAKE2B cab4bb0ef305ad6a0aa43ebfc701ec8b515f05cd3ff9bfe7ed518b4b8e5fcb239a6ac4b7ef719f3c394412ffb8eed203b7d66cbf89f5af7535fade7222dca7b1 SHA512 b86036d8e4288d5ae248bab2335ae74715950c2a6baf385c23b711a4700232961e504dcded46f39b57a520589e83c79c48111fa8c9635a63298acdcf21381912
+MISC metadata.xml 245 BLAKE2B 523d8d7725b94264503e7164af353bac39bd5e90044978fc5cb16113f73ae88cfd04c73578d032316fb157f7236f74596f09c74d6af86852ee1d952dd59f4790 SHA512 c917020b67f8cc5b28025f8a9d99d1617491506a2e0dd394e1361806f94829d07b77f1b51de542fc67c81c512dde47237e0585bb4fd915890c056ed804263b99
diff --git a/app-admin/genromfs/metadata.xml b/app-admin/genromfs/metadata.xml
index cf9dbee3a273..82849c016491 100644
--- a/app-admin/genromfs/metadata.xml
+++ b/app-admin/genromfs/metadata.xml
@@ -2,8 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>A readonly filesystem designed to be small and very space
-	efficent</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">genromfs</remote-id>
 	</upstream>
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index 9f07d918b839..73e34210ddc2 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -34,4 +34,4 @@ EBUILD github-backup-utils-2.18.0.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e6
 EBUILD github-backup-utils-2.19.1.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
 EBUILD github-backup-utils-2.20.2.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
 EBUILD github-backup-utils-2.21.0.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
-MISC metadata.xml 448 BLAKE2B 8f3322a1e551345100a70421c1fcd9d56b8750e425ab6e579ceab918858df09c6aec520898d1897066596df231f983b3384441e7edc9e8350ac19ebd3d69462c SHA512 ae28e31312c3dba5d71fd4bd6c7ed6adc171a250473d09a6646d13de2cdc0d78ff4b1ca389c04717b789d500e7c269d49aef32a785ab4bdbc073c30bffa5eba7
+MISC metadata.xml 342 BLAKE2B 9f590d0c03e75e395500a57d1b99020742fb9fc04835b6fca8a896435dec7ba274204df2c5356ec1ef101f721a4bafdb848299c57b209c8d9aa41efdeb674e8f SHA512 5a9f0cb678377962ec6e4cf33ed40423e568f15cb71dfe5dd87e427a21584043e5698bbb2baa5b77907bf8f15c9ad8cfa8b05b4fdcdf2c8876ceb968afcb2d07
diff --git a/app-admin/github-backup-utils/metadata.xml b/app-admin/github-backup-utils/metadata.xml
index 3ff8f644e3fb..5ce194bb8e9c 100644
--- a/app-admin/github-backup-utils/metadata.xml
+++ b/app-admin/github-backup-utils/metadata.xml
@@ -5,9 +5,6 @@
     <email>williamh@gentoo.org</email>
     <name>William Hubbs</name>
   </maintainer>
-  <longdescription>
-  Provides backup utilities for Github Enterprise installations.
-  </longdescription>
   <upstream>
     <remote-id type="github">github/backup-utils</remote-id>
   </upstream>
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 634bf39c2d8b..69b7637d400e 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,14 +1,10 @@
 AUX gkrellm-2.3.5-config.patch 1530 BLAKE2B 4e672d58a680c7c0d3f660a2ff26fd5340d14e39d1fb9f824464a5a89b593a9f1b915cc8735c215d27c198147a2a4a438b506e27e5c5469ccbc80534867dc380 SHA512 c8259770dd088a119c349d2f19728f4874a24c407273edbf7129a531589e908ef37fbdf7bdbaaaf51ae6fa527d88601749a9e358746bff514082535b355d2ad0
 AUX gkrellm-2.3.5-sansfont.patch 688 BLAKE2B 679912990141a5758b14f67712ec154e46b0fd8d1fd3fe5a1eb14c9d95ce8113cdf887b72290f9045bb9d37bb6ba132240b74dc3262a6d99fb54b0f204e81100 SHA512 7f404c8f57091f00e66435b0cd311611b40fc6e3f3e953476a40e9a4521e91f7bbd3b19094d88a74b9d8cef20b00c1b5289197df5219455a84ab68e5271ce11f
 AUX gkrellm-2.3.5-width.patch 350 BLAKE2B 94b3690a464b6bfcfe6b88cf7b73880680b33b389ea3ec9f299518aadfc1e9161f7ae8046b3ba484a1a0ff5f4b4d8b3d81a604b4ccc63c546156e8dfa81d687a SHA512 4324fad0b59b482b8a2bea489373a280bc6a5a647f0863f9b1c5929454f7786b94f8293731c3de94ddbef0e8cfbe6018b721fc223dade3d23feb598e4569f3ed
-AUX gkrellmd 536 BLAKE2B 6d6cf06ef51a1afc7c943b78041c9d21a9630eec0a8f598c17013868085ae06d65fdac32a4abc5bfdffb1faa33010deb9e109ccd660064a5e474402c65b55008 SHA512 7a0fa7f32f2aa5739747bec37bdcf2fd5fffffd36fdcfc4c10a36dddbf3987f003d6f8ad367d4e8b9a2d50fbef618dbb9812fc65eeed3d8e70dcf2a1da587495
 AUX gkrellmd.conf 250 BLAKE2B 2b0cfcd1940cd695c67db32c13bbb7f372936b1f88938a2e43aa27d5eeeacf746e5df3367a3c6f68c4f4470633e52a08611dc65e41a9342b98b6d4e80da81064 SHA512 257e13405bc5ce7b61b7a18e7456d1ae22d6fc2052e0e65e3b53c352a43aad2bedb4660dfd7cb95709b51f54b8949f6ff114de310be1ce49d70b074b3b8f8ef5
-AUX gkrellmd.initd 345 BLAKE2B 922967be33dcc733c55cfffa59addc01bbe2ba0298be14541925e88bac16f2310f226448545263527a96499454007baf04272fc5ce136628f03587bbc322f74b SHA512 197ad175f8e8afbc9bb81957d594ee2190c7fb3e251cfda5e987c140174a6a08e485ce2fa4e3d7a21b9bb19979c853e4c04f33021beb497f084f0ddfb2c725ba
+AUX gkrellmd.initd 338 BLAKE2B 6ff2ab29e354578efc477af50af6a7e517bb7ec9267575d75fb5d5a12c9894a60996ffa37672760657eeee0680b9b7573d3d03d7d5efbe20122d330e5a55ebd8 SHA512 403431a0bfe8264ccdaf3c7e361e363a18a5e2deda8b2287919030c746c7caf80571b1a2dda407c113a9f878253078e67202017a026d83dec43bc5ca0389cc06
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
-DIST gkrellm-2.3.10.tar.bz2 782794 BLAKE2B c0aac7df866d40c79667551ca4b25346da4267a0aad8853776425a08097dcfe3a24082e7e5d17db6d3936b59d10c29afa11e8a425319c19696141c02f7d95f25 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
-EBUILD gkrellm-2.3.10-r2.ebuild 3269 BLAKE2B 8c3ae715ca6f500851ded3929326182033152e56b2690012b83741de46b493469439374c6972abb1c495c5b8d06062ed97d8234358c8e21c08da3fd4252399b5 SHA512 9cfef7a70d9fa015e70a93e6c5bc7a65706af7c9861bb3142680ea56007b64a63f8b05e0281baee16fb03779756b4a26c8d17de784c98ca3f038813f631625b7
 EBUILD gkrellm-2.3.11-r1.ebuild 3334 BLAKE2B bbd6fe1265a6b72e1e9a9830d829e28875b8604f851f8879564aeb79bf9a807cf716ce06926b7613b043aa42644230927ef1926fe5a89c33313426d5b9791a06 SHA512 d0bdd181eed540ce917e3830cc148dc18723d32b1a825dff53ce61ef083e6d2b9a8aec61f53195588f0194f73969c665d6e56f5f4ee546d863f0eefed8bb39e8
-EBUILD gkrellm-2.3.11.ebuild 3380 BLAKE2B fcbdcea39dc5cd9d3064b88135cfb3e0157005df600c4e527b33401fef53d51b81d6aba724e732b63e71a38235e6955fddff697d1aa86afd9213b57901acb071 SHA512 1cf4e0fb31e9e323ed1859c847ebded405489376c3cbec6365d63a62aba7362c3b355a330574aaab40ce7338da1a12a0871e45960a787eebe83f9a37ae419290
-EBUILD gkrellm-9999.ebuild 3340 BLAKE2B abbdc51c93283e45f59bce3d08cea145d25e53745b74a78031681e3dae31ecefb9c6ba57a0e93f2952fe2f576c587ad1733688a40258467f2218391a89191965 SHA512 4868a487263094f3557998fabf8f908a05b1023983d45b576f1c14295df880356647e7f1588f5ac0de8f0b1d21ab16379e4a4d96f7dbe455a960f35f11a54c36
+EBUILD gkrellm-9999.ebuild 3352 BLAKE2B dab875e96a3baacbb110e23b544c412787b5ad1f20cca62196ce6b6d5b89588275836e80fcebd1e3d141f8cd3993695687ed52aaae7af6e9c71c2310146eb13c SHA512 c939397ccb34fce1892a13abac3cc6c990c16dc9e8c3a370f7767d28b0d3c4231cb3813873a5afba938bb0a6c37bee1f0b2ff30c6e84a259cd841bd11d43649b
 MISC metadata.xml 917 BLAKE2B 88567611e5ddaed8c1f81e639c7e82a120f9201f56b9e512bca08d948c78a967e57490e754f7e3b2c9a4a9a2c216b1288c8059593589378b5404b51db50a9644 SHA512 8b880d60459e4cba922f2fe586f0dfdcc4b0f8054e5f5cf8650ab10bacb30380b67f81795c671e28bf0c51bd6f3379c3b653bc78c0ec954bc7456dccdad274f0
diff --git a/app-admin/gkrellm/files/gkrellmd b/app-admin/gkrellm/files/gkrellmd
deleted file mode 100644
index 93743c57b7df..000000000000
--- a/app-admin/gkrellm/files/gkrellmd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	after lm_sensors
-	after hddtemp
-}
-
-start() {
-	ebegin "Starting GNU Krell Monitor daemon"
-	start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd -- ${GKRELLMD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping GNU Krell Monitor daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/gkrellmd.pid --name gkrellmd
-	eend $?
-}
diff --git a/app-admin/gkrellm/files/gkrellmd.initd b/app-admin/gkrellm/files/gkrellmd.initd
index fe295128e4ea..7ab4cfc103ee 100644
--- a/app-admin/gkrellm/files/gkrellmd.initd
+++ b/app-admin/gkrellm/files/gkrellmd.initd
@@ -1,9 +1,9 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="gkrell system monitor daemon"
-pidfile="/var/run/gkrellmd.pid"
+pidfile="/run/gkrellmd.pid"
 command="/usr/bin/gkrellmd"
 command_args="${GKRELLMD_OPTS}"
 command_background="true"
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
deleted file mode 100644
index cf113afd6726..000000000000
--- a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib user systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
-
-RDEPEND="
-	dev-libs/glib:2
-	hddtemp? ( app-admin/hddtemp )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:= )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	X? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/pango
-		)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.5-config.patch
-	"${FILESDIR}"/${PN}-2.3.5-width.patch
-	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog CREDITS README )
-
-pkg_pretend() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
-		ewarn "No ssl backend will be built!"
-	fi
-}
-
-pkg_setup() {
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_prepare() {
-	sed -e 's:-O2 ::' \
-		-e 's:override CC:CFLAGS:' \
-		-e 's:-L/usr/X11R6/lib::' \
-		-i */Makefile || die "sed Makefile(s) failed"
-
-	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-
-	default
-}
-
-src_compile() {
-	if use X ; then
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			STRIP="" \
-			INSTALLROOT="${EPREFIX}/usr" \
-			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
-			LOCALEDIR="${EPREFIX}/usr/share/locale" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes") \
-			$(usex ntlm "" "without-ntlm=yes") \
-			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
-	else
-		cd server || die
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes")
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake \
-			install${TARGET:+_}${TARGET} \
-			$(usex nls "" "enable_nls=0") \
-			STRIP="" \
-			INSTALLDIR="${ED}/usr/bin" \
-			INCLUDEDIR="${ED}/usr/include" \
-			LOCALEDIR="${ED}/usr/share/locale" \
-			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${ED}/usr/share/man/man1"
-
-		docinto html
-		dodoc *.html
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} GKrellM ${PN}
-	else
-		dobin server/gkrellmd
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h
-		doins shared/log.h
-	fi
-
-	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
-
-	systemd_dounit "${FILESDIR}"/gkrellmd.service
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	einstalldocs
-}
-
-pkg_preinst() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
-}
diff --git a/app-admin/gkrellm/gkrellm-2.3.11.ebuild b/app-admin/gkrellm/gkrellm-2.3.11.ebuild
deleted file mode 100644
index 93834c49a9a6..000000000000
--- a/app-admin/gkrellm/gkrellm-2.3.11.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib user systemd toolchain-funcs
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.srcbox.net/gkrellm"
-else
-	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-3"
-SLOT="2"
-IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
-
-RDEPEND="
-	dev-libs/glib:2
-	hddtemp? ( app-admin/hddtemp )
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	lm-sensors? ( sys-apps/lm-sensors:= )
-	nls? ( virtual/libintl )
-	ntlm? ( net-libs/libntlm )
-	X? (
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:2
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/pango
-		)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.5-config.patch
-	"${FILESDIR}"/${PN}-2.3.5-width.patch
-	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( Changelog CREDITS README )
-
-pkg_pretend() {
-	if use gnutls && ! use ssl ; then
-		ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
-		ewarn "No ssl backend will be built!"
-	fi
-}
-
-pkg_setup() {
-	TARGET=
-	use kernel_FreeBSD && TARGET="freebsd"
-}
-
-src_prepare() {
-	sed -e 's:-O2 ::' \
-		-e 's:override CC:CFLAGS:' \
-		-e 's:-L/usr/X11R6/lib::' \
-		-i */Makefile || die "sed Makefile(s) failed"
-
-	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-
-	default
-}
-
-src_compile() {
-	if use X ; then
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			STRIP="" \
-			INSTALLROOT="${EPREFIX}/usr" \
-			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
-			LOCALEDIR="${EPREFIX}/usr/share/locale" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes") \
-			$(usex ntlm "" "without-ntlm=yes") \
-			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
-	else
-		cd server || die
-		emake \
-			${TARGET} \
-			CC="$(tc-getCC)" \
-			LINK_FLAGS="$LDFLAGS -Wl,-E" \
-			STRIP="" \
-			$(usex nls "" "enable_nls=0") \
-			$(usex lm-sensors "" "without-libsensors=yes")
-	fi
-}
-
-src_install() {
-	if use X ; then
-		emake \
-			install${TARGET:+_}${TARGET} \
-			$(usex nls "" "enable_nls=0") \
-			STRIP="" \
-			INSTALLDIR="${ED}/usr/bin" \
-			INCLUDEDIR="${ED}/usr/include" \
-			LOCALEDIR="${ED}/usr/share/locale" \
-			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
-			MANDIR="${ED}/usr/share/man/man1"
-
-		docinto html
-		dodoc *.html
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry ${PN} GKrellM ${PN}
-	else
-		dobin server/gkrellmd
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h
-		doins shared/log.h
-	fi
-
-	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
-	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
-
-	systemd_dounit "${FILESDIR}"/gkrellmd.service
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	einstalldocs
-}
-
-pkg_preinst() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
-}
diff --git a/app-admin/gkrellm/gkrellm-9999.ebuild b/app-admin/gkrellm/gkrellm-9999.ebuild
index 1e4443fdd6e6..e757131b4748 100644
--- a/app-admin/gkrellm/gkrellm-9999.ebuild
+++ b/app-admin/gkrellm/gkrellm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ DESCRIPTION="Single process stack of various system monitors"
 HOMEPAGE="http://www.gkrellm.net/"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.srcbox.net/gkrellm"
+	EGIT_REPO_URI="https://git.srcbox.net/gkrellm/gkrellm.git"
 else
 	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index d52db2b73d04..dc5994ef3f7e 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -2,6 +2,6 @@ AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f307
 DIST glance-20.0.0.tar.gz 1961501 BLAKE2B 81ecbf1dccb1b7cbc33481825cd1de65556e9950ea8fca71565380df27c5ca967b001f811bede483b8b0e05ddf01dcb39ef4474d29d10e530d8b3cd0218dae32 SHA512 37497c5705040f3f667e0352fb620731feac91a729d77e5049feea6f4fef73cc58ef84bc6c12e84773c5013aa24a06fff8d9a56f079c716357c84823fa5690b1
 DIST glance-20.0.1.tar.gz 1959665 BLAKE2B 8d51a9e46361b2b4a1fd1642e14a6fb8bd2bc4eade58279b90eb676f49d7ac649897faf837852cdac318eab87b6daa396008c5f98c2f5aac2e2425e975014eec SHA512 19ee3313f465ff0c010389d72050ec72a4ec4dcaa075b1b0db2c7e591a9f598d9a552cc7f89b1c2bed6b2b83883783ae306fff429177d7d728c7b0a70481233d
 EBUILD glance-20.0.0.ebuild 5120 BLAKE2B 57726e39e70d1025aacccee7fbab27b44950c0d2f839ab87b4763fa794fea4475e703862845a0e662130fb1e29acda34f80f645fe68d244ee5e0037b1750cd93 SHA512 79d5affed676e46184fec436a2365dbc2a7116c9e1b6324b66c24ff95ae91f8c7c48893283af0c4b05beef14ca0e7dbfca7c91ab1ab274dcf3213d7bdcab70cc
-EBUILD glance-20.0.1.ebuild 5122 BLAKE2B 4e731fb4675b2250a15be86bd595cbb7f84f8e92e0ffbb1837d4939855069a6ea4d831e630ce1e91e83825dae9d469c6177289b1fe630d6c2b2cef37bb0b17b4 SHA512 c8bafc6142bf74d9bb79de44c565347ae90ecb504dc5247c0281152e64492b29f25ff62eacc06dd2a1b1ed67f511ab3390f368ba3d7037460da82f79c4703fa3
+EBUILD glance-20.0.1.ebuild 5120 BLAKE2B 57726e39e70d1025aacccee7fbab27b44950c0d2f839ab87b4763fa794fea4475e703862845a0e662130fb1e29acda34f80f645fe68d244ee5e0037b1750cd93 SHA512 79d5affed676e46184fec436a2365dbc2a7116c9e1b6324b66c24ff95ae91f8c7c48893283af0c4b05beef14ca0e7dbfca7c91ab1ab274dcf3213d7bdcab70cc
 EBUILD glance-2020.1.9999.ebuild 5122 BLAKE2B 4e731fb4675b2250a15be86bd595cbb7f84f8e92e0ffbb1837d4939855069a6ea4d831e630ce1e91e83825dae9d469c6177289b1fe630d6c2b2cef37bb0b17b4 SHA512 c8bafc6142bf74d9bb79de44c565347ae90ecb504dc5247c0281152e64492b29f25ff62eacc06dd2a1b1ed67f511ab3390f368ba3d7037460da82f79c4703fa3
 MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/glance-20.0.1.ebuild b/app-admin/glance/glance-20.0.1.ebuild
index 3136ae3593d4..8bf9f4279c0c 100644
--- a/app-admin/glance/glance-20.0.1.ebuild
+++ b/app-admin/glance/glance-20.0.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="stable/ussuri"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 5b9dc132ce78..9537d7cef712 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -4,6 +4,6 @@ DIST keepassxc-2.6.0-src.tar.xz 5628800 BLAKE2B 9872b9fa5f809e2d2e6ed4a233ca248d
 DIST keepassxc-2.6.1-src.tar.xz 5715948 BLAKE2B 5490757fd939b572f2f281dc6ecfcd6afc7f9a5b2ebf3cc0c8ae4a95bb982ad755a9363f6133fb0f4ac2a2b5e0a6c66a7dba954911cb5baf70d447fc8d6089bf SHA512 9fb2d01d80e2b61c847c0544c280c1f3bfca671268e2dbbe78e0f3c1264f38125a3767ceb4591261f3586cd71f4fff47ecc6eacaecf1e707cea5e8907542313a
 EBUILD keepassxc-2.5.4.ebuild 2190 BLAKE2B 4e23b212cf03f1a5c8bc18dc63313ea5224bf76efc29f360cf013af90e9fc745b04754170f5e88bacf4bc5c4600203dc9b706a2412d07e4e21b172f96822319a SHA512 9080c0202fd22e83ab38741edc4ab3061e4a24d2a3735ce03c4194faa8588ea719221296e663079a007f3f49e757ef7efcd7e206341e542054d937f3908d73ab
 EBUILD keepassxc-2.6.0.ebuild 2064 BLAKE2B 21546c5edd6287bd30a39d2a491ce1b0f010a12e77a8453bcad8d3f5e565786aed48669004230dd4625e71c7485961532394da98e1ac99d534311a3a8a012417 SHA512 1899b53dca25d584f71badaefdee9087191fd30f0f1fa97169b0e9e1b0667fbf21dee4b09b5437ce91ac70dd182ac80cf6c47ec757f2dea02b8ecb952ef74323
-EBUILD keepassxc-2.6.1.ebuild 2064 BLAKE2B 21546c5edd6287bd30a39d2a491ce1b0f010a12e77a8453bcad8d3f5e565786aed48669004230dd4625e71c7485961532394da98e1ac99d534311a3a8a012417 SHA512 1899b53dca25d584f71badaefdee9087191fd30f0f1fa97169b0e9e1b0667fbf21dee4b09b5437ce91ac70dd182ac80cf6c47ec757f2dea02b8ecb952ef74323
+EBUILD keepassxc-2.6.1.ebuild 2071 BLAKE2B 21dbc2b6d71fa3bba8a250d2b20a21eb4fa2f135ab34cbea1090d91a1525a75594dd5cbb62e97b2845e3953e73a6b54acef7dd06201c958a78193d98e1edf794 SHA512 67b9d96a95486662ff5d83d3980381949b5611b608c998b1cdec5ddd3f8e5b9bec353eb50b6f264f10d97c41a1d4572a2304645904612df4a9e306275ebecf28
 EBUILD keepassxc-9999.ebuild 2064 BLAKE2B 21546c5edd6287bd30a39d2a491ce1b0f010a12e77a8453bcad8d3f5e565786aed48669004230dd4625e71c7485961532394da98e1ac99d534311a3a8a012417 SHA512 1899b53dca25d584f71badaefdee9087191fd30f0f1fa97169b0e9e1b0667fbf21dee4b09b5437ce91ac70dd182ac80cf6c47ec757f2dea02b8ecb952ef74323
 MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e
diff --git a/app-admin/keepassxc/keepassxc-2.6.1.ebuild b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
index a6d25729d322..e4de2a185bfc 100644
--- a/app-admin/keepassxc/keepassxc-2.6.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then
 	else
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~arm64 ~x86"
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	fi
 else
 	inherit git-r3
diff --git a/app-admin/kpcli/Manifest b/app-admin/kpcli/Manifest
index 8dd763184ffd..a11defeefeb6 100644
--- a/app-admin/kpcli/Manifest
+++ b/app-admin/kpcli/Manifest
@@ -1,3 +1,3 @@
 DIST kpcli-3.4.pl 211243 BLAKE2B 4880d832554de1956e033bba2e2021b9dc0b77202585663b0f4ad2acca520bcb430ac974bbea00c21aa37c2c8e8fa8c5cf2e8131542c20ecc3c6b0ac6dd85d9a SHA512 1ec9ea46f769a6891700565a51c592fd4809a0f3bc1d2088ca694233b276652506b470328b8b840cd0876b945faad27a16a5685d8655868cd20760f24619ffaf
-EBUILD kpcli-3.4.ebuild 957 BLAKE2B 60392f3561eb813c97bc62fbf607150e8b1a7e0a3f70d41e72d50116ba07c8414eeb1f9f0bb6c65b1a652fa804acce6ff8278f023481e1abfc5253759bc50c90 SHA512 a0b930fadb59485bda66e0d200e7ddf7f5fddadb457d31fc80028997afbcb8e44dd5bd323bcd9a2e3c6a06974c4f57a47a0fe9f221c42548a860de61e63b203f
+EBUILD kpcli-3.4.ebuild 961 BLAKE2B 7977700e35b9de9a1aca2f8b78d70fe24dffd24bcb5129cb1973f79cd57a432fd8543018824f7d5fc747ee7886db2a2237649389b2eee38dfed10aa55d0ffedb SHA512 095dc8d271e2ae90b6910eaff98e290febfca02a7586fd44e5badd8c924b2f02ef80796983f285d6c7cc547c3cfbb4cf084e256850cad08e23fc6a8b7fb86ad7
 MISC metadata.xml 476 BLAKE2B 49c33b8c9713bf01f667d60e72900e99139ff425e1c10e74736bdeff840e66d7a507aa079ca334639abb9e8ef1899aa3ed37114cbf196f9309124d54ea13b774 SHA512 35280ba9f2eafc0e28b098ce0af3ec9fec17fbb956068b873516c0a28539c4d05cfecfdf71477a9fb78cf3238ad7363dc128ad149e91619485624959b780805b
diff --git a/app-admin/kpcli/kpcli-3.4.ebuild b/app-admin/kpcli/kpcli-3.4.ebuild
index 20a92eb75b3e..d12d84ae8359 100644
--- a/app-admin/kpcli/kpcli-3.4.ebuild
+++ b/app-admin/kpcli/kpcli-3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils
+inherit optfeature
 
 DESCRIPTION="A command line interface to KeePass database files"
 HOMEPAGE="http://kpcli.sourceforge.net"
diff --git a/app-admin/logmon/Manifest b/app-admin/logmon/Manifest
index a9f9b5c57de7..d7db99402753 100644
--- a/app-admin/logmon/Manifest
+++ b/app-admin/logmon/Manifest
@@ -4,4 +4,4 @@ AUX logmon-0.4.4-maintainer-mode.patch 284 BLAKE2B aecdf044dd1a91911edf87343a557
 AUX logmon-0.4.4-tinfo.patch 247 BLAKE2B ba5a762c187940fc86f7ae6845d221451a0158bbef85314f24a418d02f426460f5c8a5194eff9d6e413b41291444d7638c859ff7e9409540b6b0eb1152daa152 SHA512 3d11e8c19aff181a6886c6dd14cfe3956d1bc60c3919e9c1a1ce693111c407f9c631113386381c4391ccf4d81bdd6625fc255c7608c7f688880e22e84e9e1af7
 DIST LogMon-0.4.4.tar.bz2 65975 BLAKE2B 67f7dee996d18ef398dfbdf56c9092d2906f562aa245de0dc481eaa5c17edd8c9b300f234363641d6911cfe7b6d8c736a354e5f424eec948f0d520bb01e047ca SHA512 9ddbccfea0cae3d7fa6ffa9576f0030b6fb66e0dca152fb5242e7bd19ce319e922264720fa44f6b65319f8b25ad9e208a01434b94c629fa737bdd82ea22a4fac
 EBUILD logmon-0.4.4-r1.ebuild 853 BLAKE2B e6acec32ed26ed9f941820b6d6aa4e1495563871f8d07b4c0699822562181b95a8f4db9df69ddca9d3ee4b561810ab4829a2f0fae2c06755be9db4daa8ca6ce3 SHA512 64f74a0213a3129ad40333544fe30ae802101a5ca7c6c065ebb1431a0371d287f325f9ee185a995671e1a09bb6b265a9ea9f1073c42f49ece83de8b98b7e3367
-MISC metadata.xml 336 BLAKE2B 3cf4d66d0fd8c7d621a650d43fbed617006fc02f44f5cc515041b8746d9eb9f3f4336db6e2dd6b543aea3c5734bf5d8b275ad4258d5bd59a74cf6661e84f96a2 SHA512 e4d5565793ec2c2b9993f9561c8c84069afd5c7111ebc55339a545c146fc408c9f2ccd952d18152a07d12009634f27647295d4616f189ea5062b5db8bb6a8a59
+MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/app-admin/logmon/metadata.xml b/app-admin/logmon/metadata.xml
index 9d1727e6bd92..5b159fbcadd1 100644
--- a/app-admin/logmon/metadata.xml
+++ b/app-admin/logmon/metadata.xml
@@ -5,7 +5,4 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-	<longdescription>
-		Split-screen terminal/ncurses based log viewer.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index f33d0b9faa81..28bc9910128e 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -8,17 +8,17 @@ DIST logstash-6.8.12.tar.gz 176911027 BLAKE2B 03f95452c3823863e78a24c7bdf2709cc4
 DIST logstash-7.6.2.tar.gz 172679447 BLAKE2B afeaab06178669559ff532cf72575f8063d07f95f2401060d33e0a99c87bb9e0c251e45634b9723efe456892ac19586accc89cf7272163e48eeaef438632b777 SHA512 c86dcf36cd0d578467c7013234040d5ea100f08ef69a185f6aa86c87dfa46936282abf10d0f495ffe649274136b735d17ab513ef3401205140c2d98bd9f91238
 DIST logstash-7.7.0.tar.gz 166451553 BLAKE2B 30b732f1ef516b275246b0e14212b0b00b78502e0b4e78211b3bfdd77e2190639ed8c35f775dae7817b0b43a446d34941b968e8a0785302c337a326a507fc607 SHA512 970740adc47551d7967b9841cc39d15f2cbdcd46c2fee1f84b5688fac266fdcd2202cbb10d3a10cf3768606f693ed2e4fc79e91d293a3295083718bafaa7bc9d
 DIST logstash-7.8.1.tar.gz 159599529 BLAKE2B c7ba03fc106add6ee0b956de1c3a1ed221c2571087aeedec178d65be3cc83a10f7a4eb35898fc441ffd1c27322668d8e95344a5509cc703b4788d76422a5a1f1 SHA512 7ad6d380e92e90fad2a058a24571b85a49d5ed81835837c12dfa2f4ae4c776483de39b099ed6852ca7f4bab833cd5aba44d28df3048557dfc4a52d4c5486e276
-DIST logstash-7.9.0.tar.gz 158351233 BLAKE2B 67b8163312f832626227cb0e509b231254c331be4a7e8e9dbca4bc948f5ac05137ec0ff98c45a91f487aa53fc758d21ea4b5eff23b7f19dc3692bbab88087fa5 SHA512 61409b0a3d50f4fef3d42fefb6b39d4ff725478a9092f2e291eaca6aad6be2639a8675507f0be01ae74e88f4820aca242a94b9b79875b614ee3c2413ebe4a5db
+DIST logstash-7.9.1.tar.gz 158473271 BLAKE2B deeaccb5dd1c9acc52ee395e699fa67d816dfb4144068409f375c20a161837d07f4b0ad269f044076104bc57d84d2decf2bbb4bce17c00737afb74186e706ebb SHA512 d7e359523f4a7deba095d6a1a71f141c29ecc4cf58cdd5f81ea5af80d30be9716b1a9c824d4fc000cafc9457cf7d587d346fd8b1d0d04411a7fd8d280054671d
 DIST logstash-oss-6.8.11.tar.gz 176779121 BLAKE2B 2b3f62fd78a5ffcea07954c4e9b90fc7df10b933a327ac5400d73eb6c4ecd1013049d04b6cecd014b17ff6361a4be0ee535112267cce71cf8c9dc95b551ed6f6 SHA512 4e0d6ebaa620ebb0039687859f28e8620e5604d8452ad1338b2a670cec3153e521f4c3bdc3a78e10b843c1356e73c96065c1c624efc2baa9b2277fa1f8cabaa9
 DIST logstash-oss-6.8.12.tar.gz 176780408 BLAKE2B 4a58efc6e12b6f390022f8d4fb3f4cb3abb4af486eadd65bed840d9a0e8bf0a02659d23d7de6e0cf7068f9e3e20f65cc4e62a39350f60e1f7b3af56e3bcc3859 SHA512 2782b029a2e4880282518ed591a9dd2ee7fd6e6aca15289067f3f45922e0b1fd6adb036b4cc5d256d9aaf8d8cf06bb4ff59cfae6519fac549b6b7f36700f7c94
 DIST logstash-oss-7.6.2.tar.gz 172501347 BLAKE2B 2a83d7617c8e13a0b736ed0023a164d2191102f49e7d7174bf3ea9c56370c51e4fd760f7bb3aba97f1b9bd2ec122ba22e00dec9ac9636f7b79128c6bb2da548e SHA512 c425a9748964ef38fc58f67778cd88fc367df91087362353cfee316e54528e4a23407e1fc53d628008fd4c829b427061758112f10e7805cec88c0a1f0a966d2a
 DIST logstash-oss-7.7.0.tar.gz 166272505 BLAKE2B a12b065874e03ae985c590b8bcbaabf4d2ee6d0ce3ca1f5d60b0874074996e7f8c40bad4fd242e26e74c11741620103e41bdeade2f60f6fabe97652d1c9fbb1e SHA512 a455fcf5c9a44c326ae581f9390ddf206064e6e6b3801cca312cef91e8d33086f8a6598ed68f81f2cfc6d8d66783632b983bef7c8a4ad0f24e929827ec137da4
 DIST logstash-oss-7.8.1.tar.gz 159415077 BLAKE2B b6dd108679d813cf4ba0d0426ea8acfb460cdcfeec052359a6ce79f194fe4631349973ce1bc726fe7356264211608328204332c74e49ba0aa92e626571789142 SHA512 60d964c0b1f6afebcd41a8036e2dbbee62ca15365c840a5664406428c6b692588ea9343a600ba12d4355ff46ae60a08d42c61c5f33bb7590ce119e15fa1a32e4
-DIST logstash-oss-7.9.0.tar.gz 158167981 BLAKE2B 84f16d57ad2ce9ccda31a8621b1d71c47267b72c441e86d9afd6b5b713b94bd0662486dc7e8bd8aa967c8c2479f8054285227f8e3a2ad46c5e38e313a8cff793 SHA512 7304ddfd87c418f5ff52ea7f7db1bcc9f202cd83675373ef53dd0e8007d3b22eb16c77fc09eac8e1318257813fefe3108570bc5d84d088ec3c26d789ab7cacfd
+DIST logstash-oss-7.9.1.tar.gz 158289592 BLAKE2B 91d89b4375e51721a5d3181b916cdac33b65e4a020bdec57b3bece9b25595e1588366c69c9e07e4c25b148b4ed2703eef936d1924fac7387fb25cf750226f089 SHA512 ddd6c0db8b59b9ad719a69f04eea81e0261061b5a26569819d4c9306c6f3a63acf575bf50e5f22b17e9b44ed8750d83762b41b866a25b2a2e283b5186c9cdf61
 EBUILD logstash-bin-6.8.11.ebuild 2099 BLAKE2B f5902b9254e045789a41627c84b5a4e340268eedb1a96a266e20279a9d718ef28279e59b63320fc1d35b2e701acb5ce61a925687cd479d46a74981e92d744618 SHA512 74f8b2a81f63e5d41b373e5cb08f99560afa4f59133bfcd7955907105457ea94cf84fe07f5501e011bb2b69d388207e160057c79ec206589e7d195626fab75bb
 EBUILD logstash-bin-6.8.12.ebuild 2099 BLAKE2B f5902b9254e045789a41627c84b5a4e340268eedb1a96a266e20279a9d718ef28279e59b63320fc1d35b2e701acb5ce61a925687cd479d46a74981e92d744618 SHA512 74f8b2a81f63e5d41b373e5cb08f99560afa4f59133bfcd7955907105457ea94cf84fe07f5501e011bb2b69d388207e160057c79ec206589e7d195626fab75bb
 EBUILD logstash-bin-7.6.2.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
 EBUILD logstash-bin-7.7.0.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
 EBUILD logstash-bin-7.8.1.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
-EBUILD logstash-bin-7.9.0.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
+EBUILD logstash-bin-7.9.1.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-7.9.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.9.1.ebuild
index f47057329667..f47057329667 100644
--- a/app-admin/logstash-bin/logstash-bin-7.9.0.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.9.1.ebuild
diff --git a/app-admin/makepasswd/Manifest b/app-admin/makepasswd/Manifest
index b9b8d32eeb2b..0bfa4a64f2b9 100644
--- a/app-admin/makepasswd/Manifest
+++ b/app-admin/makepasswd/Manifest
@@ -1,3 +1,3 @@
 DIST makepasswd_1.10.orig.tar.gz 12382 BLAKE2B f38e181da077650af760123e86cdbc2f39259db82d06198280ac37f5391a7de00ca7009a69b491a150ec9e542c25b7538141941819ef540714e2a6cd75ddd4c2 SHA512 215b8c3941f395c02be43044aed972425db8fe8472ec9f4f39f7f574d9f36c5a1af5bba495dd10570363e923bfe42c26d7571741ae2ef350e660c9973ac0a5ac
 EBUILD makepasswd-1.10.ebuild 552 BLAKE2B ae35fb4808a3361971135caec829a92a1f652cbea0287e6d6d8a8fb91addfc22700997b417df018facddeb78025400d20a7845ea28b522c89dd8837ccea4e632 SHA512 160bc202eb3c2d78f4f6143ee2aa8fae30b28e361f371ebb99df4688a57d87a5f493650fea9a8e9b8abd849107fcf0890af080fc9c84016432359daae84280df
-MISC metadata.xml 283 BLAKE2B 49849d3598308d8cb5e389f56e571eae96c5c1e2f161c1e396c0be681e14acde2121463a297024e1b956fa480e6825186c6d98aa22ffe1978917e12a71e04e7f SHA512 00ac43351b446120da24fd23fda3389d29313ed42918ecf508e3bb57bb7d3769e2fe2788b4be33eb2f4a48713355a55e37a7f9c610737aa1e052597221e27c17
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/makepasswd/metadata.xml b/app-admin/makepasswd/metadata.xml
index 0d035ad2e64c..7a38bb900964 100644
--- a/app-admin/makepasswd/metadata.xml
+++ b/app-admin/makepasswd/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		A random password generator, for all your secure password needs.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index 19936b1c9714..066254d2bce7 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -2,5 +2,5 @@ AUX mcollectived.initd 497 BLAKE2B 1fe966f49117f9ea1b8c8ca4f5c92d5ddd7f8fb28658e
 DIST mcollective-2.12.4.tar.gz 1517723 BLAKE2B e49a43ae7b99a5f22fe33549b26f938941f4e007c164c3c8de77daf2b3410c7db21e5023a400c87a2e4927a5a986e3b66bc3363a0c697ea06f0dd112825ae368 SHA512 f357297253f1cb5815738c8899a543642ce721c60ba023b13a7b14a99049d909622f8500ed82fc68c142cc1ffc106aed5a9bf8b1604a47c19a04a5ef4006b9e5
 DIST mcollective-2.12.5.tar.gz 1517727 BLAKE2B b5d91c748bb1bfc63c7c040fb067d7ba39badede094d975f0b87587fe3a6c5bb6757a5be73f887be5d83f99dfefb0272bd48da6c9e79b4aee34c8d5f51e2e6c5 SHA512 639458d83b3f25d9aa433c205b9d16ded5ec689c1efb4827457fc3075c000d7abc2b70c9c8cf741c8bea03c1e47284015e69bf834e7a5670c68a40097e45891b
 EBUILD mcollective-2.12.4.ebuild 1646 BLAKE2B 36932cbac263d9e0c2d6c0ff41a78d902eb9608d2bbf7a819f97a439feab2e7dfce45d3fd7b5a726a8ff61e87a4c1659efb25ca4a713eb1c4d2fd9313c0bf0aa SHA512 1382a7674f73b359669965fa7c591d4e1c60276b918bb028c36edfead8f9cf7efdb1fa0907d757df5210561602bb4a2345e3d15dca86482335289a71eec1d705
-EBUILD mcollective-2.12.5.ebuild 1653 BLAKE2B 4a2814c96670825f66b52c71126dd83799827011768705c5ea50e383718f42cfd8867575ec474486f8d3fb773c210828a7d5148ac871ed8288fac1fe9c58d3bb SHA512 547be0bc8e379027e069fb3a93bd00cc4647bfa33ca009558652a6480b31c83519cb9f8577997977124dfa37cd4ceb17ac634ddc5b776e0d85f4d59995f9ba18
-MISC metadata.xml 534 BLAKE2B e8866ac769b65ccc61dfe79fe5883bee78ea4066187b7136b899a1a16fa74952f88fd2b81376033d36418dc670d5669d9b65fc3195720ad95adf30bfe49729b1 SHA512 e94dd85f11b4f8b838e928220cb887eeb70860e6d04f03e904ddd4332baddd3b01221305e7229fb575585235436d0d942c116f821ef37adae636a7d5c6193199
+EBUILD mcollective-2.12.5.ebuild 1646 BLAKE2B f259fc2825f41f82822004b1713dfb2decd05bdec62af33e41b8436a073f166d99f9f1c1473e739e0c74c347b5201c2f098f69a459ae6dd4dc5946ab8ea40f87 SHA512 6ac57249025751d9d3c41f06167851e9fc9b30d187c0b81e7aa0fff8960ba668e122a8d7da946171f11728b4822d42609f8bb1124a94aca45905d60719d1df11
+MISC metadata.xml 391 BLAKE2B a3e9320adadd981aa63a50ffcdaa99b9fbb0c09e2ed68abf1581a1cecb795be7d52343f3df9284c35a605ce47c242890c299883d1b51b15f8302a8350f42c0c3 SHA512 b467ccdc3ffb7ede9a597662e19f177fd0fe041727245b926660d26ad824bf1fc5533f140fa8b28651bf3be908849816bf98e0ad813a991f216b239ef175a071
diff --git a/app-admin/mcollective/mcollective-2.12.5.ebuild b/app-admin/mcollective/mcollective-2.12.5.ebuild
index 689393b26c69..81b95b3248b5 100644
--- a/app-admin/mcollective/mcollective-2.12.5.ebuild
+++ b/app-admin/mcollective/mcollective-2.12.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 inherit ruby-ng
 
diff --git a/app-admin/mcollective/metadata.xml b/app-admin/mcollective/metadata.xml
index bbf72aa5c8c7..a29cba1bed4f 100644
--- a/app-admin/mcollective/metadata.xml
+++ b/app-admin/mcollective/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -7,10 +7,6 @@
 	<use>
 		<flag name="client">Install client utilities</flag>
 	</use>
-	<longdescription lang="en">
-	mcollective is a framework to build server orchestration or parallel job
-	execution systems.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">puppetlabs/marionette-collective</remote-id>
 	</upstream>
diff --git a/app-admin/mktwpol/Manifest b/app-admin/mktwpol/Manifest
index 87a6412a1109..0cd4cf91b14d 100644
--- a/app-admin/mktwpol/Manifest
+++ b/app-admin/mktwpol/Manifest
@@ -1,5 +1,3 @@
-DIST mktwpol-1.0.0.tar.gz 59748 BLAKE2B 954d86774bf5e88612dc67f0ee29b637da188f64a8203b8aa84511e940db059afce0e993f4a703429688e29e964e5efc53a21b32f1ead3cee70bb7f056fc62a4 SHA512 f7a04bb3acdada6407e3e422e26ba2c0c454f10011a2848d0c8e962996e135a381c893f7fcdea67e1a3a23f503eb2071448beca05b7ca90e179d2a28173a973e
 DIST mktwpol-1.0.1.tar.gz 60491 BLAKE2B 66d7db396bbf7e5b2c4dd537ac9bcd387298ae733348b63c6d5cb6df79e9440ea751c27eccec66978371fa81a17929d25fcfbeca6787abf8b49f087b54a6468d SHA512 aa44af97533f130b89b83c6f2a8878d290770b677f6fb9fe654b033f57fcfb3d063a6a6ddf29599aa066452d75911cf8053d65b21c37e322851a10f4381cb33d
-EBUILD mktwpol-1.0.0.ebuild 1317 BLAKE2B 5947d97ae3fd59e6d000d29106836eb287b8d259e91333eeec7ed758dd5489506fbb4e3dfb1eb3271d9d4f1677ea805f75bff71a7a84cd244ed9b054ec2be53e SHA512 2510cb3d0f76ced5bba386823c268620203701d5dd0f7eb34646bf571a3a90d7b0c2582920c44203c0ae00260072680fb988584be31784e99f67796279d45030
-EBUILD mktwpol-1.0.1.ebuild 2236 BLAKE2B d06071f13539fd67acbe6cc58beeb994bc00626b35370b1b3521509a29170bb9cf321a77c9aae21cf64a77696811545a43c429619cddd995965b9e2c0e2c827f SHA512 167b9abd1f4f0a37487b6a3539ca350b28541b0993978144c15826e96e9e5c4bdd4d09dc669d57fbf412d3d8ee4fc899335dc1f7c171bc027e81bb6438c38f90
+EBUILD mktwpol-1.0.1.ebuild 2234 BLAKE2B 3001ec982eae364a451a4302315ab7a3d774edcfce9d2db38c78f472a5ebe48fd90a1ddcde4660bb8032d80f4176ea3ea80684cab278c54498209974062b0111 SHA512 293252ea909b2e62c0e72bab04493313a08c8de7a6348616752a2cdf9ed3170a60663c46981e7cca0e74de368dc320c1e62e6b85caf2366ba02ab6b85333cf52
 MISC metadata.xml 1736 BLAKE2B 20ff68ca7302bd5a8918c5b8befa447e8bb9cf908d2ad0a01fbf9ed0bb7f0823c0571d945906dbba7750fe650abcf0c93f516f81a0532f8b3bb25976dd5eccf4 SHA512 80690242944a3eb26ee4a5766b310c4ece95d24e6fd07d66c4cacba17ff8d6ce507d52e09a470c734acbc4757f9e41064440b302d5d65c1d39241ee293b1bcba
diff --git a/app-admin/mktwpol/mktwpol-1.0.0.ebuild b/app-admin/mktwpol/mktwpol-1.0.0.ebuild
deleted file mode 100644
index 9ae1172956d7..000000000000
--- a/app-admin/mktwpol/mktwpol-1.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Bash scripts to install tripwire and generate tripwire policy files"
-HOMEPAGE="https://sourceforge.net/projects/mktwpol"
-SRC_URI="mirror://sourceforge/mktwpol/${P}.tar.gz"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="app-admin/tripwire"
-
-src_prepare() {
-	default
-	sed -i -e 's|/usr/local|/usr|' Makefile || die
-}
-
-pkg_postinst() {
-	elog
-	elog "Installation and setup of tripwire ..."
-	elog " - Run: \`twsetup.sh\`"
-	elog
-	elog "Maintenance of tripwire as packages are added and/or deleted ..."
-	elog " - Run: \`mktwpol.sh -u\` to update tripwire policy and database"
-	elog
-	elog "Mktwpol is packaged with multiple policy-rules-generating files."
-	elog "The default \"rules file\" is installed in /etc/tripwire"
-	elog "Alternatives are installed in /usr/share/doc/${P}"
-	elog "To use an alternative \"rules file\" ..."
-	elog "copy it to /etc/tripwire, uncompress it, and \`touch\` it ..."
-	elog
-	elog "\`cp /usr/share/doc/${P}/mktwpol*.rules.bz2 /etc/tripwire\`"
-	elog "\`bunzip2 /etc/tripwire/mktwpol*.rules.bz2\`"
-	elog
-	elog "mktwpol.sh uses the rules file with the most recent date."
-	elog "Use \`touch\` to choose between multiple rules files."
-	elog
-}
diff --git a/app-admin/mktwpol/mktwpol-1.0.1.ebuild b/app-admin/mktwpol/mktwpol-1.0.1.ebuild
index 34e368f43ca0..d9a3ada6c1fe 100644
--- a/app-admin/mktwpol/mktwpol-1.0.1.ebuild
+++ b/app-admin/mktwpol/mktwpol-1.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mktwpol/${PF}.tar.gz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="app-admin/tripwire"
diff --git a/app-admin/mms-agent/Manifest b/app-admin/mms-agent/Manifest
index 1d1adf853b91..fc2726135319 100644
--- a/app-admin/mms-agent/Manifest
+++ b/app-admin/mms-agent/Manifest
@@ -4,4 +4,4 @@ DIST mongodb-mms-monitoring-agent-3.7.0.212-1.linux_x86_64.tar.gz 2643320 BLAKE2
 DIST mongodb-mms-monitoring-agent-6.0.0.381-1.linux_x86_64.tar.gz 3618281 BLAKE2B 9c036707aacad3cdbaeb72817a010df5dd91c1c4160dd95dc026c77471c5a7eff7047a93c5b9097a7fc89db96c88eb2c1c83489fde7f132cb4d14ac446333634 SHA512 79366c8ec0aaa3209d7e54942a375185312c491ffc825d9bf70d1fca36b93ab819dccf12e8f1a54c8dbd24ff501a3e3547a5a453e80308d6d638e7c3cf866f9c
 EBUILD mms-agent-3.7.0.212_p1.ebuild 1509 BLAKE2B 6a6d1eee65df8bd608f31340f98f9ee0582c0b99d1615ab4ea65a08247dd4fd27789445fe046980cbecf8ae92460990672ee2761d71e59d869e0706afde808f0 SHA512 fdd4170c672a2432505db2bded015a6ea7941bd72e30eca689bc8135c07c0e9d90876b9768b969b18dd985660e30d6602769f1919adf00c7a381bed4b5a67c36
 EBUILD mms-agent-6.0.0.381_p1.ebuild 1284 BLAKE2B bc793eb7fc238c1f4ba2af5ce0a36aa51dd516025e8d8d5311886c5f5d35299d2a1baaab6262dd303770e38561c46444c2797fc847455722a7007b1c295b5892 SHA512 1f589480aa646f3a148b49cb504fc66f711e78f45c5359a84461bfb079cf5ee22c0caa5ac3555805da6d60f1c95075910f74e6705c004bac311d3f207999b194
-MISC metadata.xml 405 BLAKE2B ede71b3fd6b42c475b1f03b3fee1a715ef25c016645231b863fc3c6bdb7cb9b6a0c9d0ccedcd940198666ac6124f5037e918df2c9a315a588015b7ccd68b74b6 SHA512 1f2c0cf7a01e344fb2cf327b9a6619ca6e9d67e6a6e7e1a191b86a788f11826e72e0f2b96333e1270c91e2692d0733ad0fb64671d8d778b236f9c1b00d7a55b2
+MISC metadata.xml 324 BLAKE2B a21bc3ec8e1cc555e69830ad4bb4a55e4b4d95c2aa54695d55e273e47c5d05c7c4efc675f898a95e68879eba83d96cd14134451fddb3b2eb5cf7e050d622be02 SHA512 e56846df6c433b08f500dae14a2533c90ca923c2dcce77f2cd80f3db6382082ce0e16efb5baee09ebe5f4d0a98b3a8ce88b45a400506159db5386adc8fd60d3f
diff --git a/app-admin/mms-agent/metadata.xml b/app-admin/mms-agent/metadata.xml
index 153f98e5eac6..3b22e1a252d2 100644
--- a/app-admin/mms-agent/metadata.xml
+++ b/app-admin/mms-agent/metadata.xml
@@ -5,9 +5,6 @@
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
 	</maintainer>
-	<longdescription lang="en">
-	MongoDB MMS agents collection.
-	</longdescription>
 	<use>
 		<flag name="monitoring">Install the monitoring agent</flag>
 	</use>
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 8606e7686cf4..29a6bddc3a22 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -14,4 +14,4 @@ EBUILD mongo-tools-4.0.19.ebuild 1613 BLAKE2B 536182baa4da100c1d3a4ddd7d8818abe7
 EBUILD mongo-tools-4.2.3.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
 EBUILD mongo-tools-4.2.6.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
 EBUILD mongo-tools-4.2.8.ebuild 1620 BLAKE2B 7719384b81a600d5ab3f6ef118fdfcba34a46632ec5a9847ce064726be364b59228cd71dfe518d49558d2318119ee8aefe9e1643142ac1708981c644a4c50cdd SHA512 63378bba1aa26dd93b5d76ecf2c1ed4a93b8c67f0912a0461cea007ad375ee91639e3ccc582ecc4233b931f2c62e019a0fdd924d960e20f643568ec87c5c9c98
-MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
+MISC metadata.xml 331 BLAKE2B 62e95d5bc17f92830615f6a251ac64e2824c9fb7bf5025f0d3898fa2d0cfd0a033fef7e04d6536b4122241462674148ee0516f0ac54ee30587f375404ff86c6e SHA512 00442ab0d006a7e4fb525dcd9df46d45eafa25f85afe5964bc98efd0996898a1b27334d939ea2d5cc843b5249632613585e0a40d9fa0f227334040c8c3d7b741
diff --git a/app-admin/mongo-tools/metadata.xml b/app-admin/mongo-tools/metadata.xml
index 7a01cd8f7c90..d8e110f3195c 100644
--- a/app-admin/mongo-tools/metadata.xml
+++ b/app-admin/mongo-tools/metadata.xml
@@ -5,9 +5,6 @@
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
 	</maintainer>
-	<longdescription lang="en">
-	MongoDB operation tools such as mongodump, mongoexport, mongorestore, bsondump...
-	</longdescription>
 	<upstream>
 		<remote-id type="github">mongodb/mongo-tools</remote-id>
 	</upstream>
diff --git a/app-admin/needrestart/Manifest b/app-admin/needrestart/Manifest
index 7a1718518ce3..f711a222ac47 100644
--- a/app-admin/needrestart/Manifest
+++ b/app-admin/needrestart/Manifest
@@ -3,4 +3,4 @@ DIST needrestart-3.5.tar.gz 67824 BLAKE2B 73af940efa578b145d89cb0724f7103edd0fe8
 EBUILD needrestart-3.3.ebuild 859 BLAKE2B cf0291a65f58175de23b840320e586d485be4978de574db6c48ad0046ea9a661cad515ffb154f9e4f25dc8ae55d6172edc1796f4d5d2d9724c8f395cec8a8a7a SHA512 9b18c5ea2c2afddb37efc238a0ac14ffc461d2fd3b1d57f8547f407ed39712404483f5bbcba159a890333d545777d2b9b85ca61a910683f578c86c5e9b04724f
 EBUILD needrestart-3.5.ebuild 874 BLAKE2B 9a4441711eaf20dc2ec30596e9d898cb9c91f30ce91aa236e09948ccf45474fe878b720771819dba22516b1c623705ce798ccbd3523f75547a971cca1d3d44df SHA512 97587e9942c153939ae20922d73454cd1e16dcd5a763f6a93c4bda87dbf644e0ac813fae574a4ee13b32d4865132e6b6ff3e9d66eacd5c728bef7c8f26c32aab
 EBUILD needrestart-9999.ebuild 874 BLAKE2B 9a4441711eaf20dc2ec30596e9d898cb9c91f30ce91aa236e09948ccf45474fe878b720771819dba22516b1c623705ce798ccbd3523f75547a971cca1d3d44df SHA512 97587e9942c153939ae20922d73454cd1e16dcd5a763f6a93c4bda87dbf644e0ac813fae574a4ee13b32d4865132e6b6ff3e9d66eacd5c728bef7c8f26c32aab
-MISC metadata.xml 461 BLAKE2B 28793d229fbcb27f6ad2bf256bfae268236133d14302a72693b90e319af2bc2dc4c1928546b9f3c5e5fc657fa4013fb28acedb1762b84bed60850e5ba0852c23 SHA512 6b8877f41545dafdb30cc0ed3664e568901cc13c68c5221817631be63d454ef30d1b2e923f3a8fd9b0d77be825e1f183601e7a7d474a1d196b2a8eef099095b4
+MISC metadata.xml 360 BLAKE2B a0996c4eb2c7dbb05be6ee95e1c0df6ef594d249e332e53cf0c2fbb25513a21da54987ba21171390996a70e2d7d8141913e74f6c410be81c494e0850e895edfe SHA512 110d7d21ababbfcbed16f1ec1cff3c07edcc6dbb05d7806b347401838b0d53d930ddf3a07781c272174f8866bf72a62c187a06d36f06345eca57f040b4fc924b
diff --git a/app-admin/needrestart/metadata.xml b/app-admin/needrestart/metadata.xml
index c7f0a8e203d9..5aff9fc2d168 100644
--- a/app-admin/needrestart/metadata.xml
+++ b/app-admin/needrestart/metadata.xml
@@ -5,9 +5,6 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
-    <longdescription lang="en">
-        Restart daemons after library updates
-    </longdescription>
     <upstream>
         <remote-id type="github">liske/needrestart</remote-id>
     </upstream>
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index e8ce03d57963..bb19d583751c 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -2,4 +2,4 @@ AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb794
 DIST password-store-1.7.3.tar.xz 63416 BLAKE2B 5931608e0208dfe6965b79f586c153a4930d1c3d3b74433d026ee0bc5889fcc29334c637ca4fb68308d0169bad7c8235b6632e9f80eda1e24f0f5721353f88e3 SHA512 89755a7b02f05d75055a9fc14fd3f456c0a49ec31bdffd097a027f91228c64a98b18c1e80017aeda811773ae3287ff1b9737532da8ded06799d8fe3979ca06f7
 EBUILD pass-1.7.3.ebuild 2200 BLAKE2B 6b45b32c973aac94606a6df46a7e36601c80c35cf83c760772c8c12f987e7dccdddb80d47297cd7cc6592427f506650d76508f8fed3316a15b8bdf3c592d0c58 SHA512 8983cc90db7a0db00fa63b090e5ccaf43ecc1f20a0ee3256f94ec7a0cda501c1495148d2f333c2f68578780c5f18af4dc5beb0284e358a15ab7c4a9f625e8a8f
 EBUILD pass-9999.ebuild 1970 BLAKE2B f2b42a0e2373581160439a6d1e89af0b873aa4140035d6f918572fafc1b9b8b8d7b31722edc61a8e771bf6912f73f5d8f358bc660c15bbdb12d23d4569d5c4dd SHA512 532a628a7d0192763af3237106e737af3a2d26fe3db2f68134569df2450cef59f1f789301020fb0930ff6c0e2e10fca8161f2b29bb288ad2af0f5f18e7ca3a96
-MISC metadata.xml 881 BLAKE2B 59fee6aeadb16d050eeaedc6d5081963e3ffa8316ddd00afb67661d721fa60b80483c16348e0c3d6c20fdb6513fd5840552c3a95724b619e07122d8755c4e7c1 SHA512 49df1e24751818d46a0c23fcdc9e41d965dca29f9964f7d142e4dba9b076b472c860d9b3eafc15b04a983f49d2cd78eb6b529742469549209c7e4160a15f1323
+MISC metadata.xml 747 BLAKE2B 0fa61ff5f87f66214e11c38fe1dd0dc746b8151bc201c72d972ddbd0f8e32dc89701798746df8e2c912eb0d4ccf43fc91d857dfc5395d184f4da24d5128f7b13 SHA512 5fb903b4d06cd49dea554f2a94bbd79e544840e4cce4e876b12eeaceb45aa6321a3fe50f1d531fdeb9cbd34dab66b2bf3ac0be52b07edaf62acf69a892c96200
diff --git a/app-admin/pass/metadata.xml b/app-admin/pass/metadata.xml
index 97bcbb1882f7..3e292a92eba7 100644
--- a/app-admin/pass/metadata.xml
+++ b/app-admin/pass/metadata.xml
@@ -5,9 +5,6 @@
 		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
-	<longdescription>
-		Stores, retrieves, generates, and synchronizes passwords securely using gpg, pwgen, and git.
-	</longdescription>
 	<use>
 		<flag name="X">
 			Use <pkg>x11-misc/xclip</pkg> to copy passwords to the clipboard.
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index e0516253cda1..af28f4de4eb8 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -2,5 +2,5 @@ AUX passwordsafe-1.06_beta-system-gtest.patch 2962 BLAKE2B 1ef77391d355364e55da5
 DIST passwordsafe-1.08_beta.tar.gz 14409047 BLAKE2B 029568b435d4cc19f3a95364355546afb99c13bbee0e83c248d57f47e472da714b95be00658ec2bba161b8eab6f0d94bf2856a2198d29673987e5c0cddf69aaf SHA512 7c37a91c71c1a79ea2cac87ec310d08df7491affd02c073d674bbedbabf25c1a1fb807376dae378dc4395b2146f6eaae059a0b14e0d1ba369cfa91a2d29060a4
 DIST passwordsafe-1.11.0.tar.gz 14538095 BLAKE2B c37e965968b7e2e694dfa9a9a9193dc9bb10f5b67446ce5db070be864c211f4af06e9c412fa1489f15151741fd1a1ec01d07d3dca4633effa284541e5d081268 SHA512 b6ac36911e24a89f51c8f2efaa381af516e826137a5b131a0258c00d9ff3be07b818ca23b3d49e8dee9913aa8fc73faedf2a70494c72c3b22cc518a9c215e5c5
 EBUILD passwordsafe-1.08_beta.ebuild 2280 BLAKE2B 8868affd34cee8695bc69ca3a2fe29d4b84ba1da30ac03bf38acc0985a4ddc0d387a774150a6808ec814bbb49d96d988afcd0e42c989245484262b3edd7ed13e SHA512 f6db9cd2bbb29b1430f6600e7640e2ee4846fd107b8c28a607901c2d6a8031d1fee9e3adeb5ee973d1fafecf273904c3355e1a66c32019ec5e93675589993d4c
-EBUILD passwordsafe-1.11.0.ebuild 1950 BLAKE2B 97ab00bd8bc8a8309a947cedb730627d4a66efef322558af01e5e1244c44059f9e77dc7809c994f474ce32f94d5a4008ad6bb4cfad2bcc4630bda05c71ad9736 SHA512 694d5e09e7c260fbaba512744fb49d6dd137eb8108f90d81ac33a61f47398b69175468b29b63417b46b5ef6f14312321c7303e99709510ac35c3d50f42f67480
+EBUILD passwordsafe-1.11.0.ebuild 1954 BLAKE2B 7963630f9fdbe48dab3011995c9ee7a2f7bc6dc1f6e04bfc7be42906bf2b7a3a154f7ba1823a87627dbae0cc2b5bb9a634d27f0e0e2e116c3e75e8481d844293 SHA512 5d1b41d11705aa67d10e2073989fea4917ae2dd525360b3a486f687e846de7d6480e6bd665ed014b2e6a2c31f0e81fba23eabb6732d9df502de02356fe3394e8
 MISC metadata.xml 842 BLAKE2B 719428e2e9a43317cbf00f6a0433719fce586a53b03374d011fe11e1a09664593d6a93f86ed7c77b6025496a5c7ae72304b910a4f0a15efb6c378418b2c6408a SHA512 da19977d8e8791ea0f274e17069201e6f2f2c7661e9c313906d674e9e44d964de36a30edb506c8c308a01b8094c6f455253ac449e3fdb3be7f75357c78234c66
diff --git a/app-admin/passwordsafe/passwordsafe-1.11.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.11.0.ebuild
index 3bf03766ff31..a8f86f8a1e5c 100644
--- a/app-admin/passwordsafe/passwordsafe-1.11.0.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.11.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit cmake desktop eutils flag-o-matic wxwidgets
+inherit cmake desktop flag-o-matic optfeature wxwidgets
 
 MY_PV="${PV/_beta/BETA}"
 DESCRIPTION="Password manager with wxGTK based frontend"
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index d47d37719af5..33b606d2c9af 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -3,14 +3,9 @@ AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_6.15.0-1stretch_amd64.deb 22581842 BLAKE2B 19c45427e56a41f6030836129a7fb2824ea47f1000745a8c74b0968c61f719d3cef9a0e02f51009b8e91c4ad66445c074ccc203754bb13d82007316a3d053c60 SHA512 4ec7e04fb6bab697bfccd369740a57f735476a4614dbfa1f7c893901f5ffb9d6ce3d79886b6e035805b1a8f2c3de3e0b9b468b08909881df6022c9700c7a2768
 DIST puppet-agent_6.15.0-1stretch_i386.deb 22917002 BLAKE2B 5bab2b6cdde11a46e64996074e8db50d48d004b601c0d08ddfde9c8dec0c0f62da1176b9148d084f0250b582460606b7cd0a97291d157a186b7a97dee4184c51 SHA512 89e676491f7b7b44c9c747b129166db7b025adf76d9911d12d7d026aa8d04de293d3d1c638ca309ee8ed45a37c49b4ab0076ea0c711ac0e43f4297084446784f
-DIST puppet-agent_6.16.0-1focal_amd64.deb 22255252 BLAKE2B 64690ea444c666476864ff8d2373a266bd91f91ef996c87f04cfdd3401093795610e0e09a4f0588bbec8b83d64848c92a95572ea570fc7985d93c5e161256e00 SHA512 47ebcac58d9b54b62fa9a854ec4eb4fcc83d2fdef199658532b7b87cf461a8ac611f776db3fbb2e1c11e607896b85a67d7a32a4e9844e1b9b07904e0860c39b8
-DIST puppet-agent_6.16.0-1stretch_amd64.deb 22336186 BLAKE2B 2bb62f25bf243e03288a5ee769c37c53c5f1c8f63a5e1a9d231b522409a68f3b3d957adbde0a99f616cdb60ced58cc6de990ff96f2b99d17be4aacd786c460a4 SHA512 dd5536e5fe9caad2dd7da8cfb6e2e2e93138b76f5a1014999f221c2bfcac94f0faecc3035ce09fc170dbb61226325ec82aafd80f1016e1d1ccacad9f1ae1b176
-DIST puppet-agent_6.16.0-1stretch_i386.deb 22579590 BLAKE2B e923847d2d381d6a1a9c1761259c72c4c92e34d4aad5643eeadbef38d48a09a95d15fd359ded3501257057dbb892bc4dc5ae60abdc01d646cd194d1b40defd6d SHA512 4015da5a4df08e03ab3bf988fd2afb67c37fa7c820f73793ebc3270364928a6f89a5ebcadfeab1f07d4e88a98ee95c2069e47fde4391d2dea98855a9743b6adb
 DIST puppet-agent_6.17.0-1focal_amd64.deb 22317432 BLAKE2B 570ef37c8e170ab1d615782322c895b0eba3193ac51dd221a8f9597c34c923c36874a5add1cf1074160c86dd4c4acc3ff1b65709cee2c0cddd84abe57c300faf SHA512 541010d896c891040154b22eed3f2e39b026cfef5669c95016ba1aa5b919002fcf2b8d2a15cde8efd104fc2e0699a8cb5cc3914bc039a27280f97f7f67d7b153
 DIST puppet-agent_6.18.0-1focal_amd64.deb 22258752 BLAKE2B 547d06b16b2c95ec9be72bd82e1aa0a4a4b511075da73f29ebecdef32ca4ed9b965a38a7c071d9bcc8c444b6974159df97f020878c0e4a20d1f50ff23d4c1129 SHA512 00f0cfd96176f5311f0bab14016ab88da03ecc10fd9e2bf28fc2d9a399600c56a97e23095694be5382005fef0df1c4fe3ff0d1aec3a46d85f74c729a3c62476a
 EBUILD puppet-agent-6.15.0.ebuild 2016 BLAKE2B 4f4382314410a9401868382b65e5ce627e9c706120dc21a537b71b390bd56480988b36e51f000303542d8711f2aebd47860605e8f52087c895e9453d2992a84a SHA512 45a7eaf2fbd6c66b672943192a92826ee10da6f0ba3a4d8cdc6c9ad2103d2fa534587dc31f5505bc8c9a23474e604ac58af0b328723668cd772a1e75fe6d0d5f
-EBUILD puppet-agent-6.16.0-r1.ebuild 2018 BLAKE2B 74f72ffb55bb069bca1a2ea3db686ae1d5236e8c180b3b14afd18f451c7718e51ff09413380abb0bc79497ccde9aa011d7de55a9f7f92ce213d9b8361dde3d50 SHA512 f4aa0379772aa69bc9bb75fd085000e1ea64a889919b025372244f8a72df2da2f5bd27d51844d34985a8f397e9d6b8159ac46da647f62ae7f9e1cb2ec25d7000
-EBUILD puppet-agent-6.16.0-r2.ebuild 2068 BLAKE2B fa894f7b4b85afe9cb403d17617ae13ef9bdd566c6ff5e70edfeec2fd3733c3f5b93c2cc08f4f7b35112d2f8d3af0f3ce8e99abf865f345b3e3bea46ac788de1 SHA512 55eaa06a91b994cd4422f0a7c3f67cd25317729a96110e28a291bf2965855f1cd53aa731fc920ad424d27a80ad210aac2f9e6046c44116b363729193791032f8
 EBUILD puppet-agent-6.17.0.ebuild 2067 BLAKE2B fbaa5ddfc2c3085a877a0adb546a8ced6242fcfeffa180cee4588dd6ac0f35ef15b58869f1b22dbc4d92b2344780ad64ae9ef41fa6a46f71bc50fd2f89031ea5 SHA512 154315c97b9ec493d6923e066df73d58a33e6f0c7bc33162d8fcb5b5eb86df3ebd7af93d9cc8a0463d6d19f7650209610fe391a5b530b7b57e147738cc567d9e
 EBUILD puppet-agent-6.18.0.ebuild 2068 BLAKE2B fa894f7b4b85afe9cb403d17617ae13ef9bdd566c6ff5e70edfeec2fd3733c3f5b93c2cc08f4f7b35112d2f8d3af0f3ce8e99abf865f345b3e3bea46ac788de1 SHA512 55eaa06a91b994cd4422f0a7c3f67cd25317729a96110e28a291bf2965855f1cd53aa731fc920ad424d27a80ad210aac2f9e6046c44116b363729193791032f8
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-6.16.0-r1.ebuild b/app-admin/puppet-agent/puppet-agent-6.16.0-r1.ebuild
deleted file mode 100644
index 6ef508024129..000000000000
--- a/app-admin/puppet-agent/puppet-agent-6.16.0-r1.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
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what
-	acct-user/puppet
-	acct-group/puppet"
-
-DEPEND="
-	${CDEPEND}
-	app-admin/augeas"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/libselinux
-	sys-libs/glibc
-	sys-libs/readline:0/7
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-}
diff --git a/app-admin/puppet-agent/puppet-agent-6.16.0-r2.ebuild b/app-admin/puppet-agent/puppet-agent-6.16.0-r2.ebuild
deleted file mode 100644
index d2a6b4ff967b..000000000000
--- a/app-admin/puppet-agent/puppet-agent-6.16.0-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what
-	acct-user/puppet
-	acct-group/puppet"
-
-DEPEND="
-	${CDEPEND}
-	app-admin/augeas"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/libselinux
-	sys-libs/glibc
-	sys-libs/readline:0/8
-	sys-libs/libxcrypt
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
-}
diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index 1ed90cd481c2..04b254834cdd 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -1,3 +1,3 @@
 DIST puppet-lint-2.4.2.gem 93184 BLAKE2B 5170bd9c30f6e2f5b30120b6edc74550e697c3243d2f5c7249f27a2d61ca2f5612d96efdc0f6be8d065e7d7a4460b9cf6e6dad13a5b24c4ce100d4e6df2f0425 SHA512 ee846688b13536b7d146ea50c0efe5083babf1ca09b77182437ec93be754ae076d54ac34f8082867a26b6df12a09bcd316e5b1aaa9c98150f9411a0c8b007c71
 EBUILD puppet-lint-2.4.2.ebuild 592 BLAKE2B 3aad54bd161caede6d54df6bf3012f7beebcfe554c9aec36937a9e1520a4d0605606abd4c77c63ae1ef87238cfe097ae7631eb68c83d3a28035d1d64fc78e684 SHA512 c19c14051ea09416031f44e15dd238c6e6bb099daad8b88a30cbd3e7f61ab55b617657e4127c06fa3c15bf823f0bed9b1830296d6d91bcf616d051e374e838ac
-MISC metadata.xml 453 BLAKE2B 4fb00983f98c8c178fa1dc667f966b0f1fd54861ef71e37211fb46edceb8f91c15d55add637a50eda53ccaff8a1d3a6dcbdd02afe2ae32cf0f69797427897d6a SHA512 bd9238c56ddcdcb124df5d7530343756b865d2f279b719fb0ce7bf4e37565709194cb7f564811be6376fd4d3b61403d76eb9542aac3a267c2eb08f1bade21524
+MISC metadata.xml 363 BLAKE2B de2b732638a0b8b0430ac0aaf25635fdbf86493507d787280c14b8c0da5713d31490d7ff89f4cf1347b7952021336d97f355a45f11653ac027722e977ced20d9 SHA512 cf7d45285491a9c11a9bff7354c6bd726eb0e359114a447321642056d199f117921b3bd15d9a427c5b7af2371c0e10ecffa634cf824df2b59997aca9ce6ff3e6
diff --git a/app-admin/puppet-lint/metadata.xml b/app-admin/puppet-lint/metadata.xml
index 78dad76cdc2f..f1f6747112d6 100644
--- a/app-admin/puppet-lint/metadata.xml
+++ b/app-admin/puppet-lint/metadata.xml
@@ -9,5 +9,4 @@
 	<email>ruby@gentoo.org</email>
 	<name>Gentoo Ruby Project</name>
 </maintainer>
-<longdescription>Tim Sharpe's Puppet Linter. Enforces puppetlabs style.</longdescription>
 </pkgmetadata>
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index d33d59782998..5e28f97a52b5 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -5,15 +5,11 @@ AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd SHA512 996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3
-DIST puppet-5.5.20.tar.gz 2995117 BLAKE2B f147be28967da748bf8d5f7250eae9045caafaa3925f850cc0a77acc19a6a47ed92d4ec81278334608839f6f8c83cab19324f2753bc05d3a042a3bfaccb72a46 SHA512 83b8f234697e13d6fd8ac16634fff4e4adfece70858c32c1001925c71cc4d9a482da1880c27c08e796facb46d5d17889f9521121a69cb49e160e3c031ad564c4
 DIST puppet-5.5.21.tar.gz 2997149 BLAKE2B b42fd79132ce0aab02724c7aa38fc39a216df38266b9ee8078b433860b675f36b3c4da0d13d8fb456069250e6cb6470686c83581bc6b57801a44375f829be195 SHA512 b33191c104cb58fc842d065c3cf7dec8ce723ddc9b273c930f56692e252eb6c51bc3b0442db6500cf015fe24ec3eb133428aa09d845ca92b05de2da39bce8bfd
-DIST puppet-6.15.0.tar.gz 2880562 BLAKE2B 082f6a6b0ee56cdb1cd98b8cade8b07b7970ae0a78a9cf7c80e9af945eb722ad156b28004ad565c51750a63fa5932e99b1dd39ac0d4008d3ed225868e7671a31 SHA512 ac7e17bd87ee924fd928d565389b424ff2ed45b9b08e1be4eff4dec3688545657e2dfede46adeb48faecf3875c640c99b07ed6e09906b3e66b4654bb984d9296
 DIST puppet-6.17.0.tar.gz 2901101 BLAKE2B 59e75d1b2a8d02285ab867d3b63b1656e29c418f4844b21100e135b306e16f82284690565e5354f515499ec7bc0e2ff688308e077cc4656076a38f49bb1bedf9 SHA512 2ebf31cce1dcc4ce0bf9403f56d3f97a41a4014111be1f27e340de8e4db157549bc4609068ee6396be3c88ff1a93b40792692a5b01140fa66a1f5a82453ba1d1
 DIST puppet-6.18.0.tar.gz 2911742 BLAKE2B 75ecb14a0cf96c1c54d09f88f91984805834288a166e74c5b9648d5f9ad60a6c279100f32f148659772a22fc01d21345bf765ed47518bfa9bd81d06c17587efd SHA512 a14994aea502fbc78219967e2d711952b580df1e7befeab2d254a73f28036c6c7923d167a20bc61c9abe76000f93dcd3cba92b3353540e2a26fc27b10b06efe1
 EBUILD puppet-5.5.19-r1.ebuild 3692 BLAKE2B 7aa03944368b7395b4c587230a39536db28d0a46352bd5c6f7ec457ca29a3e6d9a3672a9b74591d3382909dc4f9ecf6ec73853ad5722b26becafb5c1a1264912 SHA512 6012739c4d92cf576ea482f99e9d560633103116b40be7df8cc3a9e89f9efeef3e02317dbbed1207a91c5372ef7702d723c37207488ecd6ececad5d0df6de9a2
-EBUILD puppet-5.5.20.ebuild 3776 BLAKE2B 9d772a534ddff7356545c782b97eff3b656911d127789391e9c6a4e2370aad1825ebc5c62f05c6e35ad6a91e785a597ede7f67b7855adc707657b612aa27dd56 SHA512 455e955926a4dd543822c2ab13a59867d3649bdb4948c0fe184c24c4e36d2039bbb375bee254d1775a0b257265ba73b53ad1c293e982969689c8c22f0f53ad55
 EBUILD puppet-5.5.21.ebuild 3757 BLAKE2B 84bc423625d9ec703ef345fd0bbc44241e5abcd4c964290778a84a636e30a7b87153bb5c450a7b9e61f488279f28553969eb777deebb6ef22c923929b28f3b2c SHA512 cd1be53da064ad5641de2d4566f36f9733201c92ea68b3d36b416a8f786075d148a9a7f48eb1a67eca3567016f381bbc86c2a4dd6f4e3919befed2ae0bb75196
-EBUILD puppet-6.15.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
 EBUILD puppet-6.17.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
 EBUILD puppet-6.18.0.ebuild 3639 BLAKE2B 818e60019ca433e92b51946d2ad453c16a844820a5edbd91d3acd1a08b654dfdeb441dffd52ea4ef1418b1e4e0194df2391aae93a9d959b4f9dbb4121182bb2c SHA512 85bc153ff019d9db4cbb5eb334662b2c39e293abb646480122d141fe1f84b49fbc98b3f255e8877b421d1274c7fc3946dc6cf28a3ff8dfda437e7b7661243678
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-5.5.20.ebuild b/app-admin/puppet/puppet-5.5.20.ebuild
deleted file mode 100644
index 92e56e9b375a..000000000000
--- a/app-admin/puppet/puppet-5.5.20.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/hiera-3.2.1:0
-	>=dev-ruby/facter-3.0.0
-	>=dev-ruby/fast_gettext-1.1.2:0
-	>=dev-ruby/locale-2.1:0
-	>=dev-ruby/multi_json-1.10:0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# fix systemd path
-	eapply -p0 "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-6.15.0.ebuild b/app-admin/puppet/puppet-6.15.0.ebuild
deleted file mode 100644
index 11fd2d3c5085..000000000000
--- a/app-admin/puppet/puppet-6.15.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	dev-ruby/concurrent-ruby
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 0a299045c1a2..384693ac6705 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,9 +1,7 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-6.10.0.tar.gz 44394062 BLAKE2B fee0a908518bb89e9dda1d4e8683953d305c70fc0e70a856871b0916a4ef610942db1a8f24f59b7704dde3da67ffc2bb1b25cc9254f3efa3c24408bc3a336cb8 SHA512 12ca864a5a515baf4510bbfcab23b686b66cce460908c103c96fd51ad2898f2c5a42b9d0d0c707977267cc31a517b454893ad85982b31176e1ebfa79d7f948ee
 DIST puppetdb-6.11.2.tar.gz 44799680 BLAKE2B c40048d1fe6cf62371f2adb1a5361b34b1f46e6b344a7565ad9565f2ec4ae3cf1bd4927904c797be92c223dcc98e2302359af753228d09424372ea894cd5d5aa SHA512 af5d5f61147e8b67812af405b3b087897925869a62eb0749a5a59ae72e76bdcfe95879b0cb6d993ee85a00c44c6867e1864c0d22ceac7b854bca248ae1a00ccc
 DIST puppetdb-6.12.0.tar.gz 46375914 BLAKE2B 7d1a884881e9aa324b0d2a8cd49bf47e4014ff6bc23e94c76c27b3736c75f3cdcead76aea159de17ce1255381e32bb126f9cbf55297f64454fcca6ffd7f28b46 SHA512 040f8653c422e312857f82a8f040a33128f49c7900978a22b9ae672172ec41d2037e323de5aad3c50a630058b6b95c025bae05b3ea923e2321e94f97390998dc
-EBUILD puppetdb-6.10.0.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
 EBUILD puppetdb-6.11.2.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
 EBUILD puppetdb-6.12.0.ebuild 2649 BLAKE2B 61c2280603f62775d7e3c06142c0bad6d28795dfd396c45c73680e7d33b034e8f656994a21b304e438f89fc9d700e722bdbbc94dec544cda0f6abbe560c9d1e1 SHA512 1dbf062b0f95659020fcd4ec207aeb658a62e35e74f868d95c91ccabf1115b22536be505fb2de84427a6506c47ecd7cbb3ca0164f618e4d297b921a629065b6c
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.10.0.ebuild b/app-admin/puppetdb/puppetdb-6.10.0.ebuild
deleted file mode 100644
index 784885ac312f..000000000000
--- a/app-admin/puppetdb/puppetdb-6.10.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+="acct-user/puppetdb
-	acct-group/puppetdb"
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 281d73801406..b964471ce60a 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,9 +1,7 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
-DIST puppetserver-6.11.0.tar.gz 60230325 BLAKE2B e7f95c15755afe1a637558a505f3bf3392da620df44e93ed152ea622bfb35b594120f36bb1c357d49577c8fede83eee318ffe4535df78f50478e09961b62b89b SHA512 1d6fe14cb1dfaec1a8b43c54ebe9bfd9b581b9f2ad4d3f1976e4570679a72657b93060838fdaf55447dd3c7e5e3d38df30c0f20121791ac06d0a09545812b49b
 DIST puppetserver-6.12.1.tar.gz 60422470 BLAKE2B fd3fa33262a5ae83fb6889079a85c262d74d55b0ffb9ed297d60399c442d7a1676cfc54afd3e25721d6e4a4ad926c43a1f8f1a9db206ee6145280601c501fe09 SHA512 9ad5d3e266f91b8a1ef09302a1f8889f139909fb20268f714fb894dcff2379a01c78baafdab1102a26c26903cefe92ac833c2b20e9ea6f8d379af2dd11c20407
 DIST puppetserver-6.13.0.tar.gz 61890579 BLAKE2B be514b3c41dcc018715e949f1f1c86317499baa22fa70e5f7e8df89211b566651ab4de469afadf14fcd1dbc9b1d0b0c21452c313f74052eb8d65bbd591231194 SHA512 ab67ebf94c37a50999a5597e1ceeadf606296c2b6e557bd6ee2bb99ac44b7c8fe8df892f4e3bccb9f0e3822fc480f61a27d6799b7dfc8df12e058c7074d589f9
-EBUILD puppetserver-6.11.0.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
 EBUILD puppetserver-6.12.1.ebuild 5327 BLAKE2B e4b77aedde76606bdcf9f0ea87150e843edca733dfcc4d9e33d17fd20a26ff61dbd7c34bda8d9f810e843e9b20f97d522b1f8851aa172133eb983dfc307b1d12 SHA512 f9544374dd975698114e1d486b0d22b1325e1e149d9f4c58fc8febb1e0d60f2fe4cb5ab02f10f4cd3704fbdf102e0fde532ccae3376b29e97b776b7cfa4cd35d
 EBUILD puppetserver-6.13.0.ebuild 5329 BLAKE2B 5c95f3bb71eec4b03add549fb79d3217d8d27011039aa0cf4aa41e7e405713dbfe42134f1b4f28926d41acb2d8766c5b648c7ce508bd5141e6bbd409460c9aa8 SHA512 79e7cac0efab3c480be57f739c17bda61cc74d05cd8541de20be5d2ab64524c33ebf5793e9369d69fc65f55d6c46b8a6501163bd6e2ee4ffb78263094018e58a
 MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-6.11.0.ebuild b/app-admin/puppetserver/puppetserver-6.11.0.ebuild
deleted file mode 100644
index 5385eacc0c94..000000000000
--- a/app-admin/puppetserver/puppetserver-6.11.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
-	acct-group/puppet"
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	dodir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-	insopts -m 0644
-	insinto /usr/lib/tmpfiles.d
-	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest
index e7055b5bf6c0..0b894db182a5 100644
--- a/app-admin/pwman3/Manifest
+++ b/app-admin/pwman3/Manifest
@@ -1,5 +1,5 @@
 DIST pwman3-0.10.0.tar.gz 75726 BLAKE2B ba7331bd3d36ac23d9151a5ebd4a343e2d8c523ba8b324850139a9ba4af8404ddf23380b3eaef523251e8f4137c5c56b6ab509c3927690fc612962ff872ea820 SHA512 a6dc24b2e1405a91f35a9a9155dde5409e35ce733bacee8858930d82443c09b8017e2701bc8c45688483b6c40554e4d6266f6cd21dc6f205b13f96e7de4f57c2
 DIST pwman3-0.11.1.tar.gz 76992 BLAKE2B cd7289781436f0f8b941d587c61b2d8a5cad52f3d57d01106d73b3da5930de2bd2df15fe5a4bcfbdce5e5733b7328764d6e4e2d18cba8a575cadad8835218e75 SHA512 111713e23b64a7492b5e2735b0d0117a81759bd9f25a87327a2aa4a465fbbc8a0aa0fbfa86b84cbcd40eb1540d05cdbc6fb81982fe61953df91979e674ce5640
-EBUILD pwman3-0.10.0-r1.ebuild 885 BLAKE2B 655432295d431222968c3053b5431106ae3b561b7035b77c0af414bb2178ca02410197b65d96f112feb96902f7bd75ab821e2d41cb94f4a0968b6de5bddebe30 SHA512 5da4a911cc179eba8f02682ba401942e020b0e2744c352da2a1a60c84426cfde0a8631359c05dbc2914f68d6c453df142ecedbe281e1db1078ca109499758382
-EBUILD pwman3-0.11.1.ebuild 885 BLAKE2B 655432295d431222968c3053b5431106ae3b561b7035b77c0af414bb2178ca02410197b65d96f112feb96902f7bd75ab821e2d41cb94f4a0968b6de5bddebe30 SHA512 5da4a911cc179eba8f02682ba401942e020b0e2744c352da2a1a60c84426cfde0a8631359c05dbc2914f68d6c453df142ecedbe281e1db1078ca109499758382
+EBUILD pwman3-0.10.0-r1.ebuild 889 BLAKE2B 1d0a1d8aa1d6cca216dee466b1f5783aaff7df2e28a6b424eda4f4880ee9e6384da0a87e980576ed96d3855d33851f88534ed98da25dcfff01e8b0d9daaf1816 SHA512 f66d4de041d5a20ce163eb069d10529955f94ddbb417a69f46402df1eb0e924e66f3a1ce7ef067ef5c8ad18b2b15460a8b280e7f5d7487eecb1ce26585d4ac18
+EBUILD pwman3-0.11.1.ebuild 889 BLAKE2B 1d0a1d8aa1d6cca216dee466b1f5783aaff7df2e28a6b424eda4f4880ee9e6384da0a87e980576ed96d3855d33851f88534ed98da25dcfff01e8b0d9daaf1816 SHA512 f66d4de041d5a20ce163eb069d10529955f94ddbb417a69f46402df1eb0e924e66f3a1ce7ef067ef5c8ad18b2b15460a8b280e7f5d7487eecb1ce26585d4ac18
 MISC metadata.xml 913 BLAKE2B e7a041ce4293eb3bab14c466486960eb3d3268c77cadfc88612844fb0c5a599dd6fac5464a42f2e417cd0e56210020ce9002f35eaf5c2350c0a39158b01b8e84 SHA512 bb1aa91fc1f1e02865cc8de32cfadde8374dae91dd75f060289b0f2e5754ab20e9929f541467d5b369cdb4daf83b25235f1f613e89d1871413f619012701327f
diff --git a/app-admin/pwman3/pwman3-0.10.0-r1.ebuild b/app-admin/pwman3/pwman3-0.10.0-r1.ebuild
index d86b04e68b18..79ab956051b6 100644
--- a/app-admin/pwman3/pwman3-0.10.0-r1.ebuild
+++ b/app-admin/pwman3/pwman3-0.10.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A lightweight password-manager with multiple database backends"
 HOMEPAGE="https://pwman3.github.io/pwman3/"
diff --git a/app-admin/pwman3/pwman3-0.11.1.ebuild b/app-admin/pwman3/pwman3-0.11.1.ebuild
index d86b04e68b18..79ab956051b6 100644
--- a/app-admin/pwman3/pwman3-0.11.1.ebuild
+++ b/app-admin/pwman3/pwman3-0.11.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="A lightweight password-manager with multiple database backends"
 HOMEPAGE="https://pwman3.github.io/pwman3/"
diff --git a/app-admin/quickswitch/Manifest b/app-admin/quickswitch/Manifest
index e27736222e29..40702457473d 100644
--- a/app-admin/quickswitch/Manifest
+++ b/app-admin/quickswitch/Manifest
@@ -1,4 +1,4 @@
 AUX quickswitch-1.05-fix-paths.patch 1924 BLAKE2B b10ea8e626248963b8acfbbd0631f7cbde6cbd6c05d429c9a28ac163389809c1d211dd9f4bdf614d3f0ca5f50779152a7737a83cbb33eb7f51f96052ba4b4c1b SHA512 1df3e97dc223be657efa17637b7bfb541b3fb116856662d06c4be97bffadfc43e8b6242791b6918ff3b7cbc02ce5e01008efc2856269ff0ed1e40216bd33d13c
 DIST quickswitch-1.05.tar.gz 20218 BLAKE2B 9a17132e07c838dd0d39eb887502ee70fd35206d38d795e5f49307eafa756cbf78b7ffdb0c7de19197560adedff902f09bf52a4c7db9359185ecc37f42abb6c7 SHA512 dfb6b952e06d03834b22ad1abe415499bc3f231dcfee0b551ceadc4c020604b2574b70fff03ffb7099913d77e49c545ee44d51f9f7651c4fba113b0503c3bd26
 EBUILD quickswitch-1.05.ebuild 625 BLAKE2B 0020785d8eed17bdd2b72cc2dedda754d259198a4ffffc64aa82a0f4c938d948a758e8bfe623e83e06b89456b356b62171b487e99e6bc6f24e7097c88a06e30f SHA512 7c753d84fb9cf8aad2379a2a77d8de01b9ecdf1ecf69089cbe829b4be166fc5ee2599b3d50aaed1b43b104df0de939243de4c0b52b34bec11dac8e1093226574
-MISC metadata.xml 377 BLAKE2B c17495cc30293086a7a85a9a278ed134e4e7d47169e8ffb1e6d94dcd2f3f81372aa90e5e628ab322e1d3d9bb98af194445764399573231e604e3b51562d359f2 SHA512 05f90b3b4a18647e32f7c3f3029822fefb7aef4cbdbd2f6e74a8f2799e5a42f7f5546307c792aa4bf366536b4d7c1eeef6b4cc1a6b4d6f84d0ac16e5e77a8c88
+MISC metadata.xml 248 BLAKE2B 8e6cb9ca2c191e6e8fec6a8c3865d17911f7ed221eec0f6c6e1f2820d1419ef078dccb63d87af0f449bea469e22b46aff630bb62c3c5749b491c16afab9cd1ee SHA512 8b9ed31af35f3276591800fb60627b068d041eb53b297cced06f776d3dcb3fa271e8c377f41effcfb04b6f78dabbdb908ec7c116b0beea35fddba46d933647d7
diff --git a/app-admin/quickswitch/metadata.xml b/app-admin/quickswitch/metadata.xml
index 5438d3107a0d..b479c7b71de9 100644
--- a/app-admin/quickswitch/metadata.xml
+++ b/app-admin/quickswitch/metadata.xml
@@ -2,8 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription>A utility for linux laptop users to use multiple network
-	profiles, and switch effortlessly.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">quickswitch</remote-id>
 	</upstream>
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 4bc153a8708b..a050303fa349 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,3 +1,3 @@
 DIST r10k-3.4.1.gem 210944 BLAKE2B 7e4df4786a332264738f3483b9f2e14739cde2a9c1cf33788692ecf6f783b956856cefeb603f3d29338104bc9a89b0a6773e922189a412e01131cf7c77b58823 SHA512 b8d214cd6b6bc9ce00b9de22c706213be4c480cdf293b4fb47c0ff0e0dafcb3e16fe2b1ceb8d3abd22810630c4163919ded80ff697dff728b165821de61502f8
-EBUILD r10k-3.4.1.ebuild 910 BLAKE2B a4e6f91d3df7e02001425938d0f3953b443be9b7f5d06b87aa1b66787ef2ff3285f344c79a1b39f314080c8aa8e0f29df83142697ed6d401302fbddb1fb8484e SHA512 9c49942d7a150548460c2e1c91230f61c8cb2b78de89ba50ce0427db9084c764c8164315bbb07a905ccd6e9c4d975aa31d333bfd10cd0976da8ce2361afcc029
+EBUILD r10k-3.4.1.ebuild 914 BLAKE2B b2df4ff18feb0f68ab6be748a223b0a4e0380d5705bc0417b8a41ff460a8461594036d0a2a2930f26373eba200ebb185be3db66d71dfca323fe9abdf98f7f739 SHA512 39a8f6aba1f05d293ba913e5cbfc35a81d8b30175f5cc06f7c6ee7928ef00b007c2380bacc1fb35fa855b297499b48af3ace7ff1a4c00e2870be5625717f780b
 MISC metadata.xml 582 BLAKE2B e3b514385b7b851b3ce037de51024108005224c75fba470db28fe6e4d6b3632ace21a8e829198e0b22d1ba0e76b1a5c01df10426ea497ec3b00e20e578608d2d SHA512 fb8913a9f806ac0b2035dc788ee78536fff96ffb635454f668d7836d8ba849fea158e628da12743c1844b658961866b3d64e8faf700c7e373065045175785536
diff --git a/app-admin/r10k/r10k-3.4.1.ebuild b/app-admin/r10k/r10k-3.4.1.ebuild
index 240033b4fc8f..ab8b11160cc8 100644
--- a/app-admin/r10k/r10k-3.4.1.ebuild
+++ b/app-admin/r10k/r10k-3.4.1.ebuild
@@ -22,7 +22,7 @@ IUSE="+git"
 
 ruby_add_rdepend "
 	~dev-ruby/colored-1.2
-	~dev-ruby/cri-2.15.6
+	>=dev-ruby/cri-2.15.10:0
 	>=dev-ruby/gettext-setup-0.24:0
 	~dev-ruby/log4r-1.1.10
 	>=dev-ruby/multi_json-1.10:0
diff --git a/app-admin/reportmagic/Manifest b/app-admin/reportmagic/Manifest
index 09b46885b1c8..63af256da989 100644
--- a/app-admin/reportmagic/Manifest
+++ b/app-admin/reportmagic/Manifest
@@ -1,3 +1,3 @@
 DIST rmagic-2.21.tar.gz 451179 BLAKE2B b52d8dc7473d8679c0698a4d053a9740e72242b5e4de75b9ac44b9f38709c81f61da3b2dda814f5ed1e503192891fe33f070fc037e88fe7cc26c542fc67da02a SHA512 ed9f4e6f8d6160afbe138125c4cb65010a08b95390117ebf07ccde289ff42b78664b1fe677e23f46a221d153889f807c545329936829fceeae4690b00732a637
 EBUILD reportmagic-2.21.ebuild 918 BLAKE2B 0a6d0aa7bbefab15fdfaee46e525a51dd9745236a3487dd580b84b42afe8a22d08fdb83e26929793029dd09a76414a0051366652a4bafb3ea2d33f276304e38d SHA512 38dfcf32628ef422aaa461a57ce27f82e9674a183f2820b7dae1f5917e4e17c3f9e8dc560bf5dbe19b6e0f961a24172563cfa06d5c8eb1b40ba6899ca5e0e032
-MISC metadata.xml 275 BLAKE2B 3d57550415af007a55b63e9043ab4d6a6e77c51dbfd7e1e9368e18c0078e7a9f096ef3d5dbaf4d65ed3cf1bde0d32b184724ad06c93e654d07f9c4b83b1d04fd SHA512 8c3747aa12bd26e790ea267481292eb4ebfc2d27b7acb498547aae3d8479654ac9d13aecd61a49be21de831924ee3fb809d4da5a4c765127af10e13a9cb32fd2
+MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/app-admin/reportmagic/metadata.xml b/app-admin/reportmagic/metadata.xml
index 9f889449d4a0..585b0dc75dda 100644
--- a/app-admin/reportmagic/metadata.xml
+++ b/app-admin/reportmagic/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		A report generating applicaton from web site log files.
-	</longdescription>
 	</pkgmetadata>
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index 5ba3b79b09a8..e9cefe457bb4 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
-EBUILD restart-services-0.15.2.ebuild 1793 BLAKE2B 7cba407e822b45ea90c5cc88ad767d232d4195f5e4b8d217237833f36679081ab7bf367d96d406e02adad4722a23d8826ee958bf6af70248e5d8156fd9951b66 SHA512 d958bd1e77eb7b68d89a55e34716d0f4f4dd2b1af407a3449d8d859484770747bd05ad9668c5e1ecc32636d8e63c692480a9d4316b8f8e5d25caa3740d1ec109
+EBUILD restart-services-0.15.2.ebuild 1791 BLAKE2B dd068050b6902dae67edf63b00afc64e65b53225d14e7a201da6cee76dbed62af643625a7ed10a4021481f4e3a0a31f8534972ba6132cd468262af73947042c2 SHA512 74dc54132343203ab53b13d1649bd9e4b3a28d31040e5c54f32707b94267cb0d29873d48e3a3e00d70a7763a6f57d841518602c405599f575e359b5fa9f1e999
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/app-admin/restart-services/restart-services-0.15.2.ebuild b/app-admin/restart-services/restart-services-0.15.2.ebuild
index 874ac8f35520..7aa078cf4b21 100644
--- a/app-admin/restart-services/restart-services-0.15.2.ebuild
+++ b/app-admin/restart-services/restart-services-0.15.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index cad10a1ec96c..bd9fad330746 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -1,4 +1,6 @@
 DIST Rex-1.12.1.tar.gz 339065 BLAKE2B fd026e66a4e1cf6d4c8b15f7fcba0525a3e98346464170f27d5ef7bb54f1decd7450d87d9f23bee8378df4647eacf512c06a8d051bb76021cbcae472e2c2012d SHA512 774452511d97106bb6586324ff4e8642b05be628c80f3adbba7fd82558c82236878e969512bab398e26a1a7a271a7614108761bd0fb888a2122167806796bad1
+DIST Rex-1.12.2.tar.gz 343716 BLAKE2B bb546298305e2e210ea67a21c948f364d3c0ee5947c8d716606fc81cfd07c4b1eea9e6ce8fd3fd49a0cffd33a964e0d328f60d570fa18fa3452b334a7882b279 SHA512 867942eec63ba71b591b93d6c0af794605f86571ef6d1be473989314cb7fc7d4e8d906ef25e30ea56beeaefe953c884661d9b769452587a3d4892de10163b6c7
 EBUILD rex-1.12.1.ebuild 5372 BLAKE2B 2513d45fb2417fceeea5827fb68cfd69e3148105a488c3f0787179300855ff061e08d497772d55cbbdf1e0d5ad8ef4e1b79ed6feb7faf06b51972a5b9b3cfc8f SHA512 550ec06456643c3f784d29e5aedcb8d4a2903fcd6af76b48f5a1a34758dcb1f2a87284945a0b02eb06b8dbbd2ff2d9ca8043484dd4b7f6333cb27690b2885046
-EBUILD rex-9999.ebuild 5404 BLAKE2B f7e254698b468bae8a28cb3713d3c5cd521715fc62e70297e8a6c25731a65b9618a076997a927a7a1c34add30fe955c2b87362f8e342ca800ab76b9bd389d97b SHA512 de392bb91eb91f6087b95dce28bfd1db29fdb213c46ded63d277299e9b6cbeaa1bb08e1e4c4db047d28e9696e8d87e9d65454b182cf0b7a32d6f8232a052f07a
+EBUILD rex-1.12.2.ebuild 5560 BLAKE2B 42d1fcd35a8d980cd0e8c7353f106301dd844d28871a8558f9b785463822a26d53263211b5757385c483a4ffc9bbd8ea65bdd0b584501766f967cd3c4b46a09b SHA512 15516145dfab507ded82ad6e31392c5e61fba04857507ef6b4793948281ddf83e0ad5615d058960123bca7f01bab5d86514cffb99acac44f806077a5613c78c4
+EBUILD rex-9999.ebuild 5560 BLAKE2B 42d1fcd35a8d980cd0e8c7353f106301dd844d28871a8558f9b785463822a26d53263211b5757385c483a4ffc9bbd8ea65bdd0b584501766f967cd3c4b46a09b SHA512 15516145dfab507ded82ad6e31392c5e61fba04857507ef6b4793948281ddf83e0ad5615d058960123bca7f01bab5d86514cffb99acac44f806077a5613c78c4
 MISC metadata.xml 24205 BLAKE2B 76aa5370179f64adaaf79cb730a4cc53deb191a27e97b10cbb26efd804572eb79d67d9abdb09c5e62d08d73d969848286516a2176099237feba2a5c855cd263d SHA512 a6cae05b4f46b10502da5acc2905f622b61a30329c300483cea39348e92d182d190dd61433c551a1948d4ac6a281b9f91c47b759f425055970e8c5a6349b8693
diff --git a/app-admin/rex/rex-1.12.2.ebuild b/app-admin/rex/rex-1.12.2.ebuild
new file mode 100644
index 000000000000..d832e4f2b87a
--- /dev/null
+++ b/app-admin/rex/rex-1.12.2.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	GITHUB_USER=RexOps
+	GITHUB_REPO=Rex
+	EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git"
+	EGIT_BRANCH="master"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
+	VCS_ECLASS="git-r3"
+else
+	# This is intentional to stop perl-module.eclass doing magic things when it
+	# shouldn't. Like making ${S} contain "Rex" when the git clone has "rex"
+	# Also prevents perl-module.eclass provisioning SRC_URI
+	DIST_AUTHOR=FERKI
+	DIST_NAME=Rex
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit bash-completion-r1 perl-module ${VCS_ECLASS}
+
+DESCRIPTION="(R)?ex, the friendly automation framework"
+
+SLOT="0"
+IUSE="minimal test"
+RESTRICT="!test? ( test )"
+
+DZIL_DEPENDS="
+	dev-perl/Dist-Zilla
+	dev-perl/Dist-Zilla-Plugin-CheckExtraTests
+	dev-perl/Dist-Zilla-Plugin-ContributorsFile
+	dev-perl/Dist-Zilla-Plugin-Git
+	dev-perl/Dist-Zilla-Plugin-Git-Contributors
+	dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome
+	dev-perl/Dist-Zilla-Plugin-Meta-Contributors
+	dev-perl/Dist-Zilla-Plugin-MetaProvides-Package
+	dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic
+	dev-perl/Dist-Zilla-Plugin-OSPrereqs
+	dev-perl/Dist-Zilla-Plugin-OurPkgVersion
+	dev-perl/Dist-Zilla-Plugin-Run
+	dev-perl/Software-License
+"
+RDEPEND="
+	!minimal? (
+		dev-perl/DBI
+		dev-perl/Expect
+		dev-perl/IPC-Shareable
+		dev-perl/XML-LibXML
+	)
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	dev-perl/Data-Validate-IP
+	dev-perl/Devel-Caller
+	dev-perl/Digest-HMAC
+	virtual/perl-Digest-MD5
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	dev-perl/HTTP-Message
+	dev-perl/Hash-Merge
+	virtual/perl-IO
+	dev-perl/IO-String
+	dev-perl/IO-Tty
+	dev-perl/JSON-MaybeXS
+	dev-perl/List-MoreUtils
+	virtual/perl-MIME-Base64
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SFTP-Foreign
+	virtual/perl-Scalar-List-Utils
+	dev-perl/Parallel-ForkManager
+	dev-perl/Sort-Naturally
+	dev-perl/String-Escape
+	virtual/perl-Storable
+	dev-perl/TermReadKey
+	virtual/perl-Test-Simple
+	dev-perl/Text-Glob
+	virtual/perl-Text-Tabs+Wrap
+	virtual/perl-Time-HiRes
+	dev-perl/URI
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl
+	dev-perl/YAML
+	virtual/perl-version
+"
+
+BDEPEND="
+	${RDEPEND}
+	>=virtual/perl-CPAN-Meta-Requirements-2.120.620
+	>=virtual/perl-ExtUtils-MakeMaker-7.110.100
+	>=dev-perl/File-ShareDir-Install-0.60.0
+	virtual/perl-Module-Metadata
+	test? (
+		virtual/perl-File-Temp
+		dev-perl/Test-Deep
+		dev-perl/Test-Output
+		dev-perl/Test-UseAllModules
+		virtual/perl-autodie
+	)
+"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" ${DZIL_DEPENDS}"
+
+src_unpack() {
+	if [[ $PV == 9999 ]]; then
+		"${VCS_ECLASS}"_src_unpack
+		mkdir -p "${S}" || die "Can't make ${S}"
+	else
+		default
+	fi
+}
+
+dzil_src_prep() {
+	einfo "Patching dist.ini"
+
+	# This block of sed invocations removes all plugins that aren't
+	# useful for users to have on Gentoo, because all of them are
+	# conditional and subjective style checks, which don't indicate
+	# a real issue for users, and paying the price of their dependencies is undesired.
+
+	# The {N;d} trick adds the [n]ext line after the match to the pattern-space
+	# so that the final [d]elete deletes the next line too. Can be expanded for each
+	# line, ie: {N;N;N;d} deletes 3 lines after the match as well as the match.
+	sed -e '/^\[Test::Kwalitee\]/d' \
+		-e '/^\[Test::Perl::Critic\]/d' \
+		-e '/^\[PodSyntaxTests\]/d' \
+		-e '/^Test::Kwalitee =/d' \
+		-e '/^Test::PerlTidy =/d' \
+		-e '/^Test::Pod =/d' \
+		-e '/^\[Test::CPAN::Changes\]/{N;d}' \
+		-e '/^\[OptionalFeature/,/^$/d' \
+		-e '/^\[Test::MinimumVersion\]/{N;d}' \
+		-i dist.ini || die "Can't patch dist.ini"
+}
+dzil_env_setup() {
+	# NextRelease noise :(
+	mkdir -p ~/.dzil/
+	local user="$(whoami)"
+	local host="$(hostname)"
+	printf '[%%User]\nname = %s\nemail = %s' "${user}" "${user}@${host}" >> ~/.dzil/config.ini
+
+}
+dzil_to_distdir() {
+	local dzil_root dest has_missing modname dzil_version
+	dzil_root="$1"
+	dest="$2"
+
+	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
+
+	dzil_src_prep
+	dzil_env_setup
+
+	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
+	einfo "Generating CPAN dist with ${dzil_version}"
+
+	has_missing=""
+
+	einfo "Checking dzil authordeps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+		has_missing=1
+			eerror "'dzil authordeps' indicates missing build dependencies"
+			eerror "These will prevent building, please report a bug"
+			eerror "Missing:"
+		fi
+		eerror "  ${modname}"
+	done < <( dzil authordeps --missing --versions )
+
+	[[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
+
+	einfo "Checking dzil build deps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+			has_missing=1
+			ewarn "'dzil listdeps' indicates missing build dependencies"
+			ewarn "These may prevent building, please report a bug if they do"
+			ewarn "Missing:"
+		fi
+		ewarn "  ${modname}"
+	done < <( dzil listdeps --missing --versions --author )
+
+	einfo "Generating release"
+	dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]]; then
+		# Uses git sources in WORKDIR/rex-git
+		# to generate a CPAN-style tree in ${S}
+		# before letting perl-module.eclass do the rest
+		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
+	fi
+	cd "${S}" || die "Can't enter build dir"
+	perl-module_src_prepare
+}
+
+src_install() {
+	newbashcomp "share/${PN}-tab-completion.bash" "${PN}"
+
+	insinto /usr/share/zsh/site-functions
+	newins "share/${PN}-tab-completion.zsh" "_${PN}"
+
+	perl-module_src_install
+}
diff --git a/app-admin/rex/rex-9999.ebuild b/app-admin/rex/rex-9999.ebuild
index 85e62dace75d..d832e4f2b87a 100644
--- a/app-admin/rex/rex-9999.ebuild
+++ b/app-admin/rex/rex-9999.ebuild
@@ -23,7 +23,7 @@ inherit bash-completion-r1 perl-module ${VCS_ECLASS}
 DESCRIPTION="(R)?ex, the friendly automation framework"
 
 SLOT="0"
-IUSE="test"
+IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
 DZIL_DEPENDS="
@@ -42,14 +42,18 @@ DZIL_DEPENDS="
 	dev-perl/Software-License
 "
 RDEPEND="
+	!minimal? (
+		dev-perl/DBI
+		dev-perl/Expect
+		dev-perl/IPC-Shareable
+		dev-perl/XML-LibXML
+	)
 	virtual/perl-Carp
 	virtual/perl-Data-Dumper
 	dev-perl/Data-Validate-IP
-	dev-perl/DBI
 	dev-perl/Devel-Caller
 	dev-perl/Digest-HMAC
 	virtual/perl-Digest-MD5
-	dev-perl/Expect
 	virtual/perl-Exporter
 	virtual/perl-File-Spec
 	dev-perl/HTTP-Message
@@ -57,7 +61,6 @@ RDEPEND="
 	virtual/perl-IO
 	dev-perl/IO-String
 	dev-perl/IO-Tty
-	dev-perl/IPC-Shareable
 	dev-perl/JSON-MaybeXS
 	dev-perl/List-MoreUtils
 	virtual/perl-MIME-Base64
@@ -74,7 +77,6 @@ RDEPEND="
 	virtual/perl-Text-Tabs+Wrap
 	virtual/perl-Time-HiRes
 	dev-perl/URI
-	dev-perl/XML-LibXML
 	dev-perl/XML-Simple
 	dev-perl/libwww-perl
 	dev-perl/YAML
@@ -83,12 +85,15 @@ RDEPEND="
 
 BDEPEND="
 	${RDEPEND}
+	>=virtual/perl-CPAN-Meta-Requirements-2.120.620
 	>=virtual/perl-ExtUtils-MakeMaker-7.110.100
 	>=dev-perl/File-ShareDir-Install-0.60.0
+	virtual/perl-Module-Metadata
 	test? (
 		virtual/perl-File-Temp
 		dev-perl/Test-Deep
-		>=dev-perl/Test-UseAllModules-0.150.0
+		dev-perl/Test-Output
+		dev-perl/Test-UseAllModules
 		virtual/perl-autodie
 	)
 "
@@ -122,6 +127,7 @@ dzil_src_prep() {
 		-e '/^Test::PerlTidy =/d' \
 		-e '/^Test::Pod =/d' \
 		-e '/^\[Test::CPAN::Changes\]/{N;d}' \
+		-e '/^\[OptionalFeature/,/^$/d' \
 		-e '/^\[Test::MinimumVersion\]/{N;d}' \
 		-i dist.ini || die "Can't patch dist.ini"
 }
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 838e295ff143..b5e30b4712c2 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -15,6 +15,7 @@ AUX salt-3000.2-py38-abc.patch 2641 BLAKE2B 054fae62aee23528beaad9e4c9c8ac72c1f9
 AUX salt-3000.2-py38-logwarn.patch 4875 BLAKE2B f0ced7bad98983296561d223405d512077c0b70de12a8af613d4069842d3cb6167dd0da49c30fc881e985594f755ce0b063df311bbe84ae9cfc37896670aca52 SHA512 94ca1f73cbeb9d3ab93cb1c7afd4abce5318022a267342e4b348066c5508016891a3c05bd0ea867ae868794684bdc1bfd3e7779c4ea2a9cd60626d6513f8ba4e
 AUX salt-3000.2-py38.patch 1739 BLAKE2B 49591845a247f3e9fc092229950518b6ccb10035bc961a6193358a4be5b84b1e3d6fae69a5763b85966b1e115e8cf38378e2e88c66c3e10699ef47587aa3e7d7 SHA512 4a537c0e45c3287ddc71b91637b4b7f1d54e0dd4e524e91f39cabad08dda14ce5d2467c1f87bc81a098c36f0da1312b8e627189e0574d0ccecab064cba19acb9
 AUX salt-3000.2-tests.patch 587 BLAKE2B 5eb647ffd159bc56ce823c80fb384e7cd33e79c46baa3e607a772c6de1e8019c53908a2eb5111dd770b638c8088b76bee6c17f8cea9e17f3f7b8d3ab93568839 SHA512 ef6c1cd995a03d49ac2aaf65b516f0dc1ac9764e32392c67febdfd31d23ca178bb4f29a903b4d67f8792fe0fb903c03596cbfd1c1223e993189de890aa41b0c3
+AUX salt-3001.1-tests.patch 7149 BLAKE2B 3e5de0decdec9bc2ed1a6fcf2dd04c0c554f2b11a8bda45a797e811a332782eec9303ee8c81aca4f2fe646c392c63f151c0af6a3ef18db370914a2aa06afc485 SHA512 661f2ef797b1b338e43c33af80fbad0e2af9b22439b3bdf0ad6fda0b632961426a787dbf8e592c5a9b73c84af3a466c128eff15a519b83af2e9a74e0216ea014
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
@@ -25,7 +26,9 @@ DIST salt-2019.2.5.tar.gz 14574347 BLAKE2B d456dd493e79640260f3ad3c964fdaaa26dd7
 DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
 DIST salt-3000.2.tar.gz 15231513 BLAKE2B 2090d0f52f953a42f1685ad190750e9c76ad6e862a3272444fef063a7605f69a6c542f04165a41fb9cdaa126a878cc133d4857faa70edc5eac4bf49bdde937ab SHA512 88e8876ed8cd18e942c2194686cda68f40fa49e69e317ca488bf58e095bcf6cdf8771d93eba7960038941cc5863e13a4eea4dad5256c12da7cd8288a2c61f59d
 DIST salt-3000.3.tar.gz 15237557 BLAKE2B ab51e07f56f9e02c47da58fad95c9482ea70e0685996a78e34382eadb3a9a3dace63ef65d643a9de284ea00c34785eae631d033f32e00e59eb3639514459af33 SHA512 a4697da9a2f7d484b72145e8b83f6d9032369f87e2e7119a9d51f59b989488285406543f79142fc686c41c144f5878eefba37927137581c892c88f03fc3a8208
+DIST salt-3001.1.tar.gz 14556156 BLAKE2B 3088955a07b6ff95588f5b6235e0bae9cea366e957e026bacd228af9f1ed500f88f7fb543833f2398d64fe7e4546f0f29d7c65362464097bf89424174e76c954 SHA512 d59b6c3580d3379192f36e462385c74b53b0b385e63b3db7734003d0a71df8f88593a59eeccd86b1dc15800e46d050094e7a88f2636673770ddc952d0110ca29
 EBUILD salt-2019.2.5-r1.ebuild 4910 BLAKE2B 67e56a9029c3157a31525c8ea41a957b82a3d2c846ae68756c8ea67261d6ea6346a98bbafd785fe519640ceef2e3495e58b0ec262858be30016eba10f1392567 SHA512 75e9eb392f3619b714a0ba43d64c5e08c51f512e71d98f1be763cb443d1c8a6c429ef5c2d272c162db34f3e274aebdf2f0c4866a32925232d134b9f91a4765ef
 EBUILD salt-3000.2-r4.ebuild 6321 BLAKE2B ddaa02503b5d8301697bae784a4901348eec72152e9d91d21eff82640d3609b093aa2acd818554d96edf86921cfcdbf9cc39b3e0f9292fff919f903919a6c250 SHA512 6b405a1bd5234500907b8da8865ec0aa2583efe7700fb3f09776297a4592352fe13ab199ff1fd9bf50421e2f11b363b804f41823d6fbf8d993d56bf6a1d07ed6
 EBUILD salt-3000.3.ebuild 6323 BLAKE2B 8b051bae3bb397bb25bcfe341730b5c0670ca011fad15f268d9c9b33a27f9fc1c95cad659e797b1d5bca75ad9fd09d3667d7d2d7e43a1880955a70c4f40559d4 SHA512 76d5b24985a68a6c4f67c937a71c3bcbf89407ec9ceb0f40bc92cc8196d53830a3ac4000457dc2a5b9660d59a7d6fed79d646e521bcc6ddc9bb29b172eca130c
+EBUILD salt-3001.1-r1.ebuild 6039 BLAKE2B 04364921fa1cd776c9507bb767ee0edd00662e43de0c0fedd81bca98001a241e26e9612dc23c83af4e080642e248344d075fb9fdb20834c277039a8f2f3b16a2 SHA512 91d9168e09426680218556b327de3544919627ff3e05fe38229bb30fdd4640f1005503ebbe3660746eacda9928ccd80f21dedfc4bd4687431745dbc2e0267067
 MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5
diff --git a/app-admin/salt/files/salt-3001.1-tests.patch b/app-admin/salt/files/salt-3001.1-tests.patch
new file mode 100644
index 000000000000..ad32b611dfe2
--- /dev/null
+++ b/app-admin/salt/files/salt-3001.1-tests.patch
@@ -0,0 +1,151 @@
+diff --git a/tests/integration/master/test_event_return.py b/tests/integration/master/test_event_return.py
+index 1a97be0e5f..93c57f08ff 100644
+--- a/tests/integration/master/test_event_return.py
++++ b/tests/integration/master/test_event_return.py
+@@ -18,7 +18,7 @@ import time
+ import salt.ext.six as six
+ from salt.utils.nb_popen import NonBlockingPopen
+ from saltfactories.utils.ports import get_unused_localhost_port
+-from saltfactories.utils.processes.helpers import terminate_process
++from saltfactories.utils.processes import terminate_process
+ from tests.support.cli_scripts import ScriptPathMixin
+ from tests.support.mixins import AdaptedConfigurationTestCaseMixin
+ from tests.support.runtests import RUNTIME_VARS
+diff --git a/tests/integration/utils/testprogram.py b/tests/integration/utils/testprogram.py
+index 74bbc1cd90..be651591d1 100644
+--- a/tests/integration/utils/testprogram.py
++++ b/tests/integration/utils/testprogram.py
+@@ -30,7 +30,7 @@ import salt.utils.psutil_compat as psutils
+ import salt.utils.yaml
+ from salt.ext import six
+ from salt.ext.six.moves import range
+-from saltfactories.utils.processes.helpers import (
++from saltfactories.utils.processes import (
+     terminate_process,
+     terminate_process_list,
+ )
+diff --git a/tests/support/case.py b/tests/support/case.py
+index 9017027ae3..517cefb64a 100644
+--- a/tests/support/case.py
++++ b/tests/support/case.py
+@@ -25,7 +25,7 @@ import time
+ from datetime import datetime, timedelta
+ 
+ import salt.utils.files
+-from saltfactories.utils.processes.helpers import terminate_process
++from saltfactories.utils.processes import terminate_process
+ from tests.support.cli_scripts import ScriptPathMixin
+ from tests.support.helpers import RedirectStdStreams, requires_sshd_server
+ from tests.support.mixins import (  # pylint: disable=unused-import
+diff --git a/tests/support/helpers.py b/tests/support/helpers.py
+index bae2dceff4..93fbb66742 100644
+--- a/tests/support/helpers.py
++++ b/tests/support/helpers.py
+@@ -42,7 +42,7 @@ import salt.utils.versions
+ from salt.ext import six
+ from salt.ext.six.moves import builtins, range
+ from saltfactories.utils.ports import get_unused_localhost_port
+-from saltfactories.utils.processes.bases import ProcessResult
++from saltfactories.utils.processes import ProcessResult
+ from tests.support.mock import patch
+ from tests.support.runtests import RUNTIME_VARS
+ from tests.support.sminion import create_sminion
+@@ -1674,7 +1674,7 @@ class VirtualEnv(object):
+         kwargs.setdefault("stderr", subprocess.PIPE)
+         kwargs.setdefault("universal_newlines", True)
+         proc = subprocess.run(args, check=False, **kwargs)
+-        ret = ProcessResult(proc.returncode, proc.stdout, proc.stderr, proc.args)
++        ret = ProcessResult(proc.returncode, proc.stdout, proc.stderr, cmdline=proc.args)
+         log.debug(ret)
+         if check is True:
+             proc.check_returncode()
+diff --git a/tests/support/paths.py b/tests/support/paths.py
+index 1e1e081dc4..981aa54eb7 100644
+--- a/tests/support/paths.py
++++ b/tests/support/paths.py
+@@ -49,14 +49,12 @@ if TESTS_DIR not in sys.path:
+     sys.path.insert(1, TESTS_DIR)
+ 
+ SYS_TMP_DIR = os.path.abspath(
+-    os.path.realpath(
+-        # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
+-        # for unix sockets: ``error: AF_UNIX path too long``
+-        # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
+-        os.environ.get("TMPDIR", tempfile.gettempdir())
+-        if not sys.platform.startswith("darwin")
+-        else "/tmp"
+-    )
++    # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
++    # for unix sockets: ``error: AF_UNIX path too long``
++    # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
++    os.environ.get("TMPDIR", tempfile.gettempdir())
++    if not sys.platform.startswith("darwin")
++    else "/tmp"
+ )
+ TMP = os.path.join(SYS_TMP_DIR, "salt-tests-tmpdir")
+ TMP_ROOT_DIR = os.path.join(TMP, "rootdir")
+diff --git a/tests/support/processes.py b/tests/support/processes.py
+index 4f264862a4..7c93e48368 100644
+--- a/tests/support/processes.py
++++ b/tests/support/processes.py
+@@ -14,7 +14,7 @@ from __future__ import absolute_import
+ 
+ import logging
+ 
+-from saltfactories.utils.processes.helpers import (  # pylint: disable=unused-import
++from saltfactories.utils.processes import (  # pylint: disable=unused-import
+     collect_child_processes,
+     terminate_process,
+     terminate_process_list,
+diff --git a/tests/unit/utils/scheduler/base.py b/tests/unit/utils/scheduler/base.py
+index 5d7f161eb5..286e047e40 100644
+--- a/tests/unit/utils/scheduler/base.py
++++ b/tests/unit/utils/scheduler/base.py
+@@ -14,7 +14,7 @@ import salt.utils.platform
+ import salt.utils.schedule
+ from salt.modules.test import ping
+ from salt.utils.process import SubprocessList
+-from saltfactories.utils.processes.helpers import terminate_process
++from saltfactories.utils.processes import terminate_process
+ from tests.support.mixins import SaltReturnAssertsMixin
+ from tests.support.mock import MagicMock, patch
+ from tests.support.runtests import RUNTIME_VARS
+diff --git a/tests/unit/utils/test_event.py b/tests/unit/utils/test_event.py
+index 9a3b1c428d..dfcf1c5275 100644
+--- a/tests/unit/utils/test_event.py
++++ b/tests/unit/utils/test_event.py
+@@ -21,7 +21,7 @@ import zmq
+ import zmq.eventloop.ioloop
+ from salt.ext.six.moves import range
+ from salt.ext.tornado.testing import AsyncTestCase
+-from saltfactories.utils.processes.helpers import terminate_process
++from saltfactories.utils.processes import terminate_process
+ from tests.support.events import eventpublisher_process, eventsender_process
+ from tests.support.helpers import slowTest
+ from tests.support.runtests import RUNTIME_VARS
+diff --git a/tests/unit/utils/test_verify.py b/tests/unit/utils/test_verify.py
+index 5662cf621b..0339c353dc 100644
+--- a/tests/unit/utils/test_verify.py
++++ b/tests/unit/utils/test_verify.py
+@@ -343,7 +343,7 @@ class TestCleanPath(TestCase):
+     def test_clean_path_valid(self):
+         path_a = os.path.join(self.tmpdir, "foo")
+         path_b = os.path.join(self.tmpdir, "foo", "bar")
+-        assert clean_path(path_a, path_b) == path_b
++        assert clean_path(path_a, path_b) == os.path.realpath(path_b)
+ 
+     def test_clean_path_invalid(self):
+         path_a = os.path.join(self.tmpdir, "foo")
+@@ -398,10 +398,10 @@ class TestCleanPathLink(TestCase):
+         test_path = os.path.join(self.from_path, "test")
+         expect_path = os.path.join(self.to_path, "test")
+         ret = clean_path(self.from_path, test_path)
+-        assert ret == expect_path, "{} is not {}".format(ret, expect_path)
++        assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path)
+ 
+     def test_clean_path_symlinked_tgt(self):
+         test_path = os.path.join(self.to_path, "test")
+         expect_path = os.path.join(self.to_path, "test")
+         ret = clean_path(self.from_path, test_path)
+-        assert ret == expect_path, "{} is not {}".format(ret, expect_path)
++        assert ret == os.path.realpath(expect_path), "{} is not {}".format(ret, expect_path)
diff --git a/app-admin/salt/salt-3001.1-r1.ebuild b/app-admin/salt/salt-3001.1-r1.ebuild
new file mode 100644
index 000000000000..09299dcc1d09
--- /dev/null
+++ b/app-admin/salt/salt-3001.1-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..8} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+	mongodb neutron	nova openssl portage profile redis selinux test raet
+	+zeromq vim-syntax"
+
+RDEPEND="
+	sys-apps/pciutils
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5[${PYTHON_USEDEP}]
+	<dev-python/msgpack-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.9.7[${PYTHON_USEDEP}]
+	dev-python/pycryptodomex[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? (
+		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_7)
+	)
+	openssl? (
+		dev-libs/openssl:0=[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	nova? (
+		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_7)
+	)
+	neutron? (
+		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_7)
+	)
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )
+	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		>=dev-python/pytest-salt-2020.1.27[${PYTHON_USEDEP}]
+		dev-python/pytest-salt-factories[${PYTHON_USEDEP}]
+		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20.0.20[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.3.15[${PYTHON_USEDEP}] )
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )
+	test? ( cheetah genshi )"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-3001.1-tests.patch"
+)
+
+python_prepare_all() {
+	# remove tests with external dependencies that may not be available
+	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+	rm tests/support/gitfs.py tests/unit/runners/test_git_pillar.py || die
+
+	# tests that require network access
+	rm tests/unit/{states,modules}/test_zcbuildout.py || die
+
+	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
+	find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+	einfo "Fixing collections.abc warnings for ${EPYTHON}"
+	local abc
+	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
+	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}" || die; }
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose \
+			|| die "testing failed with ${EPYTHON}"
+	)
+}
+
+pkg_postinst() {
+	if use python_targets_python3_8; then
+		if use nova; then
+			ewarn "Salt's nova functionality will not work with python3.8 since"
+			ewarn "dev-python/python-novaclient does not support it yet"
+		fi
+		if use neutron; then
+			ewarn "Salt's neutron functionality will not work with python3.8 since"
+			ewarn "dev-python/python-neutronclient does not support it yet"
+		fi
+		if use libvirt; then
+			ewarn "Salt's libvirt functionality will not work with python3.8 since"
+			ewarn "dev-python/libvirt-python does not support it yet"
+		fi
+	fi
+}
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 9c21e2198fff..cccbb81081e3 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,5 +1,8 @@
 AUX setools-4.2.2-remove-gui.patch 970 BLAKE2B b3d701d0e9b4de0a3f66ca8696700e70becfa5de068e385d12ca61f76ca59f495a69fac65ee986fa548bfec2487f21b5b948da2d729cef8a3008d906c9f7e73d SHA512 088be5d53e4402fa91bec20b3d85b8c1a77b41ebde1bbb44909e740b140bd6f79b641b68f56d258ad5a4af40df3023745663acb305a810ee19f126a0e99f1e6b
+AUX setools-4.3.0-remove-gui.patch 879 BLAKE2B d8c61405d96466fbd2f1704477dfbe64477b7cb26f2a8aae66c6d7ca0ac73c4a6372ce02917ef2ef424bb8faa2175bcad7c2eeca1c84d292005d5426eb3db004 SHA512 de125a4bd4fa8aa1aca98b33449d9b11746b2aa6ccfa202ed9711b253a9da98c1200b075e7b31a27b00fe3277557d29c1be8971a5fc079be572d61c25b64bec6
 DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
+DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8
 EBUILD setools-4.2.2.ebuild 1244 BLAKE2B 12679432d583a6d7cf3bc5b4934afe807baa10beb06cd65554eff037041e4b920ca969cd74e7af575bc14987dd56e5490b54c8b99f31fe93309e30ebebd79800 SHA512 15d41d5cabd0cc8c5f0996379d371342701c42cfbf25e73c72d753bc798fc294ec0e6074b4d04074bc4965bc015acf1d16a083eeef1600b3f57e0eab54a136f6
-EBUILD setools-9999.ebuild 1246 BLAKE2B 96a9668a3c3da8e18bb5c07a14914024776737cdb485963536e8686851538b661fe2deb1032fc8af57101117534cceaeafe7e11d1df4eefb82ab5203d0bd3749 SHA512 8b5f81c50005b285bf67af722f0bef81fac45692764669363241c9fbdc65822c7f0bf40f2be6ba01742ab2b78b41ce4965dd0e5f63aedac0a641209979bf9e1f
-MISC metadata.xml 401 BLAKE2B dc411a73d59193727d72889e4e5f3840aa9cf7b1b6ef55f28ab6a6beee533276954e27fe105a60c392c49ac761745304865c221ff9417464112eb866f35bf6e9 SHA512 354eb8fc14e5673dfd6ad2781a784cd6d77442bf879a96c206b758615c1612397c09c20161efb9e37bc56a588e97a74a20939773dec0b1f137eb6ac353234d2f
+EBUILD setools-4.3.0.ebuild 1254 BLAKE2B 1779f71bac2945eca0ffc5fd077b82da117d414412f77d313ab722dff14b2de83728a8da316197798fb8bc7c8466980eb66fa622169c6128e780fcccd53b760f SHA512 2740c48f1b9bcd2faa1390dae29734ff96fb0c4a7fe76e9721bcb6a61562ba72d07530e6ee1860bbb271637adc3e0537d7163cdc0b1e576bfb301502196dd6c2
+EBUILD setools-9999.ebuild 1254 BLAKE2B 1779f71bac2945eca0ffc5fd077b82da117d414412f77d313ab722dff14b2de83728a8da316197798fb8bc7c8466980eb66fa622169c6128e780fcccd53b760f SHA512 2740c48f1b9bcd2faa1390dae29734ff96fb0c4a7fe76e9721bcb6a61562ba72d07530e6ee1860bbb271637adc3e0537d7163cdc0b1e576bfb301502196dd6c2
+MISC metadata.xml 334 BLAKE2B 7fa85c132495c221d8618934cfe5481df604ac8c4bf36878f36d8c35b31e923515634124b0e3b9abda16b748a7684463851574a23428dfdc54bd8a7bd3625ad5 SHA512 52b24eea951558dca0db5c046f0a803c94ebd9d9b42b4a317ecd2d60f0dff885872fc3813d94f4c5c5b9ec2696f609f59cb34f406348f3a75c7ce270218d4513
diff --git a/app-admin/setools/files/setools-4.3.0-remove-gui.patch b/app-admin/setools/files/setools-4.3.0-remove-gui.patch
new file mode 100644
index 000000000000..85abbf5a7aa3
--- /dev/null
+++ b/app-admin/setools/files/setools-4.3.0-remove-gui.patch
@@ -0,0 +1,16 @@
+--- a/setup.py
++++ b/setup.py
+@@ -146,10 +146,10 @@ setup(name='setools',
+       author_email='pebenito@ieee.org',
+       url='https://github.com/SELinuxProject/setools',
+       cmdclass={'build_qhc': QtHelpCommand, 'clean': CleanCommand},
+-      packages=['setools', 'setools.diff', 'setoolsgui', 'setoolsgui.apol'],
+-      scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
++      packages=['setools', 'setools.diff'],
++      scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
+       data_files=installed_data,
+-      package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
++      package_data={'setools': ['perm_map']},
+       ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],
+                             annotate=cython_annotate,
+                             compiler_directives={"language_level": 3,
diff --git a/app-admin/setools/metadata.xml b/app-admin/setools/metadata.xml
index fdc3261aeec3..8b667b0a7682 100644
--- a/app-admin/setools/metadata.xml
+++ b/app-admin/setools/metadata.xml
@@ -5,7 +5,6 @@
 		<email>selinux@gentoo.org</email>
 		<name>SELinux Team</name>
 	</maintainer>
-	<longdescription>SELinux policy analysis tools.</longdescription>
 	<upstream>
 		<remote-id type="github">SELinuxProject/setools</remote-id>
 	</upstream>
diff --git a/app-admin/setools/setools-4.3.0.ebuild b/app-admin/setools/setools-4.3.0.ebuild
new file mode 100644
index 000000000000..fd1fb1b07fac
--- /dev/null
+++ b/app-admin/setools/setools-4.3.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Policy Analysis Tools for SELinux"
+HOMEPAGE="https://github.com/SELinuxProject/setools/wiki"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
+else
+	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="X test"
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/${PN}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
+	>=sys-libs/libsepol-2.8:=
+	>=sys-libs/libselinux-2.8:=
+	X? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-python/cython-0.27
+	test? (
+		sys-apps/checkpolicy
+	)"
+
+python_prepare_all() {
+	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
+	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
+		die "failed to set lib_dirs"
+
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.3.0-remove-gui.patch )
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 88bea3902042..fd1fb1b07fac 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python{3_6,3_7} )
+EAPI="7"
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 inherit distutils-r1
 
@@ -42,7 +42,7 @@ python_prepare_all() {
 	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
 		die "failed to set lib_dirs"
 
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.3.0-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 576b3898c3fe..3e1276d10824 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,3 +1,4 @@
+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
@@ -5,6 +6,7 @@ DIST sudo-1.9.2.tar.gz 3890859 BLAKE2B 879917b8045c999a17ef36006732509aa546ee6bb
 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
-EBUILD sudo-1.9.2.ebuild 6924 BLAKE2B c21aa2506c7d3b61d3b2038e246614aee7de87c3e914517e4c7cfbfe4222e5266b3804b034745ff30eec1d7ac6325f5a591011f59b32b961eedfd91176fd33ba SHA512 bdcc78f1d1be06e5cb503b8f3da6a5c674613ebce42f19a10bc2314d47405f5a34c9bac6582166ed77d95292d117ee6fb9a149eb70c1b84fbfeac3d7a32575f3
+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-9999.ebuild 6821 BLAKE2B 6ec4c8325e4275d902df02e971ca9b3e87a24b312cabcec7909c8ce94c4662aabada79fe550305603ad92151483bb3ba02a92b1ac49807ed0ba6fa7b14da0f12 SHA512 92536adcffa6e1c62e701d7a00a9032a60d559aa114d196e9851f198321ea8d027e9f7caf598f9d0eae2182362520a3c1ba62117d13b8e8b8ed6c5d9f212e7ac
 MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6
diff --git a/app-admin/sudo/files/sudo-1.9.2-glibc-2.32.patch b/app-admin/sudo/files/sudo-1.9.2-glibc-2.32.patch
new file mode 100644
index 000000000000..6134fe736d00
--- /dev/null
+++ b/app-admin/sudo/files/sudo-1.9.2-glibc-2.32.patch
@@ -0,0 +1,308 @@
+
+# HG changeset patch
+# User Todd C. Miller <Todd.Miller@sudo.ws>
+# Date 1598395693 21600
+# Node ID e30482f26924b07775d87ae591e54ad72e794d5e
+# Parent  1ede927d99b3cb06ba514c9fd2fd7fa9a014a1b2
+Use sigabbrev_np(3) to access signal abbreviations if supported.
+glibc-2.32 has removed sys_sigabbrev[], we can use sigabbrev_np(3) instead.
+
+diff -r 1ede927d99b3 -r e30482f26924 config.h.in
+--- a/config.h.in	Mon Aug 17 19:37:09 2020 -0600
++++ b/config.h.in	Tue Aug 25 16:48:13 2020 -0600
+@@ -740,6 +740,9 @@
+ /* Define to 1 if you have the `sig2str' function. */
+ #undef HAVE_SIG2STR
+ 
++/* Define to 1 if you have the `sigabbrev_np' function. */
++#undef HAVE_SIGABBREV_NP
++
+ /* Define to 1 if you use S/Key. */
+ #undef HAVE_SKEY
+ 
+diff -r 1ede927d99b3 -r e30482f26924 configure
+--- a/configure	Mon Aug 17 19:37:09 2020 -0600
++++ b/configure	Tue Aug 25 16:48:13 2020 -0600
+@@ -23687,9 +23687,21 @@
+ 
+ 
+ if test x"${ac_cv_func_sig2str}${ac_cv_func_str2sig}" != x"yesyes"; then
+-    COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }strsig_test"
+-    HAVE_SIGNAME="false"
+-    ac_fn_c_check_decl "$LINENO" "sys_signame" "ac_cv_have_decl_sys_signame" "
++    for ac_func in sigabbrev_np
++do :
++  ac_fn_c_check_func "$LINENO" "sigabbrev_np" "ac_cv_func_sigabbrev_np"
++if test "x$ac_cv_func_sigabbrev_np" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SIGABBREV_NP 1
++_ACEOF
++
++fi
++done
++
++    if test x"${ac_cv_func_sigabbrev_np}" != x"yes"; then
++	COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }strsig_test"
++	HAVE_SIGNAME="false"
++	ac_fn_c_check_decl "$LINENO" "sys_signame" "ac_cv_have_decl_sys_signame" "
+ $ac_includes_default
+ #include <signal.h>
+ 
+@@ -23705,7 +23717,7 @@
+ _ACEOF
+ if test $ac_have_decl = 1; then :
+ 
+-	HAVE_SIGNAME="true"
++	    HAVE_SIGNAME="true"
+ 
+ fi
+ ac_fn_c_check_decl "$LINENO" "_sys_signame" "ac_cv_have_decl__sys_signame" "
+@@ -23724,7 +23736,7 @@
+ _ACEOF
+ if test $ac_have_decl = 1; then :
+ 
+-	HAVE_SIGNAME="true"
++	    HAVE_SIGNAME="true"
+ 
+ fi
+ ac_fn_c_check_decl "$LINENO" "sys_sigabbrev" "ac_cv_have_decl_sys_sigabbrev" "
+@@ -23743,12 +23755,12 @@
+ _ACEOF
+ if test $ac_have_decl = 1; then :
+ 
+-	HAVE_SIGNAME="true"
+-
+-fi
+-
+-    if test "$HAVE_SIGNAME" != "true"; then
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for undeclared sys_sigabbrev" >&5
++	    HAVE_SIGNAME="true"
++
++fi
++
++	if test "$HAVE_SIGNAME" != "true"; then
++	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for undeclared sys_sigabbrev" >&5
+ $as_echo_n "checking for undeclared sys_sigabbrev... " >&6; }
+ if ${sudo_cv_var_sys_sigabbrev+:} false; then :
+   $as_echo_n "(cached) " >&6
+@@ -23777,17 +23789,18 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $sudo_cv_var_sys_sigabbrev" >&5
+ $as_echo "$sudo_cv_var_sys_sigabbrev" >&6; }
+-	if test "$sudo_cv_var_sys_sigabbrev" = yes; then
+-	    $as_echo "#define HAVE_SYS_SIGABBREV 1" >>confdefs.h
+-
+-	else
+-	    case " $LIBOBJS " in
++	    if test "$sudo_cv_var_sys_sigabbrev" = yes; then
++		$as_echo "#define HAVE_SYS_SIGABBREV 1" >>confdefs.h
++
++	    else
++		case " $LIBOBJS " in
+   *" signame.$ac_objext "* ) ;;
+   *) LIBOBJS="$LIBOBJS signame.$ac_objext"
+  ;;
+ esac
+ 
+-	    SIGNAME=signame.lo
++		SIGNAME=signame.lo
++	    fi
+ 	fi
+     fi
+ fi
+diff -r 1ede927d99b3 -r e30482f26924 configure.ac
+--- a/configure.ac	Mon Aug 17 19:37:09 2020 -0600
++++ b/configure.ac	Tue Aug 25 16:48:13 2020 -0600
+@@ -3498,29 +3498,32 @@
+ dnl Also enable unit tests for sig2str() and str2sig().
+ dnl
+ if test x"${ac_cv_func_sig2str}${ac_cv_func_str2sig}" != x"yesyes"; then
+-    COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }strsig_test"
+-    HAVE_SIGNAME="false"
+-    AC_CHECK_DECLS([sys_signame, _sys_signame, sys_sigabbrev], [
+-	HAVE_SIGNAME="true"
+-    ], [ ], [
++    AC_CHECK_FUNCS([sigabbrev_np])
++    if test x"${ac_cv_func_sigabbrev_np}" != x"yes"; then
++	COMPAT_TEST_PROGS="${COMPAT_TEST_PROGS}${COMPAT_TEST_PROGS+ }strsig_test"
++	HAVE_SIGNAME="false"
++	AC_CHECK_DECLS([sys_signame, _sys_signame, sys_sigabbrev], [
++	    HAVE_SIGNAME="true"
++	], [ ], [
+ AC_INCLUDES_DEFAULT
+ #include <signal.h>
+-    ])
+-    if test "$HAVE_SIGNAME" != "true"; then
+-	AC_CACHE_CHECK([for undeclared sys_sigabbrev],
+-	    [sudo_cv_var_sys_sigabbrev],
+-	    [AC_LINK_IFELSE(
+-		[AC_LANG_PROGRAM([[extern char **sys_sigabbrev;]], [[return sys_sigabbrev[1];]])],
+-		    [sudo_cv_var_sys_sigabbrev=yes],
+-		    [sudo_cv_var_sys_sigabbrev=no]
+-		)
+-	    ]
+-	)
+-	if test "$sudo_cv_var_sys_sigabbrev" = yes; then
+-	    AC_DEFINE(HAVE_SYS_SIGABBREV)
+-	else
+-	    AC_LIBOBJ(signame)
+-	    SIGNAME=signame.lo
++	])
++	if test "$HAVE_SIGNAME" != "true"; then
++	    AC_CACHE_CHECK([for undeclared sys_sigabbrev],
++		[sudo_cv_var_sys_sigabbrev],
++		[AC_LINK_IFELSE(
++		    [AC_LANG_PROGRAM([[extern char **sys_sigabbrev;]], [[return sys_sigabbrev[1];]])],
++			[sudo_cv_var_sys_sigabbrev=yes],
++			[sudo_cv_var_sys_sigabbrev=no]
++		    )
++		]
++	    )
++	    if test "$sudo_cv_var_sys_sigabbrev" = yes; then
++		AC_DEFINE(HAVE_SYS_SIGABBREV)
++	    else
++		AC_LIBOBJ(signame)
++		SIGNAME=signame.lo
++	    fi
+ 	fi
+     fi
+ fi
+diff -r 1ede927d99b3 -r e30482f26924 lib/util/sig2str.c
+--- a/lib/util/sig2str.c	Mon Aug 17 19:37:09 2020 -0600
++++ b/lib/util/sig2str.c	Tue Aug 25 16:48:13 2020 -0600
+@@ -1,7 +1,7 @@
+ /*
+  * SPDX-License-Identifier: ISC
+  *
+- * Copyright (c) 2012-2015, 2017-2019 Todd C. Miller <Todd.Miller@sudo.ws>
++ * Copyright (c) 2012-2015, 2017-2020 Todd C. Miller <Todd.Miller@sudo.ws>
+  *
+  * Permission to use, copy, modify, and distribute this software for any
+  * purpose with or without fee is hereby granted, provided that the above
+@@ -32,20 +32,24 @@
+ #include <unistd.h>
+ 
+ #include "sudo_compat.h"
++#include "sudo_util.h"
+ 
+-#if defined(HAVE_DECL_SYS_SIGNAME) && HAVE_DECL_SYS_SIGNAME == 1
+-#  define sudo_sys_signame	sys_signame
+-#elif defined(HAVE_DECL__SYS_SIGNAME) && HAVE_DECL__SYS_SIGNAME == 1
+-#  define sudo_sys_signame	_sys_signame
+-#elif defined(HAVE_DECL_SYS_SIGABBREV) && HAVE_DECL_SYS_SIGABBREV == 1
+-#  define sudo_sys_signame	sys_sigabbrev
+-#else
+-# ifdef HAVE_SYS_SIGABBREV
+-   /* sys_sigabbrev is not declared by glibc */
+-#  define sudo_sys_signame	sys_sigabbrev
++#if !defined(HAVE_SIGABBREV_NP)
++# if defined(HAVE_DECL_SYS_SIGNAME) && HAVE_DECL_SYS_SIGNAME == 1
++#   define sigabbrev_np(_x)	sys_signame[(_x)]
++# elif defined(HAVE_DECL__SYS_SIGNAME) && HAVE_DECL__SYS_SIGNAME == 1
++#   define sigabbrev_np(_x)	_sys_signame[(_x)]
++# elif defined(HAVE_SYS_SIGABBREV)
++#   define sigabbrev_np(_x)	sys_sigabbrev[(_x)]
++#  if defined(HAVE_DECL_SYS_SIGABBREV) && HAVE_DECL_SYS_SIGABBREV == 0
++    /* sys_sigabbrev is not declared by glibc */
++    extern const char *const sys_sigabbrev[NSIG];
++#  endif
++# else
++#   define sigabbrev_np(_x)	sudo_sys_signame[(_x)]
++    extern const char *const sudo_sys_signame[NSIG];
+ # endif
+-extern const char *const sudo_sys_signame[NSIG];
+-#endif
++#endif /* !HAVE_SIGABBREV_NP */
+ 
+ /*
+  * Translate signal number to name.
+@@ -77,15 +81,18 @@
+ 	return 0;
+     }
+ #endif
+-    if (signo > 0 && signo < NSIG && sudo_sys_signame[signo] != NULL) {
+-	strlcpy(signame, sudo_sys_signame[signo], SIG2STR_MAX);
+-	/* Make sure we always return an upper case signame. */
+-	if (islower((unsigned char)signame[0])) {
+-	    int i;
+-	    for (i = 0; signame[i] != '\0'; i++)
+-		signame[i] = toupper((unsigned char)signame[i]);
++    if (signo > 0 && signo < NSIG) {
++	const char *cp = sigabbrev_np(signo);
++	if (cp != NULL) {
++	    strlcpy(signame, cp, SIG2STR_MAX);
++	    /* Make sure we always return an upper case signame. */
++	    if (islower((unsigned char)signame[0])) {
++		int i;
++		for (i = 0; signame[i] != '\0'; i++)
++		    signame[i] = toupper((unsigned char)signame[i]);
++	    }
++	    return 0;
+ 	}
+-	return 0;
+     }
+     errno = EINVAL;
+     return -1;
+diff -r 1ede927d99b3 -r e30482f26924 lib/util/str2sig.c
+--- a/lib/util/str2sig.c	Mon Aug 17 19:37:09 2020 -0600
++++ b/lib/util/str2sig.c	Tue Aug 25 16:48:13 2020 -0600
+@@ -1,7 +1,7 @@
+ /*
+  * SPDX-License-Identifier: ISC
+  *
+- * Copyright (c) 2019 Todd C. Miller <Todd.Miller@sudo.ws>
++ * Copyright (c) 2019-2020 Todd C. Miller <Todd.Miller@sudo.ws>
+  *
+  * Permission to use, copy, modify, and distribute this software for any
+  * purpose with or without fee is hereby granted, provided that the above
+@@ -37,19 +37,22 @@
+ #include "sudo_compat.h"
+ #include "sudo_util.h"
+ 
+-#if defined(HAVE_DECL_SYS_SIGNAME) && HAVE_DECL_SYS_SIGNAME == 1
+-#  define sudo_sys_signame	sys_signame
+-#elif defined(HAVE_DECL__SYS_SIGNAME) && HAVE_DECL__SYS_SIGNAME == 1
+-#  define sudo_sys_signame	_sys_signame
+-#elif defined(HAVE_DECL_SYS_SIGABBREV) && HAVE_DECL_SYS_SIGABBREV == 1
+-#  define sudo_sys_signame	sys_sigabbrev
+-#else
+-# ifdef HAVE_SYS_SIGABBREV
+-   /* sys_sigabbrev is not declared by glibc */
+-#  define sudo_sys_signame	sys_sigabbrev
++#if !defined(HAVE_SIGABBREV_NP)
++# if defined(HAVE_DECL_SYS_SIGNAME) && HAVE_DECL_SYS_SIGNAME == 1
++#   define sigabbrev_np(_x)	sys_signame[(_x)]
++# elif defined(HAVE_DECL__SYS_SIGNAME) && HAVE_DECL__SYS_SIGNAME == 1
++#   define sigabbrev_np(_x)	_sys_signame[(_x)]
++# elif defined(HAVE_SYS_SIGABBREV)
++#   define sigabbrev_np(_x)	sys_sigabbrev[(_x)]
++#  if defined(HAVE_DECL_SYS_SIGABBREV) && HAVE_DECL_SYS_SIGABBREV == 0
++    /* sys_sigabbrev is not declared by glibc */
++    extern const char *const sys_sigabbrev[NSIG];
++#  endif
++# else
++#   define sigabbrev_np(_x)	sudo_sys_signame[(_x)]
++    extern const char *const sudo_sys_signame[NSIG];
+ # endif
+-extern const char *const sudo_sys_signame[NSIG];
+-#endif
++#endif /* !HAVE_SIGABBREV_NP */
+ 
+ /*
+  * Many systems use aliases for source backward compatibility.
+@@ -154,11 +157,11 @@
+ 	}
+     }
+ 
+-    /* Check sys_signame[]. */
+     for (signo = 1; signo < NSIG; signo++) {
+-	if (sudo_sys_signame[signo] != NULL) {
++	const char *cp = sigabbrev_np(signo);
++	if (cp != NULL) {
+ 	    /* On macOS sys_signame[] may contain lower-case names. */
+-	    if (strcasecmp(signame, sudo_sys_signame[signo]) == 0) {
++	    if (strcasecmp(signame, cp) == 0) {
+ 		*result = signo;
+ 		return 0;
+ 	    }
+
diff --git a/app-admin/sudo/sudo-1.9.2-r1.ebuild b/app-admin/sudo/sudo-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..1f1f6e60dd34
--- /dev/null
+++ b/app-admin/sudo/sudo-1.9.2-r1.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam multilib libtool systemd tmpfiles
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} == "9999" ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	uri_prefix=
+	case ${P} in
+		*_beta*|*_rc*) uri_prefix=beta/ ;;
+	esac
+
+	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
+	fi
+fi
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+
+DEPEND="
+	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:= )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		sasl? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap[sasl]
+		)
+	)
+	pam? ( sys-libs/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+	${DEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+BDEPEND="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	pam? ( !skey )
+	skey? ( !pam )
+"
+
+REQUIRED_USE="?? ( gcrypt ssl )"
+
+MAKEOPTS+=" SAMPLES="
+
+PATCHES=( "${FILESDIR}/${P}-glibc-2.32.patch" )  # drop for releases after 1.9.2
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+set_secure_path() {
+	# FIXME: secure_path is a compile time setting. using PATH or
+	# ROOTPATH is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
+		echo "${ROOTPATH}")
+		case "${SECURE_PATH}" in
+			*/usr/sbin*) ;;
+			*) SECURE_PATH=$(unset PATH;
+				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+				;;
+		esac
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:${thisp}
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
+			newpath+=:${thisp}
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local SECURE_PATH
+	set_secure_path
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	myeconfargs=(
+		# requires some python eclass
+		--disable-python
+		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/run/sudo
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable sasl)
+		$(use_enable ssl openssl)
+		$(use_with ldap)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with pam)
+		$(use_with pam pam-login)
+		$(use_with secure-path secure-path "${SECURE_PATH}")
+		$(use_with selinux)
+		$(use_with sendmail)
+		$(use_with skey)
+		$(use_with sssd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		if use sasl ; then
+			cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
+			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+			EOF
+		fi
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins doc/schema.OpenLDAP sudo.schema
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+	pamd_mimic system-auth sudo-i auth account session
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	fperms 0711 /var/db/sudo #652958
+
+	# Don't install into /run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/run || die
+
+	find "${ED}" -type f -name "*.la" -delete || die #697812
+}
+
+pkg_postinst() {
+	tmpfiles_process sudo.conf
+
+	#652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-admin/sudo/sudo-1.9.2.ebuild b/app-admin/sudo/sudo-1.9.2.ebuild
index 6a957716959a..78ba5eaf6cbc 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/supervisor/Manifest b/app-admin/supervisor/Manifest
index 0e74740676d1..a32ed3da246e 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -2,12 +2,8 @@ AUX conf.d-r1 182 BLAKE2B eae951b6dc0252ee7b13988d65addb667d24dc452a2c50644a7857
 AUX init.d-r2 553 BLAKE2B 270ff81ca5bac99f22b49bf47ec64d73b4328804ea264e99301de3d563d2479a3640a0f5e35b2553d679e97a85480d273db170b741638b0a90929fccb490deb2 SHA512 d8d7d6165445fb4bef75454dd2b03c866fb4942c19d6ae4a8b36a900bdd9ee3a55cade02304d49d6e0095df885a1a4fa52694012a7d85d67cc1b181aaf69d8cc
 AUX supervisord.conf 2525 BLAKE2B d36d6ef6b952a99ccfd61976c21eb54922555db4802288d9364f02331da5e693bce3862869248f7c0b81285576ca633e679a26acf75f03b2e620e16eea963909 SHA512 1ce55ef1f9a4cd7592645007af5e0f18147e8dca1c324ac2e48bf58aa2191ec657cfa68d7e6bdc9ba8e0747b32f4e6a44009e8c55a7bd77b265ac8593f51eeb7
 AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c45da2bb7017631bf4af4b858bc4d7964f1d64937e331728884bc21e62e9d01b11cca46aaea389372c6bad SHA512 0fe777d1f0bf70dc9b49132102ac90083261321850f80e9e323459c894c55f722ab8470eba3ba7bb35a9d69ad411a3247546066d6cba5801c9b289350ea4bed5
-DIST supervisor-4.0.4.tar.gz 437708 BLAKE2B 211726da07ce31c00da0d6edba57942d78ee5d2757927b22afe569364c29aaf55375d4895b381f06071bc6b6c39a926ca2073e8fcb8e0ea9673a89aafd08b346 SHA512 22a38f759b0584310f5e16acbfc7b0c4cc59f3206fbfaf6295bd40a826d50ad02c8b0093821362c5038dd987a6599879d82dcefe948a2eda702b89e9f92e471e
-DIST supervisor-4.1.0.tar.gz 459020 BLAKE2B 0c4bdc2c89f54c08ad536b43852941f1aadb0173013e0f73337302f500b779023bfa0fcf8cc3ace4968cfc724998a08ea5a63680e290051d13c7cd8ac788dd24 SHA512 1ae343293707ebf33d0a0c0bda2c6cc78278e12737940a79e51b2365e7a20b07d9f5e50134ed2abbf8e7af1ebd8f1746002a159cde1cfc35e83fda0a77dae9c5
 DIST supervisor-4.2.0.tar.gz 456056 BLAKE2B 51b66cfc34505b937c47c9b510d81bcc777b9372fdeb2e08fc25153d2718cd2682258b812630160954587ceb992e1a528cdd5bf0d270139f7ffac9463ac2f015 SHA512 626d806f4b03be7cbff795afd1bdb3ff5ca5ecf44f035909ea1aa9360da9fa3047b2fe05543190bf1442f01dcdd403be19fcd907519bf7e26615900bc4bf9d0f
 DIST supervisor-4.2.1.tar.gz 460935 BLAKE2B 0c65f904599c1e8a04cd3a71085e2b2a5460691c2bfd790d3b7c10449cae08472bcd72a870cbe611801434624f405ea3e245f156cab93f25a8df784b58d948d7 SHA512 c560ef959f8d580fb20c1812aa2a838c9feaeb3726a754e8084fa8c7406ff9258139b55b081558b8d8f33e4672cdfad40695170f55412a5e85a6c1aed0f11657
-EBUILD supervisor-4.0.4.ebuild 1889 BLAKE2B 742a09c3881070eb8bb8356521a8064689341055dd23b449bfe150449c4fba4d0e60800c329fc3b2c1ad2f84f34ddac293d698183999b3ccd7814108a60d0916 SHA512 dd02e46bf2d19adc95da5ff836851e900a636d8f9b41317a5fbe3d39485391d8a597d4af1522884a5c6cedf8986f0e8338f46a7e160c6c66d702df26550b1849
-EBUILD supervisor-4.1.0.ebuild 1479 BLAKE2B c6ce3863be2f873514d1c170c9140bb5288c65729c83a81f8620a64780db2f84a659ddd6d5978cdea9f6df683026cb444ca1f920be8cdc234558a8d206e8b8fe SHA512 bcb297829bec3c8bfb8b2b41813a4e2f30ca8b92400e1cd286a4c69ab051bc52045198a1bbfdae824c20f58e6c82d6b5e86bc9b2ce556a68069b50c5aabaaca8
 EBUILD supervisor-4.2.0.ebuild 1717 BLAKE2B 3b43ad7862ec2b40aa3249ee2614eb47e3d07236d6c4f5b48f6337cd45e36c1449d5f7f4ec69550cb15473affdc759adcc144312fa766e95d365b9fb25dcf889 SHA512 a5d045834c67f084034be38ecbdfdb079b358786e932b3a19aba1552f7b68a96aeb0fdfee49e754765331b4a3b5ac14096f237ce90c54d3aec345227c305ece6
 EBUILD supervisor-4.2.1.ebuild 1481 BLAKE2B 550b341dbf20cc142ba747f8bef222edbd9b173f21e12c9549677488ead4df4d187efab4969dc6dd1250bb2568b1bc92a95ae20f119942e115c0d070bdba1b4e SHA512 0d279ffb60ade7fffee94c8b857b9ba6b3015f556e165b005eaf1e09c954b7eaf1a997635728f6b0054d19f3cb29c8b79d006f83cdb56549cdb0ef03a676e41e
 MISC metadata.xml 623 BLAKE2B dc7acae3a83fce87bdaf98f65ba4ac2434e0344faeb8ad302dcba5be3a59f2b6ffa9d85338ad432100d5e1017e40bbeb606724a214097e14bcc7082eb331986a SHA512 f05e62f68c51fe2bab054d03b3a902682eaaa133de08ac558a92736868dcc8049d1f27828e3ecae8f5f64b038bb8a322e58c90401e6fe01d215941e1507076e8
diff --git a/app-admin/supervisor/supervisor-4.0.4.ebuild b/app-admin/supervisor/supervisor-4.0.4.ebuild
deleted file mode 100644
index adec89632ec0..000000000000
--- a/app-admin/supervisor/supervisor-4.0.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 systemd user
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/meld3-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html
-		HTML_DOCS=( docs/.build/html/. )
-	fi
-}
-
-python_test() {
-	pytest -vv || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newinitd "${FILESDIR}/init.d-r2" supervisord
-	newconfd "${FILESDIR}/conf.d-r1" supervisord
-	dodoc supervisor/skel/sample.conf
-	keepdir /etc/supervisord.d
-	insinto /etc
-	doins "${FILESDIR}/supervisord.conf"
-	keepdir /var/log/supervisor
-	systemd_dounit "${FILESDIR}/supervisord.service"
-}
-
-pkg_preinst() {
-	enewgroup supervisor
-	fowners :supervisor /var/log/supervisor
-	fperms 750 /var/log/supervisor
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
-		elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
-		elog ""
-		elog "By default, only members of the supervisor group can run supervisorctl."
-	fi
-}
diff --git a/app-admin/supervisor/supervisor-4.1.0.ebuild b/app-admin/supervisor/supervisor-4.1.0.ebuild
deleted file mode 100644
index 66bc0c1f5828..000000000000
--- a/app-admin/supervisor/supervisor-4.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 systemd
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="acct-group/supervisor"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newinitd "${FILESDIR}/init.d-r2" supervisord
-	newconfd "${FILESDIR}/conf.d-r1" supervisord
-	dodoc supervisor/skel/sample.conf
-	keepdir /etc/supervisord.d
-	insinto /etc
-	doins "${FILESDIR}/supervisord.conf"
-	keepdir /var/log/supervisor
-	systemd_dounit "${FILESDIR}/supervisord.service"
-}
-
-pkg_preinst() {
-	fowners :supervisor /var/log/supervisor
-	fperms 750 /var/log/supervisor
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
-		elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
-		elog ""
-		elog "By default, only members of the supervisor group can run supervisorctl."
-	fi
-}
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 790ec5aa9a61..3f376c0ba38f 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -819,10 +819,10 @@ DIST terraform-0.12.24.tar.gz 10427523 BLAKE2B 088d0cd249a065ef663b41690e0c1e27b
 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.1.tar.gz 12837736 BLAKE2B 8dff2604a5827b916e17596f35909c65fad1be945a147f7d7e6a708d77363bde383ed19a36ceb87613c1004d04463f854b74794b92077e6a0777200302a7626c SHA512 10cb69d5eeeb692fe5c423c0326ee1248115de89c52e3e10e350108fa7e9bcfea1133fc7c3eb1ee3e3391608e9ab05bae6b0f00de68210ecdca8b13f0e4314a4
+DIST terraform-0.13.2.tar.gz 12810056 BLAKE2B c8e01cd3e3bc822cb3cc1158adfcd582642c9c6f174f21f1ba1b415f87527a9379231805731cf65de2071486598dcb9478f84cfa080125c9cd4c9e95e7f343be SHA512 db6ab93c4a6a07ef407ee97aa6e01acb937670c88225b0ad5ae1c51d99f69e863204a4b82c39dbd161f9af530997527c6aeee02c8b96fb33da91b9c4b472697f
 EBUILD terraform-0.12.24.ebuild 777 BLAKE2B 686b38d1df4e28c19f03812fcad15802193f11fc1c8da7ba263513122952ccb9f9d5d469b9ed5e44e1d147c4f7d4d7f1e225ed6345d9d1934cfc062df1be6713 SHA512 4f2f3cd4b891778209a279cd62954cbc91e440422ac5334b88b09e274804c24c1ce9a898d4cfdbeb9623c5e370b8ec9c72ce56801386e981030d821939a7ed91
 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.1.ebuild 39892 BLAKE2B d51dab818c74e4c7bedba8521da79dda9562d59dd377982cd50f14f162305ac7a81c81a1620d27605b284571fa329f79a709539b7e87ff4ccbe2a6829a034cc5 SHA512 bc01136c15d20525276d25885f5de5d8588b5967de21fee7f5017df91fbfa91efa944a43833c0dd3fba89a08fd52176c277ecfd562e1a9694c20f6c1257b094f
+EBUILD terraform-0.13.2.ebuild 39892 BLAKE2B d51dab818c74e4c7bedba8521da79dda9562d59dd377982cd50f14f162305ac7a81c81a1620d27605b284571fa329f79a709539b7e87ff4ccbe2a6829a034cc5 SHA512 bc01136c15d20525276d25885f5de5d8588b5967de21fee7f5017df91fbfa91efa944a43833c0dd3fba89a08fd52176c277ecfd562e1a9694c20f6c1257b094f
 MISC metadata.xml 1074 BLAKE2B f14c6ede900b616f5a5514adc9735d25fa834dc879712ab79b68fe15a927cb3e8e77a7b30ee8af3b44551be9ec2368476757c4ec5e5b44fcd266367b485fc8bc SHA512 2e28b3de2b512246ddfb76b547151683c4202620992f9453747b4869db1a16d92996cbf810bf82f09e6895ddc7b23ecc2e0ecaf43d9c3ba9e8a2fb53baa995dc
diff --git a/app-admin/terraform/terraform-0.13.1.ebuild b/app-admin/terraform/terraform-0.13.2.ebuild
index 75a77c9c8731..75a77c9c8731 100644
--- a/app-admin/terraform/terraform-0.13.1.ebuild
+++ b/app-admin/terraform/terraform-0.13.2.ebuild
diff --git a/app-admin/verynice/Manifest b/app-admin/verynice/Manifest
index c2611fbe6b16..95ea27adc000 100644
--- a/app-admin/verynice/Manifest
+++ b/app-admin/verynice/Manifest
@@ -3,4 +3,4 @@ AUX verynice-1.1-build.patch 2529 BLAKE2B 5ec0b3c4b4c1a91d3f7076068bfd3a39128d89
 AUX verynice.service 158 BLAKE2B b71905d327904eb6a524e5d6b2dbc1606ffd0b5bbfad659c9d336ea41edbe8e6510966886cf814888bf8ec55cdd033299b1c91b7e7e3c3f455fa0f8a6ab8ddd3 SHA512 03a88cc405c8d6fa18f1e523e6987b1455011cf17ff38f1e937d523b33d88cae839f256811b487ec3141d8b396a15b8af778998d53bf55dd69f6a6a6dbc6a148
 DIST verynice-1.1.tar.gz 37576 BLAKE2B ac499b298858ada109f298bb2d37dc5fc7ecd17386994749a5a8a3612038eaa98d1f122ed990d9c8bd9e17a428b0a3b4c0c7f0df4a9f1c0441e3fe22fbeb1d07 SHA512 731fa22162bb4f48b943839ccf8ccdc769587e323da11e4a77ad14539a724ffbb89e5f4122e1ab36df3306c507afc958d1125160d34d9cbf55df4dc69e4a0139
 EBUILD verynice-1.1-r3.ebuild 724 BLAKE2B e2ce6f00a8230f0c18d8ad80a7f5c46d77a9c34108e2d704b7d2b21c19700bdcc606bea015e5e765220363f12e4a4d0dce023d7f92cd63d15564025698f84941 SHA512 497e0b2229baa3fd5d566554d4b2d028b34ccc45dc4be387ef0052b030900178ab697cf3b9b4ff9c690f0f2b09ee05c5ffc1f00590f207b3c973272ccae02815
-MISC metadata.xml 318 BLAKE2B 1786ed2568f2f60dcaa875da07b616c2c77a1d4fe0151463db5542db66caef11931259da6bca4b437e125849caa3a3505ee607eca6c57b35ecfa75f45c82f370 SHA512 04cee3becd3a20c8f455969ea4c38d7a0843283bafded1af5310fe090159ad2ae0c804fc4893fa88138ad98aa3feda6991624c8a4942b245b64db5eebb3dcf46
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/verynice/metadata.xml b/app-admin/verynice/metadata.xml
index a1dec792eedb..7a38bb900964 100644
--- a/app-admin/verynice/metadata.xml
+++ b/app-admin/verynice/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		A tool that can dynamically adjust the nice-level of processes under
-		Unix-like operating systems.
-	</longdescription>
 </pkgmetadata>
diff --git a/app-admin/xkcdpass/Manifest b/app-admin/xkcdpass/Manifest
new file mode 100644
index 000000000000..4e40112a5f49
--- /dev/null
+++ b/app-admin/xkcdpass/Manifest
@@ -0,0 +1,3 @@
+DIST xkcdpass-1.17.3.tar.gz 2072127 BLAKE2B 20339e7a0fd43f86eb83d89774613fa0009a13ca190be7d36edb8244b7d2e0b48041b3f8c7156c04e4d2dbae0c4475f5f1e577701e651146acab1284aa6c032d SHA512 5359b0b4e3076c2b385773862ff03e3700888d1ae967a26c5b19add3c9d2cde179ed5ad3309c5b53ab6cdbd40c8fedae1f6b9b0483dba83858671f9d816efc6c
+EBUILD xkcdpass-1.17.3.ebuild 976 BLAKE2B 2afa94b45e102b2181d9c171b3e8fe501844e870c28f4e1875e108218362735f7f09c7088208c5d5d35aa8b73888294eea9f9ce1e3f1105e2ecdb8acc72af474 SHA512 12be95eb6e479fc0b7748d14daa9c9521f4c3972386cac3428e92667a5fd42180dc0f6d01252de24bea7392a768c4c13bbd1a29a4ce9efe6e69febe90f9996f7
+MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-admin/xkcdpass/metadata.xml b/app-admin/xkcdpass/metadata.xml
new file mode 100644
index 000000000000..c67d4dcaca5b
--- /dev/null
+++ b/app-admin/xkcdpass/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/xkcdpass/xkcdpass-1.17.3.ebuild b/app-admin/xkcdpass/xkcdpass-1.17.3.ebuild
new file mode 100644
index 000000000000..982abbe2a248
--- /dev/null
+++ b/app-admin/xkcdpass/xkcdpass-1.17.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Password generator inspired by XKCD 936"
+HOMEPAGE="https://github.com/redacted/XKCD-password-generator"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD CC-BY-3.0
+	l10n_de? ( GPL-3 )
+	l10n_it? ( CC-BY-SA-3.0 )
+	l10n_no? ( CC-BY-4.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="l10n_de l10n_en l10n_es l10n_fi l10n_fr l10n_it l10n_no l10n_pt"
+
+src_prepare() {
+	default
+
+	use l10n_de || rm ${PN}/static/ger-anlx
+	use l10n_en || rm ${PN}/static/{eff-short,eff-special,legacy}
+	use l10n_es || rm ${PN}/static/spa-mich
+	use l10n_fi || rm ${PN}/static/fin-kotus
+	use l10n_fr || rm ${PN}/static/fr-*
+	use l10n_it || rm ${PN}/static/ita-wiki
+	use l10n_no || rm ${PN}/static/nor-nb
+	use l10n_pt || rm ${PN}/static/pt-*
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman ${PN}.1
+}
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index b1d37cfc5083..a503a4c18214 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -2,4 +2,4 @@ AUX 99xstow 65 BLAKE2B c3d3dae69e0ed5251a996ddfb164795718974e1c2464176e680373fab
 AUX xstow-1.0.1-ncurses.patch 1070 BLAKE2B 58782b144bf997d88e1480f7743afb8d6dc2e814a4a412bb0d0ebf8cc83ae0d1aab5605228e7a6228e0aec6b8fca83104249e80e7f2406aafe2f9ab8408cf6eb SHA512 63fce626ad5b376a5aa2d335fdd4d73ce3a1b7fccc5a6ff5ab92182d6f3ca40417926b9d35f3447ed73f386d3022d6dc81ec39a2f790fea46b681d344fdad389
 DIST xstow-1.0.1.tar.bz2 153530 BLAKE2B ad5d2677725f2254bb87a4cf8f73e8158868a206f41e9a2ee7bb2547ae6e8634ab65f58655a04051425e5818071253672ccf96b8ddccd01026e992d085e0c1c5 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b
 EBUILD xstow-1.0.1.ebuild 1210 BLAKE2B e05705c7ca16a1f3767ea0b7520262142ccbd3ba07f880ad92b587f58d065a0c0f96b248799d92f792c30349cf37893e3bd398f5ebbb9c17e81cf925f0279d1b SHA512 c33be296f15d73fc57622ef8cd41ac6984a36ab07932ca84eeed71535add7e1125752f8f324262c02fc06ee1c0963744360d66451f273b27dbeb997b6a05dc98
-MISC metadata.xml 422 BLAKE2B b4f2fdf4510d87729e84ce43f6576e220eae0e82219c62e18ca7d3db1483d819fe60218df9baf68292463e326860bccf180f961a1b2c9df884c209f232b7a705 SHA512 c78f69be0d671d4d92a65412327ae34d9a61777227194b3d41032232da8e623be99ce8c7d6897b65e4b2971e37cad1ec1d5f180779c31cca55bbddd5e74e5344
+MISC metadata.xml 324 BLAKE2B c246a8ef98a1336c05a4da27154039d211c9f8abf0b634f32a2b6cfb3eb8a8888f24f594449468213bbf7cf4db4bf50d2fc0f1d0bc3797bfad8ff48d0ba3bee6 SHA512 88047ab13e5a2d8dc89d81f310f51b25ba1a7ac57501209ec4cf987bc5c2c681a445836a1111dbc0d7ddac0ccebb6da95ebd90ed2ca262cdb50a2bb9c6c76ce0
diff --git a/app-admin/xstow/metadata.xml b/app-admin/xstow/metadata.xml
index 4154b7255346..e42ba7295211 100644
--- a/app-admin/xstow/metadata.xml
+++ b/app-admin/xstow/metadata.xml
@@ -5,7 +5,6 @@
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
-	<longdescription>A program that manages the installation of software packages.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">xstow</remote-id>
 	</upstream>
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-16 09:32:48 +0100
commit	9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch)
tree	b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /app-admin
parent	b17a3ef12038de50228bade1f05502c74e135321 (diff)