gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /app-admin
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
86 files changed, 2190 insertions, 793 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9810cb492b7f..06b5ed6d2982 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 443161d04b7f..1c57a3a3cf1b 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,7 +1,13 @@
 DIST ansible-2.7.13.tar.gz 11861862 BLAKE2B 3123d84b9f45bb5e50a0d5db5d0b2ae10163e2818d30f29ad5a80c23979a347eb5e17806bd295df547b88a09191918443162cb25d7f339ae76df52e3960954b0 SHA512 8dc19e5c93a90d43ced6628699d2da42d522a020bb2cdd35ba73f6286998c605852c89250af8696e94aba0080b2fab12761a39c3e2eb86d39c212a198f970652
+DIST ansible-2.7.14.tar.gz 10203158 BLAKE2B b0727a4e2bd4d2126305e2a529fcb9c938f062a19d473d6ddc4463a0ed1e1c6d444592660aa8bb3f05f8885592f8ae3b021a7b1e6ab43422c35f88f999ff4de4 SHA512 16705c965b03daeb4e6b6a0bccf0be976de60948b88c06e65449d2662dce1fbcbf796ca2b5f6ebe9884d19d918b6ec0e5b0edcb0ef606b7bae61bfa7699c7b92
 DIST ansible-2.8.5.tar.gz 14352036 BLAKE2B a2d60132e3aeafd7dbdcca13daac1c657e19fc1b7822b33dde35e0fff67fa7093b54330652ba6c02bad710fd2d05fba3081cd0b609f16bccf7e2eba52f9fa45b SHA512 6555b9a3d3d8298410e54f7116d92fc1978bef185a5136cfb809c1942b08b96c562af9e0d6d1a25eee5a4024d309b6713ce27836857b428a7c362e26efb53777
+DIST ansible-2.8.6.tar.gz 12689211 BLAKE2B 9c451037f705f2e591633b59700e89c6de672c43b4b12ee36de9dd4b3ac0e6a19f7e2cd0df9a29b7973f4192d85b3c48fc8915bb36dbd36d9206ee3ca5ccbb09 SHA512 8e29644b4651e72bd3fbd4ca91c2a36b76e5dde9bb445d3c6e0061c315eb66e1bc507729b70d82998c1cbb25f3ef0e20d281ab8354a047193e60bf4831938418
+DIST ansible-2.9.0.tar.gz 14126941 BLAKE2B 409f94af0fa8483934b957cf31f3a762e575203f4f809c44cbf5c74cc945deb065f97374b93dd2aa03a8002b17d7da0bfad3ea80c11673b02be3d0179c34b7c9 SHA512 47e0738bbf9918254d7b33ddc0a8f89a101995ccc3cb846be9ff10bdbc7687fb8a5390d8b976b3ce17fa1325ab63a592161b026d5d943a01f8a5803fca67312a
 EBUILD ansible-2.7.13-r1.ebuild 1675 BLAKE2B 9b2c3275f960f0c36be0db1fa01e09c8acb93ae8ff4e606c8fa874d00e20512f57c528ad210a8c375f9173d7484284dce1cd2d0ac3b0590551a487e329752838 SHA512 9ea7ede55cf58584f191ada7f48465af05007d3c8a26ac18b5b06a41794b8f46f9ca46ecd900bef1c61bd433177b516c8b16b01d0eb8a13be511b341c9552798
 EBUILD ansible-2.7.13.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
+EBUILD ansible-2.7.14.ebuild 1675 BLAKE2B 9b2c3275f960f0c36be0db1fa01e09c8acb93ae8ff4e606c8fa874d00e20512f57c528ad210a8c375f9173d7484284dce1cd2d0ac3b0590551a487e329752838 SHA512 9ea7ede55cf58584f191ada7f48465af05007d3c8a26ac18b5b06a41794b8f46f9ca46ecd900bef1c61bd433177b516c8b16b01d0eb8a13be511b341c9552798
 EBUILD ansible-2.8.5.ebuild 1754 BLAKE2B dba223a203261ebe347e6379e1dc829d44ffc0c59dd0138f0cd843115eaca7b12f774522162f15950899f0b4994bac624ca10f4a582deaa5aba1a908058128a4 SHA512 7a53449ded7610d3a6e5ee0c61bbfedd0c17e7632ab4abcbe79800f2d5ddd92561c2b6f915093d3114ed9a85df8254fe1477b11a6c6947246679dbba8a8ecb93
-EBUILD ansible-9999.ebuild 1795 BLAKE2B 0f7288af3da8d075bed73dc9141c64cbecf4ec420bc79e64601d0af162cdfce7545dcb76939bc5b6d425d36b6c8f547082fd3c34b30bbe3ea155d56c00bc97e6 SHA512 3040bba45955f3e58d630222aaa0314506d12580d115fb00162ec2fb37eaaf12e48264164a75ddd5eaf62d61f47eb0ccc0402a05e4b61a47508394912f623a77
+EBUILD ansible-2.8.6.ebuild 1756 BLAKE2B 30327a58804ddf1ee56c9ce618270afa554462123140e2ef6376b1655620289677b69ec6a49da1096cadc09924147f75fadbb7738cb68eb7cdc34ccb0b2f290b SHA512 386092c824fb03e07b89589281e64b4adcd817f1f977b8c9004497fa5b115a053c2789994d1385cf56afe134cad1b67d40ec3d36845989acbbc8cc11ba2b677d
+EBUILD ansible-2.9.0.ebuild 1718 BLAKE2B 836a1251fc9bbfd580dfcf0e8bebefe079025baa95cf45a5867579e16ab3685f8a43d08ad8d10a1ce2a0a1e954a98153a6cf3acce5a55e333e45a36da2db78cd SHA512 15650c77da5295eae131050fbe762361ee08eecc3fc98fd85b9ebee5ccf9afb5a7e1b11ca3651f45bf69ba5dd381fd20ec47ce66627a0e1946667ed9fc4df4d1
+EBUILD ansible-9999.ebuild 1709 BLAKE2B 1369caa197cdf61e86960af4f793d65f2e2842456a6711797b5bbafadec8c622d178ea820e9ab9697b08837e351d379f7aea86cc551ca1c18b048e575159fce1 SHA512 4850bad9088b5bc3366efefca3827519e23af617b35e9f14d275be505248511832e17ad0da69fa28be51d458a8d0820bce081698cf4fa91bcc44b20c72a6ce70
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.7.14.ebuild b/app-admin/ansible/ansible-2.7.14.ebuild
new file mode 100644
index 000000000000..401feb026c7e
--- /dev/null
+++ b/app-admin/ansible/ansible-2.7.14.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	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
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+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
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.8.6.ebuild b/app-admin/ansible/ansible-2.8.6.ebuild
new file mode 100644
index 000000000000..b078e69e7bf9
--- /dev/null
+++ b/app-admin/ansible/ansible-2.8.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_prepare_all() {
+	rm -fv MANIFEST.in || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.9.0.ebuild b/app-admin/ansible/ansible-2.9.0.ebuild
new file mode 100644
index 000000000000..29be3eba4da6
--- /dev/null
+++ b/app-admin/ansible/ansible-2.9.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 64bfd8037602..fbd68a468346 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -57,11 +57,6 @@ python_compile_all() {
 	fi
 }
 
-python_prepare_all() {
-	rm -fv MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
 python_test() {
 	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
 }
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
index 9b2962252746..1f54493b639a 100644
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@@ -10,5 +10,5 @@ EBUILD checksec-1.7.5.ebuild 761 BLAKE2B 928d7f91b7ac04ac04a9bcfaa14f8ea781eaaf2
 EBUILD checksec-1.8.0.ebuild 763 BLAKE2B 3456a3d42a58795e00cf46689bc60a99357dfec5a8ea7c43841584c10d4fe8bceb3d3c0e3a4965cd38e7c718b6c716a36cdbf895635a458122aaa34324f13600 SHA512 dd2af6317e19baef0e21112b6a64783dd1ccffaf2f0f2d80acf802b4ee14b021be23548375c9c86c8a073da38bbe4f1c58c533cb5b16cf60e082f8164dc84738
 EBUILD checksec-1.9.0.ebuild 757 BLAKE2B 526fb5bd77d4f06d01dafef1174eae285b5ee2a1ae72882f1d05d07ec141b519ef39f622f16f4e098c3df0b31f8419b6460f2d51a462b09324519efa3235fa67 SHA512 29ec62f61fbf71e19aae933ea6b01e6f606c043e50d4c004214219a04cbc96d8ede61a444a822e1a83c0245e0e379ee553e5f4bc2d7d11a2577aa0b2e9f9eeae
 EBUILD checksec-2.0.1.ebuild 759 BLAKE2B 18b155566819f22cd16c0c13798bda4b70da1bbdc5cbf94c0977d2edcf6877f7819fc91421d6be8619c8a20f7d2fac3fce2f698a41f25aea727e3f843b1ddaab SHA512 3b34ecfcc2c1c73ec5a8565e9c07415bf6b1d6a682c6f7c8b17db07917706c9247c7c67aaca7d03d894547892a978efe11e4fa01322e80c9093d0a6d3b0d0386
-EBUILD checksec-2.1.0.ebuild 759 BLAKE2B 18b155566819f22cd16c0c13798bda4b70da1bbdc5cbf94c0977d2edcf6877f7819fc91421d6be8619c8a20f7d2fac3fce2f698a41f25aea727e3f843b1ddaab SHA512 3b34ecfcc2c1c73ec5a8565e9c07415bf6b1d6a682c6f7c8b17db07917706c9247c7c67aaca7d03d894547892a978efe11e4fa01322e80c9093d0a6d3b0d0386
+EBUILD checksec-2.1.0.ebuild 757 BLAKE2B f638f3ec54f7d6f7ed1d6b5affb2cc8801ea61686f962e7e7d43391ec7512dc6902e8a0a5ba3c7efc1ac8cb549b7ecf0baa5558acba9d4ee969fab635d1eb36a SHA512 974d9f5c147385193d1525bf5cfac3dc7a9c027d0fde69cdbdd33de9ad384c3de624643da737f978c6efb7f121f3c7d71a5152582cc92a767f23ede3b2a74974
 MISC metadata.xml 334 BLAKE2B 96b933c9475a18c3957d46b58c41162e396f27ff7c53eaf4ba5be2a24e22e8a136a0814cce5c0d3c113e5d18a286fdd34a1b3cd46e509a7eec986f82d7d8ea9c SHA512 dd9373f93f165e576bd930ae4a49019d0c53359c4ef288c5d1ed5fc1033b82afff7d0421551eb9518bbfb3f25bc7cdab09cf89b1e0bd9c1ffe0137432d70b716
diff --git a/app-admin/checksec/checksec-2.1.0.ebuild b/app-admin/checksec/checksec-2.1.0.ebuild
index 3dd38365d970..958b02354f83 100644
--- a/app-admin/checksec/checksec-2.1.0.ebuild
+++ b/app-admin/checksec/checksec-2.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
 IUSE=""
 
 S="${WORKDIR}"/${MY_PN}-${PV}
diff --git a/app-admin/docker-bench/Manifest b/app-admin/docker-bench/Manifest
index 018ecede5f7f..d53f451bb56d 100644
--- a/app-admin/docker-bench/Manifest
+++ b/app-admin/docker-bench/Manifest
@@ -1,20 +1,42 @@
 DIST docker-bench-0_p20171206.tar.gz 17541 BLAKE2B ce6e68cab7e36a596c9b366ad6c7a6ff9ec735248f99dbb5b046bd9628f62ff392bb3c576c2a159d3403401e6d6cd4093632e47102c763f1c967bbdff2e4ee08 SHA512 fb9fbc1ccc54965c546bbba17865b803214824ef53e02d088e72a9bf3ae7c6ee7429e15507593b2ec8d33c52aab375878d9ea86b51a2518948bc0dfe969bec13
+DIST docker-bench-0_p20190822.tar.gz 49441 BLAKE2B ea4d9056f0825c8adc0b87837fdb2087577ab68fbd53189310fd983f2a4155329789c30cd228b043d08e265457a90f0692210eddc87cbe63479f1c2ecf698401 SHA512 6157d9a473f10fc9e593c1cd87b153f1f34e8317bc31787085cca5a5be92efa1b00b386afa73f62a23ef45b39da70fe8345b61fd3955f5cdef82a085df854b27
+DIST github.com-aquasecurity-bench-common-81f08528fa03.tar.gz 18981 BLAKE2B 6579a12622870e537a16f467bcfed71ed1c791641e1948caee10a69f8ff7fc28a3f73e48beb8d3b1d274428e498720f528237d07b28fe1319164ab1339852d0e SHA512 b01f88ddb7c119dc9d7e4f7f3e2d9c80b4046dcd65c6d5f2640d28c235c04fbe03b348032584350485f6323920f692cd96ff73e4140faaeb26d7d5b6eb24671f
 DIST github.com-aquasecurity-bench-common-fc47834ad19bafbba64ded876d82bee4dba50c40.tar.gz 11587 BLAKE2B 832d7216340c71ce8ec201a0abb8f22dc73916a8bcc0d3657a7d12958f48142e6d729ce1f6403ed4a7b0b11a7cb53d45901f0a6e20f095d931c075e414373647 SHA512 20fb3a105af33096ed5e4a6b52e9793d9031ca5c2d2f37811e4be90abbc6cc3d7aa94e1d210ada703b61398f6bcf771ed20a9b9b9ad171fe88f66e78125bbc4f
 DIST github.com-fatih-color-5df930a27be2502f99b292b7cc09ebad4d0891f4.tar.gz 588446 BLAKE2B 0e3acbea72d4e6d14964c53a13eac4ddb4299f86045bc4751498c1e80ee997f3392b3236f1f7fa872ceef73edf0c4e87154d5cc1605d5637ae090979596f1906 SHA512 9c7a1f5d67e0c8da788624a24ec42a9a1504f497840590e50b8fe9204dde5511be00a94645c2e9326dba23a8514adffdc242192abb270021c37e231636bafc71
+DIST github.com-fatih-color-v1.7.0.tar.gz 816449 BLAKE2B f006f51cbd1a0288380b339d7d2b493e447aa1e6bd783f11de5670d4db6ff8c1463cbe957a04127c1f24186a9362be8c40ecdf4394cbbc0e2c6c2cb598c012ac SHA512 ee5668ce828ad3e5461c54d971aee4b10a578f697717010d60fdda641948430816e74580563dfea6a4c66a9840175ff5b63c2ca9cf1af213cfac5be7b8ddac36
 DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8
+DIST github.com-fsnotify-fsnotify-v1.4.7.tar.gz 31139 BLAKE2B f2d0aaabfad525fb640beba78991a858ad23203a557a69fc15d2f017b2a693c64c244de435682b1cd9d59e89a97e4ba60c7f95fa99a6145a9dea73b0f334936e SHA512 840943043c49c837641f04b976f2ba610fc03bd31030ca6442744d51fa9241da1905730ea11466e249a5bd37437f1e2a433a012a64ce872a1562c941bd5bfcbf
 DIST github.com-go-yaml-yaml-d670f9405373e636a5a2765eea47fac0c9bc91a4.tar.gz 64859 BLAKE2B 211e51960673e78e9c802357dffb550c6d59692203040b2f3d0bc9ab15f8bf5ee479918a782931238e230f36f4c77228a44632883486370f0fb9266d8b2c7c14 SHA512 daa9d622d4b717ce54af884e1f5548d7ead93486d322f808bc6cf291011a5c418d33b464fd66161bef8c18da759aa1c6182b36fb2210c5f026110776e2195ac5
+DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
+DIST github.com-golang-glog-23def4e6c14b.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
 DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
 DIST github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz 796903 BLAKE2B 4e31f27784cdc5781628ac082d7994a5559be59268003366a3185eac6eb514495f6d82ba13c3046f1061c6abc68712ae8d0505ab7567c8e6057b90f3217c272e SHA512 580bd4cfd26d82aa8c6870eabbd289b76f2ba529ed8496428b29e482ec39bc617cdbcd2f2f2d476ee93526bd18550dcd239085b9f74fb4d24ccb87a3b357bff6
+DIST github.com-golang-sys-a9d3bda3a223.tar.gz 1245170 BLAKE2B 62fd7fea3ab8426f9092e6758573c1fcd8915c776b7f44521d7d82ee42bbe5d4323a8813f1d39c336da6bce3525b4eff1b60e024cbf037738268dc7151024f4d SHA512 79e81f5fc94fe47ce3e794a80e888d09e3d9a192a65fd234a177e1665fde5a9029d1197160edfb5df7e479313665536a1e6445428d41d0c33f5319aa5d79cf51
 DIST github.com-golang-text-4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz 6112758 BLAKE2B 88f0ece79f03800d6482430d569fa9b65d8ec4b15d42f65706ca665349346961ab273d3a7d2d0676d0c6c05a12d08f75c1465fd0ef632611b7b606593466e5ae SHA512 9fc536d4971e8861c5b905dec44fc7eddfaf8b0dafd5f904929bc2b63a65ce3fa28108d3f9f954a9db8d4ed24be532a519bad41e09e8076f9b75e6564f75f7ce
+DIST github.com-golang-text-v0.3.0.tar.gz 6102619 BLAKE2B c92e68014a8c157d76741c02acd708771d66bd3dda5b19285f5aa3e073e0fe3fccb9054744d35ea62b681ae4421bb7489238d6868f9314fb26f88e002287abe8 SHA512 bd60dfaa7d9dbfca171a3ba40b51f5663c01257cf3b12b618d35689a97ab2212d316d5716ff09681bf40b099f7e20a0e0df8cfc065699cb6a07ad1dc2e2bc189
 DIST github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz 69787 BLAKE2B e1d034d5863ae8bca85736e971e613e6821665861e35954a067e5d659029a8680b6902387848a318aee374cd4f6b810ae160046979b5bc86e64df0e1ff5d08f6 SHA512 751ea2fcea04ab2a9b61a45443a71cdee9cd09c2576af048108ccb56027b34f46b00e14aa664b966165b7d8cbb994e49f128bf54e3469c627d73f7ee2809ebf8
+DIST github.com-hashicorp-hcl-v1.0.0.tar.gz 70658 BLAKE2B f28dbe8171ce4fa94f57e8bfa8ffe7e16e57147a6a4525a8b5d31d3a47e817e056a85bdb8b91d56be202db27a29f37496f73014d1d97c5d55ce07b89f7ff6848 SHA512 044e3ba2a44a1abd9c851d4ec1f5c541663f8cd7f705c46c6ae2c377fae6df6315a6596c42f391e8239b61f0f0f6caed8d4156f8875cbddfbc7bcb78eaeb466f
+DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
 DIST github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz 27761 BLAKE2B 0f39a63d3d19ad5d3ac367739d568dd3abe74a8a6aa0e60cf19ca8203412270fc45dd1fea07627290a85c42db6ead0229f72bfd845b9e4f645976db1585838e7 SHA512 493a7493e415b45abe2109c79e02ed7903de6a559911cff0323f9577fcf41134ab8f4ac26d776fdf9a891654f063bd2452c7e557c643d73de5f558b13533f62c
+DIST github.com-magiconair-properties-v1.8.0.tar.gz 29504 BLAKE2B 667b8e60ed2ff538a84f199e43c75d37998d6fcb2e9c3cd6b3e069ba9950d45b4cd775797879467ef86b701391078582be2100fe32fbfc4c794f728fb7f38527 SHA512 9790debc8def1a7eae5a1e530ca68e53e562e622b374752f69e40aa508a88b58b95e15a503a8314e7d4f71a42411d1ba462687184c2b251eb41b5ee3f12ce95d
+DIST github.com-mattn-go-colorable-v0.1.2.tar.gz 8518 BLAKE2B 176ecf55b90c106f4801aeee6d03a53eac495d23ccdf70e8276fb9f909ba144e2b59643bf4dd708131abb0ee3d1ca08c334f2accf0c4ad31729d46b8a7509a09 SHA512 fec4d5e9c5d4a259e81fa62d5188bfa6c5309e9113c0d77803f04702c482d4dc4b7ca4ae079a0aa1d8f789b48ad6dd2dc4f86074e8fa51e0fce3214fe88149c8
+DIST github.com-mattn-go-isatty-v0.0.8.tar.gz 3564 BLAKE2B da50a8739bd33249bca2231509948da94d5ac61787e5ac84af17b04a5b76cc751d2d3ab00d1967e1bc71365060835c6d668a8cea607eccd5a4f95bef8cafb240 SHA512 e9dc9181dfa9780bffd5b1aefbee9028d8a38c2c8feef6a0ca28952b57948a41582dc4c372394bdc76f8081490283d055f89cb7a8792418b3ee55a85c32a5b69
 DIST github.com-mitchellh-mapstructure-a4e142e9c047c904fa2f1e144d9a84e6133024bc.tar.gz 17997 BLAKE2B d2233557f40812a16fcb2b012f45afc7637fc8c64eb3e8e3d01ef78198dbf99d2a4caa9c749faac9b46d75c46a50ea5d0a6eb292924406a385533d3a47ac2eb8 SHA512 20b70a65cb700a2768dc643b2b2c86ea68927d417e9135e582a15f267f583637a01eec186a4fb1788c0ac421df1f8e0420d7b934d449fe7b66d572266d71f83a
+DIST github.com-mitchellh-mapstructure-v1.1.2.tar.gz 20980 BLAKE2B 6792e875503b852773e8f062808f7bfa5a7e77ab4ec9012865750a5e15a13a6338490e7dd865545b8055c043a9f016cdabe6fc71c031a1210eb3a5e0c28a3394 SHA512 86c9fb9494652dd391b67185aae44b9cb14fcf96ba9ff62ed95c8952b01f6485154102e5883d16c6007d18a02bbf34e5937e2842df72c0244d48b22ee6aa9fe3
 DIST github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz 56990 BLAKE2B 02a12c6c8ef85cdfacb6ab59406132c74cb0eb4fc270c680abd220210a7d0a5796bdc79c97c5623c4760e38cc143cf51e62fdbdc52d007241f2b61657fbf7d53 SHA512 cfce832c0a74dbc4f559600c846b8df8e94368785991a910169e1a535e2a57a72f7d20ec7c9fbd14a44b7b5a11b496af0bfd7705fd67a1c192e39819ca8aaa64
+DIST github.com-pelletier-go-toml-v1.2.0.tar.gz 57496 BLAKE2B 48ffbd6b1b06df31b89ccda4d5aa7f8b23215a2532aab102612231dcdda3fcad4c277f15a56894e10bb94cb3c891f50e87ef9c0e6c7e1f3f840d14bd85634b25 SHA512 07791bbc0e578ab383776d715942cd4fa723e5fa6f9879676b6820166ca9b776651fd62a0584cbcc52d2ba87cecf18184734ce9b06fb5b490013eb8dff6fbb4d
 DIST github.com-spf13-afero-bb8f1927f2a9d3ab41c9340aa034f6b803f4359c.tar.gz 43579 BLAKE2B e0953e8a7cb3383cccbc307443d5942a8642e0358a0408af8b991e719698e7746f6b5cd4b3e46a7f896823742c6ba58e4ef332aa92cd5f4376eae1396a06c677 SHA512 9ff4adaa3b525b7b18fc4d1fbbb9e3049938e81cf2f0890a1a7e35f19640793d90d53b104a4f9e87aeb066b8b641020f468ba37b7a7a4e1c14f0d7d2085cdccb
+DIST github.com-spf13-afero-v1.1.2.tar.gz 45309 BLAKE2B 0de6a204590f40cda8e80495bf57f55827aec4fb0fff58e0ae7d03b25d297edf530af4c8da94f11ad9bd25eb148fb72b083c75d513b8c4802e8d1a557386f101 SHA512 2ea3773346086d7f0e499653649ef9cbe71b5c0ea488b7650630f4262c13fa426522c9f9556ab127c7b8aa2aa97ff0b34cf3a9eba8b7c753ed200292a50a314e
 DIST github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz 9594 BLAKE2B 4979fd23b48a6bcd2538357d33b7670326b9129b5de309548492d9597eace1320875e1b242b594c98777192c1e0c6abb0bda4ba946a43530cc68ec762d1949c6 SHA512 2b97f56aa83dd1302e02603a8fcbc8f2642ceff8bdc19cf8a26120801023c4a8a3fed689de0ac392f6a4144450ac85d32b00fbde200b22e972c31cbabd996cad
+DIST github.com-spf13-cast-v1.3.0.tar.gz 11085 BLAKE2B f46ad23efac14d599ef7268c033c5f244ea7976982fee02b4d83ae65f91a72150bef359eb24b8c868f8a42ea8a0aeae839dcf82a7646648bf482f2a520704e09 SHA512 4cd15f59860fddbb67055beb15dfb8114ecaad5999a8fb46fbbbdea1cf78eaa094a4893c10b97efc7d2f95509920688659d609623135bf9871e6229043452194
 DIST github.com-spf13-cobra-93959269ad99e80983c9ba742a7e01203a4c0e4f.tar.gz 100166 BLAKE2B 60304e434dbe9c3f7192f8c818371c02b5eb08a1777b244daf5fb6c53a1b7cbea019c70ad8e544fdf48fcfa3479f79d59ec5ab4da544a8afe2fd66c7e5de179c SHA512 8ba4b60e4b37a4efafcf8adfd609901d12c0f5a1f0bac88cb159f75d451d19622428f720bd22f929985b8259a6fb8720f02e187e7a684a8ee6324edabdefd8bc
+DIST github.com-spf13-cobra-v0.0.5.tar.gz 111126 BLAKE2B 0f5fe38e3e278603fcc53edfdd72206d7b6850aa3ac4054b4242091949fe327bf80ddc46c20c3df1e644807e5b8882c528ca5d3bc184b9f039038cbe9043835a SHA512 c21a2c935365c74772152e37adea553dc89fd31dae794bd7e8f56d7c9eaafe717e2d0d6f56e1c8d2fe442df445dee9f03bbd30e802e2ac6911babf309b901c04
 DIST github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz 6345 BLAKE2B dad5459a45bc35e28f9ed7473a02bbfdfcc8da06e17cee15a1876125829065fd4bcaad35b8ec489f3b308637a3fa9cd829c04836207620e61db1a7f706660c6c SHA512 f98c62d7e74ce3e35c29862244d46fb19fcd615e500713dd7c26b30ebedd7a846e419af6586031b748029b8b4d5e32baff6d36bb1ec35856bb6ad5625a407f14
+DIST github.com-spf13-jwalterweatherman-v1.0.0.tar.gz 6392 BLAKE2B 15ed225aa9eb6afca552a19a7ba22216454a27a29aa9f7ee39758100ff123afe8b10e06fce63bf2f4710fbdcbc5c680d3b4eef1cc3c8d363ce0a9f31ce8a34ca SHA512 13cc90c6f4a9fcdd29610773ada79fa2072223459c824b0f732ed3a6f4c61cb7a65c169f70007d3a08354f0a2e06b67e5257c4b0a0e1989fbc2309e69f7200cf
 DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
+DIST github.com-spf13-pflag-v1.0.3.tar.gz 46002 BLAKE2B b7caa90be69c7bb6a36b0da68af309debee6edd6e2596d39e286ebdb10f9f90246736f3af3a35c89ac704e2764d2ac40e76dad09c3147a942200592e3d234916 SHA512 d7121dade4fc06568cfb650a529dda350c60171e97ca405d29b9654a9fd06e453d20f8efc2fd8c51f530cfb0708648b2b2ba06ab40897b262ef2f3baf04d65a7
 DIST github.com-spf13-viper-aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5.tar.gz 32232 BLAKE2B 23602979412f6457f7d1b1ffd78feb3a595dcd813d2f231ba7e6d000135f6bd1a68700125cf271ad50483ff21d4ac09aa67f8cbc4228351683002f5d73cbe52f SHA512 45a10a14b20a60f3a3471a0a4e92e96bf30aa96e09d589acf55f1f96b2fd0e0d2de6beb936762d57ca8057d7512029bedce7059afed1793b1dd8c351214ef09e
+DIST github.com-spf13-viper-v1.4.0.tar.gz 44183 BLAKE2B 4294bc3c5076f1305618f4caf5abdfdec200dbd140d48264495319a33c850a99b5bfa406f4987e58ae5b96321044e12235b60ffee018adfc6612daf04870074e SHA512 59d1ac2d84c4e72687df631fcdad723a5ad96e362a851a56fcf2f2dc57b5a9ac03f01f47fd24f5d3b027ffbd011b3981ce3abc21f3b98fcbe04c7f34752d4b01
 EBUILD docker-bench-0_p20171206.ebuild 2081 BLAKE2B 86c752360e7b948b1a73cd67b4f9981fe7cd1c54be28cf0f8cc4b4f09859934b1c2e20c7aacb6d74feeb26770ace16fb8e7862587703abe5cbbe65e6eeff48e5 SHA512 f370c1af5a9301d4e60b7d2cb8a632474dc4cc1e1ff872afac1ded02597aed3b5792f4925e02b6f25bb8f65c6fcef7cd5bdb302ecf57652e62c34a140f6f2b73
+EBUILD docker-bench-0_p20190822.ebuild 1687 BLAKE2B a238ed84d72fac380056eac51b35561f23163cc0ef6c93ab8e439d6373e126897a11ee025261afaaecb451954f4c92bf734c354d7f0af181daf5f5ed779e9cc8 SHA512 4b9ddd1c431d6de075e5e3d1f4bc4270f5cb984ba1adbf9c0988d68e985ffd504703fe31dad7d407e03c94926a2593ce501fb27956c91b711ac2820560542386
 MISC metadata.xml 335 BLAKE2B da5cd90d136df106dfcb334ed49459e5b69e470094fd259abfb2d402c7c9f363432013dbc5c64e04592de6a2d5dc535004e767aff6d9fe5c00c961cc8fb454c8 SHA512 079aa469e4bf9c79262feedcebf7ae1986224751d0667e502b0b66e1b2499f43177130a5fd1b37ece57713f49b2a7ce83c093e7b8b884ac995e4075a8edfea50
diff --git a/app-admin/docker-bench/docker-bench-0_p20190822.ebuild b/app-admin/docker-bench/docker-bench-0_p20190822.ebuild
new file mode 100644
index 000000000000..2ae49c969c76
--- /dev/null
+++ b/app-admin/docker-bench/docker-bench-0_p20190822.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/aquasecurity/docker-bench"
+
+EGO_VENDOR=(
+	"github.com/aquasecurity/bench-common 81f08528fa03"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/golang/glog 23def4e6c14b"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/magiconair/properties v1.8.0"
+	"github.com/mattn/go-colorable v0.1.2"
+	"github.com/mattn/go-isatty v0.0.8"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/pelletier/go-toml v1.2.0"
+	"github.com/spf13/afero v1.1.2"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cobra v0.0.5"
+	"github.com/spf13/jwalterweatherman v1.0.0"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/viper v1.4.0"
+	"golang.org/x/sys a9d3bda3a223 github.com/golang/sys"
+	"golang.org/x/text v0.3.0 github.com/golang/text"
+	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
+)
+
+EGIT_COMMIT="67d07bbe0bc22b73344b6a24ae810294c0912165"
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+ARCHIVE_URI="https://github.com/aquasecurity/docker-bench/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Docker Bench for Security runs the CIS Docker Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/docker-bench"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GO111MODULE=on GOPATH="${S}" go build -mod vendor -o ${PN} . || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/${PN}
+	insinto /etc/docker-bench/
+	doins -r src/${EGO_PN}/cfg
+}
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index e495f70d9a3d..9b42ba9bb3c7 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -3,6 +3,6 @@ DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d4
 DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
 EBUILD eselect-1.4.12.ebuild 1601 BLAKE2B 2686a4c94796f4eea06114c9cf242c4dff3daf650423fb7e89437ec8ad9d9164b1ecefdeda7c81bd6d7d1bd61d2c0d487db4ae0d5381f84bd3a31208abf5379b SHA512 43935b87ccc169dc442e81a05c9f7bb4f7a417606895693a91810b1a1f5e096d9eab7de8e939f43cf06e698ff9616d00f47deae7d970fea62a4d822777330848
 EBUILD eselect-1.4.14.ebuild 1605 BLAKE2B 1580569165e5273eacbf56cb4d74c6435f9c72bf0e2bf1012089997f6a99de3ab0b8503f5fe528043edc4a470257fb22c4361b7a62a913bd5c0ddbfd1b373281 SHA512 7afeaaa18391f92e834701a3f1d1a80c066815eccaaffde62dfd6edbf9279b2e73a125dee428c8696d5da1f1dc67772c85feb2c540643099ac17d88d660a5f78
-EBUILD eselect-1.4.15.ebuild 1610 BLAKE2B c1587a77851bbbf877c142f7c303b81e316772860ce972e7e9bb460e8c6de2aa5c4a4d0185183e69946c36ee782aa7805618865e5587a959a621621d19230ba5 SHA512 3707a3ea7fe5e7841f8b9ef68c223db549ad5547a1ef9b359d2559c76f2de79b34d9f1baef8927adddf46cb6911e5a7c90d42f294796ddbe22ca0aeca5f645c1
+EBUILD eselect-1.4.15.ebuild 1608 BLAKE2B c146651c7725f25f844edee243c79fd3f52b4079c568885b63ad0ff571a1c1786f6002f6899decce19354c8311a8226a52f06901d612a4b892925ae32ce19de0 SHA512 43e87c2cc0313043455e020e6b50f967651d7579e70698a7e6a4bd9efd2b8e5dbe1b658091bb54c36eb1cc4646c0ff89c31e242d756a328d7d4eccdfc65142ac
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.15.ebuild b/app-admin/eselect/eselect-1.4.15.ebuild
index 7165c6e763a0..49d294fa03fa 100644
--- a/app-admin/eselect/eselect-1.4.15.ebuild
+++ b/app-admin/eselect/eselect-1.4.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 1b8507759b70..7bfb3ba85b70 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -1,22 +1,16 @@
 AUX filebeat.confd 269 BLAKE2B f9cc2a3d96be870d755c41606a274e94d6f6a2a5be71aeb3fc10f989d58b1bb5cc3683b38ede75f7e34937daa4189eccdd30c306b20e219c91bc90ac22d21b40 SHA512 89f2a8ead476750b3fd9a94dcc84311503907e78e66c70d151f27c7fdc8835e7bae6667a6aed0b6470a8f9b42c850396973fd09b1b6aec2d170e3774c8cfddff
-AUX filebeat.initd 1388 BLAKE2B 2a427750a15e6910344dee1d2707773b01961360ae3a7e3337a761b759b2c9fcd9a914385e8ff6292841ad6c07781af3b5cf059f1338a6f2f33bda576bb125cc SHA512 9b08635b9ba6e180881780de0fa9d6c8c1b2e7496fc803c2b38127fee13d13ca5d00792132cdc8bd4073018e3f6e374d4164a86e450a1dbeb68b2694fa0dbb12
-AUX filebeat.initd.1 1388 BLAKE2B 6ca4f3f4d50bba2a036a35b8e74bfa92d5b03ccaf8548df215d3d68ba9a2eaf9e2996374d49011f9e4380bc59f6307e262eee1367801bfb8279eb0b1639b83c4 SHA512 374b466b39feb832b414d0491510190758007079b6c865823878db00d5c17235f657deb0822066f124e3f07616dc4ff3237e87f6f35785e071815ec4e533b1dd
+AUX filebeat.initd 1388 BLAKE2B e7b01c32443e1be3ee2b9f503d214df5a03546db3ce3989423d81d5e51ef7ae74c892f67e0c7ccf93665110bf8a4b5515fe54b9914f7bb4cb3609aa44b5eca0e SHA512 10c212f9225cb3b0bf1fcce9d57c2c7fc17f3a7afd3dcf72d7200789c224b7d9c7d8f2252f72e74eca41fa80b2b9069a1521ab296e6b1300eda508ff8e334da3
+AUX filebeat.initd.1 1388 BLAKE2B fbe25a8996e7042c0b0f76fe6416b419e3993e8f75e1d2ada5fd85c0a0eb19be1c2411d00dfb7fd48f3493d69eccb9ecbd859fe50662e2db5801b8e9de8f204f SHA512 2009b18fe333bddce9e8a2eb70f11a290cdbdddd37b19ad816dc681ae66335c72c9865beb2dae025dbef026c3818014e1bbef0dfaafe8d2eeb71bd6a37b544cc
 DIST filebeat-5.6.13.tar.gz 18212575 BLAKE2B a0b8810523cecd1c6c87a69832c92b39fdc4cbe199eeae3c837f60b5057915e4d1ffb0fd371b3296cea398a11135b9d8da147451997514c85447722d086b8739 SHA512 fd572666858f1aeeede9e1b2074668d0bd691f58d51acd7955a3203b27d3ee850784a39e47941a570a833926a4109645eb98c24b49263276d1df475578c17efa
-DIST filebeat-6.3.2.tar.gz 20923316 BLAKE2B 70ac7e574f94a6141a7c6a1bd0af45ddbda3d01d6ea006c90ea341d2df03cac320d53496833cace3b394b9433251ea68a248dafdc8e28a85a6014314d5a2f3c4 SHA512 3d6ed03c9286bc7784444ad979b1398fcd70d870be184f912202ee5fab7c0ff23df639f445ec14cfcfd4d41ef648f33e88c2959f3c5f966fd3986884a223623a
-DIST filebeat-6.4.3.tar.gz 22085261 BLAKE2B 466580ba371d02bd0b51bd80f0e8d9766f2af1d371f88cd01144a648cd8d5488ca54447e925e9014790a836009d76be9eec9ef9b14a102287d3f4a71b852d20d SHA512 c28d9939c2082b586ddf744b4e18427096290987efd74f7ea03d2632a1cdcbc5dd2b043ee7ceeb0457098faeb52abbac57652077c518112fb65858954ee27f34
-DIST filebeat-6.5.4.tar.gz 25286147 BLAKE2B c3eca03c8e8e2b863918f3fe65bdea46b351739569f5570daac3e321963e98190331c5bf99c2451db5faa615620e023d2fd9c73060d4d775392a86a2f5578d80 SHA512 a48b9ae267ec80c1b45e4e07644f8080f8ba280da5c3543022b73472eb70de9d836cfffd387e576298becf9313d2cfa67d835158442f163b1a1bd0e72df31297
 DIST filebeat-6.6.1.tar.gz 29108620 BLAKE2B 21dbe189dcf91efe6170574e3cff858cca4094936fbda54a343f66e61a5f0cd7d29e71d547c34ddd78776283d13e48926dd84925eed58ca07cc7bedf216c9064 SHA512 9c7646efa8aa44c2ae1cbcf85204749bc57491aad075d3ca283cd75a1b3a93d922169603407b2ea111e7e3abe0a43ce26fabccfe93d56a4232bd63e2b2e8b24a
-DIST filebeat-6.8.1.tar.gz 35550017 BLAKE2B 0a1913adf2eda50884f33715a059fcc2028e31560afc5412e87d7fd3a6ed5cc504683ad3c5b28f18df24afd3e4c8d96c5b2a930411ae32d09d05c85cfdff0499 SHA512 5ff047e80099b09e25952ac7fc8ea0c6be25df2cd3b638c07c600e680fac32505c279a3a91ee2e61acf0f9535b4adb390a65f3a7dbc3599e74c6b02e0aa6ef71
-DIST filebeat-6.8.3.tar.gz 35551301 BLAKE2B ec33f0a5812e355bf2a9212daff999dfed869cd07b20ed9a8fa7c94c76e6fda291a137c5c601d9317ce3e1a34e06be241c1ce7c148f7b6e181903f88c6b1a410 SHA512 49cea2f95429feb311a15b9f247a0c627409edb1badd09d629d37a28994301e69526d5156bce72c9ed65079815f58bca41202862321edc46315e649395293632
+DIST filebeat-6.8.4.tar.gz 35552503 BLAKE2B 165edceffa71318d77363e4e8e737663eb45e5c3d20148dffd8111187eb3d07eb7998c068b3a3da315ff582f7687d75183ae9828f8b9c87d0c025d450936e00d SHA512 4739481a2ec0307804b797369050b81668f531793bdd1c72304b963e8ab4662b40820dfab211c7fdeeef5deb431f5a0e6ef2680841b4748d352ee8724b2bac42
 DIST filebeat-7.2.0.tar.gz 46415588 BLAKE2B a8940e9a4a85e6eac79dca3418d3dcd14c5a1062741dd895c561d1498c287bb974a5ac89d5b353dbb75e78e6c67cba97a08d41528042db4e4d76bb46016fac60 SHA512 67d251cabca10a1f6d392be8e6203e66d4cf5d63ceb2af88185ea4824259995dafd3aa8dd2da326d079cfcfedce5996f173cd6c50972db67cbe25f660683e5d1
 DIST filebeat-7.3.2.tar.gz 49977990 BLAKE2B 6219a382b415572fdea2ff4b0aa3f02b3c1e500d77ed5200b6d5b4334a08b8e91d389ea41b3afe98355f8b20e7f8ecaccf5996f0bb7aad5f10e0f0d69400a0d6 SHA512 75943b251343d28f478f2f19665e4ba31f5bc6e4b26f6e6da8aa062322da4ab8e134c87a9557a97677ba3b22484c44ebaeaeeb87866e0f12e67f1647fe34131a
+DIST filebeat-7.4.1.tar.gz 59665819 BLAKE2B 5af538d317713d42d79d43b58344149980d4bf07b99ea6e6b29562cbce8e221f067881b85a78e4b6dee4973f42aaca1108e4941b1c3041df6162885a7c49d57f SHA512 917942f2434ed09ccc998e75d4272ff03ed1536bfa8c7f09d48f11bccdbe0315d298bc3aeab3c66be3ac3d9fabac506c8b797aa4560dceb7f1978ac420d35696
 EBUILD filebeat-5.6.13.ebuild 1593 BLAKE2B eace0e8d7977b82028436e2c55c4a4bf19a7c0b57714cf6b7cc1e7176e9013edb889065f58740f8db51e38164f6e567cf809d9c4fb82de1d7e064580ef8cafaa SHA512 8eeb1e64ea6d8e06a79ef9b25103d523718f779e351ee5c1f0a00db67d1e28405ccdc371ae5c0177861276db40c848b78ee2d1eff16c14da3efca3c7576ae399
-EBUILD filebeat-6.3.2.ebuild 1477 BLAKE2B 9600502c104f8db4f8661a354bee5160b5780fb4ae3cf84a1353ae5b774ed01e61aebd66ad530550691a43ae62ebb0cf7607591c5b582564b69d81c8af64f68d SHA512 304cb456b2b56d2005b8dcdf56817005e7843c5073ef1aeedd75e69a73178eb184910027d94522e586e6492d80f86d8c49787a7d818292695304815fbecfa239
-EBUILD filebeat-6.4.3.ebuild 1478 BLAKE2B a8430ed2d2c0bc2411300514a35a72ae3c6765c54c6ec49c8deca06f02b7e2f543788e77cf48ddb08492dcadd4ae4ba0ad3b27ac6e3497ee4d29ea91f9e3482d SHA512 597ab402cd5a644892926595c65edf5853b5173e5b76d46f116dc02dbb995110a774181b7e9c3dc149ed4fdcf7b9d89d3a9c6ee36b158ab983e37d36467582bc
-EBUILD filebeat-6.5.4.ebuild 1478 BLAKE2B 4eea3c20260b9e8c32b0fe66108378fcda572d3d80bf435c341b6b0ac6e18f4a95eb4d430a13d2fbf775216d857f1877327c724d9abf9e8acf7efd33a2f57473 SHA512 3ae3570cbe614358eead82f36aa79008e317164c62f779eeee33e5ad067c58bdd42389db57f52ad4e909fff67f48043bfec3bcb4ed478b05fbbf75d43d39157c
 EBUILD filebeat-6.6.1.ebuild 1477 BLAKE2B e77d50b39c421fcd161d066248e4af864f8c9e414ac36d9c043ee40372ee0c7e84f2e72d45d00a7252877f1910cf5db11dec88a5e0ed7008c7600ce9826c358f SHA512 ba38e1a89475555f7941a566b717ccf26d27694914615fd4c1d3b8916a1b6d20bf395412bd1a25d8a6f62d06a301a36325acbfb32b0b37dc0270b55e31bec284
-EBUILD filebeat-6.8.1.ebuild 1500 BLAKE2B c21cf6b0e97aeb03ed9975ab64e50cafaec0920767d839ddbbfdcd4cfc2751d2f6852d45e95ef8d3d4ed8852e0f3166467b5c8e89cf5e127bf7a03f346c189e0 SHA512 9e2c8832931b23958a18b7acda6edd91672c2f9c9e033196e4d83c57eb54fa73663006844739fa9d628ce81bcbcd307ce78f1ef3d243d5db3af361f7ae95444a
-EBUILD filebeat-6.8.3.ebuild 1498 BLAKE2B 6fc76ab316ddcd407c945664152b847421e2d1cbe1602d6e1002558f894ca00aa4f9ceea1885c9d58b1f5e6e847f9b88f75ef8ab57d99ec277ab66f984086ac8 SHA512 bc86fe2d7783d378350d6d98bd79421e286c129beec250eafd8df4857a2ba80df3a1a0646fd18a5bb53e91658c63e8f436c3e57f36e49a4d4d5b48457086b245
+EBUILD filebeat-6.8.4.ebuild 1508 BLAKE2B e83622851a3dcdc4bb54c20f8f3e62c682a5bcda3e6fd4165bc6551724c5fae6da3fd1f818fc23b64f3b07b2891c270730ea66da66e53ef35b17942bc872c75b SHA512 3e0d35163aa280ac21092c0f9bfef094fdaa6716e92089add9775c07d37fbaa127766fc60c202222f6e25fea919d2473a80e6f0944219da55a886572ee3bb11e
 EBUILD filebeat-7.2.0.ebuild 1500 BLAKE2B c21cf6b0e97aeb03ed9975ab64e50cafaec0920767d839ddbbfdcd4cfc2751d2f6852d45e95ef8d3d4ed8852e0f3166467b5c8e89cf5e127bf7a03f346c189e0 SHA512 9e2c8832931b23958a18b7acda6edd91672c2f9c9e033196e4d83c57eb54fa73663006844739fa9d628ce81bcbcd307ce78f1ef3d243d5db3af361f7ae95444a
-EBUILD filebeat-7.3.2.ebuild 1498 BLAKE2B 6fc76ab316ddcd407c945664152b847421e2d1cbe1602d6e1002558f894ca00aa4f9ceea1885c9d58b1f5e6e847f9b88f75ef8ab57d99ec277ab66f984086ac8 SHA512 bc86fe2d7783d378350d6d98bd79421e286c129beec250eafd8df4857a2ba80df3a1a0646fd18a5bb53e91658c63e8f436c3e57f36e49a4d4d5b48457086b245
+EBUILD filebeat-7.3.2.ebuild 1497 BLAKE2B b130f2fa0916e4b37b238fb87ef6ab80f4d94bee5df788873537b9031a718c4300d3582d7fd070421f06a8b034b853d3b4a89353d572006160a660cf8882ee8d SHA512 900e496e61e21a2ccbc5eb657161c03021f0b95315d688ace1d4ef1c00b73d20f015aec5e562d7d3d72a139daf3b342501d2515d782635bbd64fd2752641a422
+EBUILD filebeat-7.4.1.ebuild 1508 BLAKE2B e83622851a3dcdc4bb54c20f8f3e62c682a5bcda3e6fd4165bc6551724c5fae6da3fd1f818fc23b64f3b07b2891c270730ea66da66e53ef35b17942bc872c75b SHA512 3e0d35163aa280ac21092c0f9bfef094fdaa6716e92089add9775c07d37fbaa127766fc60c202222f6e25fea919d2473a80e6f0944219da55a886572ee3bb11e
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-6.3.2.ebuild b/app-admin/filebeat/filebeat-6.3.2.ebuild
deleted file mode 100644
index 1c9264bf6ec4..000000000000
--- a/app-admin/filebeat/filebeat-6.3.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.10.3"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}
diff --git a/app-admin/filebeat/filebeat-6.4.3.ebuild b/app-admin/filebeat/filebeat-6.4.3.ebuild
deleted file mode 100644
index 8a81429845c7..000000000000
--- a/app-admin/filebeat/filebeat-6.4.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.10.3"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}
diff --git a/app-admin/filebeat/filebeat-6.5.4.ebuild b/app-admin/filebeat/filebeat-6.5.4.ebuild
deleted file mode 100644
index 9c0c5d215f46..000000000000
--- a/app-admin/filebeat/filebeat-6.5.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/beats"
-SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.11.2"
-RDEPEND="!app-admin/filebeat-bin"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-S="${WORKDIR}/src/github.com/elastic/beats"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv beats-${PV} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# avoid Elastic license
-	rm -r x-pack || die
-
-	# use ${PV} instead of git commit id
-	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
-}
-
-src_compile() {
-	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
-}
-
-src_install() {
-	keepdir /var/{lib,log}/${PN}
-
-	fperms 0750 /var/{lib,log}/${PN}
-
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
-
-	docinto examples
-	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
-
-	dobin filebeat/filebeat
-}
-
-pkg_postinst() {
-	if [[ -n "${REPLACING_VERSIONS}" ]]; then
-		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
-		elog ""
-	fi
-
-	elog "Example configurations:"
-	elog "${EROOT}/usr/share/doc/${PF}/examples"
-}
diff --git a/app-admin/filebeat/filebeat-6.8.3.ebuild b/app-admin/filebeat/filebeat-6.8.4.ebuild
index 0c71f0e08435..916728450cc4 100644
--- a/app-admin/filebeat/filebeat-6.8.3.ebuild
+++ b/app-admin/filebeat/filebeat-6.8.4.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
 HOMEPAGE="https://www.elastic.co/products/beats"
 SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
diff --git a/app-admin/filebeat/filebeat-7.3.2.ebuild b/app-admin/filebeat/filebeat-7.3.2.ebuild
index 0c71f0e08435..bd5e95bbdc95 100644
--- a/app-admin/filebeat/filebeat-7.3.2.ebuild
+++ b/app-admin/filebeat/filebeat-7.3.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 DEPEND=">=dev-lang/go-1.12.9"
diff --git a/app-admin/filebeat/filebeat-6.8.1.ebuild b/app-admin/filebeat/filebeat-7.4.1.ebuild
index 36a7f617b67c..916728450cc4 100644
--- a/app-admin/filebeat/filebeat-6.8.1.ebuild
+++ b/app-admin/filebeat/filebeat-7.4.1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
 HOMEPAGE="https://www.elastic.co/products/beats"
 SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 
-DEPEND=">=dev-lang/go-1.12.5"
+DEPEND=">=dev-lang/go-1.12.9"
 RDEPEND="!app-admin/filebeat-bin"
 
 # Do not complain about CFLAGS etc since go projects do not use them.
diff --git a/app-admin/filebeat/files/filebeat.initd b/app-admin/filebeat/files/filebeat.initd
index 92b8369a41d7..1d9a987c87bd 100644
--- a/app-admin/filebeat/files/filebeat.initd
+++ b/app-admin/filebeat/files/filebeat.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 FILEBEAT_USER="${FILEBEAT_USER:-root}"
diff --git a/app-admin/filebeat/files/filebeat.initd.1 b/app-admin/filebeat/files/filebeat.initd.1
index 2cb33ba8ebc0..3bad7654d348 100644
--- a/app-admin/filebeat/files/filebeat.initd.1
+++ b/app-admin/filebeat/files/filebeat.initd.1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 FILEBEAT_USER="${FILEBEAT_USER:-root}"
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index fc41eb384fd6..ee5b3841c917 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,8 +1,11 @@
 AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5
 DIST glance-17.0.0.tar.gz 1961137 BLAKE2B ff649ce366739320bcc5073cb60cc24ab09e098bd6808374007f89808d6caf020a77f711a714b34f8a1ef5b0754220aab7c35c02fbdc0d3d0f44e24185a8cdc4 SHA512 cd10bd2d3e98ab1a80ec4f09b5954dbc334079a36d3dfc0d27c5a4f40e5920e0a6fb91c0fc5430c9e625a375e44a8d886568f2a712190dc0f80df10b4998e9af
 DIST glance-18.0.0.tar.gz 1987182 BLAKE2B 1e30d1897b360a8691e79e5e4eda290148146dd55103ea44c5f2cc96990dde0d2cf6bdf785913b5712dc0dda4a79ff0a2cf9bac1a58f5195fe5f5cc22116cae6 SHA512 79129c6ee1cce0fec0c5e656a97278ae275aa8ba33690ac62959f317c4e6b2f548ab0c97f0905dcda2500594acb3f5c05644064bdd3cccb443c593513522d274
+DIST glance-19.0.0.tar.gz 1942312 BLAKE2B b4b3e6cd86385dfe19d4a3b2e9c900006aed984457da71433ea1608b177702f1f0cc5c5057f475f7c0024d18fd196b48a774514511534cf6d325d5c9ccc1cb2d SHA512 7c72f988f2baebd6af17cd7de8e5daaa0ec889d8f210e3bb5cf45bd4d9296b45f1dd2dbbd1709705d0e2b6203bad60faaa11a56328124d47b95328b6678827a6
 EBUILD glance-17.0.0.ebuild 4933 BLAKE2B c13548031d58d2009e6cd38721ce97c966ac4e26ebba60bee1047115de63978d51ffa154d1b7ca6f929b95c0faf988f10387c025bb3e200b7f356407933d1f5f SHA512 e279c6c8a4c225c3c82c6d4d0e42c445016d18ac30ed7b36402462c6b2d7028eedbd117574191ff383a532dcf9db34a261c9e3df9c3f8a590073df4bdecf4c1a
 EBUILD glance-18.0.0.ebuild 5064 BLAKE2B 9853b05b91e6698cff58658ce9bcaab04fe188d25b3dbac8f52e9054d667482fc0dde4ebdc6d703a4bfcd4d566e928e0d33517cbf9204ea4e03ae4f2137b574a SHA512 994297106d3ed31c1d81c82a6c18eb0aa1ce1838bac168be2007a0c2da5dc71b02dc4f0f2e033b5ae2249c3bbc17246f90e950b4dbdad784a73f69b40b206090
+EBUILD glance-19.0.0.ebuild 5207 BLAKE2B 4b03352ba0db6877180ba9fa0de0e53208c59aee13c7a6fc91f838d509c1d8b400af69ce2209a3504f9afa33d6421c188a6a1810b82bbe2ae56b6f5bd52edda0 SHA512 6c1f6ff8b1f173bc936dba53e6fe28876469fca72df61fc7dff43646b13d0cbf2c00554f51efd3261888eac47aa7b865b808b1a3585a878531062b759b440ffb
 EBUILD glance-2018.2.9999.ebuild 4935 BLAKE2B ee851e3b85ac17acfd1c4bd17872ad5d4fc244b5bd674a679893e2d1cff0c6037e1f8503cb8cbdc24c577ca5f31ebac6164908433c4973f755bd8525672432ea SHA512 12ead5e77d22134e34e3b25408e7ddb2914e5cd027b4ede10a25cf5e258e16bee75ce897ce0abf0f4218525b00b8281e8b60e18926dfcd416186f445bf6ba7b5
 EBUILD glance-2019.1.9999.ebuild 5107 BLAKE2B fca67661ccc03db0279824d6352afd1d20103bbbb1e946eef4114d996f395bdbfbf152e88137c88d12961415d1d8136888037709f47f50cf1ed3f7dfe82d658b SHA512 888b1ca0843323152ffaee1e8a5b71ec2d327f58014559e4d77caed27137ba74ade854b8afab06c8bfeb578c1204d9f8a5a09da5bcfe5873b016aabe8499fcc7
+EBUILD glance-2019.2.9999.ebuild 5207 BLAKE2B 4b03352ba0db6877180ba9fa0de0e53208c59aee13c7a6fc91f838d509c1d8b400af69ce2209a3504f9afa33d6421c188a6a1810b82bbe2ae56b6f5bd52edda0 SHA512 6c1f6ff8b1f173bc936dba53e6fe28876469fca72df61fc7dff43646b13d0cbf2c00554f51efd3261888eac47aa7b865b808b1a3585a878531062b759b440ffb
 MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/glance-19.0.0.ebuild b/app-admin/glance/glance-19.0.0.ebuild
new file mode 100644
index 000000000000..11dd58856231
--- /dev/null
+++ b/app-admin/glance/glance-19.0.0.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/glance.git"
+	EGIT_BRANCH="stable/train"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if [ ! -z ${EGIT_BRANCH+x} ]; then
+		use doc && "${PYTHON}" setup.py build_sphinx
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/glance.initd" glance-api
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+	rm -r ${ED}/usr/etc
+}
diff --git a/app-admin/glance/glance-2019.2.9999.ebuild b/app-admin/glance/glance-2019.2.9999.ebuild
new file mode 100644
index 000000000000..11dd58856231
--- /dev/null
+++ b/app-admin/glance/glance-2019.2.9999.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/glance.git"
+	EGIT_BRANCH="stable/train"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if [ ! -z ${EGIT_BRANCH+x} ]; then
+		use doc && "${PYTHON}" setup.py build_sphinx
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newinitd "${FILESDIR}/glance.initd" glance-api
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+	rm -r ${ED}/usr/etc
+}
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index c335ad1e20bd..bf22a7f956b4 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -1,23 +1,33 @@
 DIST github.com-Azure-go-ansiterm-d6e3b3328b783f23731bc4d058875b0371ff8109.tar.gz 20948 BLAKE2B 36ef6d0327a373d105a891d28de4a2e620856c902f5159330d8c316a31e3dab77847c292bd14e3c014203744ebdf0dd1ba1431024a52b55991e87b92a43535f2 SHA512 079dc6400c2dc53d46cad809a1bc7723b43b10939d51624a0aa48d2734f2d44b1621748ef1820843f55c07f233bcf394d2ae63ff356aa22f66df32ca40556e44
+DIST github.com-Azure-go-autorest-1ffcc8896ef6dfe022d90a4317d866f925cf0f9e.tar.gz 126669 BLAKE2B 89aff22041db05db8a8fce99d766852b4f7a9089fee6124757c661b5bdf430cf5fa2ed82af454a2b0e053c738919723e2d6818157ea55b9ea62edd6621dcf4fc SHA512 93652d5fb472b2e752f82fded6402ddc856a9755bc2686ec74d3a414191f07593a847a0faf44e520ff17b776b25c7a16fac3c44ebfa7e3c94dbb67bcc6255985
 DIST github.com-Azure-go-autorest-ea233b6412b0421a65dc6160e16c893364664a95.tar.gz 126267 BLAKE2B 6245eec0fc8798c3482b4fda99229ad6953bef957102d1c85f1bf932bb295a6c3945317c7bdad78c5eaf6bd883c734a7e6fe104bf7ec6664d832906e1cf76fd7 SHA512 3bdcfcdcab1bdd2f4de044d3312cdbc93e515d8a4da712f4b9bfaec28d39a2496a4bf77b24b0fed778e1b66e055a809cd3ce5655d3e08940e902b35715279106
 DIST github.com-BurntSushi-toml-3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz 42084 BLAKE2B 09e4447d28ddb0824547d9aaa84c3c16acdc309faaf44434119e1851c40b3d3f67d0cb745691bf47a560084c93a9ce492c715833405061e5fc6114cd674b37a5 SHA512 bd14b162d4d33f62dac4abfe3bec908ea45dce88b9a0e5dd173e9f0576e29344c5136bc48e5c6602add41ddb71523e831c53107b47c4b36832c97e7b0a3d18f9
+DIST github.com-GoogleCloudPlatform-gcloud-golang-0ebda48a7f143b1cce9eb37a8c1106ac762a3430.tar.gz 2049315 BLAKE2B 4b1a921abc65505282fabebfa3560568f8b7363ef8287ada85d63b4a1cc2117d4e64533d5f909d91ee2a6534ae1d8bedba9f41a0924652c877b57b306ce6cc7e SHA512 4a82a3d9b898cbfb498c4d4799bd73619eef251e2bfa1466260dbc5a40592524b7a95330af8114dd4f11f7cff259bd1e5da1566c62737c5fc8f5bb02c5db156c
 DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
 DIST github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz 3384 BLAKE2B 5eb9bb3c88a3bee70cd64f30afcc039f2f43b68be23f39c72f9091765388229a8f5bdbfba8d11d1916d18e9c785e15959c000337461e44940df0ea40ecce40db SHA512 b877b8b0e67f300ed9773b32593a1edec2fb6df3b0d5026cc7b67490ec9a4cb0d9630fb30dc3dee6b7081f81c3fbf1399809c4bb171a5afab665ff93a9f3a034
 DIST github.com-Masterminds-goutils-41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0.tar.gz 14603 BLAKE2B f8f04dd7fb48c67ea31e2c438210100d671c0c017026317f43428d0460970cc6e07faaf6b3d4c2d554851dd962a7f62c8df617d0a42bf30f4d7038108f9df8a3 SHA512 05d67b1d5eb8881a9a4223d823412826d2ec035782a58879645c53e75d4e3a0a312ff70e32020d385faf6c345125edd8808b63d33c4f53542cdba73b3901d3b6
+DIST github.com-Masterminds-semver-805c489aa98f412e79eb308a37996bf9d8b1c91e.tar.gz 21138 BLAKE2B 07cb99b393f48eb0df3fcacf327e2c769791e5353bb717a998ef7acf587cd7e1f211d258cf55768d5b7951059612ddfa39e3404dc908255ef900901d16c33c6c SHA512 a442038c4a222734d0f18a10eccdc450d4c2fddbcb2b1e10bb32c70e956d74ea3a6672ffae2a89a52e92aa6bb4c75fd85337392dc1e2380d27843237f6ebec2a
 DIST github.com-Masterminds-semver-c7af12943936e8c39859482e61f0574c2fd7fc75.tar.gz 15906 BLAKE2B 0063a5faf829f84578364629c3bdb74db6485ee360f6fb62c273f580865dc2455eeee35016bc1f32d8a7b91544df4550b890a713b47f08138d4dd63994cbc41e SHA512 32ebd89448ef9d135fda47f9b0e9c98729a867295af6c9ad4441eccfdfb19e251d8d3270e364a42e26abd59c3f838ef6c37149e5bcc432a19c524d1e6490e453
+DIST github.com-Masterminds-sprig-2691a9cba2adee8d9a60100a1bc49e770f97b7db.tar.gz 40766 BLAKE2B 23dfea059877a4fe721a9b9c5452f40d771613b5550b62f3e45e54046a67492f7365417a643fd103d5683ac1df58bf7458252b6c6d3c97a6cc088e225e9208c6 SHA512 1a2ad4c4753b792066eb62fd8b9eeb00a7fe6735478e40d6397e8539a5fcf1422832149cd1bc3692d56de904113321fca36bcd95d18c417ce0da9d021a91d1d8
 DIST github.com-Masterminds-sprig-9f8fceff796fb9f4e992cd2bece016be0121ab74.tar.gz 36657 BLAKE2B f40e9fc9982b24e72f463af5f05cd26b903b5f457c8601e1419b5262fd18a2dc206b5fbce86f110aeb01b457f90ac587a1786429d7c10cedb610131acaf1ded7 SHA512 4ea351b3345ff1d8cb57dd7827378dfdc5047f622d8a64300b46c1197f833fe9179d2b8fc9a006d01683214de0df0903e257a694da646bbb89369580eda1585f
 DIST github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz 27278 BLAKE2B 072014886aba809af343bd5b5a2cf21ef95a5712ed80662f62591fb58dde6e71f075d74d93b755845cab571f510ce1e59b0cdcbf61fd8a485738acab14345c29 SHA512 77a2d594f7da607c9c1502e9ad64414c177450a40853d6928c690df2ff6adce0fa79627ea437e07e7459b1956b00db9d1fb8b0e08bff2c0e2c1f98420b36ee53
+DIST github.com-Masterminds-vcs-f94282d8632a0620f79f0c6ff0e82604e8c5c85b.tar.gz 27791 BLAKE2B 4d9f7e81c9d66f7302ed45f433a9329319b75d6e1416ded87c74032a7cdcef4a321edee370305f7e6ef16f30efa70b56badbdc81b75fe90a87f890ff0cab2eaa SHA512 2fbaff5ba0cb0a651e93634ba1cff5f34c374f490c7182b904d052b22fabe717f5a478856101e8e8679ae806db0b70462f59abfe445714199fe91a3dc73b975c
+DIST github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz 11651 BLAKE2B 5303cc2264bc289d94cbe81766e12ce42e5ab59a5fedf3bb9b1fba76d0ab543af8f7c34b991837f9ed6270003b5e1eb2d94721c27dc409ad67472c8dc0315d82 SHA512 faf9ef8e24db59d477073fb8a06de337827f21b84a69c03cf47c6ddd8d3d67772319e261d98fe1fafbcc80c725db52541e02f8f2d598986246d02b8e381b4e6a
 DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
+DIST github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz 6799 BLAKE2B 8e27467b05093ef6af830c07a3a5a9fcfbd158c75893c6e0279538b02d70ed8ed48981ed1369aa1472903bec16c48b020a7949759dce625f6fa5cb8fe6fc4e03 SHA512 a7c80ad1cb51be792f92dd34fec99dd1d3f11e5762e196e8f2d126afaf7e62548f3355dcb2616a989d0e4afc4cd7f559a0bf528ca0e20b0d1013b27498308a30
 DIST github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz 35759 BLAKE2B b9406a926df5f8b27e27711ced93c9749a0d69c35f1d65c1edab7682fb039741e3825ee62f5b08bdf62d17d2373b17c974ed2653e39cc8910878a94f81b1331d SHA512 c7e5d4497201398cdb2314f8f863d717f91d52815da32abc3d3a1af00ca35696d612c64b1c2a862eb3822f555e2df5a671f2e446be7f5b5cce0e8153b9a5e878
+DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
 DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf
 DIST github.com-chai2010-gettext-go-c6fed771bfd517099caf0f7a961671fa8ed08723.tar.gz 812631 BLAKE2B 576924f2df0e824490075c661b3a503b184b5d1b262c6154bc68db159b14f09fa15942e1650de20389ed950664aeb9698de2389c22dc5b9f15e335b22b87d3d2 SHA512 8def098c2cc2bd9c2a91f26473f99ac67931af968dab770e1eeb5682b3d3d259a39d4506e78e39395edc201105d6161d79308a6b17e20eb65b1349e9053e1692
 DIST github.com-cpuguy83-go-md2man-71acacd42f85e5e82f70a55327789582a5200a90.tar.gz 3393 BLAKE2B a63a65e8dac54a2220aed0c23024b0c2897c72f172f55c9ba319cd913bfd3f8be87935735e1b42c96f6f7abedde09c84b5eea4adc1fca0b13c018276d52eb04a SHA512 b6e5eb124d073a22e6177b80dfadc835baae69ea88061d761b0ccdbe28f43614d74ce11025fbe8b8d9fd63107606e411b1f6305e8ecc28e9038dcffa3b78e0d3
 DIST github.com-cyphar-filepath-securejoin-a261ee33d7a517f054effbf451841abaafe3e0fd.tar.gz 10810 BLAKE2B 4150ca52c8229e8d4533347b8b266b6b9421b86a9e511aa70a26a40e34c0468b0aa853f910afbd9ecd206d3c7009d36e6e7b3ac85d79aa4e738acee62bb71f03 SHA512 ca22438bc5bd9196923dc7e70748452635afb743335e4b198177b88a6e716a2677f5941a8c5352ba452faa7b77aca02ebc2404ed59918e626cf2478ea9d8278f
 DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz 42385 BLAKE2B 6c9addcfc48296c3c19b47a6187501de588889468c5ebd616c1603d2b2dcf9686524574e9fc8e53f9a033aa31f69b96aced8898429a01c9bc8585916aa97843e SHA512 3d48bc77e250cbb48db5d9a1a22b4f8bba708170fdc55cc99d9bf2470f6864d095990154506b15fca19afe41a60f9eae6886201d4371e02dc97c148421a6eadc
+DIST github.com-davecgh-go-spew-8991bc29aa16c548c550c7ff78260e27b9ab7c73.tar.gz 42217 BLAKE2B baa5e818fa0cafc3d0af4fcf158e96ff5f9820c186872c3b4038be83b41878ce7ca297216a9669b903763ecaebe7ea36507602280eb3734bd9eb01bdd54c631d SHA512 4c4047bc9a8cbb27973c7b11779388458dd9cca5937e8b65e19ea513cbc7bfe8e97f538fcc132c7512aaebef44429f531a15b367b027d731db5762b7f4a210b9
 DIST github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa
 DIST github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz 1769777 BLAKE2B 235216295ebfcf61e6fe3cd8f81ac66a0bfd9a67da6b8c6ead4c778e0fcd7ecb519bbb67711d502f5f253a4e98604fba3b055458931ab7a03b4d61fb380c8169 SHA512 05caa27ac0c8e16c7a7c1d0de0f3c0f560be51d0bf5f487f370a0b99971f88e3134448a2fd34af694f124f60515ce38923686ca4fedc8141c5bf4d74f85b0141
 DIST github.com-docker-docker-a9fbbdc8dd8794b20af358382ab780559bca589d.tar.gz 7654023 BLAKE2B 36781404e6b3705cce95773c8d5b468e0fb0df81993b001f055eb5babeb8e2b6c6c771d0f2d2f36ffb4a6be99e2408e8343501a98f581b8c30addccf8c0a22fc SHA512 2bdd240782e123a5b87adb92d435a4fb3864c28a0a4899d9e6fac6a93926565ff1efae228c35ca81d72f048fd0bc5a5d9eeaea99ed6a911cfdd3ef20bfe67637
+DIST github.com-docker-docker-be7ac8be2ae072032a4005e8f232be3fc57e4127.tar.gz 9059054 BLAKE2B 8c4489bde6cba2d6318f93abdad0e14141d38398de06e06ce58d4cf4c7cd8a8d6526d21e41c0433eb31a4db97fe4c8e98b48fdfd49ac15a311e3fc507af49d1b SHA512 15bfe14059103fb8cbf62a9f39835b0a38cd61a859d2feed3685a39cd38ce81f9b525142c8c7bfea66b970807be78183956c74d45a61b4161c7f41d7c7177f17
 DIST github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz 11094 BLAKE2B efc28ea5f3db552cacd9c48d7ec4de65a4f50a9463ac964d98782d62ae8c6103c119bf443d3219a39e0ed4658228a04b4a388c29ee38a05ffc3c78c25456abf0 SHA512 baf231424d453bf889e8614c54cf28f0f37f8b8e06e841c2b42ef82729afc4036018b1ca0116da33a8452a2d2345bebef5e8c66be489896db813abaac79d668b
 DIST github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz 35378 BLAKE2B dab00cf2ff22077187532a66abdd609a9101a0ca4b0fb6bcd31647e72dc491ba6ad2c2f82d3780d687dc8a95c3f499bd457abc7ca4b98cc0d08c726f13d58593 SHA512 754efd869559f96eb244a603bf575e1b439d8aa4ad34485121c76c4900150ac8a81f7fcdde4b2af49bcd317eba2212ed60a16a10cff973c9f87516bf50ad0d2f
 DIST github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz 59771 BLAKE2B 91eaedb1f78485b68000b02a9ea86f86a156e8109ea173b3593407ff5779ac1f4652465bd617b13e7ff95ddd7d12d1d39a284fee2c59dcc53e63626b5e1680ab SHA512 c762005454ce5247941d86fb8587ed8229927c1ce81fdac8601ffe41d535d1b3d89f81366be2c0bff13c8fdf2750c7db4b913b0548f19b71e2ab7a7654ab8a71
@@ -34,22 +44,29 @@ DIST github.com-go-openapi-spec-5bae59e25b21498baea7f9d46e9c147ec106a42e.tar.gz
 DIST github.com-go-openapi-swag-5899d5c5e619fda5fa86e14795a835f473ca284c.tar.gz 30111 BLAKE2B 36c1fc29c12f6e42d4b1d38326022233836e7274d0cbbfdc6ebacb7e13c8371c02389031291f8612f18997d9f8be90a402f17c642f341c980a31521830da1deb SHA512 030d98c3fe62ac33bed1895e2312642bf526cc0bd91506f7b6f24500fde08cd4d7d7e3ed16778f9ecf35871a8c5b7857dc1a8cdccbb79df9a01590709671350e
 DIST github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz 70322 BLAKE2B e4284bbc1825c0e78cf2818091d2d25c581fd5da86d66eb8f91877b8a92f62400962391efb911ff33ffbe3db1de432a892dcc3670f96710fdb7c2cb191309697 SHA512 a5c4cbfc12e932f161c827537ad8366d8c003f40c3959c39bba9b6032e3d381516998a046429ef0980072b717dab0ab1df6b1ef24a43e66e1bf4bda176302b49
 DIST github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz 25955 BLAKE2B d6c9b20f80800396ebc3eba2b08ad48522d297bd0da90ed32d6ea2ea4e575e9feea112513332a3c55bbeae2569770433466536698084e787127866efaf0d25c2 SHA512 e5767898e8aaeff59219e0a0578586b63717d5c8507c74ecb813e8e8a7b02470b10df0452cc378c7f0a4b9bec030be22deb3c3ce7c5ae88fd739271cf05e36ad
+DIST github.com-gofrs-flock-392e7fae8f1b0bdbd67dad7237d23f618feb6dbb.tar.gz 7291 BLAKE2B f1b1025008a54f896c2d5ded4ae26f601fb9ccbe751bc06a1fc93e5963857d8ffcc1dd8a2709fe0b0762ee4b94e7e351d793b70f187f6ed9ceb35ded3aafdf57 SHA512 7309fe6301bf229002b28c0eafbaeb0e8d1e0500b09af6327e7e52490e003eeb291b982125780a0106333b3aaaaeaf888aef97bdf5ffbc015aff30d913f75637
 DIST github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz 1732674 BLAKE2B 2dfc3538a0f7e4b77f90795a6e76a0c962bcfdb7fe557e64484481cb6ad053ddd738abd1415cea69fc1305dd2d4e2301510c6715243c76e2251304b6f74d6649 SHA512 2b40b3eed0fe85fb111d49b0eaea33be382539c1829ab43da6da0cbe3f5f7db44422ee38e425d660e85d0541031364a8def3b2e4589cad326c29a1bc4ed8a6a6
 DIST github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz 213923 BLAKE2B a53b177f8b31b8927b923c5bcfc4ee4a1f48725e6652f38e20bcf1147a646411771bde259ed7917ad12913734375f880e7c4cc9b49b370e738928286b432a877 SHA512 903ded0a887db7a6b6783bea7d6af82087449ff05ac34367f3472f23c80965a4f6b4883e6983e57560a80a6b81eecbf285729d4c38b505cf1e99274d1d87c1a7
+DIST github.com-golang-appengine-54a98f90d1c46b7731eb8fb305d2a321c30ef610.tar.gz 326123 BLAKE2B fc4ad02a715532a99688dced5ed7dfdf7f7f22f8ec913de73e2f8d0feb95de84d46d497415f4d19796de37f2234dddf5c1b4c7a2bed69feebcf709d54669b2a8 SHA512 353f9a2705dacc5f485db1faaaac3ce51dddcc2f383f9e4a3874b199d5ddb1c2ac4a8d40d82ef3fe4f20cff8940edf5ffd09caa943096084364d06eac1e2e854
 DIST github.com-golang-crypto-de0752318171da717af4ce24d0a2e8626afaeb11.tar.gz 1636269 BLAKE2B 85529e4607b4efc684dd5a7aa726294a21f3cacc4c6331d91afa95e0e14756b8ccb7d461c6c4ac9f3e0d6b864e63afd763a41c8e7df23a2b8afe0a1264d635f2 SHA512 c1c5380ab03ef5fc8aee6d5937a90286bddc32d8b9488b38b890654657ecdf5f878d74eef2d32d6789053dade619e4aff006ecb003cdafd56b8730768660de80
+DIST github.com-golang-crypto-e84da0312774c21d64ee2317962ef669b27ffb41.tar.gz 1641247 BLAKE2B eeeefcda7ca9cdbd1519ac03e4cb195d68041efd556b5ba7999b202fd993b3dde2455bf3fad3590dd00bb1a40b01141bee12a756a6db974c8b5deebba93654b8 SHA512 3d88feb4e9c840207f3f5185b6d33ebeab673746ae2fd7a8589e6180ba5d9aac6e18229415d1acc525854fc4c717b91702701edb73fd2e9979550f82908ca754
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
 DIST github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz 25244 BLAKE2B bbfd67b7c9d34fe1cddab77a372fc53c899424122c46dd637186bb571e1a12dda7f0d6991bb5ad85cd0162803832e5843af6b184f861fa5dd1ac0a5cd8c7ed86 SHA512 e7ecb5c64bbb9e1fd2555ed496abb1e65f836b8017f21010dc853f8c527826eb6c315744ce991725d85e3500a6c877b3f25ba22090584c4c75dec6e6cbdc938d
 DIST github.com-golang-net-65e2d4e15006aab9813ff8769e768bbf4bb667a0.tar.gz 966021 BLAKE2B 0d5e297e6175faa704daff2de29b7dc3adbc9dc567cdcfa0813c1a75a7a88e47b991637abb3e12e40c4ba03aa6493bb45f7cc49dfc6a308c509b212f343d89b0 SHA512 22bead696af115d40f5b92c6188373815b024d467c2bddf19ad67750d6dbe2a12df169461b904aa6c677d4e2f2e07467f5479f2cac194acb18c0906b181a5024
+DIST github.com-golang-oauth2-9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz 45022 BLAKE2B 0b14e367f087601624a84ef25641b1f3338cc689ee92136ef51abbbdcf1b3b3dc1cad47b17868a39c1a9ecb2f792cdb1d5bb8f8ede300a5d9dc8445319c05132 SHA512 8a9ea21c4e7f9dd1ceeb069dee1987f5e5e5ba4f973572ab6f0ccf00ae6246a142dc517ef15ff83de5f3c16c267181ac3812d3c6bc0180d12b98d7540e1fc91d
 DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a
 DIST github.com-golang-protobuf-aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz 332903 BLAKE2B b05fa3e3316bd6adbad623ab239795172ee70c38380873ee52a32c10f8f3e750c26b27fc43da4a290d82eda5723fd56063bffe01fdedb2d3a65bf5349abdb376 SHA512 80407835aef3553f655c35e89aa884038c90a3667460af1db60b069ae31e870efc59d6907743ee080d85e167c20d778440b9a6d19ff79f9055bc666c8314fe30
 DIST github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz 16326 BLAKE2B d214c190a03006b726b4e5daa8320aa2f664572db46ac6a57545ccd3e98529c63fd5d9296e2afe0af0b781fcced4af52127d8079e72d116e0310688465e1882e SHA512 dc67de045513305edb3239b412b9154b44b6f408eace3cbbcf400c08d68322cec7090b9e6b22d63bcfaaec459e221d0e3f2c057aa19ae9b35a4a134dd72475c5
 DIST github.com-golang-sys-b90733256f2e882e81d52f9126de08df5615afd9.tar.gz 1242904 BLAKE2B b25ad8ab9a4376ddf2b51303eec7cbb954c53693950b040bf118294484b22f27e2b463c3ee2c994b511c4d04119c85b1cc6f56a3ccee21b297bddab242f22b82 SHA512 b79478d67ae01728adcc6fe81ec91396ff2459ff0d48e05c235f618264262b393c566af902845d34f2ffecb9fcc02ced5a1476a3e00d66ee721cd20e7b49fb7b
 DIST github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz 4604452 BLAKE2B db401ddda5fe4ad1504a520707fb19053b36d99a3c47101e682ce9be8aaf7e216af586816cde01a3328f09d02e9d3c8adec35ea1f74299106b47853102de9206 SHA512 c613d40866803ea36cc43507fdd33dec8581bc6bf0bccdc53efac2fbb1f5903c94ffeea6deb18928fadb09aee673648d322bb7b8db34a7f630500248cc9fc87d
+DIST github.com-golang-text-e6919f6577db79269a6443b9dc46d18f2238fb5d.tar.gz 6588337 BLAKE2B f182e9a40157c43aa749fae5fd6aacadf994a7c2051fc23dfef8031b243f691446d4e5c93c9b363ab22df38f533b1635aa45e23f4d8de7947ad7ab0aa8e5898a SHA512 caae52905ffdaa8e712f6b92a03a8cf9d9eba227e04ee795977c2b76bd79bc16457f846c11e45525f3e3df557fab5e0279fe098c0145b5807c0e580dd339f452
 DIST github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz 9005 BLAKE2B 5ad1988c9bd3a632ea4b248e32f6223a79d54b68b1c95bddcace042c22c20d3aee6192bf3d72def729292ed50e4d423935c3ec7004398e03037f91b7f401fd77 SHA512 65a69bfc6044de4ecacfad1c9c8add6312745bd2ba3dc46f522f1e7a424aac49b5e18aca60f8daabc340d50d73675cd5c06de9441060d86009a092feb4f5c9f7
 DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9
+DIST github.com-google-go-cmp-6f77996f0c42f7b84e5a2b252227263f93432e9b.tar.gz 76176 BLAKE2B a2c233a7301def18dee5a8820daf83734c41022b391a9cc93f3af598ed60449a17d4c0ca5a6a54dae1e91375c86956accd608b1ca6941f00cec2f79d49505a0c SHA512 e2067f3159c0423b5b067581b116997d347f6f6fc7c43ccd7856877eee8c7d578350634405e082e287ae9cbb809e82eef83bc0624d25f011b6e39ef365ac09a7
 DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4
 DIST github.com-google-gofuzz-24818f796faf91cd76ec7bddd72458fbced7a6c1.tar.gz 13166 BLAKE2B 83980ee59ba818996fbb52f7506b2870893be99d292d404fd924f30b401d1b505fdd8b83fb8dc9f45fbde5164fa125704d3dfc8edc02507c601af08463b854ad SHA512 09cf1bcb662369fbfac5c6a6e3af5d0adc3623eb7da384a57bd578f8359e341f0a8db597e21821dced1fdf055ca97ca3031a331954291779886fd156094b7bfa
 DIST github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz 12733 BLAKE2B fb29066f37f5f7d6aa5c7e0cf4a90b9b16de012d809034aaaf10ed4a43b5941e68c8925fe991ce5b25fde56995e8e66317fcab2caf97a722b12cc03825190488 SHA512 d3c2b411793681cf5b55438e3ba23512b6edbc48677c2efdbaea02d226519690525aba848cfde45205dafa39fda9f2868960b39f744aec80222b61dc42b77da7
+DIST github.com-google-uuid-0cd6bf5da1e1c83f8b45653022c74f71af0538a4.tar.gz 13561 BLAKE2B d158ab89d96b1987a79d5ceec74ac002e5b4053a86cf3a3d407f26b27d425fcb11e113e388f688eb181229ca280548f6c3490077d01f994298a5d47ec68258d4 SHA512 c0185645a3df24ed5edff43004194f844b5e67c69b62dfc746b457cfe236b869b225b3d383e8bab161281aa1fdd667d4196a7b0ff81dfa32e3ddc73aab43af59
 DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136
 DIST github.com-gophercloud-gophercloud-c818fa66e4c88b30db28038fe3f18f2f4a0db9a8.tar.gz 797285 BLAKE2B c21bf269e5b5b5b6b2e6f1dcddaa9ee517e1015db18d0459a04cc5cb3c0b916c63ce36afee28d5b99ba85c88788d71bd1e5d4351be963e4d086db48d63eb9e57 SHA512 4b92891255ae94c22e1fd262cd42f37a1f74f09d9afca582f7b54364889b8c74ee55fbccd82db45ed5ce19729975e0d07283a2677eeb7a9d42ac2fab8e2d8231
 DIST github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz 6864 BLAKE2B 71816efd7996458a90b192780fb720b9a0f7ee8bb01df6d1fa0e079ee56a426310f632839e921ffb89403145e63a34e90e985099221c4253bdc1c316f1aed37c SHA512 7cc647e6347258b9fc455cda220da8f59c3ea92f975369ce5901289102d5db8c45ea6fe24a587cc4dc95a502c4fc203c3503f9db0c427cca702418478eb25f25
@@ -62,22 +79,33 @@ DIST github.com-imdario-mergo-9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz 15
 DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
 DIST github.com-jmoiron-sqlx-d161d7a76b5661016ad0b085869f77fd410f3e6a.tar.gz 49619 BLAKE2B 69a7ad4e10d12420534374e36a0897aaf9219479a128842455f00f865fd9c15d0b580ccfab2ae0a98a4720b19f0230291d24c773b7c297b9e47306fedf68e6af SHA512 d52c306a0664135d8c6e63e836791ba829daf9cf23c656e8cf93ee258aef5c708a7a83d57efb0b0d78456b3c644677ca25c0dc9960a0a2aa058202f799880555
 DIST github.com-json-iterator-go-ab8a2e0c74be9d3be70b3184d9acc634935ded82.tar.gz 75753 BLAKE2B b813abddaaa09f947a1425ea097be3162b255e572d00c0eedcfd87883d31ee48a5e87f55a53f4640805ce779f4b34df43e4fc44c4f1a0beecfc25d13c7a401fe SHA512 065176d9d83c2ff364eba1a9f0081c68c305383cb70e5193a98e8bafb70bd8b562e050a070a63f7ae60f034bfbfa2bc47b764968818e9c30400aa73a57040a72
+DIST github.com-konsorten-go-windows-terminal-sequences-5c8c8bd35d3832f5d134ae1e1e375b69a4d25242.tar.gz 1901 BLAKE2B f8abd760472e484d1d6465fcedb5240ac104556af67715860c0429b9dfd963441396266f3b1b0af2b6a62530dfa4f8ffef9414561ff64b8639e6eada9efeb301 SHA512 c8445e656d4042d0c31661bfef05cf918e84d5b4905de09553cad0682c83fdab60ed11c0fdbe90949566514125d2353aabad85d36c15825a48e86d8ed73a94fa
 DIST github.com-kubernetes-api-6e4e0e4f393bf5e8bbff570acd13217aa5a770cd.tar.gz 775958 BLAKE2B 0c30e606694c8457e0ce36aab860b93d6807020891be9a923ec3990b83d9f4a5d7323d9d283b7d5f1e0d122fde9f4d80b7860c2c2db19ff06ed93ab93a723199 SHA512 29a70fa69173d06ba84bd313d433cdeeee9a0326a5f2f4a7e859d6e5cc4fc4e6e7dde7d13b8002e0441dd42f84c170770b9855d3b4b5412e6cdf19bcba650599
+DIST github.com-kubernetes-api-7cf5895f2711098d7d9527db0a4a49fb0dff7de2.tar.gz 1447047 BLAKE2B 964cae79b15cc112d0f9cc91611b5103900d4e74aca63f731790caef2e2fc5f189e0c53d17b41b242565debbf032dabc8801a05bc2d886f522aede196ecc00fe SHA512 7b387cf705e547331d7ec106ea8ff9db1a114e231852795f2f2c0ea18634056ccd3a3dd4b5e18069b94a500a294865cf41d8aa1091f1aef0337e93bca150ec65
+DIST github.com-kubernetes-apiextensions-apiserver-14e95df34f1f469647f494f5185a036e26fddcab.tar.gz 283011 BLAKE2B 06919fe84a85cd31ab10a4b22db2ad1bb6dc33047a7f3a2a713dee2751c75acca3570deb7f9c3773b94522b36b44f2d5030a2daa7cc7bec1a831474cac4f5558 SHA512 a83793b4550f38457bbbf0a071c13974397dc9ec1a5d6848612044cf2722531c965f1533b6d6000b0fce6fb4fa73dbd281914895fab02d2d4a7c02dc3217f837
 DIST github.com-kubernetes-apiextensions-apiserver-727a075fdec8319bf095330e344b3ccc668abc73.tar.gz 6258035 BLAKE2B 7419fe02e398c4764290f21e20992c9449ea212e43a15c6db44dd78c21b5572fbd842a977dbd02e8c084c88aa0dd39283681fc92eb9a1b4c6f37e4c8c58fd93e SHA512 1e5ef8152ac7a85ac6d6de99fa5a4c5900c748aab292b6d7a8af4e7fa865a9f6336581953ca8c0a6cd3b8b3cd6eb4748d373da483ade428865275d987d0193a5
+DIST github.com-kubernetes-apimachinery-1799e75a07195de9460b8ef7300883499f12127b.tar.gz 491755 BLAKE2B 21ca16da64c0b657e6dbcc27eb26dad784c7fc6be16669447a55ed2ca264fc72963dd53ac0a3cb165437df4a5018444dea5f051b10d47633c730f4fbbcad4424 SHA512 7d63539d33aa99e1cd32e079ad303ab9223a3a248df146152d1d1df4ce31c8ad8025546dee33b5f87a5be5c3b9080c07e95291cb2d9ece83bebaed736c4e2e45
 DIST github.com-kubernetes-apimachinery-6a84e37a896db9780c75367af8d2ed2bb944022e.tar.gz 474085 BLAKE2B 6f14c64b7d4092350f5cb70c2648f5285cadeee4ffc70331fd7135f7dbbed82e4109a433e04d5e6691576cbdfc15e31d1b673eec94bd79fdf7c65e3d5d3626a9 SHA512 8c3acc2935ef84c516607bf93419e0fccc09e56e4101e1d8330a975a3e6171d21397cb2f98ccab6a3e7a9597bb1f9b1e936fa53746442f2cc5de1fed75a95c69
 DIST github.com-kubernetes-apiserver-1ec86e4da56ce0573788fc12bb3a5530600c0e5d.tar.gz 703289 BLAKE2B 23d5b25741c33355e738ea50914f4f585db7bd6246ceec1c0ee0f9a246fb61c4e6a2f751bf33ed958204ab2af91e371e9f5d5c5266df15387309ef64a986d307 SHA512 8155d908db3264aa7252d72367c10567b5b274027b2ef90c71c3e2a4ae86ed3fb1bc946511814ca94937773a345453145df079ac23cb77b795f4afb60e1876df
+DIST github.com-kubernetes-apiserver-47dc9a115b1874c96c20cea91d02b36e4faa1bb1.tar.gz 734024 BLAKE2B 7f2b51bce843124c4fede88a473bcd7e3aa071b525290d95d35a989d748e89086e09449ce66a765476ea462fd4b9b346872f2aae46757ac02b6551d690baffb8 SHA512 792e7ded55535d102c1d331fcc0e26e51a0b2430a63eca7b006c1be97f8f154e519037e3cf5cc4667c16cbea3a951cbdf21148277732c23c5d5e9eeccb9c36c9
+DIST github.com-kubernetes-cli-runtime-2090e6d8f84c1db3e23968b0ee97fb677b363fcf.tar.gz 86163 BLAKE2B 8b58fd17d380720afe988eae3f3daf29e88339220fe4a4c8e0b06db32ccb057c4e4bce8145b492d96a03829beb3c9b1866bcec60956860c4c7fa94bd635ced68 SHA512 e619c24b2f79b66d39acd4b88862e8161fa543264597cb5f10e7901c3b3e7fdfbf5de825b81e5b833ce179a673b3351eb621ac3334f1365821a5d32ea4934e24
 DIST github.com-kubernetes-cli-runtime-d644b00f3b79346b7627329269bb25f2135f941c.tar.gz 80440 BLAKE2B b1ed3f539b9fdfd8de63d769fe5ec83b25e155f7f49fbf2a22b25f147278fa5c66941f2a680e6e92867340d910e7bbb4daedacf494735ae8ba54676b38a6abd4 SHA512 736dc5b9cf0023c11a813c6121dc694598a81de886db1eebc9d29684a0ca4f47024db812de37ce5b0b2ab875c8355483a48690a88d45e782c56dbd15174aece4
 DIST github.com-kubernetes-client-go-1a26190bd76a9017e289958b9fba936430aa3704.tar.gz 543092 BLAKE2B b4913101d300c949a9b0c5396d2f5ae433f8bdabbf736ebc197c07471d7076e69d793923c84c6de19cba454e5327e84977ced6dce6b94f2c842a60e4de02802b SHA512 a2eae2811d7ee942b74a24e976c2840df9985e16d46f1c890ce7591341ecd60664979b6f825abd30fa0569607139e6ec208d40e98507ec3d364d52958c2c8818
+DIST github.com-kubernetes-client-go-78d2af792babf2dd937ba2e2a8d99c753a5eda89.tar.gz 560611 BLAKE2B 2d4f996b26573099b6c1efcb25da61400a4f994c59ed4fcc896ef3064ed5ef9260f5ba2ef3d9fdafa50195edd687c914cc0a874e562c235b3d135d1edb41adc4 SHA512 06c2c6329aa980726e56d52563af7dd4e191e0c1209f0c2e79978877cca13e1f6b022e8da4069916a95f84f81f07c8d6cea9b2d832935b3ed00cf7559bb86894
 DIST github.com-kubernetes-cloud-provider-9c9d72d1bf90eb62005f5112f3eea019b272c44b.tar.gz 1491284 BLAKE2B d9ca8dffff0a374fe1a6faffc202d6793e9be10a10c1de9f76d5fad37fe26a45ff8ca949f5eb43889c1491c9c85ff714eff55f3690ce12a791493cccc91fb26d SHA512 d48c0d88fda9a68be9550c7498cd0e2073acba6187a9d2d90f54a66261bae22a83fe7b20dda67e7003ffff1c1d3dcaac757a3f7edbc91a3850a6b5b7ec6528b9
+DIST github.com-kubernetes-component-base-185d68e6e6ea654214f444cab8f645ec3af3092e.tar.gz 44010 BLAKE2B b04235683c8e6b46b00e7fa302b5ac0aaaf26f68433e6f8205fa839ac5ade1e711a94c4acad7c96a3b0920a85d28a3fb3412cfb2202b2ae7d5b7b77f7981b242 SHA512 37267c1c07c3d5622be3177488d8118817735289be17e66652acbbac03b49ae50918f63b104a3e203f1ed7d08634f792f58ebd19a3e31013a95d33fe55868933
+DIST github.com-kubernetes-klog-89e63fd5117f8c20208186ef85f096703a280c20.tar.gz 28889 BLAKE2B 1039dd12ccb380dad94fd3e4cf3093bb445a9f92bbaa3c9590a7575628ff25a8051154ce2a1365ba9cb3d7cf540724c5756f3c067a529af5d6aeea52bd430bf2 SHA512 6874d3a90f42c3b9f4c4c08644273c167f0c6306568139e1ee6821ac85b4063bfb4abf78e6168987bcb2d55711fcac28c8f25679720928eb4e873cdb5ef3aff4
 DIST github.com-kubernetes-klog-8e90cee79f823779174776412c13478955131846.tar.gz 27368 BLAKE2B 5eb6965407074c30e8d9fa81c413564cc020e8b4142c1b56330f8ad8efe7a343ab5c7ebc41b7ed433b60a4355f1a18e25de69cf1e02608cdc2e7ae4f7d3b5654 SHA512 8a7540e4a0e5e601e784475aec61addb8e190c2c5090fcf98ac748761dd19e4e01370322cdc92459d97b3d1a6828f7333ce053ae59c989c3d054f0e0fbff978b
 DIST github.com-kubernetes-kube-openapi-b3a7cee44a305be0a69e1b9ac03018307287e1b0.tar.gz 729058 BLAKE2B 68da0c27466683767deeb8e5a3e690628e49fe545254ac72676ee0b1b433f971e7810266e1bf2746d14ae954395c2f70243fe6487113522de3f47f171116bbb2 SHA512 de84c8d256dd331abdb9928cbf889fd0d887f3f6c843cc8eee847e1ffd0562bc58ceea4ad95f1253890111187e9411727a269baa3768a8b45aee2784275e412c
 DIST github.com-kubernetes-kubernetes-b7394102d6ef778017f2ca4046abbaa23b88c290.tar.gz 28009514 BLAKE2B 80cc0733172650ecf89b2579b43a75c532d47029a414f2bed1f18cd0e548a72d7aa0e573a196ef118e10aecf8f1e7db02bbc28a96443f4e9b3c806e4103409ad SHA512 fb59da6510d217623bc06d25414290b6174f80be01f67e025fb2277372f7de78c78e0600eac76110c17c87fd28dcffca47ebc58c70d9733b66e595ecff3a4818
+DIST github.com-kubernetes-kubernetes-e8462b5b5dc2584fdcd18e6bcfe9f1e4d970a529.tar.gz 26590117 BLAKE2B 8ab8a1ac5882e142bcd0f50770a8e0175431e96fd17047f4af0d7bf5d1718ab5687f910d1513a0e22632b0f09167d1d86f2b3cbe7ecb9e21b7778883c54471c4 SHA512 a71a27b51160442f350b45fe0a371cb432ce4fe8d22dfcbe2674aeaa0c4c34b4e1d1063b825635829b1add550fad457d1b3dc088fb0ddfb0fa5cf96c2952e8ea
 DIST github.com-kubernetes-sigs-kustomize-a6f65144121d1955266b0cd836ce954c04122dc8.tar.gz 3437120 BLAKE2B 9eed49b8b5f924c7627304a48307de2f3db386c5817d8ad00ec1f15d6fc9900eb00b16508abee9c4176b3853aa940421d0dc6e9a7a900e4c4cfb85ed399cf42c SHA512 fac0eea0c20ce1c23986e77f6d7fcc783b044cd774f2cd05e50d6088ecfc179141d6d547e6537a0bcfe8d2291c2610bf4e6a1806d6d86eda4e93ae871c10f1ab
 DIST github.com-kubernetes-sigs-yaml-fd68e9863619f6ec2fdd8625fe1f02e7c877e480.tar.gz 14901 BLAKE2B 8403e128afa97525c6322e80fd9810334fa6cb8746254f98877478db49b7eac6dddb86ec4a980844ca1d4fa398d881a8338b80bfb51206017c771d6d4f07c9d4 SHA512 7bc311c2afca9d83af3242f008267e7f7ed9eb8320a55c09fc1d1a0854fbacbf04e38fe69efb8510aab54444e6b1bccb9bfbc5e54630a1cef153ea3caedb4f0d
 DIST github.com-kubernetes-utils-c2654d5206da6b7b6ace12841e8f359bb89b443c.tar.gz 41732 BLAKE2B 7e7a23cf383dd2a907c65110af4e9e240f94442e3a322eb8341e21e1c3252e1435766f4189d5e77e85c68117f2a7d2042826365eb99ef958bebfef788f7d90f1 SHA512 3a6c2944de6c9520a85ef1d0d90b07650c6b00619ab3cadaf85259ae43bf6c8b9202619598a87b11b3c8a1f77b621b3ecfbde667aec51d3441d5c96a4f0d7538
 DIST github.com-lib-pq-88edab0803230a3898347e77b474f8c1820a1f20.tar.gz 90417 BLAKE2B 080f410d849c6f1e55ee8f8fe8caee6acb2b5191d05b6c071dc87860e22cf9430eff823f1e8431a33acd99f0e0074cf776d68c4afb65b05e1b48bfa9508c2883 SHA512 889eb58cc417a8e128630b5511ccdca5d13c40cc96d449fa25a324485fc6b32e5d46c6bec33bda767b4c2c7804de4668762bdf34bbcea5b4d32ed5a2670f2019
 DIST github.com-liggitt-tabwriter-89fcab3d43de07060e4fd4c1547430ed57e87f24.tar.gz 12277 BLAKE2B 7c8c248116cd4feea2fb9bcf22d64e110feb6e377c9b2859a5f0786e3949b57505d1ed3d072bf2216a0ca0926978932d60ed84f236d9d2fee26309ac6582c6f2 SHA512 f1aa930429addd014ce293038087c447e44d0f840963b188930cfcac95490ea52df174bb662a0c5d506371342dbd8466223b3a0f6641017fc20d59f7f209b33a
 DIST github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz 70478 BLAKE2B 19c135401f34f8a8285c8bc315e6197c156de85fe9f4e65de7b71fbb73e37d57031915c2632930d5e76bf01e9038ba380150bdc78ec2cdac959e2cdb9571bc11 SHA512 319a7bd61ae490353a939a412dd00ffed9b6acd55bb739e8c259caed7904ec3407493888798addf89a15474053e125abe8818618240a55402b4351270cebfbdb
+DIST github.com-mailru-easyjson-60711f1a8329503b04e1c88535f419d0bb440bff.tar.gz 74976 BLAKE2B 7e9c0e6f36cd90393c593adc87fb8993cdb421c704bf7177bf4ad76b36dad6b293fffca1670a3f222567c9a27ed2890994dbaad57b82ea5a4f041f94def6fcb8 SHA512 3d7245572ab248e28c7d11778224ba572de77a73f2716c87cd0004d5f2601b0850f8722f17ad9dd8d1f9c968626ad5aefa7ebdceb887914b3661de7deb6e1ecb
 DIST github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz 5884 BLAKE2B 62f6d7217043f77a41e038c3f69c4fd20f71a9b203b29946b7dea5b9ddbcbb08b83ee40533c73cea681700c04ce2f15361eb43f6c9e86bff85318792e12f0968 SHA512 15e7ccac112c78e4fc8fc06f32c6b5864a945b0cea885856f12ab694020adef0af92b0f6a0d5e873891c3f68dfa0dae4c1f2de1ac7946ce570b155e6c5286d84
 DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 BLAKE2B b3b007f925a4a1c1862c8cbe34c5cd225dfa610ad8c56b5328e6920a44b507680daeea97209370bd6b259654d0ca5791f4bcc54b8bd8970b9aaf994eada16d4f SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d
 DIST github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz 2740 BLAKE2B 10127381356aff4d25d3b5da3d2db5f4565c8e5c4e16ffae18e481fcedc0616039cf3907fdb3c204d5f743bb5163bf437d549dea9fd46cc9141d8ef88cb36e21 SHA512 39cd6786782e3a29ad448db3ec815a6da029bc22fbe543fb04e0e869d8b4a698f20434bb24c09bd18b5d2cdb992fc28e21b7ae16b3e585412cede7b4eed2b26c
@@ -88,16 +116,25 @@ DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.
 DIST github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz 11345 BLAKE2B 9f25872e040b5e0602e658fa728e93a300c00ed1064966370e1b676eea6a94d6bca491b2f6c33a9f2c4d1c522a3ceee540aede2dc638eed238de8485500821e9 SHA512 fa82643f622150b44b198451c1e41e042fd7ceefad9d68e32238d48c9a29c6fb14780fca9d9a7dec660365062d4089c638196960fac056b685e7543410774228
 DIST github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz 130114 BLAKE2B df1149ebda18c7940ea35fbe09b08be6437a8d4c4f812e3b4b088da8a374718212f0b10a153f3e04a6ffbe0bac109a92e5eca8b95814d221cd6a01d5fcfd48c5 SHA512 27a3cd10256ba6784b2f1318919ad6ce9e2a15c029c18961cd760a7569d5c683097c7407478b2ec96852163a321cda854aba18b0a73e0dda836480d05451bd62
 DIST github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz 54855 BLAKE2B 2a7fd47a9e1dbc794f5de84d5ee3512b282f5f94d044dd9b471ab5ad138ebf2940c4441e6b4d89404f3443f0ba466fdab8fcf58c92d9c85798f23b5a0c57a6fd SHA512 9d4d52142888edff091f23496aad70ab2924dff3a27930cb6df81c5452ca897b9d61eff74fbd092372ecb4bb005b4d362ea6b0602e1764ea4f2a30e23048a81d
+DIST github.com-prometheus-common-4724e9255275ce38f7179b2478abeae4e28c904f.tar.gz 80876 BLAKE2B 669ebe88636632ff26229b2e3ba261cd5a35bff4586df59950637fe169802fdf6e1fdd7d7c64fa6918aa26cc5dd196138f13a87dba7532d2e84ba2550bc5b705 SHA512 fe1895ba4410b326c80aca9cb97614e32daedc2f35af4a32b502a25ad3f98d6e47ed1b12c2066a8ea9eb2618ea60e1ee4d4b423e48bc337b778472c3897ede05
 DIST github.com-prometheus-common-cfeb6f9992ffa54aaa4f2170ade4067ee478b250.tar.gz 88669 BLAKE2B dbdce2a4a54f18a97363ad809d4283aa729082171a9c95ae202e8052ed32c3ae099e0afc2b4232f9979c2eec75ba24e6ab2957a25506d6055a428bb01a0391c6 SHA512 55c21f0b289e4bd7fd09c270ba0b86761d90359df4f934524185d8e11da668e44fcecbde9204b67b1642ab8ae86b75f359ced20a4de3ed917ac0302bf82e0ea9
+DIST github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz 61606 BLAKE2B f67de9c0f3e8d814bed1711f0e0771c13e7d4d8d9dcc67ede3615bb80f8a8f20bbcf9ef65e46dff4a41cc587ef10ad54ffdb6909fbe83f19993422ed5714dd81 SHA512 8cabd997ac2405fe53aa507b6755aff7aa4ae2a1fdb3711abfac5d29bdd369412a17359c3d9c3ebc4945d1b6310c2fadd25201ec7b040b20e2ac5d27b56c564b
 DIST github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz 34890 BLAKE2B f0284354e3782e07371825b3fd6136a5fc516dae97218c90ac333ce749f87b435a55c6545691a7b71f90b98563fdba5f96c238007ee8187d98297edce1124cd5 SHA512 47cafa8b7a4f9496e1cfd6e2d24ae882ed3ac21a2417eb2ece2cfaa2e391d32b60d2ec8c3860988d8fe3af8bfa6d1430e938e5da1331a7e1df2828753dac82bd
 DIST github.com-rubenv-sql-migrate-1007f53448d75fe14190968f5de4d95ed63ebb83.tar.gz 22241 BLAKE2B 8ab7abaa0e50f5def70c56571e7c24e8c74daff80f09d553373b2b1e8824e3b173f2d105307cbd45e5eb39b9e0e36bebad6c98f4e6934e8827037735432d4268 SHA512 f6c1bd596f8d5faa0d43c6ed7f985ce565563643806cb7729adead8f594da5d1793bc83365a81ee850f4b1cc622e19ec9a4bf57263fe1f39110f9c8544dee955
 DIST github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz 69591 BLAKE2B af6a9dd3e0a9186bb6f96b73faf03ce69d15083fd664f212cee1aea8288094dd9a3a158da07d4a27a44a0c14f03fab50837f3cb517b0727b77ba8297651805be SHA512 616af6fc95fc5e4825413ec6590fded0cc837af3887cbab814828ffe9a55f27d212f0a67080b867d7051cca2a45266da8f8886360249451fd983cefd340f0023
 DIST github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz 1941 BLAKE2B 7ef4ed22d34a9dbc56396a0b04fdf75e5384f941588116a44ecbb7b19f070fb2f4930b93b364b97c784e3f0a60832a9ea4c8d2007623548f12c93928cb36682c SHA512 06b8bf3f8d89a93c565de9b4219211ad08c91b2442ba31ef8bffa02c7ee823ae4f57ed8b39b4ac1eb326e5d12c65b56b16833c28fc97623c732bb6ea685a3c2a
 DIST github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz 28245 BLAKE2B 2f37d14ee529db80301ffcc2c9c88e18cb21b0398333e5528494d143006ec9adc1ceac31d0de3ad30c30c442354220393fccf13fec251ff2cb27994435242f87 SHA512 85023d0442b05ac280d67f43443cbbd40cd4e21da10a6fc9f6f9395fc53e730c73591c9f5a74b910f4190fd8f52843836049ab62fc388bfd8e60338cdb1297a5
+DIST github.com-sirupsen-logrus-bcd833dfe83d3cebad139e4a29ed79cb2318bf95.tar.gz 37786 BLAKE2B 4bb2929236d710901b8750911287c844620aa3bb2baeeedeebf2c739e40f212ff351ad05ac8388c9408ea19182e1be09d06fcf33b049bdd11805f2f36e23c9c5 SHA512 78cd34082c52ef9cadc1765be312c0bf8f7c3a9a51f570a911f2b4b0a739f4cdde445ecbf3f079adfb98530a0933a095e0f5adedeb0ef86f62f8200b65968be7
+DIST github.com-spf13-cobra-f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5.tar.gz 111260 BLAKE2B 4ba7f888257cd5b883379d9bf137872b1ecdaee796ba7cde107ef7e85d1f55d45b039dc7d6e7bf170a6eeb76cf8a56e9a60325284f4318397edbfcbad5ed1bda SHA512 c9b210a7c08e96e66b14c03d8b4dc613092eda22b647f56da597d329203b594ce6358f34a2404a41ce8070250721e18e4defb7aa70fab8b3a6bc7ff81291f02f
 DIST github.com-spf13-cobra-fe5e611709b0c57fa4a89136deaa8e1d4004d053.tar.gz 102553 BLAKE2B f95eb665a52c1819bce2ba8ae05d9b5a3f0e27941af8ced5245d088840f605924abd17547fe51a0c0ed07ca2e28267be600c6e1fc95abe507dc53b7f7ce41e65 SHA512 c7adb5e8fe32aa0b8ebe85449e14bd57f00c60170f41167bf80710d32e83cc4fe37635a3c2b4ff49b2275050b749365c2aabf105ccdbf37bdb4bd251f14f1925
 DIST github.com-spf13-pflag-298182f68c66c05229eb03ac171abe6e309ee79a.tar.gz 46092 BLAKE2B b1e4bbebcdfd2bed394e0b1e93f47951c29a8b6c4b9e5435c73b34f18648ca8ac6d51e6c664dc41310f0b953c4f4d2cded88f43a27312f42d394e7e699cfb8ff SHA512 1e1ca10d2d42aacbf0da8d62dd786c024c86054212e1531ea7bbebe7ead1aa9e47646ec19d8895b6d3914da8b98dffad17fdb207bb917a9e19c9d777b9de6c96
+DIST github.com-spf13-pflag-e8f29969b682c41a730f8f08b76033b120498464.tar.gz 51007 BLAKE2B da20744103b89b62f7a411a7b210bf33065595a4e46fd80d6e209b833c93dcd5b27b3b6885bbff99812c823ad208da9cd1adb84e719952ab18fb5cd25ca1cf0b SHA512 b12a831c717d0a13486492aa0da170da22ffa47d839116b069bc04b59dc83c7733486753f6820ec94c921de52f53d3a1687e10bb6f8a4bb1c2e01df25e927fcb
 DIST github.com-square-go-jose-89060dee6a84df9a4dae49f676f0c755037834f1.tar.gz 289746 BLAKE2B cff786ac7a6c39829ffd4d7b7f0fac3893b7c469ca35f008558ca3a7dbfc376fd0166c8ed7becc73d0f8d67b456ca00104f08c8841ff156a9c1f9a6d68d3b25f SHA512 fac5e8d32f93f252b2e64d60f2e4da65a11e9408ac4db0afdb3f2357a814cb3992ade307bc8bec8799703c0cb63d05f7d4eaa19e13bab6402b50c1cd246bc50e
 DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613
 DIST helm-2.14.3.tar.gz 1242779 BLAKE2B 8c16da15b54974b837397784734fa8bcf53240d075261a7dceecc6fb6cd172d72ba0d060d55001a87b5910b1b715646729b10e689ee6a1602aa26a4bf56013a7 SHA512 80f6c437235ca0d0c8f330135d689d2d5a9414d166717f72d8c3e2952c35f33fe621579e221078e65e2c5cc648e44ef037356b7ac18bce985daf642493ec4297
+DIST helm-2.15.1.tar.gz 1274091 BLAKE2B 028bf422e4d74153ad41353a4f49b7fe8642e766c50a2ae0b08fc60694d595d8f247bfc4d04430848a5342fc96df4c6a2dca044ed17b3ca9a12e5a623b8e1ac0 SHA512 ad4a4523e8aa57f939672a1ed9b19966e04bb6c557ec69ee5b363d0e4f0e4295798e4fe1f448878ffe8f13a6a5c56fd3b49795872b4b1fe45f2779331db9f9ed
+DIST helm-2.15.2.tar.gz 1276291 BLAKE2B 8dc01d20f179e2c78a833f3c2b5e7633fdf87713b68f3b1a1ec91ce0129031730b913b4b6a4e5339f9d450b77f304eee4f7bc11fc9b74e457e23413b7b9d237f SHA512 f25d5dd55444d5e8b2821600e0419be71e4dc39c4cbf73c203cdadeb33721ba2925481eb9504e33f52eb8f0ec03ae1e05ef8bee4b29e305d092bac1246ff50f3
 EBUILD helm-2.14.3.ebuild 9531 BLAKE2B ed454f1b092dfee9a4f160f769bf909d67c03f68f997d544cd88ff8851f860c47a85635931b6a24420fbb73fd5209ca1755d4cf3f1110ae60e3a72525408e4d5 SHA512 aa53e762ebc4747d231e9fb5383a985b53182e98416a4a154dcd3ed98cb0d389e154fc93117d2e4d2ffb8a42025c94c4008675e13dc914d9e4c2d4c5bf19fe5f
+EBUILD helm-2.15.1.ebuild 9760 BLAKE2B f11be52355fe5bdf47bd741fee22fb87fe1f6e1fb5858ef6a6e0ff7165b355b86cea37e3d8c25dac4cab72d7da38578ee90319b9a951a12ffb2905ce47cf0cf9 SHA512 3600c458d76dbcd322521a1b1b4144fd4cf2bfeb4ef454f831b988a62ced59785813b9d6feb3869d0e9c50780b76d9cf39d6d3db715b1b7a2d47a865bb88f98e
+EBUILD helm-2.15.2.ebuild 9760 BLAKE2B fce9d4f0226454098cc10c29c6d57eff1ee69ed8294b616ce0c311b7ab82cde7e869a88ccd567f6cc1db6c812e7b2928c952e6eaeacd309986e14e655b964b5a SHA512 bbaecdffe0908191a57d4d065327c18577f1092c8d20df336de5db84c5e6dda6a41a9679c1fb1b1c1b2607d54cf59a043574cab104b9e49bb7afc5d65b3e57db
 MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
diff --git a/app-admin/helm/helm-2.15.1.ebuild b/app-admin/helm/helm-2.15.1.ebuild
new file mode 100644
index 000000000000..dc055f1bf306
--- /dev/null
+++ b/app-admin/helm/helm-2.15.1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+MY_PV=${PV/_rc/-rc.}
+
+EGO_VENDOR=(
+"cloud.google.com/go 0ebda48a7f143b1cce9eb37a8c1106ac762a3430 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
+"github.com/Azure/go-autorest 1ffcc8896ef6dfe022d90a4317d866f925cf0f9e"
+"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
+"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
+"github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/docker/docker be7ac8be2ae072032a4005e8f232be3fc57e4127"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
+"github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577"
+"github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d23f618feb6dbb"
+"github.com/go-openapi/jsonpointer ef5f0afec364d3b9396b7b77b43dbe26bf1f8004"
+"github.com/go-openapi/jsonreference 8483a886a90412cd6858df4ea3483dce9c8e35a3"
+"github.com/go-openapi/spec 5bae59e25b21498baea7f9d46e9c147ec106a42e"
+"github.com/go-openapi/swag 5899d5c5e619fda5fa86e14795a835f473ca284c"
+"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/go-cmp 6f77996f0c42f7b84e5a2b252227263f93432e9b"
+"github.com/google/gofuzz 24818f796faf91cd76ec7bddd72458fbced7a6c1"
+"github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c74f71af0538a4"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud c818fa66e4c88b30db28038fe3f18f2f4a0db9a8"
+"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
+"github.com/hashicorp/golang-lru 20f1fb78b0740ba8c3cb143a61e86ba5c8669768"
+"github.com/huandu/xstrings f02667b379e2fb5916c3cda2cf31e0eb885d79f8"
+"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/jmoiron/sqlx d161d7a76b5661016ad0b085869f77fd410f3e6a"
+"github.com/json-iterator/go ab8a2e0c74be9d3be70b3184d9acc634935ded82"
+"github.com/liggitt/tabwriter 89fcab3d43de07060e4fd4c1547430ed57e87f24"
+"github.com/konsorten/go-windows-terminal-sequences 5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"
+"github.com/lib/pq 88edab0803230a3898347e77b474f8c1820a1f20"
+"github.com/mailru/easyjson 60711f1a8329503b04e1c88535f419d0bb440bff"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/goutils 41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"
+"github.com/Masterminds/semver 805c489aa98f412e79eb308a37996bf9d8b1c91e"
+"github.com/Masterminds/sprig 2691a9cba2adee8d9a60100a1bc49e770f97b7db"
+"github.com/Masterminds/vcs f94282d8632a0620f79f0c6ff0e82604e8c5c85b"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
+"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
+"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+"github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
+"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
+"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/common 4724e9255275ce38f7179b2478abeae4e28c904f"
+"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
+"github.com/PuerkitoBio/purell 0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"
+"github.com/PuerkitoBio/urlesc de5bf2ad457846296e2031421a34e2568e304e35"
+"github.com/rubenv/sql-migrate 1007f53448d75fe14190968f5de4d95ed63ebb83"
+"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/sirupsen/logrus bcd833dfe83d3cebad139e4a29ed79cb2318bf95"
+"github.com/spf13/cobra f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5"
+"github.com/spf13/pflag e8f29969b682c41a730f8f08b76033b120498464"
+"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
+"golang.org/x/crypto e84da0312774c21d64ee2317962ef669b27ffb41 github.com/golang/crypto"
+"golang.org/x/net 65e2d4e15006aab9813ff8769e768bbf4bb667a0 github.com/golang/net"
+"golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
+"golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
+"golang.org/x/sys b90733256f2e882e81d52f9126de08df5615afd9 github.com/golang/sys"
+"golang.org/x/text e6919f6577db79269a6443b9dc46d18f2238fb5d github.com/golang/text"
+"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
+"google.golang.org/appengine 54a98f90d1c46b7731eb8fb305d2a321c30ef610 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc a02b0774206b209466313a0b525d2c738fe407eb github.com/grpc/grpc-go"
+"gopkg.in/gorp.v1 6a667da9c028871f98598d85413e3fc4c6daa52e github.com/go-gorp/gorp"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/square/go-jose.v2 89060dee6a84df9a4dae49f676f0c755037834f1 github.com/square/go-jose"
+"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml"
+"k8s.io/api 7cf5895f2711098d7d9527db0a4a49fb0dff7de2 github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver 14e95df34f1f469647f494f5185a036e26fddcab github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery 1799e75a07195de9460b8ef7300883499f12127b github.com/kubernetes/apimachinery"
+"k8s.io/apiserver 47dc9a115b1874c96c20cea91d02b36e4faa1bb1 github.com/kubernetes/apiserver"
+"k8s.io/client-go 78d2af792babf2dd937ba2e2a8d99c753a5eda89 github.com/kubernetes/client-go"
+"k8s.io/cli-runtime 2090e6d8f84c1db3e23968b0ee97fb677b363fcf github.com/kubernetes/cli-runtime"
+"k8s.io/component-base 185d68e6e6ea654214f444cab8f645ec3af3092e github.com/kubernetes/component-base"
+"k8s.io/klog 89e63fd5117f8c20208186ef85f096703a280c20 github.com/kubernetes/klog"
+"k8s.io/kube-openapi b3a7cee44a305be0a69e1b9ac03018307287e1b0 github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes e8462b5b5dc2584fdcd18e6bcfe9f1e4d970a529 github.com/kubernetes/kubernetes"
+"k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c github.com/kubernetes/utils"
+"sigs.k8s.io/kustomize a6f65144121d1955266b0cd836ce954c04122dc8 github.com/kubernetes-sigs/kustomize"
+"sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 github.com/kubernetes-sigs/yaml"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="cf1de4f8ba70eded310918a8af3a96bfe8e7683b"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.12"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+	popd || die
+	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} bin/tiller
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-admin/helm/helm-2.15.2.ebuild b/app-admin/helm/helm-2.15.2.ebuild
new file mode 100644
index 000000000000..5bc8a3b1f1e9
--- /dev/null
+++ b/app-admin/helm/helm-2.15.2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+MY_PV=${PV/_rc/-rc.}
+
+EGO_VENDOR=(
+"cloud.google.com/go 0ebda48a7f143b1cce9eb37a8c1106ac762a3430 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
+"github.com/Azure/go-autorest 1ffcc8896ef6dfe022d90a4317d866f925cf0f9e"
+"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
+"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
+"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
+"github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/docker/docker be7ac8be2ae072032a4005e8f232be3fc57e4127"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
+"github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577"
+"github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d23f618feb6dbb"
+"github.com/go-openapi/jsonpointer ef5f0afec364d3b9396b7b77b43dbe26bf1f8004"
+"github.com/go-openapi/jsonreference 8483a886a90412cd6858df4ea3483dce9c8e35a3"
+"github.com/go-openapi/spec 5bae59e25b21498baea7f9d46e9c147ec106a42e"
+"github.com/go-openapi/swag 5899d5c5e619fda5fa86e14795a835f473ca284c"
+"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/go-cmp 6f77996f0c42f7b84e5a2b252227263f93432e9b"
+"github.com/google/gofuzz 24818f796faf91cd76ec7bddd72458fbced7a6c1"
+"github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c74f71af0538a4"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud c818fa66e4c88b30db28038fe3f18f2f4a0db9a8"
+"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
+"github.com/hashicorp/golang-lru 20f1fb78b0740ba8c3cb143a61e86ba5c8669768"
+"github.com/huandu/xstrings f02667b379e2fb5916c3cda2cf31e0eb885d79f8"
+"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/jmoiron/sqlx d161d7a76b5661016ad0b085869f77fd410f3e6a"
+"github.com/json-iterator/go ab8a2e0c74be9d3be70b3184d9acc634935ded82"
+"github.com/liggitt/tabwriter 89fcab3d43de07060e4fd4c1547430ed57e87f24"
+"github.com/konsorten/go-windows-terminal-sequences 5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"
+"github.com/lib/pq 88edab0803230a3898347e77b474f8c1820a1f20"
+"github.com/mailru/easyjson 60711f1a8329503b04e1c88535f419d0bb440bff"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/goutils 41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"
+"github.com/Masterminds/semver 805c489aa98f412e79eb308a37996bf9d8b1c91e"
+"github.com/Masterminds/sprig 2691a9cba2adee8d9a60100a1bc49e770f97b7db"
+"github.com/Masterminds/vcs f94282d8632a0620f79f0c6ff0e82604e8c5c85b"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
+"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
+"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+"github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
+"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
+"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/common 4724e9255275ce38f7179b2478abeae4e28c904f"
+"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
+"github.com/PuerkitoBio/purell 0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"
+"github.com/PuerkitoBio/urlesc de5bf2ad457846296e2031421a34e2568e304e35"
+"github.com/rubenv/sql-migrate 1007f53448d75fe14190968f5de4d95ed63ebb83"
+"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/sirupsen/logrus bcd833dfe83d3cebad139e4a29ed79cb2318bf95"
+"github.com/spf13/cobra f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5"
+"github.com/spf13/pflag e8f29969b682c41a730f8f08b76033b120498464"
+"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
+"golang.org/x/crypto e84da0312774c21d64ee2317962ef669b27ffb41 github.com/golang/crypto"
+"golang.org/x/net 65e2d4e15006aab9813ff8769e768bbf4bb667a0 github.com/golang/net"
+"golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
+"golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
+"golang.org/x/sys b90733256f2e882e81d52f9126de08df5615afd9 github.com/golang/sys"
+"golang.org/x/text e6919f6577db79269a6443b9dc46d18f2238fb5d github.com/golang/text"
+"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
+"google.golang.org/appengine 54a98f90d1c46b7731eb8fb305d2a321c30ef610 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc a02b0774206b209466313a0b525d2c738fe407eb github.com/grpc/grpc-go"
+"gopkg.in/gorp.v1 6a667da9c028871f98598d85413e3fc4c6daa52e github.com/go-gorp/gorp"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/square/go-jose.v2 89060dee6a84df9a4dae49f676f0c755037834f1 github.com/square/go-jose"
+"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml"
+"k8s.io/api 7cf5895f2711098d7d9527db0a4a49fb0dff7de2 github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver 14e95df34f1f469647f494f5185a036e26fddcab github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery 1799e75a07195de9460b8ef7300883499f12127b github.com/kubernetes/apimachinery"
+"k8s.io/apiserver 47dc9a115b1874c96c20cea91d02b36e4faa1bb1 github.com/kubernetes/apiserver"
+"k8s.io/client-go 78d2af792babf2dd937ba2e2a8d99c753a5eda89 github.com/kubernetes/client-go"
+"k8s.io/cli-runtime 2090e6d8f84c1db3e23968b0ee97fb677b363fcf github.com/kubernetes/cli-runtime"
+"k8s.io/component-base 185d68e6e6ea654214f444cab8f645ec3af3092e github.com/kubernetes/component-base"
+"k8s.io/klog 89e63fd5117f8c20208186ef85f096703a280c20 github.com/kubernetes/klog"
+"k8s.io/kube-openapi b3a7cee44a305be0a69e1b9ac03018307287e1b0 github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes e8462b5b5dc2584fdcd18e6bcfe9f1e4d970a529 github.com/kubernetes/kubernetes"
+"k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c github.com/kubernetes/utils"
+"sigs.k8s.io/kustomize a6f65144121d1955266b0cd836ce954c04122dc8 github.com/kubernetes-sigs/kustomize"
+"sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 github.com/kubernetes-sigs/yaml"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="8dce272473e5f2a7bf58ce79bb5c3691db54c96b"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.12"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+	popd || die
+	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} bin/tiller
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index a70afd15e96a..0d2505fc932f 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,4 +1,6 @@
 DIST keepassxc-2.4.3-src.tar.xz 3301944 BLAKE2B ba95d5d48049367e7d3c39b5fdc9fc9816dfe2b257530068f229d1b5bd4eb9c137607f63bcce0aac4bc67ed41ee00c0385be800720acfdc3920c44444cade180 SHA512 893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d
+DIST keepassxc-2.5.0-src.tar.xz 6752776 BLAKE2B 90c82d6a3c8144797fc0cd379bbb7e6745cd4512a47bd04eb61b52205b6efe3ad8036a0f2c0012de4e710b6184526916ac4a4453bca90e18ccd9e6db1b86e9e3 SHA512 45f76491892ee5377eb803079ee6db2987d66e569c8c53ebc706cb51a4b8f37675801df484f03d486803de2675a3a46bed5d2b211ff7be0b83daf9c2f8607d00
 EBUILD keepassxc-2.4.3-r1.ebuild 2135 BLAKE2B 499b397116dcde99805b4afa4b38b4c25a8b3121e4cd8fe473cb584e295a77ad6ab36a47cfaf447cf09bfb0d12f45bd649e7cb4e90c031ab4dd68b9b04565787 SHA512 9f2651697c320325e7dc9aba2cbb9cc6c01173a2c82072b9df13b9a8292e841bbcd059ef95c21b52ffec1c0155b3c9787cd303512139a9db38b00274edaa9c36
-EBUILD keepassxc-9999.ebuild 2137 BLAKE2B 58f0826e47b23ce6c2d142c315f7c86ffef47d7752627363b4218d58b5ac414cb2f75cb36c8aeef4ad829223ec054e7fa08e4151bc1bb6c0e1d867a420d77da5 SHA512 2b27245a7d84f720b3dd28eecf75a2d5b36ecfb41c67138bca189ded563e03ddee03ab87d7229fce937f22696bf1f4a792f3924854c75b7f8a9406e57559dc09
+EBUILD keepassxc-2.5.0.ebuild 2163 BLAKE2B 4b03f6d0a3bac167f66a5c8122cdadec36438a798db8336f8ee109f818431fdfb6ae5ab625c171800942a30b5a6395b6eab98e0f24e5805106753ed166919fd2 SHA512 fdad7db0660f23091b54c216311ef482565c7332ada2eaacfbaa49b5d9686b41619f29265184686742383be66af8cdea585f98bc4f5795e9badb5ddaf0973b46
+EBUILD keepassxc-9999.ebuild 2163 BLAKE2B 4b03f6d0a3bac167f66a5c8122cdadec36438a798db8336f8ee109f818431fdfb6ae5ab625c171800942a30b5a6395b6eab98e0f24e5805106753ed166919fd2 SHA512 fdad7db0660f23091b54c216311ef482565c7332ada2eaacfbaa49b5d9686b41619f29265184686742383be66af8cdea585f98bc4f5795e9badb5ddaf0973b46
 MISC metadata.xml 960 BLAKE2B 63a61f81e372efa1d1a4118f8353818eb28f4d9b0e7c87c5cb6e7a4ee8c9856ae3c7ee981e2777d3263725338581834f294022d052397dffbe98db2b5ba36895 SHA512 85ad2302913936ce51a455ae15e2d9ca7a68d26fc16819f46ab494b6aaafecdf32f74596b47c1b5a3cea56bfc49bf7021dbb4b770efb8f362386a67c88ea2404
diff --git a/app-admin/keepassxc/keepassxc-2.5.0.ebuild b/app-admin/keepassxc/keepassxc-2.5.0.ebuild
new file mode 100644
index 000000000000..20be986b6fde
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.5.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org"
+
+if [[ "${PV}" != 9999 ]] ; then
+	if [[ "${PV}" == *_beta* ]] ; then
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${P/_/-}"
+	else
+		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+		KEYWORDS="~amd64 ~x86"
+	fi
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="autotype browser debug keeshare +network test yubikey"
+
+RDEPEND="
+	app-crypt/argon2:=
+	dev-libs/libgcrypt:=
+	>=dev-libs/libsodium-1.0.12:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-gfx/qrencode:=
+	sys-libs/zlib:=
+	autotype? (
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXtst
+	)
+	browser? ( >=dev-libs/libsodium-1.0.12 )
+	keeshare? ( dev-libs/quazip )
+	yubikey? ( sys-auth/ykpers )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+"
+
+# Not a runtime dependency but still needed (see bug #667092)
+PDEPEND="
+	x11-misc/xsel
+"
+
+src_prepare() {
+	 use test || \
+		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
+
+	 cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_GUI_TESTS=OFF
+		-DWITH_TESTS="$(usex test)"
+		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_FDOSECRETS=ON
+		-DWITH_XC_KEESHARE="$(usex keeshare)"
+		-DWITH_XC_NETWORKING="$(usex network)"
+		-DWITH_XC_SSHAGENT=ON
+		-DWITH_XC_UPDATECHECK=OFF
+		-DWITH_XC_YUBIKEY="$(usex yubikey)"
+	)
+	if [[ "${PV}" == *_beta* ]] ; then
+		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+	fi
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 20cd5799cdeb..20be986b6fde 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -74,6 +74,7 @@ src_configure() {
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
 		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_FDOSECRETS=ON
 		-DWITH_XC_KEESHARE="$(usex keeshare)"
 		-DWITH_XC_NETWORKING="$(usex network)"
 		-DWITH_XC_SSHAGENT=ON
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index 3db38ff5c15d..bf2096579561 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -22,5 +22,5 @@ DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b
 DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
 DIST github.com-spf13-viper-v1.0.0.tar.gz 30804 BLAKE2B 9f88f872c1bcd0f3590f7b4bbc35e03b3d3fec5233eeff0ed1cc1cd68dff1b29a5170492683f864a8b66fddd57722cac2ecb06a0035f6b4dc40a636025e0ccac SHA512 a9264fb09dd9d069f3ec1543a32c55a1268e6b33c3715da9116fe6e23f7b6f179785331f07f13cc03db29eb38f017eb5e8569e144bcaafbd73801857e0387504
 DIST kube-bench-0.0.34.tar.gz 254837 BLAKE2B a7606ec52741bb0551a9073e1f58d23db6571c7d7ad6775ebe13ff32396530fd03b7845ede40baec6bea6cb437426454cef624b1c711bd5fef242a772e14e7e3 SHA512 4df1b88ae3d6425dff7473066bfa6561f32e5ef6f137984f7a90e713f3dd1e59f8551353cbc3e86fe35c6cd3793d2acc13b9db426bd7930d22d1a06e9c7f4156
-EBUILD kube-bench-0.0.34.ebuild 2298 BLAKE2B f1ae1ade7f9c6f80353c1088b5cef0f73f7469f9497fc4853b3c4165218232282401a42ad208a00ba1e520761aab5586a2af14b00b6a73459d2037c39f61b8b7 SHA512 cb86130b6b2ae9fb82ba94aa443414e4bfd776dc527b0137bc29776ca811cd9f919d799f25a5ab60ab3dbe1086e89a849fe244d8a1abb2c9c6dcfbaa687688dd
+EBUILD kube-bench-0.0.34.ebuild 2313 BLAKE2B 1d824b63a5e504d63aab8ccf102d8fea764b6482c48c6def5ecf20b2bff24b440e453b73a2f2424ff7f673bcb355945a3d72a7412e25c538d742f876b537af1d SHA512 d98a5a4eda61429928e415f7505db1a28d35e351fd4d581a5bd5cd65aaa8b1acf55f2d8ebdedcb8e1c101af15a2eaca377c9763a89b75bee64eec0d3f44a8f56
 MISC metadata.xml 333 BLAKE2B c8437977b6a07e36929b13f767af0f09158bedd1ea7a0bee1da52dd1b83acb2929248c3c385a5fba14362721ab6871d399ddfba53d15bbe84a87af0ad771b73b SHA512 295cae435555436e9091195ac585fd30d022aba0b76244c85927f19f14b38dde95fb14192c832f00f52e3cf71aa3d95f7527b22a90690f85206178c49d620c8d
diff --git a/app-admin/kube-bench/kube-bench-0.0.34.ebuild b/app-admin/kube-bench/kube-bench-0.0.34.ebuild
index cf7b9e1eb726..5b943f248d2e 100644
--- a/app-admin/kube-bench/kube-bench-0.0.34.ebuild
+++ b/app-admin/kube-bench/kube-bench-0.0.34.ebuild
@@ -49,7 +49,7 @@ RESTRICT="test"
 
 src_compile() {
 	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -mod vendor -v -ldflags "-X github.com/aquasecurity/kube-bench/cmd.KubeBenchVersion=${PV}" -o ${PN} . || die
+	GO111MODULE=on GOPATH="${S}" go build -mod vendor -v -ldflags "-X github.com/aquasecurity/kube-bench/cmd.KubeBenchVersion=${PV}" -o ${PN} . || die
 	popd || die
 }
 
diff --git a/app-admin/linux-bench/Manifest b/app-admin/linux-bench/Manifest
new file mode 100644
index 000000000000..56aac315d692
--- /dev/null
+++ b/app-admin/linux-bench/Manifest
@@ -0,0 +1,23 @@
+DIST github.com-aquasecurity-bench-common-81f08528fa03.tar.gz 18981 BLAKE2B 6579a12622870e537a16f467bcfed71ed1c791641e1948caee10a69f8ff7fc28a3f73e48beb8d3b1d274428e498720f528237d07b28fe1319164ab1339852d0e SHA512 b01f88ddb7c119dc9d7e4f7f3e2d9c80b4046dcd65c6d5f2640d28c235c04fbe03b348032584350485f6323920f692cd96ff73e4140faaeb26d7d5b6eb24671f
+DIST github.com-fatih-color-v1.7.0.tar.gz 816449 BLAKE2B f006f51cbd1a0288380b339d7d2b493e447aa1e6bd783f11de5670d4db6ff8c1463cbe957a04127c1f24186a9362be8c40ecdf4394cbbc0e2c6c2cb598c012ac SHA512 ee5668ce828ad3e5461c54d971aee4b10a578f697717010d60fdda641948430816e74580563dfea6a4c66a9840175ff5b63c2ca9cf1af213cfac5be7b8ddac36
+DIST github.com-fsnotify-fsnotify-v1.4.7.tar.gz 31139 BLAKE2B f2d0aaabfad525fb640beba78991a858ad23203a557a69fc15d2f017b2a693c64c244de435682b1cd9d59e89a97e4ba60c7f95fa99a6145a9dea73b0f334936e SHA512 840943043c49c837641f04b976f2ba610fc03bd31030ca6442744d51fa9241da1905730ea11466e249a5bd37437f1e2a433a012a64ce872a1562c941bd5bfcbf
+DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
+DIST github.com-golang-glog-23def4e6c14b.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
+DIST github.com-golang-sys-a9d3bda3a223.tar.gz 1245170 BLAKE2B 62fd7fea3ab8426f9092e6758573c1fcd8915c776b7f44521d7d82ee42bbe5d4323a8813f1d39c336da6bce3525b4eff1b60e024cbf037738268dc7151024f4d SHA512 79e81f5fc94fe47ce3e794a80e888d09e3d9a192a65fd234a177e1665fde5a9029d1197160edfb5df7e479313665536a1e6445428d41d0c33f5319aa5d79cf51
+DIST github.com-golang-text-v0.3.0.tar.gz 6102619 BLAKE2B c92e68014a8c157d76741c02acd708771d66bd3dda5b19285f5aa3e073e0fe3fccb9054744d35ea62b681ae4421bb7489238d6868f9314fb26f88e002287abe8 SHA512 bd60dfaa7d9dbfca171a3ba40b51f5663c01257cf3b12b618d35689a97ab2212d316d5716ff09681bf40b099f7e20a0e0df8cfc065699cb6a07ad1dc2e2bc189
+DIST github.com-hashicorp-hcl-v1.0.0.tar.gz 70658 BLAKE2B f28dbe8171ce4fa94f57e8bfa8ffe7e16e57147a6a4525a8b5d31d3a47e817e056a85bdb8b91d56be202db27a29f37496f73014d1d97c5d55ce07b89f7ff6848 SHA512 044e3ba2a44a1abd9c851d4ec1f5c541663f8cd7f705c46c6ae2c377fae6df6315a6596c42f391e8239b61f0f0f6caed8d4156f8875cbddfbc7bcb78eaeb466f
+DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
+DIST github.com-magiconair-properties-v1.8.0.tar.gz 29504 BLAKE2B 667b8e60ed2ff538a84f199e43c75d37998d6fcb2e9c3cd6b3e069ba9950d45b4cd775797879467ef86b701391078582be2100fe32fbfc4c794f728fb7f38527 SHA512 9790debc8def1a7eae5a1e530ca68e53e562e622b374752f69e40aa508a88b58b95e15a503a8314e7d4f71a42411d1ba462687184c2b251eb41b5ee3f12ce95d
+DIST github.com-mattn-go-colorable-v0.1.2.tar.gz 8518 BLAKE2B 176ecf55b90c106f4801aeee6d03a53eac495d23ccdf70e8276fb9f909ba144e2b59643bf4dd708131abb0ee3d1ca08c334f2accf0c4ad31729d46b8a7509a09 SHA512 fec4d5e9c5d4a259e81fa62d5188bfa6c5309e9113c0d77803f04702c482d4dc4b7ca4ae079a0aa1d8f789b48ad6dd2dc4f86074e8fa51e0fce3214fe88149c8
+DIST github.com-mattn-go-isatty-v0.0.8.tar.gz 3564 BLAKE2B da50a8739bd33249bca2231509948da94d5ac61787e5ac84af17b04a5b76cc751d2d3ab00d1967e1bc71365060835c6d668a8cea607eccd5a4f95bef8cafb240 SHA512 e9dc9181dfa9780bffd5b1aefbee9028d8a38c2c8feef6a0ca28952b57948a41582dc4c372394bdc76f8081490283d055f89cb7a8792418b3ee55a85c32a5b69
+DIST github.com-mitchellh-mapstructure-v1.1.2.tar.gz 20980 BLAKE2B 6792e875503b852773e8f062808f7bfa5a7e77ab4ec9012865750a5e15a13a6338490e7dd865545b8055c043a9f016cdabe6fc71c031a1210eb3a5e0c28a3394 SHA512 86c9fb9494652dd391b67185aae44b9cb14fcf96ba9ff62ed95c8952b01f6485154102e5883d16c6007d18a02bbf34e5937e2842df72c0244d48b22ee6aa9fe3
+DIST github.com-pelletier-go-toml-v1.2.0.tar.gz 57496 BLAKE2B 48ffbd6b1b06df31b89ccda4d5aa7f8b23215a2532aab102612231dcdda3fcad4c277f15a56894e10bb94cb3c891f50e87ef9c0e6c7e1f3f840d14bd85634b25 SHA512 07791bbc0e578ab383776d715942cd4fa723e5fa6f9879676b6820166ca9b776651fd62a0584cbcc52d2ba87cecf18184734ce9b06fb5b490013eb8dff6fbb4d
+DIST github.com-spf13-afero-v1.1.2.tar.gz 45309 BLAKE2B 0de6a204590f40cda8e80495bf57f55827aec4fb0fff58e0ae7d03b25d297edf530af4c8da94f11ad9bd25eb148fb72b083c75d513b8c4802e8d1a557386f101 SHA512 2ea3773346086d7f0e499653649ef9cbe71b5c0ea488b7650630f4262c13fa426522c9f9556ab127c7b8aa2aa97ff0b34cf3a9eba8b7c753ed200292a50a314e
+DIST github.com-spf13-cast-v1.3.0.tar.gz 11085 BLAKE2B f46ad23efac14d599ef7268c033c5f244ea7976982fee02b4d83ae65f91a72150bef359eb24b8c868f8a42ea8a0aeae839dcf82a7646648bf482f2a520704e09 SHA512 4cd15f59860fddbb67055beb15dfb8114ecaad5999a8fb46fbbbdea1cf78eaa094a4893c10b97efc7d2f95509920688659d609623135bf9871e6229043452194
+DIST github.com-spf13-cobra-v0.0.5.tar.gz 111126 BLAKE2B 0f5fe38e3e278603fcc53edfdd72206d7b6850aa3ac4054b4242091949fe327bf80ddc46c20c3df1e644807e5b8882c528ca5d3bc184b9f039038cbe9043835a SHA512 c21a2c935365c74772152e37adea553dc89fd31dae794bd7e8f56d7c9eaafe717e2d0d6f56e1c8d2fe442df445dee9f03bbd30e802e2ac6911babf309b901c04
+DIST github.com-spf13-jwalterweatherman-v1.0.0.tar.gz 6392 BLAKE2B 15ed225aa9eb6afca552a19a7ba22216454a27a29aa9f7ee39758100ff123afe8b10e06fce63bf2f4710fbdcbc5c680d3b4eef1cc3c8d363ce0a9f31ce8a34ca SHA512 13cc90c6f4a9fcdd29610773ada79fa2072223459c824b0f732ed3a6f4c61cb7a65c169f70007d3a08354f0a2e06b67e5257c4b0a0e1989fbc2309e69f7200cf
+DIST github.com-spf13-pflag-v1.0.3.tar.gz 46002 BLAKE2B b7caa90be69c7bb6a36b0da68af309debee6edd6e2596d39e286ebdb10f9f90246736f3af3a35c89ac704e2764d2ac40e76dad09c3147a942200592e3d234916 SHA512 d7121dade4fc06568cfb650a529dda350c60171e97ca405d29b9654a9fd06e453d20f8efc2fd8c51f530cfb0708648b2b2ba06ab40897b262ef2f3baf04d65a7
+DIST github.com-spf13-viper-v1.4.0.tar.gz 44183 BLAKE2B 4294bc3c5076f1305618f4caf5abdfdec200dbd140d48264495319a33c850a99b5bfa406f4987e58ae5b96321044e12235b60ffee018adfc6612daf04870074e SHA512 59d1ac2d84c4e72687df631fcdad723a5ad96e362a851a56fcf2f2dc57b5a9ac03f01f47fd24f5d3b027ffbd011b3981ce3abc21f3b98fcbe04c7f34752d4b01
+DIST linux-bench-0.0.2.tar.gz 73095 BLAKE2B c90b0185886a56a2afe2110c167dd2f7783f2bcdf50670d632ddd4c30f34a8186cb82fc477e6ddd9b9d8fbb22ce19438418dd3db62f8da851a20c04b23f61474 SHA512 acbabcebd5bd79d32863941e501b8e787ff89f92564ce7a0827fe1cde4f6c210bc4a5ff9d9a9e1f5db33b019f215eff3f27869e58ccd23e1eafcb8931dc3f0c9
+EBUILD linux-bench-0.0.2.ebuild 1639 BLAKE2B 8ce45b18d73324c1e377ace972227624a170de7c5ef32eb9f32e665ed5e1ee6ed075f562ef9de4d48a481fd518ece1d6437520fec1004d26092f568b1526541b SHA512 9ebd8c951d589f32a0ba7f42b8380c6d27aa8257efc2d109d9db0e230ee8232cef6be58434aff79fbee40a89cbc141829dec5a3c77ae4f5157dc0b813d6dc8d9
+MISC metadata.xml 334 BLAKE2B 4af62114a3b9a109691781ea413e8ac16d3a4a77d16dc55b8d6c17d294778998bb96f393e57b84f7f3dfee5281fc46de218f979cd6cef7a4147ab1970ae9f9c5 SHA512 3e3beff7662814028797343d2454c7a499862ee4304c5981ae81dd2b606bb01906468a02312fcbb99d7ca78d108da5d35f5769f9132a81b97c5b87af74c67017
diff --git a/app-admin/linux-bench/linux-bench-0.0.2.ebuild b/app-admin/linux-bench/linux-bench-0.0.2.ebuild
new file mode 100644
index 000000000000..b9f23fdaa036
--- /dev/null
+++ b/app-admin/linux-bench/linux-bench-0.0.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/aquasecurity/linux-bench"
+
+EGO_VENDOR=(
+	"github.com/aquasecurity/bench-common 81f08528fa03"
+	"github.com/fatih/color v1.7.0"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/golang/glog 23def4e6c14b"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/magiconair/properties v1.8.0"
+	"github.com/mattn/go-colorable v0.1.2"
+	"github.com/mattn/go-isatty v0.0.8"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/pelletier/go-toml v1.2.0"
+	"github.com/spf13/afero v1.1.2"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cobra v0.0.5"
+	"github.com/spf13/jwalterweatherman v1.0.0"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/viper v1.4.0"
+	"golang.org/x/sys a9d3bda3a223 github.com/golang/sys"
+	"golang.org/x/text v0.3.0 github.com/golang/text"
+	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/aquasecurity/linux-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Bench for Security runs the CIS Distribution-Independent Linux Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/linux-bench"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GO111MODULE=on GOPATH="${S}" go build -mod vendor -v -o ${PN} . || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/${PN}
+	insinto /etc/linux-bench
+	doins -r src/${EGO_PN}/cfg
+}
diff --git a/app-admin/linux-bench/metadata.xml b/app-admin/linux-bench/metadata.xml
new file mode 100644
index 000000000000..9787777fce9a
--- /dev/null
+++ b/app-admin/linux-bench/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">aquasecurity/linux-bench</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 117b57430aa7..60d6751fc12b 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -8,20 +8,17 @@ AUX logstash.initd-r1 2176 BLAKE2B 37c05148d3789c69805ae5151bed5e297d71b9d60d71f
 AUX logstash.initd-r2 1989 BLAKE2B efa16227a2cf1a42f1f9e27e110dae64c7eb6547e22e89a71b3394fe587e0f83468e361d335e28b15a1507959dc26c019ae8ac9bc110f1b8a6896ceb7f3ceecc SHA512 77c69600f22d31e7e08c2d953c99bea8a24ad83c7abdd578526b850ca37c963a91cfd245b70e4ddb8d405135230fbc641768de2dc4dad096a0db3d40313acb2f
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
 DIST logstash-5.6.15.tar.gz 110086992 BLAKE2B 3047259c4bc5d71b072fa004c44953f84860ec53e051641c4efc903e38243e85b8fdebeaf093c01f5410c1f05a78a8d8aa2282fc45cf5fd784a41ea66ff5b196 SHA512 405039ff988aee8878cbeca96ef0fcbadba762f877eaec36c8a75b010e56a943c2951a8f83f9279d7d9fea99c4f8a200c705f784813a2733289336c58c34ca1e
-DIST logstash-6.6.1.tar.gz 169642354 BLAKE2B 335fa036e9f120de5d6588ed18e927ddfb3a94dfcfbc9605fbda3e3eb4da3ba88561d466eb171c85a2deebb3328312ba903616704844e253a7599f75597efbae SHA512 a66f196f160af29492b64efb61b7e3253a4ef45764c5e6226f73c2a216151ff43f6d344c2e3340a1a9ddb8b00e61f14c65d5dd0c14d69421f4efa3542445fe4f
-DIST logstash-6.8.1.tar.gz 172031559 BLAKE2B dcb0d37ce0325affa86c3cba546dae262ae8436cc2234eb977a359498f923620cb1ce4bc79a5a5c5d7afe6b7b3b3e938791baf44ce25ba967f5738ea5cb15669 SHA512 3f3a90cbd185a5efaefbe2004f1265ea5d1fbd3371820897b19d8b9b8fcc6d5522bd97ef4150fd963a376ce7726d9ab4d62fa9e2bc718a2c8bb69dd7e964c378
-DIST logstash-6.8.3.tar.gz 172067513 BLAKE2B e91661009b1977879117c814f1b17a703848bbf09093ed0eb7c91007254299b2935f2cb36374ee0e9ebb71cc3f61521e96db51d4e4f7fa1612cc04cd08cf5201 SHA512 b441619570af6043c914744d32e5a7fef95ed24103693990c9ca6b45aca717678a7916e18a08d7903b907aabda4fab75ef3a4f8ab0e0ea4bea4fc4e167db4dcf
+DIST logstash-6.8.4.tar.gz 172186036 BLAKE2B b1219dab8dd1f88d01def54306ae09b3e9c1657adc7487e5c024f69e51ce24e66a9a713c8db357f84b19fda5ee3f824845858e34e8b75b8025f87b4d27b69b5d SHA512 6dc33099be2ee3670c00cb4162e3924a97e5548c1b978a50fe3d7ed0745c7f0a3422849c04e3d64f999ed9dcf8efee3fba05d9643fbb759c0e27643235667ee9
 DIST logstash-7.2.0.tar.gz 171299740 BLAKE2B cfdbabc11d6e0d182ea7bdff1d30ca3a5bfbfe036f952c0d944c105f563dfa1b444c8dd1e9f023301abfbf9a86708d6bde2689b462b28f00a34d09f78fe3898c SHA512 955358d504b6626ba9ac88a2d65b161044180c3085f8dbaedfb8b85b092ecc65721bbda73b750f7d8b78a052828a54f7ed7ad16ee7ec72f3ed5e428ba291a173
 DIST logstash-7.3.2.tar.gz 171783584 BLAKE2B 0a936edaa57ae5552b79bead754b75c8a8c7a920461b720c58dc8e32c2aae342f3639955b63264e8704093c0d30d5d801f468d1b391e9efb2c5d605dcb2ebf5e SHA512 311b849cb8e1f336908aefa1cb2f0e2d76b696410346dd3fa0560313f9cbd3f098c93aee68c9fead736a3edb39ca543161eb7de115597e034eb0a015904c7417
-DIST logstash-oss-6.6.1.tar.gz 169512439 BLAKE2B 54a18deda80079c9bf2de39936737689d696a4ddc6f8a7ae375d48817ea127f1eb83f1ef50a18b573709446fc3deb858f53a5aff6411329b52ef0316859a7f03 SHA512 7fbe960e615c3c6b6715bd63debd3db869abe29bfdc94d4947290b822fe1d858e289548dbda266c8ad6d25745e63a788de0c83566121faa0d3027642b0f3d108
-DIST logstash-oss-6.8.1.tar.gz 171901409 BLAKE2B bff3b96bcf3f53450e1279f633788af7d7a1d18b18305741c87c6b2c7e9e24db0664798c7040116bfbf72c9714bad867a00a3f37fe8eb436ce1948bb84a2096f SHA512 d928f9eaa2278c76cbdec46349bf1b924d3f5a9f668c834c882158decf52d44f14dcc356a491cc935dd3717f4a76b8a23eac1173ab28f44cdb32a57ab298fbcd
-DIST logstash-oss-6.8.3.tar.gz 171937304 BLAKE2B 25dc90c6223d2481ee7cb4fb5bc9019aff6aa6e01bd56e33758842898a273de5fbec1e939dde91ceb719b41ea0222ab9ce8548cece56fd7c07d398a30b329a1d SHA512 24efed274cf1adf5e538048d1d9c2c5d252fd8671c167f2bf28b1ecbbec353e4b41729e722b3aeadfa72835717bad7f4bd1638ddedf53827dd5d9826e234e8b1
+DIST logstash-7.4.1.tar.gz 173284835 BLAKE2B d1d3fe199175d57e4b47fe50f26d6d54486182d6e69b6e50cccceecf1cf02484c6d9f1a8cd0ef72ea82b1da9550787cb5ac37bbf93a91b4d0518dde415479a1a SHA512 c89d530f16e5c6953d97708b6ff2f46bbb518a93652f11cad988841a73bf5862beb4a5326de1e63d0ffb65a498fc33235ab4fc950e8087aed5815b3a65e81ef6
+DIST logstash-oss-6.8.4.tar.gz 172055711 BLAKE2B 696769dbb94ed9a6c9a84fb54ba35fedff360bff39c61ba7ef6a9a5f00e59dbc3c8d15f6b9080e39ce87f17553f04b831f029e8f779c75f0f28b673a2aa2e697 SHA512 6f7fe35f6e84417332093d089dc737f89737f30718d5ce843dfe6d3ba85d098e2a01da6c191729b68a7a326d4d65f6bcbdfeb656d5120401478dacb96b1f0671
 DIST logstash-oss-7.2.0.tar.gz 171128040 BLAKE2B f0f3d4f0d5228918d8435c521d10ff5070e23561c25ce28e8d58997d499a7c7697354c1fb1cb70bf2bd832ad50c04afb00cbde4b3053f9f24d2619f3fbfffbdf SHA512 24120740bc727b6da50b865bb85bf61f013a38b6679d679ecc75a73c69766a5133fd47ad99fa0220d5dc6cceb506fbde206787adcee31483288c68c228edd1fd
 DIST logstash-oss-7.3.2.tar.gz 171613705 BLAKE2B e1a0c512cadd5855e1a1524e1c44214aeb792361493406c5cacde1bd72243178d03113c08a1fe0d1c2212cec5a2947074911bf19eaaedc636db754081c3fe32c SHA512 3aac74966b27d0d551f49c78c457b18a1a76d0e5a7b2fa1dc9a7776927145b28a6c02f51e4dd7e9ca49dabe5f63effd4227fc6980e522ab7da4ef847da6bda12
+DIST logstash-oss-7.4.1.tar.gz 173114578 BLAKE2B 5530e3275be095168d845381ac2ef92c3fa2e3783b7d9749d88465239751bc74d0483a51fd61ac75f46a569201c5fd34bd1553db32ca84e911dbf34ddd5e6b14 SHA512 26defcb5777c044030081e98cc47a040c72c7a8261f8f2cb9349181ec6a375b4969e1fbd00c8046da2c3fae5a6dea45e53c41d1c84325cd75af766f6a1d4b3c3
 EBUILD logstash-bin-5.6.15.ebuild 2195 BLAKE2B 1ef9e7d8a825109a85e850c2e9b971c3b16d435f1a0e3dce40e18b48f64c5b83a3cedd0d85a15d422a3accccb0ffcbe79b2a0812fda24c04fd0f07a0e37b9436 SHA512 6026cb3d76dbab56a4a495b1bc3abea2d0c4c731261047e76acf792840f3deb1fdd0fd181b5b6a599f2056f22b76920e7844f1e76516919c7404c1d10e1b7259
-EBUILD logstash-bin-6.6.1.ebuild 2185 BLAKE2B c0ca9f44ca02db43d7b6b414f866f5d7a1eed19c44f45874a1df6a9171c0327b971878bcf74bb4028903f23bd2521464bac662cecd89bbacfcc32d6e88d4b4b0 SHA512 0088d7e185bbf58af1c4880aaac299f3a4a93ee1ecd3092aa9548d60767faaa963bbcc422ff40e8b8905b843da25d73dbb0b75bfffa19261306668fd9e414c43
-EBUILD logstash-bin-6.8.1.ebuild 2106 BLAKE2B 8b04abf9b4395e60882de2d5c482bb3ee17f1ec2446a5d2c24feda677025c0662580c277334d2f7eeb0a5b61fe52bc1513a79b1a55f85d33ebbd75829307b86f SHA512 c56a7c1c3eb973cbaf895206270f80a3ed3c9ccec37c9102b5cee1f6477a1952b6a93310f41046e12d021580862dd96fb1b658798126f00535abddb4d738853f
-EBUILD logstash-bin-6.8.3.ebuild 2099 BLAKE2B e7cd6249e76d9e3629cc640542aef942ad893d4643c803a10c789a1070775996364aa0caff337bf2eb18cdd2bdd534941a5637f23e44d370a87bc017bc931fde SHA512 aadfd4248e27c0c0134a7c7705dc3c8cfb9b031a963214174664c8c2438ba8e1e466025337fc9a9a531ff5f6bc16b7e1f25d3362205b0ca2793bdb8482a9e202
+EBUILD logstash-bin-6.8.4.ebuild 2099 BLAKE2B e7cd6249e76d9e3629cc640542aef942ad893d4643c803a10c789a1070775996364aa0caff337bf2eb18cdd2bdd534941a5637f23e44d370a87bc017bc931fde SHA512 aadfd4248e27c0c0134a7c7705dc3c8cfb9b031a963214174664c8c2438ba8e1e466025337fc9a9a531ff5f6bc16b7e1f25d3362205b0ca2793bdb8482a9e202
 EBUILD logstash-bin-7.2.0.ebuild 2102 BLAKE2B 4859b52ecbe2d3cb0fa31768cbfcfe59ff4ab1ccfb70ed1b0b30edf33415a7107a246ab902fc3c42897804482dd91a25bd8da6af29374c424bc53e700ed1b797 SHA512 3e346deb2bccc47fa55d2de9afbc6bea15f28d235e93fae323620a24a70aa6671072ab90f778d3157ba74c860056a1f76d5ad0ac678b6d658bd49ffbb8fdc3dc
 EBUILD logstash-bin-7.3.2.ebuild 2095 BLAKE2B 80aa953c2657cc0218b18df01e67279384fcc57f8fb3931121c787caf0c198e9d87c138bc2c6d809d0766fd67e8e5046d10ca0d4826047f845d89931bf63e5b5 SHA512 4db211818a819557d904ced91163c2bdfeb3ed9a1ae5ecc9873c1973b5137aca526164fe04c35984b9f97a56564c3e2627d4b952775dd3b0ca220c2cca37fe54
+EBUILD logstash-bin-7.4.1.ebuild 2095 BLAKE2B 80aa953c2657cc0218b18df01e67279384fcc57f8fb3931121c787caf0c198e9d87c138bc2c6d809d0766fd67e8e5046d10ca0d4826047f845d89931bf63e5b5 SHA512 4db211818a819557d904ced91163c2bdfeb3ed9a1ae5ecc9873c1973b5137aca526164fe04c35984b9f97a56564c3e2627d4b952775dd3b0ca220c2cca37fe54
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-6.6.1.ebuild b/app-admin/logstash-bin/logstash-bin-6.6.1.ebuild
deleted file mode 100644
index 97dc32bb2def..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.6.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 user
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="virtual/jre:1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/lib/${MY_PN}"
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT%/}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.3.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.4.ebuild
index bc5b7769f9ee..bc5b7769f9ee 100644
--- a/app-admin/logstash-bin/logstash-bin-6.8.3.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.8.4.ebuild
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild b/app-admin/logstash-bin/logstash-bin-7.4.1.ebuild
index 05b243d87853..7b2c36e2a632 100644
--- a/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.4.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-inherit java-pkg-2 user
+inherit java-pkg-2
 
 MY_PN="${PN%-bin}"
 MY_P="${MY_PN}-${PV}"
@@ -24,7 +24,7 @@ QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
 
 RDEPEND="acct-group/logstash
 	acct-user/logstash
-	virtual/jre:1.8"
+	virtual/jre"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index f4eed3777c5d..1c527d9d276e 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -4,6 +4,8 @@ AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a
 AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84e914a82cce16782b2c9dfdc83123d609cabd4e9e60eb38a9e43fe7a22a2afca8f53c3dc8e65ac87 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75
 DIST mcelog-162.tar.gz 308347 BLAKE2B bd438e85ea793c6c5ce4d561f0400e91b101a010cce7f937751a11a0a974fec49db7e9d768fc50db68a91c973c90c8ab1b4ffa80964cb6fde860b9f2ac217435 SHA512 d61a0b7ad3974098963edde1e9e9acdf4dbd1a025577b7044bafc17302abd19080c8145a2700c691400af0768ff4b6833d47697e1478c5bef8831f7f8b61ae48
 DIST mcelog-164.tar.gz 308393 BLAKE2B da1f425faa88eb8377eb11c3e13aa6fd4c0b4f4d3b02afc2fba8e4137979bb5619b075b0d0ecd80ec6059c9eb912376291e56e667bf7b838bd2f641c4a6c175f SHA512 10c8c580b10caa6d40c2a4887cb9e9ec07eb81a353d24a4d1a89ad8ec5cc29f7976c26335f077393794b060e62b5cbbe348c64567a3cf3fabc3ec5c3fe59da5a
+DIST mcelog-165.tar.gz 308405 BLAKE2B 8e6cf59bfa3a5c667c1b709f9c0c5c82f8710ff1aa7c5758c1573a2c832030bb31735f8dd5a53fab26745739cdfac3001cb7a752df579cf452874d19e9e7da65 SHA512 466a07a90679380783524854934d6d66cbc53474616de9141cd36dd2a3b757cacccf1db50c8d4cd54763cea63ac9c09daf6e27ccf3bcf17d62da7fc3396281eb
 EBUILD mcelog-162.ebuild 1367 BLAKE2B 7fb646e842316273c540c327b2bbdc1c7c7f77f8e4150406f56bf207b581f1e9c05eb19c93a00ca924707f4af4b263665e81ca0f771e635340dd6ebfb6e1c9e6 SHA512 8d1e0e8caa4a685c1323a52c02a81f8de194c69fda836a3f70bba95b7c95fc18914c01cd2c0b76a25c849df4011c422216944684d1c9dc09774590ae788a3707
 EBUILD mcelog-164.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
+EBUILD mcelog-165.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
 MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/mcelog-165.ebuild b/app-admin/mcelog/mcelog-165.ebuild
new file mode 100644
index 000000000000..557b542b3a9f
--- /dev/null
+++ b/app-admin/mcelog/mcelog-165.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	insinto /etc/cron.daily
+	newins ${PN}.cron ${PN}
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodoc *.pdf
+}
+
+pkg_postinst() {
+	einfo "The default configuration set is now installed in /etc/${PN}"
+	einfo "you might want to edit those files."
+	einfo
+	einfo "A sample cronjob is installed into /etc/cron.daily"
+	einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 7918a9929ec5..eb4e829d79f0 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -3,11 +3,15 @@ DIST mongo-tools-3.6.14.tar.gz 4990861 BLAKE2B 13394a7222e73c0912e7d9d04205b25e5
 DIST mongo-tools-3.6.8.tar.gz 4723878 BLAKE2B a1693024d60f69d25c268eaaa30a478b1e4c0042c5fb7a3fd6252ed00aef2fee3fba94516fe825165a1a57887ed38e4fbce488c48ddd4f45349f0b7a1b244020 SHA512 359e8ce2d847d005d48ff12bc2e8af73213d81cd1521d2b5b5ac94792468218248bebbe808e1bd8fd49234eab8480608f294c1b63f317aed58f456b84ef17dcf
 DIST mongo-tools-4.0.10.tar.gz 11134721 BLAKE2B f25e834622db8a2cea1658d9396b747666dee6a0e6471f5fcf351431f716735227b19f854c228ebb9ace8a7c27b8cdf83f8a5009107191aa6dd27c1a4c037505 SHA512 12764b2e2016ae3ab3f0ed1f5b9be9ce10e466c53b408ad2c01b26bdf39ca41a358acd07aea5847db2b40e3e89293f77efcd2b310e4e2bf3071873abf1b20f49
 DIST mongo-tools-4.0.12.tar.gz 11134652 BLAKE2B d3c9703046dc577b85cefe1185678e0029411ddd44d0648f9b09fc3ab41e3661891d18afd83bf1a148dc4c9208895f444c115948e515e09dfa3062e89d98fc24 SHA512 068d8c456386caddcce23fa8917ffecdc9b5c39fb6794c5cd1d9099be1f127ecf680b006055581dc3d90507072a87788b46be7410f0dbede42da64c664b77ced
+DIST mongo-tools-4.0.13.tar.gz 11134653 BLAKE2B b963f2a4ee598f6716c6c678df029040f57e2ad17b0e025139d3ac5049aacefbf5342a455ac58161c11df734da4fe4f62f021c1544eee3542af3aed77a65e6d2 SHA512 0694c7ac5743b04d927e27eb913df1b9b55c6c7a26d2a4dc52af8d2e0a6934416f416da91c57e1e61804ae855ec4bd8facabacf0754f9f924f21602737f29e3c
 DIST mongo-tools-4.2.0.tar.gz 14402906 BLAKE2B 535a9a0e49f4288e63c905f7bd98c1f1b8e38eef562cb5c40a0c09500a18eb7fd401f05df2261c92db3e8a126cc03902fa3c61177b50a3e18f2d33bee7590f52 SHA512 f937a9f2b4ccfe262ca1a09e7bd103ffbdd45eae7c6deed8c1453f4499935f526f513749422e3215071ef465291c3f0544bf1e9510bbaf8dd9fa1edcf22f887a
+DIST mongo-tools-4.2.1.tar.gz 14435826 BLAKE2B 8d068cb39957f6773fb6ca186a1eb324e03c21b8472fede407daf7bce091f3d401f0debe6412d70bb8e338101d7ada870e7347782ffb582b58fcafc236ad4932 SHA512 bba754acd9e21f8f832fc2e434720347c2222897b2af08d66f9491110d5491f5475ae2118ff25b263606677da10b0c96b76cc507a01287180096c25c1eab5ced
 EBUILD mongo-tools-3.6.13.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-3.6.14.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-3.6.8.ebuild 1345 BLAKE2B 1baf6f2c407b2a4d1e81a6a04444b9c43ef74e6abd7e68c08c4ef1e0540b8dcb6c54c83a58b4687d2aa20f3fbbfd88b793e20058adaecb8e53b13e76a328ee54 SHA512 2286b4f40c01231648535b0f050e1ce36f5fdd654acd83389b35604d41e92bd584dec654b5368a7ee4e6ff7d420b19faeadc1c1c7f252093f365e23efb6604eb
 EBUILD mongo-tools-4.0.10.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-4.0.12.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
+EBUILD mongo-tools-4.0.13.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-4.2.0.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
+EBUILD mongo-tools-4.2.1.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.13.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.13.ebuild
new file mode 100644
index 000000000000..092d770686fb
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.0.13.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# allow building with go 1.12 #678924
+	sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-4.2.1.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.1.ebuild
new file mode 100644
index 000000000000..092d770686fb
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.2.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# allow building with go 1.12 #678924
+	sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	# build pie to avoid text relocations wrt #582854
+	local buildmode="pie"
+
+	# skip on ppc64 wrt #610984
+	if use ppc64; then
+		buildmode="default"
+	fi
+
+	mkdir -p bin || die
+	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+		echo "Building $i"
+		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+	done
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index e990f3cc98e7..b97b22dfe9c1 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,16 +1,13 @@
 AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
 AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
-DIST puppet-agent_6.10.0-1stretch_amd64.deb 19699044 BLAKE2B 06345d1178cd9fe15f7ae5a56676764517de6587f238a35212845b89a8ac17664cf88821dcfd7fc51de6809104e1e6e6ee22512b7b007ddcd866d898bbc1b461 SHA512 d3bfeb31d769efec58584e582e62b880d399905abf742f394d2a1fc022647ffca14f9ea208a27dbf57cd6ab530737524ca57f021a27dc1a96d105a5dbe1ceded
-DIST puppet-agent_6.10.0-1stretch_i386.deb 20013932 BLAKE2B f19775e2557cbb69ab1f539def040ef7109ee271a44aee1f6ce5dc685b86b78dc0c69fbaee7f29fd054079311169e47bd26f71e154fbe623fdc29489eab67ae5 SHA512 5d0d782c92d392c35a1283e9dd3d4230a657151424838ae3f5f87a6f76c822457e7ad26b7399a2f6e3152e91b23df88767dd18b936dab06939475285dac82e39
-DIST puppet-agent_6.7.2-1stretch_amd64.deb 19184682 BLAKE2B 6078c1b21f0e737881d949cfaf052571b40df450e53724696e2738141da30e59da7abf03ce00285ab77fd4ac52291ab6e42da373420807499f37b75c872fa83e SHA512 1c464448b1478397af7b806f8bfcaee0378af9d4b6bfa5a73e8245064329b1b49136107c5fcbaea0ef6cd4e1daf840d1ba331e798b2cd255ead54969520315c9
-DIST puppet-agent_6.7.2-1stretch_i386.deb 19452604 BLAKE2B 1915e7b7085db6cb87980a98a7cb85881331719e2af98b07f8461514a0296b3cf5181eb88f78893055a0fa09fc2ffce0e81e866db27abcecf9d8f745e329311c SHA512 8d89735601c9764e207eef77f5d42e836ee9d7c0c0f2856e0f293919cce52e7a42fc28fca42bd0e0bed760063aae527007ef7ce25503ce05fcfd495a44243ee3
+DIST puppet-agent_6.10.1-1stretch_amd64.deb 19712026 BLAKE2B 82f5d9d18a3171b230d0e6027b9b8409b51096e12c5fd88844643320a0f5f654bc79880b35565571a6367a2d95f7a8f90ac811c2df1f1ec6c1866508c7e112e0 SHA512 8b289f8690fb67d353bc004a281e3e32a118048523bb6c743fa8ff46f2583c155ddffc22a7898662b598128f5ef75d77fd9a99b43c4afb72a23a2bfa3959f0c6
+DIST puppet-agent_6.10.1-1stretch_i386.deb 20055310 BLAKE2B 31bb9bd40f5098b666d911545b565654d84a422625536eff954256851089d211ea2660dbdab7b73df370efc0bbc41875617df3012ee734ec586af87967e8bc02 SHA512 33348839a245bcda4c76feae214d72bb36c1959c1b6f5f9c2db084ad1bb0018393ab6bd94e16ed987a23b2f253baf31f1df0453ead1cc6860941954ff31930c2
 DIST puppet-agent_6.8.0-1stretch_amd64.deb 19184708 BLAKE2B ac961857784eaaa55604285cf305dac437007628ea5baa3c3ae9a8a345fcb8cf2b20820bd80cc2c96afb77cb03c4d2779b17b1183c9bc9461b56860d2179f448 SHA512 707146f71b21df4b89244df7b786f481136cfe7b0cabf20aa0d4784aca547ba85c75d13309b77c853b9e034b8271f350b30bc5358010d90b7573e3fdb63c31b6
 DIST puppet-agent_6.8.0-1stretch_i386.deb 19478404 BLAKE2B 0b9d76bb3d745ca42e489e16a133d684aa0e485941d59c6773c447f5fc79be7a964f0a2ff9e4c334a47b7d2ffc0264bd49e4f7806cbc2e72e037da1c9e385d51 SHA512 f8bc962b32abbaf070b81245b7488b4fc131d5a9e3ec94ac97038f5e9c942c70a493e61e13190fe2837eb898518724bb5f360b37531003dab37606436d66219b
 DIST puppet-agent_6.9.0-1stretch_amd64.deb 19846122 BLAKE2B 7f9133d1f5cb85f45c96490c230ee0cfda707db390a3a39be218fcd730e2298099e6d70c4f44bb5c6af46736c2c8aa7906a16375088c0119045dc77b53343b91 SHA512 f96cb1a6108a21192493b7b9958243e537ab41ce3ab6a7dde4d12bcd5da25ec6a5b29632acb87c4e156256578e8348c6fdfe26043539292f98203cce69b04fff
 DIST puppet-agent_6.9.0-1stretch_i386.deb 20170516 BLAKE2B 391a61a847bc05f9f03885f2e2140ea42b4eeca247f3223f17a82d3ede2e1bbc88226f9794777f4b20e81943d94b11612f8d4ffd9f74c2f494bdc242fb05e1a1 SHA512 595dbe1591a8ee9d703a3efdf103a3095966b22cafd0fd63fb2a7b9274ea858b55d0b915ecc32e93c49bcbeba453654fc9126efe3855924fb5c5b6732e0af83d
-EBUILD puppet-agent-6.10.0.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
-EBUILD puppet-agent-6.7.2.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
+EBUILD puppet-agent-6.10.1.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
 EBUILD puppet-agent-6.8.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
-EBUILD puppet-agent-6.9.0.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
+EBUILD puppet-agent-6.9.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-6.10.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.10.1.ebuild
index a72df734d6b1..a72df734d6b1 100644
--- a/app-admin/puppet-agent/puppet-agent-6.10.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.10.1.ebuild
diff --git a/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild b/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild
deleted file mode 100644
index c648209a4a7e..000000000000
--- a/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/glibc
-	sys-libs/readline:0/7
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-}
diff --git a/app-admin/puppet-agent/puppet-agent-6.9.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.9.0.ebuild
index a72df734d6b1..c648209a4a7e 100644
--- a/app-admin/puppet-agent/puppet-agent-6.9.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index 84819ac75d26..8c1554c213f3 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -1,5 +1,7 @@
 DIST puppet-lint-2.3.6.gem 87552 BLAKE2B 0a2f4b9c2ef76c06bc4fb6eb0f737af406bf3949e7c9001685c6522714b550c0f2c5680d5d39f5d3994496a497664e912eadc44bdb7aa4c27635d23b36a90776 SHA512 d162307e66bb5f1dd923f2f9fab55de7b4c5fad6264d7a1bae8df20bd45c5a786b66d9f5b3bd235230fea959c67242462e711212f65807040048f4c0be7122b9
 DIST puppet-lint-2.4.1.gem 92160 BLAKE2B 5bcdf14cad8cbf90e69c6afaa6935768db3cd9023175a8d5632951c7ff0d5b91362988c0e667c0f852eae705920a6a570f582db394b89436f61eda50f314dc9b SHA512 39d872350ab9ad276c346a7020269f246889dfb00eef020f93a5b53a93e4ae8fd5cf307ac057d6129edf52974ea71af0abcf422e9e0be0ba570d029ffa7011bc
+DIST puppet-lint-2.4.2.gem 93184 BLAKE2B 5170bd9c30f6e2f5b30120b6edc74550e697c3243d2f5c7249f27a2d61ca2f5612d96efdc0f6be8d065e7d7a4460b9cf6e6dad13a5b24c4ce100d4e6df2f0425 SHA512 ee846688b13536b7d146ea50c0efe5083babf1ca09b77182437ec93be754ae076d54ac34f8082867a26b6df12a09bcd316e5b1aaa9c98150f9411a0c8b007c71
 EBUILD puppet-lint-2.3.6.ebuild 624 BLAKE2B 4ac251b1b01aca51123969199c9dfe49aabbcc7318e06c78a197299542ce5ed54a2bbdae8831d8349c58342b2bed43580b4b437417891f01e5c53d7559304267 SHA512 af8e5d8e726bc773053a9cfe5a4d0615db3acd67395762344dcc48a88ce5ca9c03124e4ee59ad0270c9d600299f1c812ab8884f43221b092fb8c2e8714f0ce2b
 EBUILD puppet-lint-2.4.1.ebuild 586 BLAKE2B 60d694ebd57c1112b3a76a4da7ec2efb3e72da48ffad9eb0fb284db50fa7185cc885bb19c3cb6f69b15c6f2ae24fdc1ee0078c570bd4d5a39ba2afcad29ffef6 SHA512 241c69280163c708f3c251d1f840aa851db3fb90ca0a5c433a95ef6b04c7f78b57d4db95ccb17332a8122cf80644d1b0de893998851b4992ab5b9587ace3be5e
+EBUILD puppet-lint-2.4.2.ebuild 586 BLAKE2B 60d694ebd57c1112b3a76a4da7ec2efb3e72da48ffad9eb0fb284db50fa7185cc885bb19c3cb6f69b15c6f2ae24fdc1ee0078c570bd4d5a39ba2afcad29ffef6 SHA512 241c69280163c708f3c251d1f840aa851db3fb90ca0a5c433a95ef6b04c7f78b57d4db95ccb17332a8122cf80644d1b0de893998851b4992ab5b9587ace3be5e
 MISC metadata.xml 453 BLAKE2B 4fb00983f98c8c178fa1dc667f966b0f1fd54861ef71e37211fb46edceb8f91c15d55add637a50eda53ccaff8a1d3a6dcbdd02afe2ae32cf0f69797427897d6a SHA512 bd9238c56ddcdcb124df5d7530343756b865d2f279b719fb0ce7bf4e37565709194cb7f564811be6376fd4d3b61403d76eb9542aac3a267c2eb08f1bade21524
diff --git a/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild b/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild
new file mode 100644
index 000000000000..738798f64b2f
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit eutils ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="http://puppet-lint.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec-its:1
+	dev-ruby/rspec-collection_matchers:1
+	dev-ruby/rspec-json_expectations )"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 364c7fb005d0..02ee66b90641 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -2,6 +2,7 @@ AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13618 BLAKE2B 91727c30b968b41
 AUX 50puppet-mode-gentoo.el 217 BLAKE2B 632d02667437b04642b7d3510d5010a3a7952ccd6aaa301a463c629c5dd6320c847e9f05425bd5882681a471761d0fe501ccf6860faa33b9e5458a761dad40a1 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a
 AUX puppet-fix-tests-4.7.0.patch 1102 BLAKE2B e5c98627620f9f76f1421a13969dba3b1d279a63cdb65fc28713a9a2849c8e8cd0e42a30c9058e341d5bbabd3d24ae17c050fa551566e6c61301b83396a0b80a SHA512 81485af1a218b5616195ed80b3fc963c42d56265477be9a636c0e915a18771ff93e12cdbded45ce90da17ce72be4ea4881b5ad8e9d5a997be271df3cd2e8a2c8
 AUX puppet-fix-tests-5.5.14.patch 1005 BLAKE2B ebe103e8408c2015e431966a637521b673ed79b97c318699d34efffadfe311143382eb5e961d626574072c346c984206dc3f93863b2484d3fa838c2dbf51d18e SHA512 d07598d6ef8631e718e5c4b4d61db87b2651cd1f246791778def5561f0262b23b0b8f2244e326dcef33dcc083fa96438ac138b21d5fdc246642e35b81829d2ef
+AUX puppet-fix-tests-6.10.1.patch 1163 BLAKE2B c2b0dd51aca250b06bdcefcf59fe0e33244aaaca90ead498fc7254a148ee4f4a5b89e8fd99259fce380517827f75720728610ffb79b90c3416f86de2988126db SHA512 2c97b9929c8a66ffb1ae4a16600e1ffea40b04e13f8cfc320a1d681317b3b348918d8e6c66c9be746db19cfb65b615afe94a4e30a8f6a350cb64cf437415e4ae
 AUX puppet-fix-tests-6.4.1.patch 1178 BLAKE2B 6767555c3f43519238b2e539267a40977cc460800644f2807fd1fe27fa49f805e62d5aa0a74e4c1a58160bad1fe1f1628873195a60b5b2e0a83d484e26b72bce SHA512 88a25ad9bb809f06d4af618b1da2711d84e18a63d2368c7191c6cc3170e0d85930fc235057babc92e26315312636d61d69f54cd8a3a2c8acac13ccebd187c258
 AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
 AUX puppet.init 917 BLAKE2B 0ebbcdd8c9d4154984130ba3f597969f5f070f65f246770583663df4f192052a0ed666d09d4d417864457814d6a680ac4f327dc2a83b774da3a3c0d4efea1c8d SHA512 6bd2e1c21abaa5149b853f1732a6bb84335a8b4ae4129db52da463597691fd983d347bc04aad69724034d37f953f50c6aa5316d517b9efed2414db8e3d94d7bf
@@ -13,15 +14,15 @@ AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
 DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397dd0a4aa26f5d0fa9ffa94477a5cc59b3724ab9ae3ee2e7e9230881676582c328c804ce9138dc484b9bd92e0ec3 SHA512 861100c02e0b8a5bb232d266bcd5e54b0e32cf26954ea37f276690aa3159ffdb28195ab8691df61ee0098300d226ea1d369dbdff8aae69101c2bbe6068ede8b1
 DIST puppet-5.5.16.tar.gz 3084466 BLAKE2B f3e2f12331b4794b90a81a4f80e626fcd3d5252b7cbdacc1d6243faa557540d3a68e5e23b7b5c3e4f4286774e9a9198e59fb15d7d7c41d7193754ed5c80dd624 SHA512 7d9e533e352a22e347ac6467094c4bdbde893c2503f47b4a2d175fd6e759e6662991efdd1a0a83d9495d22f28da4ae7a30cc771c5d90b8252c4618bd8837833a
-DIST puppet-6.10.0.tar.gz 2803541 BLAKE2B da122259341da54db8e9a6c3261934df5020164304bc493674d5164c0a11da1270746b41edb67c1d7c1f96b2553071c87ab2086f78b8184a1fab4dc3dbcc70fc SHA512 ff58d5898f34baa14363dc5c4f16eaa75b709b09cdb711662f3a74351d0abce85f3aa990057f296e208db8e559ecfa5ba9206ad5737aa64675e60c3e595747f5
-DIST puppet-6.7.2.tar.gz 2907345 BLAKE2B bbb0f789ae64b5039e5b1bd2ce985e89ba693d33352baee7a1d11df7f314663aa3606a73d42d6b20042f81ee405a72cd17b9cf8f3c3cb257869e982f84cfd552 SHA512 6ebcaff30bda27fc17870b991287d620d455db8cf9a41c59833efc2a7541d3622228a7278689eb0494d0f6328cd334764f21ffe8700a567696e05398a5c16b7d
+DIST puppet-5.5.17.tar.gz 3090402 BLAKE2B 7722ec4196ee766c29eddd7dc73539a4a5a0e4cc781a84af25210488328b5ae01178ca64e8eef14152cbeca06dc8fe145b5e39ce6a120d7689fc32cbbbe16f9f SHA512 95c6cd836a9f732ccfe2d8b83096e79c32428c43390c0826663f896ca1388e1fe3b55d93a5a7548831e95de85247db717866c36786d591e207341c734d70168b
+DIST puppet-6.10.1.tar.gz 2809383 BLAKE2B 1589dcfa7d73b81ab7fbc3fca4b2fe956f5d240d11583c484262d5243e4713bb4aa9cd5c655e9566468050ab2e5c0ec0cc720e3ff9088add0744e02147b4e3bb SHA512 211c9837eb4a77a54bf09811a1a84709eef06f17e0c5c9c598d01bce2e183e69974709ad4dfb8f5fecd7433c1ff52757aa699c623155d1a0742f2e07eaf2ec56
 DIST puppet-6.8.0.tar.gz 2906582 BLAKE2B 2dd2f9eb203aa951e0ea9639efa20aac3edb063b4bd68dd0b05a07fc2a399c4b59b3b87a1cb573096c5042920080623b9afb9c4d863b6249664edcc291cd1787 SHA512 c8446529e706dab7fd156b5bbca638f1722b07a638f626df2002a4ad218ec5e448f533395a6eed613b31ebbacea56539e903c040998d4110c8a362f2ead7f43b
 DIST puppet-6.9.0.tar.gz 2911311 BLAKE2B 1d58d0e976430031732de4f63c3ec100088f1d93894cf52caff252befeabe1ea3cf51939063143bd7c9011bb56f2a6420ba38ae230edea19ac8f1f135ed6f56f SHA512 4d1bc1a398c1e75bf8e832d477a0fff4fa3613510f8d59d73594e6fc2f2bbbedf050b1e7729b71bb1428c230f42fcf7b98f7a7683fc3c52cb36a596e20e6540b
 EBUILD puppet-4.10.12.ebuild 5620 BLAKE2B 75fed43f7044fef014b1c9297066e07a5ef624fd187d141475e5fbaf69aab50494e783a16b212f3063cfaa059bec310b9771ccfa88d3f8ddcfc5458a75d2ba22 SHA512 8649b6811f330733ba25602e35e13bbd5be094c8f395d5f6c7a859662d831a579b9b3ad2a44b1ed9ea60882c32eb89a261f5e36977d79a2e9a88d5f12959a3cd
 EBUILD puppet-5.5.14.ebuild 3822 BLAKE2B b639a7bd6b1a2a0229271a2c00ae246e5cd219b91510f1fb1b5bcc4668d2f81c631233329628b78240354ae884ca9e4de02287896b326eef1220c81eb3d4e173 SHA512 1043b71e29082c1020a4c67814394dc70707c3f299afadb035bb2e15e4425a38dfa76b2323f4ad31b7142c1494cb05616ed28f0cf8f46b88760fcc53c3e734a5
 EBUILD puppet-5.5.16.ebuild 3824 BLAKE2B 0501c0a04cea8cd762732a7b6728833c99c828d79c39c18dc738e2c7cb063a8f14f997108a4d3863fc0abfbedf9546dd1541f01cbbb4ea3fdcb723a49fe6ec39 SHA512 baaadc5c82ea91dab0dbcf93a5b836248183777db978e0ec0621183b695191a19b6c7fdad892d0cec05c4426c64c949eadc4dce89f08cdea8b7b6f6913d01917
-EBUILD puppet-6.10.0.ebuild 3680 BLAKE2B 080661787edaa5fdfbb24a927cd1bd9f64ec30d3d928cfab512098a6a951dc42403625db7843ab9583ce3599484af0912065f3e759beedaa946332b27ccf4378 SHA512 420679b3193c53324c65a122a6633c329eb01d07bf4506a8ceeb3b7b4f7323af69fe3dc54b183934aee0ebbf691150946620fc2f134a8df64a8023669b0942cc
-EBUILD puppet-6.7.2.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
+EBUILD puppet-5.5.17.ebuild 3739 BLAKE2B 2f2e21bf61b695a74ccd42c19cd0138249f14141b8461a28a9ba26d473fe2b9635d7b2e2dcb36f2e2aba8e0fc1d1b5e9af93f363f903e2e3c845a5df68339e92 SHA512 e8a73db5ba89b73c3e92c1d5a9277ad0d7872a7d14898a52a7309393285479434b5609ef04e48615a76d17cff9388143600f3d06c55831c7f94ff31c2a311174
+EBUILD puppet-6.10.1.ebuild 3681 BLAKE2B 8d64d23902331971a17c5868ff5a24b629c139fb9c03701f742ecab8f3c53f95cc12f919870300b98d96eca436799a0eb4e955cffa7faa808a77c6d11d2301bd SHA512 09fc378dddbd1d29abcf138dc13f4e08ada22de0f099790dc7136d82e80130f5d2b58467a1b96aabaeea8e7918884b527d016522c45fa1f1cc069b1b2162ea23
 EBUILD puppet-6.8.0.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
-EBUILD puppet-6.9.0-r1.ebuild 3680 BLAKE2B 080661787edaa5fdfbb24a927cd1bd9f64ec30d3d928cfab512098a6a951dc42403625db7843ab9583ce3599484af0912065f3e759beedaa946332b27ccf4378 SHA512 420679b3193c53324c65a122a6633c329eb01d07bf4506a8ceeb3b7b4f7323af69fe3dc54b183934aee0ebbf691150946620fc2f134a8df64a8023669b0942cc
+EBUILD puppet-6.9.0-r1.ebuild 3678 BLAKE2B 2d18ebc4de1114501fc3bccfa0e91bc97e3c3616376154583da2040864234144fd66f7b7bb9caf2b979dca9d2feadc184fefc329b79c75c96ce82177b90dc01e SHA512 f861d29b8e6b2f6ddc86be8cfe2231847f5210b9bef1c1a4f75a7ef7bb13d11bd993a2e4292eb4b3880a90f3e188c9c9eb8ed95cb6b67c64a242d75fea92d532
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch b/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
new file mode 100644
index 000000000000..daa065dabb5c
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
@@ -0,0 +1,19 @@
+--- spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-17 19:36:56.000000000 -0500
++++ spec/unit/network/http/api/indirected_routes_spec.rb	2018-09-19 10:52:35.841614932 -0500
+@@ -158,16 +158,6 @@
+       handler.uri2indirection("GET", uri_escaped, params)
+     end
+ 
+-    it "when the environment is unknown should remove :environment from params passed to check_authorization and therefore fail" do
+-      expect(handler).to receive(:check_authorization).with(anything,
+-                                                            anything,
+-                                                            excluding(:environment))
+-      expect { handler.uri2indirection("GET",
+-                                       "#{master_url_prefix}/node/bar",
+-                                       {:environment => 'bogus'})
+-      }.to raise_error(not_found_error)
+-    end
+-
+     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
+       expect(handler).to receive(:check_authorization).with(anything, anything, hash_including(environment: be_a(Puppet::Node::Environment).and(have_attributes(name: :env))))
+ 
diff --git a/app-admin/puppet/puppet-6.7.2.ebuild b/app-admin/puppet/puppet-5.5.17.ebuild
index eeefd4e8c63d..83d26aad2806 100644
--- a/app-admin/puppet/puppet-6.7.2.ebuild
+++ b/app-admin/puppet/puppet-5.5.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -19,14 +19,13 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
 ruby_add_rdepend "
 	dev-ruby/hiera
 	dev-ruby/json:=
-	dev-ruby/semantic_puppet
 	>=dev-ruby/facter-3.0.0
 	augeas? ( dev-ruby/ruby-augeas )
 	diff? ( dev-ruby/diff-lcs )
@@ -66,9 +65,6 @@ all_ruby_prepare() {
 	# Avoid spec that require unpackaged json-schema.
 	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
 
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-6.4.1.patch"
-
 	# fix systemd path
 	epatch "${FILESDIR}/puppet-systemd.patch"
 
@@ -98,6 +94,8 @@ all_ruby_install() {
 
 	# openrc init stuff
 	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
 
 	keepdir /etc/puppetlabs/puppet/ssl
 
@@ -131,8 +129,13 @@ pkg_postinst() {
 	elog "Portage Puppet module with Gentoo-specific resources:"
 	elog "http://forge.puppetlabs.com/gentoo/portage"
 	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
 }
diff --git a/app-admin/puppet/puppet-6.10.0.ebuild b/app-admin/puppet/puppet-6.10.1.ebuild
index d633c6865a1a..2fac345af4a8 100644
--- a/app-admin/puppet/puppet-6.10.0.ebuild
+++ b/app-admin/puppet/puppet-6.10.1.ebuild
@@ -68,7 +68,7 @@ all_ruby_prepare() {
 	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
 
 	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-6.4.1.patch"
+	epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch"
 
 	# fix systemd path
 	epatch "${FILESDIR}/puppet-systemd.patch"
diff --git a/app-admin/puppet/puppet-6.9.0-r1.ebuild b/app-admin/puppet/puppet-6.9.0-r1.ebuild
index d633c6865a1a..3b0aed940aba 100644
--- a/app-admin/puppet/puppet-6.9.0-r1.ebuild
+++ b/app-admin/puppet/puppet-6.9.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+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/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 9a7cb74500dd..707d65628bb3 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,11 +1,9 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-6.4.0.tar.gz 41720668 BLAKE2B a4637750c553eed8ee5bdd46212a7455fe1d59015aa78fe01f6fa9ee2b4a98ec50a2a8b551f65d4bc6965b2a969f559c53f5a6324a8e48983a1d027948387ce7 SHA512 c49afce1661ed284280e89ed9dbc2406a657e5f2cdbc501acf50900d431b58a341f1541789ea4ffe9109e8d30faf47eb85573a589426c40ad50597a7d81b5552
 DIST puppetdb-6.5.0.tar.gz 41768030 BLAKE2B 2a52239dabb5c026f4d00ee2942e3128ce50f1de23aa5ff5d53f2020237b54867b48727e774ecc27f5f18bd1617b43fcf30fbd3b03a730ca60d5bab7296e3f9c SHA512 8aee40101a17e22ef5b9b7b965ffe8d8a9b8dfaa787721b3e6a5e7363b98e0c52dc0583216a058540618a6a980cf80f138fa6b358a9daac518abd50981910cf5
 DIST puppetdb-6.6.0.tar.gz 43366185 BLAKE2B 224c13ff2583a7c8124f03845eca4756be6446e7470565c44d3fe1fcb756d5564ae2ded69d0bef1dda939efe082756c0e44afd3c6b0fc4268a744946860b5a02 SHA512 5076f52af51b7a3b43a0deb9cf1f10d77da98a5e531983d3661cda522c8d46f70882457934be6f70e77587b930077c0a4d2eaf7ed41eff9c6bcf4bc5ecbf2205
-DIST puppetdb-6.7.0.tar.gz 43437454 BLAKE2B ac1d656fe727c6c784ebcc6be4f84d3c2aa6fc48a154316e20d89d851456a2af826cb6840937875b78764299c882a631401c1cf2289888c76381a0bd966b859c SHA512 ccfd97651a7b1e1c242159c2f3c793370f8db1a37b115c47ca2754236cf7b67e39bd1bfc0244496e8dbbda47b5c847862be259d40574a41387ed809e62b11a47
-EBUILD puppetdb-6.4.0.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
+DIST puppetdb-6.7.1.tar.gz 43563417 BLAKE2B 902397b2bedb64f4ccb2d6932d6dbfb7d67c479640fb8429aecf3de558ce31ab0017175f183ee3e66268d802fc9901f5473271b6598414a7b57182bc1788f1e3 SHA512 58c6f3db268885e603bb1219f89c2aeb237c042fe7eccc95ce5622cfc739f971d9d37e0cc37cae335552d0d9845fccfd9425381faf6ec3534b20991bd9f7db0e
 EBUILD puppetdb-6.5.0.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
-EBUILD puppetdb-6.6.0.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
-EBUILD puppetdb-6.7.0.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
+EBUILD puppetdb-6.6.0.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
+EBUILD puppetdb-6.7.1.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.4.0.ebuild b/app-admin/puppetdb/puppetdb-6.4.0.ebuild
deleted file mode 100644
index 77d1c1ca9cc4..000000000000
--- a/app-admin/puppetdb/puppetdb-6.4.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppetdb
-	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-6.6.0.ebuild b/app-admin/puppetdb/puppetdb-6.6.0.ebuild
index 616793cb4123..77d1c1ca9cc4 100644
--- a/app-admin/puppetdb/puppetdb-6.6.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.6.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+=""
diff --git a/app-admin/puppetdb/puppetdb-6.7.0.ebuild b/app-admin/puppetdb/puppetdb-6.7.1.ebuild
index 616793cb4123..616793cb4123 100644
--- a/app-admin/puppetdb/puppetdb-6.7.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.7.1.ebuild
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index cbfd7fc7a48c..b7223a7bbdf6 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -2,8 +2,8 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-6.5.0.tar.gz 76080713 BLAKE2B 0562128001a24eae6cec071a366e16ab3ce5b0babbe50330ecddd13ab3dbfd35d6cb23634770e4bd7904cd231752ce923d4af8dc42d783cc137f300efcb05fb2 SHA512 d871f3817c370ddd08e8d791deb1a30aa50ab0d801192ebfb5ef225d8dce21885175fe4e9911287437b687b2bcbf5a098d8b9511b24bd05fdf4854575a686cfe
 DIST puppetserver-6.6.0.tar.gz 59095750 BLAKE2B adbc08a68a1382106c43d27604c2cef52bd1d9875c5f555320d97d31dcf9d248c88baa2d6dfd37a855010fda76ad4d273a7bd5eca77bb216aabf6a120e41cee0 SHA512 2b43092752e246027a437398d6d23a4085caa2956a1453cec2e62f1001fca1c98bddca0a9d90c178ce9c89a06c26edcaee49416c1b8a4941e2bc4b6b5bb1fe0e
-DIST puppetserver-6.7.0.tar.gz 59097892 BLAKE2B 99f57d54e7cf2a071edb266f1487b80dad86a92d27fc6143c8581f08d430aceb66845f92c44e153748529611048f96b91817a80249c7707d6f861eae455bb133 SHA512 bc7e9e57f072a3b29b75a383d9c60414ef4db30f725faa69da3b258b860005f7f50fa4bb5a454bc90a5277d8c636231e2d0a5cbe23addf0dbf46be3f3ec28278
+DIST puppetserver-6.7.1.tar.gz 59202711 BLAKE2B 9f88617811d05dc09ee568b40ff332f88e44998916df6d2c88a268fe443d35b62e4d94816acc49a87dd355925bb13e99f8694596831423013b96119a4e1a0727 SHA512 80af1266d122f131f8d5385acbcf712d3042e7665eb739491d1d3d06adec8c0d78009aaec86161ed4fdb180bf529a48b2964c784ec728d40319f63c6d2f8f0df
 EBUILD puppetserver-6.5.0.ebuild 5370 BLAKE2B b3b8bbba45305b658c94fcc43c9e2d11b854e80f536e5e3c3afc7c4182f954b9491f47eb83529dbd00a894b793c9a0cf660ed7b52051b840b24e7fedec97a6b2 SHA512 31b6e681af9dd22d9388a447237289e3e48d79d2e7e1ba79d10e70084b99a9d7cf99fdd19b58a210f990ed1b202af2367a0e0911f8579a876ff284413f6051ce
-EBUILD puppetserver-6.6.0-r1.ebuild 5393 BLAKE2B 72168876f0d5ce90d779ddf60ed2069e284c3ef98a9e62a594e1b8614a3ac2f2681d25f7c3222ef0084d1d816d991d818d471f874bc8675d2a39fdaab260b288 SHA512 640a1e81775befe3a5a19ed8c8a19c53d11a30cbd9bf9613a5c19ee487bcc1d2e0948d91779a4c9bd7ccc1fb8e86f4c77fb0eaf1ddd5a13ad0158093729afed5
-EBUILD puppetserver-6.7.0.ebuild 5393 BLAKE2B 72168876f0d5ce90d779ddf60ed2069e284c3ef98a9e62a594e1b8614a3ac2f2681d25f7c3222ef0084d1d816d991d818d471f874bc8675d2a39fdaab260b288 SHA512 640a1e81775befe3a5a19ed8c8a19c53d11a30cbd9bf9613a5c19ee487bcc1d2e0948d91779a4c9bd7ccc1fb8e86f4c77fb0eaf1ddd5a13ad0158093729afed5
+EBUILD puppetserver-6.6.0-r1.ebuild 5391 BLAKE2B a67b5f2f3d53fafe7922c96e579a6ff274b4246869987c97e4aa4f7e7f5d250e525f11a723de66266f440bf894c921c246edc8a45cbc78e80b80b6ed155f2bc5 SHA512 3490f2cfa072716aa24fb07d8ff24952bf0e1df60f6c5b33b84b5259b044c1875a9baff326e75c4d76afa8a0b4ff930aa4adee833be500be3a1fcc10ea3455db
+EBUILD puppetserver-6.7.1.ebuild 5393 BLAKE2B 72168876f0d5ce90d779ddf60ed2069e284c3ef98a9e62a594e1b8614a3ac2f2681d25f7c3222ef0084d1d816d991d818d471f874bc8675d2a39fdaab260b288 SHA512 640a1e81775befe3a5a19ed8c8a19c53d11a30cbd9bf9613a5c19ee487bcc1d2e0948d91779a4c9bd7ccc1fb8e86f4c77fb0eaf1ddd5a13ad0158093729afed5
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild b/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild
index 45ac7ad8e73d..19d3602bfcbc 100644
--- a/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/puppetserver/puppetserver-6.7.0.ebuild b/app-admin/puppetserver/puppetserver-6.7.1.ebuild
index 45ac7ad8e73d..45ac7ad8e73d 100644
--- a/app-admin/puppetserver/puppetserver-6.7.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.7.1.ebuild
diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest
index 807f5a96d7b8..10ef84d68c50 100644
--- a/app-admin/qtpass/Manifest
+++ b/app-admin/qtpass/Manifest
@@ -1,3 +1,5 @@
 DIST qtpass-1.2.3.tar.gz 369412 BLAKE2B 55e8f5e7967b264b20aa044979620631f319e2ff38edcc4e1390ab5d9f35e1e90ff8ff00c94cd35a9b5c05a5ccd8d8fdfc97214e9bd9f564bae1bd80efe0f224 SHA512 d6c3af5b92042a38afecb40689d41c08105dd2a39555f78ebc585a6db6dd65cd8fd6dc637542dd3b5b4ce18f1a852768ffa298b5a461a2d0e4ef4950c58d1649
+DIST qtpass-1.3.2.tar.gz 310316 BLAKE2B ac0f562fd263e9d46980a69183cfd556596750e1050dbc50748cd9be45bc4bf39e4de14cb59f778cfc54f5c32050d567d88d65ec039cba1e9c2e8ef24d7ae99a SHA512 9026f74f6ff75fcef2f6a0862484a2a1eaed1370edd0659e8b4d20039affe846e0da3a0a26a804563813bc678638ab67fa516441208e70c7e9de9b2eda876a10
 EBUILD qtpass-1.2.3.ebuild 1169 BLAKE2B 28e24f3651ef3abebd613d7e464e3d2ce2ee0fc759cd133144158fa7659699925cec08713848d34df52e28529287ab76a8fdc3a08ed630ea004cf02b9cef498d SHA512 f738908611196d83ffdaea3ff2360a97d2e7d2be46a9a7cffb3025bffba2b9127a331400b58307806819ec1728a39fab57cae7671a2d5baf2a9fea126a899d6e
+EBUILD qtpass-1.3.2.ebuild 1187 BLAKE2B 041e02b80371294797db76f9c52f00f541ce7e1b4dbd605401e0d448cc3d3a7e4e468fe12cb3fa7b8c160bb8d5c1c5b5ceab4197c1cc48f0547cffd565026558 SHA512 9ca19544740a327f60f364db06e398960d37e72c0d5b5cffa6a1bd62951f127eea1b20d606f5a5a6088a28f228817d557f933d20ad2639a9346ebaece2005c27
 MISC metadata.xml 571 BLAKE2B 1fec9b040ae2b49beec1b99abd0853f631275d3c7f22584a42b503d008ff9403edcd451194881d09224ab0d41ff0598dea2dc7a403aea0227adc4909d02deaad SHA512 937b219855427d7423067037b05ea3b7f19c01eca32fa38e3d6bad9354da039bf2be63a6450f0ebd71fcbd7b6b15b8ca1f993b89391597b1bfb7e3db3d3c04ae
diff --git a/app-admin/qtpass/qtpass-1.3.2.ebuild b/app-admin/qtpass/qtpass-1.3.2.ebuild
new file mode 100644
index 000000000000..dad3a4d82ee6
--- /dev/null
+++ b/app-admin/qtpass/qtpass-1.3.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils virtualx
+
+DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
+HOMEPAGE="https://qtpass.org/"
+SRC_URI="https://github.com/IJHack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="app-admin/pass
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[xcb]
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	net-misc/x11-ssh-askpass"
+DEPEND="${RDEPEND}
+	dev-qt/qtsvg:5
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="dev-qt/linguist-tools:5"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/QtPass-${PV}"
+
+DOCS=( {CHANGELOG,CONTRIBUTING,FAQ,README}.md )
+
+src_prepare() {
+	default
+
+	if ! use test ; then
+		sed -i '/SUBDIRS += src /s/tests //' \
+			qtpass.pro || die "sed for qtpass.pro failed"
+	fi
+}
+
+src_configure() {
+	eqmake5 PREFIX="${D}"/usr
+}
+
+src_test() {
+	virtx default
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/qtpass/translations
+	doins localization/*.qm
+
+	doman qtpass.1
+	domenu qtpass.desktop
+	newicon artwork/icon.png qtpass-icon.png
+	insinto /usr/share/appdata
+	doins qtpass.appdata.xml
+}
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 86ea1704f7f1..146a6f66bff9 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -2,8 +2,10 @@ DIST r10k-3.2.0.gem 206336 BLAKE2B badc840ec7e6793daf205f1352899fa909e9a922a353a
 DIST r10k-3.3.0.gem 206848 BLAKE2B 92fedb9871c6e22df3a3f8c4cf18feac1bf3ef51e2e67b3001c811bc81397eda71bc9da94ef860d6e39b989fd1c1a3b9dae402142496f17c4427ff2de62188fd SHA512 674c5c386885dd1476264d8bc047ddad0411b6344350662021ede8a5352e95fd50a72f62127b00bf6b2bc8e6b3835b017128788707610d510a64eee13b9f4d4f
 DIST r10k-3.3.1.gem 208384 BLAKE2B 81e7de3d2fabd038240478ab7ace4fba181a4370544f964b438a6b96de34a741f653aff018ece21453b119ae6b12f06934cc82be8a6b78cd5a72277195a5fe81 SHA512 20f9c92fbabed82521d452f339d9d2fd8cc438cac1cc11385a6e2874a5d55fe6425ddfcd281d8e63ee043adec5fbbfba0c37ef0c6e15d498c64ba550740ccd6e
 DIST r10k-3.3.2.gem 208384 BLAKE2B 8d5ce5d7fb2497b701fdf7cd0a742db7b221a2b327464b553b9dbd893ecfbda2498302fb14cda89df7030c6b48dfb048d23d5c271773a3974e75b115ad0e3c49 SHA512 ccc71c856f204aafe9f15b497c3881aaa3beff50c36647e06590cbbaebaed58514eb30a5d57bbee4ba071e3586083c0b07decbd68c859667e6eb6bb57a40aef5
+DIST r10k-3.3.3.gem 208384 BLAKE2B 8c20a516c721970e4edb57160972dfa992d79a90794d7428f7083dee48f68ea87fdd6b182acd3df1ec9c8b50a2a72543d2ffb4b5361d6960fb46d021e3c2d592 SHA512 b1a407cd0bcafc9d7d15ff0d40f54d93d19be48032858aeb42955cdf14799fa75445f4ec462dd05a19cda972d155a0fc0be641d1998fd5e02c0ea5f1d971ea08
 EBUILD r10k-3.2.0.ebuild 933 BLAKE2B 6e7df53cab2a25bb5bf6fa4218cd670b742a68aeeb5402dd09d1f34861d0596250b915965a06b4cc8c157009d671046c00758cb576223d108e6b8d40067a23a6 SHA512 66c0c7e12e9f934c9e5f3024021e31ef4dce674f3eb27763bdc60413c9ef79dd101ed5cdcbdeec6cab9332fcbb60454754aea7c05f251b23327fef6f227eb7c8
 EBUILD r10k-3.3.0.ebuild 941 BLAKE2B d66e537eb1478ad0acf777d35efde0ecdad4594c5032ce01cfcb873eecef8e9fe65f237a0465ecc2f2368fb3019e728f54c7eebcfd06f461362f65ebc9cceb4f SHA512 eee05605d5294656c76a5207b25ced88a7162cfc15308660bb51fd9d22d13ccea24c288d21d540b8da108bcfe18e6539c589f0f2d3dd420ec1050850d7f19365
 EBUILD r10k-3.3.1.ebuild 916 BLAKE2B db2bdfab6af08c85fafdc36a9cf45e340ca0a65a0d8917c793d020e23d5773d77e71b40926be7e03a7161e4b0c8cbf80452ed928bd198594cc26fa55616d5158 SHA512 18d544b67913d9f0cb8f5cd0ac906b7ca482cb9bfa926b8feb98bef68447ba7450bc52ad00a2ca60289ef93a45340e8d8f96771e5647004b816fbd871e69ad4d
 EBUILD r10k-3.3.2.ebuild 916 BLAKE2B db2bdfab6af08c85fafdc36a9cf45e340ca0a65a0d8917c793d020e23d5773d77e71b40926be7e03a7161e4b0c8cbf80452ed928bd198594cc26fa55616d5158 SHA512 18d544b67913d9f0cb8f5cd0ac906b7ca482cb9bfa926b8feb98bef68447ba7450bc52ad00a2ca60289ef93a45340e8d8f96771e5647004b816fbd871e69ad4d
+EBUILD r10k-3.3.3.ebuild 916 BLAKE2B db2bdfab6af08c85fafdc36a9cf45e340ca0a65a0d8917c793d020e23d5773d77e71b40926be7e03a7161e4b0c8cbf80452ed928bd198594cc26fa55616d5158 SHA512 18d544b67913d9f0cb8f5cd0ac906b7ca482cb9bfa926b8feb98bef68447ba7450bc52ad00a2ca60289ef93a45340e8d8f96771e5647004b816fbd871e69ad4d
 MISC metadata.xml 582 BLAKE2B e3b514385b7b851b3ce037de51024108005224c75fba470db28fe6e4d6b3632ace21a8e829198e0b22d1ba0e76b1a5c01df10426ea497ec3b00e20e578608d2d SHA512 fb8913a9f806ac0b2035dc788ee78536fff96ffb635454f668d7836d8ba849fea158e628da12743c1844b658961866b3d64e8faf700c7e373065045175785536
diff --git a/app-admin/r10k/r10k-3.3.3.ebuild b/app-admin/r10k/r10k-3.3.3.ebuild
new file mode 100644
index 000000000000..1826c94b4704
--- /dev/null
+++ b/app-admin/r10k/r10k-3.3.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git"
+
+ruby_add_rdepend "
+	~dev-ruby/colored-1.2
+	~dev-ruby/cri-2.15.6
+	>=dev-ruby/gettext-setup-0.24:0
+	~dev-ruby/log4r-1.1.10
+	>=dev-ruby/multi_json-1.10:0
+	=dev-ruby/puppet_forge-2.3*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/archive-tar-minitar
+)"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs for unpackaged rugget git provider
+	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index b81d405238da..7c5289453a08 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -15,5 +15,5 @@ DIST rsyslog-doc-8.1910.0.tar.gz 8158007 BLAKE2B 7a05cf7070ba350d0fb939350868ff0
 EBUILD rsyslog-8.1904.0-r1.ebuild 12569 BLAKE2B 119a617375da61a37962edddae9f20888fcac469325b77f07c15141d471a00e62f6647b94d9837990ad7bccc0e85fb071de8b63f411245f9759f2163677fa663 SHA512 2a6514fbe431f61c29a8f261f528458c05e82398a34b4cd810c36cadaf5d355f7678f530f52d9236269eab01c990703b2bdfe2c6b6b8d3ea0005f1f168587a54
 EBUILD rsyslog-8.1907.0-r1.ebuild 12546 BLAKE2B d562cb749a8632d6399613667f786dabf472b65b112a5775a9f2977b3a513b25f50454419fb62ff02648e4dc1acf5fb226b7d01d62e70bdbcd1de69f6c6cbb97 SHA512 9d683b5267a57653bbc7f8caff1b8e60e78b6e7dbfc6cb2ba7f63ac80776b75cc1d3ba84c27a9659cfd48e568c01af97423f5450af6173e94a9bb9ae38eda95c
 EBUILD rsyslog-8.1908.0.ebuild 12548 BLAKE2B b8fb662688270ee92cc4382bbc39a78e8bf4db46f48e4dcbb4cb3efb0194eb8dffad999cff631199909573590842dd56efc5fb38c05cb88e72ea0bfe5040aa64 SHA512 fabfdc53abf6aab98f7ec7a0ee4381d73155df3a3f1e3dec5b9f8705fa83d336005de173bcbcf34d3a136f5c4565416d35e289c0a827d6fdde63ee5784c656f8
-EBUILD rsyslog-8.1910.0.ebuild 12548 BLAKE2B b8fb662688270ee92cc4382bbc39a78e8bf4db46f48e4dcbb4cb3efb0194eb8dffad999cff631199909573590842dd56efc5fb38c05cb88e72ea0bfe5040aa64 SHA512 fabfdc53abf6aab98f7ec7a0ee4381d73155df3a3f1e3dec5b9f8705fa83d336005de173bcbcf34d3a136f5c4565416d35e289c0a827d6fdde63ee5784c656f8
+EBUILD rsyslog-8.1910.0.ebuild 12545 BLAKE2B b5ab0e992ba314a05fb413f2a7c41ff425993f871a1164e5495c766d02f5f507539d05dfa4d28ad7400c50500a7ffc0e5572a67f636074ed61b451d905f883ee SHA512 8700879fd2851c3aaf9ac20e92132b667ccaa7152060e49f43b736f42d6df3ef698aa92d202be65b20d4bd5d72a78b0788234eaa2c14abd13a2252ac0133bc9f
 MISC metadata.xml 3874 BLAKE2B c09a57dcbd88bda6c510ca741e1ee8c5207e5906843fe3ae21c8dd6575c7b104dae74e79e5a27c8bf9f0348673f5c33eb6c4b12fafbb1ba64f1a9f81bd374eaa SHA512 2f7a72017376018aa5d864deb33675d51ab50cd8481dffb7f1421b83d4e07f19a86a90705dbb6191686fc650284e2bcbe30ed0af07082b57eef46dd615778868
diff --git a/app-admin/rsyslog/rsyslog-8.1910.0.ebuild b/app-admin/rsyslog/rsyslog-8.1910.0.ebuild
index 09eed323e458..d8a51113e54c 100644
--- a/app-admin/rsyslog/rsyslog-8.1910.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1910.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 54e485931c51..051dbfa16d25 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -16,6 +16,8 @@ AUX salt-2018.3.4-tests.patch 2944 BLAKE2B f41c1e53297e1828c840d0ff22a49e2d47b40
 AUX salt-2019.2.0-newer-deps.patch 9260 BLAKE2B 02234367c4de7586b72502126fec7392dca96a284058b6c21733d21e5a61e12e81da054454aae20b290b9179fc7790e74ac111c7b1b638b36a935806e367902f SHA512 1e999b302323c4880103f8e68aa4c471c280484c91af0c4ac8ae85270553d178bb79a4a7d33fcc4b3a0ba2a6d95a8199d411b15e35b87f33004821dea4a07360
 AUX salt-2019.2.0-skip-tests-that-oom-machine.patch 739 BLAKE2B c0e1b18c528ddcdc19e93061112d2c42aeca96f9091218e7ad6b4eadf11255079cecd6b9b9def576c663b4ba794d151db8fc32336b1c29c3da8e9c18c09582f3 SHA512 0bd8fc2ab73be8ffc9fdda65a60c7306dbfa9f76d874994ba09db7ef71678fca80c8fde5963d22b5bbbe3b933140a56f2173f4c109b47dd9e9c3c9a70062b0e3
 AUX salt-2019.2.0-tests.patch 2793 BLAKE2B c609564673db7388a876902deb57f0aec70531ea26536954efdabdd8849eee314e840cc299f6e1fbd6a18740847a9ee8d217426adee38d36ae569f6e2e9c85ae SHA512 eb1d61f5410b36d0749cce5fc7dc08a8950061f7fb3497a122702eba7638ec3e635750b25ad5cacc4839d4828f13785ea122df43e8aff7635d79283be0392f02
+AUX salt-2019.2.2-newer-deps.patch 6635 BLAKE2B 377b06231914bbbfc0ca279bb169e0167f5dec0d421e221f7441a237c11d9670e5fd378d294c02fe16bd5989f2cb0db9864eb2270dbe09755475e9e6fcc059de SHA512 24faf550a0de753eb605df8fe658b71972048be781bb77df0c11f3ed7eda6b423897d1f88d84dad3f5d9e8d3db0784cbfe8d1a017c950661de56deb7edb23eaf
+AUX salt-2019.2.2-workaround-broken-mock-on-py2.patch 1224 BLAKE2B ea81b3a699220fd0084eb1f259e59d28c75b5bafb9ce0988b987f373265f58d8184a4703c5b2f36fddf7dad5e7be666280c1b4f5c4d6d11ce71c636cbc380b94 SHA512 2078c489080aa0731d0304835fbf9fdfa88bba4fca4fa8d19d708927e1583d3e3a17d49fbb233b6a41d079a921eb2cdf2f7fa9bd606005ca7259548cff7f66ae
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
 AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f40566297c5bc469b351587db4d9805bed124774107efb64e6ed3e25fefa899b42a38064ee6fe26fd990ae58 SHA512 99f0a5c696e38b42b283416736a23e535ccc53095928b205914cf4b69c0df931a6752205985726527f7889b01dfece78466be28448458b15064edd04aca3e5ed
@@ -26,8 +28,10 @@ DIST salt-2016.11.10.tar.gz 10058200 BLAKE2B 4b6a42f6bf56421bc19458686ec23a1f945
 DIST salt-2017.7.8.tar.gz 12060430 BLAKE2B b2dde1b6f43bbb9b9db29b70dfd57591ae0e490e35ec7f4895b68b444ff77f9e997321d73697f791d345756abf451f11891b5f78a97c537c35dfe8bd24c43bbc SHA512 1e5123ee3dc194a33cf5da1e68a0419230b2b4eea26e7f66bf2d64754f0dbef9012abfbd498015f6b675725e580d72abf13c151b106639597337498b1fd42238
 DIST salt-2018.3.4.tar.gz 14404085 BLAKE2B 932b30b1ba60aefd3a6874a8ebe4cb6c469d82e31f6acdbe8a5641d09e3316796b5403ef803a355cec6255c1aede8bac3b66af179bd1bbaa5418c7076229cef9 SHA512 f17e06fdbf4741f231d9e769be57de4f6079e9283881b4bafa0d23928d7626a1f9c02b9f49c654b29c3e6ee8ed3d3ddf42c21baecef158ad63a97dc87895b21b
 DIST salt-2019.2.0.tar.gz 14952746 BLAKE2B aa3bba4b7d9548a8d333c242fc0265a743f56ff1a259da7c8618d37b3b022e12f09ac594a09f0ceec80fd9d3a6b6b9ec35b33e879b7a124e6612f2ec2a63a01c SHA512 de5a976213d011c230e423a172952effddb87168367958b8657eaaaf8fd2a8bec8471f547b6ff9e896a17064a13d387dbc12e12c605c8a241062e3238bd19eca
+DIST salt-2019.2.2.tar.gz 14420887 BLAKE2B 84e8a0aa72b88a66a1020b695849926669728ee02f8cb51a14853b5e9c2ab692fe65810367e5d53268f7b234c10911f16d063ce665b3761432ab1d9c0aa52d16 SHA512 2bbf9765384f1f6c2336a3f421298c8900cf459e6d1ebc7fb89284014ef8db9f5215a68de2bb06dfa3404983160a0c4c589ffa3dc046611dd5409bd502938677
 EBUILD salt-2016.11.10.ebuild 4855 BLAKE2B 8d6321e45aca368c5919104752f3ab5f0ba0778b183a232cbbbcd19da126eaecc2d0c40c29e3745a27d7f1cff9dc620840d7cbd86de7a3d8c6454bc2ff9b900c SHA512 a4e7ae265c66a659eb70fccba97c2c52ba9fe06fe20e23d3643029fd68442aad4f82d94f8a9dd55a5f040644a50571dec645ab866b20ef05a70ad8a550553c92
 EBUILD salt-2017.7.8.ebuild 4614 BLAKE2B 8974a75658aa59bfc4cd98efa9d601ebc374f407ea33d51b98b02fbcd00f195455c867f824cf16092e3859fcbccfc4a0c7ae2933a1724180d34a9f616432095b SHA512 a9a09dc1939775f46687e4e25fae24a3b7bfa48c1358bfec00fcc70fcd271d947c4f2ea5e9c0a9b4a522b87c5d2ab334f0df3d487dc2799db0531cafe23e7a2d
 EBUILD salt-2018.3.4.ebuild 4905 BLAKE2B 882cbf2fc6fd4547a19bbd078a27b6deb5053702fac869af73bac8a7a664f0d368e66a1a3da3b9c30bc0a892f71c1f7d5135fd14240b80cbe24c7fd9438276c7 SHA512 217870e4aef470660089e0627674b8001a3047c783a1fe6fe95c20084ad00ec089d51e0d2783c9a6a69f407aa475091bed4b8fc9a35001e32883440f30f5c1f0
 EBUILD salt-2019.2.0-r1.ebuild 5079 BLAKE2B 09f9672a3ff9e8abb40e5233a600f91b0ffcacd8011ee0d28be53b394fc796c23cdaf11f3b75136f31a1e184a49b95e358940102f6e3c309993823dd18b8d9ba SHA512 ef245c5e1f8a1b4a5c7b187608643099929f8165028aa3fc7649a5bb347a21e7a976e9c8a0ebae39f601ab6ce8e291cbb25af4d5505b8ce3b330f3a8d0918eec
+EBUILD salt-2019.2.2.ebuild 5070 BLAKE2B 35ff02500389792afd1b847caee031194610bf2c776033f193f6523a6b766635145496a3873060f53d72956a33cd7f74d27692af71acab70da7711f56ba58202 SHA512 5c478ac00fedf2b2c02fa65fedc426b052bf9ab24f98583f19e812cc5e47f361ea36a62b87106895b54dcb6fd02ce60aa154c3ab8efbe5fc4c4e72eb7f976659
 MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969
diff --git a/app-admin/salt/files/salt-2019.2.2-newer-deps.patch b/app-admin/salt/files/salt-2019.2.2-newer-deps.patch
new file mode 100644
index 000000000000..ee3bc0604173
--- /dev/null
+++ b/app-admin/salt/files/salt-2019.2.2-newer-deps.patch
@@ -0,0 +1,136 @@
+diff --git a/salt/modules/dockercompose.py b/salt/modules/dockercompose.py
+index 61e937536c..0f37e0d43a 100644
+--- a/salt/modules/dockercompose.py
++++ b/salt/modules/dockercompose.py
+@@ -241,7 +241,7 @@ def __load_docker_compose(path):
+                                     None, None)
+     try:
+         with salt.utils.files.fopen(file_path, 'r') as fl:
+-            loaded = yaml.load(fl)
++            loaded = yaml.safe_load(fl)
+     except EnvironmentError:
+         return None, __standardize_result(False,
+                                     'Could not read {0}'.format(file_path),
+@@ -371,7 +371,7 @@ def __load_compose_definitions(path, definition):
+                                               None, None)
+     else:
+         try:
+-            loaded_definition = yaml.load(definition)
++            loaded_definition = yaml.safe_load(definition)
+         except yaml.YAMLError as yerr:
+             msg = 'Could not parse {0} {1}'.format(definition, yerr)
+             return None, None, __standardize_result(False, msg,
+diff --git a/tests/integration/utils/test_win_runas.py b/tests/integration/utils/test_win_runas.py
+index 3042a77991..d4057a4d03 100644
+--- a/tests/integration/utils/test_win_runas.py
++++ b/tests/integration/utils/test_win_runas.py
+@@ -539,7 +539,7 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 1, ret
+
+     @with_system_user('test-runas', on_existing='delete', delete=True,
+@@ -560,7 +560,7 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 1, ret
+
+     @with_system_user('test-runas-admin', on_existing='delete', delete=True,
+@@ -581,7 +581,7 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 0, ret
+
+     @with_system_user('test-runas-admin', on_existing='delete', delete=True,
+@@ -602,7 +602,7 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 0, ret
+
+     def test_runas_service_system_user(self):
+@@ -621,5 +621,5 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 0, ret
+diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py
+index a07fcbab6b..79072bb89e 100644
+--- a/tests/unit/utils/test_schema.py
++++ b/tests/unit/utils/test_schema.py
+@@ -5,6 +5,7 @@
+
+ # Import python libs
+ from __future__ import absolute_import, print_function, unicode_literals
++import sys
+ import copy
+
+ # Import Salt Testing Libs
+@@ -506,10 +507,7 @@ class ConfigTestCase(TestCase):
+                 {'personal_access_token': 'foo'},
+                 Requirements.serialize()
+             )
+-        if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'):
+-            self.assertIn('\'ssh_key_file\' is a required property', excinfo.exception.message)
+-        else:
+-            self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
++        self.assertIn('\'ssh_key_file\' is a required property', excinfo.exception.message)
+
+     def test_boolean_config(self):
+         item = schema.BooleanItem(title='Hungry', description='Are you hungry?')
+@@ -1733,10 +1731,11 @@ class ConfigTestCase(TestCase):
+
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': {'sides': '4', 'color': 'blue'}}, TestConf.serialize())
+-        if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'):
+-            self.assertIn('\'4\' is not of type \'boolean\'', excinfo.exception.message)
++
++        if sys.hexversion >= 0x03000000:
++            self.assertIn("'4' is not of type 'boolean'", excinfo.exception.message)
+         else:
+-            self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
++            self.assertIn("u'4' is not of type u'boolean'", excinfo.exception.message)
+
+         class TestConf(schema.Schema):
+             item = schema.DictItem(
+@@ -1839,10 +1838,10 @@ class ConfigTestCase(TestCase):
+
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': ['maybe']}, TestConf.serialize())
+-        if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'):
+-            self.assertIn('\'maybe\' is not one of [\'yes\']', excinfo.exception.message)
++        if sys.hexversion >= 0x03000000:
++            self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message)
+         else:
+-            self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
++            self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message)
+
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': 2}, TestConf.serialize())
+@@ -1894,10 +1893,10 @@ class ConfigTestCase(TestCase):
+
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': ['maybe']}, TestConf.serialize())
+-        if JSONSCHEMA_VERSION >= _LooseVersion('3.0.0'):
+-            self.assertIn('\'maybe\' is not one of [\'yes\']', excinfo.exception.message)
++        if sys.hexversion >= 0x03000000:
++            self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message)
+         else:
+-            self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
++            self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message)
+
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': 2}, TestConf.serialize())
diff --git a/app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch b/app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch
new file mode 100644
index 000000000000..8d28fe7f16a6
--- /dev/null
+++ b/app-admin/salt/files/salt-2019.2.2-workaround-broken-mock-on-py2.patch
@@ -0,0 +1,28 @@
+diff --git a/tests/unit/utils/test_network.py b/tests/unit/utils/test_network.py
+index af5cbbab2b..15236c127a 100644
+--- a/tests/unit/utils/test_network.py
++++ b/tests/unit/utils/test_network.py
+@@ -1,6 +1,7 @@
+ # -*- coding: utf-8 -*-
+ # Import Python libs
+ from __future__ import absolute_import, unicode_literals, print_function
++import sys
+ import logging
+ import socket
+ import textwrap
+@@ -249,6 +250,7 @@ class NetworkTestCase(TestCase):
+                 log.error('bad host_port value: "%s" failed to trigger ValueError exception', host_port)
+                 raise _e_
+ 
++    @skipIf(sys.hexversion < 0x03000000, "https://github.com/testing-cabal/mock/issues/323")
+     def test_dns_check(self):
+         hosts = [
+             {'host': '10.10.0.3',
+@@ -302,6 +304,7 @@ class NetworkTestCase(TestCase):
+                                         "Invalid or unresolveable address"):
+                 network.dns_check('foo', '1')
+ 
++    @skipIf(sys.hexversion < 0x03000000, "https://github.com/testing-cabal/mock/issues/323")
+     def test_test_addrs(self):
+         # subset of real data from getaddrinfo against saltstack.com
+         addrinfo = [(30, 2, 17, '', ('2600:9000:21eb:a800:8:1031:abc0:93a1', 0, 0, 0)),
diff --git a/app-admin/salt/salt-2019.2.2.ebuild b/app-admin/salt/salt-2019.2.2.ebuild
new file mode 100644
index 000000000000..97d22f8486e4
--- /dev/null
+++ b/app-admin/salt/salt-2019.2.2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_6 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+	https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/libnacl[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	<www-servers/tornado-5.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:0=[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[$(python_gen_usedep 'python2*')] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
+		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/timelib[$(python_gen_usedep 'python2*')]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/salt-2019.2.0-tests.patch"
+	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-2019.2.2-newer-deps.patch"
+	"${FILESDIR}/salt-2019.2.2-workaround-broken-mock-on-py2.patch"
+)
+
+python_prepare() {
+	# remove tests with external dependencies that may not be available
+	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+
+	# allow the use of the renamed msgpack
+	sed -i '/^msgpack/d' requirements/base.txt || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+
+	(
+		cleanup() {
+			rm -f "${tempdir}"
+			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+		}
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 50f5b6d4fb8d..b6fe5c4f411e 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,6 +1,8 @@
 DIST sudo-1.8.27.tar.gz 3293178 BLAKE2B 174d63ece5c24309dc0d237fadfc4131243aca333491ffa6dcdb3c44b53cb8149d3bf2f3aea2aa49529ea811d4727a11ac1909305e342b858a4c14f923f12956 SHA512 0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac
-DIST sudo-1.8.28rc2.tar.gz 3311100 BLAKE2B 18aa7504f5cc8e58308472cf9e59cebdb5cde52d944b0e93d0235c94f7af7cb6cd62ae7bb757d33ca6708958687fdb3638b5ec5c9778c80254bb95a2f503fa81 SHA512 b8f148d1b2aa09c54ea30b48781f736916594106d0d49da1bcf4d76fc369365b3fec6233e62f4a6faaae9568a0d63d48aab9f4155f8dc2e4c8579e64fcab9335
+DIST sudo-1.8.28p1.tar.gz 3310254 BLAKE2B a1810af7a42d05cce49bb9d0acf6f3731a5193e9e9c3b458691379131eb86d36995854d11c09525e8d999ed1da7e99cf170634667c5a444aa522b8f23db7d1aa SHA512 bda3de34c15fbb68fc29759542295560ccc1562b419d03709cea51613937e9b92ba689c79c3ef4858aeea90d3d1a4dc0148225b11b22cf82395ae1bad8cb1734
+DIST sudo-1.8.29.tar.gz 3338260 BLAKE2B 7ba29d155bfb1d7ba20e32ade2e8ee3919e70400b6c235e313052b247b48406b9a051e71daa7e47fdb0a9fd0889f4c05b8a1a170c027503b90081e8cec81660e SHA512 ea780922b2afb47df4df4b533fb355fd916cb18a6bfd13c7ca36a25b03ef585d805648c6fa85692bea363b1f83664ac3bc622f99bcd149b3a86f70522eb4d340
 EBUILD sudo-1.8.27-r1.ebuild 6641 BLAKE2B 87663af3782d324385698c58407b6a74858bc60f8e174edf25789eda5f46039dfe811656f96371833dfaef5bad5a51804fae4cb98fb7b17fd64e09aeea0040de SHA512 cdc83a9b9578c23e3dfd30898555e2276332ff947b8695d6a322fd75a564f2be5ad8d62164d88e055a832ed15884e4dac999d93afbd90f683648ad96f0603990
-EBUILD sudo-1.8.28_rc2.ebuild 6618 BLAKE2B 8cca6568c81a5012800749cf30111cafa3ee9900efdd5d49a450c2b8c99dae4567a3bb396e0fe1651fb824e07d90ae15547e2425c2eb0768eeac45e5209b7fff SHA512 08060b50aa82206f4e6a28692cea7eb9dfb67e815c5dcd979557fe640d3b35addc6d19fb657d8dd97a09b8ea19b5b712bb4934d124ce8ce796435149fdb1684e
-EBUILD sudo-9999.ebuild 6618 BLAKE2B 8cca6568c81a5012800749cf30111cafa3ee9900efdd5d49a450c2b8c99dae4567a3bb396e0fe1651fb824e07d90ae15547e2425c2eb0768eeac45e5209b7fff SHA512 08060b50aa82206f4e6a28692cea7eb9dfb67e815c5dcd979557fe640d3b35addc6d19fb657d8dd97a09b8ea19b5b712bb4934d124ce8ce796435149fdb1684e
+EBUILD sudo-1.8.28_p1.ebuild 6666 BLAKE2B 551d3373f646240fe899cac890cbe926e77efdc83f041ce4198c47d8305ba7ee008a8434105218a578d178621128181922b98fd43efa60f9ae43057af14d82e7 SHA512 3acc292c0527f15cbfc37bc056d420bfe3c14a247920fd02f1bc8e7a44cbe037faa6580d8da9a8a4a3c3c496e498463d13d190c7fc77a843c0258a206294bf1e
+EBUILD sudo-1.8.29.ebuild 6677 BLAKE2B 5a5ec21a1dcbd3807957781a86cf1629c8050bf49169c84cbecc1c3540a053ad5049cafa015c7a9fe96e761c812c0e5309f6e537eade26cedbb5379ecf526d41 SHA512 266f6117189dfd4d25cfbe2af2b69f6fc1523c12dd0c2d4d3431f96fb690f9f911c62baf8986b0cfcbebdae3a7ed70a1dd966c8232d98120731eae013ed0f03e
+EBUILD sudo-9999.ebuild 6677 BLAKE2B 5a5ec21a1dcbd3807957781a86cf1629c8050bf49169c84cbecc1c3540a053ad5049cafa015c7a9fe96e761c812c0e5309f6e537eade26cedbb5379ecf526d41 SHA512 266f6117189dfd4d25cfbe2af2b69f6fc1523c12dd0c2d4d3431f96fb690f9f911c62baf8986b0cfcbebdae3a7ed70a1dd966c8232d98120731eae013ed0f03e
 MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6
diff --git a/app-admin/sudo/sudo-1.8.28_p1.ebuild b/app-admin/sudo/sudo-1.8.28_p1.ebuild
new file mode 100644
index 000000000000..d22f403b4434
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.28_p1.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam multilib libtool tmpfiles
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} == "9999" ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	uri_prefix=
+	case ${P} in
+		*_beta*|*_rc*) uri_prefix=beta/ ;;
+	esac
+
+	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-solaris"
+	fi
+fi
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest"
+
+DEPEND="
+	sys-libs/zlib:=
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	pam? ( sys-libs/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	sssd? ( sys-auth/sssd[sudo] )
+	system-digest? (
+		gcrypt? ( dev-libs/libgcrypt:= )
+		!gcrypt? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+"
+RDEPEND="
+	${DEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+BDEPEND="
+	sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	pam? ( !skey )
+	skey? ( !pam )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+set_secure_path() {
+	# FIXME: secure_path is a compile time setting. using PATH or
+	# ROOTPATH is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
+		echo "${ROOTPATH}")
+		case "${SECURE_PATH}" in
+			*/usr/sbin*) ;;
+			*) SECURE_PATH=$(unset PATH;
+				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+				;;
+		esac
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:${thisp}
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
+			newpath+=:${thisp}
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local SECURE_PATH
+	set_secure_path
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	myeconfargs=(
+		--enable-zlib=system
+		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/run/sudo
+		$(use_with secure-path secure-path ${SECURE_PATH})
+		--with-secure-path="${SECURE_PATH}"
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable sasl)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with ldap)
+		$(use_with pam)
+		$(use_with skey)
+		$(use_with sssd)
+		$(use_with selinux)
+		$(use_with sendmail)
+	)
+
+	if use system-digest && ! use gcrypt; then
+		myeconfargs+=("--enable-openssl")
+	else
+		myeconfargs+=("--disable-openssl")
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins doc/schema.OpenLDAP sudo.schema
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	fperms 0711 /var/db/sudo #652958
+
+	# Don't install into /run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/run
+
+	find "${ED}" -type f -name "*.la" -delete || die #697812
+}
+
+pkg_postinst() {
+	tmpfiles_process sudo.conf
+
+	#652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-admin/sudo/sudo-1.8.28_rc2.ebuild b/app-admin/sudo/sudo-1.8.29.ebuild
index 023e5a069d09..d53e24703c68 100644
--- a/app-admin/sudo/sudo-1.8.28_rc2.ebuild
+++ b/app-admin/sudo/sudo-1.8.29.ebuild
@@ -200,6 +200,8 @@ src_install() {
 	# Don't install into /run as that is a tmpfs most of the time
 	# (bug #504854)
 	rm -rf "${ED}"/run
+
+	find "${ED}" -type f -name "*.la" -delete || die #697812
 }
 
 pkg_postinst() {
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 023e5a069d09..d53e24703c68 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -200,6 +200,8 @@ src_install() {
 	# Don't install into /run as that is a tmpfs most of the time
 	# (bug #504854)
 	rm -rf "${ED}"/run
+
+	find "${ED}" -type f -name "*.la" -delete || die #697812
 }
 
 pkg_postinst() {
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index eb149022ed76..752600412bcb 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,5 +1,4 @@
 AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f43d5bf06fb77b86959a75c7680df87e7ded7fd72073ad469a06bdec1e739784c82776d04a91bd3add SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e
-AUX patches/syslog-ng-3.23.1-fix-sigabrt.patch 2287 BLAKE2B 1937edf0bdf29f9737361134302ba0817bdc8ae029186e1aba712032b52fa2b9e6a5d7d634c521fd734d7d536eaa94c6a6ecaa3c7c55287ad7abcc09beeaa8ce SHA512 fc23bb8778d9889a24afb3cebc4de722f3d1a83f6d184cd2bdd279056a0eae2050beb4f8d4bcc5bf3cabb66ab698b3555d36b0568929f2186060d82c63519450
 AUX syslog-ng.conf.gentoo.hardened.in 4509 BLAKE2B 39f130c008df8d5e31c121246997f8f31d2d8e2a78f1a881f4ca07ade0b3a5386c6e8c3fd8518e2ae471751564263886b8e3b78e8651efe0eeccd1d06c23c2a5 SHA512 0670952e6f5d0405e90bb5cb1ea168832bb2293095250c01a9baaf9e4fcdf8578ecf5b60809bd9e5089096a4d97fa966fcc47324fbe70cfd14266a10eb0001c6
 AUX syslog-ng.conf.gentoo.in 1198 BLAKE2B a95b1fb9f46655502a41b0381c7388c9b54cfe9b8c3fd68dc68bd473175688e8ae72145a0ef718ef65220ecced7ecab00b39755cf41d4e21a6d375059cf6f309 SHA512 2830d1c5071a50c4aea6288b35c2880988111f29a11a641ee89f001a4ca4319943f87fdb1fd7079988888efa55401e2ed62f7a507c452de137f2e97a445d60e1
 AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530903659828565018dff71d62e56bfba28afa6c5e9fcb55aee2a41bcfff53c9ad006ee319124adbd66a SHA512 c945d27560afa310ac7f15e0cde3a564d5296892c747827d68df1b49c728998b056b596f93ac2564a5cb349f88db6585de58ec64cdaa13b92f20f5aac213ef44
@@ -9,7 +8,7 @@ AUX syslog-ng.logrotate.hardened.in 1518 BLAKE2B c13fd2707266edef0e74476aaf8446c
 AUX syslog-ng.logrotate.in 219 BLAKE2B acfde709749d11790b451e3f9a0d9bc33f129e86e3f68bdd36cf2d2c9c5561c5308805aea36378e8d79995e1bf173e4471845805681be2c409b52479333c35d8 SHA512 7a838006ce61c9702d6ea77672affa8cb1dc2ec2c6a1a268a4ae4f5a59dcac1ccfe835d25144ef8376a60a11227fa64e38dc16f8d0eaff182f14a6644a3a5ceb
 AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a007d8f4978e1bbd4ce1f1e8f9daefb60c586aa58756d7d98ca59a869ae8e3f4addac732b6086ba5 SHA512 9e21637b684a48093d00ad9b5d4dbb79178ea8cc280cb03dbce235193e916bf3bd10b091a901cf13842f1c080b707a36efe8833bbde9d2721245598a3fe038df
 DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B e4f7e47f1939fb07d204c4721ff558a606cf6c6ee072278ff7c9bc1db7406e6abf058ac8a96bd4df0b867272bdbc5401528d47c94e60d90ff5ebb1aaec49e223 SHA512 4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f
-DIST syslog-ng-3.23.1.tar.gz 5008517 BLAKE2B a128707ed36ae3a236dbd3bffb080bd39187a77b3ed7fc0c8d6a2de65f6b761f3c7160a8fdc804c56e4ba673451779382a91c83c8d8cd15ec6fed2c799309adf SHA512 d1ded084a9141637da44cb9c7d8c66585e498b16ff6717548e31ad61bbfe1e04de3554183c8a4de540d9280de1e6370303845010164b3b2ac53ecce1e7434a48
+DIST syslog-ng-3.24.1.tar.gz 4909513 BLAKE2B 4b8d05899f9767784b6d24008d55808bee0af4a29883b2cb67031d23f4937632ba00f2ed7a9e969984ebec2785243a9e60811c4c2ccb3c6188c66a71af004f36 SHA512 b5326193e20db16763d3e187292bf683ebb77032b800a6e54a4ce2dd3864dda48b3d0ffc4d442eff0261117ac7a76d7927f4c8d0d96fc59ce29b46da6bd052d5
 EBUILD syslog-ng-3.22.1.ebuild 4950 BLAKE2B 8f357d97832fa2b34281ca0db58afbd648d33d9cb9de955edfe6f22fa442bd0a1a9661ea398ed2d7d964de416d73d338ca8237d881348f9e5a6438454a11c504 SHA512 8c91d2a427f451eb6fead571a9101615faf2f8aa29c0938fe491662ddda4e073efd2efb029fb1b56abb56985e2defb2e56b9ef16c46f77a38c06197668c90890
-EBUILD syslog-ng-3.23.1-r1.ebuild 5040 BLAKE2B 42fe6556ac3b19d5faf90b6b48a8f57b97bd61ced33d861ffdfe1d0fd314332437768a8803e607fd5841b95780f11b196642544cbe525f21cac1531d8c223761 SHA512 1ac2e842474c19050fbf9bd90c9027d211df516bc962def2508b3397733094049b483aa8e1c32168412d92aafba46ce24a2eb3ca59e4e673a7a18cea89b568c3
+EBUILD syslog-ng-3.24.1.ebuild 4897 BLAKE2B 779e2c58e303606079e830fa123bfab8e5efc1729ff48e9086b82efe996360978590db4117b61b08bb264080e8f5d9959b68c4d9fd4cc399d3f7dc4fc210611c SHA512 d2c3c294cd7195b7c290230080669b0b56686c51f577a09d4e7e75ffce12bcfa77894f6eab862b49725e41880a00f357423c92b19d35e82b926e4ed827d00e67
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.23.1-fix-sigabrt.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.23.1-fix-sigabrt.patch
deleted file mode 100644
index 6d27e88abf71..000000000000
--- a/app-admin/syslog-ng/files/patches/syslog-ng-3.23.1-fix-sigabrt.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/lib/logsource.c b/lib/logsource.c
-index 3f38b66e8b..83c61a8e93 100644
---- a/lib/logsource.c
-+++ b/lib/logsource.c
-@@ -633,7 +633,20 @@ log_source_queue(LogPipe *s, LogMessage *msg, const LogPathOptions *path_options
-                   evt_tag_printf("msg", "%p", msg));
- 
-   msg_set_context(NULL);
-+}
-+
-+static void
-+_initialize_window(LogSource *self, gint init_window_size)
-+{
-+  self->window_initialized = TRUE;
-+  window_size_counter_set(&self->window_size, init_window_size);
-+  self->full_window_size = init_window_size;
-+}
- 
-+static gboolean
-+_is_window_initialized(LogSource *self)
-+{
-+  return self->window_initialized;
- }
- 
- void
-@@ -645,11 +658,9 @@ log_source_set_options(LogSource *self, LogSourceOptions *options,
-    * configuration and we received a SIGHUP.  This means that opened
-    * connections will not have their window_size changed. */
- 
--  if ((gint)window_size_counter_get(&self->window_size, NULL) == -1)
--    {
--      window_size_counter_set(&self->window_size, options->init_window_size);
--      self->full_window_size = options->init_window_size;
--    }
-+  if (!_is_window_initialized(self))
-+    _initialize_window(self, options->init_window_size);
-+
-   self->options = options;
-   if (self->stats_id)
-     g_free(self->stats_id);
-@@ -679,7 +690,7 @@ log_source_init_instance(LogSource *self, GlobalConfig *cfg)
-   self->super.free_fn = log_source_free;
-   self->super.init = log_source_init;
-   self->super.deinit = log_source_deinit;
--  window_size_counter_set(&self->window_size, (gsize)-1);
-+  self->window_initialized = FALSE;
-   self->ack_tracker = NULL;
- }
- 
-@@ -696,7 +707,9 @@ log_source_free(LogPipe *s)
- 
-   ack_tracker_free(self->ack_tracker);
-   self->ack_tracker = NULL;
--  _release_dynamic_window(self);
-+
-+  if (G_UNLIKELY(dynamic_window_is_enabled(&self->dynamic_window)))
-+    _release_dynamic_window(self);
- }
- 
- void
-diff --git a/lib/logsource.h b/lib/logsource.h
-index 370842efc2..75d4926046 100644
---- a/lib/logsource.h
-+++ b/lib/logsource.h
-@@ -71,6 +71,7 @@ struct _LogSource
-   gchar *stats_instance;
-   WindowSizeCounter window_size;
-   DynamicWindow dynamic_window;
-+  gboolean window_initialized;
-   /* full_window_size = static + dynamic */
-   gsize full_window_size;
-   atomic_gssize window_size_to_be_reclaimed;
diff --git a/app-admin/syslog-ng/syslog-ng-3.23.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
index bc13ee0fdc78..f3b04f13b93f 100644
--- a/app-admin/syslog-ng/syslog-ng-3.23.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
 RESTRICT="test"
@@ -27,7 +27,6 @@ RDEPEND="
 	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
 	caps? ( sys-libs/libcap )
 	dbi? ( >=dev-db/libdbi-0.9.0 )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
 	geoip2? ( dev-libs/libmaxminddb:= )
 	http? ( net-misc/curl )
 	json? ( >=dev-libs/json-c-0.9:= )
@@ -51,9 +50,6 @@ DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunO
 	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
 	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
 
-# bug #695176
-PATCHES=( "${FILESDIR}/patches/${PN}-3.23.1-fix-sigabrt.patch" )
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -116,7 +112,6 @@ src_configure() {
 		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
 		$(use_enable caps linux-caps)
 		$(use_enable dbi sql)
-		$(use_enable geoip)
 		$(use_enable geoip2)
 		$(use_enable http)
 		$(use_enable ipv6)
diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest
deleted file mode 100644
index 8cb367c771b1..000000000000
--- a/app-admin/systemrescuecd-x86/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST systemrescuecd-6.0.3.iso 881852416 BLAKE2B ab1064237902542845e11869f7076a829e9593d29b8d106f0309c61a1371173cd5b3ef3fa3b84910cc81bcec485d27c8e297f269820aa96b0043df7c441121a2 SHA512 21b77e38999f56457a4c0a096eb58b2e74a8b376af33290b2e75995762e12a977435e8a9ed2ad9448799c3246d85f3bddfcafea020a1336b14f4f81644e06bb9
-DIST systemrescuecd-x86-5.3.2.iso 585920512 BLAKE2B e68bb4e765359ac0e8124c9cb6090ed2ec9340a09e3ebafbcaa4acc175f8afe3985a57f193cd4be4192dfb23a6042a68328a29bbfb962f73fbe010c32d66e020 SHA512 c9da6a63556836bd38f7072b49a5408f2f9e5fa310dbae3f229c9b7af4fe6e073cdfc95b942bc1a6d9c42d41527fc54e8c6c15379082bc3ee0f025da80b01e5a
-EBUILD systemrescuecd-x86-5.3.2.ebuild 2491 BLAKE2B dcfda1a902812b84d00d5386caafdc522a84c75b03852b786441f029f2fb23766bbcf0622f005755c62e192cd2eab2fa782d6db774b55bef9f7b4d6525952b0e SHA512 0286a3c2edc3a7d4a2fa3a96476e2179936e9e024464bcd155c9fe759fb346d3df6b1c371c2b4d422f745bc6af3f307f95cbea3e607b9d76c6e08a17a474754e
-EBUILD systemrescuecd-x86-6.0.3.ebuild 2105 BLAKE2B 805cd8fb4d2b896220c3ca624c1b7d647e5a0636b50fac93b6a1defc3e4b4cb02ce5df6608d41c24efae5cca7605f602690c27c5d9cb678b446f7dc9845655ae SHA512 338edfaa329f3df1fbc5c6aa6ee1d1ca17113065ed6fb5432b999b63085417b96d52ad722edfada05e036cdf28cd209b6af1e7d9d3e3958332c593615283f4e5
-MISC metadata.xml 610 BLAKE2B 400c26cbce80747fe88b60d34ea0f018b7119ad6ef333e8de931424aaa929db90ba0836a4520fbe62baa0c7aa9992745c4c082e495f318066acf5285e56dcd10 SHA512 5092c69f83df351b3697ab0c83e165eba5c7ceffd197707047bdd4d2e809ff7267e436e91e3035223beb088c48835ae28fd4032a8122687af116fa1405b30b15
diff --git a/app-admin/systemrescuecd-x86/metadata.xml b/app-admin/systemrescuecd-x86/metadata.xml
deleted file mode 100644
index 823bc77a91fb..000000000000
--- a/app-admin/systemrescuecd-x86/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <use>
-    <flag name="isohybrid">
-      Pass downloaded images through isohybrid in order to make it
-      possible to copy them directly to USB media and boot (requires
-      <pkg>sys-boot/syslinux</pkg> at build time).
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">systemrescuecd</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.2.ebuild
deleted file mode 100644
index a54988e7f076..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-5.3.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant"
-HOMEPAGE="http://www.sysresccd.org/"
-# Large ISO mirroring explicitly approved by infra in bug #588766
-SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso"
-
-LICENSE="AGPL-3 Apache-2.0 APSL-2 Artistic Artistic-2 Atmel bh-luxi BitstreamVera boehm-gc BSD BSD-1 BSD-2 BSD-4 BZIP2 CC0-1.0 CC-BY-3.0 CC-BY-SA-3.0 CC-PD CDDL-Schily Clarified-Artistic CPL-1.0 EPL-1.0 FDL-1.1+ FDL-1.2+ FDL-1.3 FDL-1.3+ FLTK freedist FTL GPL-1+ GPL-2 GPL-2+ GPL-2-with-font-exception GPL-3 GPL-3+ HPND icu IJG Info-ZIP inner-net ipw2100-fw ipw2200-fw ISC Kermit LGPL-2 LGPL-2+ LGPL-2.1 LGPL-2.1+ LGPL-3 LGPL-3+ libpng linux-firmware lsof man-pages man-pages-posix-2013 MIT MPL-1.1 MPL-2.0 netcat ngrep no-source-code NPL-1.1 OFL-1.1 Old-MIT openafs-krb5-a OPENLDAP openssl PCRE PSF-2 PSF-2.4 public-domain rc rdisc RSA Sleepycat SMAIL SSLeay symlinks tcltk tcp_wrappers_license unRAR UoI-NCSA vim wxWinLL-3 ZLIB ZSH || ( AFL-2.1 GPL-2 ) || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) || ( Ruby BSD-2 ) || ( Ruby GPL-2 ) || ( Ruby MIT ) || ( Ruby-BSD BSD-2 )"
-SLOT="${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+isohybrid"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-RESTRICT="bindist mirror"
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.3.ebuild
deleted file mode 100644
index 7cfd100cadf5..000000000000
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-6.0.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${P/-x86/}
-DESCRIPTION="The .iso image of SystemRescueCD rescue disk, amd64 variant"
-HOMEPAGE="http://www.sysresccd.org/"
-SRC_URI="https://osdn.net/projects/systemrescuecd/storage/releases/${PV}/${MY_P}.iso"
-
-LICENSE="Apache-1.0 Apache-2.0 Artistic Artistic-2 BEER-WARE BSD BSD-2 BSD-4 CC0-1.0 CC-BY-SA-3.0 FDL-1.3+ GPL-2 GPL-2+ GPL-3+ icu ISC JasPer2.0 LGPL-2+ LGPL-2.1+ LGPL-3+ linux-firmware MaxMind2 MIT MPL-1.1 MPL-2.0 no-source-code OFL Old-MIT OPENLDAP openssl PSF-2 public-domain Sleepycat unRAR UoI-NCSA vim ZLIB"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+isohybrid"
-RESTRICT="bindist mirror"
-
-DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	ewarn "Please note that starting with version 6.0.0, upstream has switched"
-	ewarn "to Arch Linux as base of their distribution, and running on 32-bit"
-	ewarn "systems is no longer supported."
-}
-
-src_unpack() { :; }
-
-src_install() {
-	insinto "/usr/share/${PN%-*}"
-	doins "${DISTDIR}/${MY_P}.iso"
-
-	if use isohybrid; then
-		set -- isohybrid -u "${ED%/}/usr/share/${PN%-*}/${MY_P}.iso"
-		echo "${@}"
-		"${@}" || die "${*} failed"
-	fi
-}
-
-pkg_postinst() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# no version newer than ours? we're the newest!
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		ln -f -s -v "${MY_P}.iso" "${f}" || die
-	fi
-}
-
-pkg_postrm() {
-	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
-
-	# if there is no version newer than ours installed
-	if ! has_version ">${CATEGORY}/${PF}"; then
-		# and we are truly and completely uninstalled...
-		if [[ ! ${REPLACED_BY_VERSION} ]]; then
-			# then find an older version to set the symlink to
-			local newest_version=$(best_version "<${CATEGORY}/${PF}")
-
-			if [[ ${newest_version} ]]; then
-				# update the symlink
-				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
-			else
-				# last version removed? clean up the symlink
-				rm -v "${f}" || die
-				# and the parent directory
-				rmdir "${f%/*}" || die
-			fi
-		fi
-	fi
-}
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index daf06e7d456c..9e7a6464a8d7 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -1,7 +1,7 @@
-DIST terraform-0.11.12.tar.gz 10907800 BLAKE2B d6d3c0a25b994be9b61e250a35adae55ed6cea0cc2166ea62774940292d9e881f16b66b88b19d5fd2c64d19bdefb82b58c79c54d8c641e1ad2970ef9a463c4c8 SHA512 2163cbc13a2bd37b7dace0a4ee2b3da4ee212038f9d6e11b83e509a794cf8d854040c366a099c9560a149157c6951b1f9d1698b4c47bd11a4fa96c4521e93414
 DIST terraform-0.11.13.tar.gz 10906645 BLAKE2B dafdc1acddd4ea97b41cc5899a541701731fce7b13b914c0859fe148b10b5c8ac877d71b665e8d80a65f376bb09fb8ae6fd0e0263ff711a156ca48119522f89d SHA512 1c16f20d1a65c763f1091ff2d20e0752e62903e07a12d41dd722e5c4c989f477da7d64901336d7536ed1693d5c82f4548ae5a643edae85b4e83325fc8c81b245
-DIST terraform-0.12.3.tar.gz 9702723 BLAKE2B 90a6c77d1e1d6cac761572a470e23d44705fd0326ea9e2b280f51d9c95c85a74951ed93d8d8eed56821209bbd0725ffc034cf19bbb2da2baa390eafac790ac76 SHA512 49e1fefbfaf0dc0b0505836133c95dd5b664babfbdec094288ac823678cfb6e1593b19c9a0dca608cb1c7063f1ad531adba470c5ec67e3d245ef1e4341fd5b4a
-EBUILD terraform-0.11.12.ebuild 877 BLAKE2B 323146e7839983be9a5d6cade8082cf0ddaffe4bcdc664ca25828598f15ccc30ca2a433bbbc832f424592db33e57af0b5347557b2cadd85eb7f7c406310bf944 SHA512 b875aac0c3e202b07c19e6ed93ea5e1f0ca85fa14e7df1bb32c1621a024e345d668e89f6f4d4bec24d7c7a4fc81de49924f7b53be84f261619ec8b7c1280d27f
+DIST terraform-0.12.11.tar.gz 10338506 BLAKE2B 62c33591d55345e8c3b9c61b6f9279a81f1df86f5942cee787e4b525eefdf7834f0e4a6a42835b4ae038591fd467941454be674a3c1c8b329ef52c7d5e39359b SHA512 2b9fc6157aea8e7159d7089135620433d75843f2b3dd48af18ecb7837a5ca3ea72d9dfb8b36a25a65f9b9cc29b11bc7910f124a359a6589bfb941a714e0b7b23
+DIST terraform-0.12.12.tar.gz 10441883 BLAKE2B c30366c46bc77b7b5c1a44766ce891db01a139e1fa9f936962341d2b9230f85c9137ffc3236e6baad5aad5bada845fd0327846ebfb0c93037ae7c9c46fd70f13 SHA512 58e15da1cc5345e7780573bfeda4a6f34dc281682a0e3f7bf6b129d0db42ff343b79575bb06472e1c994f8d3e3d7e3ab507a4a09f1cfd166690a611af221bd8e
 EBUILD terraform-0.11.13.ebuild 876 BLAKE2B 5b62cb3e2ffffc599f1da2c7fe0a083f944b95a86e617bf7fefda8fecb0f7a92936990c3fff78f219c0e2b31a9264067e7b6c2ee6e4e38f0e5700af392e5e415 SHA512 f94d55f7c68710d082c8afadfe5a75a7daff664588becfeddeb3055b6e5e316ce35bb46dfe278e342922e95fb5d1ce89a13c286c4b03f2511db9ea49e1d4e253
-EBUILD terraform-0.12.3.ebuild 824 BLAKE2B c9b63bc043118f7a9e8a305768af97cce7d856bab11b77109a50919fbffb553349cd03d2128fd16b77c2a8e47b469f7f17afae05ad535560fecda7f0a4c8ea5a SHA512 5543b4839fc94e6c627f83f50184f1633272843f3d049e130f31c1b9b31d90e707fa6a9d05a31acd7cf39c88a2a175ca3240dcde3111af166956218e90615fb1
+EBUILD terraform-0.12.11.ebuild 836 BLAKE2B bf02adfb19a15f2a4b12409226d8584e648f98dd46b062d3a24f6e710c99c53fa137004288ba61da51b2783658b21161ccc8ac9e5502b1b31bca9e272bf81e5f SHA512 cd9e8d65da3da000cbb02ba39c885ca95a412ac672c2c568e5767a1718e1d49f8dcbb43c442d5167bf0a0f5e914ca0c93fae69c9803dee8ff97e2cbfe2f45743
+EBUILD terraform-0.12.12.ebuild 836 BLAKE2B bf02adfb19a15f2a4b12409226d8584e648f98dd46b062d3a24f6e710c99c53fa137004288ba61da51b2783658b21161ccc8ac9e5502b1b31bca9e272bf81e5f SHA512 cd9e8d65da3da000cbb02ba39c885ca95a412ac672c2c568e5767a1718e1d49f8dcbb43c442d5167bf0a0f5e914ca0c93fae69c9803dee8ff97e2cbfe2f45743
 MISC metadata.xml 1185 BLAKE2B 4e3e36b75d012f5a48886bc4cbce9f2f597b15060cf5298036690e3832e909ac6e08a729b477de9b893a38ea8cb634c8abefeb5776a14a790f5b4d8a7b86bc38 SHA512 8f52d688db4c37ddbdbca03c5a2f8fc49fa9a0765902e34559408f5f14230c12bc2b160768d3c9cbc978a0ee01e5f3c8a50aef00786a96f42725db54cb845d03
diff --git a/app-admin/terraform/terraform-0.12.3.ebuild b/app-admin/terraform/terraform-0.12.11.ebuild
index da8687cc0e50..effc18ec2234 100644
--- a/app-admin/terraform/terraform-0.12.3.ebuild
+++ b/app-admin/terraform/terraform-0.12.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit golang-vcs-snapshot
+inherit golang-base go-module
 
 DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
 HOMEPAGE="https://www.terraform.io/"
@@ -11,22 +11,21 @@ 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="MPL-2.0"
+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"
 IUSE=""
-DEPEND=">=dev-lang/go-1.11.0"
+DEPEND=""
 
-DOCS=( src/${EGO_PN}/{README,CHANGELOG}.md )
+DOCS=( {README,CHANGELOG}.md )
 
 src_compile() {
-	cd "src/${EGO_PN}" || die
-	GOPATH="${S}" GOCACHE="${T}/go-cache" go build \
-		-v -work -o "${S}/${PN}" ./ || die
+	GOCACHE="${T}/go-cache" go build \
+		-work -o "bin/${PN}" ./ || die
 }
 
 src_install() {
-	dobin terraform
+	dobin bin/terraform
 
 	einstalldocs
 }
diff --git a/app-admin/terraform/terraform-0.11.12.ebuild b/app-admin/terraform/terraform-0.12.12.ebuild
index a70144a8d83f..effc18ec2234 100644
--- a/app-admin/terraform/terraform-0.11.12.ebuild
+++ b/app-admin/terraform/terraform-0.12.12.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit golang-vcs-snapshot
+inherit golang-base go-module
 
 DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
 HOMEPAGE="https://www.terraform.io/"
@@ -11,27 +11,23 @@ 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="MPL-2.0"
+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"
 IUSE=""
+DEPEND=""
 
-DEPEND=">=dev-lang/go-1.11.0"
-
-DOCS=( README.md CHANGELOG.md )
+DOCS=( {README,CHANGELOG}.md )
 
 src_compile() {
-	cd "src/${EGO_PN}" || die
-	GOPATH="${S}" GOCACHE="${T}/go-cache" go build \
-		-v -work -o "${S}/${PN}" ./ || die
+	GOCACHE="${T}/go-cache" go build \
+		-work -o "bin/${PN}" ./ || die
 }
 
 src_install() {
-	dobin terraform
+	dobin bin/terraform
 
-	pushd "src/${EGO_PN}" >/dev/null || die
 	einstalldocs
-	popd >/dev/null || die
 }
 
 pkg_postinst() {
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /app-admin
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)