gentoo resync : 22.01.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-01-22 10:09:44 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-01-22 10:09:44 +0000
commit: 09351e78166b5e864197c4456ebae3f89dd0bed9 (patch)
tree: 41a96399f56ed3aa399006871bfce4430db84aa2 /app-admin
parent: c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff)
46 files changed, 1083 insertions, 798 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index a9fba389da96..5b36040c96d8 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 2311e9d0820e..7c4fb7ebadb6 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,14 +1,12 @@
-DIST ansible-2.5.13.tar.gz 10117549 BLAKE2B d5a53f411ff7cc8dfa3cbbcb6623b95d0a736b7359579aef1c81b391d75dc90c81396ffdd1906d1306d1d5ded7a745499fc82db086758b85ece027d9d243ad63 SHA512 f9968738b4aea6d6e84cca888827159c757b2248bf9fccbc2db0bcafccaba4700ebf87718fe98c912481cb0e8ed6b7a3b7be7a88ab7824092a2db838301fdec2
 DIST ansible-2.5.14.tar.gz 10119785 BLAKE2B 6e771aafc16053185ee6d275d6d41f64aa3f0d6dffbe721a66b548b97e84d78916e03827d592b961f9a4e0bb03fae09320731a4b8fdb814126cecdfb51f9f136 SHA512 9635b1c4bc9a93a24f4bb2894c9fed63803cecb01c5562559e3b808791d1007b26aa0aade4aa05fd4bae0f7d01216588d4e2e0bf4c5fb6cdf677d9b40e9e2de8
-DIST ansible-2.6.10.tar.gz 10716578 BLAKE2B cf769c65a25cebe799c9aedebacb3f07e9fa95dc8dfa57ec805861679ac5917432ec894ccd68bef7cb78dcf3b2bb2165c94274ebd932fd376b80ad17238e8922 SHA512 8eac8bab53042c25d12aef8ee3fd1b5361a339c176cd21daf8782150183fa5ab05ad65ec4636178c341771544742a487c5ce06f8e9b1492dcab3140788784b5c
 DIST ansible-2.6.11.tar.gz 10722546 BLAKE2B d98a82323409b894343c22c0b6226ef643bae34198627a6de426fdb65ef2a9892429edda20d522b8f501fe34c47b463f844abc7e6cf38009bd22398ca0c35f11 SHA512 5b795644d2bc02470b8a71be42720405614eac3e602a8906257c82ace36dc4c3727322b12ffadda6e2b752d963a40559cc35b1bc0a85596123896e7d1ac75b6b
-DIST ansible-2.7.4.tar.gz 11769861 BLAKE2B 3aee95d19ab057e39d174b19f29acf8d2c1011c0f5408f0a78ddd172089794a40a11455cc693a6457f3fd6e30eeb986579bbcc57a384cef0d8aef1013f7f71ec SHA512 4b7cb202577e3c87ec89598ec9a81ebac4b60f62f670322c24b655f5f3a7fab4657c27cce6cfa4f1bb41e7d60f7f6cf80251d86fcb36b1312f6f3ad47be777c9
+DIST ansible-2.6.12.tar.gz 10726648 BLAKE2B 9f3b1b48069f5b450f649bf1c21ee57922ac3db6a8b1b11c459b572bf298813490f230400f09d35d4d7b21a709643ac37cb527719fea59a1b57616b476235dcb SHA512 daee0a5c37a83dfd22b1fccb5245735e4874f7428f5e8f0244a8a208c7f73729bffc06df16d16e257ae65b8d4cafeb4e3b67e49160b5d9d530666166b5096a70
 DIST ansible-2.7.5.tar.gz 11781337 BLAKE2B cbb1ae02ee5733c03797db8acbb79980e24afe6e265aa609bbb22d8b43675c8ec995a4b10f3212e8dbf2fe49fdbccf1d2f8ee251bb4bd11ee5198a2ca2443147 SHA512 b3a8a2c10e42f4dcf0f3867901eaaf555e6b9bcbd808b91765a8825db3ec49d618d8893f244d52e49e944d0900a876bbb31b3a7b89d636e435e94cd4b281be18
-EBUILD ansible-2.5.13.ebuild 1621 BLAKE2B 7374dd46389da290959d922ea41086b94dc1c15ae17cffcbb211f1415acaeecc3d5be1f5c4c27ce5ee60454a49b453cca06587a64259e7091d9242d8f7e07cf8 SHA512 641a4babfab26eced6fabc54587d77b5e750c8b0af3e024a493f55444585167bb4e21aa9eae77ea5322d3c9071ea3097c3d79343bdc3854c372d9a944f7dbf18
-EBUILD ansible-2.5.14.ebuild 1623 BLAKE2B 28e5e0c4e05904fa61ccb810b8ab546a41824c52a6d1246d9f9ae6e3d60d6d6c99ef91fda9aa304d0dda7fc3afcaf78e38731a189ca5fd5ccd1cf3e7dd7a0dc6 SHA512 44fe0eb5c7b0fe17db4e42abdb0c1294769527cdd724929799d517e1b21ce4a75ccdfa1a8099aee75bbd579f3cb820b00ac41ecc6903c18f03ea3a3ac31956bd
-EBUILD ansible-2.6.10.ebuild 1621 BLAKE2B 7374dd46389da290959d922ea41086b94dc1c15ae17cffcbb211f1415acaeecc3d5be1f5c4c27ce5ee60454a49b453cca06587a64259e7091d9242d8f7e07cf8 SHA512 641a4babfab26eced6fabc54587d77b5e750c8b0af3e024a493f55444585167bb4e21aa9eae77ea5322d3c9071ea3097c3d79343bdc3854c372d9a944f7dbf18
-EBUILD ansible-2.6.11.ebuild 1623 BLAKE2B 28e5e0c4e05904fa61ccb810b8ab546a41824c52a6d1246d9f9ae6e3d60d6d6c99ef91fda9aa304d0dda7fc3afcaf78e38731a189ca5fd5ccd1cf3e7dd7a0dc6 SHA512 44fe0eb5c7b0fe17db4e42abdb0c1294769527cdd724929799d517e1b21ce4a75ccdfa1a8099aee75bbd579f3cb820b00ac41ecc6903c18f03ea3a3ac31956bd
-EBUILD ansible-2.7.4.ebuild 1626 BLAKE2B 84fe58d2c7daf64cd7a4fa3f22b2a09738c3c8aa88a6a6fe4dc0367189e1e6d8530054fb38f317adc95bc6a909a99939aa8d54ab77bcf8f7f4e748b9b08cb6db SHA512 75b8810271fcf75da109e5641d58b1869d9a2e5874c4c2744c25d970ae6d7787d856362672644aea6b38e7b133bab51f2d1c8412df32d614fb0558789da7b92b
-EBUILD ansible-2.7.5.ebuild 1628 BLAKE2B 75c493a396ecd1289471706473f927ef6142e680684934a71627dc7db9bd98ec574e05cd15b5fa70d931d4fabcc7007dfed980b9af639591e056f0db1ff39e79 SHA512 c44d7752ce67fdcc289081cef230afc7dc38bf187a9bbfe9ca1fd8c055c55b64fab153b9fb5f6faa34af57349db40d249308a65496e4f2aecd78d9bdf4848535
+DIST ansible-2.7.6.tar.gz 11796062 BLAKE2B 171dbcc7380ded52b03b9b109705008a492dbc5b8542fa600562c66abb8c3d3ace6bc92696559357d62fec106938e8fa4366b67cd621e4e8144fad59d0870db7 SHA512 db0813009b4683b74bf4dda640adc3dad750e053c3a87f97c6e61a2a5ea7668ea51e97ec204ddcdba6f09733bb399f824f87f365b74c35315b979603c99a6b70
+EBUILD ansible-2.5.14.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
+EBUILD ansible-2.6.11.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
+EBUILD ansible-2.6.12.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
+EBUILD ansible-2.7.5.ebuild 1626 BLAKE2B 1bdce86a17494f3be67aacfa001dcad3cc573bf5829bebb1b91503ccff18b7a612df7a7e384b630e3fc17ac0d40d2efb0a1f3ad6ade9642cf03d17b0d0ae0c97 SHA512 dd2d96a324a232b6aa8c903d7b890e434c2143c393409ded7da43931cb65544577f8cb6cc64fceb5dcefd5d9b0e3c7c9c60132af8e97c6aabaffc0e494791f9d
+EBUILD ansible-2.7.6.ebuild 1628 BLAKE2B 7d378d511ba2e0057f277185aea987022248e9c2c2f78e3424b92a3c6b35ae52ee0feacedb88d02f26742089a64a4b8afea1dba4241530a697adbd6de655aada SHA512 74c8acd86aa822edcd67a83b5ae4c19f27620ea22fb168575f6fa5bf993db795ebecc55a3a037a08bbcceeabd60ed0b938221631656dae579547095cd22710fb
 EBUILD ansible-9999.ebuild 1639 BLAKE2B 363a22df345822cd047685b7cdf7114e5e1a1276bf90463799712ee90f751deea4c487f9c96a807558428d3e5993f4fded0017fb5d37b75ff6e550a6ccc32b2b SHA512 10d18db06a345555299b342eb01c7f3355f9f71d70f0ac6b3f2fc3837859161821c8c5771bec3d943647cb1c5ba8abae8c4febdccbbc4f2d747aa0f848682b46
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.5.14.ebuild b/app-admin/ansible/ansible-2.5.14.ebuild
index 71d5cc29eccb..90340deaacc1 100644
--- a/app-admin/ansible/ansible-2.5.14.ebuild
+++ b/app-admin/ansible/ansible-2.5.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.6.11.ebuild b/app-admin/ansible/ansible-2.6.11.ebuild
index 71d5cc29eccb..90340deaacc1 100644
--- a/app-admin/ansible/ansible-2.6.11.ebuild
+++ b/app-admin/ansible/ansible-2.6.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.5.13.ebuild b/app-admin/ansible/ansible-2.6.12.ebuild
index 652b1374c856..4bec3453ac7f 100644
--- a/app-admin/ansible/ansible-2.5.13.ebuild
+++ b/app-admin/ansible/ansible-2.6.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.7.4.ebuild b/app-admin/ansible/ansible-2.7.4.ebuild
deleted file mode 100644
index 3098582f06bf..000000000000
--- a/app-admin/ansible/ansible-2.7.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
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-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 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}]
-	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.7.5.ebuild b/app-admin/ansible/ansible-2.7.5.ebuild
index 2f38c77741e1..256812f33d6e 100644
--- a/app-admin/ansible/ansible-2.7.5.ebuild
+++ b/app-admin/ansible/ansible-2.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.6.10.ebuild b/app-admin/ansible/ansible-2.7.6.ebuild
index 652b1374c856..c32faea9ddfd 100644
--- a/app-admin/ansible/ansible-2.6.10.ebuild
+++ b/app-admin/ansible/ansible-2.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index 9ff43b217be3..09375f17ed2c 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1,6 +1,6 @@
 DIST augeas-1.10.1.tar.gz 2289207 BLAKE2B 6e3cf750c4d3faf7dc472ec7bfe3c46f5babca294d2bd5169cca419c2f93e21bdd656bbc44b30ab66c00fb793df1aa045f60c1260963901773c334b9019eff0b SHA512 382e8ef6a5bd3d12d7d2e0d2987f39c04ff7df3f07cd68aa732bf266b89d5d59a85be63921a7ff70f9219dbc6bb8547f80528242caa9417e08a008d1721cb1d2
 DIST augeas-1.11.0.tar.gz 2393675 BLAKE2B e7c50715fee892b47843f9be4ec9e88937c0ce10544b3e212d9c32a6151bbc36550d711ebec9db2a691e91cc6a2cd93696d807b440ab57a678ca6680426a4b03 SHA512 1b67bb7fcd9b560d3fe4a5c753d5e778db73caaab6e50367afd123eec107b65b73096913ac7d5170e85f5b63ff3522b2a6932b130e207ab22560dfc6e267b8a1
 EBUILD augeas-1.10.1.ebuild 1000 BLAKE2B c6d0e200c970a67013c4495d5018f622a947c96de0f3f6435b9b8ae193335a5c7181e33debab36db20fe96fcdd87ce1e4e4b00ea2a22c3ebb37aa6e46e906608 SHA512 85322cb00d04bf5b8c9b7534126ed6c966b73f094b63afc211345d80ee83a836d90bec866168107d390072c2f0d90ea113b4fa1b525c54d4c3d820bafa704b9a
-EBUILD augeas-1.11.0-r1.ebuild 921 BLAKE2B b58477ad5d583f7b19fa373e3fd3fd1a2dde55deef733713e43ecb101823a58da56b6e796db7a592f57f68fb3ba3738e2e02a2c578b19bc1bd90c6ef06b38b89 SHA512 7a4af83123f3a44d0e85f4f916f65619353084720429f3ed1a61f8f3d0aaed169ca0fd9e3f253c3125efe1b4fe899af87231a58aaa77b9969f5d9b51bc64c39f
+EBUILD augeas-1.11.0-r1.ebuild 928 BLAKE2B cff1daa25a49d177469f957656b892b9ec511b6a249f9106902b8339e632edc501fd9873be22d4f61f835e43ff0042f8935037e5c092dd4133d1bb242ff6ba14 SHA512 6368c5f1913ebf99e6191d819b89a1d953aef0e3704e3e00fc6e86e52b9bd06cd784bb5b5021924191bdad1e6fecd42e59b5393671e1246358b961114084e1d9
 EBUILD augeas-1.11.0.ebuild 997 BLAKE2B f3d422e9dd5c0fa1bc0046e956c9646a43b0acd495f3264f56088183ccd363b6db427341e54cbb2e08785046d17543c622c555ef35f7af3f0e70c916a0cc4254 SHA512 15a1f7475f967d6953e023dc5797096f69108eac0740eecffc63dac3af0f11786dd1f5279f08333ff9f5e570c1d900855dec1d197d0e99a4110474ed94c4de80
 MISC metadata.xml 693 BLAKE2B c47bd36818c81a0fcb3d8f2e18e7a48797038c8a4a93302d592140faaed41d093523b6ad407b58dc7ae8c5f81c999c04e8514511b685e2a9b7d556dea177bde8 SHA512 1fcdcea259ed6cb652d08e763ccc67bee7bd5da9a7d3600dd492beaec7300868a47a7afdd71950ca8631886042428fce36cc17602a0776a9fa489f0fa2d27436
diff --git a/app-admin/augeas/augeas-1.11.0-r1.ebuild b/app-admin/augeas/augeas-1.11.0-r1.ebuild
index 339423a7d7e4..75dcd83cc457 100644
--- a/app-admin/augeas/augeas-1.11.0-r1.ebuild
+++ b/app-admin/augeas/augeas-1.11.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.augeas.net/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ~ppc64 sparc x86"
 IUSE="static-libs test"
 
 RDEPEND="
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index d29e0d536a61..e8ed53db6175 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -3,6 +3,6 @@ AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e
 AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
 EBUILD conky-1.10.8-r1.ebuild 5148 BLAKE2B bb6889a8179156c0b53afc5650d7a12ccd9822ce71996301a77f093a835a78d9c7798fb5f3dd8d8e6263c1a1c7a2f1b1b84a3cfc932c2f7028a5973c7a536956 SHA512 94e69572ab007c4fe2b1289b2b6073031c7975ea7c0339ec34326d74a185858acb9677621f69043fe51caa79bb9b5df005b319d100bf05257c6126e654fa2bc6
-EBUILD conky-1.10.8-r3.ebuild 5175 BLAKE2B beabef522d97c4a2bf565824f2d58ee4cec4ded348789142fac8c20dcb2e266bdd70da896b48c36a9c9a93347ed527d691ae7be2c8d18b1969614e99f2b7712a SHA512 d8a054c323877a249502ca41661336e04ce8a2dae4dfaabf092d4b2e6a37ee763e3dc730c75365ce562d3f843f790c5e8654ae732c5b56e1e499f81ca2851b29
-EBUILD conky-1.10.8-r4.ebuild 4727 BLAKE2B c2e8bdd83c6a811595b7f5210d45a3e003f18b75a3b42558154897f945539538e2ccead510cda94378cd322a056be49dbf7f4f0d3b19c21d5f63292efe81a56b SHA512 eec2f0d04eff1ca91c4f8766d4be1b7784966c22d50ab3cf562ed636fbf29e643fdc9902647bdf1aedcf50f28aa694b31734c1c18e9353d9451c44a0c856524d
+EBUILD conky-1.10.8-r4.ebuild 4723 BLAKE2B 93de51c63f3370998e3bb2f9904555108a07a2bd191631c4c52b191ec37acb2fd767a1bdcb7831af2b1a89965a29dfadf8588683f3fc8c7830f78271f002db99 SHA512 47692933de7e683ad3a7007ce01ce3497c0b204ca7773b4531dcd2ee41ef95d587a2f2cb7bd6c4f4128851283bf5536a05dd91f815ef7ce95b0b5a6c6a575ccf
+EBUILD conky-1.10.8-r5.ebuild 4723 BLAKE2B f8cec52cb3d048a9ee66e3a73a938697fa6e15309d1a6e3750e95978c4d47e5574c384089e703688ebafbb86b6e20c855893be67db834de2ee63862c07451b9b SHA512 c94c6cc8f40c9e4ea59ad14b11a41a1c95d2ed817774ea6ccf2e72979b16d12ec5c570dc95de8fec98ad00fbd10e1e569aedc82806f38ecdea8208cf914dc98e
 MISC metadata.xml 2524 BLAKE2B c86460a6b065874ba17b35f4aba4240424a71bddf0d6648555d936259a2e9ef46ae373bcfc91a5382edd79e830945baef6c54eff52ed88a7f6648254c447675b SHA512 7f9aa6dcd65d7e4a9e1829cb273329b08cadec8820afb65de5e9fb189981b7084384e759909365adad36ea587161c6eb5a193363cc1a95e0aef65434ab827d55
diff --git a/app-admin/conky/conky-1.10.8-r4.ebuild b/app-admin/conky/conky-1.10.8-r4.ebuild
index a2bc7d317c41..44866c4ce035 100644
--- a/app-admin/conky/conky-1.10.8-r4.ebuild
+++ b/app-admin/conky/conky-1.10.8-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 sparc x86"
 IUSE="apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
 	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
 	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
diff --git a/app-admin/conky/conky-1.10.8-r3.ebuild b/app-admin/conky/conky-1.10.8-r5.ebuild
index 55ef2440069d..aded0ff23a49 100644
--- a/app-admin/conky/conky-1.10.8-r3.ebuild
+++ b/app-admin/conky/conky-1.10.8-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils linux-info readme.gentoo-r1
 
@@ -12,10 +12,10 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+IUSE="apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
 	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
 	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
-	weather-metar weather-xoap webserver wifi X xmms2"
+	weather-metar webserver wifi X xmms2"
 
 COMMON_DEPEND="
 	X? (
@@ -30,7 +30,6 @@ COMMON_DEPEND="
 		x11-libs/libXinerama
 		x11-libs/libXfixes
 		x11-libs/libXext
-		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
 		xmms2? ( media-sound/xmms2 )
 	)
 	cmus? ( media-sound/cmus )
@@ -46,10 +45,9 @@ COMMON_DEPEND="
 	systemd? ( sys-apps/systemd )
 	wifi? ( net-wireless/wireless-tools )
 	weather-metar? ( net-misc/curl )
-	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
 	webserver? ( net-libs/libmicrohttpd )
 	>=dev-lang/lua-5.1.4-r8:0
-	"
+"
 RDEPEND="
 	${COMMON_DEPEND}
 	apcupsd? ( sys-power/apcupsd )
@@ -57,11 +55,11 @@ RDEPEND="
 	moc? ( media-sound/moc )
 	nano-syntax? ( app-editors/nano )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	"
+"
 DEPEND="
 	${COMMON_DEPEND}
 	app-text/docbook2X
-	"
+"
 
 CONFIG_CHECK=~IPV6
 
@@ -73,12 +71,12 @@ PATCHES=(
 )
 
 DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}.
+DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
 To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
 and edit it to your liking.
 
 There are pretty html docs available at the conky homepage
-or in ${ROOT%/}/usr/share/doc/${PF}/html.
+or in ${ROOT}/usr/share/doc/${PF}/html.
 
 Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
 
@@ -111,7 +109,6 @@ src_configure() {
 			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
 			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
 			-DBUILD_NVIDIA=$(usex nvidia)
-			-DBUILD_AUDACIOUS=$(usex audacious)
 			-DBUILD_XMMS2=$(usex xmms2)
 		)
 	else
@@ -121,28 +118,10 @@ src_configure() {
 			-DBUILD_LUA_CAIRO=OFF
 			-DBUILD_LUA_IMLIB2=OFF
 			-DBUILD_LUA_RSVG=OFF
-			-DBUILD_AUDACIOUS=OFF
 			-DBUILD_XMMS2=OFF
 		)
 	fi
 
-	if use weather-xoap; then
-		mycmakeargs+=(
-			-DBUILD_WEATHER_XOAP=ON
-			-DBUILD_WEATHER_METAR=ON
-		)
-	elif use weather-metar; then
-		mycmakeargs+=(
-			-DBUILD_WEATHER_METAR=ON
-			-DBUILD_WEATHER_XOAP=$(usex weather-xoap)
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_WEATHER_XOAP=OFF
-			-DBUILD_WEATHER_METAR=OFF
-		)
-	fi
-
 	mycmakeargs+=(
 		-DBUILD_APCUPSD=$(usex apcupsd)
 		-DBUILD_CMUS=$(usex cmus)
@@ -165,12 +144,14 @@ src_configure() {
 		-DBUILD_JOURNAL=$(usex systemd)
 		-DBUILD_IBM=$(usex thinkpad)
 		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_WEATHER_METAR=$(usex weather-metar)
 		-DBUILD_WLAN=$(usex wifi)
 		-DBUILD_BUILTIN_CONFIG=ON
-		-DBUILD_OLD_CONFIG=OFF
+		-DBUILD_OLD_CONFIG=ON
 		-DBUILD_I18N=ON
 		-DMAINTAINER_MODE=ON
 		-DRELEASE=ON
+		-DBUILD_AUDACIOUS=OFF
 		-DBUILD_BMPX=OFF
 		-DDOC_PATH=/usr/share/doc/${PF}
 	)
diff --git a/app-admin/graylog2/Manifest b/app-admin/graylog2/Manifest
index 77b17ae7e6cd..7a95817208b2 100644
--- a/app-admin/graylog2/Manifest
+++ b/app-admin/graylog2/Manifest
@@ -1,5 +1,7 @@
 AUX confd-r2 542 BLAKE2B 83a8b2a3bf1fc60a2a9475d823efe39febb961d0aaee12b7b18f1d2752427e401fe2f68c83f777fba1d2f585540f4d9b422befcc959aa082a26eeef2be093b2b SHA512 fde38b6813f40633db5d5cbcb3d93fd17e8705d6f2c5805fdc900858fe2b0cf0c0c219345dc741cc2573b1f80b42fdf5714e71fa31938329355556503492bbb8
 AUX initd-r2 872 BLAKE2B 500a428a0f479dc79b1d8b7d6a1acfafe9a205a65adfacd10aa6f5e89c105c30e095e69799acd8739d9ed2b7dee0ed6d053497a74495a986b6d9b24122c29a75 SHA512 43632bd345bb3772018ce1fe32a97c85a1ad812dca2ae229dccb65302e686597dad4b62ecbc0cc5358c34761f354d51de2c9fe81bd3db71af5fdc0a6cbc0e95e
 DIST graylog-2.4.6.tgz 122985232 BLAKE2B 3a409a08f27c3abf1eadca57c4e8c9afc334655e050c0db9bad9d16e03acab6d92bfced708486ad8383987842d9b0a5ddc54e28d29fc426761fcb0ab8c65844c SHA512 e1941f4740f43c5b92b5faa7cde06fb15294acfed5f0f56cb21a7ceffb8616382b68b67d049a2982c68833d706e57b77f365665f12193d053a2ac0996801bcbe
+DIST graylog-2.5.1.tgz 123878927 BLAKE2B d168579be4d20e3a8081d608247e7101fc5d99ddd2b5f063f94d7e91d4095c6bd016a4bc1be0f0e08b5043b771070312286404ece5eacc51e4a8730dfc13dab1 SHA512 44e2ca00e47a34708cea94b74fdc0f56f3a381f161d25633bdf7685fbcd989937163508f8b47b0869c7daacec6c8bd2c874f9381e196ffb3194eb6e3f96b3ce9
 EBUILD graylog2-2.4.6.ebuild 2289 BLAKE2B c1b21ab668e1c0877b3cfcadf63538de1a3eaf9a85b043b34d56774f73e436454e499f22f8d7cc3f2262a01866d8e55ef9ea3be9195fe48755ebfb015fbb992d SHA512 864b58319a8ff84bd6a94490eea9d89de800dcad678302df1ea4f834f27b5b18a5f8c0ac8ae57bd0c23d3c0904e99a90a0d363abfc39442bef5b55a70783ec1e
+EBUILD graylog2-2.5.1.ebuild 2288 BLAKE2B f973d7f05566ec7216b298cc374a699793f9935b0ced36989259a9b7c4c8bf55c8ec50193b461d15f7429ee4e645647cca5e76f821ea5d6d40e089db0372ab10 SHA512 06424941cb8918bffbbe477c1c3ff8edb23d6505597f20a8805a27db1c2c84f7f55bdcd65d81d808408c5ea43a4a8bed4a68e211d2076ec691fb31e9900c8aa4
 MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
diff --git a/app-admin/graylog2/graylog2-2.5.1.ebuild b/app-admin/graylog2/graylog2-2.5.1.ebuild
new file mode 100644
index 000000000000..b4ba9c0fe33e
--- /dev/null
+++ b/app-admin/graylog2/graylog2-2.5.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit user
+
+DESCRIPTION="Free and open source log management"
+HOMEPAGE="https://graylog.org"
+SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="virtual/jdk:1.8"
+
+DOCS=(
+	COPYING README.markdown UPGRADING.rst
+)
+
+GRAYLOG_DATA_DIR="/var/lib/graylog2"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog2"
+QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
+
+S="${WORKDIR}/graylog-${PV}"
+
+pkg_setup() {
+	enewgroup graylog
+	enewuser graylog -1 -1 -1 graylog
+}
+
+src_prepare() {
+	default
+
+	# Stick to architecture of build host
+	if ! use amd64; then
+		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
+	fi
+	if ! use ppc64; then
+		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
+	fi
+	if ! use x86; then
+		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
+	fi
+	# Currently unsupported platforms
+	# QA warning galore but testing/patches welcome
+	rm lib/sigar/libsigar-*freebsd*so \
+		lib/sigar/libsigar-*solaris*so \
+		lib/sigar/libsigar-*hpux*.sl \
+		lib/sigar/libsigar-*macosx*.dylib \
+		lib/sigar/libsigar-ia64-*.so \
+		lib/sigar/libsigar-ppc-*.so \
+		lib/sigar/libsigar-s390x*.so \
+		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
+
+	# gentoo specific paths
+	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
+		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g; \
+		s@#\(content_packs_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/contentpacks@g" \
+		graylog.conf.example || die
+}
+
+src_install() {
+	default
+
+	insinto /etc/graylog2
+	doins graylog.conf.example
+
+	insinto "${GRAYLOG_DATA_DIR}/data/contentpacks"
+	doins data/contentpacks/grok-patterns.json
+
+	insinto "${GRAYLOG_INSTALL_DIR}"
+	doins graylog.jar
+	doins -r lib plugin
+
+	newconfd "${FILESDIR}/confd-r2" graylog2
+	newinitd "${FILESDIR}/initd-r2" graylog2
+}
+
+pkg_postinst() {
+	ewarn "Graylog does not depend on need.net any more (#439092)."
+	ewarn
+	ewarn "Please configure rc_need according to your binding address in:"
+	ewarn "/etc/conf.d/graylog2"
+}
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 79916abd167b..4c63788a365b 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -3,14 +3,12 @@ DIST github.com-Azure-go-ansiterm-19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.g
 DIST github.com-Azure-go-ansiterm-d6e3b3328b783f23731bc4d058875b0371ff8109.tar.gz 20948 BLAKE2B 36ef6d0327a373d105a891d28de4a2e620856c902f5159330d8c316a31e3dab77847c292bd14e3c014203744ebdf0dd1ba1431024a52b55991e87b92a43535f2 SHA512 079dc6400c2dc53d46cad809a1bc7723b43b10939d51624a0aa48d2734f2d44b1621748ef1820843f55c07f233bcf394d2ae63ff356aa22f66df32ca40556e44
 DIST github.com-Azure-go-autorest-1ff28809256a84bb6966640ff3d0371af82ccba4.tar.gz 113471 BLAKE2B 32f7566c24603f3f355d37367ee7eabc9cd7a97d0834425b9a5f25a6f5a79da95408cc27e224e74439d83b770075af9946f3bbec1f3e76668817ed6b81fd4730 SHA512 584f05c943dd9bf11ad65da30dd756fbbb41b7b89c672b13328dca40de9e8c3053443180f4f60dbf70915d4c44eb94b620f2d5aee8f987bbcb7f19e271c623c1
 DIST github.com-Azure-go-autorest-bca49d5b51a50dc5bb17bbf6204c711c6dbded06.tar.gz 119019 BLAKE2B 3333f2b5ce83b3200d85d5b3979e3331c19cf6f2b1b7a03fef69021cac1918f63114e0a281af17f9c6f704309e8c215e79b02f6391a1cb306cb3ecfeebc1e08f SHA512 060f98cf8bd680db5384c3981052c0397e35fab83412c19305944c589c2ed94a50ad9f272adf96cb4dfab151c4927bafef3ac2b04ee8746f2afc6c520d69498e
-DIST github.com-Azure-go-autorest-d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz 105565 BLAKE2B a6db0d05102de0ff49470de5c8936d6f327ccd65c92bea6e7e7ddc0b4f15fc8b2baccc0aa929ccd8b4ec0b07e42f15ffbcd49e22e88eb2e334c193daf78e2256 SHA512 2e6992dbdf57f9d87d3e0525b29b0423e0678caeb699cc3b332b0942d8efb9ad79140b1b72ffcf649ed5d40d44210314e70dbf65484f456933bd12dc0e07ec52
 DIST github.com-BurntSushi-toml-3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz 42084 BLAKE2B 09e4447d28ddb0824547d9aaa84c3c16acdc309faaf44434119e1851c40b3d3f67d0cb745691bf47a560084c93a9ce492c715833405061e5fc6114cd674b37a5 SHA512 bd14b162d4d33f62dac4abfe3bec908ea45dce88b9a0e5dd173e9f0576e29344c5136bc48e5c6602add41ddb71523e831c53107b47c4b36832c97e7b0a3d18f9
 DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
 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-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz 15744 BLAKE2B c5ebbc22c9d995a9bea44742bdc513dea977276d43306f1c9edd2c59eb9844c1e6f304ba4fa5f340b6052abea5294314049bd9055154af2d6f3e2ddac3d6cdaa SHA512 321734efb1dc3d7c6e5795c991511340330c0ecd44571f84fe6d5f6e36945c68b3fe2c47c8bceb4c80d0eaeb21b7a2e45f856b65e942a74434e1f28892120460
 DIST github.com-Masterminds-sprig-15f9564e7e9cf0da02a48e0d25f12a7b83559aa6.tar.gz 35723 BLAKE2B d74064c3b7f09ce7f6be93c27917f1b5ab564192131c0d24e3edfc83343219bb1b3f4044d76e0a2723b2539ed8b160788e911ac1a7c780851949168820328424 SHA512 987a182ad90ed56e00fc81190d357b9390404dcd25ae1eac56f0320eb0577388621c2958816e8381641fa53dc67052dae3356762a546631eb605e8b5feb30b01
-DIST github.com-Masterminds-sprig-6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c.tar.gz 39054 BLAKE2B f730fe75f18e1706e9c15db3ff37ca63e8c66276595b6b6dc253b1f0d23859944e2b4d633ba2e4c64def17454e4dd2535984c4f39c786393318a829f9769b2ec SHA512 04f6d5e969b9c4dcc9f2ca40c3f475c09ecb0f7f196736d4e5fde384fe8f79227334b9b3299449024b639fd740c65c08b8b0c63427def6ccf7462e5844f3dfde
 DIST github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz 27278 BLAKE2B 072014886aba809af343bd5b5a2cf21ef95a5712ed80662f62591fb58dde6e71f075d74d93b755845cab571f510ce1e59b0cdcbf61fd8a485738acab14345c29 SHA512 77a2d594f7da607c9c1502e9ad64414c177450a40853d6928c690df2ff6adce0fa79627ea437e07e7459b1956b00db9d1fb8b0e08bff2c0e2c1f98420b36ee53
 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
@@ -19,7 +17,6 @@ DIST github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.
 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-06bda8370f45268db985f7af15732444d94ed51c.tar.gz 10815 BLAKE2B 2fdb7af9f8b31a5bfea7b71a2c1dab85b4cff869fb04639c0fe8d0c0ce48f978a1cdf4ad09d64e3d28b307509a145166276de91245421e9219903f90cad7b17a SHA512 8d16b30049d66d8fcbe0f248d9eca2fde2782538b7246f84e9f7d5471d39929a530a0d0661826c4a6096f9ef1641f3e3e6e2ff740a2c7496fa3e0a9a34d89650
 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-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa
@@ -30,7 +27,6 @@ DIST github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.t
 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-evanphx-json-patch-36442dbdb585210f8d5a1b45e67aa323c197d5c4.tar.gz 13289 BLAKE2B 4085dcd289abae0130a053349c1d0165858f7407fc3a93dcd5875c45a8fb1dd1b182a266735a02041492fb905d273fc84a9e36bfa41132bb7445158c98f7dce1 SHA512 c2006b4b5f7fb97da69b6a7144dcc5256e2987c0d58da7e62f59b0defe9c8aa3b4a3bd83a3bd9d960c1434f910480d87c45be0b0f1af323159d2de7ccc9d10e7
-DIST github.com-evanphx-json-patch-944e07253867aacae43c04b2e6a239005443f33a.tar.gz 10453 BLAKE2B 9aa008b347c27a66bd6fb84c4ee219bddb71dc8063975beb7e8d2d01b41589e9f9caebf81c878ae1122ebda9afffcc0d242ae29c69b25e33e0b1a773f764da7d SHA512 34b0aba157e3b51ff88bfecf55dcf1119a4da86a5dfa3e4ffd802d693691dfaa02c238a34e4fd32f668aca801af60d50eea13b95724946b4f66f29de4b9dad6c
 DIST github.com-evanphx-json-patch-94e38aa1586e8a6c8a75770bddf5ff84c48a106b.tar.gz 13162 BLAKE2B 6367f3dee190d32d6f8d7a86f5928d738aec24aec85f41c896fa1bc896a62e9ed68700db7b23fd5285bc85254e0c5b9c9b675debfe47513650b9e1cc748797fa SHA512 481945473f954c9e2a618bfd95687121d28ea33e46c360adcf2c9315e42f0b655da65d544740bf38a14a2e02dfc799036da210b9925cf25a622ecdc1c9ec8948
 DIST github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz 8224 BLAKE2B 8997719d55e4c051d7addc41bffbb11092df5dbfbcb35de6cbbd464c8232661c714bcf83eb652143b6cdf5e868b1df233d23c17c0341399410bc4f18d3188158 SHA512 1db86023b693c41a2bb80ac3e3a26f54aeb741b417ae2af81f5d4ca44772ba45a02cdb2c928cfcaca425212717ac3501b627a39fa5794b41d93976ba65c24602
 DIST github.com-fatih-camelcase-f6a740d52f961c60348ebb109adde9f4635d7540.tar.gz 2994 BLAKE2B 2c684342854093e6fea90287d6cd2e56cd5e180f2e452a9d56a73d0c51df3649bb3c15771b6274a200cd1928424298cd119ea3849f279f3a6094fd84e6a73c18 SHA512 a27f645aaeb46891568f1ea0223fae23d00a46918947446fa9e452fdb0b5d1f20bef543ba0be536f586eccd23e0bb413a33bc74b932cc05c6fcb74aa94ce80e7
@@ -41,13 +37,11 @@ DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.
 DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a
 DIST github.com-go-openapi-spec-1de3e0542de65ad8d75452a595886fdd0befb363.tar.gz 83793 BLAKE2B 48404746fb453ca8b2da12a14c89c2ca96f326be17c023bd5c7f9a53b4fc20ab4e68affc7896aff7fcf213ce788a8ca8500f4588a3288f301d50194dd0c52d1c SHA512 8798188e5037d1b28c4376c05776c107ffca09a4932ce5936306fc7a87d3121aaaf810c3dbabbba8ff20e52ed665e00df30061199b5ef1021e2fc974455830aa
 DIST github.com-go-openapi-swag-f3f9494671f93fcff853e3c6e9e948b3eb71e590.tar.gz 25710 BLAKE2B 4ea4a7ebe3193b3da07551bf0bf78750a467ab18fb80fdd2c37be25c31252200f1e414faf37876a0b43ec6dbd56526713a83b636cd713b909538e777973ef02a SHA512 6450fd254866eb541c903a007c573666334cbe5d93aea5281d83c1f81896eb2dc0d1c5a55ab11e4d4683749c078c39603d6ef1b4f2b0e7a3719ba1286c075e47
-DIST github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz 62918 BLAKE2B 0a7f97fe8976ea4131ff5b0d95c974d38cd9a95e708f4822a77ae6a1c962afba45373771c2e2de85ee5288dac016d61f3696e7e55f41ab24a089dfb5265b33d6 SHA512 9d3e6eabcf0872a01f7fcc761c371389b3723c07cd0511dc737a0b888c843e9e45022dd0829ee4f47a3d88e7f95471bac62ccfc8f52df2d5642b2f4ff1d4c1e5
 DIST github.com-go-yaml-yaml-670d4cfef0544295bc27a114dbac37980d83185a.tar.gz 61351 BLAKE2B 78103165ce41b2185f103d62cffc0fbc410aa05928a574b0cba2caa9e2f3d2868dec8f8220657e01edd4b86eb33e412512dc8b4275c918e6a55dc2d240720657 SHA512 d7ab43b219828773ecb8fc5be0a52ed83c9c8e195bd318e68fb741b487c4ec20847f04e828737196360fca7f62ff04839c676ff6cc181890d725bea457342ce0
 DIST github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz 25955 BLAKE2B d6c9b20f80800396ebc3eba2b08ad48522d297bd0da90ed32d6ea2ea4e575e9feea112513332a3c55bbeae2569770433466536698084e787127866efaf0d25c2 SHA512 e5767898e8aaeff59219e0a0578586b63717d5c8507c74ecb813e8e8a7b02470b10df0452cc378c7f0a4b9bec030be22deb3c3ce7c5ae88fd739271cf05e36ad
 DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 2444654 BLAKE2B 592a01beb3b9ab843786768f97c6e416ec1d167f1afc27ec1a60921b6ed038052190adedd97b635390a2386488c5a080b01d438dfa5a3fb87966b238e091b978 SHA512 97957c4162e542f0cbada090a38220e33e107259a68ad6b4453a593e7add4d725ecbd18a61506062d27d61a697654a2ef1a0b7410789275b20f20d42a704c459
 DIST github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz 213923 BLAKE2B a53b177f8b31b8927b923c5bcfc4ee4a1f48725e6652f38e20bcf1147a646411771bde259ed7917ad12913734375f880e7c4cc9b49b370e738928286b432a877 SHA512 903ded0a887db7a6b6783bea7d6af82087449ff05ac34367f3472f23c80965a4f6b4883e6983e57560a80a6b81eecbf285729d4c38b505cf1e99274d1d87c1a7
 DIST github.com-golang-crypto-49796115aa4b964c318aad4f3084fdb41e9aa067.tar.gz 1451379 BLAKE2B cec68f14af4d7b1c37941c3dceb70f7267f318a57e2d8f38d515c9a398803a242fcc074098f4c490612a0edc25e23704dcf05e5b8ee4480f0000bb6f781db644 SHA512 1b6bc00add4c897858108ace4c8c134250a08758347cd9ae30bab42988be0d0e870fdc9c83114c72410933bb46c93cb662da2e00787eecd7def6703d3077f749
-DIST github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz 1431151 BLAKE2B 09738718227b69635d6cab53397f3ba09295a683e7b8175829259381b232a8e56f4035710a2882c7edfbae61d94f673aa3e7301a343d1b1938413023b3c9f823 SHA512 ff5eaf61e7dc133a56a90d100c4b48fd2775145b457febdd1eb9ec39c15ce6bc73665873bbe658d6b4bb94a008d7246317d751a41b5a62b43d2055ed3cb01e02
 DIST github.com-golang-crypto-de0752318171da717af4ce24d0a2e8626afaeb11.tar.gz 1636269 BLAKE2B 85529e4607b4efc684dd5a7aa726294a21f3cacc4c6331d91afa95e0e14756b8ccb7d461c6c4ac9f3e0d6b864e63afd763a41c8e7df23a2b8afe0a1264d635f2 SHA512 c1c5380ab03ef5fc8aee6d5937a90286bddc32d8b9488b38b890654657ecdf5f878d74eef2d32d6789053dade619e4aff006ecb003cdafd56b8730768660de80
 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
@@ -63,49 +57,34 @@ DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.
 DIST github.com-google-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz 12668 BLAKE2B 01b0f7b14690c4c2b45d789773e4cd8bfd3e94d66ad08b43bd06511535deda5b6b3ea611ec1023cefbf272153fc37cffabeb45d714d72ded6fb95cba77a47ca1 SHA512 312a5a60e11c3dffe9099a033a4f2349d6caae14139e9b6b25429a42bf3f88dde08dd81c2443f2a7ec44505c990d50e059002e0d81fa105bd68c2a221bacb557
 DIST github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz 12733 BLAKE2B fb29066f37f5f7d6aa5c7e0cf4a90b9b16de012d809034aaaf10ed4a43b5941e68c8925fe991ce5b25fde56995e8e66317fcab2caf97a722b12cc03825190488 SHA512 d3c2b411793681cf5b55438e3ba23512b6edbc48677c2efdbaea02d226519690525aba848cfde45205dafa39fda9f2868960b39f744aec80222b61dc42b77da7
 DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136
-DIST github.com-gophercloud-gophercloud-6da026c32e2d622cc242d32984259c77237aefe1.tar.gz 514142 BLAKE2B 6ed841cc143be653a75af99b6d68f10410c957752a7f2fd315b744df5d492da0e1ad4083620b155a374fdf647739685d31b1fa9c8940dd6c692abb89127ad684 SHA512 0341f076ef430d544a15302269d16a788a1e47a8f2e35c01cf9c8fb9f710b58d3a3e5554429f5e747406484d7d7682e46590e5575bfa3b90f44b7a89ebf78f9c
 DIST github.com-gophercloud-gophercloud-781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d.tar.gz 543860 BLAKE2B feb8c6b67ed4af87e1aafa1f93ebbe1f3e79f69382d93b4298b69e17a4d0b079f1341da6d1c740c1d9e62e7e072e6e2b87a3effbd10dfb996b2fd741f01f4af4 SHA512 5e6aaef5d0e75dee5c4531441b1b0580a456c7c7c98d69ba37c37928d28fbc0136765d7a62a3564259460d817906b77bf8e3bcf76515c3a7ce4690a62acf414a
 DIST github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz 6864 BLAKE2B 71816efd7996458a90b192780fb720b9a0f7ee8bb01df6d1fa0e079ee56a426310f632839e921ffb89403145e63a34e90e985099221c4253bdc1c316f1aed37c SHA512 7cc647e6347258b9fc455cda220da8f59c3ea92f975369ce5901289102d5db8c45ea6fe24a587cc4dc95a502c4fc203c3503f9db0c427cca702418478eb25f25
 DIST github.com-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
 DIST github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz 20764 BLAKE2B cb5d2ef073be0df0b185cede4c4fd924d160a4beed06fe6ed748734865272ca958cd69208684492932cd4ecb5b36c07413cd0cda3fa43ac4cc1b0e8337407eb7 SHA512 6b8b8b980ee9b98b7508045c4dfb5be38dac586d0bc2fb3b9118824336e8a32b2428265e9aac427bea68cb7ed5079cf1ef910de284862b1845f05c23e09dcbc3
 DIST github.com-grpc-grpc-go-5ffe3083946d5603a0578721101dc8165b1d5b5f.tar.gz 334844 BLAKE2B 6b1025e0248b427840eace218538e34a21338990436a74f6e7c29da7415ddaa343a262b8f9b87a2f6c82d91d66dc192465a8ab4f283b4427f63e0bc98020df62 SHA512 124bf026d11a15aeb512f94807765e0b8f12815f551eaed14d634e0966122c1b18c0b9a2e06330aa6911ec9d923ae2e9e88ecac94d77874bc2ff850f2708fb0e
 DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
-DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
 DIST github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz 16077 BLAKE2B 876bad301ff0e8074442a7f375533113c93d5f58d61969f7455a3aa653d2083fd9abccc0410a8c46325328c4616d1beed2cddccd379ce21fbf4a8bfe8c322cac SHA512 3100ead162c3339b07786ae40a27c880ec9309b4dd45af94d686cacaa85f0cd41d87e3509103789122fdea787e501235ff5f9c770fb1d3df50f1dedc80629359
 DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
 DIST github.com-imdario-mergo-9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz 15928 BLAKE2B 1a6f95308897829160a1a61d76fb17fe6da2159ec68a9def1294eee0f7c5acfa0de9581a7afe05353a79088374ebbe8ca1299844666ee52a3074b8a2ed04d02c SHA512 34bdc7ed182a4290862c4c21fd9442e6b3bc03a16aa04a54aede48f16c0baec62478dff97433c6d3370b110abf4a712b304064826589ef922d1bf8cfb80fd446
 DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
-DIST github.com-json-iterator-go-13f86432b882000a51c6e610c620974462691a97.tar.gz 101395 BLAKE2B 336dd30f7906023e87f835df12becacd8e3e4c0a57b4897b277b4bb04272440257ad150268d5cfb4ed69665f1a168d919d7a746b1da00691afe9e7669f6f3a45 SHA512 8497d6578a78ef575834350c2eba15d11ef6273c472cda9016181c044e034ea002d4039b99852a9837425c791f199d121b19edd701b9a9c47c19a155a19baa81
 DIST github.com-json-iterator-go-f2b4162afba35581b6d4a50d3b8f34e33c144682.tar.gz 75576 BLAKE2B 0fdbeb288b06b3fef3d282ad45e52e91a2371f56583aa90b9ff2c353e3ca50867cdedce1dff64ddc044c15d66735f842ceafd94108f34216da3c7c55551440c7 SHA512 60389686a74ed58ef961656bf2a15dcb6e0526f6c79849ef9037314a5fe00f188cf33e9b382246e52001724964119dfde88da02c6b5cf34085b75dec16a3cf22
 DIST github.com-kubernetes-api-2d6f90ab1293a1fb871cf149423ebb72aa7423aa.tar.gz 690029 BLAKE2B efc3977b0e15c4a30682e544227e9f796e032c78ed559b01882616e2c5d01714c3c2280a6c80c0fc79a04f11ac84284f6210031d2c32e3468f3977e93481ba03 SHA512 1c0a67a23e0e557c6a735e769875b807069154bbf894bbb77ae5eee320161bfb6d6b304c04244a064bae201d6b5b9ab6e0e3d47011a6f86c3a00773eae4bf5d4
-DIST github.com-kubernetes-api-8b7507fac302640dd5f1efbf9643199952cc58db.tar.gz 681931 BLAKE2B 3c26af4d821fd63157d522a63371c168769c3bccb5ae02ea484554fc416f405932e8d534f109cc6b6ac233393ab99a06456abf65b4896a44f635f033a12d0b32 SHA512 006b8b4be9611550efbf258d3960060bbdcf12cad1b35104274f92fab94aa7f568dd88a901d50020c9ba63662318c1cd63d04e7b5dbabfb23dfe72d0153f55d7
-DIST github.com-kubernetes-api-c699ec51538f0cfd4afa8bfcfe1e0779cafbe666.tar.gz 681854 BLAKE2B 036aec7004f00fa62b9e330d52a427b945b9455a55049f6c6620110374e1928aee66d31d82dee97d264d231f8c83b52e91f6ed5ed9953e57ab86f31d586b85e8 SHA512 66dd666c5cd0eef845eb1c31ee051cacb7b260f68804b5b58482bc5565693b4072dba7aae6fea9e58ba3729428eae2d03bf89b8a8b6b624f67ecd43f561d045b
 DIST github.com-kubernetes-api-fd83cbc87e7632ccd8bbab63d2b673d4e0c631cc.tar.gz 721707 BLAKE2B 1b2d72e175c801805cc52f9357abd62f46c95fb2e12db462a5b2d79f03efc81dc1126ac58a9209e6b1e5cf829015307ddf2706d5aa6949d87317cc5f6f62c721 SHA512 791f0378a6b6d5e9bccd8cc1faee32135e9b7027b8ebb91cfa8e977cf0ca8facd7c2c34c3b65993ef95e773c1ad638a0ff3b9c4d720a4263e13f3a1706818c76
 DIST github.com-kubernetes-apiextensions-apiserver-05e89e265cc594459a3d33a63e779d94e6614c63.tar.gz 6534973 BLAKE2B 65462410cf5da591a26ff5b622991eee124edc84302dcbad8ceb2e6034715e4cf3a53f6dcbd336d716a867d8563c5896c4b2c57a60560ecc3666bc223b1f4b49 SHA512 0003fc02728f1593c661fb6c5b88340dabec903a1850d938e9f14c1837151f69d33283c0d3cba85c7fa904abe6f4fc95054ee9bea90893e86f75fa96d31ef434
 DIST github.com-kubernetes-apiextensions-apiserver-898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz 6322992 BLAKE2B 18d636098012e2fac47bbed778d4b1e2c6b6c996044aa46d429e9297a8cf6504ddf6126098dd879bead50dfc22cdb3a46af062234b486a4574f10b841ed04f59 SHA512 a8a0ec14df38cb25c09b2800da1ed6cec66ebf38e42cd883e2c0852181a7ad7fe5ac4b8e618fc5a6adb168f2fb822db80e0fbd14ba008e041182394599c41ff0
 DIST github.com-kubernetes-apimachinery-103fd098999dc9c0c88536f5c9ad2e5da39373ae.tar.gz 445992 BLAKE2B 6eeebdb18a53e92b090bfc5bfbd294732f0fb950349bec2d0451cdbed489db8771f99df55a784da225c947f20a6dec655bb4dc921da5d0904eb087dd50ae3eb2 SHA512 58a22adcc0d88f0ddcba8f6dec82edb9a72026caec724437c30d05dd3624041f6fff4e77a11409945d0b8855e6a5fc04a4f1ddd6fa27bbc1e5e9df0dc382628a
-DIST github.com-kubernetes-apimachinery-54101a56dda9a0962bc48751c058eb4c546dcbb9.tar.gz 446533 BLAKE2B 709ecdba91821a3533d85ab73a6392ebaaa549e4fe78b9d0510bb987e275a174e621ec92c4ec38cd137f60922b8f2a81fc093e18cab9fe050bffdf5d9deb576f SHA512 97ba85121dcf5b7effce14d2c5e2d67597afeb1d438ed450396ca94d46dfcd5be772af300d37d339e5ef39408fead8b8f77731a0823a270d0ee44dfb7b88e671
 DIST github.com-kubernetes-apimachinery-6dd46049f39503a1fc8d65de4bd566829e95faff.tar.gz 454385 BLAKE2B 471286e60b0049311a90dbb5e4e9c32cedf998670941b3d317a49773df4afd675380f28a5cc2367bdf9dbbc7a27acbbb3e031c22f4c596331b454b4bb6a020ed SHA512 76f8cc5ddf0e41c650620032abc08a6ab014699d91df498379f5bb61549d79bbb5e674dffff195e000eeffe8692aab16c254907ae81f87842120b9bf318822e1
-DIST github.com-kubernetes-apimachinery-f6313580a4d36c7c74a3d845dda6e116642c4f90.tar.gz 446523 BLAKE2B 5d24d4dab4999714d1fd205b34358661eed4a3c0bbf83b08118fbe11d3024cc1ff5e9f0470acc80050a7f809dc8cf21cba0264e5a1ee011a6ad4768514cd4df8 SHA512 0f97dbd621fe197f2f640b1692ccebe687347585b5885f1f366aaccd92f6c2fc08ed7bbdf84ff13c3c597cb60f3b062dccc81e659684d5352394f97ecc025846
 DIST github.com-kubernetes-apiserver-8b122ec9e3bbab91a262d17a39325e69349dc44d.tar.gz 1144217 BLAKE2B c8120be10cb63933a7bd13becbd2cca06572f3a456cfbfebdb310f65e7fc31fa6bc1237ae923a478032556510b94716fab9260ee0d1e7b82e17561b82cfe9d79 SHA512 974e2d580462e75207f6865acc179eda584a3fc25cb59efc8aefed53927c3bd7cffda5913a4294ecd9f3df4ef2b30160272c0cded1ac7daaf61e2ccf80658024
 DIST github.com-kubernetes-apiserver-e85ad7b666fef0476185731329f4cff1536efff8.tar.gz 1181224 BLAKE2B b7213362d7d26c73853e7565e9bcf78b042310b98e91ef98e783bd6e3a5161c1183d03090b0ce4adb294ae552fa13440f04b49b6cd2aef50532424200c1aaad9 SHA512 34331561a1618621b265d5121c83dfbd73545c961d3295268540279c24a7379f1139e3b16bee3e93b8a2397b0c7bce8d7123d1621155a51fabdc41cc4d53b84b
-DIST github.com-kubernetes-apiserver-ea53f8588c655568158b4ff53f5ec6fa4ebfc332.tar.gz 1128422 BLAKE2B 21897cc3baa81ff35fe04fe8e13a652e9f308d04043d49756e2a144bafc61063758fff7c51dbd795f8c395824df51656d5e58626aa52d3c7bb1c66ec18287139 SHA512 6ba081a066ec9e31623345a91df4dc85216576b9c945f4e514790a944451d082d72ce5c5599beb6a3bdb55114cdc118f283a35276de85e78190698dbb560be98
-DIST github.com-kubernetes-apiserver-f7914ed3085badf66a1b6f3a5218ada28f7bd084.tar.gz 1133144 BLAKE2B 0660bf2ac97d14c5eb99161d466821c5466ab143e9aa3da076239ddabd4e0d48ad0aa410ebae4b777719dca93e7073e9a228697e758df1eac9288ee2bc022226 SHA512 737047222f6a10c0437957cc63a97ee1f7b6d5406eac5ca8e012b49bae1ef23c9ffb69c8e39674d7fb3a47b70740e01ee992bd60a10531436c3b2d2f82164515
 DIST github.com-kubernetes-cli-runtime-79bf4e0b64544d8c490247abae089bea572ddae6.tar.gz 61380 BLAKE2B 059892b94b686f63da24cb34a63492ad9202d2eace11d9184be6ccaab2f77a35e3d79de0e942769b52948225b4339e8c43f14e8daec0b42a1d2c3798dd53bd83 SHA512 448e4c6fc2f04fa2f9d2d81a6afc79285f0087d9a9eb4ce0ff22b2a9c644a3f68cd02faff3939bfe207bcc9043c2240576f4f445c66786a324fb652b6561e780
 DIST github.com-kubernetes-client-go-1638f8970cefaa404ff3a62950f88b08292b2696.tar.gz 503028 BLAKE2B c420f9eba15842e807c1997a59adbec288d207b85ed31b42c1bc10e0c4f464697276e183632bfff46d15fb4b717fae056294b35c836b8ff2f6e95e5c3129dc60 SHA512 2bea2efc06422651460f9a6c30c9973b24cf2eea275bb0449a0fde020d6e69508af921d07360d7e94c324a5f0a822b13d36f15885b809fdec9da12c4cdd43a20
-DIST github.com-kubernetes-client-go-23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz 487299 BLAKE2B 3f40b7173a62414dddb7ada2d21b9cbc541e4bdeff9ad8cb501cde47af49859540a1c2af1992ff2dea2bea7fd93f02f9e932b7f6ca5a2078d68807cb46496040 SHA512 b1482dee5a512aca81c901a031db9d7e26875560ebacfd8b5a70ab78ae7b7941bd39e7b0cdbdff2d759e5c8f15909ed16f8bf993d2623d849198e271d27ea139
 DIST github.com-kubernetes-client-go-59698c7d9724b0f95f9dc9e7f7dfdcc3dfeceb82.tar.gz 483956 BLAKE2B ae123e66497c3391f0a38ff8d3bf77313b6ce4978971a7ddb1d93ac674a1ce78ad4e464e0348be844e9a93874e1d5caee386688c6606bf9029916bc3511c3845 SHA512 062d32925e6cdc2357c3c4c170a96fc4a6f6e4577914abaf6f12034c6d90aeb6ac4c0c6d3632198d16d90c4623f9ccd79fa92f09a30033573185700633ba91e0
 DIST github.com-kubernetes-kube-openapi-0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803.tar.gz 152390 BLAKE2B 698257243a783c64f8f77ae75689f229da583f9250454c1ee8493b09855ea4ee3fa454eaf66721f07e4043cd2d69aa45ded6446aab5a05e84403f7c81c5b5f1d SHA512 c3b94136a2010163d073dd1799738711a0c86502766ec22bad8d595373db38ee955fd9ddffb9aede50866e9656fbfb5c5d8ceb87f6fc7b26b38b679854db0ec6
-DIST github.com-kubernetes-kube-openapi-39cb288412c48cb533ba4be5d6c28620b9a0c1b4.tar.gz 88363 BLAKE2B 32330bc4a8c31e21662ebff637eb3f9594db2f22e824c7b90437b6bb54708227b3c9b25deb077972b18f0d63014fd5feda609f790cd578a5cc4b53fb30109412 SHA512 b28d72a7ce8229da2bca4a4d35d951fb383035e54ef7c1ad1669ccde546040f39f9b1024d9bc9eed9f56517e91c3c8b8c6b61fa49f938c13169ddabfe9862ff8
-DIST github.com-kubernetes-kube-openapi-50ae88d24ede7b8bad68e23c805b5d3da5c8abaf.tar.gz 88141 BLAKE2B e96d61f9c784e4428723d1dc28315f2400cdc2102b10178c8a93cbb4fa56e1b07f5a34671bc75e17d5d028ecb0b0661abec6edb86ab33e385b72388ba593cd24 SHA512 37aa7397a8ff203ba53931f19b676c996e3712145f1729ba8a1b7981295049783912d49ce83bb932ccd0ffadd4d1ebe727a1b7118f4d411b44148ef649d26ad6
 DIST github.com-kubernetes-kube-openapi-91cfa479c814065e420cee7ed227db0f63a5854e.tar.gz 146098 BLAKE2B 8ff2408c61978a3e0770cc63a4c5980e617c46c054337fe6faaf969598bf9fdb7680f0e45bbb0fc097287fe0b511a43eabcca8dc095db590887f4a6ab8ddb247 SHA512 28937579b01666c5bd00fe09a360b414e8cfce0a3355043e164cd349bc0c86c8112ef3c2ab9b7aae359b9ac690b08cc9a815e0371aae72be9d4ed0691d252ac1
 DIST github.com-kubernetes-kubernetes-2e809eed16445fff9dcbfc56e9936cf76ccbdadc.tar.gz 24794071 BLAKE2B bd7d4382708f8ae0da7469a22959c43f317dca62bf4035b8f2e1ca86913989f3455f9623789c89d660ea2bf31d90f2f5ae3358ccc32c337b51c13759d2b8f691 SHA512 5a713ea0c3059f6cd66d918dd5d9f90805dbc5e1f54a4b40a58d2ee5c2794cc1328df72f6a3e2aa198ff526e3d7df58b376b2c139c444f36be46d168e7b1bade
-DIST github.com-kubernetes-kubernetes-32ac1c9073b132b8ba18aa830f46b77dcceb0723.tar.gz 25047883 BLAKE2B efbd9c495139f9711167491b16339edfba653ae84c6c5957bb6e8070f60b7029be6aacceffe202f44dc4519676fe34e0d191bf8a15794db31d43fe067cb48955 SHA512 061eaf34bfc6d9af8bc129b8a8736f3c66b3826307d334ddfc221dcba453ff92a18c0e79ade7b2c5112caabe3bdaf4c473b3b5ba831ee5860ecbb20959ee7f3f
 DIST github.com-kubernetes-kubernetes-54a352dda957bce0f88e49b65a6ee8bba8c0ba74.tar.gz 28028095 BLAKE2B 4b7bc8ff29f61b63e99f8dde77fe0f3230adb6bca9baaec62a170ad0d0ab5afc49a004d2538d1b1f6d6bf81987631eadd686e39d287b488a20661f390e03351c SHA512 6930c85ada9e1499ce194755c7f35b92f9b081cbd1af0ee0bbc35367f2f9e5f92f53bf49c808f3156b4144b646b3feab8dad6860d28ef704efe6f743470239ce
-DIST github.com-kubernetes-kubernetes-a22f9fd34871d9dc9e5db2c02c713821d18ab2cd.tar.gz 24697736 BLAKE2B 8d735570cdb30bb3d833fabb6a6f5c7d5d458ddbfc5d3b5b6f40748129aca13878ad3cfccc70d6e601f62233b88be2f5b040ac535e0971e1c2a3ba1b87f69f4f SHA512 06d05f214c5d6a839f04eef655f66b225af8fb32d514e7b81d75d5f7656de418e8ce3d91a3acb860f1aaa6b64570843f516be9f59d0a5cd4ed955b340debe6af
 DIST github.com-kubernetes-utils-258e2a2fa64568210fbd6267cf1d8fd87c3cb86e.tar.gz 13868 BLAKE2B 7ea71fd390a6b800e5a9e37ef36e5037ed5a68b0da8a4e50d280d12c2ba5a612ea257784dd70f5cf37a2903e086c6e7a197d31426d8be2e7f5f1caeec1558b16 SHA512 f354db283ae2190116afab2d4e13182f232e881ea43f50d2a1fa3e4e950e29b065db760a01e0f9a19e74753f3b12c619fbcd21e3a766a553612b4a1418f292c9
 DIST github.com-kubernetes-utils-66066c83e385e385ccc3c964b44fd7dcd413d0ed.tar.gz 15766 BLAKE2B 0f38b77113a1a8cf963cf5e44d1594d4b08b8c71519b41c86ebc2d3b7f234785493510a8cb678775e5a9ca2ee0ed248efba5774eb10750d18ee939cc64c7f074 SHA512 2bd4e85b36949070f8a8d2d73a43ae8a91617fd395de57ac7b40bc20b7cb4b35185ce3a3d1b333152ee0f3415a5d8e2eb806b168f5d07b934e20cbf6d9fc5c12
-DIST github.com-kubernetes-utils-aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz 13650 BLAKE2B 7ef52334585300d4faf98a02324380ba5dcdaf708b8027ca9fdae43d0b0a43c5d495162f1e69d4f9f9b8dbc2e22dfaefd66eb479bace78bbbfcf84145613c174 SHA512 91f525cc68ec01f394da926eb3fcd7bd95b62609721c86f22c02d852b42913eba659a97bb9ceb19f4b6aab5a967e5f385d732b81284871c82c740fb102a09368
 DIST github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz 70478 BLAKE2B 19c135401f34f8a8285c8bc315e6197c156de85fe9f4e65de7b71fbb73e37d57031915c2632930d5e76bf01e9038ba380150bdc78ec2cdac959e2cdb9571bc11 SHA512 319a7bd61ae490353a939a412dd00ffed9b6acd55bb739e8c259caed7904ec3407493888798addf89a15474053e125abe8818618240a55402b4351270cebfbdb
 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
@@ -115,7 +94,6 @@ DIST github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.ta
 DIST github.com-modern-go-reflect2-05fbef0ca5da472bbf96c9322b84a53edc03c9fd.tar.gz 19200 BLAKE2B c6a89079d8cc59b20dd943ca51ed815cb51b6ff760983dcba6d4f35538fc3679725386a9653620f76789a442e59cd9a19c8f9025265419e9ae55d9c24a18ee0d SHA512 244abaf4a9ef6634f22a8a71ac63989aeba34899fdab9752bc2dbac2b798285863989803832280111414321b25ebc5064912efe2fc8e17d1a77222be2864d7f2
 DIST github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz 18386 BLAKE2B c484694b778f0e71b94628ffebcaff6fec311f033540d2a27202b8e1bc6224b1a48a8670f6f7ecf10bc2f406a9cfed98f0c9565215e4a297786f041e940996d6 SHA512 3061c0372815652836db5245519ec2b0a2f71eac1af7c23a419edfa64063e6f39e91a1aae2ee1ccf1e97a96de620e15684ee660f9039e694c7b9b4ffac27879d
 DIST github.com-opencontainers-image-spec-372ad780f63454fbbbbcc7cf80e5b90245c13e13.tar.gz 136692 BLAKE2B 99eecdd38938c9ca5febb494e1a102ae60fefa9b8074ca9422c7b10295caa09a50f66dd6a02c6c8bfc61513d23144ba660f383684c077caf5791111ec1c9c92d SHA512 cfddcfc6863fc9ee9fe5ea59ed0da8bce7c8299117155e404f135b4ed2f7cec00881b8d70273a865ab84a0bed601f191f328b357b7c50d204016e81ac8c47fb5
-DIST github.com-pborman-uuid-ca53cad383cad2479bbba7f7a1a05797ec1386e4.tar.gz 10027 BLAKE2B 24a0e05226ace1ddfd98b55a2a97105e1b050e689590b302936e0afa82e63df73171d84e0b1badfd564d800f0816fc874fb4398f7b3a119b40642a4a6c36c7aa SHA512 a920c0d8d14704cd97a3144215c2df23d2112acb98b0c8a1e50ca8c2ee9bef677cad9611ccc774ac413452a014876f7d826ecde09b2837fc8bda1fd987670052
 DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
 DIST github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz 11345 BLAKE2B 9f25872e040b5e0602e658fa728e93a300c00ed1064966370e1b676eea6a94d6bca491b2f6c33a9f2c4d1c522a3ceee540aede2dc638eed238de8485500821e9 SHA512 fa82643f622150b44b198451c1e41e042fd7ceefad9d68e32238d48c9a29c6fb14780fca9d9a7dec660365062d4089c638196960fac056b685e7543410774228
 DIST github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz 75589 BLAKE2B b739cbfdbdc070aeae55f25d263ae74fa07cb4af0b8d7b9504ccb954c4df7c8bd40f6e2392f16f63cb0f3f41c282e16655ab0d04ffddab241e3472cb6ef04faa SHA512 5fe34c1cbd9aee1d1e50424aec83a1e72d834b25208e35c1af8b30519f6db26a6d54adeacf40006f4d04539c1d2e8f577641c8d796314cd71e9b87b20847b2d7
@@ -126,24 +104,14 @@ DIST github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.ta
 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-spf13-cobra-c439c4fa093711d42e1b01acb1235b52004753c1.tar.gz 100898 BLAKE2B cedfc2121e6bc7d42c16cddf48979bad9b5a6910249a0daa274b2e00227f236c1ba42d93d7892418c91afbb0e83469e938669c96074bbb4e3e7f76c9e85e914c SHA512 3bec9d9895efb6d4a39a3aa1893b450f93336540d974514255def8e6c5aa847ebb5ffb05d744235706ba4deebd101243eeec30c8b009991dca77e3684ba5880f
-DIST github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz 71311 BLAKE2B f908877fb77bbc63a213647f068966f771cc2d299fad21da2b7b096b3253102c9f334f8709960a33841a2b441fee2b9ddb23bccd1fb745268fa41303b25b50f2 SHA512 69ed1d5202af46c685821b914f8ca8bc77b9bfbcfb68a2f388f141d35fc2e673f27bf99d5f9dff285f974a363aa0f3fed1eaacb19910dca080c6e1fa388dcb38
 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-583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz 43327 BLAKE2B cc00d2852d895265eb0b60454877da841fe123535009025c761761c61b4d937d6293f3bef765d2a8919d63d8324dcb6addf774837df26fb864cb72d88add2d03 SHA512 061b9895e3936e356f707385ed7d7e5172f94167a1fabc84e9a0a69df4f03e0eaf435a4ac0cb00f5077855987ab1d2c3b051846c0466485a7bc329a547dc3d3a
-DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
 DIST github.com-square-go-jose-89060dee6a84df9a4dae49f676f0c755037834f1.tar.gz 289746 BLAKE2B cff786ac7a6c39829ffd4d7b7f0fac3893b7c469ca35f008558ca3a7dbfc376fd0166c8ed7becc73d0f8d67b456ca00104f08c8841ff156a9c1f9a6d68d3b25f SHA512 fac5e8d32f93f252b2e64d60f2e4da65a11e9408ac4db0afdb3f2357a814cb3992ade307bc8bec8799703c0cb63d05f7d4eaa19e13bab6402b50c1cd246bc50e
 DIST github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz 278276 BLAKE2B dfb467b318f0a6661c5ae910f32bc5337d9677ff60b55dea4706193b4acb815f7e087debc92cf9347ae54db13f512c4a2dc1cc05ea031201bf119caaffa6c6e7 SHA512 4230ba34fe8f45ed7e4a0f7ffc60781b1b4fbaa6877212a8d5ab5a8b088d0d3151f76868929e270c5ca71769ae366976a25de65716e8c0e6289a4f720055f02f
 DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613
-DIST github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz 7897 BLAKE2B a2b6f62fea8cb724ebbc9658e37985ed27fd1c395a838b6f8f89bc3e05106cd3e89b86753223bccc50de210461c89b01d8e3095ae1c6dcb6bc9a655c462981f0 SHA512 460b1cbef7d5236b099a67b27e902f9077fd42d6aa3772c13c1c3ab20fca87719a770478a068bf150e1224612fe4e1eadb1ec7cdfa60ca9cc81e3f6de62ee9c4
-DIST helm-2.10.0.tar.gz 1158857 BLAKE2B 942474eacea109559baaa9d83d023b746ba0ec8943c3dd0a6ce6a338b2859bd585431ce5521c47f39b43dda7d8edefa84d8365abbc2463a6b69290881fb5f20a SHA512 a1fe5db8f7de634a06de6410227bc1387709e0401997afeba0d36f003dcc26df24020e420cb766fe81be40bddeda8ef4ba103345ddfc191f5e43a40016055cfb
 DIST helm-2.11.0.tar.gz 1169696 BLAKE2B b4736e5d4cf7d16406c7b1544b0f1960295d90651b1028968c98f03fc515c13cd0151a495b5ccdc2b251585b71faad32432b1aeda4b68304e01363ae2a0005a2 SHA512 1b769f969010ee8df5d0ab0f169ead3ba8c3dc6838fbc608122ce133bdf9b978fbef0e698f594c2ad6e39e5e8a5c1f8d24ecc7e5d58495e2b9a6bf179fd73669
-DIST helm-2.12.0.tar.gz 1177781 BLAKE2B 2fba13bbd813c356ca94b8a89b2eabd1e61bc3c7f80a5fd1cd8bd9c62f5ad8a3fb8b5516221736534900c91f20442938d4f9d22ad2276bd1f3709a1a779c86e9 SHA512 773d9a95c305a832f63745dc3a5ffde0db5727b24bf9118768c7ecc8bb0ffcaced4016243e74bcca12ce0ec38aabcb4db78d7ef9af1205f014e524c090bdf98f
-DIST helm-2.12.1.tar.gz 1177575 BLAKE2B 804a908659ab5b3f1cdbe116251743281f9e441aed6dfcb45786672023d9cee0200141a59f02c22090f6466f6fbf611db6120e63981d784d3207f5507cf9e216 SHA512 1396bddb5ede097ec11e6e175de91f8d65304beb161d6cbf3c16b341ab22b851c79c9e599248379f771777a728ac2b930c995862f7232bb6f9c753f092d9b0b6
-DIST helm-2.9.1.tar.gz 1136941 BLAKE2B 57e319df56d60b1285df99ee6c0213e9700b80aa4117f11ab3e37493d552481875a42acd200d2183c2e587dc13130b9c47cbacee7dd7bfeaaf4dc9bb0a17dcc5 SHA512 c9830ae3de76e219dc4effad749fa6f80d24f47f034bd7150afc5817700947b678db64a0889fe1e3c3c69ed0932933ebf9bb893c065d7d77c2953190ab15b033
-EBUILD helm-2.10.0.ebuild 8581 BLAKE2B c105833befb257b27c705a686dde12efddf42124029483f55e12ae9834c73b62a5e5cf349f97a784eb386afba8a7626e506b5528f84654a7939e50165c838a9c SHA512 94f49188dc838f1daff6bab1df8671403d63776e8d593d973494dbd48acd7bbd2be36b39425cc3f50b0e4c43316fa5f52dca19e67c0723824c52834c367844a9
+DIST helm-2.12.2.tar.gz 1179286 BLAKE2B ee1a3229e5567dfada4eb2f721f0f67a2fc6ee4e54c7d58f342895483a49d6ef1028a746ebb990a8b68b0a8386591f5e5ce0b3593b83d66d00427a69b1ede938 SHA512 38927ee8179f53a0bc4863b85bd090bc88364b1cf0e5491d1313fa4becbb7665aeec9b41854f86617882b66d1b8b31f065202d78c93593994744965c914e0cde
 EBUILD helm-2.11.0.ebuild 8664 BLAKE2B 1f96b30970ae755a77bcccd9537cbca09f5feaa425ee467e174a60af316fdce1fab83ba0804f44777800a57e31e21b7f293324a55f3ee802700eefc017d25adc SHA512 9c1175849fb4018be2801ee45375cd763f05de4786ad0854ba60fbca4eea8d85fd00c350ef979e97a4da1e11d02f2ad3768b92e072c206b0b533cbc159f068bf
-EBUILD helm-2.12.0-r1.ebuild 8836 BLAKE2B 34d955411afc03034bc47a82b91ec6f1db514ff5a778bd3245b317dcf35657b277a5f11a0982714c582d3d6a6f4ebf53b061b41dfa4f55c8dad4834664104c11 SHA512 745110a9a9f537cd58ad9b47bfc5cfb61a59a4889235a597940d9189bbb31317d68fae5247a167e81e0471502c5a267cb94e82f9786a4bbc8291f467781027ea
-EBUILD helm-2.12.0.ebuild 8761 BLAKE2B 3c79c0c4e2acc4579aba7f71aef356bdd19184f269024200a5ea7f27aa1fb959041e90801c972f1109182d60da9a839c27ef486a4defbbdf09135c8a278e3c04 SHA512 2c07389e4877dd4ad14effe8eb2d7498dee8de7ddc6d22829b66d135c58044b4f83485ca1d1293c87ea97209de21b01f4cf55577c2115b5d3d9435965740bfed
-EBUILD helm-2.12.1.ebuild 8844 BLAKE2B 42d281c3027c1f534cf75448e268b7b7ddebe5b5d358015d647b523d7f559b4882f19a380c6e0525755a9a9615242b1f4ded87ff64ab263c50cef580b376e32a SHA512 20ae8c99e0e7ee2e2b81ec2191b445703c1130bb91bfc588c325ce6c9668a366ebe5a73a3673d97ad73089362f80576f2b09677e60987eaa4a576626cd46023f
-EBUILD helm-2.9.1.ebuild 8410 BLAKE2B 266d13ec9488fbc344e29c577238d5980d10a8c6094cb6f41c6127065ff7b899bc609b530bc0cd87816d71424492c87634848ce26002954a09fe60aa99578e42 SHA512 b21df5a0c6f9a1d13404a128c1466301848216386c74e143a04f1567bac648efaf727d22ac7cdb1a943c8edcdaa3ed3b5cc440c8cd664ddaab803514b4ba44c8
+EBUILD helm-2.12.2.ebuild 8843 BLAKE2B 3b806d8d9909f346d7f35d0ef6930a37b6699364fdf42e52006fec3fc3a03ef2bcdce900fd1b3e0030538031406fc9557e2d924d8ff630665531ce58b3d990e6 SHA512 a375d94551dc4b3d67c0a1d00164e17b007d02784fae1c6199909acd609dc44c3d7302062fa67ec68b263504a19ce451d30f2b38a702c61c9e57e434a8eefa69
 MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
diff --git a/app-admin/helm/helm-2.10.0.ebuild b/app-admin/helm/helm-2.10.0.ebuild
deleted file mode 100644
index 876c49808695..000000000000
--- a/app-admin/helm/helm-2.10.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
-"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
-"github.com/Azure/go-ansiterm 19f72df4d05d31cbe1c56bfc8045c96babff6c7e"
-"github.com/Azure/go-autorest d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
-"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
-"github.com/cyphar/filepath-securejoin 06bda8370f45268db985f7af15732444d94ed51c"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
-"github.com/docker/docker 4f3616fb1c112e206b88cb7a9922bf49067a7756"
-"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
-"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
-"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
-"github.com/evanphx/json-patch 94e38aa1586e8a6c8a75770bddf5ff84c48a106b"
-"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
-"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 1de3e0542de65ad8d75452a595886fdd0befb363"
-"github.com/go-openapi/swag f3f9494671f93fcff853e3c6e9e948b3eb71e590"
-"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
-"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
-"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 6da026c32e2d622cc242d32984259c77237aefe1"
-"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-"github.com/json-iterator/go 13f86432b882000a51c6e610c620974462691a97"
-"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
-"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
-"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
-"github.com/Masterminds/sprig 6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c"
-"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
-"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
-"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
-"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
-"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
-"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
-"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
-"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
-"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
-"github.com/spf13/cobra f62e98d28ab7ad31d707ba837a966378465c7b57"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
-"golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30 github.com/golang/crypto"
-"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
-"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/square/go-jose.v2 f8f38de21b4dcd69d0413faf231983f5fd6634b1 github.com/square/go-jose"
-"gopkg.in/yaml.v2 670d4cfef0544295bc27a114dbac37980d83185a github.com/go-yaml/yaml"
-"k8s.io/api 8b7507fac302640dd5f1efbf9643199952cc58db github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver 898b0eda132e1aeac43a459785144ee4bf9b0a2e github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery f6313580a4d36c7c74a3d845dda6e116642c4f90 github.com/kubernetes/apimachinery"
-"k8s.io/apiserver f7914ed3085badf66a1b6f3a5218ada28f7bd084 github.com/kubernetes/apiserver"
-"k8s.io/client-go 23781f4d6632d88e869066eaebb743857aa1ef9b github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 39cb288412c48cb533ba4be5d6c28620b9a0c1b4 github.com/kubernetes/kube-openapi"
-"k8s.io/kubernetes 32ac1c9073b132b8ba18aa830f46b77dcceb0723 github.com/kubernetes/kubernetes"
-"k8s.io/utils aedf551cdb8b0119df3a19c65fde413a13b34997 github.com/kubernetes/utils"
-"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-GIT_COMMIT="9ad53aac42165a5fadc6c87be0dea6b115f93090"
-
-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=""
-
-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.12.0-r1.ebuild b/app-admin/helm/helm-2.12.0-r1.ebuild
deleted file mode 100644
index 5b6f4c2c330a..000000000000
--- a/app-admin/helm/helm-2.12.0-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2018 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 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
-"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
-"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
-"github.com/Azure/go-autorest bca49d5b51a50dc5bb17bbf6204c711c6dbded06"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"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 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
-"github.com/docker/docker a9fbbdc8dd8794b20af358382ab780559bca589d"
-"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
-"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
-"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
-"github.com/evanphx/json-patch 36442dbdb585210f8d5a1b45e67aa323c197d5c4"
-"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
-"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 1de3e0542de65ad8d75452a595886fdd0befb363"
-"github.com/go-openapi/swag f3f9494671f93fcff853e3c6e9e948b3eb71e590"
-"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
-"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
-"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d"
-"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
-"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
-"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-"github.com/json-iterator/go f2b4162afba35581b6d4a50d3b8f34e33c144682"
-"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
-"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
-"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
-"github.com/Masterminds/sprig 15f9564e7e9cf0da02a48e0d25f12a7b83559aa6"
-"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
-"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 05fbef0ca5da472bbf96c9322b84a53edc03c9fd"
-"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
-"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
-"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
-"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
-"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
-"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
-"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
-"github.com/spf13/cobra fe5e611709b0c57fa4a89136deaa8e1d4004d053"
-"github.com/spf13/pflag 298182f68c66c05229eb03ac171abe6e309ee79a"
-"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
-"golang.org/x/crypto de0752318171da717af4ce24d0a2e8626afaeb11 github.com/golang/crypto"
-"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 95c6576299259db960f6c5b9b69ea52422860fce github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
-"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
-"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 670d4cfef0544295bc27a114dbac37980d83185a github.com/go-yaml/yaml"
-"k8s.io/api fd83cbc87e7632ccd8bbab63d2b673d4e0c631cc github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver 05e89e265cc594459a3d33a63e779d94e6614c63 github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery 6dd46049f39503a1fc8d65de4bd566829e95faff github.com/kubernetes/apimachinery"
-"k8s.io/apiserver e85ad7b666fef0476185731329f4cff1536efff8 github.com/kubernetes/apiserver"
-"k8s.io/client-go 1638f8970cefaa404ff3a62950f88b08292b2696 github.com/kubernetes/client-go"
-"k8s.io/cli-runtime 79bf4e0b64544d8c490247abae089bea572ddae6 github.com/kubernetes/cli-runtime"
-"k8s.io/kube-openapi 0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803 github.com/kubernetes/kube-openapi"
-"k8s.io/kubernetes 54a352dda957bce0f88e49b65a6ee8bba8c0ba74 github.com/kubernetes/kubernetes"
-"k8s.io/utils 66066c83e385e385ccc3c964b44fd7dcd413d0ed github.com/kubernetes/utils"
-"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-GIT_COMMIT="d325d2a9c179b33af1a024cdb5a4472b6288016a"
-
-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=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	pushd src/${EGO_PN} || die
-	eapply "${FILESDIR}"/${P}-sorting.patch
-	popd
-	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.12.0.ebuild b/app-admin/helm/helm-2.12.0.ebuild
deleted file mode 100644
index 4af765722dde..000000000000
--- a/app-admin/helm/helm-2.12.0.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2018 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 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
-"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
-"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
-"github.com/Azure/go-autorest bca49d5b51a50dc5bb17bbf6204c711c6dbded06"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"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 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
-"github.com/docker/docker a9fbbdc8dd8794b20af358382ab780559bca589d"
-"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
-"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
-"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
-"github.com/evanphx/json-patch 36442dbdb585210f8d5a1b45e67aa323c197d5c4"
-"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
-"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 1de3e0542de65ad8d75452a595886fdd0befb363"
-"github.com/go-openapi/swag f3f9494671f93fcff853e3c6e9e948b3eb71e590"
-"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
-"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
-"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d"
-"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
-"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
-"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-"github.com/json-iterator/go f2b4162afba35581b6d4a50d3b8f34e33c144682"
-"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
-"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
-"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
-"github.com/Masterminds/sprig 15f9564e7e9cf0da02a48e0d25f12a7b83559aa6"
-"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
-"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 05fbef0ca5da472bbf96c9322b84a53edc03c9fd"
-"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
-"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
-"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
-"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
-"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
-"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
-"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
-"github.com/spf13/cobra fe5e611709b0c57fa4a89136deaa8e1d4004d053"
-"github.com/spf13/pflag 298182f68c66c05229eb03ac171abe6e309ee79a"
-"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
-"golang.org/x/crypto de0752318171da717af4ce24d0a2e8626afaeb11 github.com/golang/crypto"
-"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 95c6576299259db960f6c5b9b69ea52422860fce github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
-"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
-"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 670d4cfef0544295bc27a114dbac37980d83185a github.com/go-yaml/yaml"
-"k8s.io/api fd83cbc87e7632ccd8bbab63d2b673d4e0c631cc github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver 05e89e265cc594459a3d33a63e779d94e6614c63 github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery 6dd46049f39503a1fc8d65de4bd566829e95faff github.com/kubernetes/apimachinery"
-"k8s.io/apiserver e85ad7b666fef0476185731329f4cff1536efff8 github.com/kubernetes/apiserver"
-"k8s.io/client-go 1638f8970cefaa404ff3a62950f88b08292b2696 github.com/kubernetes/client-go"
-"k8s.io/cli-runtime 79bf4e0b64544d8c490247abae089bea572ddae6 github.com/kubernetes/cli-runtime"
-"k8s.io/kube-openapi 0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803 github.com/kubernetes/kube-openapi"
-"k8s.io/kubernetes 54a352dda957bce0f88e49b65a6ee8bba8c0ba74 github.com/kubernetes/kubernetes"
-"k8s.io/utils 66066c83e385e385ccc3c964b44fd7dcd413d0ed github.com/kubernetes/utils"
-"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-GIT_COMMIT="d325d2a9c179b33af1a024cdb5a4472b6288016a"
-
-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=""
-
-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.12.1.ebuild b/app-admin/helm/helm-2.12.2.ebuild
index 72263dddffc5..095509e67590 100644
--- a/app-admin/helm/helm-2.12.1.ebuild
+++ b/app-admin/helm/helm-2.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -103,11 +103,11 @@ EGO_VENDOR=(
 
 inherit golang-build golang-vcs-snapshot bash-completion-r1
 
-GIT_COMMIT="02a47c7249b1fc6d8fd3b94e6b4babf9d818144e"
+GIT_COMMIT="7d2b0c73d734f6586ed222a567c5d103fed435be"
 
 ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Kubernetes Package Manager"
 HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
diff --git a/app-admin/helm/helm-2.9.1.ebuild b/app-admin/helm/helm-2.9.1.ebuild
deleted file mode 100644
index 7b1e12736337..000000000000
--- a/app-admin/helm/helm-2.9.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="k8s.io/helm"
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
-"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
-"github.com/Azure/go-ansiterm 19f72df4d05d31cbe1c56bfc8045c96babff6c7e"
-"github.com/Azure/go-autorest d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
-"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
-"github.com/docker/docker 4f3616fb1c112e206b88cb7a9922bf49067a7756"
-"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
-"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
-"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
-"github.com/evanphx/json-patch 944e07253867aacae43c04b2e6a239005443f33a"
-"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
-"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
-"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
-"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
-"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
-"github.com/go-openapi/spec 1de3e0542de65ad8d75452a595886fdd0befb363"
-"github.com/go-openapi/swag f3f9494671f93fcff853e3c6e9e948b3eb71e590"
-"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
-"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
-"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
-"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 6da026c32e2d622cc242d32984259c77237aefe1"
-"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
-"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
-"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
-"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
-"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
-"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-"github.com/json-iterator/go 13f86432b882000a51c6e610c620974462691a97"
-"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
-"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
-"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
-"github.com/Masterminds/sprig 6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c"
-"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
-"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
-"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
-"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
-"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
-"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
-"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
-"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
-"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
-"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
-"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
-"github.com/spf13/cobra f62e98d28ab7ad31d707ba837a966378465c7b57"
-"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
-"github.com/technosophos/moniker ab470f5e105a44d0c87ea21bacd6a335c4816d83"
-"golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30 github.com/golang/crypto"
-"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys"
-"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
-"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
-"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/square/go-jose.v2 f8f38de21b4dcd69d0413faf231983f5fd6634b1 github.com/square/go-jose"
-"gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
-"k8s.io/api c699ec51538f0cfd4afa8bfcfe1e0779cafbe666 github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver 898b0eda132e1aeac43a459785144ee4bf9b0a2e github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery 54101a56dda9a0962bc48751c058eb4c546dcbb9 github.com/kubernetes/apimachinery"
-"k8s.io/apiserver ea53f8588c655568158b4ff53f5ec6fa4ebfc332 github.com/kubernetes/apiserver"
-"k8s.io/client-go 23781f4d6632d88e869066eaebb743857aa1ef9b github.com/kubernetes/client-go"
-"k8s.io/kube-openapi 50ae88d24ede7b8bad68e23c805b5d3da5c8abaf github.com/kubernetes/kube-openapi"
-"k8s.io/kubernetes a22f9fd34871d9dc9e5db2c02c713821d18ab2cd github.com/kubernetes/kubernetes"
-"k8s.io/utils aedf551cdb8b0119df3a19c65fde413a13b34997 github.com/kubernetes/utils"
-"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-GIT_COMMIT="20adb27c7c5868466912eebdf6664e7390ebe710"
-
-ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${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=""
-
-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/ksonnet/Manifest b/app-admin/ksonnet/Manifest
index 42bdb2ff0118..7f9cbf346b42 100644
--- a/app-admin/ksonnet/Manifest
+++ b/app-admin/ksonnet/Manifest
@@ -1,9 +1,11 @@
 DIST ksonnet-0.10.2.tar.gz 9312418 BLAKE2B 5e097250a8f1c7887d1949a84d6b768619508b0557ae15220cb31b933a40fcf025200a1d5a60e3fed8e37226faf9b5fdfaa18c87ac56ff4187968efb73b8cef7 SHA512 d4ea1b9b5feb90b345997d8546df276c3e9b171cbe6b648133615ae89fd0fadedb6f98128f4c8b5a40005de3f08ccd0a4de46c7d9c7d0f20e62baa5727c11065
 DIST ksonnet-0.11.0.tar.gz 11228264 BLAKE2B 2c5be1124f2976b6f38b23c9f871bc67a1b88fdf851339893525a4f42a8b3a8ac37b18454e2d281ae3ff71008744a60683910d4864b158fd428b76d28cd73e9b SHA512 4b80b16e4b2cbf79f043e38c6668fad51ec958264a85262f16b1f44c66af80f93d51809c713360758392d4689f350748b5ec55bc2bd3bee01bd42ce4030ffeeb
+DIST ksonnet-0.13.1.tar.gz 12336756 BLAKE2B 1952c02a0dbefc0efdcde1728348e62b23e9ef92fedb8444f98dcc0e670090be56aa001ee50f5e6885752e565863b3813556b091dc614a766677ea4d6e0722c4 SHA512 be16e986c27da358df27d632d1191837d3c16a92e702f3bc29d504de80128870dd4d97752db07c06bd5a11b517e69d6690b9608125d702f809c181d4109622f4
 DIST ksonnet-0.8.0.tar.gz 5260937 BLAKE2B 3b14618d9e40e0f71f966a0acd1ac121040ddfbd378b363236f98c4ecc6d2a2b688988816cd56801bc127b41ac56f4a8446bf152b0ffbdc3f64bce879bfa7cc4 SHA512 c80bbb0d6959045c2de0bf3a21b8a869b53a397e2e31b4b273ccd4f16afceb4038c6263a34d8e0934234cea5997949202e58dd7603902b221a140be737924aec
 DIST ksonnet-0.9.2.tar.gz 6552479 BLAKE2B 46aa62fe5c647d87f11b0c35db1e494d7c045d65bd98a0cc81bcb9c5a1890739a6f782dd04735781cb11aff70e4ec6f04ab97ff51b567385fa1e72bd2d835f15 SHA512 fd9c3c966ed27799f5c7e29e031270406e901c16089f354984d5aed62ebc53f1fc3be0f7623c1dff4231e7a5676b3bed879448845e35d6c1db5104ec28669a48
 EBUILD ksonnet-0.10.2.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
 EBUILD ksonnet-0.11.0.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
+EBUILD ksonnet-0.13.1.ebuild 871 BLAKE2B de4a469dac9e43e91ce6eb9fafa38cac4ba7cb30a7aacedfa8ba57df4ef5aa09686a2677e98c5f03195fbe3ec1c8dc4a32abd087036158db1829408c0e2adee2 SHA512 793660b3a34fd44acdd1c11075bfad84f78f7b016c5280248d6706f5a586fb529bc7503003ad73db1fbe3375dd88b23f293633c8e0e7fe385e574b2a25f5231d
 EBUILD ksonnet-0.8.0.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
 EBUILD ksonnet-0.9.2.ebuild 874 BLAKE2B 9ddadcf4f4a14c257780f227073337f274ef5e30812355bfd3852579b350edfa9b413555704838a686beffa570bee381310a768c448e1912e92851b07b410428 SHA512 963a95f8600a88649e09c64a88f3853f10d0ad4636713b36137b28a90cd4aecb87f35366bac3859f044159aefdb23322c44100b47ba3999d943b0240897e6a90
 MISC metadata.xml 324 BLAKE2B 89e56104008d1d0adfc928707dc011c96d3169f299d4b8b7dde1bf4fad5221728ed3d2b5a4cda9aed69f3ff16ba202c3bf445946ccaa169ebedb22e001251602 SHA512 9f554c4509d955b3d88f15dab2f0bfbf9862b52bea5aab36fea37c4b863080a5378a76087baa2f3be7e8ade5a7fd519d80deecb394d3ead642d1c943faba8809
diff --git a/app-admin/ksonnet/ksonnet-0.13.1.ebuild b/app-admin/ksonnet/ksonnet-0.13.1.ebuild
new file mode 100644
index 000000000000..47e17f761f7e
--- /dev/null
+++ b/app-admin/ksonnet/ksonnet-0.13.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/ksonnet/ksonnet"
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
+HOMEPAGE="https://github.com/ksonnet/ksonnet http://ksonnet.heptio.com/"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/EXTRA_GO_FLAGS =/EXTRA_GO_FLAGS = -v /"\
+		-e "s/VERSION =.*/VERSION = ${PV}/" src/${EGO_PN}/Makefile || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" emake ks
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin ks
+	dodoc README.md
+	popd || die
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 9afaaf6b48ea..d3e20f9d0fdb 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -5,11 +5,11 @@ AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_5.5.7-1stretch_amd64.deb 17300432 BLAKE2B 4c3b13361b9a97734a7b63ad94d1e96d9bcad284372d0b63a085c4415fa7c0433e66546bd43c99a82839837ed5a8683c6d2739d47b629f5580b8007219f06010 SHA512 fa17413afc2f2872963e241b38c2d7abe06ed37b0f01f2ace3cc6c31e53451291fe98905957377940b16d1b6926991ef39b556a4697e9ba06f10f62583f72c9e
 DIST puppet-agent_5.5.7-1stretch_i386.deb 18222282 BLAKE2B b9ce9269cc59d79450cb66c9c3e545ad4267ad1a43905df4ca57b45ad1213dd11c9ddcffb77719a151f52eb60d6792a486823ea4a29b2f4e83a2d62960c9691a SHA512 b65ecaf27c2bcc6556d7d43a0b78e282a64c72eed3b672af5d2e23c34eefe8134b6d4c60505f9d7c6e5b40ed4a1ad391128933c27710819f5078ec7d8680b6d4
-DIST puppet-agent_6.0.3-1stretch_amd64.deb 17876404 BLAKE2B 06f4a951270b96e93ff72c5e0e1deb8c2e21588a424e06d9619397586d2c92367debab0d552df0c88bd2ccc53644c53b1117f2826d01e2feeab94934505e3700 SHA512 1dfbd1a9266f0d092d71071e9d6c271e2ca9ff6a8457699a9561a8f5ad2be05ef779f80d5dac3dbe3744dad30b66bd98dd593ca7e7f2696183eb30edb430bf4c
-DIST puppet-agent_6.0.3-1stretch_i386.deb 18615216 BLAKE2B 8fd3e6344fd9773dae7bc1bd94543cfbe7f71158423b00aac01be4c3e911c6576ea159fc5cbf88ff5342e8b7e13d14fa23524771b33688ac828b40df508bd613 SHA512 9aea3b90693a566fe9f285da60772f739c07d7cc40abaa6a98bc0e4d2d2eba1178c01a6e8d4b2a48b6f0009d3bef8434412b2eeb5876966249fd872ef8bda159
+DIST puppet-agent_5.5.8-1stretch_amd64.deb 17302932 BLAKE2B 4ff925477f74e5ecb7737cd41712bcd8b0b54d244784fd874ad160bc7cd33327af615ec117fc28cd45d59f275c51aa71f80de204f1f395ef89c7162d5acc3cef SHA512 f30cf250855c4f5adfe58f8c3c7dcdcf155ba97a9a805449555134fb9fedcf6c4d4ab54483d4c1530ae09583e6ca78d1af446cc7fc62760c4aa839c1e9d42bc8
+DIST puppet-agent_5.5.8-1stretch_i386.deb 18221644 BLAKE2B fcacbae34bdb6fa18eff344123908880de2e5025ccddd25ee751c5c2b229ff8b63c66d482d4e8139b0d263edeff78771459cd90beff36136a553b039a7c417a9 SHA512 e00c04eacea360619f9fa4e016b8421fbf44127f979ed772e06cef21a15261a7d201abb9bcde30d8bb4e36a4b37d38d67814b2c1077b33ee6e6404c898c53e32
 DIST puppet-agent_6.1.0-1stretch_amd64.deb 17902402 BLAKE2B 4fb8a0e85fc4dcee0ad08ca45b90ddafca3ae3f605bc9b461be2e2b31a35412c23229f8ea58a7c2ce97df2f3951598529df874911bc446d7f5f41a1f36b0cc0d SHA512 6f5ae6ee3479021ff455c7b9344cd54a3d0a7ecf57b2403343297b1d1d017e995eacf0fed210976db799b9e833b26557917ca4319ffd01dffeb92d2a9418b7c9
 DIST puppet-agent_6.1.0-1stretch_i386.deb 18652482 BLAKE2B 42c03e6c1c6c86d54875a6fd79c4a67b9b83daef42415cd9c7f1fc445912f051be3c2cd21f804318779169eeabd1ec15b9a2fb5389601416aea44c2533c7a879 SHA512 d78e2fb3ec28bb60a46ba1dae8d4e1292ac9346a7471aa29af6cea1a249496c4d96e7ff006700482b08338d3155dbba653d86be0d65dc31c522dd8fb4b5b4dfa
 EBUILD puppet-agent-5.5.7.ebuild 2478 BLAKE2B bc197abccc5e3ee2bf58c799e56437a818e56994309963561497e8eb70dce277e13d14c441b1cf4da0fc8f688af3163e87fa9044e4a3f48b71953666f65d7e40 SHA512 742a16a57da4578a0d4db4ebcf60487b6278070e3210c775d7c6b3bb0670d7cfae63c7cb661b327d3373f87bb8f348b81baefc872282e3a26717ba18485fee85
-EBUILD puppet-agent-6.0.3.ebuild 2175 BLAKE2B 4f2b992887347552ff4160969e5bc0c08dceaf0a29c478b935457ea456a067392019d86df97a08dba4d252b8795c1045ccfeabe0df7fd89ee239e845bec6ee2b SHA512 1e21c9342239121e5381d611f44f81d808e06386e97a5d1c5ec9e1ec985b585cb4b7f956217c9178699303d8a9409a14c4dc69f26166d935b007b15a986dba08
-EBUILD puppet-agent-6.1.0.ebuild 2177 BLAKE2B c85e11a40efe10eb550bbd4a04e01e9ab90e11e350697124e8adf36ae7b955111f00071a2dad7645c76b44ffa8a9a7285fd2e41d6756e96aa2053b70540227ce SHA512 0def0f855b823e935dc5addf3dcb5351b9b570d9e2c6de216ac8e9394143df015da37fd11187747bc620312d690285d9f981a18a3485720b79ffe7a16b406ee7
+EBUILD puppet-agent-5.5.8.ebuild 2480 BLAKE2B 2dc21f5294f4ab42011e2359caadaf207a16e7a2eb235cd33ea4300c41c5ecdd8df771c92eb350d7e5f7334b207b42540271f016c2cf2560f9d38bb41c3e3113 SHA512 b8f39ea59b87fdf1c6b83ec6cda1bdc66650c15287219060f42015928f2739dff8084fb7722462201abe950c8888667796f76bd83cda1bfa48795af8d472f202
+EBUILD puppet-agent-6.1.0.ebuild 2175 BLAKE2B 3aca5fd4bc6cde1b4198850d907ee3a0684497e3e0068e851a090351c4249d13426f673a101d244746846743015529283626f7f1500c0d12c5f7d6829b30a2fa SHA512 388e1c782ca0ba873108e0774110a7eed3b337b19dee4145a50c0b4ee8ecec689bee8bf27e67099c33f170e3c8105a856bca9ce10b893bf82649c0e466708ab7
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-6.0.3.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.8.ebuild
index 54c238bc455e..388141a53241 100644
--- a/app-admin/puppet-agent/puppet-agent-6.0.3.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.5.8.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit eutils systemd unpacker user
 
-DESCRIPTION="general puppet client utils along with hiera and facter"
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
 HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${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"
+KEYWORDS="~amd64 ~x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
 CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
 	!app-admin/puppet
 	!dev-ruby/hiera
 	!dev-ruby/facter
@@ -47,6 +48,7 @@ pkg_setup() {
 src_install() {
 	# conf.d
 	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
 	doconfd etc/default/pxp-agent
 	# logrotate.d
 	insinto /etc/logrotate.d
@@ -64,7 +66,9 @@ src_install() {
 	fperms 0750 /opt/puppetlabs/puppet/cache
 	# init
 	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
 	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/mcollective.service
 	systemd_dounit lib/systemd/system/pxp-agent.service
 	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
 	# symlinks
@@ -72,7 +76,9 @@ src_install() {
 	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/mco /usr/bin/mco
 	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
 	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.1.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.1.0.ebuild
index 4ad0513947d9..528983f6fafd 100644
--- a/app-admin/puppet-agent/puppet-agent-6.1.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/Manifest b/app-admin/puppet/Manifest
index b05568c16876..2fd52e57d82f 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -10,11 +10,15 @@ AUX puppetmaster.init 1090 BLAKE2B 367b678860b955003ff8d79e69cd8c4a6d652ae738bec
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
+DIST puppet-5.5.10.tar.gz 3064457 BLAKE2B 04cac9cebc03343b8c6fcf762f681f63bce4ebe27b6e7e727d06b14f0013a6c4b0ed7ff793e01b170931a881a921b4a2f107a5e37d1ac9394046f8611a7adaaf SHA512 70a5684289fc576853bf908adff44c1b1ce4b37d71236e7d7a8d140fa0e3cdd46a4b570cc7e493a3f47641f6be0c3b736ab04a178c30cce4244abe686378bf4b
 DIST puppet-5.5.8.tar.gz 3056987 BLAKE2B cfb0599f5a9a6f254b0e853ece390dcc4fb3e8cd40956955b81e9dd9ae3c3c39c18a0f5f010b269c8c21f1b288f50c354e4c40cd0cbd3ad3128dd95c3c7d0cca SHA512 2ed960c0fcd4f6b0a7eacfffd8bc3ca88387bade0ce5ac6cbb247752f18927959286b1238c146d3d2bda7f8bee171fc502b44b129c4778feafbda90d993ee816
 DIST puppet-6.0.4.tar.gz 2804651 BLAKE2B d2e685938b57ec896446a658d6a115f999b2254064711ceb6a139da3c5ffe488ba2dbd2da39b3a6c889027d971f44ff4fc99f87ceec95cc8b79eefc86f43f614 SHA512 fcfc0a9e1a707945c89e3080c1795511fd28143576886552d8e3635d62f526d0b3f9ed2a400ecc0084b63906246cb86e176b288ac049d01d0f9cf47fc65fe332
+DIST puppet-6.0.5.tar.gz 2811469 BLAKE2B de25af69b387a02b68fbb31ae13a9fa4aea8f25dcef32bead662e708060909b2f10813c1e889372a9167cb7a10b084679c20b5fa8312d2e06e2b53ebd573082a SHA512 0b34a27a0c21d24cf22e442b495dcfc49ac8b78e40f83eb9eb7f8b82b29350be436a63c6c9c9e969fc3d16096ccb927ca3c4d11e64e51d1e50150001d015bdbc
 DIST puppet-6.1.0.tar.gz 2818606 BLAKE2B 4fb6b26e5c3711262ff2210c9a4e9a9df0f47f4a989526a79cc36f56fa939fd4e54e41f3afef818aacd4630daf559f1ded7e2f6e3cc258a005a848b4d49b64ae SHA512 b82d5f5b045e23543a26949d9faa7ced78f1413e7699d124dd43a56b8558232d6f151a9fdbe52e1959900eb8fff7d7e873fa7ce986206419a27a7627a56f91f6
 EBUILD puppet-4.10.12.ebuild 5623 BLAKE2B 5653e7a7ff00a41e59acc42da38a47f78c25e2befdf034a7697d6cc37b1b0c7236a7f0fe6a8b0f224b08905d2fd74e20e8fb43e67e7dd1c3afc5ebaf3fe357f3 SHA512 4ea6f32bd809bb4e8ac90b2cb6205cc464dc9ea3cb97fbe3e14deb6890a04e9095f3d9896a99663ecd0d57a80df16b283ad8c55f8d0f11d1bc4eecc477a245be
+EBUILD puppet-5.5.10.ebuild 3826 BLAKE2B 5c607670362e772e049e9c4789895145076fe3666abb893d4f5a862ce644c0434146f3bba0e4d84264c6796abc3c534f48ca3d3f7d34bdcb489b7b0a0f8981c4 SHA512 30546929c45f9eb178bdac4eca613ede8bf6ebdd677b1046b785ac540081dc98c8bab9f19782c815066e2daf591a882258f7af7dba4d240087eefda62992cdad
 EBUILD puppet-5.5.8.ebuild 3824 BLAKE2B 907719041ed40a583a9edc42a0e8cef3a3e9d6853bf0c9199f488d86aa04aca729eb9fc23c7ec13ada04c0c9b834763b7f2f342a3820140af2b904bfb989f2dd SHA512 5ef99a7afc0c99be4df265be02f107705236824226c7a681e8ccf96a566364025c1407d78ec99a0ae9a2c6de4988d730d4b0721ac293caa02106f1ad962c1d90
 EBUILD puppet-6.0.4.ebuild 3655 BLAKE2B ff22ce68512cbccbc58d07d2331c96382f512f926fe5e7e98d410d30bb053f54ac5502588d7caa965d3e2377a63967d5ada26e74a4a312f3db6c70564dd63a2b SHA512 d48c942a3205aa72ddb6b44afb46b86bde21ead50d58c9c5ab33b8f7d4a4f62f8d57932d022a0baedc903c753b19e2ee75dbde68dd261f4ede034747e4784cc0
-EBUILD puppet-6.1.0.ebuild 3657 BLAKE2B 4f8f3a4bbca258e814738d7120b420f6da6ddbd1e8710b759a9d1e108d5e9996363e11ff5fd995828b599b77287cbb704df1ffea1d590b83f4b0b0be692025a6 SHA512 82c527a707c9f08cce2ea2672e97b01f8111c0855e01e45b5db28ddac394c8f406bf872e7083a6f755e2cb2db8d072eff0edb9970c4b68be44693b63f891a60e
+EBUILD puppet-6.0.5.ebuild 3657 BLAKE2B 348472cfdac195d18c5fb0f0430c64f9c8a91c5e912cdba02c2e229d66894f9c748fafdca0a5c77a7b8a861ae8ce8dd31fbbf37f1ae6ba3599707baad503034d SHA512 1ca964aa0fd78fdf7459383e5d1bad770c60908757ff0216e240268ad02142a18e91eb57562841819df459716052cf4187f4fae7b2186cc5eeb6f7152f1c0bc4
+EBUILD puppet-6.1.0.ebuild 3655 BLAKE2B 6589c4e2d07056f8949e942e54edb401842377263462f7c0bbdc66c907dc038bac06296b6479c22919d0a4740f0f61e443623823ff6517759d4188f576ec01e5 SHA512 221ea214e4222aff478bd3777e468d1cb377b23cd0008d9fc25cba7f5a1114e7d3f475e7161d1d0300d49b472e26a1be4686f5c9a90aaed23ec36d42466aa3f3
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-5.5.10.ebuild b/app-admin/puppet/puppet-5.5.10.ebuild
new file mode 100644
index 000000000000..7f380bcc3fac
--- /dev/null
+++ b/app-admin/puppet/puppet-5.5.10.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem eapi7-ver
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	>=dev-ruby/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+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-4.7.0.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
+}
diff --git a/app-admin/puppet/puppet-6.0.5.ebuild b/app-admin/puppet/puppet-6.0.5.ebuild
new file mode 100644
index 000000000000..1d12aee25d2c
--- /dev/null
+++ b/app-admin/puppet/puppet-6.0.5.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem eapi7-ver
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+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.0.0.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+	elog "not already done so."
+	elog
+}
diff --git a/app-admin/puppet/puppet-6.1.0.ebuild b/app-admin/puppet/puppet-6.1.0.ebuild
index 863d46f28daa..87692a87fff7 100644
--- a/app-admin/puppet/puppet-6.1.0.ebuild
+++ b/app-admin/puppet/puppet-6.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 42627e598167..731523241490 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,8 +1,9 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
+AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
 DIST puppetdb-5.2.4.tar.gz 25438658 BLAKE2B 4e548ed018b57f68c0cc81185579234e17086985733d56030802577ab5fb8106c7c47c603aa3da65ede3e5780c89df8b2dbece12c29aa1b171ceda1de7228f56 SHA512 6979ebccaa1136d19ffd0d67bdbff9c608c649d75b56b4b041d8795fdcedf24c831553c5361f8e144fa01bbac92af88e6548f917ca00eec707d8740a99689059
-DIST puppetdb-6.0.0.tar.gz 23168375 BLAKE2B 05b7738d1f1dfefac50ea54682b2c2f888d9227117fc676ef5d4754b8fddce449ee75a2ae9eac977426707654737c86499efa3692f4195547f997297c1b08f5a SHA512 f2be7049cf1615f7f235be16f32c599ad9679b9da59d43b30c63ca4fd9c9f24fbdb488def01372c516ac510105292ddb163bad403d1b06429bfc10310505501f
+DIST puppetdb-5.2.7.tar.gz 24353701 BLAKE2B 196b336a92031a25f7f28ca070a831857f3e0dde3ecc02e12e6884f3628c12dcc27b347c39147636addc975841f340fbf89196e86b3c10efc2ad1f16cf6f882a SHA512 989fa232d0fbd90c975fe110caca9b9c92a90167eb7b8d0384282dd8cf85111a56174c6785d7c73800e19185e879e258b8e6cefb210c1c44a229ce994336ef1d
 DIST puppetdb-6.1.0.tar.gz 40448212 BLAKE2B fc12d7177eda99e755eddf33c7833b98a1567ac8675bd080720105709b44421b0293a3c8eb38c104104b0bade72f0dd8e2862a10d25f52c4ecbd0f914e66bd77 SHA512 185403b528099d6ef318cbbdd58228c31face25c540435e049585f68fabcc17f5850cc10eec342746c910ebfdcf2a1d99c7f9ca01b0baf2dd4585ccae1ede205
 EBUILD puppetdb-5.2.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
-EBUILD puppetdb-6.0.0.ebuild 2760 BLAKE2B 57ea7ff1a81c62ec1d42bd40eb33dd0743b4d2d513991425d4ec35d5be751a76e340debab8c753098bf6d20c19d1ad54f669b6612bf77f032e96ec3c8693f927 SHA512 4c245b096cb4a169c566a294c026dcde1dfea946c5ca5e3cbd7a13bc8cb34a4ba9b55d8165b4d81feaf8b03fe073c5477219cfe290c0ace903addffcacac9788
-EBUILD puppetdb-6.1.0.ebuild 2762 BLAKE2B 1ccc4176c10e2ddfa56493ead809e80cc202f3ad060f765d8739c5c40e524800ccfd12b771c63e52434150fcc87416265e65e98f18d9bb3b03957d1ab527ce61 SHA512 7cd2fa8b260cd47b68963579b163c451d6752a12ff04cf832df41a3f662a9a8aa6cd8e080b06c73ecf54f08893e2ea62ba792d30235117b5967b155eaf79af19
+EBUILD puppetdb-5.2.7.ebuild 2762 BLAKE2B a0a831a2d5fc57e047d2e02f3b186e07b16b4a2397c91f2d5420ff7664eeb7be1d3ad8dc68bf5577b1c43555c1e52bee45a3ec5179cd41f8475ed2d08856054d SHA512 3b7560b937e8888412fbbc44d891e587af7aaf27e2802534788dd248697aeac422e0be1348ef6896a09c8c60de9d48dc61ef067a61ec561f41ee9f8e6274e3ab
+EBUILD puppetdb-6.1.0-r1.ebuild 2763 BLAKE2B 09a088412310f2de919ad26d13485135f791b1498640410304c96d6bb30712f61fb9afd0ed0e7ec4628d9079da2d33afd83eded15f4ae79deaffc25fcd702640 SHA512 b10d6d224b610a6478bfbfa66fa4ee96c4dfafd9188840815f2406872dda090334f22b090f110689e7e3d65a68be3ae19fc777f676a848331069d1b7ab64365c
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/files/puppetdb.initd-r2 b/app-admin/puppetdb/files/puppetdb.initd-r2
new file mode 100644
index 000000000000..a59d798a6382
--- /dev/null
+++ b/app-admin/puppetdb/files/puppetdb.initd-r2
@@ -0,0 +1,64 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+
+LOGDIR="/var/log/puppetlabs/puppetdb"
+RUNDIR="/run/puppetlabs/puppetdb"
+
+checkconfig() {
+    if [ ! -x $JAVA_BIN ]; then
+        eerror "Missing JAVA_BIN."
+        eend 1
+    fi
+    if [ ! -d $INSTALL_DIR ]; then
+        eerror "Missing INSTALL_DIR."
+        eend 1
+    fi
+    if [ ! -e $BOOTSTRAP_CONFIG ]; then
+        eerror "Missing BOOTSTRAP_CONFIG."
+        eend 1
+    fi
+    if [ ! -e $CONFIG ]; then
+        eerror "Missing CONFIG."
+        eend 1
+    fi
+    if [ ! -n $USER ]; then
+        eerror "Missing USER."
+        eend 1
+    fi
+    if [ ! -n $GROUP ]; then
+        eerror "Missing GROUP."
+        eend 1
+    fi
+
+    checkpath -d -m 0755 "${LOGDIR%/*}"
+    checkpath -d -m 0755 "${RUNDIR%/*}"
+    checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}"
+    checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}"
+
+    JAVA_ARGS="${JAVA_ARGS} -cp '${INSTALL_DIR}/puppetdb.jar' clojure.main -m puppetlabs.puppetdb.cli.services --config ${CONFIG} -b '${BOOTSTRAP_CONFIG}' --restart-file /opt/puppetlabs/server/data/puppetdb/restartcounter"
+    EXEC="${JAVA_BIN} -XX:OnOutOfMemoryError=\"kill -9 %p\" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/puppetlabs/puppetdb -Djava.security.egd=/dev/urandom ${JAVA_ARGS}"
+}
+
+start() {
+    checkconfig || return 1
+
+    ebegin "Starting PuppetDB"
+    start-stop-daemon --start -u "${USER}" -g "${GROUP}" \
+        -m --pidfile "${RUNDIR}/puppetdb.pid" \
+        -b --exec "/bin/bash" \
+        -- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1"
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error starting puppetdb."
+    fi
+    eend $retval
+}
+
+stop() {
+    ebegin "Stopping PuppetDB"
+    start-stop-daemon --stop --pidfile "${RUNDIR}/puppetdb.pid"
+    eend $?
+}
diff --git a/app-admin/puppetdb/puppetdb-6.1.0.ebuild b/app-admin/puppetdb/puppetdb-5.2.7.ebuild
index 480aee3abe2e..40efa2d8d9ca 100644
--- a/app-admin/puppetdb/puppetdb-6.1.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-5.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE=""
 # will need the same keywords as puppet
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND+=">=virtual/jdk-1.8.0"
+RDEPEND+=">=virtual/jdk-1.7.0"
 DEPEND+=""
 
 pkg_setup() {
diff --git a/app-admin/puppetdb/puppetdb-6.0.0.ebuild b/app-admin/puppetdb/puppetdb-6.1.0-r1.ebuild
index 17db5a3bc7c1..3353ad78822f 100644
--- a/app-admin/puppetdb/puppetdb-6.0.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -77,7 +77,7 @@ src_install() {
 	newconfd ext/default puppetdb
 	systemd_dounit ext/redhat/puppetdb.service
 	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
 	# misc
 	insinto /etc/logrotate.d
 	newins ext/puppetdb.logrotate.conf puppetdb
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index d2a8cbeb71c1..b6b72e1be042 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,8 +1,8 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c
-DIST puppetserver-6.0.1.tar.gz 62362369 BLAKE2B 895eefe1f1d508a9a791fc30937bb778fe6d032fc0143caeafa695e73ee139cded8c6c839b90b4f168a641ab7952f4ba10a805e0a85112ca522e78df06838062 SHA512 485b24dbe74fe40c23b98693d02096052af23344a4c8d9bb5d29876cb4224ded482c5b741be1f2b8ff94d7e48041206acd4c301e9c188b3406b04b229fd51094
+DIST puppetserver-5.3.7.tar.gz 53517572 BLAKE2B e423169b92a1638b0fef1ee5adbd10899917d89eeaa9b3bea689ce9d6f4d3e3b9d5c6cfdddea897014493373429ebba375c1a9d7b77284de46f5a0a5d6555dbd SHA512 8a58d89dc44aa8ebf82f06bdfc4f52c7a25ae3f1a48ca516425a57180c73618a1e850a595aa0e46d6e3a0b360ea38d3f050790304689bfa3b47bb0c1a4fad17b
 DIST puppetserver-6.1.0.tar.gz 74953913 BLAKE2B 0a84e64209ad313bea375bbaa22197d0216138c3714551796df0cfe99e634ef3efb0cf5378fe0db4b329df21c57359a84f249cb7fe62d9369ec7e8702c5274a1 SHA512 b3f0f2ef86550879a2eeefaf187c5be0b9e7e9bd570e77669a3f20f8b6127aa8b04b8debb10ca66a60a1858285717bdfc27f3f31c8014de2e0af51746da2f1a8
 EBUILD puppetserver-5.3.5-r1.ebuild 4894 BLAKE2B 23e8e5a9b5d544c5107e8c56b5fffe727a06883dfcd13cf55f519e70a77798424a217970c4c38c1c703466a2ac16fe0032b9ccb7e377db5c40bdebba238caa53 SHA512 f43549918d1bfe8a9ffd444bd9816e91cde25b4939432949f28e4be5bf7081175bf524cbb66e9c9aa177b9da1844cb58155b1340b301c282a721db036cb83443
-EBUILD puppetserver-6.0.1.ebuild 5322 BLAKE2B 68792635942362d16d8c5c42b100fd33b6405164f8db431096204a46b2d26c3cfef6e77eb759f917f7ba00175395bedfb70bfcb6eafa7e5f0b44e4c7b6c412ae SHA512 23db9cb35d4284bec0e3323a996602dc86c471f81dc9636f2ae87eb41274e4f00736b653ba71fbdb48fa3a7bc4f8e91c50033c67ae140bd6911c18b6cc741131
-EBUILD puppetserver-6.1.0.ebuild 5324 BLAKE2B 3f8b7d7c250a90cdfae36bb127641a81c20940dfc16a24662151dc53c18f5504e18224a3ef5352c824be1ea44d11fc6ea0378f4614a60aaf39be59227ae83885 SHA512 cb0f6432ae4addf53f932e79c5bd8e216255f2b46d3edb604f05db5706c77859f9cf41a4421a26963d8ce52183bb0d9ef11e6b04a84e59aa705e6260d283303f
+EBUILD puppetserver-5.3.7.ebuild 4893 BLAKE2B 802069d0b2e2f414ed43eade2f993c708c9769ea25bbfeb7a49ed40e6690039a10f3014f07292b3a95eb42b05597aaea385e386d986fefac2b42eb3de6b7f4c5 SHA512 77a1f8e429a109e1347e47ba13198b7bcea17ec6564e84d1bbd4bafe1652b74507b3086d0ccd47da4fa04dbbaa177c67d2a8a0fc1043938948a4b50598c74339
+EBUILD puppetserver-6.1.0.ebuild 5322 BLAKE2B 87f32494b7697944dd5b03e55c5c5bdbb32b67cd718fcdbf19066e8bb3d1ff65e5f05c1bb1a068347be4d99f4a345a437fd4c1af169d7a8f632cd9495f26c6e9 SHA512 f18c43fc1aaa91de048fe1f810e1656ecc0c6b5ac0323e355b1aca2294168df6ddea2a9cb5e317564ece2bf2cb9529ac220d5c377ff0926051117142b1ffffd5
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.0.1.ebuild b/app-admin/puppetserver/puppetserver-5.3.7.ebuild
index cdf7e741d73a..954d16fdc3b6 100644
--- a/app-admin/puppetserver/puppetserver-6.0.1.ebuild
+++ b/app-admin/puppetserver/puppetserver-5.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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
@@ -46,6 +46,8 @@ src_install() {
 	insopts -m0644
 	doins ext/ezbake.manifest
 	doins puppet-server-release.jar
+	doins jruby-9k.jar
+	doins jruby-1_7.jar
 	insinto /etc/puppetlabs/puppetserver
 	doins ext/config/logback.xml
 	doins ext/config/request-logging.xml
@@ -63,7 +65,6 @@ src_install() {
 	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
 	doins install.sh
 	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
 	doins ext/cli/irb
 	doins ext/cli/foreground
 	doins ext/cli/gem
@@ -106,8 +107,7 @@ src_install() {
 	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
 	fperms -R 700 /var/log/puppetlabs/puppetserver
 	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list.txt
+	newins ext/build-scripts/jruby-gem-list.txt puppetserver-gem-list.txt
 	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
 }
 
@@ -122,12 +122,9 @@ pkg_postinst() {
 	elog
 	elog "# install puppetserver gems"
 	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt"
+	elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
+	elog "while read LINE"
+	elog "do"
+	elog "	java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
 }
diff --git a/app-admin/puppetserver/puppetserver-6.1.0.ebuild b/app-admin/puppetserver/puppetserver-6.1.0.ebuild
index d62a1297c2c2..f49052d8a322 100644
--- a/app-admin/puppetserver/puppetserver-6.1.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/sudo/Manifest b/app-admin/sudo/Manifest
index 1a25b9e65d6a..aaf84df8dca4 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,6 +1,9 @@
 DIST sudo-1.8.25p1.tar.gz 3189951 BLAKE2B ebfedaad62e60f625db8c46a5c8f19977a5ec0a86bab3b34d91096c08e8b8ece056ba312f9fecd4cdd704fc17d49a36681b41cd40269df7c67cd66d80c0d8efb SHA512 b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72
 DIST sudo-1.8.26.tar.gz 3286368 BLAKE2B 8df947f3dfa32081020b8a19921ea5daf6f9250c1ae34aa29900e85e80669223f28573217cd7e0a28393c6f30aa2117347014aa0cb554f2b85632e335ae790be SHA512 f5596cdf753ffa54f651bb30126e690640125b2ee54e8022f3740bfbe2e5a23e1bee86ce52879e863b9386babbbcf33d3e2882c573995a7d4612e9eea14d8791
+DIST sudo-1.8.27.tar.gz 3293178 BLAKE2B 174d63ece5c24309dc0d237fadfc4131243aca333491ffa6dcdb3c44b53cb8149d3bf2f3aea2aa49529ea811d4727a11ac1909305e342b858a4c14f923f12956 SHA512 0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac
 EBUILD sudo-1.8.25_p1-r1.ebuild 6418 BLAKE2B 54b1649420ec20b8f34b4ceb51549d1d04382c42cb31a90c0b3b20fc9f50a8f7bd111eac0702e9d6229c8c908df3030d0fe040c80eab22e52e71574c1ecc011f SHA512 beb5ca170c8e149d550d6c2ee96326af2c63780c4e9ae69493af2e7612dd1458aef187c193acafac16d3b003775f9d2a53ad778254468bc0d68620149a918fe1
+EBUILD sudo-1.8.26-r1.ebuild 6497 BLAKE2B 0ba8ace2f8e5ea21652e3b4d2f935068090396fd094247f216a5ea689171157a6494a7fa250e85963953e98f44c08e0e398bb9009a1a29826407dc3c6c8f56e5 SHA512 1709e1cb5c272a8885c42fa9b3216ec0ab00a1a97ec330b7982db6d67e1627d6cf2f40dadab7eab53e261ed69d3a548b1063b4d9efc8a19e34fad863ebf4941a
 EBUILD sudo-1.8.26.ebuild 6431 BLAKE2B 7fc4cf65f44a71e5d7af3592b594a1453ac35b36d9d78ac34be974331b181ae4819a52fdc5616f501a28c2e14c6b0db999314ed8711fa97984b9eaa73b70aa3a SHA512 f5086673217867bd68ba1af5feacffee0f0c8232502d289fb187f0768ad4044a013b077e647202a1a7e3128e79df1a4d664293663c64afb4ab5a7fd1bb420ddc
+EBUILD sudo-1.8.27.ebuild 6431 BLAKE2B 9d8b162ad36ebbd733027f565f36ef8e5fa1cb720019a26e5024bdb79fdb527f96e6e8759e55e1e0f23798691e2b650a90c8fecc91b16dd610e8355ebb343d3d SHA512 7ff984c9ebc4c0fb853a15cc0f1ea6537ef523286f2a583e7b57c83a8174b89d5d79ab7f3770d0c306dffd25273f9cac11564aaa243edd174c0cbfedb6e0782c
 EBUILD sudo-9999.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
-MISC metadata.xml 1060 BLAKE2B 9d18c75cd15621433e2391bceaff27f7bafcf9fe39691b62ee040e894055193eb1d68acef48b467244978dcac79bc1bfb20af11952f641eab75104b2350b3d7c SHA512 e229a2df28f8bb87efb05a2980860fc37f8e324633444e26d9eb303397e16ca12e9e17ed6939e8e8044f03ab45eda4cb0401e38fdb9409229fc99a64c6da007e
+MISC metadata.xml 1147 BLAKE2B b0e011395c241b5f6a9fb83efeced5acac1b8623091353db3cf7c1f0a74aa8692b29b56669cff6e9414f1c5a03d5f77f9252bac0ee5bf4a6ce28b8c4f5f96478 SHA512 12f02da02d296556b259aac07b5d2d82e91cd77fe58821331fd1ba42eabba64845bb989d74adfb3dc5d4b4929560002784f8144f9672d404ae549bc08d44d67c
diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
index 66a78473b2e3..de20459ab49a 100644
--- a/app-admin/sudo/metadata.xml
+++ b/app-admin/sudo/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="openssl">Use SHA2 from <pkg>dev-libs/openssl</pkg> instead of sudo's internal SHA2</flag>
 		<flag name="sendmail">Allow sudo to send emails with sendmail</flag>
 		<flag name="sssd">Add System Security Services Daemon support</flag>
+		<flag name="secure-path">Replace PATH variable with compile time secure paths</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:todd_miller:sudo</remote-id>
diff --git a/app-admin/sudo/sudo-1.8.26-r1.ebuild b/app-admin/sudo/sudo-1.8.26-r1.ebuild
new file mode 100644
index 000000000000..fd5b1a9c50b5
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.26-r1.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pam multilib libtool tmpfiles
+if [[ ${PV} == "9999" ]] ; then
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+	inherit mercurial
+fi
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+	*_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} != "9999" ]] ; then
+	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 ~amd64-fbsd ~x86-fbsd ~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 nls offensive openssl pam sasl +secure-path selinux +sendmail skey sssd"
+
+CDEPEND="
+	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:= )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	openssl? ( dev-libs/openssl:0= )
+	pam? ( virtual/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+	${CDEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	pam? ( !skey )
+	skey? ( !pam )
+	?? ( gcrypt openssl )
+"
+
+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 openssl)
+		$(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)
+	)
+	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
+}
+
+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.27.ebuild b/app-admin/sudo/sudo-1.8.27.ebuild
new file mode 100644
index 000000000000..0cf20f0ea915
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.27.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pam multilib libtool tmpfiles
+if [[ ${PV} == "9999" ]] ; then
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+	inherit mercurial
+fi
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+	*_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} != "9999" ]] ; then
+	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 ~amd64-fbsd ~x86-fbsd ~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 nls offensive openssl pam sasl selinux +sendmail skey sssd"
+
+CDEPEND="
+	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:= )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		dev-libs/cyrus-sasl
+	)
+	openssl? ( dev-libs/openssl:0= )
+	pam? ( virtual/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+	${CDEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+DEPEND="
+	${CDEPEND}
+	sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	pam? ( !skey )
+	skey? ( !pam )
+	?? ( gcrypt openssl )
+"
+
+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
+		--with-secure-path="${SECURE_PATH}"
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable openssl)
+		$(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)
+	)
+	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
+}
+
+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/tmpreaper/Manifest b/app-admin/tmpreaper/Manifest
index 0a9b4ae50497..0f8f52953ca8 100644
--- a/app-admin/tmpreaper/Manifest
+++ b/app-admin/tmpreaper/Manifest
@@ -3,5 +3,5 @@ AUX tmpreaper-1.6.13-gentoo.patch 1766 BLAKE2B a619096b159686dbcdaacdbd3bf979f74
 DIST tmpreaper_1.6.13+nmu1.tar.gz 141080 BLAKE2B ad2895e0444e3c1a1ceabf71c34b560a817e7cc274482bde63a07499fac799ef127f5b64c953d43cd11a279819972b63b7e21a683f6250a77eeadc299a491a78 SHA512 c868d421a7757a47b81c8932743981ded2b415c83377f8781fdfd4dfda48c701991da17fa262dfa0680b2a315d6b46ee4c9035ba4c06f5a0c1bc32efa717f19f
 DIST tmpreaper_1.6.14.tar.gz 158981 BLAKE2B 1c9ec124c6e57c0aab5d555594950dda37f06a6404a0d111da05be7a48bf6141e09e942c090d3f79ccf855f958a7b32f0d64c73da68b412da74465e39bdb72ae SHA512 e78fab0cd2cc8c851e2806be70c102697bff86230e181bfad1c76b15fe5455fb431bc0dd16bebf77a2e9bb64b5f5a1474d24254ff780d4d72d343ea0e6e30ccb
 EBUILD tmpreaper-1.6.13-r1.ebuild 1113 BLAKE2B 34be61752588526b7e06cf50b816f049604af02125ac7b3e8b74c12d76afe5282d3f940e75f760b1f50e5be0ae9b4105f408529675957458fd7cc3ba546edc8f SHA512 1c40a66f0fdc5b6cf9406af6b985c8bb32eec4f3f2a21839fd1e87ff57eaff4a85151a1cfd21a5b0e1f61e67fae079b4c37c85b45129c58477fe1f2f2f187be3
-EBUILD tmpreaper-1.6.14.ebuild 1136 BLAKE2B 9298b9c9a0f4db5cf696cf0a3fd68091bfd139731eb433d6edd95c2f50b4b0589a97779314473266048274e829c4b7cffaf24aadac9b4264ca0cd02a828b0d26 SHA512 957282bb12a806694529a11d9954fbea7bc247240e78f423bbeddaeefd1fe9c180032caea1f272337bb9f4bc727843d1414ff453f644dd2b13f69bd46407fdfe
+EBUILD tmpreaper-1.6.14.ebuild 1133 BLAKE2B 06c66f570767191ae32c1456db113490a133d86a43b13dab7243e93fb009608162ff17958b1aad86063d4f2190faa579c27cce1b0a1db2749784b00491cdc490 SHA512 4743a15af0c8c3ebed5bb34d1bc905d593d8616d06934377a3dbd3aaf710d2855455d806912f35a2ca130a7a0c157cf8a8f035e1dbec530b34c17fe5a51be3da
 MISC metadata.xml 1167 BLAKE2B 7c6f25158d5a4e3e4586ef1824ccfa233ab52f6695324951ae6de2fbe4247ffd780f2806254066f34029b661c1313b01f0bb2f67ef5f335e95be97f6a9fc805e SHA512 64813b5adc37817c87f5eaa4bed0e725a3b24b2e3edadd27c92c811d13f30c09d6334b0ab18a37b4f028a335b75a5ac43be19073731ce58e35f8528335c6176a
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.14.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.14.ebuild
index 7f8b09f6daca..493307a2ef70 100644
--- a/app-admin/tmpreaper/tmpreaper-1.6.14.ebuild
+++ b/app-admin/tmpreaper/tmpreaper-1.6.14.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/t/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND="sys-apps/util-linux
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index dd8acfd5f40f..b7b115114136 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,10 +3,11 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 542 BLAKE2B 5e28a00356c010d34458c6f64d2bdb0736673ae552bec809cc5e23a1613e44cd847b4df99bee652a99cb6fb84443d5f9c5c1fba1c165d946f1c93cd8ca31ffa3 SHA512 ac13c688e006799b607c44e94fbdf922befc62131014b714a93ca4bb0205f5f012bb3e4814eeeb47b31034f5c35b187fc8ebaeca02bd02430c5842bc9821f29a
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 409 BLAKE2B 1e34e7bb4e5d52949b1b0afbe495aea00202ee599db1b1737bd81c5252a6d57efd2a5c98e4dfaa4d632bb664a467414e644ec751921ced20f5e4c40b27222eb6 SHA512 2c4c7c395ebcd06e70de57d93384442ea88346cc2815b509966bd9f12579758e5f43d9a2ca1158e3b25198ad0c82ed9cf5d453f3cd7b5873011b3b13ec60196c
-DIST vault-0.11.4.tar.gz 25456828 BLAKE2B 35ed79e8474c4fffb046b5163bfd7115ca4ffe3c3560732d9f73349a1187417a288c30985d7ac450b86f682aa7a1d5318634c1be60e5bffce04137e32f2ad13d SHA512 99e592d679d65d75d62812e2d0ae9a652342a97f4934a2ca00a9ac044cdc92b35e7108296cf1a700ed36818a504fcaf155f8f61d7b10d84933932bdab00a9f7e
 DIST vault-0.11.5.tar.gz 25459691 BLAKE2B 9f77e90b71629e1ed341d03830a0376b6731d85189dde0205148c7c8002556521538144cbf1b7bc425253cc55de6ab3d48cbcc1d270165e5804f7f632d06523b SHA512 b290523ee94199d241bbd2477ca686076f645804953181996aefe2a425bc5114db3d375fd5c832d1fa257a790947544406f50777317e854ccf2d4d4477ab6ffd
 DIST vault-1.0.1.tar.gz 25817507 BLAKE2B c4882341fbcea2051c8685dfff85739f11898d0406d12611cdda36f19d7badae69e88060d593ba03c333b151d4402b7bfc520f34c0663fe00a77998aa662f161 SHA512 b644e419faa8dc1f8a347f7b522ccafbdea9f849de9ad1ca085214d21e50bd2ec6eb868b4eb0abff65537abc4fba93c3e4ffd424afa90ca049068e6eccc99999
-EBUILD vault-0.11.4.ebuild 1620 BLAKE2B 7130a0a55407c092d96c3e22b216bdfab9d2e0168176539745afda5563808efbec06051adaa66fbf644a530ae91ac6f21fa7d58f78f57aab3f8b19dc65812399 SHA512 5d22bb29b0a7bffe7410af9b9cb07ab6957ca78aa0d82016341327eb739011799f330bc1f2eacc8d3509eb52f445ccb1f04ecb5332fd8d2601bfb2ba8d36486c
+DIST vault-1.0.2-webui.tar.xz 1252768 BLAKE2B d4af46bae84eb2e0e76633e5af061b351d486f19eebd0323a0ae5eb13275310e23169a88e3984a753ae45102c1010b54ae2ca789fe0c62e8e302305eec2bd129 SHA512 9282135e1f1cf983fb1ea4b72b7b3e5cc49aa42299aa5be40e9697da028c3e0bb8c2869e72a79b27ee2124a1b0f913b1b22ef98f96401289edb9e3407d460465
+DIST vault-1.0.2.tar.gz 25834864 BLAKE2B 88f3252547e05a70a377d7711c7df279619455ce26003868465df1030da9ffe95bddd094b40b99f7f4698bbacfd883cdee31d14ee47e815299eb41a18ef99b3d SHA512 e90a1db0401778650f16fa01827b274dc8e38e5f6fb420814bdc3f89507d3507a94d6bd3eacabf1ae782e72286dda598106918030b674f9b7d3f8e69cddbd3ec
 EBUILD vault-0.11.5.ebuild 1620 BLAKE2B 7130a0a55407c092d96c3e22b216bdfab9d2e0168176539745afda5563808efbec06051adaa66fbf644a530ae91ac6f21fa7d58f78f57aab3f8b19dc65812399 SHA512 5d22bb29b0a7bffe7410af9b9cb07ab6957ca78aa0d82016341327eb739011799f330bc1f2eacc8d3509eb52f445ccb1f04ecb5332fd8d2601bfb2ba8d36486c
 EBUILD vault-1.0.1.ebuild 1620 BLAKE2B 4cfe3ee73464ce3f1c53c9f1afc42022e8feef5312e678630b4e52abe2298baae67824f63b058341680c953713e94c715f9caa773312563588e2ec712eb7bef1 SHA512 9a1ff9ac7f1b15acda152467f7d9f041681f570eda71848c05c62643dc155c7fcacccd8dd3aac4bafe51ace6a9522cf847d5a47ce8fdef7677d8ff24cf605b82
-MISC metadata.xml 306 BLAKE2B 882a83701d71a45cdc6fc00ba3da98ff7d7439c9f81ef0aa1655c49bd5e79b3e625858d33f4ac6d5157df6ef74c5dd00a2b8efb1fd5ee45f9a0ed785c90d8ebc SHA512 d1fc4040379fb33c7f193f37a1c044000408e47c9df8b17771ed7cb5194f9d8b8c062b8a6804e72fb5a666683a8d5b49ec5a6328394870d9bdc1b7f3e0e4e787
+EBUILD vault-1.0.2.ebuild 2135 BLAKE2B 2372bc71e55bc372481dbe7c96031ffb05aacab25bdcc658e40f04b7562c15d1e507c8ea443b6ea935f174fe7a26742f6445a50da3e1f5004a6588d37028afa3 SHA512 5fbeb9aff965df2f8d441668805fb2d79e5b9c83fbd03d7faea5ea7a4a99cf14ecb51e48668f452b32ca4a45458009cd167af639499245abb770d6169c2af812
+MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/metadata.xml b/app-admin/vault/metadata.xml
index 9f451f6533d7..5f19dd15eeea 100644
--- a/app-admin/vault/metadata.xml
+++ b/app-admin/vault/metadata.xml
@@ -7,4 +7,7 @@
   <upstream>
     <remote-id type="github">hashicorp/vault</remote-id>
   </upstream>
+  <use>
+    <flag name="webui">Enable the Web UI</flag>
+  </use>
 </pkgmetadata>
diff --git a/app-admin/vault/vault-0.11.4.ebuild b/app-admin/vault/vault-1.0.2.ebuild
index 52a7f68b449b..8eb29218789b 100644
--- a/app-admin/vault/vault-0.11.4.ebuild
+++ b/app-admin/vault/vault-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,13 +6,18 @@ EAPI=6
 inherit fcaps golang-base golang-vcs-snapshot systemd user
 
 EGO_PN="github.com/hashicorp/${PN}"
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
 DESCRIPTION="A tool for managing secrets"
 HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	webui? (
+		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
 SLOT="0"
 LICENSE="MPL-2.0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="+webui"
 
 RESTRICT="test"
 
@@ -23,6 +28,17 @@ FILECAPS=(
 	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
 )
 
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+	if use webui; then
+		# The webui assets build has numerous nodejs dependencies,
+		# see https://github.com/hashicorp/vault/blob/master/ui/README.md
+		pushd "${S}/src/${EGO_PN}" >/dev/null || die
+		unpack "${VAULT_WEBUI_ARCHIVE}"
+		popd >/dev/null
+	fi
+}
+
 src_prepare() {
 	default
 	# Avoid the need to have a git checkout
@@ -40,11 +56,12 @@ pkg_setup() {
 
 src_compile() {
 	mkdir bin || die
-	export GOPATH=${S}
+	export GOBIN=${S}/bin GOPATH=${S}
 	cd src/${EGO_PN} || die
 	# The fmt target may need to be executed if it was previously
 	# executed by an older version of go (bug 665438).
 	emake fmt
+	BUILD_TAGS="$(usex webui ui '')" \
 	XC_ARCH=$(go env GOARCH) \
 	XC_OS=$(go env GOOS) \
 	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
author	V3n3RiX <venerix@redcorelinux.org>	2019-01-22 10:09:44 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-01-22 10:09:44 +0000
commit	09351e78166b5e864197c4456ebae3f89dd0bed9 (patch)
tree	41a96399f56ed3aa399006871bfce4430db84aa2 /app-admin
parent	c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff)