gentoo resync : 08.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
commit: 24fd814c326e282c4321965c31f341dad77e270d (patch)
tree: 033d63b33c21a3209964ab56005bb9bdd523630d /app-admin
parent: 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
84 files changed, 1598 insertions, 1031 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 82276d04360e..e3a31ecc155d 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index dbcad9d41370..2132becde76f 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,7 +1,3 @@
-DIST ansible-base-2.10.2.tar.gz 6023200 BLAKE2B 80abfa3fab56d3f997cbe90b557ffd5004b216709d6ba2c6d50ea0fb7a2e5a2ad49ce83bfc7a17054582e786f53ce29814d8b5a3fc2408a1e729b1647619080c SHA512 2ee60303841e88d3451ddbcc4c18473d3a37253873406b0783816b1bbf9d8404599ebed12bac7c7f32693314048668b84f3a1c593621c7b8c37a7b48687c769b
-DIST ansible-base-2.10.3.tar.gz 5836841 BLAKE2B 000ee1e369beb450a9a58680030fc7605f62020a28f0ec4634569be0b12ca54c79d0c36a6022895f93b6f8449b8f8483e07590eeea233383490600bbce600aff SHA512 4da2c79c7d990bbe07e136447643484d947e512693194017623deadd88d6556dac67865069182059ae2daf82a13876600dc5472712d6ab6e0556cb829fce3b5b
 DIST ansible-base-2.10.4.tar.gz 5708083 BLAKE2B dcae17dd84dd1985703bf55bffd4a7907ecf072fcc52c76633fd2fc1d3461901b284002f69ce542ab8447f7aa6a2f65ff4c9abca1a7c1c8df3ad69a4179b1c33 SHA512 50dcccc0b40f47590d3ea56907f987bddbb858952b0d6a999db0b706232a571037dc31e66a773370be57ca14d11a7091c53a480d7f3cecf4a5e7f91895661100
-EBUILD ansible-base-2.10.2.ebuild 1678 BLAKE2B e2ea250401ab8e5a12ae93e07788844ed90dcbc430137b3298c215d2efb56e1e6156d87d7fbe1c99826d0fd4d4cb087e6c1d11a1509e27fc11c582542d76e76c SHA512 e8da7dd4f6bf332a1138b4ce2f0eab40be05d4a5d5e932692877158c6e579eb4ea8e9daaac147f6dfc27c8ecf3f68604cf0429996b88f8b005294cec29b8c272
-EBUILD ansible-base-2.10.3.ebuild 1679 BLAKE2B 7a0df030842dd19e042b56cb771802b0eff897739456dcbda6fc85749b4806d9277f59fa8815618a6147c11006b574d9466386f8160d466124531ee2303dd6cb SHA512 178689c5fa8db63ea02da55fd552ede89e8b2cadad9ee0d72f9d3bf92cebb383a48f7a38ff1085c140d0c977740df5630b786f6a94c7a4b4737cddba449f23fd
-EBUILD ansible-base-2.10.4.ebuild 1681 BLAKE2B 8951247229c2713c1399a2236bf7ed8fcfcaa1c91b6365f5f7928be3da9e5419e855c7ab55ac5778ffcab0584d767b27f21696cf6c9e85c4fc156efe0bc14a6f SHA512 df4909f9d68a5fc78220eaba10f473bd65c839ac65e453f4e890fc52a16179feb9f988552c64d1fab8e9756a359c3483aaafd1f90117b184f8103b4e4fd3138f
+EBUILD ansible-base-2.10.4.ebuild 1678 BLAKE2B 97b1821b3d5adadfccf88e01ebfac3edef631af01156a714d4f8b3b6bb178c98998415ab2742df8bd6152ae9c1871e88ff1362ca0a348023bbffa84455430e73 SHA512 68af5a51524cc631020a9016cfe42036e27149a9e5bdbd826f6dd7350d725b720bb47e19b9351e51c1b8e94038996a6eb96dcba8c69760772bc78cc9210fccd6
 MISC metadata.xml 1266 BLAKE2B 449ac5109e0fb6b64d32185f0660ce6e8c3828a830f8516d680f47ebc25aef880ab5116103d67cfba02e04b1ad496917fbf67252b7bfc062d828e22f15b961fd SHA512 95d52b68b5b3efad6d8575741430b2d1c18a7c7b41a1374229763fea7c599f3ff2b46dee51845e20388829faa4246e5a05011e61254e91d10709457a4b822f0f
diff --git a/app-admin/ansible-base/ansible-base-2.10.2.ebuild b/app-admin/ansible-base/ansible-base-2.10.2.ebuild
deleted file mode 100644
index b24b734cb988..000000000000
--- a/app-admin/ansible-base/ansible-base-2.10.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-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="test"
-RESTRICT="test"
-# doc removed due to https://github.com/ansible/ansible/issues/71395
-
-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
-	!<app-admin/ansible-2.10
-"
-# ansible-2.10 or above is needed for the collections
-DEPEND="
-	!<app-admin/ansible-2.10
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${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_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r examples
-}
diff --git a/app-admin/ansible-base/ansible-base-2.10.3.ebuild b/app-admin/ansible-base/ansible-base-2.10.3.ebuild
deleted file mode 100644
index 5dbedc04ecfe..000000000000
--- a/app-admin/ansible-base/ansible-base-2.10.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-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="test"
-RESTRICT="test"
-# doc removed due to https://github.com/ansible/ansible/issues/71395
-
-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
-	!<app-admin/ansible-2.10
-"
-# ansible-2.10 or above is needed for the collections
-DEPEND="
-	!<app-admin/ansible-2.10
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${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_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	dodoc -r examples
-}
diff --git a/app-admin/ansible-base/ansible-base-2.10.4.ebuild b/app-admin/ansible-base/ansible-base-2.10.4.ebuild
index f376ff42569a..10ce97471c50 100644
--- a/app-admin/ansible-base/ansible-base-2.10.4.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 IUSE="test"
 RESTRICT="test"
 # doc removed due to https://github.com/ansible/ansible/issues/71395
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index b2dc15a7fb88..962ca9dd0fde 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,9 +1,5 @@
 AUX ansible-2.10.0-CVE-2020-25635-6.patch 2961 BLAKE2B bd023424bb075a743881056d6e0c0c194ae56cde0ed3b9aad2ef5a2f75d6a63994a0455a896e6e9f16cacd0f1c3438eb45cd2352d4f4b53810f19728b5a7de5e SHA512 36bb9321e9524d04f06d7156ad6f7f72ce4bd75332437a33ff49c226e12e8e4f8cd82976ccb0c02076ee95de762988d6783a2ed00453b1b8893fe8127847bc30
-DIST ansible-2.10.0.tar.gz 25454980 BLAKE2B 91f930518b90b36aa2c21f553092233059fada86fd1674c9c6e881484b1bd4e68a3eaa05d82e15115906e55da99c43394c3de36a898e26bb222f780b82f8a5bd SHA512 878036f06e1705e4392223bda210b2acae0232069d0cec02a47f13f6b3bc6c9538fb515a2d2dc6003695bcf0915fdd3dfc5b8dc59355e37e2ca8fa48bbd79657
-DIST ansible-2.10.1.tar.gz 25851704 BLAKE2B f9f42ab9f7864a48f0d960b4e8149dfba3ece6c4b01c08db59f9ba5fbcd39771c7b315bf7c9853641d15c2bb6319c9b9ebc791440fc8933780895024c9b74c12 SHA512 46bbbfb22e5c3715df0069d420b174877dffd59f91613779e7057648d15751d528a9cb57357709d0c04a507a60e20c87b109ba1904e1f313441cf5832ba93b5e
 DIST ansible-2.10.4.tar.gz 28622006 BLAKE2B 94551986f5e8ef54dd4f806a264f8373b19564f74b32bfc6d852d49b7b9ff1030ad3c2fdda2f16bc78c0dae5e07cc750a3992bca23fd9bff0f2466716ac32374 SHA512 da9517ad1f478eb8ccab3bad15f3f6ca4d6151798b5aab6db261c4b19a0ac023db1e294745a06748788820ece8980bf1c2c6274314fa0a2943b76c0658383b72
-EBUILD ansible-2.10.0-r2.ebuild 1985 BLAKE2B 30885a55981450ae698183239f9659e770e5afafb774722dc4dfeb48789c3b4e8985f39e917ff497911f84363dceaf1bdf7c2d45537c8f6e3bf21e57fc88a67e SHA512 e48e28eaf5ee8bfa2e54e3245b448105e6687cca172ba1f3fba5b68b2c165a16045d94f5794b936426658bdc53883342aaf7fc7a4eb4bb7ef7b3bb8bc0e014b9
-EBUILD ansible-2.10.1.ebuild 1908 BLAKE2B 009631ae1683884cc6f0c7ee1de1849944e8ab6d967554fa19904a9d959dd6e63603a40ff2fb6b70b20c22211b03efb5ac65932d4aafb0e39aefff3017c4e8f3 SHA512 a53a5352f6f13e295bf93d27fba404b59ead3dfadd9d51472c22c9a6b2b3638c95961e262d55e8345de41f3ad76c2190c2bc852bbdfc57e4c1d614eaf33f7a2b
-EBUILD ansible-2.10.4.ebuild 1518 BLAKE2B 05cb37f3d8a2805d76d5f5cc64880babc20fa1db50207f3ba6d4ba56afe35c7792109991975c4b644294cb28ad8860e4a3ba7ec844acfa54f492942d3c3c5042 SHA512 54aebf31f5721dec424b4bc7153509dc690df0fb6730487d868226903a3241ed84fd0d7c3910ebc926f4d51a29d5af54e1c9bb173551740f4a0456822eb6a8f6
-EBUILD ansible-9999.ebuild 1545 BLAKE2B 6a08a6b254a318114889c4f56586ab71ed8af353c0b38bc99c2ff6363bf76673f04e044ec7c5f313337682a26fa1578395800da63d0caea7ac9173c3a4d9acc8 SHA512 15d4b6cf8a02d44197aca55ba941e5fc3b6168d37e47146da5023a0cf2f1a64a4788984d56fcce9439a6194f20e6810fe55aeb747fe0d93055b4a426501f40a9
+EBUILD ansible-2.10.4.ebuild 1515 BLAKE2B c144c9099dcc347fd5eec6945222d1c4b80f357e0d5c6645dc8a45f1812adc75d8b33bd1d7aaf3c233d718f15152242834115ce78376f2e5b7f40819db9046c2 SHA512 5a65db7ac0770ae19d32f9c19a391d6a2b17ea64d21d182b6fc6fcd1cd274bce31f1e623a1b56a1711f42c63d1e7519fa28292a56086fbb02a858cb2cf0b18e2
+EBUILD ansible-9999.ebuild 1520 BLAKE2B e7358a5fb39611b0aca5c62cc18c9e40a992844d3a94d8f2677ce1a05cd80d4ec730a4c701566d65a4d4bb993630bab13db24e84748cedab7ac13e826ef74012 SHA512 f349dc7ab23e08540a103ff4724b81f50d54c8f99ea6e9c1a28555e752fb0ebd8bce7aec11791da718349dc7f1b96fd16f9d7448616d3571c8025d6b5f8478c2
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.10.0-r2.ebuild b/app-admin/ansible/ansible-2.10.0-r2.ebuild
deleted file mode 100644
index eae0967a94af..000000000000
--- a/app-admin/ansible/ansible-2.10.0-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${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
-	app-admin/ansible-base
-"
-DEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	app-admin/ansible-base
-	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
-	)"
-
-PATCHES=( "${FILESDIR}/ansible-2.10.0-CVE-2020-25635-6.patch" )
-
-python_compile() {
-	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
-}
diff --git a/app-admin/ansible/ansible-2.10.1.ebuild b/app-admin/ansible/ansible-2.10.1.ebuild
deleted file mode 100644
index e14d7dc95522..000000000000
--- a/app-admin/ansible/ansible-2.10.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${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
-	app-admin/ansible-base
-"
-DEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	app-admin/ansible-base
-	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() {
-	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
-}
diff --git a/app-admin/ansible/ansible-2.10.4.ebuild b/app-admin/ansible/ansible-2.10.4.ebuild
index cfb7d42b3a3d..3927ed75daf0 100644
--- a/app-admin/ansible/ansible-2.10.4.ebuild
+++ b/app-admin/ansible/ansible-2.10.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="devel"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 04de5dc07690..77a14c34734d 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,6 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
-	KEYWORDS=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
@@ -23,7 +22,6 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
 IUSE="test"
 RESTRICT="test"
 
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 51c2ed7bee08..78be115b92b8 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -2,7 +2,7 @@ AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c57
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
 DIST httpd-2.4.43.tar.bz2 7155865 BLAKE2B cd85c7e25500f8f1b4bd6ac5f715718a61bf548dfaf36408a970d27bacbfce256e4dda255ba5b62f89e117c335d0568d6207c93e5fb0d2b1ee84dba4ce0d4bd7 SHA512 16cfeecc8f6fab6eca478065a384bdf1872f7ac42206b0bc2bcac6c0d9c576f392c07107201f39e0601dec1bbafcb33d66153544de4d87d79b9a52094d334b64
 DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
-EBUILD apache-tools-2.4.41.ebuild 2542 BLAKE2B f3389b4174f91111825074df092502859b3c2a81b9056d869cc2da4e31f4e4b10da95536d1dcbbf9156f6177b7ee8c1f45da14792d2e28d207d3e2a0ccf7e3ac SHA512 698c732450c4cb9f47940e1c73be54bc0b2f24ff8eb081fa637e0f3706f03739f8dde66f0738b2ceaccdeae993a4f937e7ec70c5e353d846ade7bee7efaea984
-EBUILD apache-tools-2.4.43.ebuild 2542 BLAKE2B f3389b4174f91111825074df092502859b3c2a81b9056d869cc2da4e31f4e4b10da95536d1dcbbf9156f6177b7ee8c1f45da14792d2e28d207d3e2a0ccf7e3ac SHA512 698c732450c4cb9f47940e1c73be54bc0b2f24ff8eb081fa637e0f3706f03739f8dde66f0738b2ceaccdeae993a4f937e7ec70c5e353d846ade7bee7efaea984
-EBUILD apache-tools-2.4.46.ebuild 2542 BLAKE2B f3389b4174f91111825074df092502859b3c2a81b9056d869cc2da4e31f4e4b10da95536d1dcbbf9156f6177b7ee8c1f45da14792d2e28d207d3e2a0ccf7e3ac SHA512 698c732450c4cb9f47940e1c73be54bc0b2f24ff8eb081fa637e0f3706f03739f8dde66f0738b2ceaccdeae993a4f937e7ec70c5e353d846ade7bee7efaea984
+EBUILD apache-tools-2.4.41.ebuild 2531 BLAKE2B 7ab902d03942ba42d2cbf2a239b919730b573041e3b5cf69ae5797749825b4d1c5a49babbf06e3b436543cb198063fd67ca86af0454e099a7c9edd6c0b8e8747 SHA512 e113dcb3859b9bff9277c12e4a84911d3ea8ec1fdae9da82526b5e1d99294e640f35610370d006be38f798dfc91f00f438aae534e2a850639e175dabb5893f5e
+EBUILD apache-tools-2.4.43.ebuild 2531 BLAKE2B 7ab902d03942ba42d2cbf2a239b919730b573041e3b5cf69ae5797749825b4d1c5a49babbf06e3b436543cb198063fd67ca86af0454e099a7c9edd6c0b8e8747 SHA512 e113dcb3859b9bff9277c12e4a84911d3ea8ec1fdae9da82526b5e1d99294e640f35610370d006be38f798dfc91f00f438aae534e2a850639e175dabb5893f5e
+EBUILD apache-tools-2.4.46.ebuild 2531 BLAKE2B 7ab902d03942ba42d2cbf2a239b919730b573041e3b5cf69ae5797749825b4d1c5a49babbf06e3b436543cb198063fd67ca86af0454e099a7c9edd6c0b8e8747 SHA512 e113dcb3859b9bff9277c12e4a84911d3ea8ec1fdae9da82526b5e1d99294e640f35610370d006be38f798dfc91f00f438aae534e2a850639e175dabb5893f5e
 MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122
diff --git a/app-admin/apache-tools/apache-tools-2.4.41.ebuild b/app-admin/apache-tools/apache-tools-2.4.41.ebuild
index 507fe59e1ace..7c26535a0d35 100644
--- a/app-admin/apache-tools/apache-tools-2.4.41.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/apache-tools/apache-tools-2.4.43.ebuild b/app-admin/apache-tools/apache-tools-2.4.43.ebuild
index 507fe59e1ace..7c26535a0d35 100644
--- a/app-admin/apache-tools/apache-tools-2.4.43.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.43.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/apache-tools/apache-tools-2.4.46.ebuild b/app-admin/apache-tools/apache-tools-2.4.46.ebuild
index 507fe59e1ace..7c26535a0d35 100644
--- a/app-admin/apache-tools/apache-tools-2.4.46.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.46.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index 27f775656966..f5a2fc74fea6 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1,9 +1,5 @@
-AUX apg-2.3.0b-cracklib.patch 920 BLAKE2B d1b0decd8a35db02ee8132350a04f61ada715e3316113ac0afa98b85602cf62594f392b14710c617426273acaf0d2d01a930b00809ba84d9ba3bf05b3ff9a327 SHA512 11fba45b144b28c613d6c9dc4cd2ed62d18ab306dfe2fb8e347e3d809d80f605096168b770fee70f9205f07f94aa87f8afe183551133431ad387d383a9b093a3
 AUX apg-2.3.0b-crypt_password.patch 844 BLAKE2B c87ccb6002eac2c363a5b35dc033badf3968562956a4f49697c98368293aa98f2420ff56ac742a7308a2373183c3883c5bce30cd1d8cb72f6f788df2891f8275 SHA512 bde5b1bbc4084cd4d2630ea92ed73c970cd217554638d17980c4d56b0da2f55cd7cafbc76b5073bd0415a7698b70df9d357f0c1731353dae46990e9407d7bb94
 AUX apg-2.3.0b_p20150129-cracklib.patch 1485 BLAKE2B e6df97af3cfe408d68a86461733a060a7045d9cafd1a82821c56756b6c69d27aba5ba6b7b189346daf52cd407703e07ccff4a66965953f0a20c1ac19add4a064 SHA512 d7e3b210627ac6df34cb380c9b6bfdfd3eff790750082c7ebc40a837a88c73467f0e5847633a51b32c7634a57821b06c704bace511dfae18bc5d3e473f9e43ad
-AUX apg-glibc-2.4.patch 260 BLAKE2B b30c414ed89f22eb7dc2d0e3b115dbbc0845aba06f2a9dc0dea61fb36d9ccfa231d56959e7f02b3f1fb337654eec5cf2bd60c53ce24e112470c9fc9b9c225680 SHA512 27463b291aee051a4a149664cfd3dea524a34cd88d5cb90c5b4891fe0722aad9993cfd10df555455890ea631d8844d566d23cbb3812f8cb2859e131ea4c42114
-DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
 DIST apg-2.3.0b_p20150129.tar.xz 313372 BLAKE2B f5a1b894a0379294c478020de512af047aec2e7c9d881cb2f4c79df88583707b5ce0e995623915b6bd11b720e60e0f8696e0ddce472441cb1d04f3bf7a818e32 SHA512 7be813368b4b6fe4ae2882d85c40b6cf80ad44b7aa7e46c8cb97926ef89edf4f59e9a4c76a7aa9f725ac6ce1f0df361f8b68ef6dce798e1e0a8d55767c7a16e8
-EBUILD apg-2.3.0b-r7.ebuild 1240 BLAKE2B a43a3137eb6f64ef3005812609627b72de0223c73fef78657b15a553f419c0353d8bbc485d708689af0167fcaea0a16dfdfc3779ee13028bbe8b41cbc5c7ff67 SHA512 fec9142349b0d61a2c36b11ce66706a8f8bdafa4dda2dbe6742c4cccb3e0a265643a407d4de01e78dfeb7aecc9b81ac06beebd3247bacb268c4b459877bc032e
-EBUILD apg-2.3.0b_p20150129.ebuild 831 BLAKE2B 401da933459d3f23fd9085176151e383ebef7fb8004097a8f0f703838e886b306fef96ed554be26fd87f5044ae7c6ba6e0ce62e4004a9591dcf4e7814582e279 SHA512 15c3981c58ce8c40dcfb5d57672105480108e007a3b3966786e5f8153bc356e8e61edc6cba66b9ba6effde078b0e7ec88c898e6fa88343871af9bd4b15de355d
+EBUILD apg-2.3.0b_p20150129.ebuild 830 BLAKE2B 85a870b95cfce7962738c907f484ce1556be1dda95c4f6c2e0f62b2349d4bca667e80c892488ea87af7cd9c989404797a6f3b416595331cefb88a2228f77fab6 SHA512 41a9838e7ab2933656a4bcf2bdc5eac3389e26f7269d0ed1194cb36b68111ef612c912d944f837115841c0a3dd4e4263acdbb687315b5baa0f24645e21434040
 MISC metadata.xml 323 BLAKE2B 3b44b94032a0312054a8d1b5e1d77d8104646ca23a5ee93f20e34a93947184353a2c953141a1de172639fff8100eaf8eda38d1a65690ae99dbc3e533464dff6c SHA512 63dcf35a66f95ba538cc976762491f8e248d5679fe854f06f6c98394731c61f28f66f49bab54e5fad3d48a6cb8f611d2afb90f5ddf48a55eb60ca1b26a649926
diff --git a/app-admin/apg/apg-2.3.0b-r7.ebuild b/app-admin/apg/apg-2.3.0b-r7.ebuild
deleted file mode 100644
index cfc9ecdda9be..000000000000
--- a/app-admin/apg/apg-2.3.0b-r7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Another Password Generator"
-HOMEPAGE="http://www.adel.nursat.kz/apg/"
-SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cracklib"
-
-DEPEND="cracklib? ( sys-libs/cracklib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	if use cracklib; then
-		eapply "${FILESDIR}"/${P}-cracklib.patch
-	fi
-	eapply "${FILESDIR}"/${PN}-glibc-2.4.patch
-	eapply "${FILESDIR}"/${P}-crypt_password.patch
-
-	sed -i 's,^#\(APG_CS_CLIBS += -lnsl\)$,\1,' Makefile \
-		|| die "Sed failed"
-	if [[ ${CHOST} == *-darwin* ]]; then
-		sed -i 's,^APG_CLIBS += -lcrypt,APG_CLIBS += ,' Makefile \
-			|| die "Sed failed"
-	fi
-}
-
-src_compile() {
-	emake \
-		FLAGS="${CFLAGS} ${LDFLAGS}" CFLAGS="${CFLAGS} ${LDFLAGS}" \
-		CC="$(tc-getCC)" standalone
-	emake FLAGS="${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \
-		-C bfconvert
-}
-
-src_install() {
-	dobin apg apgbfm bfconvert/bfconvert
-	dodoc CHANGES INSTALL README THANKS TODO \
-		doc/{APG_TIPS,pronun.txt,rfc0972.txt,rfc1750.txt}
-	doman doc/man/{apg.1,apgbfm.1}
-}
diff --git a/app-admin/apg/apg-2.3.0b_p20150129.ebuild b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
index a7a50f646dae..776ab76cb32c 100644
--- a/app-admin/apg/apg-2.3.0b_p20150129.ebuild
+++ b/app-admin/apg/apg-2.3.0b_p20150129.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cracklib"
 
 DEPEND="cracklib? ( sys-libs/cracklib )"
diff --git a/app-admin/apg/files/apg-2.3.0b-cracklib.patch b/app-admin/apg/files/apg-2.3.0b-cracklib.patch
deleted file mode 100644
index d297495b3211..000000000000
--- a/app-admin/apg/files/apg-2.3.0b-cracklib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/Makefile	2003-08-07 09:40:39.000000000 -0600
-+++ b/Makefile	2004-10-14 07:16:17.288530686 -0600
-@@ -44,10 +44,10 @@
- # If you want to use cracklib for password quality check then you
- # must uncomment the folowing 4 lines (you must not do this for WIN32)
- #
--#CRACKLIB_DICTPATH = "/usr/local/lib/pw_dict"
--#STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
--#CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}' -I/usr/local/include -L/usr/local/lib
--#APG_CLIBS += -lcrack
-+CRACKLIB_DICTPATH = "/usr/lib/cracklib_dict"
-+STANDALONE_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}'
-+CLISERV_OPTIONS += -DAPG_USE_CRACKLIB '-DCRACKLIB_DICTPATH=${CRACKLIB_DICTPATH}'
-+APG_CLIBS += -lcrack
- 
- ##################################################################
- # Support for ANSI X9.17/SHA1 PRNG
diff --git a/app-admin/apg/files/apg-glibc-2.4.patch b/app-admin/apg/files/apg-glibc-2.4.patch
deleted file mode 100644
index 43b5874fa2b6..000000000000
--- a/app-admin/apg/files/apg-glibc-2.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/restrict.h	2006-03-26 03:33:50.168661936 +0400
-+++ b/restrict.h	2006-03-26 03:34:10.427582112 +0400
-@@ -33,6 +33,8 @@
- #ifndef APG_RESTRICT_H
- #define APG_RESTRICT_H	1
- 
-+#define uint32_t int
-+
- #if defined(APG_USE_CRACKLIB)
- #include <packer.h>
- #endif
diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index 0db1d53b9e47..77a6ebd78a19 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -2,6 +2,6 @@ AUX diamond.confd 57 BLAKE2B 8a5e3f478d3eb948e262239a9a83026e067ed67f2a4878075c8
 AUX diamond.initd 659 BLAKE2B 945ab65f07091de300082518d57f7c479a2c29800c8813494f2e45babf030bec9dc11b640378bbfa1bd2445be498f03b14e1f30f6a814401db34e0733fcc44bd SHA512 c6a9e120ab4012335d75610dac60b2ea0c9bc3f3d8244f14caa0ee7b5c50f623e330dee580285de0ce4319c554d9f9996fbe07b9e35d1a3c30a14f57ef97ecc7
 DIST python-diamond-4.0.515.20170311.tar.gz 671963 BLAKE2B 9449f2d27b48c0e24727eb2c415a5095b20199d9315ef69df92a4aa6f8f3397743f3dc6cf2d8d91f79eca309926731b6b42da170a02987a20aeccd1e0980f4ac SHA512 d18a80540018975455b839a78fd55d13d167726b92914e3dc2de1c6f27f47319962361e05961c55047ba185e11ebf57831f3ab5cff9158a50d30a2ca635d53bd
 DIST python-diamond-4.0.515.20200620.tar.gz 674623 BLAKE2B eaf290a18a79115fdc013addff5b9d5a5c5b5ce06989c7e3cb8ac5dd988f47878a893ae37a96d1f020dac1aff00ebe191bf27c3d19ac5625afd56cf79451a141 SHA512 5e43aa1bb7acbeaa80db2bbc8e956042104fa9364893b5149bcfa7bff3e00b3667a112243e7a1fad85c1fb1b0c2e2727d0f73fb6851c1959ac95c1854b0c0f76
-EBUILD diamond-4.0.515.20170311-r1.ebuild 2930 BLAKE2B 367260bba34e5ce64c5b1070ad2daa3c9a21fa76286a4d62b7452475f7f899f3b41efd101187439767ee9782c9b679a3263141a07681ed4c857b589204623a8e SHA512 07e79c270f6c987dda3d2bb4e98ad848b46b43964118fdb6878a278f0ca6bf43a21b965ad59f2032004a16bfcca1da7f23ebf91354f552915d4565e6f4989e3b
-EBUILD diamond-4.0.515.20200620-r1.ebuild 2395 BLAKE2B a6424ab9ac1ff2f1cd8a4c69beabbb8534d0a3ccdbc44fb9f822cb36b7af12bb6406af382d7e4eea6fae794785674dc39cfe6a12e8578f1562b7c035b5e0c20c SHA512 576d410ed4475bda3ae2dbeaa529283e08780124d5e040856418bbba8d202f23d38a1691bb22a0c5b208720e30d1736dc669459a58eb483f926b19182889232e
+EBUILD diamond-4.0.515.20170311-r1.ebuild 2919 BLAKE2B 4f57f4806a326a827b0320bf4113f68803080202777f952ebcefb12591e84cd6778d4640baf18d5e25d78eb9f787a3797c162d0ad80ff7134692dd66a32ccfef SHA512 a16a901a7505a69532682aacefd06f115880152ea65efb9a0497036bb6640d5b872d18001a6432fdb4997bd0603bd3408ace27d883144bf6d517de00ca5ca090
+EBUILD diamond-4.0.515.20200620-r1.ebuild 2384 BLAKE2B 22164937f7f344b0523018c772cbec83f1e93390c1d35126374a4bad2582aef023eae2749446e3b81a610a5a22a1eba9a1fbb679ae7cec896def424cda5a09ac SHA512 9aa98f7e60e484343fc1ecf89d3f96f2c3f632fdc84dd7664cd574106ee5abaa32b9654852765889f16d6f6e701e2e49e8d082a003a27bb60df4cb37576bc059
 MISC metadata.xml 802 BLAKE2B d013e1b87c2f1d5f0f628766ed754a4ac50e9c9e710b7b2542081cd06988f7f577513a53165c54ff4d1d1de3bba92ec2089eaa15d16cbe946f7489d0345aeaaa SHA512 c455baa068661000d395e15f6952b3106cb3633f1a95395745c6a0d7cc5dbfb193d018af1341f27b250226bdc109e961bda4a612115d5805958f8e500108239a
diff --git a/app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild b/app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild
index 80dbc4734ecc..7a55b7eb2c8e 100644
--- a/app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	GHASH=73207d04e0739a4ce92bc201b36681c42d9fa7e7  # python3 branch
 	SRC_URI="https://github.com/python-diamond/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${GHASH}
 fi
 
diff --git a/app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild b/app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild
index 938b0d14ce90..41dd6a756b92 100644
--- a/app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	GHASH=8d8a2e49d80d44968a34d43e36c1d864695a29c1  # from python3 branch
 	SRC_URI="https://github.com/grobian/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${GHASH}
 fi
 
diff --git a/app-admin/emacs-updater/Manifest b/app-admin/emacs-updater/Manifest
index 9a71fcbdbf99..1999e7388aa7 100644
--- a/app-admin/emacs-updater/Manifest
+++ b/app-admin/emacs-updater/Manifest
@@ -1,3 +1,3 @@
 DIST emacs-updater-1.16.tar.xz 7112 BLAKE2B 82160ef71b4c22a385a45765c1f60b7d428297cfb3b51f84bd44b176d1bd302165f9ccdde803aae628a2dab9e0520098082232c513b2006ae5facfa283f287ab SHA512 3de3126debc49ea47bd57802c1a3aa82a0769ab392741fb891c93ffb66141f05f58025fa0de746ec78795fc34c135536740e447e1f6a4ae59aa847d21bd6215b
-EBUILD emacs-updater-1.16.ebuild 952 BLAKE2B dda69320623c22c46cd1d746a9513280a35798b16793e6e274e60c41ed6ae68d2e80972109568440a5369deb50da2d7715a30a34a5bc697a7bfb5299a4c721f7 SHA512 16cf55dc73c5b8eea8d3a6cae3e5f918304387c85e29a3269a40ae56cb52faf13bdc89c16f2bfbfe26b08bf0ab34f9e3719187adb34d355e5064a29ed1bc4431
+EBUILD emacs-updater-1.16.ebuild 941 BLAKE2B c6ce9accdd102f107263e1c13625f269636e042592843c52cddf0de4b45d990f6b0337153304b634b656b24b055d49ab3278bc1f1f9c530c107787a504b0ccb7 SHA512 cc33615d09d324c4f22f3ab7f672a76c8a0e4698c55fce2ed9a3287079871a6fcca18dd67b6c20b1bd8f274d47d0c6607e408c8e4cf092c2ae3c8dd34d40f94f
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
diff --git a/app-admin/emacs-updater/emacs-updater-1.16.ebuild b/app-admin/emacs-updater/emacs-updater-1.16.ebuild
index 59762c1354ae..e86a8f90937e 100644
--- a/app-admin/emacs-updater/emacs-updater-1.16.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
 RDEPEND="${DEPEND}
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 20fd94a26369..b8bb99167ace 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,6 @@
 DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
 DIST eselect-1.4.17.tar.xz 178980 BLAKE2B d905ac88bc009080912af75e64c7920d745788866fa3cb35466d68a652efbbd6984d6e1efeed76d9a344aed94705b74c85aa43e9c037d4d548d2e24afa69bd7a SHA512 35dc4c52f44c4f64db9c0dc2aec57b3055a6d36760b1bbbd094ad11b3f9e71a731444802632817b89c3b511f1dc9bb92046b59322d177e13fdc501ed767b591e
-EBUILD eselect-1.4.16.ebuild 1559 BLAKE2B 9617bcec623e305cfb926d728a60ca500e0f53d79cab12af0aadf7a42fb15c2cb42449a11f92e6e6bf07c55ec9980cbc005e18d5a55759818e26eeacc1eae214 SHA512 9ee05ec3422bf9425ffdfa8402b564314675b68cad73548e5f0d1f84a73e31579e05125a7f2219df37733c80209b84720b88078040223e203e9481fc5d8d3089
-EBUILD eselect-1.4.17.ebuild 1554 BLAKE2B 27ad5f4edd4a162a6bd16b32b5406a7e0a94d6bdc2492823f36db3056e332257af80600e029096618873e667cf11e71667d81631d01550367be6161b33c7d914 SHA512 b77cd2b16052ef3ad604fe4260e4700679a89b7b3fc09456eebee5758a5a5bd42dca604e5ea1b9dd53b9b6797e9ad20cce7704a8b1352bd80706a652f4950bf6
+EBUILD eselect-1.4.16.ebuild 1548 BLAKE2B 01fa31bf8ddd0a4180d003a077431ad59579b6bba23f310c14021baf38f5de04142598f00478a91f88823fafbc3be2d0a653fbe105f1a3ffdef29e42b83daf8f SHA512 ef73f2ef644b9edc9154a7d1faa7a81ad2b53c4b7e6e02d57993499f16b0359d508e1c0d5923ace609fa5b52c2f0b6c6ea267cb8380aeb8d518d5702056bc8ce
+EBUILD eselect-1.4.17.ebuild 1543 BLAKE2B 209d0e4324070ca448aabe290e6fc017aed72951fd8469edf4659ff6c719267bc7006c947dffc816558c423720466ba5977d7cd57399625f3e1fb7092f3b34a0 SHA512 4ac01a2cdc0af8ef4e85bf80df4c5c372d8f181d1f20278c6c172495d7ba36bc002af81075cc897ad1aa48e4cea643c7eeaeb8a74ce7c207892c5cd2147e0b9a
 EBUILD eselect-9999.ebuild 1394 BLAKE2B fb62991371b697680959344974f4d7d4cdedba39337b12d004588d118632be5cd26c2026024fd6a2cc1e448f196c3367b82ba3fe347617149602c4730f8083d1 SHA512 78c75a30e9a8bfb370620b25cd200be9c6a8724858548cd1ab76926194f9d96a25c7441463d1dcb7a2aa3a6c947b1a656d6a0b455eb95e9ad9a1535f8cb349ce
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.16.ebuild b/app-admin/eselect/eselect-1.4.16.ebuild
index 1f492a64f269..555ce6185536 100644
--- a/app-admin/eselect/eselect-1.4.16.ebuild
+++ b/app-admin/eselect/eselect-1.4.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/eselect/eselect-1.4.17.ebuild b/app-admin/eselect/eselect-1.4.17.ebuild
index bb5137982560..40e4b07b1903 100644
--- a/app-admin/eselect/eselect-1.4.17.ebuild
+++ b/app-admin/eselect/eselect-1.4.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 DEPEND="sys-apps/sed
diff --git a/app-admin/gtkdiskfree/Manifest b/app-admin/gtkdiskfree/Manifest
index 897f11c65aae..9d8710fe2a1f 100644
--- a/app-admin/gtkdiskfree/Manifest
+++ b/app-admin/gtkdiskfree/Manifest
@@ -1,5 +1,3 @@
-DIST gtkdiskfree-2.0.3.tar.bz2 216189 BLAKE2B 146dae89b0f66328840f22bd7b9e8ad751759dea3a67c332d71e513388be46122cb761fec6229258b63e85c726ee889e04a56d405437904f1eb8060ea31ee88a SHA512 c6f093ff023cb8c67090b3bd3660a998163e786b08386f346bdc1aa7b29e030a31cfb0ef54c55f109f211bf045f90afd20558b91849a4f82d041c99532f170fe
 DIST gtkdiskfree-bdda379b9109a226a37801505a19da91494144a6.tar.gz 318381 BLAKE2B 06fa325714dba0ec8ee319448286af791472d4aebdd7b94923fc102dfa0352f69247b941e91877c906b754a3b15c8c97d3b01281389274bc92ae23d1c4dfe858 SHA512 641aff62adb665ed6faa82925cc8941d894591e8209a46097b04a5feaba50a401144414edaaa1d97dd9c6b01fa6b4a057b3a5d96f9fd20318f85e535550ef2b7
-EBUILD gtkdiskfree-2.0.3.ebuild 606 BLAKE2B 7e437ee97362a5b8152cc036b8f92854efb9eaa3871f3a694795603b4375fa1e52f2eb70c5cfd8ce18b25606185d45dc74164e8b0d178d5c6ad2d1673f4c06f7 SHA512 b40217538674ee82af7902d25144acdfb4a3940aed487c2030687271e2107103fba230e611d57c23f6998c7194047b0707e0b98a7701bd843491221930da4962
 EBUILD gtkdiskfree-2.0.4_p20200224.ebuild 775 BLAKE2B bfbc8fa6f36663e46239e49954c2e23de38a6a32aa88991f6a7f5b6322fe58112e490c71a610516f2ff2d7b6da9e58559df87f26660c6e698d30c93454374c63 SHA512 e3aac871b014e841241b7af30feefd40168feee5eb883c9090a5a5792ed3dc582c9de6db2078dedee77e28abd7b4c501cc7cc782d1783069429cf05868c0e338
 MISC metadata.xml 445 BLAKE2B f29d0cf84087c74f4b4c336209891779c2333b2c4838f359e230f3b2d5ab0bb8dcf20734ba7815a23a78fef03b4abb74a0ae40830d7fbd4ad94781c605f41ca1 SHA512 06d2091ac361b713e98ee2e2fdc4997ec9b2cb2e511ccad8fb686e94388448d4422961987c6bfe66241c5318f77b6c7d37032f0cb6129f2fc994a573f8cc53f9
diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild
deleted file mode 100644
index 25ff319c3ea1..000000000000
--- a/app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-snapshot
-
-DESCRIPTION="Graphical tool to show free disk space like df"
-HOMEPAGE="https://gitlab.com/mazes_80/gtkdiskfree"
-SRC_URI="https://gitlab.com/mazes_80/${PN}/repository/archive.tar.bz2?ref=${PV} -> ${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk2"
-
-RDEPEND="
-	gtk2? ( x11-libs/gtk+:2 )
-	!gtk2? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf $(use_with gtk2)
-}
diff --git a/app-admin/hardinfo/Manifest b/app-admin/hardinfo/Manifest
index 67d4d24571a1..6bb88bb24be6 100644
--- a/app-admin/hardinfo/Manifest
+++ b/app-admin/hardinfo/Manifest
@@ -1,5 +1,3 @@
-DIST hardinfo-0.5.2_pre20130823.tar.xz 280472 BLAKE2B d72883e7e57234b3328d03daf4d81cc478b383b51f4de08981792c42b3278ede81731ca831fbc285a594aa7f00f861c870aa6d784b7c282960f5541f04f9ce45 SHA512 e36bd4eec0090461de5fdb6c17dccf76937ee8fa9cb3411068fc568847f519023037999278bbb8b9a24608ed5b1d7fd2bebfe7115c631ccca1c35fa259cb20b1
 DIST hardinfo-0.6_alpha_pre20201116.tar.gz 1294614 BLAKE2B d585be00603a5da2873d0e15829039f3f5212e2ab294b71d7f53299d7eecdfbb2d46ee8d56913039bf03807cebe3f100f41ce6560a1a33fcd712eab59c2a92a9 SHA512 34ce849f2d1a9ea129502abfb186b43a0d8ddecc853d2edc3128389944a34efa3580c6d8a35b8fc40b55d64cc8f3c0d33b97f198a449ed0cacdbff2520853c1c
-EBUILD hardinfo-0.5.2_pre20130823.ebuild 512 BLAKE2B 207b8597c26c271345aca603bc0f807e95523a2b772c42e0a49f47723735e035703ccc48ec17cd2521871d0578a3868909dd67128729d3203041fc128201fd5b SHA512 9c9b051e7b25b4ad0b576688650ed51bb390a31a7b710014a5d39f63b4eb49e119ce600e46d2e9d0490490e86d235ba83ebee96c72d2c512a1611e3e6dc71569
-EBUILD hardinfo-0.6_alpha_pre20201116.ebuild 784 BLAKE2B f4204ed0fe7e009494d220429f97468fdad890d4749fda17bd57b4101212d17d3e8a7ea2bcc65450dc9f65de5177b38af0d2b8ab4fe8bad3c0080861b47b541e SHA512 e7897398661178bd5551aef19cbe88ed7635f8446df56e9a2d3321efb7200a506e718909a57c4a9ee82b8f44888bfee02668daea749bc9eb49315e58cb04d5a9
+EBUILD hardinfo-0.6_alpha_pre20201116.ebuild 782 BLAKE2B 28dacc6efc8b4d2dce3d4d10568c580b9e11ee9c43efdf5f54759f6dd5bbc084a3199397d10eb526b6b7f4a97fd0bdd32c2054a03ed0f408a74a54e5000bc635 SHA512 b72330fe9284705c91d468a59b839372051055db086f051b53715b709f1f46068302a4dc5f879568ddb2273a7184f1af9ebefbbe1ced6c1afc6793f91402501b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
deleted file mode 100644
index 2a5d57fe7276..000000000000
--- a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="System information and benchmark tool for Linux systems"
-HOMEPAGE="https://github.com/lpereira/hardinfo"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
diff --git a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116.ebuild b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116.ebuild
index 4743177144f4..4b3aba5dca73 100644
--- a/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116.ebuild
+++ b/app-admin/hardinfo/hardinfo-0.6_alpha_pre20201116.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lpereira/hardinfo/archive/${GIT_COMMIT}.tar.gz -> ${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="dev-libs/glib:2
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index 6eb30457a412..ef4793fa683e 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -1,7 +1,7 @@
 DIST haskell-updater-1.2.12.tar.gz 26708 BLAKE2B d0b040cb3b6211b3c5c60f8cfa3dbccbf9cb15d246b21609a21aac746a8a034e284fe0b99891b5035980252a7aa8b376ad943f32882dc29e16226d95583cb053 SHA512 f3a993cb556919bf2e57fdaca7eea9146abc59096e779cbffb69a5c29fc5f6ef889c8ccf4d8331dbd9279919ea91bb05a16d83ad70085d5ef5a44d61120fe7e7
 DIST haskell-updater-1.3.1.tar.gz 26573 BLAKE2B 68e5357e8f24b9b372dba4feac76595cbf35602d9d9094d616497c9d0040177b5f1def5833770041b693220717f3a4976877e0608858d5d8d4dddd26620c71e5 SHA512 39c36c4a8997806bb4d64625bc9ed72334a68e57f8c32f75d0c3704ab52b3b68605444c89480e5186c04bb275b3608ea9544366ebc5a00e010cc5fb4ae8296df
 DIST haskell-updater-1.3.2.tar.gz 26133 BLAKE2B ea72850e5ca35ec18fa00136c654435a852b072aea0402003c962abbb0e0f09e8a84568f78c9186324b0b0ee9658de1b413670e268cfe1c0056810b8c61b479c SHA512 a4d80ecb65efa9ae21008e04b1363ff2196df4ba431fc5ec899bb9904c598c7a109a38f7dd86dd2dc86faca8ed5083d036d700e7f7796840ee5470401c24f3d9
-EBUILD haskell-updater-1.2.12-r1.ebuild 1037 BLAKE2B ef35b3e4d5f936770a7ecefb3d94971078031298fe832fb5c56e2004dd476030b5e0742ea29dff976a59e7aa895062cecc494ae5953e49dbf5836ed536e93bbe SHA512 979671949e1ed11cfece3f0bec2ca8baf634c303fa7f61e2aea56a2d60f2f6692c548716172bf1caa3ba4f626bfb5100cf61be47f1758e2ddf0cd6bd65fb3f11
-EBUILD haskell-updater-1.3.1.ebuild 1048 BLAKE2B 43bb858e8a653c0feb06b3f4dbbfaff1f3facee0e3d04242e0d618423d63baab1cfb816607417881bcabcb8beb3ffa112dde18e15c3138745141b544d1cda07a SHA512 8c5f336bc8998af7d5381a949e7de202a9b1e04309e13c0cc2a5de720fef9383b967dae565a4fcdd9221ca83dd0bb1c07132adba1786290d4a93e1319a1502c2
-EBUILD haskell-updater-1.3.2.ebuild 1048 BLAKE2B 43bb858e8a653c0feb06b3f4dbbfaff1f3facee0e3d04242e0d618423d63baab1cfb816607417881bcabcb8beb3ffa112dde18e15c3138745141b544d1cda07a SHA512 8c5f336bc8998af7d5381a949e7de202a9b1e04309e13c0cc2a5de720fef9383b967dae565a4fcdd9221ca83dd0bb1c07132adba1786290d4a93e1319a1502c2
+EBUILD haskell-updater-1.2.12-r1.ebuild 1026 BLAKE2B 5867a02b101b58fed1be3834a2721fbdc5ddb3873b2015ab0b9ed29100db12b14683020ec8c9c87a6a9ab3861e3affc332ed861c6434a4de4f57c1d028bc692c SHA512 2da05895e28ec3baf796e5859fe7ae9d3dfe1e36af426e166f026df53e4d7fa16e9e757c720381d9af40bbfc449a5afc0d19d49e2ec947d4b4f6284435055b4a
+EBUILD haskell-updater-1.3.1.ebuild 1037 BLAKE2B f4457e24f66c2e00f4b7ad3f7ca3874e02d09c92bf0538dce0555fa5c15eabd0e22956773b812510679fd94cd2661d706a11dd95de3374aad6aaff2d6a884a2b SHA512 15702462bdff201de63fe87f4ea8ac3a2f5b34d3e5b828f5c62ad690aa362f185a5bc391e4f1195cba3cf2993d6d163abae0b94654e97d1db393b245970d47f8
+EBUILD haskell-updater-1.3.2.ebuild 1037 BLAKE2B f4457e24f66c2e00f4b7ad3f7ca3874e02d09c92bf0538dce0555fa5c15eabd0e22956773b812510679fd94cd2661d706a11dd95de3374aad6aaff2d6a884a2b SHA512 15702462bdff201de63fe87f4ea8ac3a2f5b34d3e5b828f5c62ad690aa362f185a5bc391e4f1195cba3cf2993d6d163abae0b94654e97d1db393b245970d47f8
 MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
index 200a5286f8ea..79d82fc62d59 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
index 7bab96460e78..46aa1414b2e9 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild b/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
index 7bab96460e78..46aa1414b2e9 100644
--- a/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ghc-6.12.1"
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index b772cee8ebf5..672ebb46b71b 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -1062,6 +1062,7 @@ DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47
 DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461c9a888afbdc1e214d9260b08324623e5828ce14b9dafdd42febc839e354f242e5ec53e78c9f61bd70338abc6de06090dd8197 SHA512 795de820e4a8622de316ee1b391a9c92476b3a67eee387278cd79f818c275df687ccacc60afbba20491dd813e442fa5a10d84b8b138f712c5a8705e884cb1d42
 DIST helm-3.3.4.tar.gz 635362 BLAKE2B 41c6bb96532ef23738c7f5defa08ad819a9bdfd57d2270e150f5e728f0c5db6358edd318febe4d348c5a50b1018519c48a96403f1e0442897294dcf45d7df3a9 SHA512 9ec2aa5f6c30f9e705c812be77bac2815586ffd430d1316d343ade1048efc84abac603bb0185b6dcfc66029a8a5398c3de945830ca39d2415c62c4b7ea0c678a
 DIST helm-3.4.1.tar.gz 655551 BLAKE2B dd6c0bb4e290dc0d87eb02f687a1b53a66de8661bcb29821a004982b9157c17ce992858d4e28522c4ad5f187f097052011c18d3500ac12684d8ce611aad10cd4 SHA512 08b86c55472e22904383770a82104fe97ee08b800e08028c20bb599e133e4eed721d024357d7a40b826c4481623ba31844003279172250a055a10fae879d6cd6
+DIST helm-3.4.2.tar.gz 655844 BLAKE2B 4a5b0dc96bf3dfb5de9047a46c80f24080c5fbf4f1540e4662cf8769fd05e341731d00b9c3aea9f203a441cf20b8f023f8aed18950c5fda08649fd9c32f71c42 SHA512 ca0d61c270ee1b0c9a0c7627827992bec8f866f6624f37862ac2cd090919937f4cdc888f6aae9f2d1a07e032c0a3db9432cb22b33fbe49f67228641fb69f8a54
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
@@ -1076,42 +1077,68 @@ DIST k8s.io%2Fapi%2F@v%2Fv0.19.2.mod 250 BLAKE2B a6bd00134bfb5ca1cc9aeeffb7dfc42
 DIST k8s.io%2Fapi%2F@v%2Fv0.19.2.zip 3838024 BLAKE2B 1e3dad2dd433b9dd49814966320f9a7a1e437a076841bc514f04410e8e5cc0d46d2ca0c15555586d36cc2bbe39d54b67c27fa7e69556e96f6fc978f9db091995 SHA512 a241480631f08eb6c12e47d548e7799c46b5283624094bba2456b55c67a13b7b053008e4bafacb8e0bc0abfb3855e96e094454ed1ea19a514860c21dcb63eced
 DIST k8s.io%2Fapi%2F@v%2Fv0.19.3.mod 250 BLAKE2B 66a92834c1de7a735b757517b7246302b69b3e89ab7eaac0b2501dfad2e34de0effa1b58cef23fdcb6034533a933f5cd680a6942719ebf838860d97fd2561549 SHA512 b328833978423f9e6eeaa8817c3d3a42105a4c28cbb479909e8bc7be5d762ee358f95da22a20f408fcaff432bb30d2760f834c44b121c03ff75b520bdecc6641
 DIST k8s.io%2Fapi%2F@v%2Fv0.19.3.zip 3838034 BLAKE2B 9c213ca11c75ba980ed3d531cfc1dcd983cbfb05deb494b4759e430c11d8b8c4cc09138eec6ad39fa96ca4504e61e2c9d184c973a07a66a4fe6fa5c717ca2d17 SHA512 aa0b1b6e433a61ad5e562230290799ecdd914fe252198ecfc5a388f55cf9a751a58903af359e8f31da8f5fa3398581d202e39975ff04464dad559fefc258f948
+DIST k8s.io%2Fapi%2F@v%2Fv0.19.4.mod 250 BLAKE2B 832af90a5721d00e66f1aafa6e13a8cdb4528325549ba853e1e0fe1e0873bca758e43f9febcf3bbf40af8f4e196113eda25acecc63a9615b8ef915207f48b31e SHA512 4eb8c2d413bfb608a3f198d99b603f632bae77888ba0a235c65344f44725b0c6e288a71bcd50ee7e6abd8d2e43f99856b84a6dd32d584c0fac1cc1f7db0dedc9
+DIST k8s.io%2Fapi%2F@v%2Fv0.19.4.zip 3838035 BLAKE2B 85fd1495473eb653ed1e0880dc6823ba25309d5100e826ebaa501a4bee706134f5e77ef64dd4ca51815f924e54879091c347ac19a912775aa305168b7e4009fe SHA512 f5c46726dad74e7597fc39d4564efe8dd006163958ff931944ee2fa534541212335bffb805ae6a92db143d46f1289c0e1dd0ec1128ba6a6260f9f95ffa8b09b0
 DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.4.mod 1543 BLAKE2B 8b5e7767dacb9d2307101bdda72033a9e51a0792d9307ea774d5d7f35d47ca086885824b059091e9cc2562d82875bf0a4715f02af51af6c58bcd8ca67895ea45 SHA512 3ead818938e51b764c54ab2c47cb2120bdaab68941fea5d7a23959014ec636f8c239f10a45b5a74b74501f2ebc686761442ec005abac667eebf777de06ba3a2e
 DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.4.zip 604313 BLAKE2B ab486857e6e979d5cd760a78f82f794ac40f389788b2f13bbf866c35da46dfb6cb428e85fb1ecc23c609a294612191b3d77329a1119cb06ac4f7ca9e4677fffe SHA512 57c7e0af981be6c5ca086f133b736c8115306a8198730589c16de7cf56661dc805b736be3b5e8c5155e01a7fa0a3b960c522ee5e867adfdbf973e1cffe81bc6b
 DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.8.mod 1543 BLAKE2B 5c29896f1e76958abadbfd7b0ca85376ec5592c2d217bbe078a4d6a96969d8335e259cf8962d7d709de2a738b9258c5d43e23809c526fc99692e8f196995c613 SHA512 e43b1bb4ebeb2c41d1fe8e82e73b71e071e08204b7374f1a3179264b962570da7d75a147e45c41cbe1cf2578d4d72d39e6cf98c6a3e4ba926d6cb0cbf5869238
 DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.18.8.zip 604397 BLAKE2B 0cd2b5acb7cafc6e37e6972b127fbdaaa9bec14d734ab0e0a205481c590f15496c7271c28208e830ce5abab91ddf7b49dd1d8826a20746063070ee9be024472c SHA512 8465ab9e7995ee316df99d6e9330ba17724303eda0786c587adb5ac058604961daa78d72a6a11b480cc98f610c64baa6a8da300aa5089b29ba088ff337ac4af0
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.2.mod 1320 BLAKE2B b9106d3e41d7fd174d14f901c57e5d402e8f5d7cac286d5cc0de171c57c036f496844f6e9c8f19285f42ddb6b56f689f72dc472f0b5834753c005b608c2c1187 SHA512 9b3236f284461b4721d9183c6f78664dc223215edef611c9e1babc85fc016785bafa73248c2db4618bb479374d84a58ab3204a2bcdd87126a38d8b8f4f5cee68
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.2.zip 620168 BLAKE2B 51fe8fe330891d0a9ed7b47578f7a9df9f9c7883b93a6f244283d4a3dd30b2d90aa83ba4286f5f8347238b662ecf8cf3307ed929f0898e9c2aa5e26a628f44cb SHA512 449a6a570059b1cef43b314fbd5fb1b29e5df24f65bcd86e1df4dc5fd491b2637936b705733f226e76968ec150f1ccbfd5119c2cdfc49c7581a04027c76ca541
 DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.3.mod 1320 BLAKE2B ec0e6c11f482b1dd74126512db40700017f1562cbcbd7aa222402a18662d1ddf21b36d6cdb364c38c0ac3131ce9acfb11df04679f20d02784bfa8046b3e7de97 SHA512 f5405869c9c40dbc4903f13f814f3415199919e55c25233535e91cadc10b772bb79ef2b39ea70c589639f1c011f86040adc8750997c73da7e9b22e319ea70784
 DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.3.zip 620174 BLAKE2B 2b78aa7002e956689367d39e3cfdcc33f342e8a598b82eba407663934c89b2a020739161f6395deebdaedac263c18b212d2a2677f833627dab5eb863e0f1e3f7 SHA512 e3a07f1707aeb6e158779c713c61dbb020989dc0fd0b3236e3f20c964ef99c4d2c8f5feccd03f2efc5e9170d628a37d8bc619523ce973ebc789ce7023412955a
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.4.mod 1320 BLAKE2B 07d2a9e6484de5634388702b9e031f3b65b164d0fe3aa9bebc51bea8756750627b31a59bb125bfaf555adcd0b7eab00bb3714be3a927d43ce94987441dc5f94a SHA512 0cbd95c720c4db625fb05b392d55ce3f2ee8fee4c09bf0f19a08aacd6982d6641123f6e7fc447490f892a508a51c2b0b7186808747cfc8cd8ae341936f53ab9c
+DIST k8s.io%2Fapiextensions-apiserver%2F@v%2Fv0.19.4.zip 620170 BLAKE2B 69d8b4a5e658e309e7b4d4debb2d61a91734e0ecc8f9e1e9821ee77e7dc24926261e8765ab56ffef30df33d0b300b89a6f046053efacb7acb6b974e4fdd89ec0 SHA512 aff41eff2974ed6f6fd5f23d43cb410e2886dcaecbcc2303d6cd521a668204887addc83de11520196fdfd842f6e084e7ec38fa67aeb8cb3812fed6b43987bfb7
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.4.mod 1621 BLAKE2B d900a46836b5db1e3fdfc0cdae750be578f87c9ff2628d15d6438efd04966aa45937d0b7cc1ecec59d3fbe5881a324d2483b8a1794a14fa7d099a75084ad7e8e SHA512 dfb42b8cf1147f96a726a745be420a2e3279f53b72accef3766da6d591d0f217fa620af2d2cf9982d848bfd97a150182d60ac58304ff59b7c8b3ce3b31459137
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.4.zip 782976 BLAKE2B 2fc2d707f3591c1d8967c79b16e4ba28baa808d9bc7648371f846c3b27f7b0ac477c0fcdaf136a7315ba3dce128ae598f7c15a48f43592986d9711ef6881f62c SHA512 5f3e21eed6f05db299a30f8f204e2a4ca98e62166c9b232066e8f34ef263f222564a1e2a2a07ed8600ae0ca41a8f9d90678cccf6258377d4f679d60583d2a084
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.8.mod 1636 BLAKE2B 39389c6a705f0959a6661a1732962bcaa47e39c88e1365265d65745f40afe28bc8fcfbda2f756c3cd801f56e54acdb3fbaee31267ddab1823f8121304b146f25 SHA512 cfac07e354564a8d737dcaf549aa47c9b96293a867f25f9a9774451435e5504392872a7be93e441d256c73ae2075b822f0cc1bffafced0af62f4cb5169e913f6
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.18.8.zip 783417 BLAKE2B 51655fb7fc8e4a759e5cd48d5763aff29bb3f31bb19163ffeef099d345e20b6aa07e90f416f8d39350b82a1d1101a6a92b8b9b7ca64929e0ba8cf27beb4c457d SHA512 80877134b8cdaef32951c832d2a2d4c287003b0c3c816ae6538739d29f86d204a6fb0543ec9b3f2c06de79c7b347e3b4eba58ae08705fb1ba474d5653a21d5d3
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.19.2.mod 1408 BLAKE2B be74691cf674c89144a34225010441b5edb70d19c7fde8a12cbf6980f5e9df1c722bd7ed7e70b2f9e9e620d989ff54dcd64931cbafb14a679dc67476f67bf05e SHA512 c46a5eae7bbeccff1e49672a7ccd85a9e66ccfb5b4fbc7760fb663c92be4f7b4653db0a5bbed300a8bb196b5ddc43c81b163807b6a83c866c0e82dd74457df00
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.19.2.zip 799731 BLAKE2B 11a971b3208ed7b3063a5f8d759750ff6eb7d7d3a68ed26e30899c7e62f5114bc8c442300dd565b10bc4a81eca35905390403fc8c98464cb220dc9a39b29e87c SHA512 7e067105fb929d8da7f375f1318dbb4096d8f059e184bb44fd581ee51bcb4cabed9dfdca867090cbe8d33836931b46b3b0d43fc105b91c604b4008891a2c0464
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.19.3.mod 1408 BLAKE2B be74691cf674c89144a34225010441b5edb70d19c7fde8a12cbf6980f5e9df1c722bd7ed7e70b2f9e9e620d989ff54dcd64931cbafb14a679dc67476f67bf05e SHA512 c46a5eae7bbeccff1e49672a7ccd85a9e66ccfb5b4fbc7760fb663c92be4f7b4653db0a5bbed300a8bb196b5ddc43c81b163807b6a83c866c0e82dd74457df00
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.19.3.zip 799731 BLAKE2B d09b48f808b2ae12b907b0ef7444d4196be5f7bc3da445afcfaa44598bdbe4673e35dc2a5c4f3320128d77a0b0da0aea3829503efcaf0a0ef06e43402bd0e69e SHA512 de9f350bd1904cbec33ccaf4d8f26d609fb32c07467a34a22ee19b59321d89e6f251c353a982c82bb13a1cf7a5364c1c729f05b2f2c49fd66b95275a1779ef53
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.19.4.mod 1408 BLAKE2B be74691cf674c89144a34225010441b5edb70d19c7fde8a12cbf6980f5e9df1c722bd7ed7e70b2f9e9e620d989ff54dcd64931cbafb14a679dc67476f67bf05e SHA512 c46a5eae7bbeccff1e49672a7ccd85a9e66ccfb5b4fbc7760fb663c92be4f7b4653db0a5bbed300a8bb196b5ddc43c81b163807b6a83c866c0e82dd74457df00
+DIST k8s.io%2Fapimachinery%2F@v%2Fv0.19.4.zip 799731 BLAKE2B 009b486f8f6b5f2c06a38f62da7376d9b87c2f3cf5e2d676652f0a490430d44110c846d65fdda476e105487bf07936cc18c0b360350611f35f7759dad4b29246 SHA512 c7c3eeb38b64dcf5b5fd18afeb0358591f7707e37bda35001340a23add8a87df4894afe8fc82a4d44a4ce7190a1338c8841ba41536fb5ea3e7569bf0be928de8
 DIST k8s.io%2Fapiserver%2F@v%2Fv0.18.4.mod 2647 BLAKE2B 60bc4bd15addde6f39f3eb29675363680412eb7b59523b7399bef716f97f3749159b34a47115a7cab2a8b0bd5bf79dad6b30a2acd973f1ad8c59056add9bd941 SHA512 2e05b765d5ae7b59c00939e38803373ac32d9e7f883ebe59b00d37e6524bffa7eb3bb25e9068def69f656b475ac428e5ffcf01546529bcc927d8c92cc889a4f3
 DIST k8s.io%2Fapiserver%2F@v%2Fv0.18.8.mod 2662 BLAKE2B c9a6e7dce4ebfdc7d2221266e4901d59214ae2bdb805f89e301e61975ac38c0e330c46d3b035d2b651905c923077dcb015f71ac23790ffbdd91a7b8d91d52246 SHA512 991f184242d84c5d78fcca49067076a84358c1e2290d3c9786f218cc56bb44a59a9cc7a58560edfe9b07fe8696f5749b3f0b095b0f13079dca7fb9f9b88b5758
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.19.2.mod 2322 BLAKE2B 2d595c28bb42b3c7a087ed33204ada493ffed904b17a3cd70410e167fc1f51b5e20d64606136eedf7d9f27a16bd75885af091870b6a19d7d906bb92d55b1e07f SHA512 8f8367c1e8d24ac06fe0bc26c1826a2e0f9a892cdfba17a7b0a220d75eff823e641640468b2a0c816c4f0a50363c3e08de8b305a9d9b94ae61fc685982e6ffca
 DIST k8s.io%2Fapiserver%2F@v%2Fv0.19.3.mod 2322 BLAKE2B e760dac815e2b27dcdc088267ec5de367db73ff4be80f2950b240eaa69cf0d8ee2286fc20d6e0be549adc3a24adc43d75c0b8e7ef28050b7432f37135523eeda SHA512 7d89bb477bdfa31966df56e0da970fd9159ccbbb410c4c602164177fd90834985666e285990092976c8bc0fb8ff88f55b682f490f81b57ce077bbfc5603aeab9
+DIST k8s.io%2Fapiserver%2F@v%2Fv0.19.4.mod 2322 BLAKE2B 80396646b1da421d397454cd8f60caf7380128624cb5c5d6d99cb3571cf2ef11f581bf500226bc515b1fb1042e672046c2e4de11b12029f596349425b47922f0 SHA512 8c407330f8f9ca163708e9bc7ea3343fdc1aded61edd9170940dbb3a70e9122e06dbfa6ac6c6038e5caca6b9199a851bb7e0f042774c668ed37193a4f8e63420
 DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.4.mod 1307 BLAKE2B f525f1fea05b26ef69ba1265bc5ed3979ddeeed48486069b7256f1c06f96427ad11d8ff2bc4e118b3e4bf8969d44909ea4643249c40ab6628ba2e3b877797ebe SHA512 a77a071d74ee0fad326c1c8ddc090250566dd472ed1089c9159af10ddbb1b4309f2ac45f8b66484c2b8242b73413ff9d547cc50d12a9bda00d7d314a9c1a84d1
 DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.4.zip 463311 BLAKE2B dd723eefbed0139db31caaad4da657a6b8461b95d8573746ecd58b657458f2d132167d31b136145b6981181f05d6b46f78cbafd446a15223c0096bee0240cec5 SHA512 ef139627071ff1ec06cf5923c57f008a2a74347064e380e1a04015e3ed6a55f7e1f219d2ad83612e769c48f7946630ec84c939fe69c6943d64385ce03a8cf0e0
 DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.8.mod 1322 BLAKE2B 9b8ce22015f21a78737be48c71083efe074107e7b18037aa63a1f208f0f14d3c26922776ea709626fde54f34a7c3a0071271374b7d48fe2c7fa1f70c7fedbcf8 SHA512 764a74b8ea1912963dd7b4373cfcc0f8ab54700416578e5df9184bb672c1770aa4b8185c2909c999a0669416483bd6da1ac6b1e3c05c4197617d93da15c81246
 DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.18.8.zip 463410 BLAKE2B 0f0c4331e87e7bebc8fc4d6e6b39ab0262113c06ba99523fd6bbb15e9359055dc1d1091b446122cb9e0fa396a1152b32db2a08c37f8e9dd9d22a3d8a17fb93c0 SHA512 4e9295f3831fb8b45a2db0b5d4cb48be5ab49d492eb3046ffedf9601c3aa5967612d94bc09e1be8cde31422e9c3a1c2a04aafe818112f05d92329d47437283ea
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.19.2.mod 1028 BLAKE2B b18366121d500e20c0ee1b2153ee8eb4f67501890200403a03e6eaca0d28052f2d3f7103abea92baf6fb01f5f5371e4560232faa1788a92a0a35a46ce6913fc3 SHA512 b2ffcd761cf60432c67888a102cfeb5c73c22bbb8c8c2ad15de0659b915a3864f2459e0e78dfee73f68dabcef1578942d0b3bf1c4dd28eb3437ffcdde89a56da
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.19.2.zip 473338 BLAKE2B d5280ad5f9a29436e918052ca74d1e477801972e124a82803ccac23f2d6ca558ed9c44949a22b9627d0c135eb88c2900ef34bf37ac38e6eee26aa0116623be99 SHA512 d2cfcb84cca2e2f7936193a085643c0e51aacc0bdba2733ad48064ab8d56f977712026456d17d056cd3f0a9de4c52dddc3d2a8600c02745ce590aebd41cb60ed
 DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.19.3.mod 1028 BLAKE2B a9fbec797f02e6f6225a8292655df449f2f7b526b499bae6c0ea400705cb8868eece215f71db148ab98d8f6abdaf92841067139afb6d53a2b32a7d3624d4797f SHA512 08391e4bb3caa2a1b56376c8fce30aa57949e6fada468c5ba2cd79256d91b5c8d53b218c8de8636420470733fa62c03875bc85472b5e1b29fe05b73e398aaa6e
 DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.19.3.zip 473337 BLAKE2B e052a309f74e074f5b7554f2a37841e109c68629a894ac07113463ffaf5b5be195587b199df6e1e8431ffb3a7297581226167d3a6e3ac79b7079d3719cf79398 SHA512 379a3bb12b457ca92b4a1481b472b2110fb5ae4fe167b4672008dd45d60c1268ea0038503ed26ab4e814ca2d34a0fda458645f67f775c5e3c16fe39460571aa1
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.19.4.mod 1028 BLAKE2B 1983da4d5af92d7a9a4e86a787e342f11c57109402dc3eaf0ab92d48db28bab37c7358a5745ed4e845b897b622e982b636e4ba392ca289e7896a996ecaf8b8d3 SHA512 cf541d742df76967b16f820cb6893f14431e2ff77ab761bb9ae908cef4c70d96f380fe02689d62448c56b45826698d9588a8d8b89f7b77d8a21d4f43b9bdaef2
+DIST k8s.io%2Fcli-runtime%2F@v%2Fv0.19.4.zip 473338 BLAKE2B 151e11545d7bd027b78cca201e173939426d1bb06299820d9e61d4d190575623d37ddc24bd3d60a78a517290fcf243b5b0aa14f18933903afa4ec91a26a116ce SHA512 8d5e647c971bdfacef6166e0e62e8a3bc43fb64f7fcce00a995318d1d224787a9fd31b7257a5d3f2a8a6714938a4da539abfaf8d36deda8ae7a72d1c110cf8f9
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.4.mod 1591 BLAKE2B 2d7c4d51da9090c8ea2507639f519946375fc3e63de1fc451f699c83799c76f43f85b3992ed44b0a5a9e42bd85b9d559b68abb3a41950de9e9012f4a281d6a87 SHA512 2e4fdcd447d6abd2ce5145d9b157267ccce27b52a83e7e31188fc25cae6e853c7beed3a70345ce0a21ce65f13d0644b3432d796e822f9276a49847758abb31b3
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.4.zip 2145721 BLAKE2B 72ada14492290c2ec710330b0fa45e470112d1e666eea75a968a34755438eac46775dd3bba2d31c0a90b3ec4a8e7660c095e32f503d4113b4ffb113d7bcb85ef SHA512 b938bbea89a9aff0596b26d24922e03f16bce963fe61ed612495bd2a0c40cdea72cbbc53b42045f8b5a007d9c4ed95e40f1c26b5de69d72afc50081bed8d501a
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.8.mod 1606 BLAKE2B 18042cd13fb92c6ec2324434c8cd21d77bdade496eb928b30354d3484c8da81e3babe1738d6ce805b8a09a4c275db9573d2e0b9ab15135260089b3646849ee9a SHA512 218fb1280d6188c581174f1d99c21755afa2ecdc07f520b5a87b7e836041cbb1ce2a2576af89c5e6164b3984bfa2fe3b04d77555a58b8be3eb718e2fb3f266b6
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.18.8.zip 2146391 BLAKE2B 680b2547daa7236b244fd1784f3cd0483edb15743fd9a01946a44444cc499638429ab3836fa74a4eed51924402fad43198798becc39ddc45895ed203f2503fd1 SHA512 5c3347234f3a5110ae80c9264f9310f85435d885cf70534a18b632d64e9d7f62b4a7195e52d039f9ea23d32c8bc945c11af0e07d4776ad89464f9d6af5b9fd64
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.19.2.mod 1272 BLAKE2B 5cdf6a7ab7dc115627259253d7b53d11b038bbbc4f62ab07eae9ca16af31e1405fbdcf4abb24e94c047f723e88df76e89f35c53d6ca877d46d15cb7973460b99 SHA512 76f08ad9ef4cae5a3a66f7c134758b29a465a686d5699f407472a65cce2543cf0591083bbac0060b684c9d30eb8c05e9f0aad228f587b75ad8c892fcdaa43777
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.19.2.zip 2193478 BLAKE2B 156e807873d9324ac325322090d988a714b933ed6d07adeab2f844df7db7c2d28352292959879534765e17423f34523133fba9333a2a80d806549e5d26fe74de SHA512 3d79bdfc9f9dd02aa9bffde1f459ad677f95465b0eaa69fa0feebdce76569eaa793a8fac8643217f9464257535468a97790306990752d18c4e6215370077503e
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.19.3.mod 1272 BLAKE2B 84cdb0966744deeef8500c2514ca8fd3b5d98a65e3b1c383346cee0b7a05b24d8aebd088d0dc3039e0ff0c1ea67cb91758cc4456c24cae6bc4bdafbebbabc3cb SHA512 815a14dad481cb63748eef26d374054a4aac284f8d68a67601fac11db5de108f4c1cac40ac2b50609a0c93b1da55d41a2f707d557480218cf9e3b0002282fa42
 DIST k8s.io%2Fclient-go%2F@v%2Fv0.19.3.zip 2193475 BLAKE2B 7900ba17b8bc9921485a0c8caadf969c363fb9d24c8d12553bf21a291ffd9f06e4517f4906744d5457e5193c83e5a030a4f39d7ac9f23987ec4d95d63feefa8d SHA512 a48e4a2f2e93cea912af5d740055761b0109956878e93d61b06611517d86fb78b002f488271d213b05077140bd62402bad4f2d7313ef0fde7ca3c06ba1d98e84
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.19.4.mod 1272 BLAKE2B 5bb5525f24e2e1dec456f5ac4197eb24ca87f5f858d90ca2148a0d4d51f27555e23caab32d33f649b9404170dae34148b22e9d159a7671e82dc9ee55750ca0c7 SHA512 c02ad295d048f191ccebd1b14e4baaf6ace59b807933def2d99cf683ebd45d813b021607e88be63b24583e44c83f11185c2a4a1adfb5ce82a697f6031278d350
+DIST k8s.io%2Fclient-go%2F@v%2Fv0.19.4.zip 2194403 BLAKE2B 079902a044c0a7372828d816ea1593be93ee483e14a3ea24d233bb999a1fc0413d17501ba20a8058475f72712bb2b3775e904ac1fcd3fbee47d7bd6bfe27daaa SHA512 47c348a530b160adcabf6d7f3c866723386b5610c654d0b7cc8e5d20e84dafa00b01b4bcd9b96c89fb5aecfc78fc5fe8c6c5354bc353c1c992c6d8533f14d2b7
 DIST k8s.io%2Fcode-generator%2F@v%2Fv0.18.4.mod 1067 BLAKE2B d3133c2596ababee5cb774ede5881feb974f36d62d58be14e04e2d3652b29d9f0fdcc50373c0fa1068cdd2911dca89183615fb8eee8e181ad45e403d5846565c SHA512 c34e945b634e8cecd22b140b8cf244648a5fc40057950839ead1fa609ae9e1228ddf94bda68c09f79f3e84d0df137e101fdf800b5ac65a57a208d6030225d621
 DIST k8s.io%2Fcode-generator%2F@v%2Fv0.18.8.mod 1067 BLAKE2B d3133c2596ababee5cb774ede5881feb974f36d62d58be14e04e2d3652b29d9f0fdcc50373c0fa1068cdd2911dca89183615fb8eee8e181ad45e403d5846565c SHA512 c34e945b634e8cecd22b140b8cf244648a5fc40057950839ead1fa609ae9e1228ddf94bda68c09f79f3e84d0df137e101fdf800b5ac65a57a208d6030225d621
+DIST k8s.io%2Fcode-generator%2F@v%2Fv0.19.2.mod 852 BLAKE2B 11f881c3c0d6b9ad32f82a2ea0fe73bf26651598006815a995b6f90a25fa15bfb9fe2c48d4718890cb558fac0ca6751e24231d89cd41c7a5357693808d8cc54c SHA512 3dddfe73f05ace10bf417aff050c57bcc8856b0224e8b745c4985e8f57b8b5c86d769030132d13d89b60346654ec88bd3b35fbba67ed15141dfa8ff4c6856847
 DIST k8s.io%2Fcode-generator%2F@v%2Fv0.19.3.mod 852 BLAKE2B 11f881c3c0d6b9ad32f82a2ea0fe73bf26651598006815a995b6f90a25fa15bfb9fe2c48d4718890cb558fac0ca6751e24231d89cd41c7a5357693808d8cc54c SHA512 3dddfe73f05ace10bf417aff050c57bcc8856b0224e8b745c4985e8f57b8b5c86d769030132d13d89b60346654ec88bd3b35fbba67ed15141dfa8ff4c6856847
+DIST k8s.io%2Fcode-generator%2F@v%2Fv0.19.4.mod 852 BLAKE2B 11f881c3c0d6b9ad32f82a2ea0fe73bf26651598006815a995b6f90a25fa15bfb9fe2c48d4718890cb558fac0ca6751e24231d89cd41c7a5357693808d8cc54c SHA512 3dddfe73f05ace10bf417aff050c57bcc8856b0224e8b745c4985e8f57b8b5c86d769030132d13d89b60346654ec88bd3b35fbba67ed15141dfa8ff4c6856847
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.4.mod 898 BLAKE2B a0dd888b5fa55c00f88a97e00aad35febd63729d182bcc402d631fadfb585c9fc7fe25b24e0ea85085b37b69a54383de9bbb90f7acdabd25c2840b2ef44094a7 SHA512 73cd415b8468c8c5aab4881a535ed71a4b57ababe633e7902b3d46205adb3486e5930b87b7528f418a0387d0ec2ce01d346db9dc75d74b52cf9d8fa89d4e59f5
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.4.zip 146591 BLAKE2B 8d169a6ee42fe3b0e5c12eac7fc7ea0ff765b68fefeacd140a5409fc6e675963749a8c2073ab11043ca2e6aa6f7e5e60cfc2f091894fb2026eee18a6705488b7 SHA512 e33270544be0696ac4d8c1d800620bba711f639bee7fdc91b86d064f6d2203036d1346ee3823badbe2b65274634553dc4358d9c0a77f67e6939f036fd2ebfe70
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.8.mod 898 BLAKE2B 8e9c10e3836abcb150ed5fc6a196f4479f3b5e49648d2395b18b27473f8581bd4b2a04e1ec56a07fd71e17e74a21f94dce919257652dd232c0e48afa14823aa1 SHA512 bc3f0dbc319926f412587a16c3317b105b7381ee506afcf1e96c332c48437e14ee2d744a7505b1df6194dbc69b8234bdfebdb799fac28fb81deeedf9882b5098
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.18.8.zip 146723 BLAKE2B 70e43fbf3452551c6cc3bd19f5851147ce3af128d56b5911964dad8df561f9b3bad427a5dce20a65964117367434d7436271717ee91cb0683d1260b4c553d0c7 SHA512 f468feeab442f4348db2b41a994642c6337f88cc404204ac06398068666e61dfb8164ffb1cb81f04a77fa02b5593aa49d89791832a37b2f3425927e6c50b78dc
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.19.2.mod 1022 BLAKE2B 0a3c040fa97b8900ca55ebf60d9c1449040efc81ce97615a6cc43553cb877427d88468d7403b30b6211f1564af90e2bb8ed7c2bd37aaf443f6c3c65ea57e1cd4 SHA512 8ff751441cac14cf9a2e5cb3356d1ee0be65b7b0878d0b47281b5d264f7d1435ff814812eb8fb14b32b6492ab9a120a2b38ad419d90837df15451be9a14ddeb8
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.19.2.zip 179189 BLAKE2B 38b24a11663b6b18be71f0f9a0b310f41fe213f118079fb1e457d030e29c75d4d8d4478880036e7f07f3e4adb210158a3c1018cf7fe7028c225bfe3ffffdc8ea SHA512 a9b126da3ef3b2d4eea63a4cbdae86c4370a3d0f0037b7574494dce8adc0035179f21afd4c338f9b1f8c1667a4c783b4d4602c19b91ab4f09957ba0c755b8aba
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.19.3.mod 1022 BLAKE2B 1ad29a3e6d4a0d6059c90bdb52f6a1660a05e6f4bd5682e9a6d62fa419d706ac7b9008cde727547d0b0b982fddfcf1488a3518b7836ac431014bfab49351ba52 SHA512 4484b48234c67ce36f4d9be2bbd17886b2cd07cd8c70fa3a76dc8183141cf477c2023a82363cb66cdf09ba50407a229d4754e1cc82b05514db6b3d0c61df29f3
 DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.19.3.zip 179186 BLAKE2B 8a669971eb1183bdc1381a567f1e7ec095ebcd5f23d19d703bd95c0697b14a1b188bef0a8a718f60b1574abe333cc3c3bffb5690dba5bdb23c9f00ab095f21f7 SHA512 2a204e3402a9fb122d3206ab7a76fe8d930f6dcfbfdde5284e9c40af11d8a979953a5f88e8d2fa7831cb94adc7038fa6ef9006c2150063c44d76d6691b2ca04b
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.19.4.mod 1022 BLAKE2B 0b81564e567349ee08f5629bb7f6e7d9d7a035a061876ec2165b436e8572b63ecfdf69c46979039f787df5a845b5e8871961b4c66cd155acd94c8ad79777817a SHA512 d2476ce1f4e49f7fe033508cbaee6ca92859cc4c2d0e9c701402553f31d47121b3b1c6a60f3fc72e4f76399c6b43db9c125ecf8e59498f3ac2f2f14095589e54
+DIST k8s.io%2Fcomponent-base%2F@v%2Fv0.19.4.zip 179191 BLAKE2B fbf23c5c804467791f8450b7833876dcf61d92def925507f0e7acf9a8b505cfed247858125b9859151f5710fa9ec38f6a005680e5e89f32b40c1af8adfc60746 SHA512 cd20e05883e0000bbc413b8a8a3f98e2c5d874331db61c06035b1536867589fe787dff9477d54f3e43302539c4d87b17c7c8747947b26819402d524722bf537e
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200114144118-36b2048a9120.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
 DIST k8s.io%2Fgengo%2F@v%2Fv0.0.0-20200413195148-3a45101e95ac.mod 20 BLAKE2B ccdc31e151abf5dd6ff0453cb723ffae550c67c154d9de14cc2aaac1efac32063e57a1092e4341db6cbc6f58f639e3b34734859052ae76f21ce92af3ef61ffa4 SHA512 854a60e4fe9dec8121b68fa3102f977ad14264ed89bce9a6860117e80a3830a58565be00260da435f40452b28c6445fd191c90ca5134afea49458d676da49b07
@@ -1133,10 +1160,13 @@ DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.8.mod 2705 BLAKE2B 176cdc6687ad797a87c0450b06
 DIST k8s.io%2Fkubectl%2F@v%2Fv0.18.8.zip 3312938 BLAKE2B 6e8c2c20306706b3f9685f4e4f244c64cc2224f723117dbd5409609058b2596bda9246ecaefdee63ebd8084ab62426bae84bd808ef7736e5b9474e37d835ace8 SHA512 2baf6a76216c2e8261c5413c3170ca174515c18e0d3e4ef02f32618a61518f51c78e7026d99b6b5cb1f8af90adb35342ade05ce3c7897d1a8d9bf2f02d6e5146
 DIST k8s.io%2Fkubectl%2F@v%2Fv0.19.3.mod 2281 BLAKE2B 5e739880b1e208bcf721dac1f0f0f9662c8d538e86d625cfe42a375236282ce4e11cd75e29a20cb7aa05b1b818d021d5c6fd9c26f51a33a21d2d7ae77613b698 SHA512 0c84263fb449a087048a3d32506d54f8285a94b7ab8d43f5d65ded176d7f56e8b1d33d0c8c84832592a0137e69ee09e4c4d7c33e1a8e945740ccdc7fe539f701
 DIST k8s.io%2Fkubectl%2F@v%2Fv0.19.3.zip 3346263 BLAKE2B 4fd0b7e63f76d74262ab32f8af81e4c3cbf476196862db6cba23d313fce04982fbeac44cd47bf7dea8257a5d57f5f7003b8a0d43e8a7db8b518b2dc2b5a5caf2 SHA512 027f557453d70d721fd70389e5cc4cdcfb9f38ec13b280f9060e0530f9e9fec17d4d306c5521a1013125c21f8c964da1d25b4c859b9cefdb2b5fafb9357b03d3
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.19.4.mod 2281 BLAKE2B 23bd294817752dc611f630e66cdff447f00dae054d43388233cbce351d9dfa0ab809bab9b071825b900c2a44b34c2cf7de2d3097b5154cf74d220e41c7659ee7 SHA512 634d2a5c698101fc19f4650e487ee0aa476b836850d8378f0ac4106f6f6b2d9924af309e0ee33303f685f933550a70cae60afeeac90a6db094c1d0ddc0aa0b6d
+DIST k8s.io%2Fkubectl%2F@v%2Fv0.19.4.zip 3346298 BLAKE2B e6681a569c50e405f8eb39ac5ce4ba77f0fcd218ab172a3364467281a1bd9495c1d5bea14169859def821b26b772660e283c180785b016268010a9b8ab7cba73 SHA512 0f54101ca3a09b40a1905a06c30b0df3e2682f87060bf4bc79e91599f64be334134b94bb596805c185f5cdaf1366796d78946cb58506393ec3c38d5c21c444ff
 DIST k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod 25 BLAKE2B 4060536d51fac9854215957b1108a158adb0b3aeb8bfc659eca1140efdcf79cffe378db6f3cb1f4a4b68aa36468b7d5631e993d5a089eb839bd03b6b608496be SHA512 2349b7dbe8409836cc70d97c5b336f518b809f5731baf05ce68d957c9970895a9b7f89caf09763794cf13824ee29410b3a6e431b2da7f64610895c44b86c4d2d
 DIST k8s.io%2Fmetrics%2F@v%2Fv0.18.4.mod 692 BLAKE2B 0d75dc7a0df4f86c3499fcd3838043ec3206281b43393cf210fc91f29d6516ff7313fd2e42713dcb04afd45ec16f2ed58e73becaef147b41d1d6ec71da20b477 SHA512 39d689b3b0edd309c042862e2f8c852f5320111c28c651a3f7e34ecb498970b26eade8e15738815fe6d11f16af87a7b33383855675ebd15d198384d11d3833e9
 DIST k8s.io%2Fmetrics%2F@v%2Fv0.18.8.mod 692 BLAKE2B 1ef91337ee3abc8206e7118df4ba9d25add0b70a75073f65a7a0686e4653abb45aea53f270765039dc0236f4312ab10c7d71f9fcec50662abcfce6a6ec0e20c1 SHA512 032530a5611bde524d7f1fab3548830c45696e306f5a2c8189f9d8f005b9bf0cbafc6da38ccb1b2083be3257e2398afc785a0b6f498b07e75263440eeb84bd30
 DIST k8s.io%2Fmetrics%2F@v%2Fv0.19.3.mod 472 BLAKE2B 0d9effb9eaf256b65b633d91c0aae1af596c2da19de178411187cb2ec8d2eba4570e97381445258006b0c196eecd5e5e952e2502d510177f7706d905fd301552 SHA512 129785dd355c37d94b2bcab564bd44a8e7ad8c6f7e383774a6f4133688486b51e273cf5659cdbed9f03651cf64b32716b2cba9bd4850964410ae748d4bf92af4
+DIST k8s.io%2Fmetrics%2F@v%2Fv0.19.4.mod 472 BLAKE2B 6f80ce3be5b5d6cfe711d0f66fc255fbeeca8fa8a6853ca23014692b8c0da48fff24e5a6c9ba546c92647ee209bb5511f62d0b33912a6184b0cb8d64bc4eede8 SHA512 6f4c5fe177926d2500d273a412036717f1b56756277ed1292189ef60b6e0de1087b14a92d8e5258ddd555f9933bcf5e2e943b019b186ed2d3211a2d80b5ab49b
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200324210504-a9aa75ae1b89.zip 147166 BLAKE2B a9d5897231997c8184aba7c58d6b31fa8413d7c94e48f52fb59f171f537d0e9a047055a5e717e411c7f0dbc63bf1794c2a425c278724eeb73de59e7bbd8d2ee0 SHA512 49641d1a253a5469d9dec1e104b5ecbd7033e28f8ab08c351edea432687fb1bf902d9fbf3ea2ef217b82ab06ca3f2453a1dccf03468d38281c847e19477641df
 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200729134348-d5654de09c73.mod 167 BLAKE2B 2a61747d367153284e7e614a82f98c8913693f3b51174c24b7f25d8e9d236418c4da9e6b33c7cdb7b4350314373037e1e7121ad7c0ca5fbc9a3b4b711a078a98 SHA512 1117d2493d40a111a749b0033c92876773242b86da0b437ba063e5da21289102d784479b0c757ad8ce50de4b1d8a2f6956afe3b2656977bd76bfab9f97c1d8a9
@@ -1159,4 +1189,5 @@ DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcff
 DIST vbom.ml%2Futil%2F@v%2Fv0.0.0-20160121211510-db5cfe13f5cc.mod 20 BLAKE2B 9817a2968dcdd45e9e5d40b93cb54e6002d0aa6613f241bd77d448b3173b639f58a88d25899734be39a822473b4aac69ad947878006d5bb266a13f24637b0082 SHA512 b052661c1a3c2599fa350578cde2899166b39b71c65a6414ca7ea33e8d5186e85895ebd948819313781041d06fac3292cb08ad12447060df3860a86402344c24
 EBUILD helm-3.3.4.ebuild 53769 BLAKE2B a43abc89b94f837cb83beddd4fb1efa8e0ea75f8daf972142aa898767075f72d2db90e653ee149a9ebdf43834b8caeb2883c927733df136c8ae1c3377ba9550d SHA512 e8f01ab1ac529e8a67f67146ab906b4162c3799e1dad1503cedca12fb82a84297df063293f10fd62997d554414d551df414ceefc0a2f56fcd66b0fc5b772bcfa
 EBUILD helm-3.4.1.ebuild 61570 BLAKE2B 630a410c9ae384f61b0db72738e276a8e5361ef3cc18402d5e53597223c8b8acb066abd958740c21dcbbdbd98cc0ad94cf6bb13cded3262766b06b1548959fae SHA512 81e76faac2da824fab415e342ade26667952ac9201a6060d53354e9f26e9a17bd7f62ceec0c5c8e692fc5ca3cc070c13db280f4523529d9ea4f192682497841b
+EBUILD helm-3.4.2.ebuild 62589 BLAKE2B d4dbb35f7b1d95746c09888d9e39a67a941d80787ae7c6c119c1b75a16ec6c8a6a48b07dda8fe550a4eefd60cfe7f8508b9d73cef163d6c1f83477e0578f9ef5 SHA512 34f366cf59c23083273c54dc9c4f58165315faae4ba8f87943340cb74e2bb92e808d7b049b7d04d8ac6907ee86f0634b7f6446cf9cc82149585d1a50e6c9af48
 MISC metadata.xml 322 BLAKE2B b452dfaecaf6b32e7fc334ddb00444d739a618898f8e0d6905e8b3191acc7f0fc5e3929345405d86f9ab56e8ad80fbcd1dd46a0ea3ff5aaa2bb9f56407d10234 SHA512 ef4bb714213346e60a2a39833d0ab1987e10d2b34460a053b479775163e8778021ef3da63a8f5fede055281298dab88309a796cf3ad650c2d3ddeb17a7b0b4be
diff --git a/app-admin/helm/helm-3.4.2.ebuild b/app-admin/helm/helm-3.4.2.ebuild
new file mode 100644
index 000000000000..8750ff885fe8
--- /dev/null
+++ b/app-admin/helm/helm-3.4.2.ebuild
@@ -0,0 +1,1200 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+GIT_COMMIT=23dd3af5e19a02d4f4baa5b2f242645a1a3af629
+MY_PV=${PV/_rc/-rc.}
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/helm/helm https://helm.sh"
+
+EGO_SUM=(
+	"bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"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/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+	"github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+	"github.com/Azure/go-autorest v13.3.2+incompatible"
+	"github.com/Azure/go-autorest v13.3.2+incompatible/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.0"
+	"github.com/Azure/go-autorest/autorest v0.9.0/go.mod"
+	"github.com/Azure/go-autorest/autorest v0.9.6"
+	"github.com/Azure/go-autorest/autorest v0.9.6/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0"
+	"github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2"
+	"github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0"
+	"github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0"
+	"github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0"
+	"github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod"
+	"github.com/Azure/go-autorest/autorest/mocks v0.3.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/DATA-DOG/go-sqlmock v1.4.1"
+	"github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod"
+	"github.com/DATA-DOG/go-sqlmock v1.5.0"
+	"github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod"
+	"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
+	"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd"
+	"github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod"
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/semver/v3 v3.1.0"
+	"github.com/Masterminds/semver/v3 v3.1.0/go.mod"
+	"github.com/Masterminds/sprig/v3 v3.1.0"
+	"github.com/Masterminds/sprig/v3 v3.1.0/go.mod"
+	"github.com/Masterminds/squirrel v1.4.0"
+	"github.com/Masterminds/squirrel v1.4.0/go.mod"
+	"github.com/Masterminds/vcs v1.13.1"
+	"github.com/Masterminds/vcs v1.13.1/go.mod"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5"
+	"github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
+	"github.com/Microsoft/hcsshim v0.8.7"
+	"github.com/Microsoft/hcsshim v0.8.7/go.mod"
+	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.0/go.mod"
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/purell v1.1.1/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578"
+	"github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod"
+	"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d"
+	"github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod"
+	"github.com/Shopify/sarama v1.19.0/go.mod"
+	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+	"github.com/VividCortex/gohistogram v1.0.0/go.mod"
+	"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
+	"github.com/agnivade/levenshtein v1.0.1/go.mod"
+	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+	"github.com/alecthomas/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/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod"
+	"github.com/apache/thrift v0.12.0/go.mod"
+	"github.com/apache/thrift v0.13.0/go.mod"
+	"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-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+	"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535"
+	"github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod"
+	"github.com/aws/aws-lambda-go v1.13.3/go.mod"
+	"github.com/aws/aws-sdk-go v1.15.11/go.mod"
+	"github.com/aws/aws-sdk-go v1.27.0/go.mod"
+	"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
+	"github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod"
+	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+	"github.com/beorn7/perks v1.0.0"
+	"github.com/beorn7/perks v1.0.0/go.mod"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/beorn7/perks v1.0.1/go.mod"
+	"github.com/bgentry/speakeasy v0.1.0/go.mod"
+	"github.com/bitly/go-simplejson v0.5.0"
+	"github.com/bitly/go-simplejson v0.5.0/go.mod"
+	"github.com/blang/semver v3.1.0+incompatible/go.mod"
+	"github.com/blang/semver v3.5.0+incompatible/go.mod"
+	"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869"
+	"github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod"
+	"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd"
+	"github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod"
+	"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b"
+	"github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod"
+	"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0"
+	"github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod"
+	"github.com/casbin/casbin/v2 v2.1.2/go.mod"
+	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+	"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/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/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/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+	"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f"
+	"github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+	"github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+	"github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
+	"github.com/containerd/containerd v1.3.2"
+	"github.com/containerd/containerd v1.3.2/go.mod"
+	"github.com/containerd/containerd v1.3.4"
+	"github.com/containerd/containerd v1.3.4/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"
+	"github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+	"github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de"
+	"github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd"
+	"github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-oidc v2.1.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cpuguy83/go-md2man v1.0.10/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.7/go.mod"
+	"github.com/cyphar/filepath-securejoin v0.2.2"
+	"github.com/cyphar/filepath-securejoin v0.2.2/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod"
+	"github.com/deislabs/oras v0.8.1"
+	"github.com/deislabs/oras v0.8.1/go.mod"
+	"github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod"
+	"github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod"
+	"github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/dnaeon/go-vcr v1.0.1/go.mod"
+	"github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492"
+	"github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod"
+	"github.com/docker/distribution v0.0.0-20191216044856-a8371794149d"
+	"github.com/docker/distribution v0.0.0-20191216044856-a8371794149d/go.mod"
+	"github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod"
+	"github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce"
+	"github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce/go.mod"
+	"github.com/docker/docker-credential-helpers v0.6.3"
+	"github.com/docker/docker-credential-helpers v0.6.3/go.mod"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-connections v0.4.0/go.mod"
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916"
+	"github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod"
+	"github.com/docker/go-units v0.3.3/go.mod"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/go-units v0.4.0/go.mod"
+	"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1"
+	"github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+	"github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod"
+	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/eapache/go-resiliency v1.1.0/go.mod"
+	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+	"github.com/eapache/queue v1.1.0/go.mod"
+	"github.com/edsrzf/mmap-go v1.0.0/go.mod"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153"
+	"github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod"
+	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
+	"github.com/emicklei/go-restful v2.9.5+incompatible"
+	"github.com/emicklei/go-restful v2.9.5+incompatible/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.6.9/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-20200808040245-162e5629780b"
+	"github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod"
+	"github.com/evanphx/json-patch v4.2.0+incompatible"
+	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+	"github.com/evanphx/json-patch v4.5.0+incompatible"
+	"github.com/evanphx/json-patch v4.5.0+incompatible/go.mod"
+	"github.com/evanphx/json-patch v4.9.0+incompatible"
+	"github.com/evanphx/json-patch v4.9.0+incompatible/go.mod"
+	"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d"
+	"github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod"
+	"github.com/fatih/camelcase v1.0.0/go.mod"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
+	"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+	"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7"
+	"github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod"
+	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/ghodss/yaml v1.0.0/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod"
+	"github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-ini/ini v1.25.4/go.mod"
+	"github.com/go-kit/kit v0.8.0/go.mod"
+	"github.com/go-kit/kit v0.9.0/go.mod"
+	"github.com/go-kit/kit v0.10.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+	"github.com/go-logfmt/logfmt v0.5.0/go.mod"
+	"github.com/go-logr/logr v0.1.0/go.mod"
+	"github.com/go-logr/logr v0.2.0"
+	"github.com/go-logr/logr v0.2.0/go.mod"
+	"github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod"
+	"github.com/go-openapi/analysis v0.17.0/go.mod"
+	"github.com/go-openapi/analysis v0.18.0/go.mod"
+	"github.com/go-openapi/analysis v0.19.2/go.mod"
+	"github.com/go-openapi/analysis v0.19.5/go.mod"
+	"github.com/go-openapi/errors v0.17.0/go.mod"
+	"github.com/go-openapi/errors v0.18.0/go.mod"
+	"github.com/go-openapi/errors v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
+	"github.com/go-openapi/jsonpointer v0.17.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.18.0/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.2/go.mod"
+	"github.com/go-openapi/jsonpointer v0.19.3"
+	"github.com/go-openapi/jsonpointer v0.19.3/go.mod"
+	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
+	"github.com/go-openapi/jsonreference v0.17.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.18.0/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.2/go.mod"
+	"github.com/go-openapi/jsonreference v0.19.3"
+	"github.com/go-openapi/jsonreference v0.19.3/go.mod"
+	"github.com/go-openapi/loads v0.17.0/go.mod"
+	"github.com/go-openapi/loads v0.18.0/go.mod"
+	"github.com/go-openapi/loads v0.19.0/go.mod"
+	"github.com/go-openapi/loads v0.19.2/go.mod"
+	"github.com/go-openapi/loads v0.19.4/go.mod"
+	"github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod"
+	"github.com/go-openapi/runtime v0.19.0/go.mod"
+	"github.com/go-openapi/runtime v0.19.4/go.mod"
+	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
+	"github.com/go-openapi/spec v0.17.0/go.mod"
+	"github.com/go-openapi/spec v0.18.0/go.mod"
+	"github.com/go-openapi/spec v0.19.2/go.mod"
+	"github.com/go-openapi/spec v0.19.3"
+	"github.com/go-openapi/spec v0.19.3/go.mod"
+	"github.com/go-openapi/strfmt v0.17.0/go.mod"
+	"github.com/go-openapi/strfmt v0.18.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.0/go.mod"
+	"github.com/go-openapi/strfmt v0.19.3/go.mod"
+	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
+	"github.com/go-openapi/swag v0.17.0/go.mod"
+	"github.com/go-openapi/swag v0.18.0/go.mod"
+	"github.com/go-openapi/swag v0.19.2/go.mod"
+	"github.com/go-openapi/swag v0.19.5"
+	"github.com/go-openapi/swag v0.19.5/go.mod"
+	"github.com/go-openapi/validate v0.18.0/go.mod"
+	"github.com/go-openapi/validate v0.19.2/go.mod"
+	"github.com/go-openapi/validate v0.19.5/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.1"
+	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/gobuffalo/envy v1.7.0/go.mod"
+	"github.com/gobuffalo/envy v1.7.1"
+	"github.com/gobuffalo/envy v1.7.1/go.mod"
+	"github.com/gobuffalo/logger v1.0.1"
+	"github.com/gobuffalo/logger v1.0.1/go.mod"
+	"github.com/gobuffalo/packd v0.3.0"
+	"github.com/gobuffalo/packd v0.3.0/go.mod"
+	"github.com/gobuffalo/packr/v2 v2.7.1"
+	"github.com/gobuffalo/packr/v2 v2.7.1/go.mod"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
+	"github.com/godror/godror v0.13.3/go.mod"
+	"github.com/gofrs/flock v0.7.1"
+	"github.com/gofrs/flock v0.7.1/go.mod"
+	"github.com/gofrs/flock v0.8.0"
+	"github.com/gofrs/flock v0.8.0/go.mod"
+	"github.com/gogo/googleapis v1.1.0/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.0/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903"
+	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"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/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+	"github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod"
+	"github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod"
+	"github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.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/gofuzz v1.0.0"
+	"github.com/google/gofuzz v1.0.0/go.mod"
+	"github.com/google/gofuzz v1.1.0"
+	"github.com/google/gofuzz v1.1.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/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/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d"
+	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+	"github.com/googleapis/gnostic v0.1.0"
+	"github.com/googleapis/gnostic v0.1.0/go.mod"
+	"github.com/googleapis/gnostic v0.4.1"
+	"github.com/googleapis/gnostic v0.4.1/go.mod"
+	"github.com/gophercloud/gophercloud v0.1.0"
+	"github.com/gophercloud/gophercloud v0.1.0/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/context v1.1.1/go.mod"
+	"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33"
+	"github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod"
+	"github.com/gorilla/mux v1.6.2/go.mod"
+	"github.com/gorilla/mux v1.7.2"
+	"github.com/gorilla/mux v1.7.2/go.mod"
+	"github.com/gorilla/mux v1.7.3"
+	"github.com/gorilla/mux v1.7.3/go.mod"
+	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gosuri/uitable v0.0.4"
+	"github.com/gosuri/uitable v0.0.4/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
+	"github.com/hashicorp/consul/api v1.3.0/go.mod"
+	"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
+	"github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+	"github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+	"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/go.mod"
+	"github.com/hashicorp/go-version v1.2.0/go.mod"
+	"github.com/hashicorp/go.net v0.0.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hashicorp/logutils v1.0.0/go.mod"
+	"github.com/hashicorp/mdns v1.0.0/go.mod"
+	"github.com/hashicorp/memberlist v0.1.3/go.mod"
+	"github.com/hashicorp/serf v0.8.2/go.mod"
+	"github.com/hpcloud/tail v1.0.0"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/huandu/xstrings v1.3.1"
+	"github.com/huandu/xstrings v1.3.1/go.mod"
+	"github.com/hudl/fargo v1.3.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.8"
+	"github.com/imdario/mergo v0.3.8/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
+	"github.com/jessevdk/go-flags v1.4.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jmoiron/sqlx v1.2.0"
+	"github.com/jmoiron/sqlx v1.2.0/go.mod"
+	"github.com/joho/godotenv v1.3.0"
+	"github.com/joho/godotenv v1.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.7/go.mod"
+	"github.com/json-iterator/go v1.1.8"
+	"github.com/json-iterator/go v1.1.8/go.mod"
+	"github.com/json-iterator/go v1.1.10"
+	"github.com/json-iterator/go v1.1.10/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"github.com/kisielk/errcheck v1.1.0/go.mod"
+	"github.com/kisielk/errcheck v1.2.0/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pretty v0.2.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/pty v1.1.5/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/lann/builder v0.0.0-20180802200727-47ae307949d0"
+	"github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod"
+	"github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0"
+	"github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod"
+	"github.com/lib/pq v1.0.0/go.mod"
+	"github.com/lib/pq v1.2.0/go.mod"
+	"github.com/lib/pq v1.7.0"
+	"github.com/lib/pq v1.7.0/go.mod"
+	"github.com/lib/pq v1.8.0"
+	"github.com/lib/pq v1.8.0/go.mod"
+	"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de"
+	"github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod"
+	"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
+	"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
+	"github.com/lithammer/dedent v1.1.0/go.mod"
+	"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod"
+	"github.com/mailru/easyjson v0.7.0"
+	"github.com/mailru/easyjson v0.7.0/go.mod"
+	"github.com/marstr/guid v1.1.0/go.mod"
+	"github.com/mattn/go-colorable v0.0.9"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-isatty v0.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.4"
+	"github.com/mattn/go-isatty v0.0.4/go.mod"
+	"github.com/mattn/go-oci8 v0.0.7/go.mod"
+	"github.com/mattn/go-runewidth v0.0.2/go.mod"
+	"github.com/mattn/go-runewidth v0.0.4"
+	"github.com/mattn/go-runewidth v0.0.4/go.mod"
+	"github.com/mattn/go-shellwords v1.0.10"
+	"github.com/mattn/go-shellwords v1.0.10/go.mod"
+	"github.com/mattn/go-sqlite3 v1.9.0/go.mod"
+	"github.com/mattn/go-sqlite3 v1.12.0"
+	"github.com/mattn/go-sqlite3 v1.12.0/go.mod"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+	"github.com/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.0.14/go.mod"
+	"github.com/mitchellh/cli v1.0.0/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+	"github.com/mitchellh/gox v0.4.0/go.mod"
+	"github.com/mitchellh/iochan v1.0.0/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f"
+	"github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
+	"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd"
+	"github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
+	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/modern-go/reflect2 v1.0.1/go.mod"
+	"github.com/morikuni/aec v1.0.0"
+	"github.com/morikuni/aec v1.0.0/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
+	"github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
+	"github.com/nats-io/jwt v0.3.0/go.mod"
+	"github.com/nats-io/jwt v0.3.2/go.mod"
+	"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
+	"github.com/nats-io/nats.go v1.9.1/go.mod"
+	"github.com/nats-io/nkeys v0.1.0/go.mod"
+	"github.com/nats-io/nkeys v0.1.3/go.mod"
+	"github.com/nats-io/nuid v1.0.1/go.mod"
+	"github.com/ncw/swift v1.0.47/go.mod"
+	"github.com/oklog/oklog v0.3.2/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-20170122224234-a0225b3f23b5/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.2/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.7.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.11.0"
+	"github.com/onsi/ginkgo v1.11.0/go.mod"
+	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.4.3/go.mod"
+	"github.com/onsi/gomega v1.7.0"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod"
+	"github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0-rc1"
+	"github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+	"github.com/opencontainers/go-digest v1.0.0"
+	"github.com/opencontainers/go-digest v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.0/go.mod"
+	"github.com/opencontainers/image-spec v1.0.1"
+	"github.com/opencontainers/image-spec v1.0.1/go.mod"
+	"github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+	"github.com/opencontainers/runc v0.1.1"
+	"github.com/opencontainers/runc v0.1.1/go.mod"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700"
+	"github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+	"github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+	"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
+	"github.com/opentracing/basictracer-go v1.0.0/go.mod"
+	"github.com/opentracing/opentracing-go v1.0.2/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
+	"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
+	"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
+	"github.com/pact-foundation/pact-go v1.0.4/go.mod"
+	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+	"github.com/pborman/uuid v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible"
+	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+	"github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2"
+	"github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod"
+	"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
+	"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-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/pkg/profile v1.2.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/posener/complete v1.1.1/go.mod"
+	"github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod"
+	"github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod"
+	"github.com/prometheus/client_golang v0.9.1/go.mod"
+	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/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.3.0"
+	"github.com/prometheus/client_golang v1.3.0/go.mod"
+	"github.com/prometheus/client_golang v1.7.1"
+	"github.com/prometheus/client_golang v1.7.1/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/prometheus/client_model v0.1.0/go.mod"
+	"github.com/prometheus/client_model v0.2.0"
+	"github.com/prometheus/client_model v0.2.0/go.mod"
+	"github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod"
+	"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.2.0/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.7.0"
+	"github.com/prometheus/common v0.7.0/go.mod"
+	"github.com/prometheus/common v0.10.0"
+	"github.com/prometheus/common v0.10.0/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+	"github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+	"github.com/prometheus/procfs v0.0.2/go.mod"
+	"github.com/prometheus/procfs v0.0.5"
+	"github.com/prometheus/procfs v0.0.5/go.mod"
+	"github.com/prometheus/procfs v0.0.8"
+	"github.com/prometheus/procfs v0.0.8/go.mod"
+	"github.com/prometheus/procfs v0.1.3"
+	"github.com/prometheus/procfs v0.1.3/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/go-internal v1.1.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.2/go.mod"
+	"github.com/rogpeppe/go-internal v1.4.0"
+	"github.com/rogpeppe/go-internal v1.4.0/go.mod"
+	"github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351"
+	"github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351/go.mod"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/russross/blackfriday v1.5.2/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+	"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
+	"github.com/satori/go.uuid v1.2.0/go.mod"
+	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/sirupsen/logrus v1.6.0"
+	"github.com/sirupsen/logrus v1.6.0/go.mod"
+	"github.com/sirupsen/logrus v1.7.0"
+	"github.com/sirupsen/logrus v1.7.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/soheilhy/cmux v0.1.4/go.mod"
+	"github.com/sony/gobreaker v0.4.1/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cast v1.3.1"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+	"github.com/spf13/cobra v0.0.3/go.mod"
+	"github.com/spf13/cobra v0.0.5"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/cobra v1.0.0"
+	"github.com/spf13/cobra v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+	"github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/spf13/viper v1.4.0/go.mod"
+	"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
+	"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
+	"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/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 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/stretchr/testify v1.6.1"
+	"github.com/stretchr/testify v1.6.1/go.mod"
+	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8"
+	"github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+	"github.com/tidwall/pretty v1.0.0/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/urfave/cli v1.22.1/go.mod"
+	"github.com/vektah/gqlparser v1.1.2/go.mod"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f"
+	"github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
+	"github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+	"github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+	"github.com/xeipuuv/gojsonschema v1.2.0"
+	"github.com/xeipuuv/gojsonschema v1.2.0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43"
+	"github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod"
+	"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50"
+	"github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod"
+	"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f"
+	"github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod"
+	"github.com/ziutek/mymysql v1.5.4"
+	"github.com/ziutek/mymysql v1.5.4/go.mod"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.etcd.io/bbolt v1.3.3/go.mod"
+	"go.etcd.io/bbolt v1.3.5/go.mod"
+	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
+	"go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod"
+	"go.mongodb.org/mongo-driver v1.0.3/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.1/go.mod"
+	"go.mongodb.org/mongo-driver v1.1.2/go.mod"
+	"go.opencensus.io v0.20.1/go.mod"
+	"go.opencensus.io v0.20.2/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/atomic v1.5.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/multierr v1.3.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"go.uber.org/zap v1.13.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-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-20190320223903-b7391e95e576/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-20190611184440-5c40567a22f8/go.mod"
+	"golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod"
+	"golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod"
+	"golang.org/x/crypto v0.0.0-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-20200128174031-69ecbb4d6d5d"
+	"golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975"
+	"golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod"
+	"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904"
+	"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-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/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/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/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+	"golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod"
+	"golang.org/x/net v0.0.0-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-20190125091013-d26f9f9a57f3/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-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-20190619014844-b5b0513f8c1b/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
+	"golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9"
+	"golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/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/oauth2 v0.0.0-20191202225959-858c2ad4c8b6"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
+	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+	"golang.org/x/sys v0.0.0-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-20181122145206-62eef0e2fa9b/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod"
+	"golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod"
+	"golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod"
+	"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
+	"golang.org/x/sys v0.0.0-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-20190826190057-c7b8b68b1456/go.mod"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3"
+	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7"
+	"golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f"
+	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4"
+	"golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod"
+	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/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-20180828015842-6cd1fcedba52/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
+	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-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-20190614205625-5aca471b1d59/go.mod"
+	"golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/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-20190920225731-5eefd052ad72/go.mod"
+	"golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/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-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
+	"golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/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.0.0-20160322025152-9bf6e6e569ff/go.mod"
+	"google.golang.org/api v0.3.1/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/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.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/cloud v0.0.0-20151119220103-975617b05ea8/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod"
+	"google.golang.org/grpc v1.17.0/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.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.21.1/go.mod"
+	"google.golang.org/grpc v1.22.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.23.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gcfg.v1 v1.2.3/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/gorp.v1 v1.7.2"
+	"gopkg.in/gorp.v1 v1.7.2/go.mod"
+	"gopkg.in/inf.v0 v0.9.1"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.2.2/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+	"gopkg.in/warnings.v0 v0.1.2/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"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gotest.tools v2.2.0+incompatible"
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"gotest.tools/v3 v3.0.2/go.mod"
+	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/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/go.mod"
+	"k8s.io/api v0.18.4"
+	"k8s.io/api v0.18.4/go.mod"
+	"k8s.io/api v0.18.8"
+	"k8s.io/api v0.18.8/go.mod"
+	"k8s.io/api v0.19.2"
+	"k8s.io/api v0.19.2/go.mod"
+	"k8s.io/api v0.19.3"
+	"k8s.io/api v0.19.3/go.mod"
+	"k8s.io/api v0.19.4"
+	"k8s.io/api v0.19.4/go.mod"
+	"k8s.io/apiextensions-apiserver v0.19.2"
+	"k8s.io/apiextensions-apiserver v0.19.2/go.mod"
+	"k8s.io/apiextensions-apiserver v0.19.3"
+	"k8s.io/apiextensions-apiserver v0.19.3/go.mod"
+	"k8s.io/apiextensions-apiserver v0.19.4"
+	"k8s.io/apiextensions-apiserver v0.19.4/go.mod"
+	"k8s.io/apimachinery v0.19.2"
+	"k8s.io/apimachinery v0.19.2/go.mod"
+	"k8s.io/apimachinery v0.19.3"
+	"k8s.io/apimachinery v0.19.3/go.mod"
+	"k8s.io/apimachinery v0.19.4"
+	"k8s.io/apimachinery v0.19.4/go.mod"
+	"k8s.io/apiserver v0.19.2/go.mod"
+	"k8s.io/apiserver v0.19.3/go.mod"
+	"k8s.io/apiserver v0.19.4/go.mod"
+	"k8s.io/cli-runtime v0.19.2"
+	"k8s.io/cli-runtime v0.19.2/go.mod"
+	"k8s.io/cli-runtime v0.19.3"
+	"k8s.io/cli-runtime v0.19.3/go.mod"
+	"k8s.io/cli-runtime v0.19.4"
+	"k8s.io/cli-runtime v0.19.4/go.mod"
+	"k8s.io/client-go v0.19.2"
+	"k8s.io/client-go v0.19.2/go.mod"
+	"k8s.io/client-go v0.19.3"
+	"k8s.io/client-go v0.19.3/go.mod"
+	"k8s.io/client-go v0.19.4"
+	"k8s.io/client-go v0.19.4/go.mod"
+	"k8s.io/code-generator v0.19.2/go.mod"
+	"k8s.io/code-generator v0.19.3/go.mod"
+	"k8s.io/code-generator v0.19.4/go.mod"
+	"k8s.io/component-base v0.19.2"
+	"k8s.io/component-base v0.19.2/go.mod"
+	"k8s.io/component-base v0.19.3"
+	"k8s.io/component-base v0.19.3/go.mod"
+	"k8s.io/component-base v0.19.4"
+	"k8s.io/component-base v0.19.4/go.mod"
+	"k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod"
+	"k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod"
+	"k8s.io/klog v1.0.0"
+	"k8s.io/klog v1.0.0/go.mod"
+	"k8s.io/klog/v2 v2.0.0/go.mod"
+	"k8s.io/klog/v2 v2.2.0"
+	"k8s.io/klog/v2 v2.2.0/go.mod"
+	"k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6"
+	"k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod"
+	"k8s.io/kubectl v0.19.3"
+	"k8s.io/kubectl v0.19.3/go.mod"
+	"k8s.io/kubectl v0.19.4"
+	"k8s.io/kubectl v0.19.4/go.mod"
+	"k8s.io/kubernetes v1.13.0/go.mod"
+	"k8s.io/metrics v0.19.3/go.mod"
+	"k8s.io/metrics v0.19.4/go.mod"
+	"k8s.io/utils v0.0.0-20200729134348-d5654de09c73"
+	"k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod"
+	"sigs.k8s.io/kustomize v2.0.3+incompatible"
+	"sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.0.1"
+	"sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sigs.k8s.io/yaml v1.2.0"
+	"sigs.k8s.io/yaml v1.2.0/go.mod"
+	"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
+	"vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	default
+	# Makefile:
+	# - Remove GOFLAGS entirely
+	# - Remove -w & -s from LDFLAGS
+	# - Git spec will be passed later
+	sed -r -i \
+		-e "/^GOFLAGS[[:space:]]+:?=/d" \
+		-e '/^LDFLAGS[[:space:]]+:?=/{s,-[ws],,g;s,:=,=,g}' \
+		Makefile || die
+}
+
+src_compile() {
+	# Do not pass LDFLAGS directly here, as the upstream Makefile adds some
+	# data to it via +=
+	emake \
+		GOFLAGS="${GOFLAGS}" \
+		GIT_SHA=${GIT_COMMIT} \
+		GIT_COMMIT=${GIT_COMMIT:0:7} \
+		GIT_TAG=v${MY_PV} \
+		GIT_DIRTY=clean \
+		build
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN}
+	dodoc README.md
+}
diff --git a/app-admin/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
index a1ec31a1f17c..020db886e7e1 100644
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@@ -1,9 +1,5 @@
 AUX lastpass-cli-1.3.3-gcc10-fix.patch 2855 BLAKE2B 9d20c68d2d1349d557fef3d147e799cca1db7181e767011fcba73d2cb2639f2fa0e6a1f321561f0cffa39dfa365080984c923f10eff8fb9a3eeab19ca11418a3 SHA512 53d8d6842d21fad888597750d4ebef4de351621751befe791a09921210ddae13a2fbeb21e17aca759e60c3c6172ae786fbea42d8e9dbb379386033fe2b3a5bfa
-DIST lastpass-cli-1.3.1.tar.gz 114843 BLAKE2B 7983d4090092ef3443d8c502d157934fa2384426f0be22c796795cdf664be3ba396f64daa81cdf896cb6901d4063f93e54b62cda4349b14fa4d312a21c5bb76d SHA512 092d28dc459719e662fbb2c5e92e8cc75be108aa9d7b62569ee44cb34dd9588e78151fdc5ad114c30e8de21c0b8803edc41db9295548c7cbfe6e537c9a52aad2
-DIST lastpass-cli-1.3.2.tar.gz 116399 BLAKE2B d00ab9443935b90eab7337702a52e0ed2e7f2e67c20ed6764f72e25ae123e0420013aa9220ece8a57b7e3bbe2f243ff56bd054fecdbd064f086536bc5eaf0d88 SHA512 b293e86d70988aa5860a94fdc2bc65341bb253d2423c8f745730419400adc91ff860017d35657d283458c477c2385ff2532b8aefa752f886b207da8d10bf9018
 DIST lastpass-cli-1.3.3.tar.gz 116434 BLAKE2B 341f99a7a5edd157c271a0989a004ace8300f2121230b4c0b7c23152643ebc0e3f60717a057b4e6acc802fe641ccd84c770bfcb3d89c505713aea23692d1542b SHA512 9b9274cae1fe4045b7df4402170c522ab5765929739e76141b35a75ce3c8af824acd881e194face45e8721d6ce778bde97ff1a1ac23515de0c6dba28d61a8c7e
 DIST lastpass-cli-man-1.3.1.tar.xz 5700 BLAKE2B 736ab71ad55cfcb657c727f3dc9dc15775dab1a0232d1ffc51b8794e49911531c96a841b4a5ac0b31f0516cd7aa54027ac7d0eb096816730cdfd192c04d99449 SHA512 e60807683ecd681b3937ef447d3e6a487d25418fe99f51ba99e54bf643c5254dd18427a03e7f035198ef34ff578bbb6116baf04eb554f54d85e7d059b6bfed7e
-EBUILD lastpass-cli-1.3.1-r1.ebuild 1415 BLAKE2B c3a538042b71247b6b8d3c54219f9ba52b0d86c43fe8ab8a25f43b74d729dd6db4347647177aab2589ffa3f8dfb6cdc64aa8b3c25223144d9507fb53fac03102 SHA512 c17c165c9816c02b54d3b7182d70f43ec0f65ee0130ef6060d8e0fcb1140d4bce6ebf8e9253eafa251d569064fa9699a892cedf1bd6d929380d88d948fadc734
-EBUILD lastpass-cli-1.3.2.ebuild 1637 BLAKE2B 0f2ea3383ffa4f3a0ecb6d0ec7bf7d5d3846616f66dacb1782adda191c35d206289e0abdf86d5201c09dec82d1b42c6e3b5526531b075e57956a470e235f6414 SHA512 888df5219a4702fa9829d6792af7adb82ead09ad479fc51986da11688b3552d77a50e7a20bfea448a4e73f93dc1ccb3ba30937a26555929ab3f4d7a7ecba32e7
-EBUILD lastpass-cli-1.3.3.ebuild 1695 BLAKE2B 9f58fb5d95d82dd7ce549c88093da7a76c8a52a4770110f24b24920c82daaf1b0a5e629982fc2d452769902bb4a1475be636810ce8092a7f3694e90a50945c7c SHA512 6839ceef84878313f12663897878c0bb6505aefb0869a7504f68f061eabcdc1e753ce90d09cc414795014bf53b76e3568676d475ccd6534c3613c73c94565d0c
+EBUILD lastpass-cli-1.3.3.ebuild 1693 BLAKE2B 7094b306aee08cabf6a9dd09bcb253ab3250e26740ec7effc105b90e2014d8c7cf7ba3ec958093eb7951ee8b7b349faca09843f77b00949f3fc99a37b46deee4 SHA512 0fb266ed52aa52c7d8d5aee6102287af3dc869ec4907f4d884e435d16bd844b96e379dcafca39de788e13f41fef2cf9ff815b8590e23a5fa263fd9e8ba54c16f
 MISC metadata.xml 643 BLAKE2B a5a01a1dbcc257692bd14369470d69eef33a00a9910ed5006c62f1f5fec2a9a261dd6ece42bcaa68345a21f6e26958f965f90459501324b0e7a168f3fcc4f7f9 SHA512 6b1a7f6566687384d328260576dad306dd07add06001b3746b4f37f05ff91b6ee72e1e2ecfd35463a5b78b4ba8dd1a7757503bdf992372dbd474967e4bf0e9f3
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
deleted file mode 100644
index 4bc7be0358f1..000000000000
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1
-
-DESCRIPTION="Interfaces with LastPass.com from the command line."
-HOMEPAGE="https://github.com/lastpass/lastpass-cli"
-SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~gokturk/distfiles/app-admin/lastpass-cli/${PN}-man-${PV}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
-KEYWORDS="amd64 x86"
-IUSE="libressl X +pinentry test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-misc/curl
-	dev-libs/libxml2
-	pinentry? ( app-crypt/pinentry )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all $(usex test lpass-test '')
-}
-
-src_install() {
-	cmake-utils_src_install install
-
-	doman "${WORKDIR}"/man/lpass.1
-}
-
-src_test() {
-	local myctestargs=(
-		-j1 # Parallel tests fail
-	)
-
-	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
-	# which is incorrect for our out-of-source build
-	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
-		-i "${S}"/test/include.sh || die
-
-	cmake-utils_src_test
-}
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.2.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.2.ebuild
deleted file mode 100644
index a8047a4f3661..000000000000
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_WARN_UNUSED_CLI=no
-inherit cmake-utils bash-completion-r1
-
-DESCRIPTION="Interfaces with LastPass.com from the command line."
-HOMEPAGE="https://github.com/lastpass/lastpass-cli"
-SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~gokturk/distfiles/app-admin/lastpass-cli/${PN}-man-1.3.1.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl X +pinentry test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-misc/curl
-	dev-libs/libxml2
-	pinentry? ( app-crypt/pinentry )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all $(usex test lpass-test '')
-}
-
-src_install() {
-	cmake-utils_src_install install
-
-	doman "${WORKDIR}"/man/lpass.1
-
-	# Version 1.3.2 uses automagic detection for bashcomp
-	# To preserve backwards compatibility, we unconditionally
-	# install the completion file
-	newbashcomp contrib/lpass_bash_completion lpass
-}
-
-src_test() {
-	local myctestargs=(
-		-j1 # Parallel tests fail
-	)
-
-	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
-	# which is incorrect for our out-of-source build
-	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
-		-i "${S}"/test/include.sh || die
-
-	cmake-utils_src_test
-}
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
index fefda5aeb792..b202c4fb1ad2 100644
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl X +pinentry test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 3d313c68a3cd..ed100977261d 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -10,5 +10,5 @@ DIST logrotate-3.17.0.tar.gz 224559 BLAKE2B 6d019bafad6986a0b6264893d36a515db75d
 EBUILD logrotate-3.14.0.ebuild 2504 BLAKE2B c95b9546ebaa6175bfc8bfaf7cfe553d8859b2f4cd45148fab16c8f84dc50806d01fd27f9c851f077224e0b040e024aeb2fad5429d50ba77b6bf073b9574c32a SHA512 a1a3398e9895aa1884cbaee490fb21973826a258b30a2f12631c98c1c5848ecaaccd4696eea5480ed578e519bac79d19282f7590d32205408f6d1438963d28bd
 EBUILD logrotate-3.15.1.ebuild 2527 BLAKE2B 8bb89e3b8bfa250ac9d394d1291fee1e86540e34bf439fb020a5a98f849deb0658bcf56b6ed89222f2743d9b0bf333e202d0442387dd99b89823a3b25516e158 SHA512 7150d851233a645b918b333676113503f58a60451016a22b8c8500ec4630f5ad6c55b86cc4b64f2fe440947cc52040b43b4c924f3510725fb4c00912118146c7
 EBUILD logrotate-3.16.0.ebuild 2492 BLAKE2B 38e1d4f4fa13982c16375e66c014bd6e1b16c8cb589fc177aa38a9ddb52443ff9161e2255167b99d7b5631d51efb1d85861f62d881db96bce0893f2564d7a83c SHA512 26193d71af7b9a8f52770af0d9de85dd18fbfb525eb71bb231d69eb51a276d66dd7a3e5b6b77a65f2c71fa1cadf4c3732e1e03297ef8447a163153d28db480de
-EBUILD logrotate-3.17.0.ebuild 2492 BLAKE2B 38e1d4f4fa13982c16375e66c014bd6e1b16c8cb589fc177aa38a9ddb52443ff9161e2255167b99d7b5631d51efb1d85861f62d881db96bce0893f2564d7a83c SHA512 26193d71af7b9a8f52770af0d9de85dd18fbfb525eb71bb231d69eb51a276d66dd7a3e5b6b77a65f2c71fa1cadf4c3732e1e03297ef8447a163153d28db480de
+EBUILD logrotate-3.17.0.ebuild 2486 BLAKE2B f52d8f5a6159345c29eb35e9a8706d1fb35335862d71e4f27d405f2ea634ffee26d19cb32a067631e42b4378876cc19460f0027be4fa13df043d431e6da2056c SHA512 0a0627a7226be397140f6badc430a7a0b0e982957deac8827b196cad5fe07944061819aa278b565d23a03db186b165716ed168166a1f633a36b9ff04f4f16d90
 MISC metadata.xml 1207 BLAKE2B 59294176103f15343e415ada4c4e073cae53322114bf39b43376c6eec8206fd3cce19da99cf609b1e72340f15a272b94a5a956703c93659709f4d83605ab6152 SHA512 29acdfddf935cf1c3bd7e61cbecb19f9f5b4acac31d01aa89ea2f6395a7f59bc2501d3f751f5e8680fc71336cd56cc5abedd9850d44664ddbb12b140efa86645
diff --git a/app-admin/logrotate/logrotate-3.17.0.ebuild b/app-admin/logrotate/logrotate-3.17.0.ebuild
index b63b513c2ef8..98a69f1ad414 100644
--- a/app-admin/logrotate/logrotate-3.17.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="acl +cron selinux"
 
 COMMON_DEPEND="
diff --git a/app-admin/makepasswd/Manifest b/app-admin/makepasswd/Manifest
index 0bfa4a64f2b9..e1d8754b622d 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
+EBUILD makepasswd-1.10.ebuild 541 BLAKE2B 805ec7e4de548b09fd1e01992f4108532914b873f956327a25a618b3602af6084fb56758abe2005e41471057f74eb7342d4e6604f09eca9fc0dae1026c5141ad SHA512 af3af664196435acfa3780c1bb33dd1ac95773d3024479c64cc0ebcb9fb12f1be9a40a25290efd6b5a9010e8885b7ed5b22937e2c0c86e8e11b1fee480c391a1
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/makepasswd/makepasswd-1.10.ebuild b/app-admin/makepasswd/makepasswd-1.10.ebuild
index d36c2973c4d4..3d62de699ea0 100644
--- a/app-admin/makepasswd/makepasswd-1.10.ebuild
+++ b/app-admin/makepasswd/makepasswd-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/dists/potato/main/source/admin/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-lang/perl"
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 8a696303e270..7069f050de52 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -2,5 +2,7 @@ AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 BLAKE2B 5952e26c668fb71f712fc70b3
 AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de41215890cb4b6431ad694c2684f498d13287e385119304a816270f470ff26529967701c92bfc845a8aac698a0aa0f67271 SHA512 cda86c3e74f56fcd9d8771b26ca91c32ccc33e6bcd6dd0fcf856c14096daa619257d237e1e187e7820d6a0a0553ae6fd9ec160ea59e237b4e05ebca4e6656e20
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
 DIST mcelog-173.tar.gz 313098 BLAKE2B f9ddcd85294bdcb1d9e8e888040af94e5e17f4902efb47788b69737bb3408e59014481f822ea083947725f75b7db21250f4c645e7b409a6c23ce7a9ce3708a62 SHA512 fd83828d19f889e3cbb2ffda8fca95f3097644161bfe2ede1fd7600718fa56d343cd985b831eb643dc613a453730e07847de0f05fb14b4a03a8dcd73281199e8
+DIST mcelog-174.tar.gz 313473 BLAKE2B 6ffbf6f53e4a08d0dbec04f6cfd96e6b564de5e85acc1f933856e317a26898ae002f19c3b948d9e6dfc56fa3de944045a7cc31e16f53a9c40bd872d4e4ad8a60 SHA512 fcca5f9b54d1f6889ab33d7a172a7ce1e89b4bb8c4b88d589e491068cba49518bd47a3d8886b70ac1b9693bef9e312640cbc64434d8679401bf2d1beda809448
 EBUILD mcelog-173-r1.ebuild 1353 BLAKE2B 2bd8f0d4bc17feb9fa7435c1056443639777a35803379019cbdf05aaa93d82a152495b7ba3d914665ec57a28441d00a3bf077bf93929916403ad26e3b664caea SHA512 32155344fb55a5a12ff14f56d1c6b392d4cae1bba1fba2e77f219fa35f054f7c60a45917189bb63c37551f4308b90ca4cd17fda0b22f7bb532f9d9cc1c2bca19
+EBUILD mcelog-174.ebuild 1355 BLAKE2B c1c875cfb1efeae3e9818a0c1393cca8e05e2444861c426959f212e3a6ffbe1efc3a6b5ad0bdee4f14e8eb0cbfa06fcccd87a8fa8d0cce112ad79a1474d17a76 SHA512 07f1dee935160cafe5a52ec266744b7911095d012eb91d403863e3a4996768c24ea7cf15cacf6600184ba02fec380d3c8bb7390ca92eb9d4066b34bb3fd16595
 MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/mcelog-174.ebuild b/app-admin/mcelog/mcelog-174.ebuild
new file mode 100644
index 000000000000..0fceee0d5f22
--- /dev/null
+++ b/app-admin/mcelog/mcelog-174.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	insinto /etc/cron.daily
+	newins ${PN}.cron ${PN}
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit ${PN}.service
+
+	dodoc *.pdf
+}
+
+pkg_postinst() {
+	einfo "The default configuration set is now installed in /etc/${PN}"
+	einfo "you might want to edit those files."
+	einfo
+	einfo "A sample cronjob is installed into /etc/cron.daily"
+	einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 3fbc432acdf0..cd5b470d79de 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,3 +1,4 @@
+AUX monit-fix-unmonitor.patch 1231 BLAKE2B 691cc01a06817be42a90706e967577aadb6597ded78c5976d5fd505744a29a6f151e97b4d143d615324122920f849704f42ea995566cef9a3a6dcef850e46289 SHA512 535e789068744f9110b60e35bd0bc5b9f5f1f6f64d8170c0cc233fc019e9679b562064698eafb7d1f0454bed14d6659ab47543a29484cf72f6537703faf69ef1
 AUX monit.initd-5.0-r1 798 BLAKE2B 3596494122e9746157e86379f204e54d5ad7c0eb378323f3cd2ef7019e9f7a7fba0d8567afe71da8dc2a8b6e17be5fc4162211d36f227183a1557b9b33021f3c SHA512 5e0e2ae2bd1b7e1153a24a51f10b11b7006c43c5b4d68008b477dd0a4cdf97e2109cdb48b1165b79e6f5ad8e98c24a86ff0688f9aecc9297a46d82dd402e0554
 AUX monit.pamd 120 BLAKE2B 76744f79babaa99fa2961f73158ca755f885e9ea8e20b76dcb29f8fd10be6b5804b09b3c90f59ada7ce81eab90713ba43d2b2f28a6abc278fdfc75b356af4e67 SHA512 75c5fbad1c04fc5c9c0de224df245d64f4e59e23f79f4037edcc94623795852900318747e8a71946cab406009834643e84e1cd40b27854951d5462e740712b5c
 AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e4360520252369951b3f7f87a3dd96440a58c9d2c4973ce9980a00ab7085c92af1e6542ae10d679ba352d170b19 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88
@@ -8,5 +9,6 @@ DIST monit-5.27.1.tar.gz 1459360 BLAKE2B ef8030112c401ab08653692c702f2ec6d34c116
 EBUILD monit-5.25.3.ebuild 1204 BLAKE2B b1afff4ec33ccbea3c8e06de97e756590706a54492bac64da87b5a40278ed835806cbccbe9b2b7869e443b83f00f9b6cdf6d78e6929d5683916cf11756c3da7f SHA512 02a0b6d37182baf77a2cb835664ea0d8faf3a473647d234ffc2a62df313d564ec491d9682808161bf4da62aa558fa03293a1b8eea017840acb52298bcfe1834d
 EBUILD monit-5.26.0.ebuild 1207 BLAKE2B aa074c71f4eb188e69feb148663344e15c8ab1e818c960018d59abd21ea5713eb148cdb9c796b996b00aca20f9a4e46ab3ce75f90465d35fb2cd7901a18b9858 SHA512 add86722d2fa2a539c6ac3c4758731e0b72d279d8c56f9634880507e1db0e364a2c4b66ef7d23a60c6a56550bb5fc15d0f8d99a16aa11cd81890093eb368fcf9
 EBUILD monit-5.27.0.ebuild 1189 BLAKE2B 6d26a251a2971408adb9801306041c873741e6d2f8b785a050764c40fc7d1076881aeffac520c102e1c3138a945f23abc1b62d83bb6c6b8cc4ddb615511de277 SHA512 9ad4ca52585b0e2b20407b7a901e6fbb8dc0aeac56e6f9fb4c47b2453f745c88d416f5cbbe8b80c75d67c7b06fd99b68616736eb9f28328db18261bbb965581d
+EBUILD monit-5.27.1-r1.ebuild 1252 BLAKE2B 828454c39b96d5ebde4bc3edd2dde1111914242a3d883f439d76e0f53f7f84e1a8c745daa59d22cee19f69c034ffe86f5f01325d26d39d3eb115007c1aba04c4 SHA512 3de6f38ded218644e8d087c5bff499a2a78b29a2fc4a3e0928dfd49c994a96654f0cfad338f64220b052182c465a93fb41516dc92c9252931850d3031d0496ab
 EBUILD monit-5.27.1.ebuild 1189 BLAKE2B 6d26a251a2971408adb9801306041c873741e6d2f8b785a050764c40fc7d1076881aeffac520c102e1c3138a945f23abc1b62d83bb6c6b8cc4ddb615511de277 SHA512 9ad4ca52585b0e2b20407b7a901e6fbb8dc0aeac56e6f9fb4c47b2453f745c88d416f5cbbe8b80c75d67c7b06fd99b68616736eb9f28328db18261bbb965581d
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-admin/monit/files/monit-fix-unmonitor.patch b/app-admin/monit/files/monit-fix-unmonitor.patch
new file mode 100644
index 000000000000..9e134a08d374
--- /dev/null
+++ b/app-admin/monit/files/monit-fix-unmonitor.patch
@@ -0,0 +1,27 @@
+From a737d3e3bac5bd0378f645eb675a7e4c248e2216 Mon Sep 17 00:00:00 2001
+From: tildeslash <info@tildeslash.com>
+Date: Tue, 27 Oct 2020 19:53:56 +0100
+Subject: [PATCH] Fixed: Issue #931: The "if oes exist" file test with
+ unmonitor or stop action didn't work properly.
+
+---
+ CHANGES                           | 9 +++++++--
+ configure.ac                      | 2 +-
+ src/validate.c                    | 3 +++
+ system/packages/redhat/monit.spec | 5 ++++-
+ 4 files changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/src/validate.c b/src/validate.c
+index 2bf818a..36aa7ef 100644
+--- a/src/validate.c
++++ b/src/validate.c
+@@ -1686,6 +1686,9 @@ State_Type check_file(Service_T s) {
+                         Event_post(s, Event_Exist, State_Failed, l->action, "file exists");
+                 }
+         }
++        // Double-check the monitoring state: the "if does exist" may call unmonitor/stop, which resets the service object
++        if (s->monitor == Monitor_Not)
++                return rv;
+         if (! S_ISREG(s->inf.file->mode) && ! S_ISSOCK(s->inf.file->mode)) {
+                 Event_post(s, Event_Invalid, State_Failed, s->action_INVALID, "is neither a regular file nor a socket");
+                 return State_Failed;
diff --git a/app-admin/monit/monit-5.27.1-r1.ebuild b/app-admin/monit/monit-5.27.1-r1.ebuild
new file mode 100644
index 000000000000..ae564169cc26
--- /dev/null
+++ b/app-admin/monit/monit-5.27.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 pam systemd eutils
+
+DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="ipv6 libressl pam ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	pam? ( sys-libs/pam )"
+BDEPEND="
+	sys-devel/flex
+	sys-devel/bison
+"
+
+PATCHES=( "${FILESDIR}/monit-fix-unmonitor.patch" )
+
+src_prepare() {
+	default
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with ipv6)
+		$(use_with pam)
+		$(use_with ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc; insopts -m600; doins monitrc
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+
+	dobashcomp system/bash/monit
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index bb19d583751c..47bc89667c0c 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,5 +1,5 @@
 AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb79454c18b471ab62134074765c313be5633e5fc8d1d9105a51d4dc648e3e08f200487ea62e3b9cd4e4a1 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659
 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-1.7.3.ebuild 2189 BLAKE2B 8ee842903bfe1c01a62f423eac78cc96f59129c714406f3af605ddb0d3043b481a3748a19dccb5b2cb31da0416cc65d5bcf0627dbfaffcfd46f71f0efc66a58c SHA512 ce590f22fcfb55abc462cb5351f658867d4e3a182ae8ccf7e0d5a183c49514a3f1d1bc3ce9aa41f0a8e8585ff750b21a666d6c14797ff42a8269d5bf6104f77d
 EBUILD pass-9999.ebuild 1970 BLAKE2B f2b42a0e2373581160439a6d1e89af0b873aa4140035d6f918572fafc1b9b8b8d7b31722edc61a8e771bf6912f73f5d8f358bc660c15bbdb12d23d4569d5c4dd SHA512 532a628a7d0192763af3237106e737af3a2d26fe3db2f68134569df2450cef59f1f789301020fb0930ff6c0e2e10fca8161f2b29bb288ad2af0f5f18e7ca3a96
 MISC metadata.xml 747 BLAKE2B 0fa61ff5f87f66214e11c38fe1dd0dc746b8151bc201c72d972ddbd0f8e32dc89701798746df8e2c912eb0d4ccf43fc91d857dfc5395d184f4da24d5128f7b13 SHA512 5fb903b4d06cd49dea554f2a94bbd79e544840e4cce4e876b12eeaceb45aa6321a3fe50f1d531fdeb9cbd34dab66b2bf3ac0be52b07edaf62acf69a892c96200
diff --git a/app-admin/pass/pass-1.7.3.ebuild b/app-admin/pass/pass-1.7.3.ebuild
index a940c2575091..0f7ca8dcb1a8 100644
--- a/app-admin/pass/pass-1.7.3.ebuild
+++ b/app-admin/pass/pass-1.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86 ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
 
 RDEPEND="
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index 58d9aba048c1..abe670a12b47 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,4 +1,4 @@
 AUX passwordsafe-1.06_beta-system-gtest.patch 2962 BLAKE2B 1ef77391d355364e55da568c2686c1988916da9eadc312c37d01016df3449535b88b503dfd3aeac2bf3c8e613141552bb1d97f5f5a733becc33f3c565a610940 SHA512 2fc6745b84ad810a550c2b221aca4cd10f87d4bc77282cb31b3d3070b61a3958c126ce0d3da4eaf550d80be470ca4c5aefaeb863caaf2f9fb285bf844f5705bb
 DIST passwordsafe-1.12.0.tar.gz 14937705 BLAKE2B 523e4496ffb99f8a53e62252117d43b771af867b3505f3a5b8c8f1119e8365f0661090e410a832abca89e2ce35816d2046d4bff0ba1e0f06c52c01eaac9051b2 SHA512 c20cb754a2174e3b3ab61edf99f2a31c333144550103fac50cc26cea89669fa3574db3bdd59996fcd87b83c7bf6dd1e9d2b087c17615183cd7111f151be5a94a
-EBUILD passwordsafe-1.12.0-r1.ebuild 1943 BLAKE2B b60a1515c0e5c81f9f50f2094dde557ecae2af25fcca8d931a88d97ef896a7fecd1f6313c0ac5ff7cfadf989c5a484fd2a3bac0d1d1955651ea9fcc7b3c51776 SHA512 6ffda611e68e73f476ff1693f4be186344f64b9f3238ec38ba33bf3cceca71777a1128d327273c7b921f075951e092644a7d3c538b0442ced3571cd1063fd84e
+EBUILD passwordsafe-1.12.0-r1.ebuild 1947 BLAKE2B 8ce56a738cbf43a3d7b7b00fb793b73ef63a5374c18d71cebadc9ec37a0a983bcb21f988c90e95fe603d6f11130f030c45b7ff95dd53b8b1702c89ed35e3a6c5 SHA512 a16f14f23aa589a11bfa956bf8bc9e38eceb6248ebece22e034d5773976722db3d40627b20907a638cd596c83c838b1d3344bd911606682cb0828b1ed6fe37e5
 MISC metadata.xml 683 BLAKE2B 9db2240d92f852ed50085280e3ddb947261ed7aaa9ed04784cbdf71c8e29ae79e1730cae298bcbcb75f82ebb69bab96695ba1a519487c92da399e1c7a98014a4 SHA512 12f06658b68b46cec87fe6842a8b94cd3c35b9e1d81e4aa447ec488358dcd37f5b3779c87d9fe0e4271f5f7e69550aa44cb815653acd502e10446e1842899e82
diff --git a/app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild b/app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild
index df1f621a56ef..47a36e206ad1 100644
--- a/app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="libressl qr test +xml yubikey"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index e001187e67d9..c61ea6862763 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -1,6 +1,6 @@
 DIST perl-cleaner-2.27.tar.bz2 7493 BLAKE2B 03d8bc336fd0a42bce16c4bf8b2272a7ff24d605b483af777ef7ab3d59accd0082709200705638ab116934f675b17c5cf109c40a3ab739654ff64abebd8c0558 SHA512 097d68dff30da198636f73fc44600f1863c7f69f87110315bb83297c96d826f2f101f56ab546fde94ff60ca00da0aaa569fefea3c2599155f3bd69c66fb42ed6
 DIST perl-cleaner-2.28.tar.bz2 7222 BLAKE2B 8b90b6d7be8b21de3de2d946baba2ea96e145072c1d6cb4fc9a45bd2181941155791e022f59139fbd440fd1dbc16a76e635e5d4bb420e9051efd87aa08a3aa0d SHA512 c53f2a48002ab45ec0e43cbdc6153792a540efb9ce9a272388707987a76a292a1f90ece85e2f5dfa94f75a1afae13a5768d3712f183ca9d10fa0c559bba132d5
-EBUILD perl-cleaner-2.27.ebuild 995 BLAKE2B 83a0a9752639c8ca7def08e0ae25bd124414b044c405b9ed07dceda2efdf7cdac3b2de4025385e28a1099b6389686981a3439fba528740471c158bfdc6ce72df SHA512 7615c61312ae65b9f1ba7e3747865717326e4da50084c84150f231f1454f241d850b2c287b2d243d35d9457d97978546f256a841ae21105bbe2246c3f595a006
-EBUILD perl-cleaner-2.28.ebuild 1004 BLAKE2B b3d12180094d70ac00e6c0024356497d20ccdbae00f1d56f9e1e74fe33f460abbbab98e9cc5a5c07fb8da1514200276b3c7d81ce9a638906bdfcb31b158ad6e4 SHA512 cbd9e11bf021674e753d34424a931a69a41807797bf955a910f9221acc1b8efbeda9348c80139f7c8e0737ccd5f4bd492a0f85672b2422a19db01ef13a23e45a
-EBUILD perl-cleaner-9999.ebuild 1004 BLAKE2B b3d12180094d70ac00e6c0024356497d20ccdbae00f1d56f9e1e74fe33f460abbbab98e9cc5a5c07fb8da1514200276b3c7d81ce9a638906bdfcb31b158ad6e4 SHA512 cbd9e11bf021674e753d34424a931a69a41807797bf955a910f9221acc1b8efbeda9348c80139f7c8e0737ccd5f4bd492a0f85672b2422a19db01ef13a23e45a
+EBUILD perl-cleaner-2.27.ebuild 984 BLAKE2B e4598ae7ac19a0fce5b047fbba58fe8241f194f5eef4dedd11bb9368ab202cb0728339287053a3b111c11e3291d96679a6ca6a2f82f996ab08167a8b870ab16c SHA512 74d9e44da245bc423c6dc2be00678025c00679235af689c39f2f7849c3ec5423457396830cc78d011ab2127983bf040c29f42638a27faf9dcaa9ff36559f1741
+EBUILD perl-cleaner-2.28.ebuild 993 BLAKE2B f9a73433dc1cbd00680a8d8f7223e71e81116fc32e7ac2320a15438c398c97190240e0cc6c6cb02162c9e7ff486d5dac3357db885d466c01a0c88c4393812c88 SHA512 c4efd93545de3fdcc72cf298bb3cb2399ae235ee096f375a572999fe9a8636b05e7f7814329e381125792b9cc45bad6e54ee9a1cb278fd2c60367a70d9219993
+EBUILD perl-cleaner-9999.ebuild 993 BLAKE2B f9a73433dc1cbd00680a8d8f7223e71e81116fc32e7ac2320a15438c398c97190240e0cc6c6cb02162c9e7ff486d5dac3357db885d466c01a0c88c4393812c88 SHA512 c4efd93545de3fdcc72cf298bb3cb2399ae235ee096f375a572999fe9a8636b05e7f7814329e381125792b9cc45bad6e54ee9a1cb278fd2c60367a70d9219993
 MISC metadata.xml 248 BLAKE2B 7e969e31666e369b4b1826230eb9c103e51962ac23701a7d5e49d211d6da6ee2f6a8372d72b3ba454140d2c1fb7ab6d122f011e9c8144e95a9cc11f01d2e6481 SHA512 53fd9b61e8fd7f18f9493861896a34938e5f6ee4efb3d2c71703dfa81587d0943f0d439fac0e0c106966dabba08d6aeb4b0a2ff85addf30d992c9b7c78ab6314
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
index 9acfe3d3f9c4..d21cb6dee5ae 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.28.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.28.ebuild
index 5b73ebeb2248..b0c4cce4366a 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.28.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
index 5b73ebeb2248..b0c4cce4366a 100644
--- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 8c6a556e505f..03e02e1bb5cd 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -10,7 +10,7 @@ DIST puppet-6.18.0.tar.gz 2911742 BLAKE2B 75ecb14a0cf96c1c54d09f88f9198480583428
 DIST puppet-6.19.1.tar.gz 2917976 BLAKE2B 06019b465699494c3c5045d8d3f617046583f8bb5ebff4e72991bcf5f1ca76b4e00f56af79bbcd7ab849439fc5e627840ef08b92f586441c0cb0bb3d51805f7f SHA512 4e8a3c8d46b6aa67c31da4b510dfc32a187937af213efb9f2f0b6625b29995cdfa8cbca384ad857c19e47ae4878127564756a809c2afdff4883038249395ff01
 DIST puppet-7.1.0.tar.gz 2827602 BLAKE2B 5e15c7304c7b91e40b95096482d6a71a3e9e1686f769c4c0334a533cd8b6faf31d4e126585c9b48c15bb524930e0410bff32201dd01d7faeb7487c29075f7477 SHA512 7cb5f8c472d28012a0b93893792611dd03081c7100be57e2fab60a0dabe164081fc40195d562ef8cf5e2d67f9d32f26704ecedee9cc772e568a116e12af70cda
 EBUILD puppet-5.5.19-r1.ebuild 3692 BLAKE2B 7aa03944368b7395b4c587230a39536db28d0a46352bd5c6f7ec457ca29a3e6d9a3672a9b74591d3382909dc4f9ecf6ec73853ad5722b26becafb5c1a1264912 SHA512 6012739c4d92cf576ea482f99e9d560633103116b40be7df8cc3a9e89f9efeef3e02317dbbed1207a91c5372ef7702d723c37207488ecd6ececad5d0df6de9a2
-EBUILD puppet-5.5.22.ebuild 3752 BLAKE2B e64453cbc579243fc33507c6fa9d4e463c10406ad9f0139bbac379146bcb1d1c23d4c7a5bd856a63730cce798d12a235571d634598e7e530524e237a9a26eeb7 SHA512 735cec582ef2e4810135756e5baa587d8df217dd54ca117508c8da919559fe165d5c4904622c1fdf506fed8b1c3af8c5ecd311b0531e2b055580ae540adf7c8e
+EBUILD puppet-5.5.22.ebuild 3751 BLAKE2B bde3bbacdd70435fe0e804133106ebc887f72da5742c871bfdaed08a084866f178b68433453d392f7e98f8f5a2297ee10e7b6e035392fecd22a84780a2b431b2 SHA512 5bc024d0696e51de520ca6ba162cf312ddc9cca04ba5ee18f849ca48547f31e4a493664ffd0100022ef4fb69ad1c24b1efccf7a25d85652281da71c446b87f26
 EBUILD puppet-6.18.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
 EBUILD puppet-6.19.1.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
 EBUILD puppet-7.1.0.ebuild 3554 BLAKE2B a181c774112747fa06e9980081da602b0bc8a924c08b04802054738a1a9ffac08bf85d6d4fca1c0c734a04f8e1b2daaf410743488f3fddc5ebc46f9424ca65fe SHA512 0ceea9d4e1651ba4732c3cf37c63998113a0bb0f88fedb27f2f2bfb663ab1f558e537886b983a415bbf0259c4a36ca40a186f7a78b9bb48d3bdd8b396a1f4215
diff --git a/app-admin/puppet/puppet-5.5.22.ebuild b/app-admin/puppet/puppet-5.5.22.ebuild
index d73c6284359b..d0814cc9e781 100644
--- a/app-admin/puppet/puppet-5.5.22.ebuild
+++ b/app-admin/puppet/puppet-5.5.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ 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"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index 0b18c7d6703d..9330a1304731 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -1,4 +1,4 @@
 AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
-EBUILD pwgen-2.08.ebuild 604 BLAKE2B e39f7830e4e1456ba7af8ceea7820c40c8f9c1749ad8fef83fc261f621e126010ac92c3302376330949911d7ae6a9f00b90848722cf8dd428aa28fceffdaf9ca SHA512 92866456551fabe95366cace5ae51c0ac98e7dc15b9ca0da3bfcaae9e71727150b5f35152eee3852a2f370ae0fd350735cfa983eae3033c7646644275e9c2275
+EBUILD pwgen-2.08.ebuild 593 BLAKE2B 1dc18a97bdf839a9860a900c8e7a8fd1f989749347b50e799f4ece6362db92c1dd0fe359bccdfff1ee31aa6c8b05e7adf02e4b3cef223168f1ba00e13caa2f82 SHA512 e2ea733486d2197e4c295231d9b4560b2a8ed7a54376f8b04ac5bb9976aa4ab7c6efd83d23aff61eda4a1215c6408ae6c31435b444985358ebaba30b95e6cbab
 MISC metadata.xml 770 BLAKE2B 7c31186239b8def87453795145d9a04b86e584736503bb02a5a2802bffb514d410c5db3ef7025551a63d7fb4d7dc8a054d5ffe81472be48a2d82fca637b9dd2a SHA512 c1cab2c493bb0df17ad27b77c3f66845ad8a51da548cf6c1f6572a2bda1ba7728c32ad8acb0ef54dc2b84c0d9540efd109e0e74fa48d87b3d0f2a3bc09a0d9ee
diff --git a/app-admin/pwgen/pwgen-2.08.ebuild b/app-admin/pwgen/pwgen-2.08.ebuild
index 9694d8381ada..96da7315f89f 100644
--- a/app-admin/pwgen/pwgen-2.08.ebuild
+++ b/app-admin/pwgen/pwgen-2.08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="livecd"
 
 src_configure() {
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 4e0b7369e8ec..a1f4a9fce54d 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -4,14 +4,6 @@ AUX rasdaemon.confd 109 BLAKE2B 20f78ff36701aa718e5dcb36b79949ea5f887ddc65219c33
 AUX rasdaemon.openrc 369 BLAKE2B 81768b9a6cdf4696d8598dc61675b86f617ae543cdfda8166f961d9ab470ba107165b72be32370f71f52b07503f3ea948cf9d7ad10c2899e2e9b79f1e06e96de SHA512 eb91a3c54033a136e5b35aa769b5c01a0810970e77efa3f9efbcda5cf088e5268fd7bd9fff953bc47b9233a41e5321094b4d2ef85500dc0175f5be6a64c03105
 AUX rasdaemon.openrc-r1 484 BLAKE2B dd64b1b6164f74e887ebff43116bd23311b86a7bbdf7830beb4ba27ad3e2db33e2107c7083c23f14e50e781a339e49be8a69ee902cfbc98713de034daa5a82a1 SHA512 e27c08bc118edd95468dd466aea52764df5b400ce9acf2043bd035d2fadbaa3b953794869c1fdaa23320e9529960e97c9e47dd31e8d8f3f48a324090f784907d
 AUX rasdaemon.openrc-r2 424 BLAKE2B d3be2b06631ec3dc60e464b5fb38a4778e92a93fc284455f53f6b7c43a05d182b79f478362ed93a706b421ca99f6a21afdd2cbd53d125711bbf1d0f267304ace SHA512 2e30602222443e519cefc1f138dc537f5e22109fde2f8ebb0f8962abd926721389defc46cfa8db667db8618d4dc4257d36e9855367c3c8f2b7d28cb8684a4adf
-DIST rasdaemon-0.6.1.tar.bz2 363201 BLAKE2B bdc7ec3c2e7e4b2fee02dddc55b5afd82df64717f45da15dbfd5fee87721b80ac425af5806ee7462cad29c6ab2953a2e649c4b1e455983d8821a1f633d76c85d SHA512 a221a7ea0e4555befbf8acb9d4ce22d5cc7861a0da458111a24905fa06be0e8f3b18d8de5334310a423657febc0532d2705236de89cb1788302bf487ede29f60
-DIST rasdaemon-0.6.2.tar.bz2 375140 BLAKE2B fd22185172777865120fbd13b7bfb5db9b9b0348fe8575ca6b5f16fd662c1e847729e239342b1c9ece70a4e79ad00352bb69d9f80cfbc8da2c961e68874dd03b SHA512 d8c1ee2cc801124837b3a0739f3016a206165306e300ce51e6aac2cef56bb65479f96cdb019ba3a5cffeba94e7b67ca22686d4ac94bfa8a8a1145db6ba51096b
-DIST rasdaemon-0.6.5.tar.bz2 403435 BLAKE2B bc6fa1aea6a6f0190a4f26df936f0ceb4c9b2ae00183ad9239430a018d9c8178e54b016a0aa9d22d97d851b59321b4a27cad7196f1fc22790d15a19c9c06f6e6 SHA512 aa781f3148ae32c8bc7ff8007574912454180725b9b102e1c7c583101dd1fd96debbdc78f3f2a35db45df359c7547cad4d87b490af66f444341c0dc8429c1310
 DIST rasdaemon-0.6.6.tar.bz2 404681 BLAKE2B 4314cd064b255df1cb1a148914c856d074fda1fc2d63e0554cbf0b78799c4252afdd4e827390729e191ff2ed9f719f6610487e85dd52af2b02694fb17740df05 SHA512 481ecd624ab5521d60ee7c613ee05d1d19b85e914b92eae84d18cb2e6dc788981213d49a6316cf575517b6e180f46c66c65804e4feb518bdd84bc21cd2970e08
-EBUILD rasdaemon-0.6.1-r1.ebuild 931 BLAKE2B fe6abb4a500f9890dbdcb06a457d7a33ab8b138fa22af2d4046ff133a9205a8f75c6e07273e4fb7eeadf3bf8a974e8fcea39e29c4b6d080a627d6619a4c2e5fa SHA512 02871f282b1b7a4f4601293974d7fbccc41ee7c90a590e6d349db20040bd1cbebb562c56acf8c0cbad37dd6e4e04ac0140f2d34e70f208b611b1cb73873a0f67
-EBUILD rasdaemon-0.6.2-r1.ebuild 1033 BLAKE2B f3a939268a9b34f730424f8d7af85c96e0240fb8ed3d6dd8b181bdc720b84622e41f2b2bb541a055dff70bda6f2e5c4952bf53bf68a328a7907b91ea47292892 SHA512 5837d47d13166bed48f89cbd10682550f4c3abd9e4c00d1757d432e9ece382c323e8cdc44b938770517f93a801b1eb2bf91ae93e034a9113f1d123e1f74bc338
-EBUILD rasdaemon-0.6.2-r3.ebuild 1137 BLAKE2B a2402b26a92a0b9e6e6383c27d82e558bfe3f2737702ac3f0b2f57096f2eee6a6ca3ee9e8ab1fadab8366eca762a76d82ee02b783b39c35325b3a5af73f9f881 SHA512 490ed88bed969b3ab6a634bf3b04086b187a58deb39279911339f953f32da0618cb055b488b15996c011b4e681b338e640c162d2cf9a90c96fec47f409455e87
-EBUILD rasdaemon-0.6.2-r4.ebuild 1151 BLAKE2B 15161840fc5b98646cf3fbf08657a5492c054876fae43905f55285f3ae0434a88c238479f7a3c02bbda476f43316b559bb4805df49468f66e206c14d3bec78a0 SHA512 2e7ea61b7294ac22d809f32ed6fef34d73444a7a6f6a6bfa93bc004c7cb1e14c75832aeeda335c5c9e4b82b348fe5520b71a381d713a5ba8e093aa2eff6de6d4
-EBUILD rasdaemon-0.6.5.ebuild 1191 BLAKE2B 4765a18d280b44c87970e1531a33c08cc096e277a77d28a86f20ad94be350b27b4be0f83232386c0c0b71139c46995eaa217a8bd846adb696a9d90dec8b07ab0 SHA512 5d17eca9ba89d70644af169d2e4b52aec7b5898565f4a54b23f8946f5f68b6d689d4231baba00b47230cfd115953ee54ffffc1a0dd60d88f48b651353114c985
 EBUILD rasdaemon-0.6.6.ebuild 1216 BLAKE2B 65a8184eb5eb79ebce498d73cc6bdda0088174d5a7a6ff9aab4a70b4e400c1bda67ad5421c9f63e40511160d83185f40398751e9d89fbd42efc486f45e23c73c SHA512 47c4aa0af953a609ca7f178b8a4348ac7e46c879815b56bf1831019618272f05a4e26f94742335b0088cc741ae70e0ade7255780f89745a4429487887b432ab0
 MISC metadata.xml 871 BLAKE2B c9b484c2fd3019681f9c335fc046c7718c35bcafd9fa46f59328c68fb4404571818b861cb938bcb00fa08a164688a58735d7db27e73120597cd114a3a39acaba SHA512 1815bc3a92340071b40de8129441bbf55fee7edbec94f5337d6a9b42311cc3c1d898598d0756b60b56d804629700a2c0109362933acf5442a74097e752b24935
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.1-r1.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.1-r1.ebuild
deleted file mode 100644
index 18c68185be3b..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd
-
-DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
-SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	${DEPEND}
-	sys-devel/gettext
-	dev-db/sqlite
-	sys-apps/dmidecode
-	dev-perl/DBD-SQLite
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	local CONFIG_CHECK="~FUNCTION_TRACER ~FUNCTION_GRAPH_TRACER ~STACK_TRACER ~DYNAMIC_FTRACE"
-	check_extra_config
-}
-
-src_configure() {
-	econf --enable-abrt-report \
-		--enable-aer \
-		--enable-arm \
-		--enable-extlog \
-		--enable-hisi-ns-decode \
-		--enable-mce \
-		--enable-non-standard \
-		--enable-sqlite3 \
-		--localstatedir=/var
-}
-
-src_install() {
-	default
-	systemd_dounit misc/*.service
-}
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.2-r1.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.2-r1.ebuild
deleted file mode 100644
index 330e1815fc39..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd
-
-DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
-SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	${DEPEND}
-	sys-devel/gettext
-	dev-db/sqlite
-	sys-apps/dmidecode
-	dev-perl/DBD-SQLite
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	local CONFIG_CHECK="~FUNCTION_TRACER ~FUNCTION_GRAPH_TRACER ~STACK_TRACER ~DYNAMIC_FTRACE"
-	check_extra_config
-}
-
-src_configure() {
-	econf --enable-abrt-report \
-		--enable-aer \
-		--enable-arm \
-		--enable-extlog \
-		--enable-hisi-ns-decode \
-		--enable-mce \
-		--enable-non-standard \
-		--enable-sqlite3 \
-		--localstatedir=/var
-}
-
-src_install() {
-	default
-	systemd_dounit misc/*.service
-
-	newinitd "${FILESDIR}/rasdaemon.openrc" rasdaemon
-	newinitd "${FILESDIR}/ras-mc-ctl.openrc" ras-mc-ctl
-}
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.2-r3.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.2-r3.ebuild
deleted file mode 100644
index fca06e7b0f04..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.6.2-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd
-
-DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
-SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	${DEPEND}
-	sys-devel/gettext
-	dev-db/sqlite
-	sys-apps/dmidecode
-	dev-perl/DBD-SQLite
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	local CONFIG_CHECK="~ACPI_EXTLOG ~DYNAMIC_FTRACE ~FUNCTION_GRAPH_TRACER  ~FUNCTION_TRACER ~STACK_TRACER"
-	check_extra_config
-}
-
-src_configure() {
-	local myconf=(
-		--enable-abrt-report
-		--enable-aer
-		--enable-arm
-		--enable-extlog
-		--enable-hisi-ns-decode
-		--enable-mce
-		--enable-non-standard
-		--enable-sqlite3
-		--includedir="/usr/include/${PN}"
-		--localstatedir=/var
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir "/var/lib/${PN}"
-
-	systemd_dounit misc/*.service
-
-	newinitd "${FILESDIR}/rasdaemon.openrc-r1" rasdaemon
-	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
-}
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.2-r4.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.2-r4.ebuild
deleted file mode 100644
index 19491e340401..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.6.2-r4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd
-
-DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
-SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sqlite"
-
-DEPEND=""
-RDEPEND="
-	${DEPEND}
-	sys-devel/gettext
-	sys-apps/dmidecode
-	sqlite? (
-		dev-db/sqlite
-		dev-perl/DBD-SQLite
-	)
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	local CONFIG_CHECK="~ACPI_EXTLOG"
-	check_extra_config
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable sqlite sqlite3)
-		--enable-abrt-report
-		--enable-aer
-		--enable-arm
-		--enable-extlog
-		--enable-hisi-ns-decode
-		--enable-mce
-		--enable-non-standard
-		--includedir="/usr/include/${PN}"
-		--localstatedir=/var
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir "/var/lib/${PN}"
-
-	systemd_dounit misc/*.service
-
-	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
-	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
-	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
-}
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.5.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.5.ebuild
deleted file mode 100644
index 37e14a241e64..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.6.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd
-
-DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
-SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sqlite"
-
-DEPEND=""
-RDEPEND="
-	${DEPEND}
-	sys-devel/gettext
-	sys-apps/dmidecode
-	sqlite? (
-		dev-db/sqlite
-		dev-perl/DBD-SQLite
-	)
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	local CONFIG_CHECK="~ACPI_EXTLOG"
-	check_extra_config
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable sqlite sqlite3)
-		--enable-abrt-report
-		--enable-aer
-		--enable-arm
-		--enable-extlog
-		--enable-hisi-ns-decode
-		--enable-mce
-		--enable-non-standard
-		--enable-devlink
-		--enable-diskerror
-		--includedir="/usr/include/${PN}"
-		--localstatedir=/var
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir "/var/lib/${PN}"
-
-	systemd_dounit misc/*.service
-
-	newinitd "${FILESDIR}/rasdaemon.openrc-r2" rasdaemon
-	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
-	newconfd "${FILESDIR}"/rasdaemon.confd rasdaemon
-}
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index 85147b219752..45bb1d355650 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -5,5 +5,5 @@ DIST restart-services-0.17.0.tgz 25643 BLAKE2B 5999e12e38207d00266928504da05c004
 EBUILD restart-services-0.15.2.ebuild 1791 BLAKE2B dd068050b6902dae67edf63b00afc64e65b53225d14e7a201da6cee76dbed62af643625a7ed10a4021481f4e3a0a31f8534972ba6132cd468262af73947042c2 SHA512 74dc54132343203ab53b13d1649bd9e4b3a28d31040e5c54f32707b94267cb0d29873d48e3a3e00d70a7763a6f57d841518602c405599f575e359b5fa9f1e999
 EBUILD restart-services-0.16.0.ebuild 1793 BLAKE2B 7cba407e822b45ea90c5cc88ad767d232d4195f5e4b8d217237833f36679081ab7bf367d96d406e02adad4722a23d8826ee958bf6af70248e5d8156fd9951b66 SHA512 d958bd1e77eb7b68d89a55e34716d0f4f4dd2b1af407a3449d8d859484770747bd05ad9668c5e1ecc32636d8e63c692480a9d4316b8f8e5d25caa3740d1ec109
 EBUILD restart-services-0.16.1.ebuild 1793 BLAKE2B 7cba407e822b45ea90c5cc88ad767d232d4195f5e4b8d217237833f36679081ab7bf367d96d406e02adad4722a23d8826ee958bf6af70248e5d8156fd9951b66 SHA512 d958bd1e77eb7b68d89a55e34716d0f4f4dd2b1af407a3449d8d859484770747bd05ad9668c5e1ecc32636d8e63c692480a9d4316b8f8e5d25caa3740d1ec109
-EBUILD restart-services-0.17.0.ebuild 1829 BLAKE2B a692552031775ff91d9f721ee8649ff9dd106cee766d909f638ed20e3b8baa77074f7f99423b7fbc7593c27cf822f87ce1d29f780c21f2c7083744c718ddf8a0 SHA512 0f251462164af0b305b7c4d7aa97f2482891b63d3231f19d9eee948d632c8cc5cd94efdd17ed05404ef8f7072ff2c4690a2dda1549aa24be99f53ce533b67a45
+EBUILD restart-services-0.17.0.ebuild 1827 BLAKE2B fb2c22d023257c526c671ae954f2a53c606e0d9729a8a52aab4f8695f3ab16fc8d72117a71e8501622eea6bc42d8e780b96d1a67964da76b74321999deae334e SHA512 2e16910ff5344812b00775961609fdeeac7a2c4e6b7ac4cf766104614116ab4c66e85fed0c994b3ec6415ffe17c71063168e46317cd14e24340ff160b933e546
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/app-admin/restart-services/restart-services-0.17.0.ebuild b/app-admin/restart-services/restart-services-0.17.0.ebuild
index 8ea339b4acfe..103bac6c6b27 100644
--- a/app-admin/restart-services/restart-services-0.17.0.ebuild
+++ b/app-admin/restart-services/restart-services-0.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/sagan/Manifest b/app-admin/sagan/Manifest
index d226cf5ab8b4..421d5a636fc7 100644
--- a/app-admin/sagan/Manifest
+++ b/app-admin/sagan/Manifest
@@ -3,6 +3,6 @@ AUX sagan.confd 239 BLAKE2B 2ca76c1bd5bdb7b29f007a4d93602f020f76b10d6e4313e138e0
 AUX sagan.init 432 BLAKE2B 561344909a8f6610504f91bf72ba6fa89ac03fdacacd3189372f466b690b3421c3f1a8ce4750b747c53613c75f9b61696ec7b3c490597eb0eca36ebece23a26e SHA512 c5ec82e48ac33785a0e63deb6b2079e97a2f9b5f96682ccbf646b4deae5782cbceb5756b17fdff7af8cafd4e561e298d842c4c4f4aa5229ccc58f5f0fc06e6f7
 AUX sagan.init-r1 424 BLAKE2B e6fdd676e772d2abfca02215026a95321edecb41fcbeec3aa45afe15abd667e323ec2f21375d41c692b9648017002c0b410d551034dcbd3f060f5bb1e2f95026 SHA512 341754a9b18fa4b4082a852cec2eaa5ea78be33eb9d8cdef5b7ec61a9d67d3b264b2c6a2aef030bd85d3644539447345c88fd23ebe99145e40f990f565706809
 DIST sagan-1.0.0RC3.tar.gz 285207 BLAKE2B 7322ffc73a8e86f07ef106b04feb9140ba94a51b9e286ef0c0b0d3fa609e8e03cef4c75e1d32502c1b70a4c078d8601d2a1c58058137bb793c8a52cecc4be20b SHA512 29388a339b290bb4de2359c0c54b9e1d43ef207b223a499a1a4faa36de4d9590a777a796dd773948e995d052b71f3ef47ca5bad5c133116c4dbb53b4fe336123
-EBUILD sagan-1.0.0_rc3-r1.ebuild 2248 BLAKE2B 602ea4352f8a83d55c53e26136d44613f6fce83bb8adfd40d58a1bd5c0da57b3dbadecb723f37680b7def468729c30fec1e9fad28801ca5b322a14a5dd814115 SHA512 0739f9f740e3468b848a1e446ad22f2bf1e0fe988a0a0a56873ec26284fc3cde41eba8aacc2233679706b2d9730a4fe2c1588be5f456ee0a52eb15fe96528732
-EBUILD sagan-1.0.0_rc3.ebuild 2080 BLAKE2B a82272fc36cbd9eafa62cf7da9bd0b412c06f4d235861be44be21fd811fddcbe299e75dcdd56370787a3f9f35c47592a3dcc2d9608457e532ce1c0ee3dc68c44 SHA512 3dcc104b0f36a134cc0217c7c5f6373d13a6b479f8f97545953b8c551d28c330515176914c9f3447211a5c6882c68b90e656e53d61a9221489e1229f6302344f
+EBUILD sagan-1.0.0_rc3-r1.ebuild 2284 BLAKE2B abbb0774fa32f3cdddff3bb620cc7c373ec185b9cea8b2965867d782e170895e85cd1f76cdda510a53c0cee3ddefcce0eaf0d7b6632a067eea0bfde8654c0027 SHA512 3af52eabbc1b0a2f60d2d029d393c9aefc3d7a4cf85c0b7dd63dad3ea81b8360498b8d94d11a5679ce6b771df6ade7ad7e84e08c21e5057fbd3ce02d9aaa37a8
+EBUILD sagan-1.0.0_rc3.ebuild 2113 BLAKE2B 9990b426ca82edc3c3f994593ee1fbf8257b4ae881fcf5b85c23bc15b89f2e5e6e8745b35857cc868a67658e2615798dce133da642ec68e4ec518372f76d3cd5 SHA512 7551fcaef7971a2d1f059eb694b4f2fff4efb6368c030da70bb6d9b234e8924b52ba5a00e34ef9952b57689993590b89dfd77881711d6be6fe923c1e35f403e4
 MISC metadata.xml 711 BLAKE2B 19677ce6a88bd62ae22cc1383a8f671082c0f2b844d3e75344e5ff3aa01bc51e4826b3c02f30221af0f9b2b620e9bc9ccb2a6c55944d1b34de072c7f985531eb SHA512 0ddee4d50afea4e3813b9ffc57d444b95c56773f58a469e28d99a85bda787143a23f4adae995632283b2ec5269cbe38e3ffecd294448c675169c4ef10033afb6
diff --git a/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild b/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild
index 4156492fe77b..c94068188114 100644
--- a/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild
+++ b/app-admin/sagan/sagan-1.0.0_rc3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
-inherit eutils autotools-utils user
+inherit eutils autotools-utils user flag-o-matic
 
 DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
 HOMEPAGE="http://sagan.quadrantsec.com/"
@@ -51,7 +51,9 @@ pkg_setup() {
 }
 
 src_configure() {
-	 local myeconfargs=(
+	append-flags -fcommon
+
+	local myeconfargs=(
 		$(use_enable smtp esmtp)
 		$(use_enable lognorm)
 		$(use_enable libdnet)
diff --git a/app-admin/sagan/sagan-1.0.0_rc3.ebuild b/app-admin/sagan/sagan-1.0.0_rc3.ebuild
index da136ef46dc2..2fe8dd00f3cd 100644
--- a/app-admin/sagan/sagan-1.0.0_rc3.ebuild
+++ b/app-admin/sagan/sagan-1.0.0_rc3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
-inherit eutils autotools-utils user
+inherit eutils autotools-utils user flag-o-matic
 
 DESCRIPTION="Sagan is a multi-threaded, real time system and event log monitoring system"
 HOMEPAGE="http://sagan.quadrantsec.com/"
@@ -46,7 +46,9 @@ pkg_setup() {
 }
 
 src_configure() {
-	 local myeconfargs=(
+	append-flags -fcommon
+
+	local myeconfargs=(
 		$(use_enable smtp esmtp)
 		$(use_enable lognorm)
 		$(use_enable libdnet)
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 5f2876553889..5cf0642bea6a 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,5 +1,5 @@
 AUX setools-4.3.0-remove-gui.patch 879 BLAKE2B d8c61405d96466fbd2f1704477dfbe64477b7cb26f2a8aae66c6d7ca0ac73c4a6372ce02917ef2ef424bb8faa2175bcad7c2eeca1c84d292005d5426eb3db004 SHA512 de125a4bd4fa8aa1aca98b33449d9b11746b2aa6ccfa202ed9711b253a9da98c1200b075e7b31a27b00fe3277557d29c1be8971a5fc079be572d61c25b64bec6
 DIST setools-4.3.0.tar.bz2 249694 BLAKE2B 03d689f0f7dcc5ad7cf1ed114b7466aa0add96b70aa4b4a0a563805ad58cd1bde5651b155d202835e238aee9f07bf7595bfb09c20d2984ef6b921866ac1dca2e SHA512 f2ef045e76223918f16d8b0d8365166d6afa320558269be96f3a8875189607253056179092fb8134aaa2e50a5d0862f246c0aa0f8d33060919f4bc1257c109d8
-EBUILD setools-4.3.0.ebuild 1252 BLAKE2B 26a50f11e28e24367ba07642fdf771a2459d03e524b31b8b970a91fc4e3fe8239e755d8e52067fc2f8bb3f09426b3134a30e520c0bf9b02d237b6fdf54845bb3 SHA512 285f3b7c30a96b8886892231de19a5f2fcaae03661116bb687665a10cbd9f59d4b13d693e1aeb3c06023453be34774c6d3560904b4b95a1a84cee5e3e0b88712
-EBUILD setools-9999.ebuild 1254 BLAKE2B 1779f71bac2945eca0ffc5fd077b82da117d414412f77d313ab722dff14b2de83728a8da316197798fb8bc7c8466980eb66fa622169c6128e780fcccd53b760f SHA512 2740c48f1b9bcd2faa1390dae29734ff96fb0c4a7fe76e9721bcb6a61562ba72d07530e6ee1860bbb271637adc3e0537d7163cdc0b1e576bfb301502196dd6c2
+EBUILD setools-4.3.0.ebuild 1260 BLAKE2B e615419eae7389bd23e3fabdec2fecb466e6584e55d42a73c24b6ac4b62758b752ccac3913f2ef93e20b428b0ef49fa2e8d308c3d1d5f11634b986157876fca2 SHA512 dbc7fe033f9839d63a288e41f2a015a7bae740f274657172834d04283c66bb65a7a34f92407653ad2c7ed35f389f1d47c0971613b30e3d6cd9253a8ea317ba0e
+EBUILD setools-9999.ebuild 1262 BLAKE2B 5abb7baaabbe47794eec1bb9ab3dec004d6ab8c5554b5d2d86d59966998e98f23eb3cca6845191cbb552dac6fc6f2c6e09c3c7caa660b49a3e0dd55e93027d76 SHA512 e404223043b1f0a167a5e0bc65e719145d46a0afc1a33d6b0b1804b6df9a9c67f2609403fdf87e193cc0023862c5f17cb0ddc562e22f3f935580852e475a2cec
 MISC metadata.xml 334 BLAKE2B 7fa85c132495c221d8618934cfe5481df604ac8c4bf36878f36d8c35b31e923515634124b0e3b9abda16b748a7684463851574a23428dfdc54bd8a7bd3625ad5 SHA512 52b24eea951558dca0db5c046f0a803c94ebd9d9b42b4a317ecd2d60f0dff885872fc3813d94f4c5c5b9ec2696f609f59cb34f406348f3a75c7ce270218d4513
diff --git a/app-admin/setools/setools-4.3.0.ebuild b/app-admin/setools/setools-4.3.0.ebuild
index 22ab1263f7f0..830ac106a763 100644
--- a/app-admin/setools/setools-4.3.0.ebuild
+++ b/app-admin/setools/setools-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -30,9 +30,8 @@ RDEPEND="${PYTHON_DEPS}
 	X? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)"
-
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.27
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-python/cython-0.27
 	test? (
 		sys-apps/checkpolicy
 	)"
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index fd1fb1b07fac..13be0f339ebb 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -30,9 +30,8 @@ RDEPEND="${PYTHON_DEPS}
 	X? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)"
-
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.27
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-python/cython-0.27
 	test? (
 		sys-apps/checkpolicy
 	)"
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index c5f88dfcc490..7b125879309a 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,3 +1,5 @@
 DIST system-config-printer-1.5.13.tar.xz 974532 BLAKE2B 44e748d2fc20edefe58e1c8dd3781aff28af93e57356a9969e051813bf4f04f72c4e895b587e86614df6fb4984a4d610e8e1a1e17777801ae8912b6904679c72 SHA512 f4fbc1b20b35aa5b33bafdffc8a7490cc3c55e0b33bd9e925f1d3e01532c0a7bb87f80a04dd6da6fc492edd9fea74bacb0ce16ff64ceac622722fe1f9a77a6b7
+DIST system-config-printer-1.5.14.tar.xz 1005400 BLAKE2B 23f96a079e568afc098cc505d32b02d1fe14e8e43bf24032c890d8c924f754def194525a8188719873c3c4b693666c1ef83f19b8bbe89846fc2c32ed48abe4da SHA512 5aa0f9f7d3a6e15acc1c2fdc62cc6c10bc686a62fbfd2b97aa61e1d6d1d690019fc461b6db54d6340668f52d52764cc0b2cd59b02b5061b7f44577f2c2b19fe9
 EBUILD system-config-printer-1.5.13.ebuild 1942 BLAKE2B 26bd1079a01eebc8f49335d5756f310471b686bfe8966d5b993040c0636d6eaafee272eb8da305b07df0a8880e1db4899fdb61f9cd929ff1c829dc1e07c667f3 SHA512 e25caad24daf23975975b52bf2ea241e06b462573dd0e2129cebb9de467c94e035e5f3e64914d68123d0da8f40276071d9600888992b57ad9b316556a2bf1ab3
+EBUILD system-config-printer-1.5.14.ebuild 1947 BLAKE2B 2d6401f250725a79d029a10b73e08721c37904f2a7a015b8970d00e22a6631607dc06c3b6a186f2145aca6535a474879c5fd9426b91af68e6fcdc79fb215b1e5 SHA512 b7e9155c46dfd20c548cca7538e72aee51214124540d2996c41ea2b770f93418ea5cef87e6cc6ef748ab3cce5e167d7f33a88426e90d05d119d914e30e4cef4e
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.14.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.14.ebuild
new file mode 100644
index 000000000000..2ea09c424a65
--- /dev/null
+++ b/app-admin/system-config-printer/system-config-printer-1.5.14.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+inherit python-single-r1 systemd xdg
+
+DESCRIPTION="Graphical user interface for CUPS administration"
+HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
+SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gnome-keyring policykit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Needs cups running, bug 284005
+RESTRICT="test"
+
+# Additional unhandled dependencies
+# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
+# python samba client: smbc
+# selinux: needed for troubleshooting
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/glib:2
+	net-print/cups[dbus]
+	virtual/libusb:1
+	>=virtual/udev-172
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/xmlto-0.0.22
+	dev-perl/XML-Parser
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycups[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/urllib3[${PYTHON_MULTI_USEDEP}]
+	')
+	gnome-keyring? ( app-crypt/libsecret[introspection] )
+	policykit? ( net-print/cups-pk-helper )
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-nls
+		--with-desktop-vendor=Gentoo
+		--with-udev-rules
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_fix_shebang "${ED}"
+	python_optimize
+}
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 98552cf205e8..a563058f5b33 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -793,8 +793,10 @@ DIST terraform-0.12.28.tar.gz 10637713 BLAKE2B 218d8316c004c363bce39f1e4547cdf4a
 DIST terraform-0.13.3.tar.gz 12801673 BLAKE2B 2e966dc17195acf500690a60cb98e6643578c7ebc214669982dbe9e5bdfdabe58af1a82b778503fcaef7df47ff2da0a1f09e0b8dd969c9ff413c16fbdba27778 SHA512 64ee5e74e592265e47778dbc5ad2decc61f5e79514c26782128931be180131ef2ab611dbf4cf46875419157b2957b54688ed4026a80812faf3678cb26c2d7f27
 DIST terraform-0.13.4.tar.gz 12800024 BLAKE2B af158e318c335d750e4fdefa4ce18e150202aeadf26f389ef27dd83669946957799e9e3f38e6cba0bc48ab96721109fb408b01493e733159c15a57ba6a767e96 SHA512 e02cb2a9967a923b918e64acd2ffa6f8a8a03676e5207d238a6cf215f4e5cb0e1db3ac9760792187757a8f18d9d23cbfd44c1ce5d6d5bacf70786ef473824dc3
 DIST terraform-0.13.5.tar.gz 12802967 BLAKE2B a70c3209a17e75c8c5f68deacade8e7b1b85c68d1d978933ab1fa32d6b64b2298f9ea5fe11fdc040ba40c7b73480d6da4020b58602e9a5f963ef0dd287540ed7 SHA512 d8af93023275b5aa50ef0dbb66fcc834593ad598300a1c38bfcf2b9bd43bc84eab81a5e63bef29701b2a078019e4b7223cae2a846ef7680a6105b5f90790b41c
+DIST terraform-0.14.3.tar.gz 2809951 BLAKE2B 3948dc28d288f9c17c3becbcb863f54acec25c45a2caf1c3575717b4fae3f2f0ec2100b7ae163d9abcab918a028ad0db8f0c5bf2af08cc630422322f8f8a5127 SHA512 fdfc82d74f530ccb984223f5d988a059ad61a6316892077a8fda13bca0b3726a31eeba714a397de82abb42b4fac537c267082da3fd0b3243231be279cc02556b
 EBUILD terraform-0.12.28.ebuild 33302 BLAKE2B 9ca5f33aa00c5eacbb82d25fc06cc6a90d16474fe85e0e087dd91edac361188ffcf853b21fd543d07a2836c3d2b6cf47c0c367406c533fb19c5c9ecedc4ef230 SHA512 e521a4cc67ca85de383eb06e2bdace2acf1adba81a66999a744436ce42314c20a9aec78a79795a3c88ee0234e7eb481ffa3778b998692c26ad7783b01ae20bf2
 EBUILD terraform-0.13.3.ebuild 39681 BLAKE2B ea27dcb2cdfa1f12cc7fc362fdd5535d34c71a1694d9f04ae9bba66db61ed7f0b5fc6b3dec689ce34211305db5ffd4df503f2608f8f52f0310a3370d2bc18911 SHA512 e383c04ab131872fed9ac88419902305ad2d464209a390bf643c93646400e01dc21e7d068e92188a333528defa72d563780d1bf8c5f188e111a7aae99cb9498b
 EBUILD terraform-0.13.4.ebuild 39681 BLAKE2B ea27dcb2cdfa1f12cc7fc362fdd5535d34c71a1694d9f04ae9bba66db61ed7f0b5fc6b3dec689ce34211305db5ffd4df503f2608f8f52f0310a3370d2bc18911 SHA512 e383c04ab131872fed9ac88419902305ad2d464209a390bf643c93646400e01dc21e7d068e92188a333528defa72d563780d1bf8c5f188e111a7aae99cb9498b
 EBUILD terraform-0.13.5.ebuild 39681 BLAKE2B ea27dcb2cdfa1f12cc7fc362fdd5535d34c71a1694d9f04ae9bba66db61ed7f0b5fc6b3dec689ce34211305db5ffd4df503f2608f8f52f0310a3370d2bc18911 SHA512 e383c04ab131872fed9ac88419902305ad2d464209a390bf643c93646400e01dc21e7d068e92188a333528defa72d563780d1bf8c5f188e111a7aae99cb9498b
+EBUILD terraform-0.14.3.ebuild 837 BLAKE2B 4ba4bdaf13c4200f7f781eb890cb8e4688e04c0bd14b24209f13b34e9e28dd57aaf332b09fa45ac8b26a8506f732cc53bf4424fb9c5ecf0b5c7bf0736f505f7d SHA512 e89a3ae3cc54f776dc7abfd299014d366229e81a758d6b297f0d44899a31da1927793b35a2135b661ea52ce9b873febe151d209f00ddbd918a1842587996112e
 MISC metadata.xml 1074 BLAKE2B f14c6ede900b616f5a5514adc9735d25fa834dc879712ab79b68fe15a927cb3e8e77a7b30ee8af3b44551be9ec2368476757c4ec5e5b44fcd266367b485fc8bc SHA512 2e28b3de2b512246ddfb76b547151683c4202620992f9453747b4869db1a16d92996cbf810bf82f09e6895ddc7b23ecc2e0ecaf43d9c3ba9e8a2fb53baa995dc
diff --git a/app-admin/terraform/terraform-0.14.3.ebuild b/app-admin/terraform/terraform-0.14.3.ebuild
new file mode 100644
index 000000000000..0712ea8e1d4a
--- /dev/null
+++ b/app-admin/terraform/terraform-0.14.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+
+EGO_PN="github.com/hashicorp/${PN}"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	GOCACHE="${T}/go-cache" go build -mod=readonly \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/terraform
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 6d64583cbe61..6e508eafa9fb 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,13 +3,10 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 573 BLAKE2B 444541b8912910cf6b5d038e466e18baebb7dfd2905d802217baf9e861bb7f2a3e032716545c74e269782aa420fbd052745322576b4bcb8c4cf53ba07471b261 SHA512 11124e6fc656977c20b55b578e30fd76b8f6905760c2f17f93b960a317975f1914c6bd8d4ffd3741ba405bfe5aa0cecb68067f8ce52b2df9015863d31f9a7aad
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
-DIST vault-1.4.7-webui.tar.xz 1236924 BLAKE2B 83ab6f4494708f0738aed4f7226d5e634d01268da6b672c6ef1340559eccfdbb2a74baaa9a67cb3287290bd1ef332e325ba365280999f7db86e1694ec1731788 SHA512 634128a0a46c01d671c3c766eb4f84a58802f0cf0ade297f34e9d84eedb8d8dfbbbd4ad0eae6a28e33acb0b161f123a692b8b98a25918da8337cbce380c5f94b
-DIST vault-1.4.7.tar.gz 33265037 BLAKE2B 11cd3d1bd2321a6240a31f326666e0725b1bd3104a4cb050ecc78c9fc6bac1db1a79799e3a4b212468556a54e1f431e61f18115d2c86ddd0b229ae0f5ad06726 SHA512 a7af7780756df02a465a60989e3aba382116e0846cc48ab81d7b272133c31b7c47f60eed4ec5ad47ad0a80247baee7087a1554fcaf189a60a1edb807a268c3a4
 DIST vault-1.5.6-webui.tar.xz 1237168 BLAKE2B 997a3ef1e297e288d2abf14647667fd07ebd2e9c6389aad90e3c8fe4d66b5e77004ad07575c6a48d38eb1a4e4040af6cf341edc17bbe87a575a31e06f91449aa SHA512 afed06fe9866dd24ea925e49e2ebdb477ef40dd8ea0137fec1f8a86e17cbe5679ef23a9d9a248ce4de8a21392c96d50f47487c5a866f45ad7317c6cbfc1a5fda
 DIST vault-1.5.6.tar.gz 35110596 BLAKE2B 6e2581b82dfc98f0fd4c807dd24c9e17b4e4c3252ab5744388e17a076d8ed613ea2360f8bf5b975ee5b15d6c7f96100f2b814e290ab47e33c565525ffe1eeda3 SHA512 1da2a6f1307583f03298a4199d301536783787ae1d9b16a8b0a4cce55d29a1fd8a1631366a55aa4671d5b7f6fb9108ffe55d9ec9575e887e495a512b00cf9cb3
 DIST vault-1.6.1-webui.tar.xz 1277456 BLAKE2B 7a63f676e4138c9ac0a9e550f5c195a68169c9214c4f232368356ed31e6a873242f069291fa6f56770bd84598333b9d9933da8544651836b04cf91b9c0d6e818 SHA512 0ce4fc98c8134d9ce39ce0bf7634b76cad8508d3f19480f32052dd6040a299b80406586d5c7c6d9571a4cced303dbab010b0761599c0fc4fe0d0556365564dc4
 DIST vault-1.6.1.tar.gz 39080880 BLAKE2B a66f48c0e7a4edbe9765f7f3e9349ee318415d42ebac9763d48fed4060a3a81613246528339e5cce091dc3ba3ad70062dc5e3b13fce29611a37729a81cf31bc7 SHA512 3dd272b5ca6b2858ab9c65a1abcf25bfd01d554c8f8c380ab1384c216bf14f9719ae0947f764cd7a08688899b7e5805e3ce2a96086772035abe54012b5f4ea72
-EBUILD vault-1.4.7.ebuild 1857 BLAKE2B 3bfa96148412f6c7e2979f8e86baeb100e4e0e42fa2ddc9251c4a4017c18b639583fd51cc360b4c31db25d8641a82058a11572c47a2eeca3d92068e44cd00d1a SHA512 29726e334b3abc150235ba6bc72770bd82e8a0f9225f018ded55fbf08366b90d989d1457ac57e882321ae5209d82a102526924db0e44c9598534587772dcd338
-EBUILD vault-1.5.6.ebuild 1880 BLAKE2B 723b98ca4b9f724ef36ce105b516830feafd49d642b06498d69701f1f9b322e98d663ce80192d86f6229933e0928c6d7d825adae89b21c5bc074a207da85ceef SHA512 f044c61a12b406443b977ddf79a7ef005f406755d344e62c9cd8b9de9f7382ab630be6f4c54cd8dbcba650572fe18d01fe0a6a14134c76cb7cb50cf7491141b4
+EBUILD vault-1.5.6.ebuild 1879 BLAKE2B 5bddff9571265a85ae83006d0c5443ec74127d486db55e96a1121cec364ff280c8c5c34645794769d7a5997774ccfb6bac37b60b50e343f6959b1671214dfe59 SHA512 e637af281634f65377b14168fd037c24380f696830c5b520847991b5c66ef98e6011b37a073a8f1c24abe91b06b206ac140618b151e2f3ef30a9cf3f48e51481
 EBUILD vault-1.6.1.ebuild 1880 BLAKE2B 5d28f6333392f64f9ca59e3208f48e535164608cf3af0b46472a94f986989e9461b784e21506f7c14c9ec7563eb08e9fca4b7933e0e9886b5d6f74a2a6e99317 SHA512 238539a783c20b69f3c3b8f160ca9e9f48c69ff3bad4b175784544b505125d25f8947f28825eddbd30722b8a732f970b4c10d353373f061c4da1c80184e06bcd
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.4.7.ebuild b/app-admin/vault/vault-1.4.7.ebuild
deleted file mode 100644
index 671178b25133..000000000000
--- a/app-admin/vault/vault-1.4.7.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
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+webui"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-i Makefile || die
-	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
-		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
-			die "mv failed"
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOFLAGS="-mod=vendor" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-	go-module_pkg_postinst
-}
diff --git a/app-admin/vault/vault-1.5.6.ebuild b/app-admin/vault/vault-1.5.6.ebuild
index 03db71b29ae1..0e1b75de2be5 100644
--- a/app-admin/vault/vault-1.5.6.ebuild
+++ b/app-admin/vault/vault-1.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+webui"
 
 BDEPEND="dev-go/gox
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
commit	24fd814c326e282c4321965c31f341dad77e270d (patch)
tree	033d63b33c21a3209964ab56005bb9bdd523630d /app-admin
parent	129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)