gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-admin
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
238 files changed, 2774 insertions, 2091 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 24aefea5d233..3425679dd212 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index ef544ba83fd5..d21cdf4a3bb7 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -2,8 +2,6 @@ AUX analog-5.1-gentoo.diff 799 BLAKE2B 66aae5e4f66ab232cdb98eef893ffe2794e06ecb7
 AUX analog-6.0-bzip2.patch 3260 BLAKE2B a9bab8a2a7d070b59690606f393d80407f6ffcb38f2c40c30c22ffadcaf8de3f868c56660fbdf358e76ca342296305670b12d41cdefd5d03acb0ce22dea371c7 SHA512 ea256338713338043ccaa48ffd8344753811721cf42c8269a2c58c2a14f7ebe901b16131ff021163a02c570b1b902bb3ab6516e34570a7961bce716cf600920b
 AUX analog-6.0-undefined-macro.patch 997 BLAKE2B 9ae68f90acfa81e861a6fddbd588ed4cbfdf9b4ad26355894bc3aaa0df50e5bbd180096c4baf393f6dcdd7d91d28b4e6a85e5b5c65714ff540e9ae127a08905b SHA512 759d6dfc2a09305a6178d1c147219487f988d432bf6d011e49776cec2de04ccc7ab27568638063f0ca723a92a75abeda82eddd5240a0b42bab3a2de3ae99007f
 AUX analog.cfg 3992 BLAKE2B 8e68cc26a59a5bbed57f84e06ac8f5c9874cf1a36bdbb5c6f9144bc39df17ea380ebd323b2ddb891dd968078fd3d7bae6b29a90cb5ec2051a10722489d0d83d2 SHA512 af6e8eb3013fea513efcce2e57b2680850604552a8def8f3148cfc4b11bf01114778fc112ee562b7ce4cce6b496b37a53251d1061d67fe5748d39c5225f94141
-DIST analog-6.0.tar.gz 1553316 BLAKE2B 5363880cf65e8a4e845603a19dd30b79d4fb13b51b68d0cbcf59c2827a2c099d02c662e55b59ef9b4526ade53ca3f7401415a3bc78de3d7cc39b4e4988299241 SHA512 42b766d45f86a32d2e97cc2be35ebb5f4e0ffc2fb72d48196939027ea1ed3398a8cc0a43c47868f542bfb464199ab35bd93fa2ba5e37c4fc83ff15cfe19b9c60
 DIST analog-src-6013ce.zip 4875246 BLAKE2B 6b0663f3367faf84a8c65a778a065165ddfba6cd902e5cc6c9e0e84d94e1600629b9f9f89b87ec293f4b81f4034e21941ad45784ae5f35352f71f7b0917eb731 SHA512 8f8dbf0bd95873132414f558deeff61fbe9ac6cac40936f00515ccaead86642613c3f0a5a88046eb4d1f4e263cb01d638291c9a1596ea36098b455572b7364ed
-EBUILD analog-6.0-r4.ebuild 1324 BLAKE2B 3e8e566b541ce86cac1270c7f65fc0656e63b532777f35e022073edf9cb4123c6233a64cdcb35eaeceb55e07b7848924f54c50c9794e6d39ab22fac93026e7f8 SHA512 3d2d68366229b53000d872261a01eae6e8fe291937b6d614b7e2fb3fc29bd05742e03a0178a30b1ece779e453e3b71ec49c647727eb860bdba826b1d522d797f
-EBUILD analog-6.0.13.ebuild 1375 BLAKE2B 6958e8335810fe01c2803af543855edeb2f32947147db6acb392600e0b73179335af21418ddda27c91162bc91d56043c340cdbee3e0fbd47f11d56478f71011d SHA512 4a252dfa76940584f26f8e01e1b79a7f00695214c77aeaec42a2b6ec55e947ee762f157cc87d585b79a92690bdfd05d8a73f771ea9a9da9021962704f951f35c
+EBUILD analog-6.0.13.ebuild 1373 BLAKE2B 53be6fbf065bffff1d95bef6726605a6667d1e79ae6b074645b4116203e5ec68cdb9a5b0bdb90822f929237329fb7fc41bd2ab8f096c29fd4d0340e5abb71b13 SHA512 ed04fba607e61a497a1a6a21460a95823c89f15e2307a5b0b4f0738f3facf4e03a123a07d8b6e4790e413de8be49dd189054b947e5991c7ad08e53a90e2fd5eb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/analog/analog-6.0-r4.ebuild b/app-admin/analog/analog-6.0-r4.ebuild
deleted file mode 100644
index 26824d6fb25a..000000000000
--- a/app-admin/analog/analog-6.0-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A webserver log analyzer"
-HOMEPAGE="https://www.c-amie.co.uk/software/analog/"
-SRC_URI="https://web.archive.org/web/20140331011039/http://www.analog.cx/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libpcre-3.4
-	>=media-libs/gd-1.8.4-r2[jpeg,png]
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cd src/
-	epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
-	epatch "${FILESDIR}/${P}-bzip2.patch"
-	epatch "${FILESDIR}/${P}-undefined-macro.patch"
-
-	sed -i Makefile \
-		-e 's| -o | $(LDFLAGS)&|g' \
-		|| die "sed Makefile"
-}
-
-src_compile() {
-	tc-export CC
-	# emake in main dir just executes "cd src && make",
-	# i.e. MAKEOPTS are ignored
-	emake -C src
-}
-
-src_install() {
-	dobin analog
-	newman analog.man analog.1
-
-	dodoc README.txt Licence.txt analog.cfg
-	dohtml -a html,gif,css,ico docs/*
-	dohtml -r how-to
-	dodoc -r examples
-	docinto cgi ; dodoc anlgform.pl
-
-	insinto /usr/share/analog/images ; doins images/*
-	insinto /usr/share/analog/lang ; doins lang/*
-	dodir /var/log/analog
-	dosym ../../../usr/share/analog/images /var/log/analog/images
-	insinto /etc/analog ; doins "${FILESDIR}/analog.cfg"
-}
diff --git a/app-admin/analog/analog-6.0.13.ebuild b/app-admin/analog/analog-6.0.13.ebuild
index cf508ebd6e23..2f7f9b8e601b 100644
--- a/app-admin/analog/analog-6.0.13.ebuild
+++ b/app-admin/analog/analog-6.0.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.c-amie.co.uk/static/analog/6013/${MY_P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
 
 DEPEND="
 	app-arch/unzip
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index bd394949aaac..38e38a753fe1 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,5 +1,5 @@
 DIST ansible-lint-3.4.23.tar.gz 36922 BLAKE2B a012155d9608ce0517f152837cc7f5f8330848f3e6b6b8b62b1985c9aae5260d3b8c2e9016f945a30b8433387549a9421970d9f56fc32ff9aac25a71dc150285 SHA512 4b2357327319f2cc2c0863ed74af3c799afa97f6e8e1885f9c621a9b0b4ed4b33c731f4a0e8557bf7d03f4e1680a06e60b8602b48fbb55c55325f1dda31a51e7
 DIST ansible-lint-4.0.1.tar.gz 2909257 BLAKE2B c030b6fc58eaeeec42e40dd5bc46e5181916433b905bfc4a82382bf6bba8536d2639172aab0e2928ce1dd5489f322e19ab1c0ea5abb637562616addb9733e81a SHA512 a2f3bd44287a2c72f79c5fbb4c02446484cf764d386d403694325bce172e2b195dd4812e0f89e5f4e1930db124e2b383e4f067bed5d4858c354c0ae0b3fb03e4
-EBUILD ansible-lint-3.4.23.ebuild 822 BLAKE2B f10c85470b7bd0e423f7e407ce4d3a7544950ba9572ed1bd6a120a75c6cd7d2ccdcbe9d5676cb8dde1277e1712eac63ed957964bf97b1e30d015d4775a6ff5bc SHA512 868a0367462ced7d09f3335fb28a2689df05b8cf2a1899314e57ecf09e30446195afe33e1369cf2e523f62a37a539873fd1462c083f8c76392302d4aa8bf1bfc
-EBUILD ansible-lint-4.0.1.ebuild 971 BLAKE2B 2de53f3b709b83cdeef9b5f4df34ba72ca652ae5184ff207283e9bec1f28fe266baa6caa53a5d2865bd8154e9a6616a4238808029ede979fe92fd8d80f0135bf SHA512 ff76d074f577bc73f3ba1c7defbb18f2e4c7102b9869c6a271c050214b0d1fa9f990962aa5f3ee54dc226e317da7c6638b50770f4c6d55d9b8b5358bab13ccb0
+EBUILD ansible-lint-3.4.23.ebuild 846 BLAKE2B 3e8548d0adc4a6b8fe9dd53bde8b31736cd5116c0e3c0645c05adccb0e416ea152bd8f297182e49cb68abbf4764c0f6ae8c1fb9c3aaeb0f7450b862c6d5bd080 SHA512 edbeee87709d1361f96342706b9dccbde48820b147f2014b761d6460c7d0e14880d7f1ca8d55124ad326750be697e39d955a93945ac5a0baf73d2880b5dde089
+EBUILD ansible-lint-4.0.1.ebuild 998 BLAKE2B 4f20169546de7596543448faf412b0fe5a378b44fedaffc62b027d3520e9626784e3458247c47cfe7604a8cd4ec199fb4a7ab531ba4e86561a926ac50ae89060 SHA512 d1fcfdfcf771efa6707d433f96b1015bb493635a0cdb2121e9a6938fddc1ec852c38a250295a92596c63ee56e21b4b6880c48c1cd52f2f676a9e0b6e6c69614d
 MISC metadata.xml 468 BLAKE2B 6c6ebea3538b994b0ed427d005d3d46fa5bf115f25ea4de3b00e9fba3eaf44831ef0b54af5ddc352ad292ac4b6bcbb859583fb34b5bb358bc03ff25d43997215 SHA512 4dd15de2b2d9caf6cfe4518e9e4fcb476838c78c20d4edbeab8d78a602969201d7bee7bce8af1406e5a7e171cb481e7a08c58db599618e66d1c681a1537dfcfc
diff --git a/app-admin/ansible-lint/ansible-lint-3.4.23.ebuild b/app-admin/ansible-lint/ansible-lint-3.4.23.ebuild
index 25c9f45d9906..57adc9d0fa2d 100644
--- a/app-admin/ansible-lint/ansible-lint-3.4.23.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-3.4.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild b/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
index 693eadaacd95..7a241ff86f02 100644
--- a/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-4.0.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="app-admin/ansible[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index e6f6638f260b..33834a59b131 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,19 +1,10 @@
-DIST ansible-2.7.13.tar.gz 11861862 BLAKE2B 3123d84b9f45bb5e50a0d5db5d0b2ae10163e2818d30f29ad5a80c23979a347eb5e17806bd295df547b88a09191918443162cb25d7f339ae76df52e3960954b0 SHA512 8dc19e5c93a90d43ced6628699d2da42d522a020bb2cdd35ba73f6286998c605852c89250af8696e94aba0080b2fab12761a39c3e2eb86d39c212a198f970652
-DIST ansible-2.7.14.tar.gz 10203158 BLAKE2B b0727a4e2bd4d2126305e2a529fcb9c938f062a19d473d6ddc4463a0ed1e1c6d444592660aa8bb3f05f8885592f8ae3b021a7b1e6ab43422c35f88f999ff4de4 SHA512 16705c965b03daeb4e6b6a0bccf0be976de60948b88c06e65449d2662dce1fbcbf796ca2b5f6ebe9884d19d918b6ec0e5b0edcb0ef606b7bae61bfa7699c7b92
 DIST ansible-2.7.15.tar.gz 10205890 BLAKE2B 30b0c83ad646cdcd918472be4512ee8cf00e966b9c7ed0431bcf915e858dae6aeb26cdff4eee5d480b751a4c33f30c2b213d8bc67d17bc8774c5ca2bcf897632 SHA512 7140fdb80456f5dd9f34226a9f38ce567ad13e4cd6b4058ae22012867554c9ed19e3cfa0ae7e745bf56d109fbe8dde8e264efce2f537b5bdae48cf606ee38f52
-DIST ansible-2.8.5.tar.gz 14352036 BLAKE2B a2d60132e3aeafd7dbdcca13daac1c657e19fc1b7822b33dde35e0fff67fa7093b54330652ba6c02bad710fd2d05fba3081cd0b609f16bccf7e2eba52f9fa45b SHA512 6555b9a3d3d8298410e54f7116d92fc1978bef185a5136cfb809c1942b08b96c562af9e0d6d1a25eee5a4024d309b6713ce27836857b428a7c362e26efb53777
-DIST ansible-2.8.6.tar.gz 12689211 BLAKE2B 9c451037f705f2e591633b59700e89c6de672c43b4b12ee36de9dd4b3ac0e6a19f7e2cd0df9a29b7973f4192d85b3c48fc8915bb36dbd36d9206ee3ca5ccbb09 SHA512 8e29644b4651e72bd3fbd4ca91c2a36b76e5dde9bb445d3c6e0061c315eb66e1bc507729b70d82998c1cbb25f3ef0e20d281ab8354a047193e60bf4831938418
 DIST ansible-2.8.7.tar.gz 12697144 BLAKE2B f88225b358ff9fad352c04a053100c5aa612f54ba7ad8e3a700d61e030fd0b5850055b83861d3ad76e614d3e786a2ed719f63b7f452ce24d7e27d79d386b8eed SHA512 166009780c8bb5b35beb9604412d4e5e3874e13b04f3ce694d726dc5bfb064f73a17ec3c814c8a67e28d57e7c327276b6cb66a9a0dba7138d702427ec13b4de3
-DIST ansible-2.9.0.tar.gz 14126941 BLAKE2B 409f94af0fa8483934b957cf31f3a762e575203f4f809c44cbf5c74cc945deb065f97374b93dd2aa03a8002b17d7da0bfad3ea80c11673b02be3d0179c34b7c9 SHA512 47e0738bbf9918254d7b33ddc0a8f89a101995ccc3cb846be9ff10bdbc7687fb8a5390d8b976b3ce17fa1325ab63a592161b026d5d943a01f8a5803fca67312a
 DIST ansible-2.9.1.tar.gz 14144123 BLAKE2B 20b288aed59221c63cbc345d6f1bb33770b864229ddfdcb3e3d7c5ddde0978b05f1139466945a92145772f1d659a43d406c7486df91f7f16135f66b7282761ab SHA512 fdb25017b96475a6c182bba2f32050f0eaa6f22d17f166b98ce0f0cb40fd12dbbc5ede9912624fa4c5d4a8de472b28c2eb2b569700537c7d4b4c568d7e38f21b
-EBUILD ansible-2.7.13-r1.ebuild 1675 BLAKE2B 9b2c3275f960f0c36be0db1fa01e09c8acb93ae8ff4e606c8fa874d00e20512f57c528ad210a8c375f9173d7484284dce1cd2d0ac3b0590551a487e329752838 SHA512 9ea7ede55cf58584f191ada7f48465af05007d3c8a26ac18b5b06a41794b8f46f9ca46ecd900bef1c61bd433177b516c8b16b01d0eb8a13be511b341c9552798
-EBUILD ansible-2.7.13.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
-EBUILD ansible-2.7.14.ebuild 1675 BLAKE2B 9b2c3275f960f0c36be0db1fa01e09c8acb93ae8ff4e606c8fa874d00e20512f57c528ad210a8c375f9173d7484284dce1cd2d0ac3b0590551a487e329752838 SHA512 9ea7ede55cf58584f191ada7f48465af05007d3c8a26ac18b5b06a41794b8f46f9ca46ecd900bef1c61bd433177b516c8b16b01d0eb8a13be511b341c9552798
-EBUILD ansible-2.7.15.ebuild 1675 BLAKE2B 9b2c3275f960f0c36be0db1fa01e09c8acb93ae8ff4e606c8fa874d00e20512f57c528ad210a8c375f9173d7484284dce1cd2d0ac3b0590551a487e329752838 SHA512 9ea7ede55cf58584f191ada7f48465af05007d3c8a26ac18b5b06a41794b8f46f9ca46ecd900bef1c61bd433177b516c8b16b01d0eb8a13be511b341c9552798
-EBUILD ansible-2.8.5.ebuild 1754 BLAKE2B dba223a203261ebe347e6379e1dc829d44ffc0c59dd0138f0cd843115eaca7b12f774522162f15950899f0b4994bac624ca10f4a582deaa5aba1a908058128a4 SHA512 7a53449ded7610d3a6e5ee0c61bbfedd0c17e7632ab4abcbe79800f2d5ddd92561c2b6f915093d3114ed9a85df8254fe1477b11a6c6947246679dbba8a8ecb93
-EBUILD ansible-2.8.6.ebuild 1756 BLAKE2B 30327a58804ddf1ee56c9ce618270afa554462123140e2ef6376b1655620289677b69ec6a49da1096cadc09924147f75fadbb7738cb68eb7cdc34ccb0b2f290b SHA512 386092c824fb03e07b89589281e64b4adcd817f1f977b8c9004497fa5b115a053c2789994d1385cf56afe134cad1b67d40ec3d36845989acbbc8cc11ba2b677d
-EBUILD ansible-2.8.7.ebuild 1756 BLAKE2B 30327a58804ddf1ee56c9ce618270afa554462123140e2ef6376b1655620289677b69ec6a49da1096cadc09924147f75fadbb7738cb68eb7cdc34ccb0b2f290b SHA512 386092c824fb03e07b89589281e64b4adcd817f1f977b8c9004497fa5b115a053c2789994d1385cf56afe134cad1b67d40ec3d36845989acbbc8cc11ba2b677d
-EBUILD ansible-2.9.0.ebuild 1718 BLAKE2B 836a1251fc9bbfd580dfcf0e8bebefe079025baa95cf45a5867579e16ab3685f8a43d08ad8d10a1ce2a0a1e954a98153a6cf3acce5a55e333e45a36da2db78cd SHA512 15650c77da5295eae131050fbe762361ee08eecc3fc98fd85b9ebee5ccf9afb5a7e1b11ca3651f45bf69ba5dd381fd20ec47ce66627a0e1946667ed9fc4df4d1
-EBUILD ansible-2.9.1.ebuild 1718 BLAKE2B 836a1251fc9bbfd580dfcf0e8bebefe079025baa95cf45a5867579e16ab3685f8a43d08ad8d10a1ce2a0a1e954a98153a6cf3acce5a55e333e45a36da2db78cd SHA512 15650c77da5295eae131050fbe762361ee08eecc3fc98fd85b9ebee5ccf9afb5a7e1b11ca3651f45bf69ba5dd381fd20ec47ce66627a0e1946667ed9fc4df4d1
+DIST ansible-2.9.2.tar.gz 14157188 BLAKE2B 4c1207bd43f7797d8d9cb1d4612e866eebbf8c19ee060cf1eb7daa68415be5d7718c79d756454648e66a13434eacba6a07c8de31c4ec4b12e0474563d8844e46 SHA512 522dd84af9493ceafd95ff0fc806a671f3d1f10d0ca074ef41875eb966d39e64b834e0b98a35d81d9d9d96efef8069db604c8080ce8cbb1ce2e8b13bf5c30a6a
+EBUILD ansible-2.7.15.ebuild 1673 BLAKE2B 169728c5deacbe5b36f36dab8fe1f811473861587d6c0a037f1bb27dfcb40641222f51721e9f5b9d32109b0f94e730cbac4d46468ed2a8fac8373c682b568bf3 SHA512 756db7cf9ecfc0ea6f27d58e6b2fff9e691506f4930cd068802fb9cd90354e3fa29bde7b96c5cd00a20ca3f2f80472707e5dceda20b228b550ecc948b262556a
+EBUILD ansible-2.8.7.ebuild 1754 BLAKE2B dba223a203261ebe347e6379e1dc829d44ffc0c59dd0138f0cd843115eaca7b12f774522162f15950899f0b4994bac624ca10f4a582deaa5aba1a908058128a4 SHA512 7a53449ded7610d3a6e5ee0c61bbfedd0c17e7632ab4abcbe79800f2d5ddd92561c2b6f915093d3114ed9a85df8254fe1477b11a6c6947246679dbba8a8ecb93
+EBUILD ansible-2.9.1.ebuild 1716 BLAKE2B ae78ec85088015ca2a763cadeb4d849f003401ac7b216b89b9b76bff54be3e8621c3c1c0b4296a3fb0db2848e7119b4e349485dd14bf022bcc640d7f020019a2 SHA512 246a1dd356a66a100bc7d9b74f1b04f7a5bdd4a3bd970e9177cef193de17eb5bf5dd2a28b1d099253c4ba522165b23eaa54cc792c34a5d0a0726ef7b393bae91
+EBUILD ansible-2.9.2.ebuild 1718 BLAKE2B 836a1251fc9bbfd580dfcf0e8bebefe079025baa95cf45a5867579e16ab3685f8a43d08ad8d10a1ce2a0a1e954a98153a6cf3acce5a55e333e45a36da2db78cd SHA512 15650c77da5295eae131050fbe762361ee08eecc3fc98fd85b9ebee5ccf9afb5a7e1b11ca3651f45bf69ba5dd381fd20ec47ce66627a0e1946667ed9fc4df4d1
 EBUILD ansible-9999.ebuild 1709 BLAKE2B 1369caa197cdf61e86960af4f793d65f2e2842456a6711797b5bbafadec8c622d178ea820e9ab9697b08837e351d379f7aea86cc551ca1c18b048e575159fce1 SHA512 4850bad9088b5bc3366efefca3827519e23af617b35e9f14d275be505248511832e17ad0da69fa28be51d458a8d0820bce081698cf4fa91bcc44b20c72a6ce70
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.7.13-r1.ebuild b/app-admin/ansible/ansible-2.7.13-r1.ebuild
deleted file mode 100644
index 401feb026c7e..000000000000
--- a/app-admin/ansible/ansible-2.7.13-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.7.13.ebuild b/app-admin/ansible/ansible-2.7.13.ebuild
deleted file mode 100644
index 028f77e10f7a..000000000000
--- a/app-admin/ansible/ansible-2.7.13.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	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.14.ebuild b/app-admin/ansible/ansible-2.7.14.ebuild
deleted file mode 100644
index 401feb026c7e..000000000000
--- a/app-admin/ansible/ansible-2.7.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.7.15.ebuild b/app-admin/ansible/ansible-2.7.15.ebuild
index 401feb026c7e..c7356498cca4 100644
--- a/app-admin/ansible/ansible-2.7.15.ebuild
+++ b/app-admin/ansible/ansible-2.7.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.8.5.ebuild b/app-admin/ansible/ansible-2.8.5.ebuild
deleted file mode 100644
index b0307b32f958..000000000000
--- a/app-admin/ansible/ansible-2.8.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_prepare_all() {
-	rm -fv MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.8.6.ebuild b/app-admin/ansible/ansible-2.8.6.ebuild
deleted file mode 100644
index b078e69e7bf9..000000000000
--- a/app-admin/ansible/ansible-2.8.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_prepare_all() {
-	rm -fv MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.8.7.ebuild b/app-admin/ansible/ansible-2.8.7.ebuild
index b078e69e7bf9..b0307b32f958 100644
--- a/app-admin/ansible/ansible-2.8.7.ebuild
+++ b/app-admin/ansible/ansible-2.8.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
diff --git a/app-admin/ansible/ansible-2.9.1.ebuild b/app-admin/ansible/ansible-2.9.1.ebuild
index 29be3eba4da6..030cf12fa434 100644
--- a/app-admin/ansible/ansible-2.9.1.ebuild
+++ b/app-admin/ansible/ansible-2.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
diff --git a/app-admin/ansible/ansible-2.9.0.ebuild b/app-admin/ansible/ansible-2.9.2.ebuild
index 29be3eba4da6..29be3eba4da6 100644
--- a/app-admin/ansible/ansible-2.9.0.ebuild
+++ b/app-admin/ansible/ansible-2.9.2.ebuild
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 3710fe312141..4366be5ba305 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,7 +1,4 @@
-AUX apache-tools-2.2.20-Makefile.patch 1573 BLAKE2B 56de28f38934b73740d68f6429f3361bfd37f079f1f6de4e169741e7c97bceed86330744c1b69045f8ffee0baf927e35e0eca10036d2da461f14e45cd218e5cd SHA512 85120f1b57cd14baf3482dc21d4175447e135700a1f8e6455970c14e576cb0c510815681a9906de4c7eb68743de7e41bbb2d86e83dcb62cd57eb0c9f638f6892
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
-DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
-EBUILD apache-tools-2.2.34.ebuild 1955 BLAKE2B ac89e162cbd366e9d1088630a918a5fc39b656776ecf1ba0fddf9ca4eb844dc5f92ded218bca1a5ecad4f8ed25c4d57b13c9c9fb738018a56cd257ff31ca4abc SHA512 943de88edb1e55d04be1520c86c318f3fe59a75dd685160e2c29dd7b4b99a40f73995e12cfc6262728b50548689d246bf04738727d518623d04e9d3ebc447207
 EBUILD apache-tools-2.4.41.ebuild 2554 BLAKE2B 138448a508312f75c2bc15271e2fc1306bc0a131f01b02491411167279c0a20e7f2b036b72bd5a92c04b6ba147b3aad5193caa5271b65af194c6e8e367ba5cfc SHA512 9112aa33a023092cf703fffde26b4a1e3e55f595e925f104230bfe1c697727d9d855d85b5570e8403c38719e2e68163933fe88ddc0882b5d889296911c8b863a
 MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122
diff --git a/app-admin/apache-tools/apache-tools-2.2.34.ebuild b/app-admin/apache-tools/apache-tools-2.2.34.ebuild
deleted file mode 100644
index e98b337dda0a..000000000000
--- a/app-admin/apache-tools/apache-tools-2.2.34.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic eutils
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="ssl"
-RESTRICT="test"
-
-RDEPEND="=dev-libs/apr-1*
-	=dev-libs/apr-util-1*
-	dev-libs/expat
-	dev-libs/libpcre
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? ( dev-libs/openssl:0= )
-	!<www-servers/apache-2.2.4"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.20-Makefile.patch"
-)
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	append-ldflags $(no-as-needed)
-
-	# econf overwrites the stuff from config.layout.
-	econf \
-		--sbindir=/usr/sbin \
-		--with-z=/usr \
-		--with-apr=/usr \
-		--with-apr-util=/usr \
-		--with-pcre=/usr \
-		$(use_enable ssl) \
-		$(usex ssl '--with-ssl=/usr' '')
-}
-
-src_compile() {
-	cd support || die
-	emake
-}
-
-src_install () {
-	cd support || die
-
-	make DESTDIR="${D}" install || die
-
-	# install manpages
-	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
-		"${S}"/docs/man/{htcacheclean,rotatelogs,ab,logresolve}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${D}"/usr/sbin/ >/dev/null || die
-	for i in *; do
-		dosym /usr/sbin/${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl; then
-		dosym /usr/sbin/ab /usr/sbin/ab-ssl
-		dosym /usr/sbin/ab /usr/sbin/ab2-ssl
-	fi
-
-	# make htpasswd accessible for non-root users
-	dosym /usr/sbin/htpasswd /usr/bin/htpasswd
-	dosym /usr/sbin/htdigest /usr/bin/htdigest
-
-	dodoc "${S}"/CHANGES
-}
diff --git a/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch
deleted file mode 100644
index 7bc39527790c..000000000000
--- a/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-=== modified file 'support/Makefile.in'
---- a/support/Makefile.in
-+++ b/support/Makefile.in
-@@ -1,9 +1,10 @@
- DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
--	logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
-+	logresolve.pl phf_abuse_log.cgi split-logfile
- 
- CLEAN_TARGETS = suexec
- 
--PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT)
-+PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm \
-+	$(NONPORTABLE_SUPPORT) log_server_status split-logfile dbmmanage
- TARGETS  = $(PROGRAMS)
- 
- PROGRAM_LDADD        = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
-@@ -12,22 +13,13 @@
- include $(top_builddir)/build/rules.mk
- 
- install:
--	@test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
- 	@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
--	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
--	@cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
--	@for i in apxs apachectl dbmmanage; do \
-+	@for i in $(PROGRAMS) ; do \
- 	    if test -f "$(builddir)/$$i"; then \
- 	        cp -p $$i $(DESTDIR)$(sbindir); \
- 	        chmod 755 $(DESTDIR)$(sbindir)/$$i; \
- 	    fi ; \
- 	done
--	@if test -f "$(builddir)/envvars-std"; then \
--	    cp -p envvars-std $(DESTDIR)$(sbindir); \
--	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
--	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
--	    fi ; \
--	fi
- 
- htpasswd_OBJECTS = htpasswd.lo
- htpasswd: $(htpasswd_OBJECTS)
-
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index d473ce18f5fb..8e659609e718 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1,6 +1,6 @@
 DIST augeas-1.11.0.tar.gz 2393675 BLAKE2B e7c50715fee892b47843f9be4ec9e88937c0ce10544b3e212d9c32a6151bbc36550d711ebec9db2a691e91cc6a2cd93696d807b440ab57a678ca6680426a4b03 SHA512 1b67bb7fcd9b560d3fe4a5c753d5e778db73caaab6e50367afd123eec107b65b73096913ac7d5170e85f5b63ff3522b2a6932b130e207ab22560dfc6e267b8a1
 DIST augeas-1.12.0.tar.gz 2429279 BLAKE2B cd90203fec1a81b114d95bb50e168b852923136f34c83974d3427cbedd4eb0d335d3952057507b38ded5c7011be2b56725565ea106cb32a0ca43b7c81250b29e SHA512 4f61d4abbf338e915dfae212560d39792674bc757f05f500afa80c6170abc214ffb99cab2cf5bbd1c2338d11a6909e5fc3ff7112a2246fca69f7b39ac283da40
-EBUILD augeas-1.11.0-r1.ebuild 928 BLAKE2B cff1daa25a49d177469f957656b892b9ec511b6a249f9106902b8339e632edc501fd9873be22d4f61f835e43ff0042f8935037e5c092dd4133d1bb242ff6ba14 SHA512 6368c5f1913ebf99e6191d819b89a1d953aef0e3704e3e00fc6e86e52b9bd06cd784bb5b5021924191bdad1e6fecd42e59b5393671e1246358b961114084e1d9
-EBUILD augeas-1.11.0.ebuild 997 BLAKE2B f3d422e9dd5c0fa1bc0046e956c9646a43b0acd495f3264f56088183ccd363b6db427341e54cbb2e08785046d17543c622c555ef35f7af3f0e70c916a0cc4254 SHA512 15a1f7475f967d6953e023dc5797096f69108eac0740eecffc63dac3af0f11786dd1f5279f08333ff9f5e570c1d900855dec1d197d0e99a4110474ed94c4de80
-EBUILD augeas-1.12.0.ebuild 933 BLAKE2B 39d52fee8fc74802a576f2f8035198d3ca7cac6e0736c13621c566416e4e2b251738d92f1b870e394961a34af28900f754328e808b623b7e43f8bea01d4619bf SHA512 235711fc8d02e1a36fe5d79b8793bb9e21fa726f40a5245132c135bc443056f5bda8c30ace28cbd1ba298e83f6abe56d4ba020a64bfacccea3b599380534ed68
+EBUILD augeas-1.11.0-r1.ebuild 955 BLAKE2B ceb2811275fed9344e2835bf7d9cf9de660a38a4b060b577483bfece41e1b480b0214017b9fc5fa363a18efc9fc41b191ea0bd37e20a24e9044ecbdc81b151f7 SHA512 d6a31f6661704fd359b02461e250e511f7360384a913cda41e1672d7889018dcfd2b2f30e25633995e3a6923e9a90ee87a3b96ef134119ab88b8e090eb5e8e66
+EBUILD augeas-1.11.0.ebuild 1024 BLAKE2B a25617ffdd2c0c16931d2bbd34f0e7c9746a4b173d45ddfc5659f66916d0a74e5b2094705c3f929fa5876f6e6d23c7b1d51b3bc9cfa86f0fb07959118be35262 SHA512 21a0175ec73e6110363fd6f71ca395fa9a697c0616806942d3a68df6b005284fd98fa926bfa3937ccb4ff8dcc58f855bdc23989e34dfb5e4a644f229ec0c95e3
+EBUILD augeas-1.12.0.ebuild 960 BLAKE2B b7d119633f2134db78b7e60bc79374c56e351c1631bac41679f826a96f68b658ab36ec8591a0012271fc718724b951345f7eac33a44c359f6ff074d002cfcb7a SHA512 78e3e8efeb6468bc38b22d738e56da08b8a549c2f47310fe23c1fad811505f1221a18a5606a9734aba7d1913be6071db8f682ba82773115ce814ab5e6780df49
 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 75dcd83cc457..c65ef253f0bc 100644
--- a/app-admin/augeas/augeas-1.11.0-r1.ebuild
+++ b/app-admin/augeas/augeas-1.11.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
@@ -13,6 +13,7 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ~ppc64 sparc x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/app-admin/augeas/augeas-1.11.0.ebuild b/app-admin/augeas/augeas-1.11.0.ebuild
index 2c3ae1c6c1bc..4712c7e3ec80 100644
--- a/app-admin/augeas/augeas-1.11.0.ebuild
+++ b/app-admin/augeas/augeas-1.11.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,6 +13,7 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 sparc x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/app-admin/augeas/augeas-1.12.0.ebuild b/app-admin/augeas/augeas-1.12.0.ebuild
index 215eeb6342e1..b8d173872da7 100644
--- a/app-admin/augeas/augeas-1.12.0.ebuild
+++ b/app-admin/augeas/augeas-1.12.0.ebuild
@@ -13,6 +13,7 @@ SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/app-admin/authbind/Manifest b/app-admin/authbind/Manifest
index eb4103eaf6b3..7f7e9cdbb6ee 100644
--- a/app-admin/authbind/Manifest
+++ b/app-admin/authbind/Manifest
@@ -1,4 +1,4 @@
 AUX authbind-2.1.1-respect-flags.patch 808 BLAKE2B 3a74723e5bfe38b2ba31959850b7ea475afe76a73165b267936249809c46632883988f5ae8d56f89af41f682c9afcd3bc4eb3f9e3d5467ad1ce5c53cc5f809d9 SHA512 5c22805ee442cfa76e59e11a7614acaddfc6c38a316c290e147a159a221baf3ca44b44135bf4862031faacbc1c913c97a8a95f000ffcd33688021ece7df19750
 DIST authbind_2.1.1.tar.gz 14407 BLAKE2B 624cb647b138006324611d00943ad78f9166e4c47821ef5b395c58eb75c1034591cb4a0549f6870fa4294f4f4ca628f03390b4539a4543a64111d33ac9cb3261 SHA512 f3a45fcf1d8d6e6762bc1cef7a1b89f211e4af56c68b4c6c5e508a2f7ee039499b8b2f11ce8aeb94822d20377d309035760fa7b58aabaa4e87417ca25811c812
 EBUILD authbind-2.1.1.ebuild 1179 BLAKE2B 3da9b5f5f1cd5bfbe95c1caae16b0d0106439dd5154fba54d3d10941f547b9b450f975f525e0a1674b9bcc13851c2e6e79cdeef33b384009f911fb2e33590f19 SHA512 777f23b0e2d3999a73f8262659d92a45c9f99d51e439650bdf50a124288afccdd153de74f97c4b1253cea9029a785f3342ba2c495f6d67a52ebe727504293fce
-MISC metadata.xml 250 BLAKE2B 50c4b89c67107f8c4eba77c3b35992d381dfc6a30f5e8fb7c696f6b2cde6b7b1f90566a99ceba3df17485a88283059ef51010414e8df6c72d9e7b8c7f9ff0e27 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-admin/authbind/metadata.xml b/app-admin/authbind/metadata.xml
index 5c23291b5215..7a38bb900964 100644
--- a/app-admin/authbind/metadata.xml
+++ b/app-admin/authbind/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-admin/bastille/Manifest b/app-admin/bastille/Manifest
index cc1ff491696c..9c50372ca39c 100644
--- a/app-admin/bastille/Manifest
+++ b/app-admin/bastille/Manifest
@@ -3,6 +3,6 @@ AUX bastille-3.0.9-perl.patch 1049 BLAKE2B 2a82c1883bf795b83a86d34e29fc2b3495123
 AUX bastille-3.0.9-renamewidgets.patch 2015 BLAKE2B 12003ebd9d40296e5285b45b063050787fc71c8d0f1002e07407105eaa2678ed25e2dbee66bd9c057047b323076e19e258a5efd2156c043b3d1fba5a92f8ef70 SHA512 28cf0f8a5bf11c29127f128fee80bd0a169960996b4d97b3666d7cfb2485850ca040670deaaf9d0c728e08747adefeecf02c4647cbd4c0e3673cf327c9b46f92
 DIST Bastille-3.0.9.tar.bz2 319045 BLAKE2B 480288c6e9fc5462e8e6ca84665d5769aab4252813ff478ab0519d382e1f03994da008ac2818b1d4214a09607c7316711665bce154121b3029bace6f2822df09 SHA512 a97ab2c2bb64c655d43ddcfd4000cee8666787e5b5923390e3155b258c3a2cf7d131abd474f9b0dd415eb455b664ab26a875da6636268b2a715ea87dd4dae2f0
 DIST bastille-3.0.9-gentoo-0.2.patch.bz2 14117 BLAKE2B 9c4383eae9e27cc4e110553a21424cd2811172c32609b0d3bcc72ccc3f61ba7cd76bfdbee969de5a89c22d0c1dd91b9ba92ce27ea5ac2b7260e5c0e1ce424be5 SHA512 a4ecfc064d6cf8c12b6f53c81dea841931df270293b03c39266861121f3def28fcbc4127b3bc9374028983e584736fb85361443badaadec7441cfb1570bdea8f
-EBUILD bastille-3.0.9-r1.ebuild 1523 BLAKE2B 9254676406db278874b078a68e34f9f427afd2e06c15f1b6821b550701a77cd4b51e2b2110394791ad7503cbc9245058c993a9ed5e46640b28cff5332d298936 SHA512 a01ccef43f98d4627994be663cb6a9d5214b054ccb514f5f60c8ed6676916d654ceccfe84d94ec1b7383078190002a5c9dce588ca373ad90b8da7e317be6524b
-EBUILD bastille-3.0.9-r2.ebuild 1710 BLAKE2B e9cc6e37b2715d9e6f1db241b92daa5505fcf1490f0dcc769ab13a0a889b970debd0140ac0ade3c3e3bb621e82c45cd5b2d9d665a0abd8fe8599de92be3c50f2 SHA512 5cce10d4ec552c924457d3920c56c2e0224d15f757c4719c63a93963ec78c9b9face14cbcc61cc902f91888c5323af8900863580121d14b54cff6644bb1244ab
+EBUILD bastille-3.0.9-r1.ebuild 1571 BLAKE2B 1c6d3bf7b0bb37dd60ada30354a097e3cbfc8b80d0f8dccda92a983241cfb759dc97f4c550ee0edfdf674b2249b1ca9629f9808e1b9447693056224d95e6489c SHA512 ff9048baa2a2a47bb7848c298bebe7bca41b249c3ff37ccbd313a0d8930e310de2edd14ecae0abd4043245a0d9564002ae7b8ed4cd4737f6ec51679555297daf
+EBUILD bastille-3.0.9-r2.ebuild 1713 BLAKE2B 751966d54e66ab1d86caf0bcd81eec1ad1642677d69598c8a44ca7b4151888c0975bd2f64307714c62e1b7ec27b7db6e80c89e7e235061205c9510883ac0243b SHA512 7b250fa0d0dd26662c5547d1aac700200baa139e5b439d9401b2613893b95775bdf3131ef9dc91a83748ad0ca51b550bbceaadb3975429b81976089cea154b12
 MISC metadata.xml 459 BLAKE2B ef04f8221c3a19d7efded571376315032035b3ba4e4cb9cb9e3ecf2930e1ecfbf8bddec92485d8bd91655a68afb3f29aaae88f3a017bc5b56a083dcd31ce0257 SHA512 5c339c93e1aba939528018b1b4a6f21b3f87c93efc60471300064c85c9c0723474fcd5092d6367b02ac1d21564451b319f4ba6c261fa890def1e58a1647f4fc9
diff --git a/app-admin/bastille/bastille-3.0.9-r1.ebuild b/app-admin/bastille/bastille-3.0.9-r1.ebuild
index 1088834fccd1..19860743e3f6 100644
--- a/app-admin/bastille/bastille-3.0.9-r1.ebuild
+++ b/app-admin/bastille/bastille-3.0.9-r1.ebuild
@@ -11,22 +11,22 @@ MY_PN=${PN/b/B}
 MY_P=${MY_PN}-${PV}
 S=${WORKDIR}/${MY_PN}
 DESCRIPTION="Bastille-Linux is a security hardening tool"
-HOMEPAGE="http://bastille-linux.org/"
+HOMEPAGE="http://bastille-linux.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="X"
 
 RDEPEND="
-	net-firewall/iptables
 	app-admin/logrotate
 	dev-perl/Curses
+	net-firewall/iptables
 	net-firewall/psad
-	X? ( dev-perl/Tk )
 	virtual/logger
+	X? ( dev-perl/Tk )
 "
 
 src_prepare() {
@@ -36,7 +36,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-perl.patch"
 	perl_set_version
 
-	cd "${S}"
+	cd "${S}" || die
 	chmod a+x Install.sh bastille-ipchains bastille-netfilter
 }
 
@@ -44,20 +44,20 @@ src_install() {
 	perl_set_version
 	export VENDOR_LIB
 
-	cd "${S}"
+	cd "${S}" || die
 	DESTDIR="${D}" ./Install.sh
 
 	# Example configs
-	cd "${S}"
+	cd "${S}" || die
 	insinto /usr/share/Bastille
 	doins *.config
 
 	newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
 
 	# Documentation
-	cd "${S}"
+	cd "${S}" || die
 	dodoc *.txt BUGS Change* README*
-	cd "${S}"/docs
+	cd "${S}"/docs || die
 	doman *.1m
 }
 
diff --git a/app-admin/bastille/bastille-3.0.9-r2.ebuild b/app-admin/bastille/bastille-3.0.9-r2.ebuild
index 01d5a028636d..ae6415282920 100644
--- a/app-admin/bastille/bastille-3.0.9-r2.ebuild
+++ b/app-admin/bastille/bastille-3.0.9-r2.ebuild
@@ -3,41 +3,38 @@
 
 EAPI=6
 
-inherit eutils perl-functions
+inherit perl-functions
 
 PATCHVER=0.2
 MY_PN=${PN/b/B}
 MY_P=${MY_PN}-${PV}
 S=${WORKDIR}/${MY_PN}
 DESCRIPTION="Bastille-Linux is a security hardening tool"
-HOMEPAGE="http://bastille-linux.org/"
+HOMEPAGE="http://bastille-linux.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="X"
 
 RDEPEND="
-	net-firewall/iptables
 	app-admin/logrotate
 	dev-lang/perl:=
 	dev-perl/Curses
+	net-firewall/iptables
 	net-firewall/psad
-	X? ( dev-perl/Tk )
 	virtual/logger
+	X? ( dev-perl/Tk )
 "
 
 PATCHES=(
 	"${WORKDIR}"/${P}-gentoo-${PATCHVER}.patch
-
 	# make sure the Perl modules go into vendor dir
 	"${FILESDIR}/${P}-perl.patch"
-
 	# prevent file collision, bug 536292
 	"${FILESDIR}/${P}-renamewidgets.patch"
-
 	# openrc runscript rename
 	"${FILESDIR}/${P}-openrc.patch"
 )
diff --git a/app-admin/certmgr/Manifest b/app-admin/certmgr/Manifest
deleted file mode 100644
index 53e833b5e6da..000000000000
--- a/app-admin/certmgr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST certmgr-2.0.1.tar.gz 2696154 BLAKE2B 0267c82dcf89297495bd46930bb53a176b0329aa933dd8a8b8a96b377133741f45e1a16e0beccb36540ef3c25d28f2af324a976ccac7c769c0cad06d2fb4d20c SHA512 b0de0fff3af435631b26ad4f3b0c1178b3f2e784545939b8dd4a90ee29918c879aea1afc774a23655e7e10526d7a8d13f95cb0740e407eb60110dabc56fdeeb5
-EBUILD certmgr-2.0.1.ebuild 633 BLAKE2B 33de20ac15a1868da1fb3ba6b40a63280f3d1dee05ccf86e3a9799dd55fb4336beaf42910cc032dbfaeb033c1a2dc11fe27d803d0b8519b03bb49b1b50a495fb SHA512 0b1604bc0bfc31410f8e3d33ecbb970e8b774ccdb6cdd39369ac8cef5ea807037fa4e00f2cb2f62127c5d6444e7ad341b4f524ec465082f2690f99994255a042
-MISC metadata.xml 250 BLAKE2B 267d35ba6d759d93dba62b94026d1f4219bef12cdd930e75b1bbc88e4603fe53602b0de8fb1dee62d4bf2ce778cf7ac2e241c5dc117900bb8086902a4a404df5 SHA512 35c362c6a4c181cf124fd1e86b9a06430beae594982b15bd53f6fce2c958189ff5c9cd778bb9fd9a2e9c9675af9e8efb1d5d037059b72f16ad6e6db502f886d1
diff --git a/app-admin/certmgr/certmgr-2.0.1.ebuild b/app-admin/certmgr/certmgr-2.0.1.ebuild
deleted file mode 100644
index eeb5ddc69b9e..000000000000
--- a/app-admin/certmgr/certmgr-2.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/cloudflare/${PN}"
-inherit golang-build golang-vcs-snapshot
-
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Automated certificate management using a CFSSL CA"
-HOMEPAGE="https://github.com/cloudflare/certmgr"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${S}" go install -v ${EGO_PN}/cmd/... || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	pushd src/${EGO_PN} || die
-	dodoc README.md
-	popd || die
-}
diff --git a/app-admin/certmgr/metadata.xml b/app-admin/certmgr/metadata.xml
deleted file mode 100644
index e0546fc77f98..000000000000
--- a/app-admin/certmgr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">cloudflare/certmgr</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
index b29d7f7602e9..619b3ca1e104 100644
--- a/app-admin/chrpath/Manifest
+++ b/app-admin/chrpath/Manifest
@@ -6,6 +6,6 @@ AUX chrpath-0.16-testsuite-1.patch 547 BLAKE2B a6b579d54dff49736474afdcf8a7a0694
 AUX chrpath-keepgoing.patch 1041 BLAKE2B d5ec2b6d482fbd42b2d3cd04626984c1d6ea0c5ca35d5aa25160bb6781a0bd534c637d90e19f8c873e12ad477b2f0d17d57f066401afd95fc0d82c4e3319ff12 SHA512 7bd459313f3cd83c86c63adf8a39df41c0454f6a689aab803d3211b5ffa295a72ce45a8ed7c3f61af0f705fc614c4ce48d86c6a5706b20c4d45265bbeafceb9c
 DIST chrpath-0.13.tar.gz 125129 BLAKE2B 004db7e3567ceeb700d018e7e32036843413605466c218bf40252927b169775c5a86f81f8ea355f0d141821313d114ec24654ed62d75443e31739118e31bc497 SHA512 9ec2ab2731fb553497996939b421130ae221d478dab8887c184ae91f7d3ae697688e7a30e3bea30cc0cf765f1dc8c7f47d2a1f4369b36079b4033e8d0303d75e
 DIST chrpath-0.16.tar.gz 134506 BLAKE2B 7003cc1cb2332ffbe6fe0873c6d30cbc3ea696e041be33b39c3d36ae34a2497b8dd40bb373773c546b8d63cfd8534e796fd7d7cbc99d37fb8751fc960907070f SHA512 aa04d490f78bff20a56fe20539cec10218c0772a668909eda8324ca825f51e8ef92001e95d9c316e79a145a043c9c327ec94d1a82e104ab408ca1021832745aa
-EBUILD chrpath-0.13-r2.ebuild 1116 BLAKE2B ee45e402eba482358bd07fa9ab007dcd2d9dc3d715051a93adc987c9ddebd63f44de8b503a18ca2bcf0447d086e496b2c86ed0a6909944e66d5c2d34e9b75808 SHA512 63ec5a10d9608666018acc6c6946e0188ccbc0d66a160509567b931e6cc300a941781e505c87b86d0e9c9206cc1b328e1d3d7711c7b01238f31a4c9af2298caf
+EBUILD chrpath-0.13-r2.ebuild 1109 BLAKE2B 1dcaff7b62d98ef82bdf7afb09428ddbba33b14c36eaa37a44799150f2e7b981a2ee9e769cbb25356d2531e0d321e449414edcdc213c2643f966b4d864a5c63a SHA512 2e22eb2ae3d951c4cbe283a0aeb4e4fb0582db6f2229c22037f75ac5bb90dc08b6df46e1092fb1892c8a3a11c81f3c3267a83dd7efe373bdd43f74e65634fdce
 EBUILD chrpath-0.16.ebuild 1040 BLAKE2B 0d77d79aa171ad8429007a2136819b67fdce1a1e035aefb9b8b0ad7f651249a79f6b7e156712eddcdd171912587528ad3fb0d471c75fa0a6ef80fc795974bc80 SHA512 ddd41c76f3ae21d27f97cfd7d8abc248a16397aa5519efe750cf8c39c1066c3402ee4222b1c9042cf9fe7344c76f8b4d2fd41da3c1392c33f491bc07c032839b
 MISC metadata.xml 325 BLAKE2B 3d1e56e84a1ee9bfb3ab37bdce7fe7d4d2d74eca05ad6beee2f3d90da661f5bf59aa45dff767a72f210dcbdcff7818e41494a58e8c14183a6f11a9f59c0b073f SHA512 bc84447080d9969bb04b15981db6ef6cc35d7a38a796085a7397f5bf2f629ea97785828f895aeb8296e87977d40991a4dd5ffec9cf4ae2393f267afa8d3768c8
diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
index d47a2afa4974..89d26b3b7e07 100644
--- a/app-admin/chrpath/chrpath-0.13-r2.ebuild
+++ b/app-admin/chrpath/chrpath-0.13-r2.ebuild
@@ -31,7 +31,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf $(use_enable static-libs static) || die
+	econf $(use_enable static-libs static)
 }
 
 src_install() {
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 434e13ddd97c..e3ad764f56f2 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -5,6 +5,6 @@ AUX conserver.initd-r1 428 BLAKE2B 574fa8611e928b17e70b1da522060c230b3f51ef0daf8
 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
 DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
 DIST conserver-8.2.4.tar.gz 432854 BLAKE2B 5b6003609187e629544a7183b32cb7b2ab6c854cabf915271a3a924d18c2c13a1bf01f0524740b35859d83c4cb5cc525b87182c342b0075d5486ba428ed71091 SHA512 c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad
-EBUILD conserver-8.2.3.ebuild 2303 BLAKE2B 295c0f95b18ca352acab3d54fedd344689d6087aaa3340de236f423121ead7ecf72c6ed88631091087086866fd665a39482bc15edd76d3bad7cde0f85c82d6e5 SHA512 1733401706b85b956590857f8ad63a3e0941edaa2f721f3a310851bf03c8eed9fe57b49399485540c60ef1fe1494155d56e34c6018b9f890b93396795c3f06a4
-EBUILD conserver-8.2.4.ebuild 2312 BLAKE2B 755e0edcb553d9603cd456d4edfee6821916b932a427521a33b7fe6c5311ac525d46568c6a7f9138f2bb995c826f9d534b2673731e86c89ad2cb42af8421ab54 SHA512 4985e844270698deeb713abff2a53428378cee30f883c125444c273de5bdf6824a348d06c9df0c6c79a0bac3f104ba5cc07a5abdc3ce2bba987e1c72404a0561
+EBUILD conserver-8.2.3.ebuild 2330 BLAKE2B cbc942d4774a9f4c8641c2201e6aa66bae9ca2544e47d9f62e0c15fd439bac5cfa4c738ca0125bad7eb1c1f77a8e114993daabb95b674fcb6d0d8ff8cbe19aaf SHA512 e588f1b58ab5879c3d02d13ad1500b9001ed2625e829d7948800eb29c678b1d25d01fb77ae40e8fa76db47cce072048c09b70d0fa01398c6a347a98a27a95b5f
+EBUILD conserver-8.2.4.ebuild 2339 BLAKE2B 36da2173617d2c970a95a8417992dcbfacb4d139c2674a94a75e00292aae7025dabab5a0249fd83867cf5c5ffd1d8dc643fd0f8d650562f7e44ebca408b02d3c SHA512 a9b2ee02b808c42887f5655efa16ddb70d986c528f8a4017a1f833aa0eed5e024a0289fe0ad018d9f09682aca2547749c7fb8571deed41faf4ad072e787b14b4
 MISC metadata.xml 1378 BLAKE2B 942f6b9d8fd616f089d0651fbdfc41de96033acf65f127cbfded2fb9c390fd9b86c037a62679ea27b18e4e618bf764d09277350e9fdbaadc914c18a6961618e2 SHA512 6b3e06cfa1013f71eb42c9c073df8c97d2b8fa6b935b637ba29096db88d75bab1bb192695ed4a5dad63d88341a366327f419cb357777c0abb09799c8bcc40970
diff --git a/app-admin/conserver/conserver-8.2.3.ebuild b/app-admin/conserver/conserver-8.2.3.ebuild
index 8050e3f5da86..a6b7c099a51e 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD BSD-with-attribution"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
 IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
+RESTRICT="!test? ( test )"
 
 DEPEND="debug? ( dev-libs/dmalloc:= )
 	freeipmi? ( sys-libs/freeipmi:= )
diff --git a/app-admin/conserver/conserver-8.2.4.ebuild b/app-admin/conserver/conserver-8.2.4.ebuild
index 7b500c68159f..018a794f081b 100644
--- a/app-admin/conserver/conserver-8.2.4.ebuild
+++ b/app-admin/conserver/conserver-8.2.4.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD BSD-with-attribution"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
+RESTRICT="!test? ( test )"
 
 DEPEND="debug? ( dev-libs/dmalloc:= )
 	freeipmi? ( sys-libs/freeipmi:= )
diff --git a/app-admin/consul-replicate/Manifest b/app-admin/consul-replicate/Manifest
index b29e076e3926..539c34bf887c 100644
--- a/app-admin/consul-replicate/Manifest
+++ b/app-admin/consul-replicate/Manifest
@@ -10,5 +10,5 @@ DIST logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz 7717 BLAKE2B 083cc
 DIST mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz 13977 BLAKE2B eb7d4e853621798b63ec9806e2fb0d609d33fc7b370276433f055bea4282ab938488272e5a7334a54cf351f4380bc36cb0a0e991d8856e7ed1dc26de76110055 SHA512 f495fe99c8ce752830b3d36db445cdc32baac6e266a0862d13e7e80e04f412ae7ee85e13ba794f1cfae3effb226007874c8ee819a4ef568ce2884077dfba4f9c
 DIST serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz 579000 BLAKE2B 1ae7805273210e02ed1779c29b24f7ea32233e860d3ea324af670547ae85f9ce66a9a98ad2105e59bec222d74ee385bf0051974a38503bff3fb464d68959e8f4 SHA512 eced133c2ba261e4e39d16f2252f555611e90f23f70a746a6f8d60b24e6747e73e619ec74f10a1c0646ec5edfd731cd79f6700d9bc5fb7b100723aac32203a5f
 DIST structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz 12276 BLAKE2B 1e28027d9dc21fafd181ba772ae79049584f803c19dbd9da01ef488a5c9f3998071bb87df0b0a8982b31823e1b4bead2386860ca5309fd4c32aa36941c784445 SHA512 ae2f0bc1f9e1ddbf1bd32d5e50a2ffbc4841c17d451739aee7cbbe359abac982e98a00caaff2aa433d10aad4dc414ce17e94a1d0893610ff53c52beddb21dd4f
-EBUILD consul-replicate-0.2.0.ebuild 3903 BLAKE2B d763ba115f4a0523078da13faf7de03e82f2fa0e02dce15a499b21573060b1bd52aeaf8dd0253cdf7b09a671b0c824f49ea367aad25575c57a49858119884c1d SHA512 671c09144dd830deee8d187a6bcc1ecc3dba51c1a03ec26b599918f04ac37e5433b1d50e625cf6e73f02ba50a18e85d0468bc96ebc6e0c7b36b6c3962b159ee5
+EBUILD consul-replicate-0.2.0.ebuild 3932 BLAKE2B 94d84d4b88970c7c5f7d68a042b3e6f93794b9f310f951df7aad5ad7daaca95d6c97c3025405b6d9e9e72c0557cd9dbea7c8a6b056ef897ceaa29b0a03e36781 SHA512 353df2e4726e1d261a68075bc2f538d8d915b33a3c1864f7fc2c582cdee70541936c04684df584004564a4c03f41b4970da4625fb88ae2102d1067913878e1c5
 MISC metadata.xml 317 BLAKE2B 8e79b0f3b2b9099081cf94886f39e476e0bde6dd5eacffdfe48c70e1c2d2eb1d7902e8543e1bd3ae9427bd67cc699d6531be23d964cd72e993ebec7cb7cfdc0f SHA512 f99b2d57b72e37417fe17dfc9e71aa7be80fa554c6e75500953ad150a761e0f54634fc0c37787b8ac603d3d5e06e6980ffffdae87fe738dab6071620367bee3d
diff --git a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
index 7ea2003bd5a4..1bfc6d258c62 100644
--- a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
+++ b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
@@ -12,6 +12,7 @@ HOMEPAGE="https://github.com/hashicorp/consul-replicate"
 LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
 SLOT="0"
 IUSE="test"
+RESTRICT+=" !test? ( test )"
 
 DEPEND=">=dev-lang/go-1.4:="
 RDEPEND=""
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index e43863480f3f..b42b5e27a5f3 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -4,6 +4,7 @@ AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed
 AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1
 DIST consul-template-0.20.0.tar.gz 46430965 BLAKE2B 025919b928e07cda618e05aab4488214459e6bc443524bbf8fa83331c3ad5708ebbeaf0cf20351ff70a325fb56aed9cede3010b43726fa32b5b1997d6f4f294a SHA512 a09ff31ddd7d11d78e8c2afcc9a63ab4458cc9feacc02fbf95a30c82b9ad58526c6e6575f5b3ddb21d0dd720687b9ee135bacdbe761f1b5f95592a3e3e74c170
 DIST consul-template-0.22.0.tar.gz 186074 BLAKE2B b2c38e2a0e720fb39ce0978ca929b872e1dd898d510a0ab5697a746257f25fc77e172c418c5db9c9865e2e0530b7d38d7373f7c792e37c723950c02dd06b7859 SHA512 0875a4a20ba9e9e078cd26c620cb9edbd22193b6b5fe25bb6006bd7d3272dcf29d7051448d3672f9d9caaa1b871f08b050fa07882933ad6d13b90d1c8f6406af
+DIST consul-template-0.23.0.tar.gz 192356 BLAKE2B 204f0fc7ca6780a60d88ccbd75181897e9c4db5194cd702e2ac3759d456dcb9fcae4a9f8481ccbd2d61609fb9d1330f143a0c039b6278e15d85cc2535cf5b13e SHA512 769992578fb6b9f69e9c41280a46c27e74cabbd7cffddc158dc301ffaa9ad1e5b11e626e5bc2e18532952fecb61f83c107003929e9671d5de4c6f3a82b7120f6
 DIST github.com-BurntSushi-toml-v0.3.1.tar.gz 42077 BLAKE2B d846b7961dc3447a43e5c91dee1897a9701c997a407d9ba8737d08b82b493f99823eeab87cc9d4fe6dd4dbdb7b0d2a218d9f9f220ffcda2056188afbf0f2ab87 SHA512 75801d0263a68613233f3b18e35b000e1aeb5322015c0f032598d9447122fc45b1854741ce6ce9fb4d5a064546ad26f3d6384710bd8e6e1229ed2d4551524852
 DIST github.com-armon-go-metrics-ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz 27423 BLAKE2B 48344146241205d76ae35407e4e5131db7277a7bcd2b44c966ed2c8fbfcd7bd628dcedb7538c28b9106643f8c0f2af4bf0985ada6cb58db0bff739583435b306 SHA512 bf28c4df0927296214f4e89263e30a6ab7c2f5fb62c20177e597890bb878f68df4aaf5445ff9af629864b38da8f506fb530f09ff22d5d8509ad7b5f4ca20a395
 DIST github.com-frankban-quicktest-v1.4.0.tar.gz 26586 BLAKE2B 365dbf6520d5e4b936dfa71022437012b45ca8d499998af8b204fa2f4ad00086b8adbd7c871e494c0a45481809253bbdbb10c05e72f3e6247b29148b61f7a7d7 SHA512 5fb98186c0ce5c96858bd9c018a86f5db2d5b04d7d659a9aafef16e6abb6ea9fbe076c84e74d5b8c5cf7e8460f273bce203dedce0e3ce6c024a16f588acac20d
@@ -17,6 +18,7 @@ DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c
 DIST github.com-golang-time-c4c64cad1fd0a1a8dab2523e04e61d35308e131e.tar.gz 9392 BLAKE2B 9c06e2cf9a4d51eefa4d687263bd64ffef69d1937754bff1aee0a51c441510a9ce2e3193c361632c45a818b3cdd906349f44c9ee29f1fbf5c405d68bcc4b9f89 SHA512 2e1bdf8a182875315f776c556a1ad8cf2f8e3ceef72d386b8bb7dd5a3de9d5cf2216e2bbec58d2aada149f4a332fbcdef639d6479923f5a0139bb9ed3fe0f952
 DIST github.com-google-btree-v1.0.0.tar.gz 15292 BLAKE2B 663edd55fb375f2b2b1ea377efea8d891baa501161bd5b87a5d10cc84a65d4de0cd4e7b60f421d476f49f26b2ded0fb8633348392c993585790d1af194c147ad SHA512 1bbd6fff467a0f6f6ce074e94a1c13a019e7d37949cbc041d2886bcafa1076426146b46c21a15f55449d525265c04749312792006bd9ea6baeffa6f3d9705a20
 DIST github.com-hashicorp-consul-v1.1.0.tar.gz 11125956 BLAKE2B 61a8c7463f6659368d990626ebefa20bc545f17e66fb0a06a178e8cf7cb83637e64cf7496ed93facab73ef2340d46b08d7f86533378a7e57530ce1a959a9f398 SHA512 80c16a42fc58930234cb277bfdd21c3f1d9f7fe1cf2fea6284056a47f602a40a15ddd447779e83fc5b42502ca8a507a819f5ad7d11689c0bcbb0da739b217721
+DIST github.com-hashicorp-consul-v1.2.0.tar.gz 17187054 BLAKE2B 5e8d1151efe1e8ad5932886367d0012774713081aa2725f10d45af1e05751e328d76471ff3cbd85031c252c65cde0137f96c3ef86eca7e3e7f6b28e2d20ed0d5 SHA512 1c018a5f35164a899a086ccdae94cb5e6e2a490e4c788d65b0026dbf448950d0c1038b2d61cb10f5e8c9ad22a1affad64dd4a7086b59dffd115d40aa7b3d0cce
 DIST github.com-hashicorp-errwrap-v1.0.0.tar.gz 8346 BLAKE2B b407c23ddc2daa5534e38f23d69363d47012fcfcfae4e75f31513ab9fbf3d05f101258afb2bd60009aa4a6277eebe7c2396db5cb713670ecba6589a0d4b9dccc SHA512 f3bb952d98bdaaed055c4d4adac0a727459964645f8c6bf9becb03ad7eff4ec71e8e4047a29c446ee52148a0e201aac3d4b47d05bd750627650ca0e84c91652f
 DIST github.com-hashicorp-go-cleanhttp-v0.5.1.tar.gz 8069 BLAKE2B 36f2411ec94ba71b4360fc625d19fe995606560d92a4b08459b490831a4d4fda5114622cfe1aea2d100e316300a107045b9d5ce217d3748ab142e49c662ad880 SHA512 a94953d10485bbb6b1510036c8b87dac1d3ca41f84b1b397bb987ae7df68964e082ed09d9b57cfb8439735d246e599a7848882810699d26505662da735cfd406
 DIST github.com-hashicorp-go-gatedio-v0.5.0.tar.gz 8250 BLAKE2B d5a51c4ed7c2d6b3689ec50118a0543b0b581b140667b67f4a842ca6299d392832c10c6512b145f4aa372d97de47b62c29565d01f231cb41b830e18542ea26df SHA512 378cecb6d3f0f13d892ee087ee8335fa7a75b9feb8af549e06d4c81372961840767ecf7d706f0602a7b47c692abad96016c158b5dc3973dac9667fa06114268d
@@ -46,4 +48,5 @@ DIST github.com-square-go-jose-v2.3.1.tar.gz 299480 BLAKE2B 861aa2e72c5e12013aab
 DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896
 EBUILD consul-template-0.20.0.ebuild 1534 BLAKE2B efb7e210dc8e15979c5a97b2c7578560027d0596c60409a2b1ce7a31da13f5eae8da03e2577177387e50507fb385ade659f78ba362bf6489824a1909c18d8aac SHA512 5554d0d5668989615abc120e1b321f70223ccc3c829428602fe3e5cb977606ef39ae4f6092492221199e3aad289acfa27a92c487e45f6b0b8b30039c987bb2c7
 EBUILD consul-template-0.22.0.ebuild 3306 BLAKE2B b5c6f9977cc1ac9f497b9c543729921c2ac036c1ed75272094e95029ffe2f1bf68aad307574ec55cc1a39ed2f80d8d2535f280ef635a586f359b0cc0e9a519b8 SHA512 bb59f560b81f53a4fa41fbf71fb9af6b728518d6c9769da86332f5f8863f7546bbe6362801bd2b4eb830d926a07bae7a6d8182fe12088b30ac407f4e1d162af4
+EBUILD consul-template-0.23.0.ebuild 3306 BLAKE2B deb62933b47ba59e47d3ef8c329621e84aed26668edb872e2972862caa9f950882b7d1512224457eccd1a92bc11d212eb16511e817ebd1ecf87d80d1f949ee1f SHA512 1fb3133715911a5d41b7b0088b12d5d41c0f7331613c8902a06a0c9c7e02f4d54ded9c1477ffb5ff0e81755cafe2c04c833f58179329be4db5284fbbcc0b6d1b
 MISC metadata.xml 316 BLAKE2B 857b3a0a26e35ac2f52f797b85a42f91c74a10b4d8d6a1f5394465e68f6ad57bd732286650966f99cc516ec68d00f31f0f880931e2041cb596d50e521ac3a599 SHA512 e66cfdeeab0bec39ed4149454fd1876ce963f7bd0012fc659abf92aefbad4e5fba90c9fe84019273d5f837f6bdf438146b433d9ea00cfe1cf4356e112522f1ad
diff --git a/app-admin/consul-template/consul-template-0.23.0.ebuild b/app-admin/consul-template/consul-template-0.23.0.ebuild
new file mode 100644
index 000000000000..b3ef61e527e5
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.23.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=(
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/armon/go-metrics ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5"
+	"github.com/frankban/quicktest v1.4.0"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/google/btree v1.0.0"
+	"github.com/hashicorp/consul v1.2.0"
+	"github.com/hashicorp/errwrap v1.0.0"
+	"github.com/hashicorp/go-cleanhttp v0.5.1"
+	"github.com/hashicorp/go-gatedio v0.5.0"
+	"github.com/hashicorp/go-hclog v0.9.2"
+	"github.com/hashicorp/go-immutable-radix v1.1.0"
+	"github.com/hashicorp/go-msgpack v0.5.5"
+	"github.com/hashicorp/go-multierror v1.0.0"
+	"github.com/hashicorp/go-retryablehttp v0.6.2"
+	"github.com/hashicorp/go-rootcerts v1.0.1"
+	"github.com/hashicorp/go-sockaddr v1.0.2"
+	"github.com/hashicorp/go-syslog v1.0.0"
+	"github.com/hashicorp/golang-lru v0.5.3"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/hashicorp/logutils v1.0.0"
+	"github.com/hashicorp/memberlist v0.1.4"
+	"github.com/hashicorp/serf v0.8.3"
+	"github.com/hashicorp/vault 746c0b111519166ff2126f55dba7071912c33006"
+	"github.com/mattn/go-shellwords v1.0.5"
+	"github.com/miekg/dns v1.1.15"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/hashstructure v1.0.0"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/pierrec/lz4 v2.2.5"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/ryanuber/go-glob v1.0.0"
+	"github.com/stretchr/testify v1.3.0"
+	"golang.org/x/crypto 4def268fd1a49955bfb3dda92fe3db4f924f2285 github.com/golang/crypto"
+	"golang.org/x/net ca1201d0de80cfde86cb01aea620983605dfe99b github.com/golang/net"
+	"golang.org/x/sys 1393eb0183657fb29200106b17a5042ec6e48dbe github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+	"golang.org/x/time c4c64cad1fd0a1a8dab2523e04e61d35308e131e github.com/golang/time"
+	"gopkg.in/check.v1 788fd78401277ebd861206a03c884797c6ec5541 github.com/go-check/check"
+	"gopkg.in/square/go-jose.v2 v2.3.1 github.com/square/go-jose"
+	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
+)
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="Generic template rendering and notifications with Consul"
+GIT_COMMIT="521adf1"
+EGO_PN="github.com/hashicorp/${PN}"
+HOMEPAGE="https://github.com/hashicorp/consul-template"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
+SLOT="0"
+# TODO: debug test failures
+RESTRICT="test"
+
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e "s:git rev-parse --short HEAD:echo ${GIT_COMMIT}:" \
+		-e '/-s \\/d' \
+		-i Makefile || die
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME
+	export GO111MODULE=on GOFLAGS="-mod=vendor -v -x" GOBIN="${WORKDIR}/${P}/bin"
+	emake dev
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin "${GOBIN}/${PN}"
+	dodoc {CHANGELOG.md,README.md}
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+}
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 017a9b0aecae..31f50ad8f922 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -5,12 +5,10 @@ AUX consul.logrotated 85 BLAKE2B 8f3212c58295d57e9265dec26b9bfe562c47ca168442180
 AUX consul.service 359 BLAKE2B 04a42a1546d2e4dbf57b9d75b32feddd4d0f4f8b6f750b1b4a8c19cd51fdb3cedce2cbe2a1680dcbb407890aa3e75ab9ffc5c88566b3c1e44158b1b480e5119f SHA512 d0f73304d644cf26e609a2136f1107efe36afe54721cbbd6208cfe279629ef5603a94ecd786e83ad37d7828c038f01baa4482872fa65c625646fa73684e3e477
 AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
-DIST consul-1.4.4.tar.gz 22736827 BLAKE2B a1b973a303f77d84993e4879aa92072d4f2d36353683cf9a2c6cdeaded8587e8464f066168f190f7347f6038df28b3cba1d8b8a3ca0b700ee085019af5014966 SHA512 d3e5dd536726976b705fe4c78c67eaf345b8f47225919c0ca1609d75e74343d9a16d893ef4cd5140998f23b3149cfa60f5b432ed9a7251bb3b232be9b65e7241
 DIST consul-1.5.3.tar.gz 21743194 BLAKE2B c797b04457c5f0b12f06732a94038b25367b53a9e6088d725eea61786a0e18bd905ad680bc12c4bfa30b44292d2676689dd6f18e9e2143bf6e1b02c2c55f678f SHA512 3f275ec160b9e583b81ba8d463fdb05e9fc9058db2453d9393a56b67337ea04df98a89225323192230938e1abfb48fa60fe0a32b4d8980573b749217b69933e9
-DIST consul-1.6.0.tar.gz 22465984 BLAKE2B 3a030619786e8dabdf8b778012a80ff4b0e76ede6c313b688bf04bfd1a8488bff1bbd4a36c1dd11496bd1942f7bba2a9bb22ae3b364fee4335adfb741756dd67 SHA512 a122892693e3bee0fc0e0b5c0945e4a8dddb890228c091112e0db11a8afd33430611c20ff9bc13d2b3a2ac0d3b560be2d9c4e03a9cc425983fbd8f7edb699658
 DIST consul-1.6.1.tar.gz 22621651 BLAKE2B b696823d3f7f3ef135ba578f3c4ae76f78a1f172e083a3bb5cd07212b3907aefbac3fc0a1d68c5d494e7781cb84c686e2cfb1e5f7cd2d34f8bf671be84b3ca00 SHA512 c96855f3a344699580e34d6f45efe863ba4e6b23ef0889a22ee89bad8ffa807b3cec1a9d14604a340b16b0a8df8227c9eeacd507f94e4a19b25e0385ca5155ac
-EBUILD consul-1.4.4-r1.ebuild 1585 BLAKE2B 1b776c067bfc59576f8c55a158fc39d3e661f51dec78c7551ad9eb3b8f11997f6a2240c7fdb9fdd15ab1e30199d23ed96b69510f9673ea036950cfc26ff82388 SHA512 1c49555ce01c0452d42c0d19f0d22438bc5f861584070d8d0d094c243d96e79a44530cb1a966d4684c3702140530614298ae4cd665fe87f392c2d92b057856a2
+DIST consul-1.6.2.tar.gz 22041280 BLAKE2B 0b2edcd68fa166c178587a1ed3ca0445847d34510cd4e341f85a370257958a155ef6f976b045fc8e87af39107a3930ccb6d7a798ad142e87362f82d68ece4c3c SHA512 2df67854b85fa27600bf2cd57c913669f784019ee5a25b20a950ab00a403ca0562d74cb73c3402ebcec6cd951d7b9b4eb80c926746bcc27050db85f31192f826
 EBUILD consul-1.5.3.ebuild 1830 BLAKE2B 5d0354957f3f52c00f7f63f02e2d0d05528e11a39a5ef32f1c3cb1fb98f18c93d06c49e97a3fa828bb106ce54a6eb1b3106ca9060b31f5a9cd8ae552f3a89104 SHA512 e5039260bdda283f5d7f577cf69e454fe10351ac211bf88bc6681258950bc212a7d3ec014a748f0fa9ac5d8d10b12ae693f015f0c72b6666b8eef4a83df23ea4
-EBUILD consul-1.6.0.ebuild 1830 BLAKE2B 1ee09c1896bebc44692a598e35deed9bc796b6c8a02190a98a6cb57a67e78eae2f487d23f39086459252747a537e49aace74275b011be48a374e512c404489db SHA512 a095c2487cf823c4f776d7b15610b819675a359ccabd3920b6a07715f1c0a2a61779f1488fbac55d171ac7581b397c0a09a9a7c257c7c591812742d79a68357b
 EBUILD consul-1.6.1.ebuild 1830 BLAKE2B 4592f85e488843fab9ec66ff4bc2b81e384a66fd523283332cc047e931aa18cb8b2dd91707a412656d4dadda9ba7664f502e369fd0d846524e347d971ff2b23b SHA512 43b1fc4d2ebb3b88e92217820899a3f4bc5586b953cb5fdc3f5282194d0e0398638ddaa08428dc6964a8bc2aaab6e55d80c3613e814469cdb204b4346ab324c9
+EBUILD consul-1.6.2.ebuild 1830 BLAKE2B 22f8170ae1aaa139dae769623f382632f1a3b29571691ee7b15d82235a75a5c133d930afcc780bda766a91b93859072a108ea97b9da9a5e469d2a7a0c8f80c99 SHA512 7fa573a22d42f9cac2b8696a3b9fc9e84e59a3e6f489cf6fab7a04b043f1d4702a4bddc52ac9f81c86b24d4df9ca0a5086e4586f9d45a5c65d0c31c9f9d064cc
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.4.4-r1.ebuild b/app-admin/consul/consul-1.4.4-r1.ebuild
deleted file mode 100644
index d2c2ea9df0ba..000000000000
--- a/app-admin/consul/consul-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="ea5210a"
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/consul"
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="dev-go/gox
-	>=dev-lang/go-1.11:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-src_prepare() {
-	default
-
-	sed -e 's:go get -u -v $(GOTOOLS)::' \
-		-e 's:vendorfmt dev-build:dev-build:' \
-		-i "src/${EGO_PN}/GNUmakefile" || die
-}
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
-	GOBIN="${S}/bin" \
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake -C "src/${EGO_PN}" dev-build
-}
-
-src_install() {
-	local x
-
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.6.0.ebuild b/app-admin/consul/consul-1.6.2.ebuild
index 91013647ce8f..59342179c2de 100644
--- a/app-admin/consul/consul-1.6.0.ebuild
+++ b/app-admin/consul/consul-1.6.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="944cc71"
+GIT_COMMIT="1200f25"
 KEYWORDS="~amd64"
 EGO_PN="github.com/hashicorp/consul"
 DESCRIPTION="A tool for service discovery, monitoring and configuration"
diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index deabad841e53..f2eda2257887 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -1,9 +1,10 @@
 AUX diamond-4.0-psutil.patch 1842 BLAKE2B 21774c34c5557c84b5ae217acfe468b7d55a4e3b818f501ee72cec43cc01d24e7121f9fe302bdc317d60c39e39e7d4587a5caee4ddc73dcc1e87e1605499be40 SHA512 4f59e7811df1419dcf29d231f62844de6db9e5a3f6e7600b11432d1bda994b62973172cce98d257d6ce03e940645df76dee2c3cd4fced18e960527bb23b1f1ea
 AUX diamond.confd 57 BLAKE2B 8a5e3f478d3eb948e262239a9a83026e067ed67f2a4878075c8ddb7d8d356a2482da0642e673b8b3f658de6c6f30a30c830bc68af3fe2d750b998dc896525942 SHA512 51b037902394b22f957a15ad1479ebdae5ac29384f2b7a5053ea8200bad05dc9c9060cc5c6c1a931e341e99b95327e55b06aaa9a828950533265f9c96a8dff55
 AUX diamond.initd 447 BLAKE2B 76354f66282325005f193d4ad51f3deb0358604a681cfe54a596037608bd794c3fd68a78a03659295ce2021b70809edc01340f5ee39348e35275cae0b00a5042 SHA512 004b305ba945fa313da4cd51226050cec955886405026baacb15f7ab586b7ba650492b0e2cd9621b3854ec83ee6192a7b86ad4fd8239008df3c6c8bb5c8c84f3
+DIST python-diamond-4.0.515.20170311.tar.gz 671963 BLAKE2B 9449f2d27b48c0e24727eb2c415a5095b20199d9315ef69df92a4aa6f8f3397743f3dc6cf2d8d91f79eca309926731b6b42da170a02987a20aeccd1e0980f4ac SHA512 d18a80540018975455b839a78fd55d13d167726b92914e3dc2de1c6f27f47319962361e05961c55047ba185e11ebf57831f3ab5cff9158a50d30a2ca635d53bd
 DIST python-diamond-4.0.515.tar.gz 620337 BLAKE2B 8df675f7e91086dc6e98166c3f6c25c7837bd53f720cd0dfdf05a1dd2954aaa190bfe8844d01acfcdf46d5be917c29c0e231f2b433a648d6dcc1f34e2c617d91 SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5
 DIST python-diamond-4.0.tar.gz 491433 BLAKE2B ddf678b758b046b80fe347c2cd8ce2fec46f03e65415735d88969d66dc05466730e52df9e8efc27e3a3bff13862c4efcc393de6d05ec6d350e3912a706d298cb SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b
-EBUILD diamond-4.0-r1.ebuild 2007 BLAKE2B 25abec3a500ca23844dc17a7e987be99be9f2c5692c717269ee171de875850a665626cff0d2c17b990f90293adcd9da99b2e355a42328f8c7bbb22749a54236e SHA512 9385587aed2660c5872baa3a224e7a74be1b49c903b814fdf353a44401c79008e9f325b5b68eefc610b453dc91bee10730d87fca55397f1b94202441a73e6b4a
-EBUILD diamond-4.0.515.ebuild 2255 BLAKE2B b7abeabc08f907879f698f738f08fddebe8d14092dfbdd8799faf6e99c872ac242d8742c323844bc5a75d900aa63208914dc16016c3a79987431badcb3d478a0 SHA512 0deebfc762e3112bf5a53b158efd127786986c97b38b622041ad31eecaf9631cb3f53e84a9da6ce9d614b8416cb713b272ac4a6884df17b2137a105dd31b4353
-EBUILD diamond-9999.ebuild 1900 BLAKE2B cdd17d24f9817cf9110aa198ca8f11d468deb5b162215fa2b5ecc2c82072f4ebdeb6751ba047b6392b69b9a90c438912dabd627ce54ad088bafb4ccf62fc4a3d SHA512 f595d59ab69d2deb704e6a1ea739540a7760a37c786ba3d0da509029bf367ebd855e131bf187c423443bd107ea5db30489b17053c959955bf242607b3f1dc59e
+EBUILD diamond-4.0-r1.ebuild 2034 BLAKE2B 4fe7f0b57cff859c7fb7a4a5bc33c0a136600baa192d580b46956552c2a53bf6b422a092a8ca0eb1fa88cfa7383e0f8fb8544e5997357d9b07168377dbd2de60 SHA512 d5475a2669aeaed077fdfc1c54195c7fc9640f0ec119c0fe02c13fa6dada9f46b4eacffb22102be1d52b3e493ef642ecbb16467953348d3014f1030edb7af462
+EBUILD diamond-4.0.515.20170311.ebuild 2932 BLAKE2B 728ed2e1d8f175c7369fbbe339d281f16ecf564322d06be916e81328637a1f3d96c51f2ba9f5df5931b6bddb4002c3d68c0d4df06bd8b58acca5aada92cab4bc SHA512 3b23a1e830f0f754713d791546746f11e92c463291182695a61ceb4242c59cce9aaefa2326008eb6c08793298e7fb39cbde56e67057c2b972577e7dc991d26e6
+EBUILD diamond-4.0.515.ebuild 2282 BLAKE2B 069e906711a12b0d98ce0ee05cceb8a860476e2ea8b9c63e79eb9c5051193352558c2ce962ee32e4ce1a6a67c719b330ec8374ac18fb3ab51873d4364d03275f SHA512 e0d101201e87a69dad691f1ce92777381ceb036dab594276f30c78e56348d91b9ae33aaa7d701d1b7506cf14b68392c73567f62e88ecf00f4711ed26b2871147
 MISC metadata.xml 802 BLAKE2B d013e1b87c2f1d5f0f628766ed754a4ac50e9c9e710b7b2542081cd06988f7f577513a53165c54ff4d1d1de3bba92ec2089eaa15d16cbe946f7489d0345aeaaa SHA512 c455baa068661000d395e15f6952b3106cb3633f1a95395745c6a0d7cc5dbfb193d018af1341f27b250226bdc109e961bda4a612115d5805958f8e500108239a
diff --git a/app-admin/diamond/diamond-4.0-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild
index 90c4c2549e94..f45a47bf45ba 100644
--- a/app-admin/diamond/diamond-4.0-r1.ebuild
+++ b/app-admin/diamond/diamond-4.0-r1.ebuild
@@ -23,6 +23,7 @@ HOMEPAGE="https://github.com/python-diamond/Diamond"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test mongo mysql snmp redis"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/configobj
 	dev-python/setproctitle
diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
index 57df76bc0741..347df5bcfc65 100644
--- a/app-admin/diamond/diamond-9999.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
 	S=${WORKDIR}/diamond-${PV}
 else
-	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S=${WORKDIR}/Diamond-${PV}
+	GHASH=73207d04e0739a4ce92bc201b36681c42d9fa7e7  # python3 branch
+	SRC_URI="https://github.com/python-diamond/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	S=${WORKDIR}/Diamond-${GHASH}
 fi
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 prefix
 
@@ -23,6 +24,7 @@ HOMEPAGE="https://github.com/python-diamond/Diamond"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test mongo mysql snmp redis"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/configobj
 	dev-python/setproctitle
@@ -41,6 +43,34 @@ src_prepare() {
 	# adjust for Prefix
 	hprefixify bin/diamond*
 
+	# fix the version (not set in GitHub archive)
+	sed -i -e "s/__VERSIONTOKENHERE__/${PV}/" src/diamond/version.py.tmpl || die
+	echo "${PV}" > version.txt || die
+	# fix psutil usage
+	sed -i -e 's/psutil\.network_io_counters/psutil.net_io_counters/' \
+		src/collectors/network/network.py || die
+	# fix symlink out of place
+	rm README.md || die
+	cp docs/index.md README.md || die
+
+	# this module isn't Python3 yet (lambda), if you use this and have a
+	# fix, let me know
+	rm src/diamond/handler/rrdtool.py || die
+
+	# forgotten conversion
+	sed -i \
+		-e 's/import Queue/import queue/' \
+		-e 's/Queue\.Full/queue.Full/' \
+		src/diamond/handler/queue.py || die
+	# fix usage of map as list
+	sed -i \
+		-e '/paths = map(str.strip, paths)/d' \
+		src/diamond/utils/classes.py || die
+	# send data as bytes
+	sed -i \
+		-e '/self.socket.sendall/s/data/str.encode(data)/' \
+		src/diamond/handler/graphite.py || die
+
 	distutils-r1_src_prepare
 }
 
@@ -55,6 +85,7 @@ python_test() {
 python_install() {
 	export VIRTUAL_ENV=1
 	distutils-r1_python_install
+	python_optimize
 	mv "${ED}"/usr/etc "${ED}"/ || die
 	rm "${ED}"/etc/diamond/*.windows  # won't need these
 	sed -i \
diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
index 6987c28cecd8..e7f3668ea8d0 100644
--- a/app-admin/diamond/diamond-4.0.515.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.ebuild
@@ -23,6 +23,7 @@ HOMEPAGE="https://github.com/python-diamond/Diamond"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test mongo mysql snmp redis"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/configobj
 	dev-python/setproctitle
diff --git a/app-admin/dio/Manifest b/app-admin/dio/Manifest
index 72613b632b66..2698346ea6a1 100644
--- a/app-admin/dio/Manifest
+++ b/app-admin/dio/Manifest
@@ -1,3 +1,3 @@
 DIST dio-1.5.2.tar.gz 44344 BLAKE2B 8e573cbf2ad1b717ffec09f20f8c7474841bc3e1635af35116d02b37af56ef3b4742e12725134d485f788e7abb595605640e19bd6f84bfd8f14289abf1695089 SHA512 366d2f2d25b8d16439c4a9aaa7cd775ddffb1022980675cdda8e2e4d4de3d3e5dcfa8d0c581b73fcfe4eff66ee8ef682f082c8788f514b7abdf1a2cb2159b9ba
 EBUILD dio-1.5.2-r1.ebuild 866 BLAKE2B 67446d17c74b52e5e59d62ee1cfde36b8947805e5f8f67bb6376f07ceef57e7bb9410b4781e138efe0740d3be7f36a81ff9531d5aaa4ff010547fe49cc4d27fd SHA512 4f340cf0311191745672dfea523fb2a8b0b721181e60700e026b5d6cffd5a9cb0e31ad35c1e41fb5052def7046abd3084201f4c929d6f25d7d76b1f3402f9daf
-MISC metadata.xml 912 BLAKE2B 5fe57b665757cb19dbe7e6efe2202d5cb4e8311fd21c3974a0c42017841330ce03242e5ac656818781cd39cb3ff62c05ed69ee008b8aa0c1809311819e23c588 SHA512 80995a42eba255a8e79ae0ae2596114b2703a433151b3f33d438a002c220194b14905221b9ab2e59185776c331ba22342c04d3ebf5aa8297b1ef988c45621f62
+MISC metadata.xml 793 BLAKE2B cc48bcda030360c69a517a4c76e91dca8adc6d5228d6982c21cd4a07afc474a4ef03daedd773f9a22564eccfadd5fcc6eb528cc2631358b5ca602144f2bf8559 SHA512 9875ed341acd30db1009dc29da6d024b433a77a8212690911286798aeabb4206d3af91452976931bacd3db81159a393efdbd95058fa6d740b22d6ad1a81f2c82
diff --git a/app-admin/dio/metadata.xml b/app-admin/dio/metadata.xml
index 021428c4e44c..45b5d4af3242 100644
--- a/app-admin/dio/metadata.xml
+++ b/app-admin/dio/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		It samples kernel statistics at the specified time interval
 		and uses them to derive useful realtime and cumulative performance statistics.
diff --git a/app-admin/diradm/Manifest b/app-admin/diradm/Manifest
index 8a28a9dfaea3..13c988e6c346 100644
--- a/app-admin/diradm/Manifest
+++ b/app-admin/diradm/Manifest
@@ -1,3 +1,3 @@
 DIST diradm-2.9.7.1.tar.bz2 126172 BLAKE2B 23f18a7946187caf1e12ec9d1f67a2c5c06895d837add3c79dd0b043d4745f0fd9b405e5667ebe5480946e4741c7bbff2be8c4281afcb7636353f72904f7e39b SHA512 5052f7b7072cd61eb9c70d23057f6c0d2fa68a151792d7260ca52716c9588c06234d335af84b967df23da4b4a8650502cab3b18900dc15e71f71b0888224993f
-EBUILD diradm-2.9.7.1.ebuild 1707 BLAKE2B b006d5606650f6b1b11a165aa5f951d4593d6f2b479040b6d7955e731da352c6321c9b8bb654778742e9454df77e333a7413f3d8f1818b6bf369719bfd89ae6a SHA512 821bcdaaa0b0db69d658436e93ca400b57583b1081964ed199800c1b0ab04e9fc01052ae1ea0d038f6e0ee37f889db213b824fb5d1615e85cc770f09b190e147
+EBUILD diradm-2.9.7.1.ebuild 1769 BLAKE2B 6fc65736def600ab605c3b3d58f119185fd0669c06963990998c05012f143be9b02a6bf9c8aa5d332daeb6bbe229a7378d0d9ee3fbcab1c3e9a7e9eddb7e81f9 SHA512 01c8d350ca75ee7da3f322f92cb9c86507b4e584f100972184b7274aceffad4b5b322a565c3df81ee966b616f4168c73ec60664cca01aa78612b2af6cfebdc27
 MISC metadata.xml 409 BLAKE2B 9228d543861d197474a3a1e7a698b4c14fa702cc1c7454b0ceb7fcbe3b6cccc5b4d3695efb917d0d65b6907c7447a93f63412a09496048dda0a716c65160a5a6 SHA512 e9324ac84f7909c5972a7bc60d81cccddf03509f2809387b9819c67d48dfaaf080377cd6d9c624f3315bf8548a3b764d077e42636d8f51695a1837a9ebb26fb2
diff --git a/app-admin/diradm/diradm-2.9.7.1.ebuild b/app-admin/diradm/diradm-2.9.7.1.ebuild
index 2d6459346171..6ce9e7a90d54 100644
--- a/app-admin/diradm/diradm-2.9.7.1.ebuild
+++ b/app-admin/diradm/diradm-2.9.7.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="A nearly complete nss/shadow suite for managing POSIX users/groups/data in LDAP"
 #HOMEPAGE="http://research.iat.sfu.ca/custom-software/diradm/"
-#SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
+#SRC_URI="http://research.iat.sfu.ca/custom-software/diradm/${P}.tar.bz2"
 HOMEPAGE="http://orbis-terrarum.net/~robbat2/"
 SRC_URI="http://orbis-terrarum.net/~robbat2/${P}.tar.bz2"
 
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="automount irixpasswd samba test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( automount irixpasswd samba )"
 
 RDEPEND=">=net-nds/openldap-2.3
diff --git a/app-admin/docker-bench/Manifest b/app-admin/docker-bench/Manifest
index d53f451bb56d..729754bdd285 100644
--- a/app-admin/docker-bench/Manifest
+++ b/app-admin/docker-bench/Manifest
@@ -1,42 +1,23 @@
-DIST docker-bench-0_p20171206.tar.gz 17541 BLAKE2B ce6e68cab7e36a596c9b366ad6c7a6ff9ec735248f99dbb5b046bd9628f62ff392bb3c576c2a159d3403401e6d6cd4093632e47102c763f1c967bbdff2e4ee08 SHA512 fb9fbc1ccc54965c546bbba17865b803214824ef53e02d088e72a9bf3ae7c6ee7429e15507593b2ec8d33c52aab375878d9ea86b51a2518948bc0dfe969bec13
 DIST docker-bench-0_p20190822.tar.gz 49441 BLAKE2B ea4d9056f0825c8adc0b87837fdb2087577ab68fbd53189310fd983f2a4155329789c30cd228b043d08e265457a90f0692210eddc87cbe63479f1c2ecf698401 SHA512 6157d9a473f10fc9e593c1cd87b153f1f34e8317bc31787085cca5a5be92efa1b00b386afa73f62a23ef45b39da70fe8345b61fd3955f5cdef82a085df854b27
 DIST github.com-aquasecurity-bench-common-81f08528fa03.tar.gz 18981 BLAKE2B 6579a12622870e537a16f467bcfed71ed1c791641e1948caee10a69f8ff7fc28a3f73e48beb8d3b1d274428e498720f528237d07b28fe1319164ab1339852d0e SHA512 b01f88ddb7c119dc9d7e4f7f3e2d9c80b4046dcd65c6d5f2640d28c235c04fbe03b348032584350485f6323920f692cd96ff73e4140faaeb26d7d5b6eb24671f
-DIST github.com-aquasecurity-bench-common-fc47834ad19bafbba64ded876d82bee4dba50c40.tar.gz 11587 BLAKE2B 832d7216340c71ce8ec201a0abb8f22dc73916a8bcc0d3657a7d12958f48142e6d729ce1f6403ed4a7b0b11a7cb53d45901f0a6e20f095d931c075e414373647 SHA512 20fb3a105af33096ed5e4a6b52e9793d9031ca5c2d2f37811e4be90abbc6cc3d7aa94e1d210ada703b61398f6bcf771ed20a9b9b9ad171fe88f66e78125bbc4f
-DIST github.com-fatih-color-5df930a27be2502f99b292b7cc09ebad4d0891f4.tar.gz 588446 BLAKE2B 0e3acbea72d4e6d14964c53a13eac4ddb4299f86045bc4751498c1e80ee997f3392b3236f1f7fa872ceef73edf0c4e87154d5cc1605d5637ae090979596f1906 SHA512 9c7a1f5d67e0c8da788624a24ec42a9a1504f497840590e50b8fe9204dde5511be00a94645c2e9326dba23a8514adffdc242192abb270021c37e231636bafc71
 DIST github.com-fatih-color-v1.7.0.tar.gz 816449 BLAKE2B f006f51cbd1a0288380b339d7d2b493e447aa1e6bd783f11de5670d4db6ff8c1463cbe957a04127c1f24186a9362be8c40ecdf4394cbbc0e2c6c2cb598c012ac SHA512 ee5668ce828ad3e5461c54d971aee4b10a578f697717010d60fdda641948430816e74580563dfea6a4c66a9840175ff5b63c2ca9cf1af213cfac5be7b8ddac36
-DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8
 DIST github.com-fsnotify-fsnotify-v1.4.7.tar.gz 31139 BLAKE2B f2d0aaabfad525fb640beba78991a858ad23203a557a69fc15d2f017b2a693c64c244de435682b1cd9d59e89a97e4ba60c7f95fa99a6145a9dea73b0f334936e SHA512 840943043c49c837641f04b976f2ba610fc03bd31030ca6442744d51fa9241da1905730ea11466e249a5bd37437f1e2a433a012a64ce872a1562c941bd5bfcbf
-DIST github.com-go-yaml-yaml-d670f9405373e636a5a2765eea47fac0c9bc91a4.tar.gz 64859 BLAKE2B 211e51960673e78e9c802357dffb550c6d59692203040b2f3d0bc9ab15f8bf5ee479918a782931238e230f36f4c77228a44632883486370f0fb9266d8b2c7c14 SHA512 daa9d622d4b717ce54af884e1f5548d7ead93486d322f808bc6cf291011a5c418d33b464fd66161bef8c18da759aa1c6182b36fb2210c5f026110776e2195ac5
 DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
 DIST github.com-golang-glog-23def4e6c14b.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
-DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
-DIST github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz 796903 BLAKE2B 4e31f27784cdc5781628ac082d7994a5559be59268003366a3185eac6eb514495f6d82ba13c3046f1061c6abc68712ae8d0505ab7567c8e6057b90f3217c272e SHA512 580bd4cfd26d82aa8c6870eabbd289b76f2ba529ed8496428b29e482ec39bc617cdbcd2f2f2d476ee93526bd18550dcd239085b9f74fb4d24ccb87a3b357bff6
 DIST github.com-golang-sys-a9d3bda3a223.tar.gz 1245170 BLAKE2B 62fd7fea3ab8426f9092e6758573c1fcd8915c776b7f44521d7d82ee42bbe5d4323a8813f1d39c336da6bce3525b4eff1b60e024cbf037738268dc7151024f4d SHA512 79e81f5fc94fe47ce3e794a80e888d09e3d9a192a65fd234a177e1665fde5a9029d1197160edfb5df7e479313665536a1e6445428d41d0c33f5319aa5d79cf51
-DIST github.com-golang-text-4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz 6112758 BLAKE2B 88f0ece79f03800d6482430d569fa9b65d8ec4b15d42f65706ca665349346961ab273d3a7d2d0676d0c6c05a12d08f75c1465fd0ef632611b7b606593466e5ae SHA512 9fc536d4971e8861c5b905dec44fc7eddfaf8b0dafd5f904929bc2b63a65ce3fa28108d3f9f954a9db8d4ed24be532a519bad41e09e8076f9b75e6564f75f7ce
 DIST github.com-golang-text-v0.3.0.tar.gz 6102619 BLAKE2B c92e68014a8c157d76741c02acd708771d66bd3dda5b19285f5aa3e073e0fe3fccb9054744d35ea62b681ae4421bb7489238d6868f9314fb26f88e002287abe8 SHA512 bd60dfaa7d9dbfca171a3ba40b51f5663c01257cf3b12b618d35689a97ab2212d316d5716ff09681bf40b099f7e20a0e0df8cfc065699cb6a07ad1dc2e2bc189
-DIST github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz 69787 BLAKE2B e1d034d5863ae8bca85736e971e613e6821665861e35954a067e5d659029a8680b6902387848a318aee374cd4f6b810ae160046979b5bc86e64df0e1ff5d08f6 SHA512 751ea2fcea04ab2a9b61a45443a71cdee9cd09c2576af048108ccb56027b34f46b00e14aa664b966165b7d8cbb994e49f128bf54e3469c627d73f7ee2809ebf8
 DIST github.com-hashicorp-hcl-v1.0.0.tar.gz 70658 BLAKE2B f28dbe8171ce4fa94f57e8bfa8ffe7e16e57147a6a4525a8b5d31d3a47e817e056a85bdb8b91d56be202db27a29f37496f73014d1d97c5d55ce07b89f7ff6848 SHA512 044e3ba2a44a1abd9c851d4ec1f5c541663f8cd7f705c46c6ae2c377fae6df6315a6596c42f391e8239b61f0f0f6caed8d4156f8875cbddfbc7bcb78eaeb466f
 DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
-DIST github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz 27761 BLAKE2B 0f39a63d3d19ad5d3ac367739d568dd3abe74a8a6aa0e60cf19ca8203412270fc45dd1fea07627290a85c42db6ead0229f72bfd845b9e4f645976db1585838e7 SHA512 493a7493e415b45abe2109c79e02ed7903de6a559911cff0323f9577fcf41134ab8f4ac26d776fdf9a891654f063bd2452c7e557c643d73de5f558b13533f62c
 DIST github.com-magiconair-properties-v1.8.0.tar.gz 29504 BLAKE2B 667b8e60ed2ff538a84f199e43c75d37998d6fcb2e9c3cd6b3e069ba9950d45b4cd775797879467ef86b701391078582be2100fe32fbfc4c794f728fb7f38527 SHA512 9790debc8def1a7eae5a1e530ca68e53e562e622b374752f69e40aa508a88b58b95e15a503a8314e7d4f71a42411d1ba462687184c2b251eb41b5ee3f12ce95d
 DIST github.com-mattn-go-colorable-v0.1.2.tar.gz 8518 BLAKE2B 176ecf55b90c106f4801aeee6d03a53eac495d23ccdf70e8276fb9f909ba144e2b59643bf4dd708131abb0ee3d1ca08c334f2accf0c4ad31729d46b8a7509a09 SHA512 fec4d5e9c5d4a259e81fa62d5188bfa6c5309e9113c0d77803f04702c482d4dc4b7ca4ae079a0aa1d8f789b48ad6dd2dc4f86074e8fa51e0fce3214fe88149c8
 DIST github.com-mattn-go-isatty-v0.0.8.tar.gz 3564 BLAKE2B da50a8739bd33249bca2231509948da94d5ac61787e5ac84af17b04a5b76cc751d2d3ab00d1967e1bc71365060835c6d668a8cea607eccd5a4f95bef8cafb240 SHA512 e9dc9181dfa9780bffd5b1aefbee9028d8a38c2c8feef6a0ca28952b57948a41582dc4c372394bdc76f8081490283d055f89cb7a8792418b3ee55a85c32a5b69
-DIST github.com-mitchellh-mapstructure-a4e142e9c047c904fa2f1e144d9a84e6133024bc.tar.gz 17997 BLAKE2B d2233557f40812a16fcb2b012f45afc7637fc8c64eb3e8e3d01ef78198dbf99d2a4caa9c749faac9b46d75c46a50ea5d0a6eb292924406a385533d3a47ac2eb8 SHA512 20b70a65cb700a2768dc643b2b2c86ea68927d417e9135e582a15f267f583637a01eec186a4fb1788c0ac421df1f8e0420d7b934d449fe7b66d572266d71f83a
 DIST github.com-mitchellh-mapstructure-v1.1.2.tar.gz 20980 BLAKE2B 6792e875503b852773e8f062808f7bfa5a7e77ab4ec9012865750a5e15a13a6338490e7dd865545b8055c043a9f016cdabe6fc71c031a1210eb3a5e0c28a3394 SHA512 86c9fb9494652dd391b67185aae44b9cb14fcf96ba9ff62ed95c8952b01f6485154102e5883d16c6007d18a02bbf34e5937e2842df72c0244d48b22ee6aa9fe3
-DIST github.com-pelletier-go-toml-acdc4509485b587f5e675510c4f2c63e90ff68a8.tar.gz 56990 BLAKE2B 02a12c6c8ef85cdfacb6ab59406132c74cb0eb4fc270c680abd220210a7d0a5796bdc79c97c5623c4760e38cc143cf51e62fdbdc52d007241f2b61657fbf7d53 SHA512 cfce832c0a74dbc4f559600c846b8df8e94368785991a910169e1a535e2a57a72f7d20ec7c9fbd14a44b7b5a11b496af0bfd7705fd67a1c192e39819ca8aaa64
 DIST github.com-pelletier-go-toml-v1.2.0.tar.gz 57496 BLAKE2B 48ffbd6b1b06df31b89ccda4d5aa7f8b23215a2532aab102612231dcdda3fcad4c277f15a56894e10bb94cb3c891f50e87ef9c0e6c7e1f3f840d14bd85634b25 SHA512 07791bbc0e578ab383776d715942cd4fa723e5fa6f9879676b6820166ca9b776651fd62a0584cbcc52d2ba87cecf18184734ce9b06fb5b490013eb8dff6fbb4d
-DIST github.com-spf13-afero-bb8f1927f2a9d3ab41c9340aa034f6b803f4359c.tar.gz 43579 BLAKE2B e0953e8a7cb3383cccbc307443d5942a8642e0358a0408af8b991e719698e7746f6b5cd4b3e46a7f896823742c6ba58e4ef332aa92cd5f4376eae1396a06c677 SHA512 9ff4adaa3b525b7b18fc4d1fbbb9e3049938e81cf2f0890a1a7e35f19640793d90d53b104a4f9e87aeb066b8b641020f468ba37b7a7a4e1c14f0d7d2085cdccb
 DIST github.com-spf13-afero-v1.1.2.tar.gz 45309 BLAKE2B 0de6a204590f40cda8e80495bf57f55827aec4fb0fff58e0ae7d03b25d297edf530af4c8da94f11ad9bd25eb148fb72b083c75d513b8c4802e8d1a557386f101 SHA512 2ea3773346086d7f0e499653649ef9cbe71b5c0ea488b7650630f4262c13fa426522c9f9556ab127c7b8aa2aa97ff0b34cf3a9eba8b7c753ed200292a50a314e
-DIST github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz 9594 BLAKE2B 4979fd23b48a6bcd2538357d33b7670326b9129b5de309548492d9597eace1320875e1b242b594c98777192c1e0c6abb0bda4ba946a43530cc68ec762d1949c6 SHA512 2b97f56aa83dd1302e02603a8fcbc8f2642ceff8bdc19cf8a26120801023c4a8a3fed689de0ac392f6a4144450ac85d32b00fbde200b22e972c31cbabd996cad
 DIST github.com-spf13-cast-v1.3.0.tar.gz 11085 BLAKE2B f46ad23efac14d599ef7268c033c5f244ea7976982fee02b4d83ae65f91a72150bef359eb24b8c868f8a42ea8a0aeae839dcf82a7646648bf482f2a520704e09 SHA512 4cd15f59860fddbb67055beb15dfb8114ecaad5999a8fb46fbbbdea1cf78eaa094a4893c10b97efc7d2f95509920688659d609623135bf9871e6229043452194
-DIST github.com-spf13-cobra-93959269ad99e80983c9ba742a7e01203a4c0e4f.tar.gz 100166 BLAKE2B 60304e434dbe9c3f7192f8c818371c02b5eb08a1777b244daf5fb6c53a1b7cbea019c70ad8e544fdf48fcfa3479f79d59ec5ab4da544a8afe2fd66c7e5de179c SHA512 8ba4b60e4b37a4efafcf8adfd609901d12c0f5a1f0bac88cb159f75d451d19622428f720bd22f929985b8259a6fb8720f02e187e7a684a8ee6324edabdefd8bc
 DIST github.com-spf13-cobra-v0.0.5.tar.gz 111126 BLAKE2B 0f5fe38e3e278603fcc53edfdd72206d7b6850aa3ac4054b4242091949fe327bf80ddc46c20c3df1e644807e5b8882c528ca5d3bc184b9f039038cbe9043835a SHA512 c21a2c935365c74772152e37adea553dc89fd31dae794bd7e8f56d7c9eaafe717e2d0d6f56e1c8d2fe442df445dee9f03bbd30e802e2ac6911babf309b901c04
-DIST github.com-spf13-jwalterweatherman-7c0cea34c8ece3fbeb2b27ab9b59511d360fb394.tar.gz 6345 BLAKE2B dad5459a45bc35e28f9ed7473a02bbfdfcc8da06e17cee15a1876125829065fd4bcaad35b8ec489f3b308637a3fa9cd829c04836207620e61db1a7f706660c6c SHA512 f98c62d7e74ce3e35c29862244d46fb19fcd615e500713dd7c26b30ebedd7a846e419af6586031b748029b8b4d5e32baff6d36bb1ec35856bb6ad5625a407f14
 DIST github.com-spf13-jwalterweatherman-v1.0.0.tar.gz 6392 BLAKE2B 15ed225aa9eb6afca552a19a7ba22216454a27a29aa9f7ee39758100ff123afe8b10e06fce63bf2f4710fbdcbc5c680d3b4eef1cc3c8d363ce0a9f31ce8a34ca SHA512 13cc90c6f4a9fcdd29610773ada79fa2072223459c824b0f732ed3a6f4c61cb7a65c169f70007d3a08354f0a2e06b67e5257c4b0a0e1989fbc2309e69f7200cf
-DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
 DIST github.com-spf13-pflag-v1.0.3.tar.gz 46002 BLAKE2B b7caa90be69c7bb6a36b0da68af309debee6edd6e2596d39e286ebdb10f9f90246736f3af3a35c89ac704e2764d2ac40e76dad09c3147a942200592e3d234916 SHA512 d7121dade4fc06568cfb650a529dda350c60171e97ca405d29b9654a9fd06e453d20f8efc2fd8c51f530cfb0708648b2b2ba06ab40897b262ef2f3baf04d65a7
-DIST github.com-spf13-viper-aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5.tar.gz 32232 BLAKE2B 23602979412f6457f7d1b1ffd78feb3a595dcd813d2f231ba7e6d000135f6bd1a68700125cf271ad50483ff21d4ac09aa67f8cbc4228351683002f5d73cbe52f SHA512 45a10a14b20a60f3a3471a0a4e92e96bf30aa96e09d589acf55f1f96b2fd0e0d2de6beb936762d57ca8057d7512029bedce7059afed1793b1dd8c351214ef09e
 DIST github.com-spf13-viper-v1.4.0.tar.gz 44183 BLAKE2B 4294bc3c5076f1305618f4caf5abdfdec200dbd140d48264495319a33c850a99b5bfa406f4987e58ae5b96321044e12235b60ffee018adfc6612daf04870074e SHA512 59d1ac2d84c4e72687df631fcdad723a5ad96e362a851a56fcf2f2dc57b5a9ac03f01f47fd24f5d3b027ffbd011b3981ce3abc21f3b98fcbe04c7f34752d4b01
-EBUILD docker-bench-0_p20171206.ebuild 2081 BLAKE2B 86c752360e7b948b1a73cd67b4f9981fe7cd1c54be28cf0f8cc4b4f09859934b1c2e20c7aacb6d74feeb26770ace16fb8e7862587703abe5cbbe65e6eeff48e5 SHA512 f370c1af5a9301d4e60b7d2cb8a632474dc4cc1e1ff872afac1ded02597aed3b5792f4925e02b6f25bb8f65c6fcef7cd5bdb302ecf57652e62c34a140f6f2b73
-EBUILD docker-bench-0_p20190822.ebuild 1687 BLAKE2B a238ed84d72fac380056eac51b35561f23163cc0ef6c93ab8e439d6373e126897a11ee025261afaaecb451954f4c92bf734c354d7f0af181daf5f5ed779e9cc8 SHA512 4b9ddd1c431d6de075e5e3d1f4bc4270f5cb984ba1adbf9c0988d68e985ffd504703fe31dad7d407e03c94926a2593ce501fb27956c91b711ac2820560542386
-MISC metadata.xml 335 BLAKE2B da5cd90d136df106dfcb334ed49459e5b69e470094fd259abfb2d402c7c9f363432013dbc5c64e04592de6a2d5dc535004e767aff6d9fe5c00c961cc8fb454c8 SHA512 079aa469e4bf9c79262feedcebf7ae1986224751d0667e502b0b66e1b2499f43177130a5fd1b37ece57713f49b2a7ce83c093e7b8b884ac995e4075a8edfea50
+EBUILD docker-bench-0_p20190822.ebuild 1709 BLAKE2B 9d1a05a4c1682a44b8894f229a13511948ba70f56d96ab0509858eebcfa2066500f19010e149a61d6bb3cb0d2cf3f980bd9688370d3510ada15733e061b8efdf SHA512 3ac38ceb8a515ade30c34aa293b9f2d1b00e104158555ece001acdc5ef0702507bb423b99c51ac93fb3dbe5cc7e70550bd8c643e6004cc229db82b78f8562b48
+MISC metadata.xml 338 BLAKE2B 9effd9d636357f6172d82d54167f07ec69a38dfd77e5d03d9aaf6fef6c1c0d2759897e3611fd8fe84be6b6295c54f7d2b497b12c4adf135f47dcc54c7a97e3c3 SHA512 3326aa9dda4d1b907feaaf10c964db5bb6963c5dbc09dfa07339b7ac8cf4a3140ba03351cecb73a4d367587df03ea2e9d0cd6d7e8ee9fd478f2c2a2c16e93e5b
diff --git a/app-admin/docker-bench/docker-bench-0_p20171206.ebuild b/app-admin/docker-bench/docker-bench-0_p20171206.ebuild
deleted file mode 100644
index 1e575d53fc4b..000000000000
--- a/app-admin/docker-bench/docker-bench-0_p20171206.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/aquasecurity/docker-bench"
-
-EGO_VENDOR=(
-"github.com/aquasecurity/bench-common fc47834ad19bafbba64ded876d82bee4dba50c40"
-"github.com/fatih/color 5df930a27be2502f99b292b7cc09ebad4d0891f4"
-"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
-"github.com/spf13/cobra 93959269ad99e80983c9ba742a7e01203a4c0e4f"
-"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
-"github.com/spf13/viper aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5"
-"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
-"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
-"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
-"github.com/mitchellh/mapstructure a4e142e9c047c904fa2f1e144d9a84e6133024bc"
-"github.com/pelletier/go-toml acdc4509485b587f5e675510c4f2c63e90ff68a8"
-"github.com/spf13/afero bb8f1927f2a9d3ab41c9340aa034f6b803f4359c"
-"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
-"github.com/spf13/jwalterweatherman 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
-"golang.org/x/sys 37707fdb30a5b38865cfb95e5aab41707daec7fd github.com/golang/sys"
-"golang.org/x/text 4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1 github.com/golang/text"
-"gopkg.in/yaml.v2 d670f9405373e636a5a2765eea47fac0c9bc91a4 github.com/go-yaml/yaml"
-)
-EGIT_COMMIT="8abecdea32bc3fe271eed1848b3e77ab46dd1971"
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-ARCHIVE_URI="https://github.com/aquasecurity/docker-bench/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Docker Bench for Security runs the CIS Docker Benchmark"
-HOMEPAGE="https://github.com/aquasecurity/docker-bench"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o ${PN} . || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/${PN}
-	insinto /etc/docker-bench/
-	doins -r src/${EGO_PN}/cfg
-}
diff --git a/app-admin/docker-bench/docker-bench-0_p20190822.ebuild b/app-admin/docker-bench/docker-bench-0_p20190822.ebuild
index 2ae49c969c76..ffc7a6f93a98 100644
--- a/app-admin/docker-bench/docker-bench-0_p20190822.ebuild
+++ b/app-admin/docker-bench/docker-bench-0_p20190822.ebuild
@@ -39,7 +39,7 @@ DESCRIPTION="Docker Bench for Security runs the CIS Docker Benchmark"
 HOMEPAGE="https://github.com/aquasecurity/docker-bench"
 SRC_URI="${ARCHIVE_URI}"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 IUSE=""
 
diff --git a/app-admin/docker-bench/metadata.xml b/app-admin/docker-bench/metadata.xml
index 6105e885d555..55e8d234560f 100644
--- a/app-admin/docker-bench/metadata.xml
+++ b/app-admin/docker-bench/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">aquasecurity/docker-bench</remote-id>
diff --git a/app-admin/durep/Manifest b/app-admin/durep/Manifest
deleted file mode 100644
index 36f60e6542c2..000000000000
--- a/app-admin/durep/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX durep-0.9-dirhandle.patch 848 BLAKE2B 71966b1b72740ecdd4178f93e09df9294039a59da088a00a93209d4ffc7f38f298791f71078afb420f145ceca50b98e429bb7db2a208e3218e703858d4669f72 SHA512 8e887393bab2c011cdf9ae096fc4f8b077c02c471203768c9f51b59df0a36f94aad797ffc017cf03ab0ddd2eed5e290d3ec65c90774bebacb5c35673ac3f176d
-AUX durep-0.9-gigabyte.patch 327 BLAKE2B 54838c927f77bb493489b4f63835f8c2e1b91f1d8bb3f77e5b8bc072617e04a27c82697e69879e0f8b650c5900deaa5ca3065ebab0b08f9bcb16988e550050cc SHA512 2bb28c5956cc6f8b301890f82eb86255f84ed6f93d1dc61e96bacb840ae0181feed76e992bca86249e9003701666784fdf7a40331c6c1731c55b3e3d2a4897b8
-AUX durep-0.9-r4-color-output.patch 3477 BLAKE2B 07bb50e252793664fd09d26e65abfddccf252259e712a7e239e8693ed4b0c03e6e308f899d38e2261d3204b7c06606978210393450376c7ba0e7fbf8f08f06ea SHA512 18bd766f706bf2036b1da35c0daf1add0adb6603a6cd0c68277efff8e1f2f8224cc2d79ca6c4afc70db9a01b5eec8a4ca7899c7c92b0bd38f709e7736731937a
-DIST durep-0.9.tar.gz 13713 BLAKE2B ac8cab90eeec1f9dcf1c5f6ba3043ee1de909cc288f3d1692d272b77c426932cb8b9c500fc7901c85a8eeeef3db4632b76c1ff5cf8a094c971867a3557052322 SHA512 a8a58cf4a77fa43e06eb22ce70e566fe9c5dd6921677dbe4691a6dd95e2fad3735778a9858e3b80957ba6efd20293fcd2ba4ddc9cfe29f5813997de0f9c96b6d
-EBUILD durep-0.9-r4.ebuild 746 BLAKE2B 78db882a49b4be171fdc1159adab160286f910e34e3e0b7051da43a1d615c2684ce36d8e620b8fd0a6d1ee43aa256e84d5cc07f20819c317a13d00e6f079ab2e SHA512 73458ffd706804959eddaabc0a06b879562e0855a4b75d47a8dcee0b1c24109740efede4d6c846192b6fe6b9ecea00306fe86abdf83261658f337da00b1fc138
-MISC metadata.xml 267 BLAKE2B 2496f74910a8e395abde0819a7f36ecc7fb7d10639cc3ddfbbf1645c5683c6352af932ec5538b19d4e21ddbd80cb5dc23a4a64f1618a7411129f33bf9dc54d81 SHA512 cbdeb6992e6acb977746b55685ae3d60dcf00915b48002a5e7eb47830207e7cad52ae212cd8831282274c454e45faa65422dcd5ac50185f429642fb34818609c
diff --git a/app-admin/durep/durep-0.9-r4.ebuild b/app-admin/durep/durep-0.9-r4.ebuild
deleted file mode 100644
index 8a1b40e1159e..000000000000
--- a/app-admin/durep/durep-0.9-r4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="A perl script designed for monitoring disk usage in a more visual way than du"
-HOMEPAGE="https://gentoo.org"
-SRC_URI="http://www.hibernaculum.net/download/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/MLDBM
-	virtual/perl-Getopt-Long
-	virtual/perl-Term-ANSIColor"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gigabyte.patch \
-		"${FILESDIR}"/${PF}-color-output.patch \
-		"${FILESDIR}"/${P}-dirhandle.patch
-}
-
-src_install() {
-	dobin durep
-	doman durep.1
-	dodoc BUGS CHANGES README THANKS
-	dohtml -A cgi *.cgi *.css *.png
-}
diff --git a/app-admin/durep/files/durep-0.9-dirhandle.patch b/app-admin/durep/files/durep-0.9-dirhandle.patch
deleted file mode 100644
index ee2930622370..000000000000
--- a/app-admin/durep/files/durep-0.9-dirhandle.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- durep       2007-09-08 11:44:05.000000000 -0500
-+++ durep.new   2008-12-15 10:04:14.907825184 -0600
-@@ -175,6 +175,7 @@
-   my $coalesced_size = 0;
-   my $node = {};
-   my $temp;
-+  my $dirhandle;
-
-   $node->{ID} = $next_id++;
-   if(defined $parent) {
-@@ -196,9 +197,9 @@
-
-   $node->{TYPE} &= $TYPE_COLLAPSED unless $store;
-
--  opendir(DIR, $dir) or warn "Unable to open dir '$dir': $!\n" and return $node;
-+  opendir($dirhandle, $dir) or warn "Unable to open dir '$dir': $!\n" and return $node;
-
--  foreach(readdir(DIR)) {
-+  foreach(readdir($dirhandle)) {
-     @stats = lstat "$dir/$_" or warn "Unable to lstat '$dir/$_': $!\n" and next;
-
-     $node->{MTIME} = $stats[9] if($_ eq ".");
-@@ -247,7 +248,7 @@
-     $file_count++;
-     $node->{FCOUNT}++;
-   }
--  closedir(DIR);
-+  closedir($dirhandle);
-
-   if($coalesced_count) {
-     if($store) {
diff --git a/app-admin/durep/files/durep-0.9-gigabyte.patch b/app-admin/durep/files/durep-0.9-gigabyte.patch
deleted file mode 100644
index 315cb1c7c813..000000000000
--- a/app-admin/durep/files/durep-0.9-gigabyte.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-fix `durep -hs 1g` output
-
-Patch by Stephen Tallowitz
-
-http://bugs.gentoo.org/108942
-
---- durep
-+++ durep
-@@ -468,7 +468,7 @@
-     elsif ($temp =~ m/^[mM]/) {
-       return $size * 1048576;
-     }
--    elsif ($temp =~ m/^[mM]/) {
-+    elsif ($temp =~ m/^[gG]/) {
-       return $size * 1048576 * 1024;
-     }
-     return $size;
diff --git a/app-admin/durep/files/durep-0.9-r4-color-output.patch b/app-admin/durep/files/durep-0.9-r4-color-output.patch
deleted file mode 100644
index 6b8956199406..000000000000
--- a/app-admin/durep/files/durep-0.9-r4-color-output.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- durep
-+++ durep
-@@ -14,6 +14,8 @@
- #############################################################################
- 
- use Getopt::Long;
-+use feature 'switch';
-+use Term::ANSIColor qw(:constants);
- use File::Basename;
- use MLDBM qw(DB_File Storable);
- use Fcntl;
-@@ -27,6 +29,7 @@
- our ($root_node, $filesystem_id, @stats);
- our ($opt_help, $opt_version, $opt_textdepth, $opt_hidesize, $opt_showdate, $opt_nosort, $opt_quiet);
- our ($opt_savefile, $opt_loadfile, $opt_desc, $opt_collate);
-+our ($opt_nocolor);
- our ($opt_files, $opt_onefilesystem, $opt_collapsepath, $opt_excludepath, $opt_coalescefiles);
- our ($root_dir, $file_count, $dir_count, $next_id);
- our ($TYPE_FILE, $TYPE_DIR, $TYPE_EMPTY, $TYPE_COALESCED, $TYPE_COLLAPSED);
-@@ -56,6 +59,8 @@
- 	    "d|desc=s"            => \$opt_desc,
- 	    "c|collate=s"         => \$opt_collate,
- 
-+	    "nc|nocolor" 	  => \$opt_nocolor,
-+
- 	    "f|files"             => \$opt_files,
- 	    "x|one-file-system"   => \$opt_onefilesystem,
- 	    "cp|collapse-path=s"  => \$opt_collapsepath,
-@@ -332,13 +337,58 @@
-     printf(" [%s%s] ", "#" x $numofchars, " " x (30-$numofchars));
-     printf("%6.2f%% ", $percent);
-     printf("%s ", shortDate($entry->{MTIME})) if $opt_showdate;
--    printf("%s%s\n", $entry->{NAME}, $entry->{TYPE} & $TYPE_DIR ? "/" : "");
-+   
-+    printColor( $entry ) unless ( $opt_nocolor );
-+    printNoColor( $entry ) if ( $opt_nocolor );
-     if($entry->{TYPE} & $TYPE_DIR) {
-       printDir($entry, $indent+1) if(!defined $opt_textdepth || ($opt_textdepth > $indent+1));
-     }
-   }
- }
- 
-+sub printColor {
-+    my $entry = shift;
-+    
-+    my @tmp = split /\./, $entry->{NAME};
-+    
-+    if ( $entry->{TYPE} & $TYPE_DIR ) {
-+        print BLUE, BOLD, $entry->{NAME}."/\n", RESET
-+    }
-+    else {
-+        given ($tmp[$#tmp]) {
-+            #executable (bright green)
-+            when([ qw(cmd exe com btm bat sh csh) ]) {
-+                print BOLD, GREEN, $entry->{NAME}."\n", RESET
-+            }
-+            #archives / compressed (bright red)
-+            when([ qw(tar tgz arj taz lzh zip z Z gz bz2 tbz2 tz deb rpm rar ace zoo cpio 7z rz) ]) {
-+                print BOLD, RED, $entry->{NAME}."\n", RESET 
-+            }
-+            #image formats
-+            when([ qw(jpg jpeg gif bmp ppm tga xbm xpm tif tiff png mng xcf pcx mpg mpeg m2v avi mkv
-+                    ogm mp4 mp4v mov qt wmv asf rm rmvb flc fli gl dl) ]) {
-+                print BOLD, MAGENTA, $entry->{NAME}."\n", RESET
-+            }
-+            #misc.
-+            when([ qw(pdf ps txt patch diff log tex doc) ]) {
-+                print GREEN, $entry->{NAME}."\n", RESET
-+            }
-+            when([ qw(mp3 wav mid midi au ogg flac aac) ]) {
-+                print CYAN, $entry->{NAME}."\n", RESET
-+            }
-+            default {
-+                print $entry->{NAME}."\n", RESET
-+            }
-+        }
-+    }
-+}
-+
-+sub printNoColor {
-+    my $entry = shift;
-+
-+    printf("%s%s\n", $entry->{NAME}, $entry->{TYPE} & $TYPE_DIR ? "/" : "");
-+}
-+
- sub processSizeOption {
-   my ($size, $temp);
- 
-@@ -438,6 +488,9 @@
-    -d, --desc=<description>     give description of save file
-    -c, --collate=<dir>          collate save files in dir for web report
- 
-+Color Option:
-+  -nc, --nocolor 		no color output
-+  				By default durep color outpu
- Inclusion Options:
-    -f, --files                  do not descend into subdirs, only report files
-    -x, --one-file-system        do not traverse file systems
diff --git a/app-admin/durep/metadata.xml b/app-admin/durep/metadata.xml
deleted file mode 100644
index a1d1cac5ab79..000000000000
--- a/app-admin/durep/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>A perl script designed for monitoring disk usage. Similar to du</longdescription>
-</pkgmetadata>
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 282a2faaf147..816d059d6d61 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,3 +1,3 @@
 DIST entr-4.3.tar.gz 23756 BLAKE2B 0272b0185932d7c388818df0cc615e991c9545473a823c478ad9f0b6a23c97c0f4b2727b109a7bb18e2b0792f18d94d188d4a5d3fc90c479628ea078b1288f96 SHA512 f65dfc3f106e25ec4ff39eaec94222d8a547eb35390c654f6a741f92541c1b86d7d303a795308fcbfced44ac8eca6ad67e70393802ac9d46153e037dc1eab902
-EBUILD entr-4.3.ebuild 551 BLAKE2B d33d3a0fc6d239c851a63f05a66726b8cc4303fc7a01e132278418122dbad9fbd9c391d6f01d86c50c0965e5e3c7d6b2a14d6f2263ac3722521f05ea27970654 SHA512 4e39184ad8268fafabb60f3be857d1adbf015b51cb7b2f58aaa204b9d5351f5a8dc2bcd957c019e1a55c28042253e91e51e8cdf9b835a3640247e0c8d4a06239
+EBUILD entr-4.3.ebuild 578 BLAKE2B 65f1c99b403ee686a265ce41713faf013e0badcb545a1fef69bf7617af35538aa4c37100cceca603f9cf98a2162d81db4fc43c1e65b15a539d7e4d05a9ffd6a0 SHA512 1560373ff2342ae3726efd781dc538c558a46767b910feda4b04bb281827d4d4009cf35b654ea6978ce5ac31176b2bc6c58118b43a9c270c8d98c439e1e94c2e
 MISC metadata.xml 377 BLAKE2B 377ae6a1620e09bf5a309a212ed7b4db5516e51b9e955373502252ab4fa5bdd9520d5c145905634d76e3884a3a993a6fb2cbe37e730e177081ea5f0c65b3c1ec SHA512 7db7620ce42324e2a551b2fa5898aab491c868b5d28b938e163ea1bf24aed66913fff8d611e95c634e65aa5372bed9314a55b278d62157929d6873cea7994bd6
diff --git a/app-admin/entr/entr-4.3.ebuild b/app-admin/entr/entr-4.3.ebuild
index bfade6f4da8e..c2fb5be80105 100644
--- a/app-admin/entr/entr-4.3.ebuild
+++ b/app-admin/entr/entr-4.3.ebuild
@@ -13,6 +13,7 @@ LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 src_configure() {
 	sh configure || die
diff --git a/app-admin/equo/Manifest b/app-admin/equo/Manifest
index e1c884f95b91..0db3fd6f59ee 100644
--- a/app-admin/equo/Manifest
+++ b/app-admin/equo/Manifest
@@ -1,3 +1,3 @@
 DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
-EBUILD equo-302.ebuild 937 BLAKE2B 3703b5d48d3744e05584c51e3ad961e436ebc0cd495d191645ddd898cfacfbb1038a6026f8e13af00072c1d3e3c223249af8adba1751c9f777b1f185024ce74b SHA512 4c9be7016d4a190812a8df5361ab3bea74a29b0a400275d7395c757867e6411c6915f723fca59a0ded43022407a61ec593487d9275f06b4b29d93c297902361b
+EBUILD equo-302.ebuild 887 BLAKE2B d4288f003fb43a498e5b35b9a6903858a5f33b3bbfd478ad41d52d2477ed34f476a6a4af4c8a447f0b9437dee11cd0fbd3d776f4b6d181663d7905323abb28b3 SHA512 ba110ca04e91add28ba7f7ab57d0e4f686c14ed89a8755c4c90e94488db9e4bf1a3abbde7e1203116e822c12ddb5e6f0cc84c96fa80aa47982596fd4b1841955
 MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/app-admin/equo/equo-302.ebuild b/app-admin/equo/equo-302.ebuild
index 1c5924a18e98..cfe1a7c0ea3c 100644
--- a/app-admin/equo/equo-302.ebuild
+++ b/app-admin/equo/equo-302.ebuild
@@ -29,12 +29,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_compile() {
 	cd "${S}"/client || die
-	emake || die "make failed"
+	emake
 }
 
 src_install() {
 	cd "${S}"/client || die
-	emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed"
+	emake DESTDIR="${D}" LIBDIR="usr/lib" install
 	newbashcomp "${S}/misc/equo-completion.bash" equo
 
 	python_optimize "${D}/usr/lib/entropy/client"
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 504a1f55e35f..ae30b043fe45 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,8 +1,10 @@
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
 DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
+DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
 EBUILD eselect-1.4.12.ebuild 1601 BLAKE2B 2686a4c94796f4eea06114c9cf242c4dff3daf650423fb7e89437ec8ad9d9164b1ecefdeda7c81bd6d7d1bd61d2c0d487db4ae0d5381f84bd3a31208abf5379b SHA512 43935b87ccc169dc442e81a05c9f7bb4f7a417606895693a91810b1a1f5e096d9eab7de8e939f43cf06e698ff9616d00f47deae7d970fea62a4d822777330848
 EBUILD eselect-1.4.14.ebuild 1605 BLAKE2B 1580569165e5273eacbf56cb4d74c6435f9c72bf0e2bf1012089997f6a99de3ab0b8503f5fe528043edc4a470257fb22c4361b7a62a913bd5c0ddbfd1b373281 SHA512 7afeaaa18391f92e834701a3f1d1a80c066815eccaaffde62dfd6edbf9279b2e73a125dee428c8696d5da1f1dc67772c85feb2c540643099ac17d88d660a5f78
 EBUILD eselect-1.4.15.ebuild 1607 BLAKE2B 6b5650e3e634365cb3ecaf9de1535863d46d65b5fb39d24e8ad31a2a60d3820a9be902e98bb799eca3cefd8b09eb849941326e92a1031bb2618f40d2edda609f SHA512 500243e2970a0ed9459c0bd3c678beecb7ef8f491ef44cbdba41fbca574ca6633c73d2b02bc5c6322e8abd94b06e6d6a96aeb0857d81c68dd4e84dd2ccca3b2e
+EBUILD eselect-1.4.16.ebuild 1618 BLAKE2B 9c401a61aea5b45a7dff6897e39ab31ee33809ce6da77cbfd29f21fae61d3ea28fb0107a844897abf1a1c2a0912f8fe3659d622a1ac6e5829bd6ad6bc83efea8 SHA512 44fdb185726eb0f86555ef8b9d8a0556b3bdeb31705f6d97be0f1c7c8fb1902597b566944b57b520ccab777a1bed7d6ad71b8290e17483139bf50515ba6362e1
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.16.ebuild b/app-admin/eselect/eselect-1.4.16.ebuild
new file mode 100644
index 000000000000..aa84c092b387
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.16.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs vim-syntax"
+
+RDEPEND="sys-apps/sed
+	|| (
+		sys-apps/coreutils
+		sys-freebsd/freebsd-bin
+		app-misc/realpath
+	)"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils )"
+RDEPEND="${RDEPEND}
+	sys-apps/file
+	sys-libs/ncurses:0"
+
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+	vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newbashcomp misc/${PN}.bashcomp ${PN}
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+	if use doc; then
+		docinto html
+		dodoc *.html doc/*.html doc/*.css
+	fi
+
+	# needed by news module
+	keepdir /var/lib/gentoo/news
+	if ! use prefix; then
+		fowners root:portage /var/lib/gentoo/news
+		fperms g+w /var/lib/gentoo/news
+	fi
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for the portage group:
+	# merging changes the group back to root
+	if ! use prefix; then
+		chgrp portage "${EROOT}/var/lib/gentoo/news" \
+			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
+	fi
+}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index f7e74076d954..17a43513b262 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,7 +1,3 @@
-DIST exo-1.5.0.tar.gz 3806818 BLAKE2B fe817962ebcebfbe37c0ec884b127144fca4d85bf985f3f6d98bf154a1bb17b49d8b7de7ece6fb71ae3b2793969fdae8bf0ad0f2031cc11943c714e27ef1a63d SHA512 3fab4c57d55d0058a4e1191d97ac04de45052e5f9c25bea0d4408df48c648e28804842d8989700daf36c6657023b99a63a4dd77a1991689abecdb11afa4e6a09
-DIST exo-1.5.1.tar.gz 3806840 BLAKE2B 4a99fd15049ece0349ce427beb923e8ecf7ad47980412a9aced9f7ccbb340c2e95d08045fd553967f5c428d46505ff48e4eccca442cb796d845c6174a68a8b5b SHA512 2db42813446e79a4bd06048706f4a775c435c33fe7f9bf82c260623c0b09ad28e9090cf11b52b5d1c7b2a4ef693af6cede0a2470b3d8213fb655c27cc6d1f58d
 DIST exo-1.6.0.tar.gz 3754205 BLAKE2B 9dc109ec33e9a11199f49adc45b388e1c3c62ebc060b300568fd42c5b6457b1c0373939b325c0b0be462dfacf3d842a7eca66a01efd8685d6f621401423448ed SHA512 8d00dd24ef8098c156e756d082c039e9753fefc11b415435725f536faa5fa8e4eb652ff8c0c82452ab84512f7491aee970d425910bfcb2529568589e5dc9c6d2
-EBUILD exo-1.5.0.ebuild 545 BLAKE2B 1e55be70abe5f2e18f9db5058bbe72eda356212f9f698c7c9f5130d40a3da55e466412bf173952f0255370965f46b9b2af1faf8cea448c52bcef36fddcc57b1f SHA512 72e9a1fed8dc44277c4a29f71837cda8ae9a8e9ba591d78918e860122630fe6c800f4aa49d4dad62f97ee4d216212135ec9de61cc5acc8a2747a3cbf3bd00661
-EBUILD exo-1.5.1.ebuild 545 BLAKE2B 1e55be70abe5f2e18f9db5058bbe72eda356212f9f698c7c9f5130d40a3da55e466412bf173952f0255370965f46b9b2af1faf8cea448c52bcef36fddcc57b1f SHA512 72e9a1fed8dc44277c4a29f71837cda8ae9a8e9ba591d78918e860122630fe6c800f4aa49d4dad62f97ee4d216212135ec9de61cc5acc8a2747a3cbf3bd00661
 EBUILD exo-1.6.0.ebuild 545 BLAKE2B 1e55be70abe5f2e18f9db5058bbe72eda356212f9f698c7c9f5130d40a3da55e466412bf173952f0255370965f46b9b2af1faf8cea448c52bcef36fddcc57b1f SHA512 72e9a1fed8dc44277c4a29f71837cda8ae9a8e9ba591d78918e860122630fe6c800f4aa49d4dad62f97ee4d216212135ec9de61cc5acc8a2747a3cbf3bd00661
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/exo/exo-1.5.0.ebuild b/app-admin/exo/exo-1.5.0.ebuild
deleted file mode 100644
index ebb329b957ff..000000000000
--- a/app-admin/exo/exo-1.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for everything at Exoscale: compute, storage, dns."
-HOMEPAGE="https://exoscale.github.io/cli"
-SRC_URI="https://github.com/exoscale/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-
-S="${WORKDIR}/cli-${PV}"
-
-src_compile() {
-	go build -mod vendor -o ${PN} || die "build failed"
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-admin/exo/exo-1.5.1.ebuild b/app-admin/exo/exo-1.5.1.ebuild
deleted file mode 100644
index ebb329b957ff..000000000000
--- a/app-admin/exo/exo-1.5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for everything at Exoscale: compute, storage, dns."
-HOMEPAGE="https://exoscale.github.io/cli"
-SRC_URI="https://github.com/exoscale/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-
-S="${WORKDIR}/cli-${PV}"
-
-src_compile() {
-	go build -mod vendor -o ${PN} || die "build failed"
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index f0cc0105821f..21cb5e11e1c8 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -17,4 +17,4 @@ EBUILD fluentd-1.3.3.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b2066
 EBUILD fluentd-1.4.0.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
 EBUILD fluentd-1.4.1.ebuild 1324 BLAKE2B 1090d968648475fd28a75a792e53d38f63b206610e9556354ea67c1c7e80767e71e0536679b2b88f9add97ba022904de131ee6790db4c2082a03da83bbc0a34f SHA512 163bab1c25d763e212d43ecf4c1d6e50c04100fd3ddc35907ac0f09870fa966e4ea60f2fec9b052ddcd8c24e77f110b14b601bd5aa6fcd04d94cb5cb500c9fac
 EBUILD fluentd-1.4.2.ebuild 1412 BLAKE2B d5cc7d2c2cfeb8726d6f61ee437f2017f8f4c67db49d0bd39aaa35374082b2c5336f3160838d542cbc4bcb82ef2244f1231eacafa438c1c791eb3741354bdeaf SHA512 4c8100bbda3e6c0b92c477c89d26d0f958b57a2285e8feb004d43f3f2b085befa5c845c43f96454ae9e08b5d98042b5f5dfc8a4ba0060b8c14f794dc95c960de
-MISC metadata.xml 665 BLAKE2B b2487570d210ca695ec87ff2643128d9b7ccd84820efc9de8c3785298c0462ec1eb93abd3a9c481264aa564ceab8371db370b2b5d78975ecbcf8d812c6652ea4 SHA512 8b2888a9b821c0629750471fb3304e399122652a36e605adf3c11b8340ceafae5467035737d9c13a55aeab3b6dda79bb623b524fbb8fa6a1bbe0c576f32b2407
+MISC metadata.xml 557 BLAKE2B a4f765631fe109d217f577b3de01c7fe4901e7b7ad92d38e2844720188f3316e0c6f288065aa1b4e27e53d4b1f562d65839502d755081423b55e239119beccac SHA512 214770043d1c60e385a509faa12f4b7c04bbe0137b9dd9082c49fa6adea2e1a4555e38695bdb7b14cffe6a700430202e2ab711ddcfe413c6a7986584010f133f
diff --git a/app-admin/fluentd/metadata.xml b/app-admin/fluentd/metadata.xml
index d4977789cb11..1fbe5854b306 100644
--- a/app-admin/fluentd/metadata.xml
+++ b/app-admin/fluentd/metadata.xml
@@ -5,10 +5,6 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>zlogene@gentoo.org</email>
-		<name>Mikle Kolyada</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
diff --git a/app-admin/gam-server/Manifest b/app-admin/gam-server/Manifest
index d3236919df3e..58791f694c71 100644
--- a/app-admin/gam-server/Manifest
+++ b/app-admin/gam-server/Manifest
@@ -6,5 +6,5 @@ AUX gam-server-0.1.10-noinst-lib.patch 2207 BLAKE2B 28ebca731a16fb10c0f186c3eb75
 DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fbab69f2417cc089b050a7e245d89701b0703a0916d6dc08a706785ee509ee4feed0375107f777fdf4248ff5f93b SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST pkg-config-0.26.tar.gz 396399 BLAKE2B 5a88cf825d6ad99d198418798b28c779cfd4c0bcfaa023e915a818c141a504c49a6281ea0b2d04a7a9ec89f9924c87f8b1ddaa5a088952715397081383b3528a SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4
-EBUILD gam-server-0.1.10-r2.ebuild 2629 BLAKE2B c0883054e66f4145dc5041527d5d78f3dae0fd281f0750fe78ba9a38285210924904634a4f22e8d58e4f27761d7226ee3f2f5eba5e5438b83faa90f575549ce6 SHA512 5e823e9351c231ef5385cd58b7557ddcc0421b225e75a8b013f612012f8b669ac97cf982332c189efcd8c61ba50a7698c99f8b85c2263be7c0a14527c2fe24ab
+EBUILD gam-server-0.1.10-r2.ebuild 2622 BLAKE2B 3dad570f8ab9438eefe961ee86a7582eb1d8d70e0f12d97b374877c17be593d6ef9476cf5627dc8b5a6fef21c20be20f80e4f789004aa074c4e066da05a5af5e SHA512 3f595d94af2dc87a45cc4cae56511b41d650686dcace0dfb5c19f77149c1dad1e96774a25517d6ee3daf8d895f78d8d9f9cf7b064f40e47bf6209f13361fda0a
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
index 9d66f04b72eb..ed2b39bb68d9 100644
--- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
@@ -84,5 +84,5 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 }
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index 578359287e48..9a2e40cdb3fa 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -12,20 +12,22 @@ DIST github-backup-utils-2.15.1.tar.gz 84627 BLAKE2B 14f448a8c15b45cdf2a2868d70d
 DIST github-backup-utils-2.16.1.tar.gz 84847 BLAKE2B 5c6c0cbe8268ae176321739582783e920454efbebb62a0058ceeddb675a46050db3126897054c0120a74bcfa16bd28b4dd311cbd6a5e23dac262a49bc026c90d SHA512 bde17ed47ec0b89fd95e0a018cc0709045da6f27ffbf492d555219a09e3fcca612d67da1e0d5786fa8ea08a7eaa6d183dc1d40fd45d7bace5d05899ae0007fcb
 DIST github-backup-utils-2.17.0.tar.gz 89926 BLAKE2B 82e89d616f78d630a4c537ad110f1097fd4925f9d0b45ebd117a5f4dbce21ec84bddd1f7a2cfebc52464e8fff9117bd4b0cc5e862e666d4b3d05f11a9b88730d SHA512 aeae5d5f662a687e13ff0aed54801759480ba39e31f0ad49a9ecc4fabad5aa5e124e774c7b939a366a33135e81614d1cee6f1004481bbe94150b48a11f222a90
 DIST github-backup-utils-2.18.0.tar.gz 90357 BLAKE2B e9f6c155246914a36d26ec8cddf4a1e9feca73b3450ceb8e6df11df7c077b86f18cfa23b51e77425ba4e28ce4a3664200c1ddb15e6eb856d6b8930379dd3e348 SHA512 1778bf4cf404444e567f9f6b98bcd01bf9880939b4645692d75dbf10e7b31b40678521b66fbdabfedef648561f34709492b7860ce16442757e161db2ffda45a2
-EBUILD github-backup-utils-2.10.0-r1.ebuild 1165 BLAKE2B 0789a905aabb2e370d35868f89223bcd9b0ccb0100f186410f72c026747cbef9ed68b4346f37c3349e2da5a34db21ff711db8d24230d8a58f2105c2dfc3009df SHA512 fe99dae0e4dc7e7c66c33ea61488f10c62ca656829f809b7d69dc83565183dbd7528f682df71c66e9f2ad2008e7a499abe3991cbfffa53d17bcb1cf4c3057c34
-EBUILD github-backup-utils-2.10.0.ebuild 893 BLAKE2B 70055ac1dc8372d877d4f0e4361b94d3ba60334b0bea5ce284a537f137641e09a6d14fbce96a62dd9a109d48b3b76b49810cb8a8554b9882d5915b8f159c1a26 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1
-EBUILD github-backup-utils-2.11.0-r1.ebuild 1165 BLAKE2B 0789a905aabb2e370d35868f89223bcd9b0ccb0100f186410f72c026747cbef9ed68b4346f37c3349e2da5a34db21ff711db8d24230d8a58f2105c2dfc3009df SHA512 fe99dae0e4dc7e7c66c33ea61488f10c62ca656829f809b7d69dc83565183dbd7528f682df71c66e9f2ad2008e7a499abe3991cbfffa53d17bcb1cf4c3057c34
-EBUILD github-backup-utils-2.11.0.ebuild 893 BLAKE2B 70055ac1dc8372d877d4f0e4361b94d3ba60334b0bea5ce284a537f137641e09a6d14fbce96a62dd9a109d48b3b76b49810cb8a8554b9882d5915b8f159c1a26 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1
-EBUILD github-backup-utils-2.11.1-r1.ebuild 1165 BLAKE2B 0789a905aabb2e370d35868f89223bcd9b0ccb0100f186410f72c026747cbef9ed68b4346f37c3349e2da5a34db21ff711db8d24230d8a58f2105c2dfc3009df SHA512 fe99dae0e4dc7e7c66c33ea61488f10c62ca656829f809b7d69dc83565183dbd7528f682df71c66e9f2ad2008e7a499abe3991cbfffa53d17bcb1cf4c3057c34
-EBUILD github-backup-utils-2.11.1.ebuild 893 BLAKE2B 70055ac1dc8372d877d4f0e4361b94d3ba60334b0bea5ce284a537f137641e09a6d14fbce96a62dd9a109d48b3b76b49810cb8a8554b9882d5915b8f159c1a26 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1
-EBUILD github-backup-utils-2.11.2-r1.ebuild 1165 BLAKE2B 0789a905aabb2e370d35868f89223bcd9b0ccb0100f186410f72c026747cbef9ed68b4346f37c3349e2da5a34db21ff711db8d24230d8a58f2105c2dfc3009df SHA512 fe99dae0e4dc7e7c66c33ea61488f10c62ca656829f809b7d69dc83565183dbd7528f682df71c66e9f2ad2008e7a499abe3991cbfffa53d17bcb1cf4c3057c34
-EBUILD github-backup-utils-2.11.2.ebuild 893 BLAKE2B 70055ac1dc8372d877d4f0e4361b94d3ba60334b0bea5ce284a537f137641e09a6d14fbce96a62dd9a109d48b3b76b49810cb8a8554b9882d5915b8f159c1a26 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1
-EBUILD github-backup-utils-2.13.0.ebuild 930 BLAKE2B 185c34081fd6caa7343747e0ac870f18a24c6d580250774815fbc2d1df9b3c3a24823018f00bfb80d2b038a4c1dca32da50824daf558d77d27afe84c2681b348 SHA512 f6c25a3358217c0090a52e076eb138cdd82a349a8f32f1530a6cb1ce02e52acee765ad139244ba7c13c0930eacd7212706bfa00702dc089778e430e53bed6655
-EBUILD github-backup-utils-2.13.2.ebuild 930 BLAKE2B 185c34081fd6caa7343747e0ac870f18a24c6d580250774815fbc2d1df9b3c3a24823018f00bfb80d2b038a4c1dca32da50824daf558d77d27afe84c2681b348 SHA512 f6c25a3358217c0090a52e076eb138cdd82a349a8f32f1530a6cb1ce02e52acee765ad139244ba7c13c0930eacd7212706bfa00702dc089778e430e53bed6655
-EBUILD github-backup-utils-2.14.2.ebuild 930 BLAKE2B 185c34081fd6caa7343747e0ac870f18a24c6d580250774815fbc2d1df9b3c3a24823018f00bfb80d2b038a4c1dca32da50824daf558d77d27afe84c2681b348 SHA512 f6c25a3358217c0090a52e076eb138cdd82a349a8f32f1530a6cb1ce02e52acee765ad139244ba7c13c0930eacd7212706bfa00702dc089778e430e53bed6655
-EBUILD github-backup-utils-2.15.0.ebuild 927 BLAKE2B 80a84b7e2b39824b1ca6fb87294670baa9ffd8d4b9d38a522e5084a51e57ca3faf05ddedee7f3102c62cf5f9a7c42a5be99554dad1163065ee26a55af5d8113c SHA512 e6796e02b950114b60a8c3a0ebfea255155eca9bca0307b9d2e385bf6e317936c35082b2ff10013d1e57e38298baf0b9d9adff56cc6b671be30be2dae9423960
-EBUILD github-backup-utils-2.15.1.ebuild 927 BLAKE2B 80a84b7e2b39824b1ca6fb87294670baa9ffd8d4b9d38a522e5084a51e57ca3faf05ddedee7f3102c62cf5f9a7c42a5be99554dad1163065ee26a55af5d8113c SHA512 e6796e02b950114b60a8c3a0ebfea255155eca9bca0307b9d2e385bf6e317936c35082b2ff10013d1e57e38298baf0b9d9adff56cc6b671be30be2dae9423960
-EBUILD github-backup-utils-2.16.1.ebuild 927 BLAKE2B d821f5560d803995f1fc0aaf64d089a1143ffeca24c80126a0abf880777b6bd4b10022ce46543cdcd8cfbf9495d39cd3ae2d0eca9706b20b799ee107c2961fc6 SHA512 bf76aa82dfb0321d3a3ac50135a6d4219ef448d87f19bd3667f23ebccfdb98058ebb8bdf2fff2f95fa1a36452367c4530c2bcd1ab0c31770c3bc29adafc56bb1
-EBUILD github-backup-utils-2.17.0.ebuild 927 BLAKE2B d821f5560d803995f1fc0aaf64d089a1143ffeca24c80126a0abf880777b6bd4b10022ce46543cdcd8cfbf9495d39cd3ae2d0eca9706b20b799ee107c2961fc6 SHA512 bf76aa82dfb0321d3a3ac50135a6d4219ef448d87f19bd3667f23ebccfdb98058ebb8bdf2fff2f95fa1a36452367c4530c2bcd1ab0c31770c3bc29adafc56bb1
-EBUILD github-backup-utils-2.18.0.ebuild 927 BLAKE2B 56e418957d079048accd33270485da74ed1ed4a22bc31e108ea7395c86a255ff56f626834c309775ff14ab128cff67d898226b197a02c52f5fdfe47e37333246 SHA512 f38d669f7e2c29e2df5a4e54503b3abf7d91a849d594078ac8b72356b740162f9d7ff84d83defe6309b7d3e3bf8c7b6b1c1f2a6a963884329f345927482e583f
+DIST github-backup-utils-2.19.1.tar.gz 90260 BLAKE2B 403feca60cc6037a2fbcb4cc467520fb3283916fdc78e16e960656b695e1c55341c55e74fe246c56fbc2cd86a85e33bcede4d94132adaa446ea48ed8f3f75022 SHA512 60155021d23eadc5ab1ddcadf95dbab43f19456c0e7ef34e93c75d173c1279b354c7019b304d72cabcac674edbd0c4a0c4e50c08606a8559ea662858a9cdb206
+EBUILD github-backup-utils-2.10.0-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
+EBUILD github-backup-utils-2.10.0.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
+EBUILD github-backup-utils-2.11.0-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
+EBUILD github-backup-utils-2.11.0.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
+EBUILD github-backup-utils-2.11.1-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
+EBUILD github-backup-utils-2.11.1.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
+EBUILD github-backup-utils-2.11.2-r1.ebuild 1189 BLAKE2B d1040c5352625c7bda8e648fa8736350844b3d348c27957a422bde12f0b30209cf9a8d4ccc74d8109bd23195be21fafb26dcd725c88ac46f1c2e4845f1cc29a6 SHA512 222906a50c189fbee239cc275862ba8246406db19e598318eb3aea6682dfa0305d15f33e2b1aa0f954caf9934e5621b6331282b19925f05ce788c36ed578b891
+EBUILD github-backup-utils-2.11.2.ebuild 917 BLAKE2B eb55636ddd3cd5b6714cfe9e14396a8a88390a02c97216334caf270a9380420d34daac60a9646376c60eedf756f7362e04e3bd29a53a099e6eb82969433100a3 SHA512 7f7aa3fbd8ce979d09e478010e020c9895750fb9aed48467c75203a0447cf37244fc7ddd716da8eb7598d02e71b8f11b5eafd294cc0faf5ad36e11bbdef2d64c
+EBUILD github-backup-utils-2.13.0.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
+EBUILD github-backup-utils-2.13.2.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
+EBUILD github-backup-utils-2.14.2.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
+EBUILD github-backup-utils-2.15.0.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
+EBUILD github-backup-utils-2.15.1.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
+EBUILD github-backup-utils-2.16.1.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
+EBUILD github-backup-utils-2.17.0.ebuild 954 BLAKE2B 39acbf8eefaa8f233804e5c0c5d5676f905b56208001082dfe3dde98d04a097c0c75e5f062d1ec30cedbeda82d67735ead281ed2603b170cc01efb74e772a5d7 SHA512 6473e787118dc0730bd3c652f704becd5392900a151423ab7c2b2f879bb72dbcf229a5271c13a739e6a6d1224e05ef93c834f109574d971f7c2a54abdcff054a
+EBUILD github-backup-utils-2.18.0.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
+EBUILD github-backup-utils-2.19.1.ebuild 954 BLAKE2B 6791c971fe2bfaa686999bb23e699b10936deca9dabaa8f1c7afe22c01580886e7bc4292e83b5dfa9f8157d0bdf527256d4cd375c9faeac8d675966cc656e35f SHA512 f4bceb07d36274416d929b17b8813c7fafae33279c218c5a9bcb6f8a6f3e5c231ce4ec20b39488b11296550e9cdf3440b96623945bb2e1e6b36758f73c9b532c
 MISC metadata.xml 448 BLAKE2B 8f3322a1e551345100a70421c1fcd9d56b8750e425ab6e579ceab918858df09c6aec520898d1897066596df231f983b3384441e7edc9e8350ac19ebd3d69462c SHA512 ae28e31312c3dba5d71fd4bd6c7ed6adc171a250473d09a6646d13de2cdc0d78ff4b1ca389c04717b789d500e7c269d49aef32a785ab4bdbc073c30bffa5eba7
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
index ffe55dede38c..fb7dd4be7234 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
index 586f3c415df5..c7f2534ca0c2 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
index ffe55dede38c..fb7dd4be7234 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
index 586f3c415df5..c7f2534ca0c2 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
index ffe55dede38c..fb7dd4be7234 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
index 586f3c415df5..c7f2534ca0c2 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
index ffe55dede38c..fb7dd4be7234 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild
index 586f3c415df5..c7f2534ca0c2 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild
index ef2c730c8778..28f539a9db37 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild
index ef2c730c8778..28f539a9db37 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild
index ef2c730c8778..28f539a9db37 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.14.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild
index bc589b56f9aa..28f539a9db37 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.15.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.15.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
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild
index bc589b56f9aa..28f539a9db37 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.15.1.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,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild
index 0bef08b2f3d8..28f539a9db37 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.16.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild
index 0bef08b2f3d8..28f539a9db37 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.17.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild
index e88453feb7e0..9a251dd782d8 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? (
 	dev-util/checkbashisms
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.19.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.19.1.ebuild
new file mode 100644
index 000000000000..9a251dd782d8
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.19.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	sys-apps/moreutils
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+
+dodoc -r docs/*
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/gixy/Manifest b/app-admin/gixy/Manifest
index ec3522184179..70c38db7bb0f 100644
--- a/app-admin/gixy/Manifest
+++ b/app-admin/gixy/Manifest
@@ -1,3 +1,3 @@
 DIST gixy-0.1.20.tar.gz 710691 BLAKE2B 09043925d950a9a35de4df91ef3c2f9e5ca4458227320555a109e50d0838fb10ae22d086cdfc39c0d76bcd051c1a7e1d5e291354cc457cff398be8d164cbfde6 SHA512 d666e758c2746c201a11b67b4b99cee1bd3406085eb1c0aa9ae520b72d3a1273e09e3475226a6e54fbfbcefe65b3be0fc877e66cbaa81f384f757767852bc08e
-EBUILD gixy-0.1.20.ebuild 967 BLAKE2B 158d4ee112fd46ee9abb7ba5d5d29a596193b898373a2bf2b49277079ffefa8df733d92f48af904db1fb5a478478c91614110395dfff631b4ef662da9f421f69 SHA512 0cd185ae489e58958935c04e19228f1de330e9ddedd1af862db5a1a8c62a100d0a6662695ee63eb748b9cd82468d5d559fccdc49f0b7b2f92e68d9d3bf30ef6d
+EBUILD gixy-0.1.20.ebuild 994 BLAKE2B cfaf2ebd94a13e53a770ddf5cdf39245f9150854d7a6ad7760b847cd71e9dfff6178c8a89deb850c1d1fd03c055217107e5253c98f5b3a6c101d369a171734aa SHA512 614c10331d06e950a1bb0906d8deb8c7a503b8abd257eed8605eb5a5972859105087ad4837aa390152b0487ed75b7a222e50f57f62eb26b5603d7f12aad51767
 MISC metadata.xml 248 BLAKE2B f2e59d4d05a017ebeeed31b36a72a279974f8fa64886873d23671f1fa91bcf3152acf9652624f2b1a2f5d9524bb24ec7dab734ce43e8cb6475ccfef67af40697 SHA512 c0d402a47544d8f31d1fc9f23fef5d84bf000f2a9a8a07c8b23899306818152aa71844f1d9310e0c32a354189be1f53ae8c89cde90464176ab9b861e62084822
diff --git a/app-admin/gixy/gixy-0.1.20.ebuild b/app-admin/gixy/gixy-0.1.20.ebuild
index d56ff0091eef..a517bd4fad8e 100644
--- a/app-admin/gixy/gixy-0.1.20.ebuild
+++ b/app-admin/gixy/gixy-0.1.20.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"
@@ -16,6 +16,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
 	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index ee5b3841c917..d0298c3c1696 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -4,7 +4,7 @@ DIST glance-18.0.0.tar.gz 1987182 BLAKE2B 1e30d1897b360a8691e79e5e4eda290148146d
 DIST glance-19.0.0.tar.gz 1942312 BLAKE2B b4b3e6cd86385dfe19d4a3b2e9c900006aed984457da71433ea1608b177702f1f0cc5c5057f475f7c0024d18fd196b48a774514511534cf6d325d5c9ccc1cb2d SHA512 7c72f988f2baebd6af17cd7de8e5daaa0ec889d8f210e3bb5cf45bd4d9296b45f1dd2dbbd1709705d0e2b6203bad60faaa11a56328124d47b95328b6678827a6
 EBUILD glance-17.0.0.ebuild 4933 BLAKE2B c13548031d58d2009e6cd38721ce97c966ac4e26ebba60bee1047115de63978d51ffa154d1b7ca6f929b95c0faf988f10387c025bb3e200b7f356407933d1f5f SHA512 e279c6c8a4c225c3c82c6d4d0e42c445016d18ac30ed7b36402462c6b2d7028eedbd117574191ff383a532dcf9db34a261c9e3df9c3f8a590073df4bdecf4c1a
 EBUILD glance-18.0.0.ebuild 5064 BLAKE2B 9853b05b91e6698cff58658ce9bcaab04fe188d25b3dbac8f52e9054d667482fc0dde4ebdc6d703a4bfcd4d566e928e0d33517cbf9204ea4e03ae4f2137b574a SHA512 994297106d3ed31c1d81c82a6c18eb0aa1ce1838bac168be2007a0c2da5dc71b02dc4f0f2e033b5ae2249c3bbc17246f90e950b4dbdad784a73f69b40b206090
-EBUILD glance-19.0.0.ebuild 5207 BLAKE2B 4b03352ba0db6877180ba9fa0de0e53208c59aee13c7a6fc91f838d509c1d8b400af69ce2209a3504f9afa33d6421c188a6a1810b82bbe2ae56b6f5bd52edda0 SHA512 6c1f6ff8b1f173bc936dba53e6fe28876469fca72df61fc7dff43646b13d0cbf2c00554f51efd3261888eac47aa7b865b808b1a3585a878531062b759b440ffb
+EBUILD glance-19.0.0.ebuild 5205 BLAKE2B ff6e2aa0a084451b2095975114bdbc344eb76141886f57ea2b801719de189b278a76a3cc2545fd1a9d8019a651bff357bdf7e4b5967205e1ad25ef531f4b05f1 SHA512 c1630713694c6a99792d63c36d3a34d4c5fdc7b4c1c5248216b32cececc2da9f6458775b9b11def48bd29c775422793f8152cd9291ec423ece6ac4dc99ce37f9
 EBUILD glance-2018.2.9999.ebuild 4935 BLAKE2B ee851e3b85ac17acfd1c4bd17872ad5d4fc244b5bd674a679893e2d1cff0c6037e1f8503cb8cbdc24c577ca5f31ebac6164908433c4973f755bd8525672432ea SHA512 12ead5e77d22134e34e3b25408e7ddb2914e5cd027b4ede10a25cf5e258e16bee75ce897ce0abf0f4218525b00b8281e8b60e18926dfcd416186f445bf6ba7b5
 EBUILD glance-2019.1.9999.ebuild 5107 BLAKE2B fca67661ccc03db0279824d6352afd1d20103bbbb1e946eef4114d996f395bdbfbf152e88137c88d12961415d1d8136888037709f47f50cf1ed3f7dfe82d658b SHA512 888b1ca0843323152ffaee1e8a5b71ec2d327f58014559e4d77caed27137ba74ade854b8afab06c8bfeb578c1204d9f8a5a09da5bcfe5873b016aabe8499fcc7
 EBUILD glance-2019.2.9999.ebuild 5207 BLAKE2B 4b03352ba0db6877180ba9fa0de0e53208c59aee13c7a6fc91f838d509c1d8b400af69ce2209a3504f9afa33d6421c188a6a1810b82bbe2ae56b6f5bd52edda0 SHA512 6c1f6ff8b1f173bc936dba53e6fe28876469fca72df61fc7dff43646b13d0cbf2c00554f51efd3261888eac47aa7b865b808b1a3585a878531062b759b440ffb
diff --git a/app-admin/glance/glance-19.0.0.ebuild b/app-admin/glance/glance-19.0.0.ebuild
index 11dd58856231..918202c492b8 100644
--- a/app-admin/glance/glance-19.0.0.ebuild
+++ b/app-admin/glance/glance-19.0.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="stable/train"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/go-updater/Manifest b/app-admin/go-updater/Manifest
index d6f832b0260a..fb04fd37753b 100644
--- a/app-admin/go-updater/Manifest
+++ b/app-admin/go-updater/Manifest
@@ -1,5 +1,3 @@
-DIST go-updater-0.1.0.tar.gz 1754 BLAKE2B 720a328e8f28d2f0b28400053776ff8dbe52e24be7b20812d01b148bde72eda948acb5867b8ca16af7b40d20e36d36d3ffbd846c4992bb1dbe2af6db0069e765 SHA512 321f7faaec62b653c2b01f6f2e2c0104b536e63dfeb6aacd72c493d3fdc7b3bc5b96d6eff02ec1603adde1879dacbd51f4ced37c3cd94361120cc482432cb8a5
 DIST go-updater-0.2.0.tar.gz 2183 BLAKE2B 0afdd1442916a1def1de4d45eb3cb89c5634b275912b7c8c451ecd6b911e82ad5e8a9715e39404c4d3eb006e7b1822c9f23d02e871379f66536bc5eff15c2f05 SHA512 9c81ded9cdbb825872e0224634f7876a598086870a101e8c2f70fbebcfff964d4ff2f0778607c2110dad1a08160628a8943e9ac902df0b6cd70a58d5ca9e6dca
-EBUILD go-updater-0.1.0.ebuild 484 BLAKE2B 7a8413ef6a49557411bd98527880b63bd1e06ab26b3da010dbc02105de4216cf697e428d9e6d60181872a7279dd428689424363bd9a85d916b1d5b15521303ae SHA512 ffaf2957d335ebde1c981d0593d0f239740fbc155d5f28b8fd744a3c1ab193bbf6cb1ce35d5beea40ffe45a5461582be38d7c336ec235b1026cc1dd2e3f269a4
 EBUILD go-updater-0.2.0.ebuild 484 BLAKE2B 7a8413ef6a49557411bd98527880b63bd1e06ab26b3da010dbc02105de4216cf697e428d9e6d60181872a7279dd428689424363bd9a85d916b1d5b15521303ae SHA512 ffaf2957d335ebde1c981d0593d0f239740fbc155d5f28b8fd744a3c1ab193bbf6cb1ce35d5beea40ffe45a5461582be38d7c336ec235b1026cc1dd2e3f269a4
-MISC metadata.xml 326 BLAKE2B 6da205ed08b301f995aefb59116b618e24495abd172c9a152acb99d9d3e118500c9c3e55a5abb8987f33bb7d334516fa1595829e35ca9835df6622b4318d8a88 SHA512 55cfe9cb2c45438ace6fa2915828d032dfb377af270f024d78008bf5912e2527d88662f79b4b6aedbe2e9870cb52262b25624a4c598f94c4e0e4cb9f649aec92
+MISC metadata.xml 248 BLAKE2B e2e3af57757842f18124332bf8a206356aa3f66d243354fed63146cacd28424880f2e95296c1123377704265d2843ca3524b0e740580d15eceb81a2406ae595a SHA512 671b9f4bc5e748ae306d358288487ad0887e5b1a620136376b73bb517ccf1fb5c96d8270d9b1abebae8982281614f93c3e83b0355da64fe78924f601c8cf00cf
diff --git a/app-admin/go-updater/go-updater-0.1.0.ebuild b/app-admin/go-updater/go-updater-0.1.0.ebuild
deleted file mode 100644
index 78dc6698a598..000000000000
--- a/app-admin/go-updater/go-updater-0.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Checks if Gentoo go packages are compiled with the system's golang version"
-HOMEPAGE="https://github.com/mrueg/go-updater"
-SRC_URI="https://github.com/mrueg/go-updater/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-go/goversion"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README.md
-}
diff --git a/app-admin/go-updater/metadata.xml b/app-admin/go-updater/metadata.xml
index f2eeaac7c70e..55bea4d45c86 100644
--- a/app-admin/go-updater/metadata.xml
+++ b/app-admin/go-updater/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">mrueg/go-updater</remote-id>
 	</upstream>
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index f2b7b402313c..60388059270c 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -1,6 +1,3 @@
-AUX gopass-1.8.4-xc-tests.patch 923 BLAKE2B 67c00d9d0d983dbb0e3f8a7e78c895dc645d1ce0e4eed2e726871d5fa35086cba10872452b76fa0ffb65ff89f3ad25c9f726141221d1dd3f11086690697da0a1 SHA512 a80ce382b9e35af43a7ddeaa7a863e73d7960e37337b66d558dfc1840a7b113767eacbb6225bbbc2f3dd581b33c0f4a9a03105a08340a9abed4768baa4c32648
-DIST gopass-1.8.5.tar.gz 6561060 BLAKE2B 99d5ba9d5aed396eb4747461b64285d37544e7deaeb7ee7ebd6e3298a8746cdacbae4aa573d87d324703751d5a78efad2735954d8e2a2a8b53549985a4a9952a SHA512 1f451b10aa87141de635650489bf7227c252e10e5139dad274c95d5625db74fec0b8892a468800d3d3c5dd8b3d64f1c93bd6c75a0ba54fe5f6e630c77b2c6c71
 DIST gopass-1.8.6.tar.gz 7072723 BLAKE2B 5ae883c54f8180f8b6da870bd99710f1c740afe9de193c127a3047fa1211641b94ab98e23148d83c6d5b2cd2e3275f644dc875d106c9267e7e0c6342bf0b9a46 SHA512 7acdb095cf8913954044c3206eab020f197542334798c6b94724709c3953b12f7e5b73ce8c1aa4bfd5df3acf1f424b64bfa94f9a8f68fa7116ed14c8a0f2e6f0
-EBUILD gopass-1.8.5.ebuild 1095 BLAKE2B ce53235ad3e59da78f578b2388372ce67131e66f5a55d444088cc41d261f9d311e04e1372accb5936d359a4871c1c54d0a90166d231b53665567dd99c9e4ee6b SHA512 f798a8efec8122f9dbbf1d3558123e13709dde9e33819ea0179ea2f407f0634e3c17fd6ffd7766c3cadcf36a9cea51ce2baccece160fba0302334d1a3b1d06db
-EBUILD gopass-1.8.6.ebuild 1041 BLAKE2B 04d26bf816ad93d9267177e12b3d86ef6f383a5c73ab9548d098b39b92ffa205e5a7924fb91bacd5f6510bb4475bec8a087ff095a5dcdb1578acdaa8c94914df SHA512 d73ae1d48ce585ae27abdec5ad52f1e95c6b9917fd5831c683765becf50565df5fe14380179f5f7027f9945d89e6fa60d6b7d9b2f562d09588885530705acd34
-MISC metadata.xml 326 BLAKE2B fbff56ecc7a4bd866c1220fc218f9233ed0660b04cde03047df5db992557bf5d20f518815dc15eba2a22f6b2b8cc4eb5ed1c0f2cc2753e18ce4cafd59b768637 SHA512 2d43a58c7997bd539d9aa5659fe7cfcd947c97c49d31dea4ee1230b06b0ae2c8cef4fb228b889968f65c36693d5befa76828da3644bea0852ead709bbf7d760c
+EBUILD gopass-1.8.6-r1.ebuild 1068 BLAKE2B 11cfbbeb943ad9ed42bd9e16ff230d49ff40759e241d6a60ccf57b31a4bf455dfb4ff954e31fbfcf06ce242e5776ddff100b604448eed80986bd63c472680fdc SHA512 f9a71715b209b88157c72591a30f3d385f14d6e3456324a75cdcfc1e9e9e9f795f65482f7b3ec45b9691af88d756fd71646a4bf7e0c4855415843663d9c1e78a
+MISC metadata.xml 327 BLAKE2B d3ea7ba02c3484c31b58d8c8e1b1b5a064eff597c42add7bcd720d818d90ae107a9f72292fafc6c059995118d96204e8f8f2ed82856dcc0e1061c2eca81aab54 SHA512 7c7bb9cd28275bb75bb0e71da2dee86f7a32340908e59359d330b03fd07ba8569226775101a92032b06fac1ba0327ca6cb57c5ecf6b6c3c1a0319b3259bda38c
diff --git a/app-admin/gopass/files/gopass-1.8.4-xc-tests.patch b/app-admin/gopass/files/gopass-1.8.4-xc-tests.patch
deleted file mode 100644
index 5780f17bf347..000000000000
--- a/app-admin/gopass/files/gopass-1.8.4-xc-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Skip xc cli tests, 1.8.3 failed when run with no arguments for these commands
-but 1.8.4 doesn't.
-
---- gopass-1.8.4/src/github.com/gopasspw/gopass/commands_test.go
-+++ gopass-1.8.4/src/github.com/gopasspw/gopass/commands_test.go
-@@ -55,14 +55,14 @@
- 	".templates.remove":      {},
- 	".templates.show":        {},
- 	".unclip":                {},
--	".xc.decrypt":            {},
--	".xc.encrypt":            {},
--	".xc.export":             {},
--	".xc.export-private-key": {},
--	".xc.generate":           {},
--	".xc.import":             {},
--	".xc.import-private-key": {},
--	".xc.remove":             {},
-+	// ".xc.decrypt":            {},
-+	// ".xc.encrypt":            {},
-+	// ".xc.export":             {},
-+	// ".xc.export-private-key": {},
-+	// ".xc.generate":           {},
-+	// ".xc.import":             {},
-+	// ".xc.import-private-key": {},
-+	// ".xc.remove":             {},
- }
- 
- func TestGetCommands(t *testing.T) {
diff --git a/app-admin/gopass/gopass-1.8.5.ebuild b/app-admin/gopass/gopass-1.8.5.ebuild
deleted file mode 100644
index 108b80c18f66..000000000000
--- a/app-admin/gopass/gopass-1.8.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/gopasspw/gopass"
-
-inherit golang-vcs-snapshot golang-build bash-completion-r1
-
-DESCRIPTION="a simple but powerful password manager for the terminal"
-HOMEPAGE="https://www.gopass.pw/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.4-xc-tests.patch )
-
-src_install() {
-	dobin gopass
-
-	local DOCS=( src/${EGO_PN}/{CHANGELOG,CONTRIBUTING}.md src/${EGO_PN}/docs/*.md )
-	einstalldocs
-
-	# install fish completion
-	./gopass completion fish > "${T}"/${PN}.fish || die
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${T}"/${PN}.fish
-
-	# install bash completion
-	./gopass completion bash > "${T}"/${PN} || die
-	dobashcomp "${T}"/${PN}
-
-	# install zsh completion
-	./gopass completion zsh > "${T}"/${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins "${T}"/${PN}.zsh _${PN}
-}
diff --git a/app-admin/gopass/gopass-1.8.6.ebuild b/app-admin/gopass/gopass-1.8.6-r1.ebuild
index 5ca88b63636f..76181e91d2fc 100644
--- a/app-admin/gopass/gopass-1.8.6.ebuild
+++ b/app-admin/gopass/gopass-1.8.6-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 EGO_PN="github.com/gopasspw/gopass"
 
 inherit golang-vcs-snapshot golang-build bash-completion-r1
@@ -10,9 +10,9 @@ DESCRIPTION="a simple but powerful password manager for the terminal"
 HOMEPAGE="https://www.gopass.pw/"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=dev-lang/go-1.11"
diff --git a/app-admin/gopass/metadata.xml b/app-admin/gopass/metadata.xml
index 06eb97b4a0f0..9dce670d8f3f 100644
--- a/app-admin/gopass/metadata.xml
+++ b/app-admin/gopass/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
+		<name>Mikle Kolyada</name>
+		<email>zlogene@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">gopasspw/gopass</remote-id>
diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
new file mode 100644
index 000000000000..c89797fca928
--- /dev/null
+++ b/app-admin/graylog/Manifest
@@ -0,0 +1,9 @@
+AUX confd-r2 542 BLAKE2B 83a8b2a3bf1fc60a2a9475d823efe39febb961d0aaee12b7b18f1d2752427e401fe2f68c83f777fba1d2f585540f4d9b422befcc959aa082a26eeef2be093b2b SHA512 fde38b6813f40633db5d5cbcb3d93fd17e8705d6f2c5805fdc900858fe2b0cf0c0c219345dc741cc2573b1f80b42fdf5714e71fa31938329355556503492bbb8
+AUX graylog.confd 521 BLAKE2B b776c8c834358a426aab6e67b894ab3fc8e07b5d6d24f506312f41e76ea36bd39398d1eb424cf9f3fff633a26acb8af54dccd4a19642b55bf18d91fe92aff31c SHA512 3d8c3b6128f839809f14c7a1f2683ed5ac273efbabb1e0f50a2e9e90ef6c7cdc481bd84ef3372bf10f288b08f2b850a80d917838e057545851d3113c8f877512
+AUX graylog.initd 825 BLAKE2B bfcd79f71d996ca1761a79119f8ca29e531dbd9a40411c0c13b0628ebb8caea6c69e72adb3102369ffe41721acfef5ba2656689fd10ee0cae591291e9d20cd1e SHA512 e55477329fe5045b85451abd695d13cb6d67cf0b75f0f786503c6fba850d0cae9e853fb976dae35e65f570fda625bc8984714a0cdd6c23801c917184dc5a32f2
+AUX initd-r2 872 BLAKE2B 500a428a0f479dc79b1d8b7d6a1acfafe9a205a65adfacd10aa6f5e89c105c30e095e69799acd8739d9ed2b7dee0ed6d053497a74495a986b6d9b24122c29a75 SHA512 43632bd345bb3772018ce1fe32a97c85a1ad812dca2ae229dccb65302e686597dad4b62ecbc0cc5358c34761f354d51de2c9fe81bd3db71af5fdc0a6cbc0e95e
+DIST graylog-2.5.1.tgz 123878927 BLAKE2B d168579be4d20e3a8081d608247e7101fc5d99ddd2b5f063f94d7e91d4095c6bd016a4bc1be0f0e08b5043b771070312286404ece5eacc51e4a8730dfc13dab1 SHA512 44e2ca00e47a34708cea94b74fdc0f56f3a381f161d25633bdf7685fbcd989937163508f8b47b0869c7daacec6c8bd2c874f9381e196ffb3194eb6e3f96b3ce9
+DIST graylog-3.1.3.tgz 120983897 BLAKE2B 68e1dd7b8de7ab9fb12fd2035bcf6f0901d8d9f5083ff8efef09736819ccd70ae4dd6f466cf2fa1eaebb24b4098a26d72524f9b9a47e8dd62d0224bad189bb62 SHA512 8eec2339db474b89fc717e693ec23ca32d9a018f9bb924aab895d1a1f4e90afa9fe9547e432d13b9d0bf5831f8772763f19de41ac66f3e09ebf7e96ebd6cbccf
+EBUILD graylog-2.5.1.ebuild 2292 BLAKE2B 6445d3b665015da099c6eb2bae405159fbb6e176307115553d84bbecf52ab56a466fc16a53ea95d10d3588b2eaddb6f8f5dd7ffe8f60276a9fa14a2de2042f38 SHA512 040ff5ccccd24be6cb2d9c13caaa8d72fbbbd4582d079cf04d9e174b6bbbb2f770076ebaeb0bf20b72c3d8c9645eba878752892dd5cdb2614be2bee1b09c6114
+EBUILD graylog-3.1.3.ebuild 2253 BLAKE2B 4e460d732415ce33f104cfdd2371f0a3975659183482a84a1b1f846552a7d13b330b4c6c188f0f3d6678ed7fbc1d03797e6b0bb070206aef6432e86ddf80d589 SHA512 f3398f5debe254150a0e1dfab2a1a3316a4aa8eb16591bebd4526bba4c057425cacebbaa7cbc34c6bb36471cd8464a3063fbae28b17dc295b8020191232f4c74
+MISC metadata.xml 584 BLAKE2B d19e09582932c7986c85059766f2a845c0e85d214b9af6c61d9c26005e31c208a8ab59e6d82e5870162314c2cb4a9d3e852f12c02551d399c1eb3063449501bb SHA512 c32525442e20550c7e3b0ac8b74d896f35b2de1e87d57befb152047840bf4811c8df135f828b1c95505b4a348f25478cd7b2b186c36f93c6055086437f257505
diff --git a/app-admin/graylog2/files/confd-r2 b/app-admin/graylog/files/confd-r2
index 97eac6ac77fa..97eac6ac77fa 100644
--- a/app-admin/graylog2/files/confd-r2
+++ b/app-admin/graylog/files/confd-r2
diff --git a/app-admin/graylog/files/graylog.confd b/app-admin/graylog/files/graylog.confd
new file mode 100644
index 000000000000..f9c2230c0a00
--- /dev/null
+++ b/app-admin/graylog/files/graylog.confd
@@ -0,0 +1,12 @@
+GRAYLOG_CONFIG_FILE="/etc/graylog/graylog.conf"
+GRAYLOG_DATA_DIR="/var/lib/graylog"
+GRAYLOG_GROUP="graylog"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog"
+GRAYLOG_LOG_DIR="/var/log/graylog"
+GRAYLOG_OPTIONS=""
+GRAYLOG_USER="graylog"
+
+JAVA_OPTS="-Djava.library.path=$GRAYLOG_INSTALL_DIR/lib/sigar -Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:-OmitStackTraceInFastThrow"
+
+# Please adjust according to your bind address
+rc_need="net.lo"
diff --git a/app-admin/graylog/files/graylog.initd b/app-admin/graylog/files/graylog.initd
new file mode 100644
index 000000000000..d17267e9df22
--- /dev/null
+++ b/app-admin/graylog/files/graylog.initd
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/java"
+command_args="${JAVA_OPTS} -jar ${GRAYLOG_INSTALL_DIR}/graylog.jar server -f ${GRAYLOG_CONFIG_FILE} --no-pid-file ${GRAYLOG_OPTIONS}"
+command_background="true"
+command_user="${GRAYLOG_USER}:${GRAYLOG_GROUP}"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+output_log="${GRAYLOG_LOG_DIR}/graylog.stdout.log"
+error_log="${GRAYLOG_LOG_DIR}/graylog.stderr.log"
+directory="${GRAYLOG_INSTALL_DIR}"
+required_files="${GRAYLOG_CONFIG_FILE}"
+
+depend() {
+	use dns
+}
+
+start_pre() {
+	local d
+	for d in \
+		"${GRAYLOG_DATA_DIR}" \
+		"${GRAYLOG_DATA_DIR}/data" \
+		"${GRAYLOG_DATA_DIR}/data/journal" \
+		"${GRAYLOG_LOG_DIR}"; do
+
+		checkpath -d -o "${GRAYLOG_USER}":"${GRAYLOG_GROUP}" -m750 "${d}"
+	done
+}
diff --git a/app-admin/graylog2/files/initd-r2 b/app-admin/graylog/files/initd-r2
index c6177eef41d0..c6177eef41d0 100644
--- a/app-admin/graylog2/files/initd-r2
+++ b/app-admin/graylog/files/initd-r2
diff --git a/app-admin/graylog2/graylog2-2.5.1.ebuild b/app-admin/graylog/graylog-2.5.1.ebuild
index b045b60179ec..b045b60179ec 100644
--- a/app-admin/graylog2/graylog2-2.5.1.ebuild
+++ b/app-admin/graylog/graylog-2.5.1.ebuild
diff --git a/app-admin/graylog2/graylog2-2.4.6.ebuild b/app-admin/graylog/graylog-3.1.3.ebuild
index 2e0a76b5fd9d..632bb8a67fbe 100644
--- a/app-admin/graylog2/graylog2-2.4.6.ebuild
+++ b/app-admin/graylog/graylog-3.1.3.ebuild
@@ -1,36 +1,30 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit user
+EAPI=7
 
 DESCRIPTION="Free and open source log management"
 HOMEPAGE="https://www.graylog.org"
-SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
+SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 RESTRICT="strip"
 
-RDEPEND="virtual/jdk:1.8"
+RDEPEND="!app-admin/graylog2
+	acct-group/graylog
+	acct-user/graylog
+	>=virtual/jdk-1.8"
 
 DOCS=(
 	COPYING README.markdown UPGRADING.rst
 )
 
-GRAYLOG_DATA_DIR="/var/lib/graylog2"
-GRAYLOG_INSTALL_DIR="/usr/share/graylog2"
+GRAYLOG_DATA_DIR="/var/lib/graylog"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog"
 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
 
@@ -57,31 +51,33 @@ src_prepare() {
 
 	# 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" \
+		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
 		graylog.conf.example || die
 }
 
 src_install() {
 	default
 
-	insinto /etc/graylog2
+	insinto /etc/graylog
 	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
+	keepdir "${GRAYLOG_DATA_DIR}"
+
+	newconfd "${FILESDIR}/graylog.confd" graylog
+	newinitd "${FILESDIR}/graylog.initd" graylog
 }
 
 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"
+	ewarn "/etc/conf.d/graylog"
+	ewarn
+	ewarn "Graylog requires Java >= 8"
+	ewarn "Elasticsearch 5.x or 6.x (does NOT work with 7.x)"
+	ewarn "and MongoDB 3.6 or 4.0 (does NOT work with 4.2)"
 }
diff --git a/app-admin/graylog/metadata.xml b/app-admin/graylog/metadata.xml
new file mode 100644
index 000000000000..84ba1f113f4d
--- /dev/null
+++ b/app-admin/graylog/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>hydrapolic@gmail.com</email>
+    <name>Tomáš Mózes</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">graylog2/graylog2-server</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/graylog2/Manifest b/app-admin/graylog2/Manifest
deleted file mode 100644
index 407c4e40ba4e..000000000000
--- a/app-admin/graylog2/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-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 2290 BLAKE2B 2db2192e136749e213b1c5d2a90851bd6e325d9506279d55425586f73acb3c2a241e78692c2aa1528c0f80efc8e3bf080e53a2b6e031ed6091df96b98255359b SHA512 25c1f3f56c61631177f928907d251f0bdcee65651645d49cf22e06c99dcc3976d2025e71113251aa6891bde963cc38b7927a71af284130faa97d6de0fe1843a4
-EBUILD graylog2-2.5.1.ebuild 2292 BLAKE2B 6445d3b665015da099c6eb2bae405159fbb6e176307115553d84bbecf52ab56a466fc16a53ea95d10d3588b2eaddb6f8f5dd7ffe8f60276a9fa14a2de2042f38 SHA512 040ff5ccccd24be6cb2d9c13caaa8d72fbbbd4582d079cf04d9e174b6bbbb2f770076ebaeb0bf20b72c3d8c9645eba878752892dd5cdb2614be2bee1b09c6114
-MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
diff --git a/app-admin/graylog2/metadata.xml b/app-admin/graylog2/metadata.xml
deleted file mode 100644
index 5087760546f6..000000000000
--- a/app-admin/graylog2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-admin/hardening-check/Manifest b/app-admin/hardening-check/Manifest
deleted file mode 100644
index 194e328e60b2..000000000000
--- a/app-admin/hardening-check/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST hardening-wrapper_2.5.tar.gz 21157 BLAKE2B 9976de519667e3816be0ccee446dd81ed67beb331e59badfceed61bdb323644af502d3b280c70b0ec3638569cfda751dd68ebd4ca23f4cf09ce170d300ea0751 SHA512 e2c183736e9f1dd1b39ecde7d2bf2c22d4c87c69cb158d98bb527b8325d88ea86bceb6087633cc761e973a22d0cf97c6266464d117e408ed2aee2e67c8ab5565
-DIST hardening-wrapper_2.6.tar.xz 19436 BLAKE2B 61b04985f1511470640f1631af3d95613a5f9ff843b95fa53557cc183ff1e3be384c2af473f5c936697b7c70a573ab6b32c6a36d62ef9298729c079c95f4d7ee SHA512 924d9d816148bc5f2d25d66fd24c7b2a77fef8d62eb7656d4c9b0ee50c767789f25aaa3b776138103682366ff7c2266be4a207d4b11361655b5097131033283e
-DIST hardening-wrapper_2.7.tar.xz 19604 BLAKE2B fc6e17867708f9ecd5d430035f5142ae7a42d525adbe55bfc14c3cad767b0fed86df00c2a8e1c5099e1320167aa1ba7454c1dbca1210b431841e191f0be3392d SHA512 834242b28e06f32d6e899f13fcfc66f560e4137267f8cb46fab21337240fec612ea2803345012308af50c0fc4af92f52a28a18803ba330998ad7cb1321023121
-EBUILD hardening-check-2.5.ebuild 556 BLAKE2B efc8969e237ad22dd969666f2dcf71c8dbac9c92b6cd2ba6816f05e3de3f0cdeaefe8308111f0888ffa1f9880817c04f74016498fe84f97b994950885a068e0e SHA512 5694da1316e087986930237f4fd5e752768be07235f6c9c2fc4c95ed89514588a9773fe374225ea4216c3a493172823fb3b9e05478e8a5f0f36203834ca2ac55
-EBUILD hardening-check-2.6.ebuild 571 BLAKE2B efbd82f61d84c70e17b7be358b1798c57500f2cb0b30914ebdaf1ed76e18c2066cba53ff9e8155658e3c09e7875727dab960f302b163e9b5f56c1e8f3e8ead9f SHA512 9a34d79a769ce49efdbc448d0c6daa65ee118ff335c8cf774e058291a14871fdc8d44283c53da9ad4db6888be5b5552d7098a9910d895440809c299a6f31401b
-EBUILD hardening-check-2.7.ebuild 588 BLAKE2B 74236a0133aa2a99e6def70fca4fbc89dec13183a3418214ca2e2dd3f40d8d6bc224d7b7c58d304a4abeb722933d6b7d236381034e48c110ed11307843b827e1 SHA512 009c7b2eb86d6ae882c097dde72d9d1ae055db7db3be19a4224d74f0f1d4035c918f68f3b23a5da98b66a06ca6b7133d5ffcb12d5df2da8d92d0bf02c056384a
-MISC metadata.xml 429 BLAKE2B 86726d5832d656d7f1a794571c01da95476a41f39a5b3df953e17b1387255420743064972f43d5ef10fccad23dfe76e206ab6c9f693f78ca1f8d720d19f0cab7 SHA512 f70c83d5ca8dc1582a416cd3ae51c98bbe039d9d0c1ad1e1f2fc70775f8aac89ef1e4b9dddf65525556e6255796e8bcfc16ddb1d9c2fb6f15aedd44053c7cf7b
diff --git a/app-admin/hardening-check/hardening-check-2.5.ebuild b/app-admin/hardening-check/hardening-check-2.5.ebuild
deleted file mode 100644
index d52c84c63f0f..000000000000
--- a/app-admin/hardening-check/hardening-check-2.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PN="hardening-wrapper"
-
-DESCRIPTION="Report the hardening characterists of a set of binaries"
-HOMEPAGE="https://wiki.debian.org/Hardening https://packages.debian.org/source/jessie/hardening-wrapper"
-SRC_URI="mirror://debian/pool/main/h/${MY_PN}/${MY_PN}_${PV}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-LICENSE="GPL-2+"
-SLOT="0"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}"
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.sh ${PN}
-}
diff --git a/app-admin/hardening-check/hardening-check-2.6.ebuild b/app-admin/hardening-check/hardening-check-2.6.ebuild
deleted file mode 100644
index 89d34e65467c..000000000000
--- a/app-admin/hardening-check/hardening-check-2.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PN="hardening-wrapper"
-
-DESCRIPTION="Report the hardening characterists of a set of binaries"
-HOMEPAGE="https://wiki.debian.org/Hardening https://packages.debian.org/source/jessie/hardening-wrapper"
-SRC_URI="mirror://debian/pool/main/h/${MY_PN}/${MY_PN}_${PV}.tar.xz"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-LICENSE="GPL-2+"
-SLOT="0"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}"
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.sh ${PN}
-	dodoc AUTHORS
-}
diff --git a/app-admin/hardening-check/hardening-check-2.7.ebuild b/app-admin/hardening-check/hardening-check-2.7.ebuild
deleted file mode 100644
index 48aab59373bd..000000000000
--- a/app-admin/hardening-check/hardening-check-2.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PN="hardening-wrapper"
-
-DESCRIPTION="Report the hardening characterists of a set of binaries"
-HOMEPAGE="https://wiki.debian.org/Hardening https://packages.debian.org/source/jessie/hardening-wrapper"
-SRC_URI="mirror://debian/pool/main/h/${MY_PN}/${MY_PN}_${PV}.tar.xz"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-LICENSE="GPL-2+"
-SLOT="0"
-
-DEPEND=""
-RDEPEND=""
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.sh ${PN}
-	dodoc AUTHORS
-}
diff --git a/app-admin/hardening-check/metadata.xml b/app-admin/hardening-check/metadata.xml
deleted file mode 100644
index a2db75c7084a..000000000000
--- a/app-admin/hardening-check/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ago@gentoo.org</email>
-		<name>Agostino Sarubbo</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>kees@outflux.net</email>
-		<name>Kees Cook</name>
-		<description>Upstream - please CC on bugs that concerns upstream</description>
-	</maintainer>
-</pkgmetadata>
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index f5f7d2179cfb..7732678fa893 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,5 +1,7 @@
 DIST hcloud-1.12.0.tar.xz 436432 BLAKE2B b1263bfa89cb52d197d51c181b1166db84ae10613e448aea16b7b8a5399214a82025f3282d39ac359712b3ddac2decaeda148d9b392fdcb1f5d4d7dc6aa6a598 SHA512 f557ba4515ed158e9c153db4c6de97fba17123c7128b6fcc2bb58472a54f32e342df44f634c42af06a3160b45af4f1f9c28df001a0922bfdca10ade3b1640368
 DIST hcloud-1.13.0.tar.xz 442896 BLAKE2B 8bf43da9a4db336a1a313cc6a3b10897c18af57a36d9d02cc35e0edd22e0d1f711963056edf8e5b2eb2ee32e4c5d7e3f9685963b0d438e61d338ab27a1641b27 SHA512 1352e688c2c96995539a8f2a30b4893d6ccc3e8f092ff94ceca086ff67f2e6bb26ed3bdf6fa3bb3c9d02d93264f48ff0fac2bfff649ddcc0bc94143fea5c4da6
+DIST hcloud-1.14.0.tar.xz 643088 BLAKE2B e360b06796e718df31b1640d78153a843a17a8d70a27a1771fc264b01b5649aa7b6344feba1d2856348070a74df6731d462f178cb23fdd1ada051c5695e237f2 SHA512 1fc9a776d89ee8c4f00ad71994a55151f1758ddff1083b0bdd24e569200ec996b4502ae7f8ba0fe9700a35c082385fafc817abe04aa0a7e9980b225b92ab8c6b
 EBUILD hcloud-1.12.0.ebuild 553 BLAKE2B 83f94fe447972429f478b2f60df1c2cdac0d67a7886c2aaa1ec9beef7bc932182b386c53c7ab928b19b789bfb839c11a8ecc1729bb6c3a473646df3a8058aa42 SHA512 7030b9b8444d564185eb27682c388d8c078ab9994387e93b415d9083f005063df9ae9d5324e2daf77d54256d1a00a0571730de354e744cbd9e219cd562ef83de
 EBUILD hcloud-1.13.0.ebuild 553 BLAKE2B 83f94fe447972429f478b2f60df1c2cdac0d67a7886c2aaa1ec9beef7bc932182b386c53c7ab928b19b789bfb839c11a8ecc1729bb6c3a473646df3a8058aa42 SHA512 7030b9b8444d564185eb27682c388d8c078ab9994387e93b415d9083f005063df9ae9d5324e2daf77d54256d1a00a0571730de354e744cbd9e219cd562ef83de
+EBUILD hcloud-1.14.0.ebuild 554 BLAKE2B d6f92f687c94a7785a57e5ed3e882444e291a24fe70bf984981060be3bafa92c0a843787125daba62d5a619ab00569262c2e5ee2a01905f4e0fc8bd3ab08550f SHA512 7fbab9e1651f78fdcffb4524ced748a3ead31af2dad6b28d4f7459d0efb9405070137d0fb22dd3bdd0ac1655f254cbf5eda301b9f06542bad8d83914e4173913
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/hcloud/hcloud-1.14.0.ebuild b/app-admin/hcloud/hcloud-1.14.0.ebuild
new file mode 100644
index 000000000000..4367320daaac
--- /dev/null
+++ b/app-admin/hcloud/hcloud-1.14.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A command-line interface for Hetzner Cloud"
+HOMEPAGE="https://github.com/hetznercloud/cli"
+SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+
+src_compile() {
+	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index bf22a7f956b4..e3222215295c 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -1,140 +1,241 @@
+DIST github.com-Azure-go-ansiterm-d6e3b3328b78.tar.gz 20948 BLAKE2B 36ef6d0327a373d105a891d28de4a2e620856c902f5159330d8c316a31e3dab77847c292bd14e3c014203744ebdf0dd1ba1431024a52b55991e87b92a43535f2 SHA512 079dc6400c2dc53d46cad809a1bc7723b43b10939d51624a0aa48d2734f2d44b1621748ef1820843f55c07f233bcf394d2ae63ff356aa22f66df32ca40556e44
 DIST github.com-Azure-go-ansiterm-d6e3b3328b783f23731bc4d058875b0371ff8109.tar.gz 20948 BLAKE2B 36ef6d0327a373d105a891d28de4a2e620856c902f5159330d8c316a31e3dab77847c292bd14e3c014203744ebdf0dd1ba1431024a52b55991e87b92a43535f2 SHA512 079dc6400c2dc53d46cad809a1bc7723b43b10939d51624a0aa48d2734f2d44b1621748ef1820843f55c07f233bcf394d2ae63ff356aa22f66df32ca40556e44
-DIST github.com-Azure-go-autorest-1ffcc8896ef6dfe022d90a4317d866f925cf0f9e.tar.gz 126669 BLAKE2B 89aff22041db05db8a8fce99d766852b4f7a9089fee6124757c661b5bdf430cf5fa2ed82af454a2b0e053c738919723e2d6818157ea55b9ea62edd6621dcf4fc SHA512 93652d5fb472b2e752f82fded6402ddc856a9755bc2686ec74d3a414191f07593a847a0faf44e520ff17b776b25c7a16fac3c44ebfa7e3c94dbb67bcc6255985
-DIST github.com-Azure-go-autorest-ea233b6412b0421a65dc6160e16c893364664a95.tar.gz 126267 BLAKE2B 6245eec0fc8798c3482b4fda99229ad6953bef957102d1c85f1bf932bb295a6c3945317c7bdad78c5eaf6bd883c734a7e6fe104bf7ec6664d832906e1cf76fd7 SHA512 3bdcfcdcab1bdd2f4de044d3312cdbc93e515d8a4da712f4b9bfaec28d39a2496a4bf77b24b0fed778e1b66e055a809cd3ce5655d3e08940e902b35715279106
+DIST github.com-Azure-go-autorest-69b4126ece6b5257e2f9b0017007d2334153655f.tar.gz 157788 BLAKE2B b0ba1987b95af4cd2d742061bd337eaaa0d9cc339d2ac2583d5d166b957692373f0444fea9c1f4c01a78dff21086a186135290373020c8a4ae664a74b5dde5a8 SHA512 e2225fb6ff49b62bbac42d1a72bfbf953ace8e73772fa41c23eb8cbff16a0011d5e281c078f30a8d5969912ffa264aad446d2a17a024950cb25ec2a8937b0e27
+DIST github.com-Azure-go-autorest-v13.0.0.tar.gz 181063 BLAKE2B cf4663c84429234425f516adb3071b150282485311e9cc36ec676eacb8f248f57567cc86a2aef9a96bd53775862c7a5b849a04b7bfe8d61ecddd0571669cadf3 SHA512 26d2f3230a2f15b4da9a2709c4e3254431ea0efca2fe740799f6693546eb24efa6d4b9160b199de0876da4839e31f4c64358b68cdbc2c5ef964828c4090bf0d4
 DIST github.com-BurntSushi-toml-3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz 42084 BLAKE2B 09e4447d28ddb0824547d9aaa84c3c16acdc309faaf44434119e1851c40b3d3f67d0cb745691bf47a560084c93a9ce492c715833405061e5fc6114cd674b37a5 SHA512 bd14b162d4d33f62dac4abfe3bec908ea45dce88b9a0e5dd173e9f0576e29344c5136bc48e5c6602add41ddb71523e831c53107b47c4b36832c97e7b0a3d18f9
-DIST github.com-GoogleCloudPlatform-gcloud-golang-0ebda48a7f143b1cce9eb37a8c1106ac762a3430.tar.gz 2049315 BLAKE2B 4b1a921abc65505282fabebfa3560568f8b7363ef8287ada85d63b4a1cc2117d4e64533d5f909d91ee2a6534ae1d8bedba9f41a0924652c877b57b306ce6cc7e SHA512 4a82a3d9b898cbfb498c4d4799bd73619eef251e2bfa1466260dbc5a40592524b7a95330af8114dd4f11f7cff259bd1e5da1566c62737c5fc8f5bb02c5db156c
-DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
+DIST github.com-BurntSushi-toml-v0.3.1.tar.gz 42077 BLAKE2B d846b7961dc3447a43e5c91dee1897a9701c997a407d9ba8737d08b82b493f99823eeab87cc9d4fe6dd4dbdb7b0d2a218d9f9f220ffcda2056188afbf0f2ab87 SHA512 75801d0263a68613233f3b18e35b000e1aeb5322015c0f032598d9447122fc45b1854741ce6ce9fb4d5a064546ad26f3d6384710bd8e6e1229ed2d4551524852
+DIST github.com-GoogleCloudPlatform-gcloud-golang-8c41231e01b2085512d98153bcffb847ff9b4b9f.tar.gz 1922404 BLAKE2B 09d935979634506edfd69ee6c72650a4eeaa4a6e6402e0e8b10c8d8a03b783c935dacafaff4f462e14ddc79319be37d36832ae757478afe3f0bae4c4b306f763 SHA512 7edef0098965732f64ba974fb90e772325f5079fec10bc7986cd8d82178dbf906a2b17a83a58bc655bd0b5138c61aa187c4841a2f3213716035e5b9cc2f09193
+DIST github.com-GoogleCloudPlatform-gcloud-golang-v0.38.0.tar.gz 1919592 BLAKE2B 4fb7f0bbd6b7514bd02a02e8c0a67080e60538518637b05de863e019081f5b851b1897dafc958631dbb63931544bbbd17d5e2aba130444de5244726d7e69dd56 SHA512 212f43ea59475830024c520543560553e8ee253b261eec0435f2265f75f1561b97c8235361a71a040f8c97e1465d3b719f3823cb82d1068b1f50804d296c15fd
 DIST github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz 3384 BLAKE2B 5eb9bb3c88a3bee70cd64f30afcc039f2f43b68be23f39c72f9091765388229a8f5bdbfba8d11d1916d18e9c785e15959c000337461e44940df0ea40ecce40db SHA512 b877b8b0e67f300ed9773b32593a1edec2fb6df3b0d5026cc7b67490ec9a4cb0d9630fb30dc3dee6b7081f81c3fbf1399809c4bb171a5afab665ff93a9f3a034
+DIST github.com-MakeNowJust-heredoc-e9091a26100e.tar.gz 3399 BLAKE2B 9f15faeeeb693cea1adc7dd4b71a4e915e5e7a1dd0ca04710ccfbc719e6bf91b49257ec713d4bf0ebde42fbec9b096fa9d1e5532e7f1aa88be9ef16cf73e0a02 SHA512 039007e53afc33daa55e92da29342123f1fd18e718c8049470fb5ae319ef420f43aabef28a9d8d8a94e90b795a9670c0ac6b77d97b9940f9536cf0095a17f5e5
 DIST github.com-Masterminds-goutils-41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0.tar.gz 14603 BLAKE2B f8f04dd7fb48c67ea31e2c438210100d671c0c017026317f43428d0460970cc6e07faaf6b3d4c2d554851dd962a7f62c8df617d0a42bf30f4d7038108f9df8a3 SHA512 05d67b1d5eb8881a9a4223d823412826d2ec035782a58879645c53e75d4e3a0a312ff70e32020d385faf6c345125edd8808b63d33c4f53542cdba73b3901d3b6
+DIST github.com-Masterminds-goutils-v1.1.0.tar.gz 14610 BLAKE2B aa78c7326a97a92121f6d76f21d26eccb0ee2ec04adec2eba928a4a8789bb0e0610444a0b4a4512bf8cc5a19c82a1b61995065a7359245a9f48730bc4bfcf337 SHA512 cdc1dfe47c95275599d048327ce62964df0e14a549cf7787fac024250b1ca7b30fef07af2be15d9d5084f923b04910a9872cb1561393544c29f0eb8023ec84d8
 DIST github.com-Masterminds-semver-805c489aa98f412e79eb308a37996bf9d8b1c91e.tar.gz 21138 BLAKE2B 07cb99b393f48eb0df3fcacf327e2c769791e5353bb717a998ef7acf587cd7e1f211d258cf55768d5b7951059612ddfa39e3404dc908255ef900901d16c33c6c SHA512 a442038c4a222734d0f18a10eccdc450d4c2fddbcb2b1e10bb32c70e956d74ea3a6672ffae2a89a52e92aa6bb4c75fd85337392dc1e2380d27843237f6ebec2a
-DIST github.com-Masterminds-semver-c7af12943936e8c39859482e61f0574c2fd7fc75.tar.gz 15906 BLAKE2B 0063a5faf829f84578364629c3bdb74db6485ee360f6fb62c273f580865dc2455eeee35016bc1f32d8a7b91544df4550b890a713b47f08138d4dd63994cbc41e SHA512 32ebd89448ef9d135fda47f9b0e9c98729a867295af6c9ad4441eccfdfb19e251d8d3270e364a42e26abd59c3f838ef6c37149e5bcc432a19c524d1e6490e453
-DIST github.com-Masterminds-sprig-2691a9cba2adee8d9a60100a1bc49e770f97b7db.tar.gz 40766 BLAKE2B 23dfea059877a4fe721a9b9c5452f40d771613b5550b62f3e45e54046a67492f7365417a643fd103d5683ac1df58bf7458252b6c6d3c97a6cc088e225e9208c6 SHA512 1a2ad4c4753b792066eb62fd8b9eeb00a7fe6735478e40d6397e8539a5fcf1422832149cd1bc3692d56de904113321fca36bcd95d18c417ce0da9d021a91d1d8
-DIST github.com-Masterminds-sprig-9f8fceff796fb9f4e992cd2bece016be0121ab74.tar.gz 36657 BLAKE2B f40e9fc9982b24e72f463af5f05cd26b903b5f457c8601e1419b5262fd18a2dc206b5fbce86f110aeb01b457f90ac587a1786429d7c10cedb610131acaf1ded7 SHA512 4ea351b3345ff1d8cb57dd7827378dfdc5047f622d8a64300b46c1197f833fe9179d2b8fc9a006d01683214de0df0903e257a694da646bbb89369580eda1585f
-DIST github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz 27278 BLAKE2B 072014886aba809af343bd5b5a2cf21ef95a5712ed80662f62591fb58dde6e71f075d74d93b755845cab571f510ce1e59b0cdcbf61fd8a485738acab14345c29 SHA512 77a2d594f7da607c9c1502e9ad64414c177450a40853d6928c690df2ff6adce0fa79627ea437e07e7459b1956b00db9d1fb8b0e08bff2c0e2c1f98420b36ee53
+DIST github.com-Masterminds-semver-v3.0.1.tar.gz 23977 BLAKE2B bbfa3a3d07c941500a726de392c67ba5e86809d8be6edbdbf884698ad18f8a2b274b32fa42be56ed70efa480aeecd1ae5550fc79f0f9070f0248ec06bec87712 SHA512 c66c509579e24ae46be7cab2397a1ee77fa1fa0cbfd5ba4b089ad17362ef66b1ad35251b6f1e9b86d1498d23c49a64b46a785a8d181c7f5a6ebfa0c4f042aa1a
+DIST github.com-Masterminds-sprig-e4c0945838d570720d876a6ad9b4568ed32317b4.tar.gz 42053 BLAKE2B dcbbcc8e9d0f3428a5d135529f0e72883263076bf6d69d2a0d543c8ef3b52aeca1d78550b3db03bf1356ecefc4201327b1de65b8d89e67811f9fec7388f3450b SHA512 8732128e531878a4498a38d9445be448bdc77f9a6236e10fb9b20f56d249edb65f76bbc13f6bb916d5a259deb7ae77423f6116f2600c803ebdf443e3cb2d82c0
+DIST github.com-Masterminds-sprig-v3.0.0.tar.gz 47424 BLAKE2B 7c9477ace01acbfac00a17038fe82501e4f4446c48a7f43ee06eb184b86ffa3d0d07cfb7746a1098ab8bbd1d992701f1bc4d0f0f3438b38587abd399a09a2e39 SHA512 72a637eeb75a41e675a531f2753417837e9f98351b802cfd0e851dc02c42bc9e33e207bb62e8d7ccb66f71daba380850196959003de66de74fad81323c743c77
 DIST github.com-Masterminds-vcs-f94282d8632a0620f79f0c6ff0e82604e8c5c85b.tar.gz 27791 BLAKE2B 4d9f7e81c9d66f7302ed45f433a9329319b75d6e1416ded87c74032a7cdcef4a321edee370305f7e6ef16f30efa70b56badbdc81b75fe90a87f890ff0cab2eaa SHA512 2fbaff5ba0cb0a651e93634ba1cff5f34c374f490c7182b904d052b22fabe717f5a478856101e8e8679ae806db0b70462f59abfe445714199fe91a3dc73b975c
-DIST github.com-PuerkitoBio-purell-0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4.tar.gz 11651 BLAKE2B 5303cc2264bc289d94cbe81766e12ce42e5ab59a5fedf3bb9b1fba76d0ab543af8f7c34b991837f9ed6270003b5e1eb2d94721c27dc409ad67472c8dc0315d82 SHA512 faf9ef8e24db59d477073fb8a06de337827f21b84a69c03cf47c6ddd8d3d67772319e261d98fe1fafbcc80c725db52541e02f8f2d598986246d02b8e381b4e6a
+DIST github.com-Masterminds-vcs-v1.13.0.tar.gz 27675 BLAKE2B 77b7748a01113fa0a2715b4cff12a5b82bbbbad062833a6516448c8c3408211ad51816135c773022b436d8305eb370defed883d400f59fdeec5f3ebf57e70cef SHA512 fc4db2d5cf2cbb1098ddbc6c796661bf0be8f040134d31281097785f6729404df2ea1c30627fc78c6e560aa95ecd42f6f41a9748350fab64a03887b59a00a2f4
+DIST github.com-Microsoft-go-winio-v0.4.12.tar.gz 92439 BLAKE2B 7ce1539125742ab5d96586a8cbaddef90f1aeba8124430ee33c23374a3dc1a117fe8bd6d68591c83f0a8e4fb1633c74a19fcc8466567f89450056ea3843dca21 SHA512 3dfeb9f884aff5bb1b667a6558471274161ca7b4cd9402e47250903b74522f0bd6dec13ce32c8312eb8570f94dc061a5bf9ada5e0837d45a510cd4abf38c8211
+DIST github.com-Microsoft-hcsshim-v0.8.6.tar.gz 1664509 BLAKE2B 860447c4130f2137b9321e762ed01425005bdd3b6ba31ee6d3878ff49adea334f827cb0882ac922e383c8cf67cf92ea141c1e354498cebce1f7e91aa27cfd42b SHA512 454f0acc723754dc55b7ab82ce33788cd0edea28dd12d6568c835a1f339558cb7a1a3faa1d95ce73088c3bf8c6fb0d2dc404eef48bf65aab963e1356bb350392
 DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
+DIST github.com-PuerkitoBio-purell-v1.1.1.tar.gz 11604 BLAKE2B 3cbd5a831338e0c252e87d680a886581889a1f5ed49789aba25ef99ae297f9c9e42f3ad04e77b6446f70dc07eb8b1a371f37e3a65f5c086ca35bd13a8f2d55ff SHA512 536681e7d92e4b3c5be53dc6cf4cc654348f8a76595b00647c9332528761441a601f354070ecd82c52944e6f6924a227eab88f6a67f52fcc64e7b177356589de
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
-DIST github.com-PuerkitoBio-urlesc-de5bf2ad457846296e2031421a34e2568e304e35.tar.gz 6799 BLAKE2B 8e27467b05093ef6af830c07a3a5a9fcfbd158c75893c6e0279538b02d70ed8ed48981ed1369aa1472903bec16c48b020a7949759dce625f6fa5cb8fe6fc4e03 SHA512 a7c80ad1cb51be792f92dd34fec99dd1d3f11e5762e196e8f2d126afaf7e62548f3355dcb2616a989d0e4afc4cd7f559a0bf528ca0e20b0d1013b27498308a30
+DIST github.com-PuerkitoBio-urlesc-de5bf2ad4578.tar.gz 6799 BLAKE2B 8e27467b05093ef6af830c07a3a5a9fcfbd158c75893c6e0279538b02d70ed8ed48981ed1369aa1472903bec16c48b020a7949759dce625f6fa5cb8fe6fc4e03 SHA512 a7c80ad1cb51be792f92dd34fec99dd1d3f11e5762e196e8f2d126afaf7e62548f3355dcb2616a989d0e4afc4cd7f559a0bf528ca0e20b0d1013b27498308a30
+DIST github.com-Shopify-logrus-bugsnag-577dee27f20d.tar.gz 3377 BLAKE2B 8901b06cca0510bc871561e129d3b6e1bbf0fc4c01557773e3539e691aa18c1dd671783e1d4c9d9291d2b5e7fd75c4eccfbc22df6e438d1b44c26ec9a20df564 SHA512 63c1c0db85529c2d1cfb9beaa56c8df61a980b4425c8073568dca40acfe2fe127f2b351fc57476a46472b188a75dd4c11bf55a88d2e12ceb1942eb931d05ff92
 DIST github.com-asaskevich-govalidator-7664702784775e51966f0885f5cd27435916517b.tar.gz 35759 BLAKE2B b9406a926df5f8b27e27711ced93c9749a0d69c35f1d65c1edab7682fb039741e3825ee62f5b08bdf62d17d2373b17c974ed2653e39cc8910878a94f81b1331d SHA512 c7e5d4497201398cdb2314f8f863d717f91d52815da32abc3d3a1af00ca35696d612c64b1c2a862eb3822f555e2df5a671f2e446be7f5b5cce0e8153b9a5e878
+DIST github.com-asaskevich-govalidator-f61b66f89f4a.tar.gz 51864 BLAKE2B 841b1998e6584e8928ee0d13ac557b4519a4a39cd6f3a4727d8c92d586bc14012ad5bcb111f92bf89999da4c4df1a2d3cd4ec90e679bd3fbb594855b676e84a2 SHA512 44113f8855001fe5454e88043c1bbc06360de7b7e187c540a98e7a04601134467ef16c7345a5d7579249291b28523257f394344e67a671f418bde954b797d94a
 DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
-DIST github.com-beorn7-perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz 10440 BLAKE2B 99000b207d72067f49d17d6a4370c2a4d6f5f4bc0d74eb805811e3927e00f6cb5bad71a4d60f20582fac6998902e695793a2a0a3bc34bfd8586a69cfb67bace8 SHA512 36a53a1a253bf9a62bf0f48be19a1af55c210eceadb7439bbd39444d65c6a809c1fc871136cf357ffad57b2031662d9b2051651e6a48d739d7654f9ddd953edf
+DIST github.com-beorn7-perks-v1.0.1.tar.gz 10867 BLAKE2B 373c4dc08cc964430f187a05a8165df751ea7398b2dd271b85fd13dfe5c9a33c2f8df32ca6f6229b332358e60e90de6d4670d54eb1b9808d1eada0ec7a83e0f6 SHA512 686eefcc824c5bde49385d63916299e2797be205523bda66500404c5ad64ed4d1ebe8ee50958237b41a4c481579f5040288b99c9d2ff1082abbf172893f389f1
+DIST github.com-bshuster-repo-logrus-logstash-hook-v0.4.1.tar.gz 6616 BLAKE2B 93e8be82065d275c7af7f3d0cc03e1f77b52e788a49ca442e0213932254249afada1797d9fa3a23f146fe1b4e33c6e211e45cc270eab4626885ff9c62439f552 SHA512 b41d4db31f36f6c863022717fa19529e2a92f0a68d6a252c7b954de33b4cfa0738359db029ebbb90d20f3000ec79e04a426ef2c540df2b7baaf7a3458cb45b3d
+DIST github.com-bugsnag-bugsnag-go-v1.5.0.tar.gz 347088 BLAKE2B 4bde5512a4792bb97f040e71d52f787677918b022ccd2547db8a883a3dd3557ca0d55e32a9c1dea43c593e3766941b2759793906893527a91a1bd35b7d4046e4 SHA512 207d6b03569d10fcfd0df8968b02087199777f48bef08cf7f91566b7f1ddecf220b801dbaa782490cfa4dc72d8e0e6cff7140b39c3ed14f8ac0ffe89db95e3f3
+DIST github.com-bugsnag-panicwrap-v1.2.0.tar.gz 8564 BLAKE2B 7d5ece37442e6802b41b79d4ff7286deaa5aa091351e0f4e1dd3784602997ad3ccaa5b77249cccb382ece8373b0bfba5c0a496a8dab49b0ba7b8f004186ce24e SHA512 4037559a93da840d95b0565648df11f7e006f076fe3abb00d1969d0a0a357c8888b65c3bc2d7fed4eb2e20c08ef3656e47bb6b82b9045e517599e9fd55b020b2
+DIST github.com-cespare-xxhash-v2.1.0.tar.gz 9198 BLAKE2B 15dca7edb75751fac840795e5735c5e284e212180c0bf40b6bbb3023685b611b3835b8e70e865bef07ed915a5a81def967caa8cfc2a46bcd6edf81eac42d119b SHA512 6a44b29efe90fda8cdb267d1419673a577e231398480add90e7afb7eab92ecb375c947ce68c2221ed94b1fc7032a497703ec8026bff62386f52d22cac89ae2ab
 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-containerd-containerd-v1.3.0.tar.gz 5697153 BLAKE2B c334cfd2aa11dd430c74bc9f3fe6f31d83faf752b9794da26021033bb6af492c48ed1665fc76ddfe5b858f04d45e9b77505f331e3c3da556af2d75e3cca3bb12 SHA512 cff9f0189b9fdc2b5492c92129af284aa8cd099e48de94cafd90aed191e2d20060c96008111b05fe081de0d4fc41d35f8cba5a3dc2d8cc0a5c37f695fd3cedc1
+DIST github.com-containerd-continuity-004b46473808.tar.gz 1076781 BLAKE2B cc0308a8daf70278f271500ed4ed6a3df06881ab04310844050766d3a6dda650a16c9c6337063827262fc305205b07763e4eb8108c579c9b7ae60a33e1df2a23 SHA512 7ec6688cc76c7f99bff3e62dfb578db8fc1b1089a33365efb5d10616c7ed1c25fee832f3069e0a13e0dd870c86d7a83f6c0651f93b74907412c92226092f3409
+DIST github.com-cpuguy83-go-md2man-7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19.tar.gz 43935 BLAKE2B 1fb9f5795a4149e5527f80f229f074d1ce655981dc4f7cfcd6491fedbf8abae72872b4d32e5f5211abe0e43aeef9bd0030770a717a742981738ee989f3a66513 SHA512 8fe7a79dc1b046d8a967063c642942d06313f52caad27061ce03eb6b175549c58232b1d1f24f13f1313f4db6386dc345eff197a4b92df2fa9ee9605a9c108e9e
+DIST github.com-cpuguy83-go-md2man-v1.0.10.tar.gz 43936 BLAKE2B 2858c50d4fa492ba4182f08502b1145a401d0a45dd6a86eeb8b78ca7c65c97c108da07239c12bb25593f619365660d0b78903d3e699a086e1162736b949f0c4a SHA512 cf9eb65bec7fc4293c4a867eca215a0ccb0c495c3e4e0759c04899887033c1edc2b4174d6975be73e56d621d5003b9b88f590f48276099c39458609b533eb40d
 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-cyphar-filepath-securejoin-v0.2.2.tar.gz 10822 BLAKE2B 280c099ad2f23ed6a430aee5d6e7c522b4f3d851b2afb53bd26ed6b29b00fc7fc30c7c9972618c57bc4bf57d7e809561c3a5954bbec0e4e273a03b2f8c01cc06 SHA512 29906c5fbdb78735b37dc177b6dacd36391961b505de5310eb6734c93630102c07c53da9384b5041d798056ea51b6563232e50156145678c3c7db9828cb74529
 DIST github.com-davecgh-go-spew-8991bc29aa16c548c550c7ff78260e27b9ab7c73.tar.gz 42217 BLAKE2B baa5e818fa0cafc3d0af4fcf158e96ff5f9820c186872c3b4038be83b41878ce7ca297216a9669b903763ecaebe7ea36507602280eb3734bd9eb01bdd54c631d SHA512 4c4047bc9a8cbb27973c7b11779388458dd9cca5937e8b65e19ea513cbc7bfe8e97f538fcc132c7512aaebef44429f531a15b367b027d731db5762b7f4a210b9
-DIST github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa
-DIST github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz 1769777 BLAKE2B 235216295ebfcf61e6fe3cd8f81ac66a0bfd9a67da6b8c6ead4c778e0fcd7ecb519bbb67711d502f5f253a4e98604fba3b055458931ab7a03b4d61fb380c8169 SHA512 05caa27ac0c8e16c7a7c1d0de0f3c0f560be51d0bf5f487f370a0b99971f88e3134448a2fd34af694f124f60515ce38923686ca4fedc8141c5bf4d74f85b0141
-DIST github.com-docker-docker-a9fbbdc8dd8794b20af358382ab780559bca589d.tar.gz 7654023 BLAKE2B 36781404e6b3705cce95773c8d5b468e0fb0df81993b001f055eb5babeb8e2b6c6c771d0f2d2f36ffb4a6be99e2408e8343501a98f581b8c30addccf8c0a22fc SHA512 2bdd240782e123a5b87adb92d435a4fb3864c28a0a4899d9e6fac6a93926565ff1efae228c35ca81d72f048fd0bc5a5d9eeaea99ed6a911cfdd3ef20bfe67637
+DIST github.com-davecgh-go-spew-v1.1.1.tar.gz 42152 BLAKE2B 3c6689b3d2861fbc4a70b8ab25b790d132865e4ec34062fd80005fc7d62c1b4cd77df534c27a2d8b1c42c63f8a551fc7d98e3649bf902d176fd965e933faf6be SHA512 b00621d2f11c4cc858e69fda3e6975f910deb375c4f2305a45b230e2d9be73f183db5d2ce4f5e30a14b27e11e79380233ee68fceeef0d855c64fca966e68111e
+DIST github.com-deislabs-oras-v0.7.0.tar.gz 83133 BLAKE2B 25098894fda24d9d462619b69ac04f5c81c36fd08b20bb01a6bbc82c3caf6fdd7bf2899a7dc97416be901b34b6f59b45cccdfeb8f0b3bf3b64c2da54f4e835cb SHA512 48ece2e8bdf17785b7a775f7e1778ab6b09751cb36c65575088038b08884095760ddb58a7e0bc519338e94983a08424e350a0b5786340616c1295a084529c5dd
+DIST github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz 36975 BLAKE2B 8d6ae74ef5b5a07af42a81a6902cbb0dd73054a7c678f35bfc6397d7f9abd79e79204f1eb4aa46cb42f1314122c2a84134d6cdc22cdd987d1040d056143730a7 SHA512 4a46ca539ec70e5e8352621cba3b1da20ba3799bf7615b1842991471f812cb4877dc053e915def3d70120170cf9c6c25b5bfdbfaab92e0537835ad66f52cf732
+DIST github.com-dgrijalva-jwt-go-v3.2.0.tar.gz 36960 BLAKE2B ad0829882581302e00997886c31e763f89205b5aa58226033061d36ed24a1c174170e6a723cf7d7ab4ade2a6c67803455ff9f33e4781a8473d351470af55b156 SHA512 782dd5fb85e56915fca96b894eb4c6f57ea05cc2ed725f3504868a7acf9c75a4ce1acc46d179b3e4ab14100ec7eb05a906fd291bf016897c4490c27126c0fb0f
+DIST github.com-docker-cli-d88565df0c2d.tar.gz 7429995 BLAKE2B bb7f3a8026b501e37cfa81828cf7227998e410bb8c82feba46d19e50d2eb51139a03749890f33c72e3eab154064ad525826ef60ef8db75d40603a2f7ee245be2 SHA512 390144ba4c3bc22ba6341d4e6109ff75569234f211d2f5c71a473e3c989a2bd04955cc5344f53f225d5a32c80a8cddaa580ec19bc3b9a55fc2abc95cd9a9bae5
+DIST github.com-docker-distribution-2461543d988979529609e8cb6fca9ca190dc48da.tar.gz 1996404 BLAKE2B 2eb9fd568a9dcc2641195dd1b303c9d27c3a65302aa9169ed89ad15b14e1e3071844063a681d4042b4e1651fee5a3cfa26e34b996819c31eb653fed0728b0b93 SHA512 ea44c5dd0f80887fd06e4e172412f71e4633d77c613318722e8e1c9b8edbdafb0c697e64290da89eee7fd3a83371c7da7ca6b9154c717a8cc1e71a889f81c8a6
+DIST github.com-docker-distribution-v2.7.1.tar.gz 1996699 BLAKE2B 2e22db69f476be5a4688f5b3d6b41fbbf71460351543ae849f707dd5b3d56624f674815a25214002886b057f0859f75fd197bb275a7b3cc8a7787422f716ad0e SHA512 f6baf0e7aa96ebe828c628f7dfd84ee899331c3c1bdab86662aef595b092702b6d9b2c9be766a6de6d153ff4ca55d85c5fd8785a0968f285f56a32a50092c754
+DIST github.com-docker-docker-2cb26cfe9cbf.tar.gz 8717172 BLAKE2B 8601f7db2783fa3c407c4fa4a6ae83739a403f9bdea7f65147c59c4fc16416b670f1b118db9e230e22be2c4d7b34f985cda7b2da6bb6494c3a66846714d798ce SHA512 567f170ea27f80dd4da06ca9bd1be9e072f9c50b5dc56a9e1eaf77c044713e118b10635bf32df6a4749a129da1610b554b6630d34266abab256dde0a304f88e8
 DIST github.com-docker-docker-be7ac8be2ae072032a4005e8f232be3fc57e4127.tar.gz 9059054 BLAKE2B 8c4489bde6cba2d6318f93abdad0e14141d38398de06e06ce58d4cf4c7cd8a8d6526d21e41c0433eb31a4db97fe4c8e98b48fdfd49ac15a311e3fc507af49d1b SHA512 15bfe14059103fb8cbf62a9f39835b0a38cd61a859d2feed3685a39cd38ce81f9b525142c8c7bfea66b970807be78183956c74d45a61b4161c7f41d7c7177f17
+DIST github.com-docker-docker-credential-helpers-v0.6.1.tar.gz 27723 BLAKE2B b287454964e614755a307ea4ae9398634e58683d5df38c1de7b8c003d5ee619819c1f56cd87c9dec3c5f3f237f71a2eb421b34f46d13da4820755315debda40a SHA512 57d7d8039c980974a568be2f4b557227ab2df0dbb48e9ba4f4729826a9d96604170dc8782e4b9baca06337be254ecb118c51911ffd6812e7d01895561e78abd2
+DIST github.com-docker-go-connections-v0.4.0.tar.gz 30770 BLAKE2B d86cf8632524e1f3ebc4b612aba43a7b77a305625f797f7c27977f222c1c705087a13908224adaef00d51061b0f2e52a12d4bd8fb7bef5100c369a5ab50430b2 SHA512 b8b84bf0d6a0ff7b70073fc0929613385c719cefbbd9f63dd2075930adf93b9155e0c1776ec01bf1a845b32ed92854252e3ea668d4c9d46e66874b04b891cb45
+DIST github.com-docker-go-metrics-b84716841b82.tar.gz 16292 BLAKE2B d7b0e1062b5c83edc38a6970539fb1c0469c7f70499e30ad15e62006e460193ec7cc07d8d1cc9a44ebb96b8d1ae865464adfd33940d73b38e4130ce237b4dd8c SHA512 2cb6531a1dcee8017bb907ea2f65fafb84ed704c46271f8eaada42a4979399040493bfb7a8a27d73610c2aa49f4b5e7f68446b98ec33da91f18a983008514935
 DIST github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz 11094 BLAKE2B efc28ea5f3db552cacd9c48d7ec4de65a4f50a9463ac964d98782d62ae8c6103c119bf443d3219a39e0ed4658228a04b4a388c29ee38a05ffc3c78c25456abf0 SHA512 baf231424d453bf889e8614c54cf28f0f37f8b8e06e841c2b42ef82729afc4036018b1ca0116da33a8452a2d2345bebef5e8c66be489896db813abaac79d668b
+DIST github.com-docker-go-units-v0.4.0.tar.gz 11514 BLAKE2B b1a734c813b59d8de4ec80f3ded93a73a2d2ac57d6cd65a733033fda049a0c315c04704dea3bb826e9e5821a022e1fcb09e5e8efdd6502bd1741efd80b70e10b SHA512 7b714811b2821f68ecca4cc220f564cda871c19ba043b7b1a69ac70d103bd9002cc698121bbc2a15936e96af862430eed47e2fea022c44005ffe5dfdf9cf0e27
+DIST github.com-docker-libtrust-aabc10ec26b7.tar.gz 39352 BLAKE2B 53b93dacca792288423eda450d1b8dc898722d51e68ebfe111f7faad7a756da33f306e1838b74e1f56c40d6b2070721904ae3d51d2890daa76fce48a1cce3e22 SHA512 31d5a613807764c03d3356ee134bf384eca7953d4113e35d8fcce322611c25b444dd07904eb34c86c7e951529040c33fa821a56a687260e9298f900c7907e83b
 DIST github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz 35378 BLAKE2B dab00cf2ff22077187532a66abdd609a9101a0ca4b0fb6bcd31647e72dc491ba6ad2c2f82d3780d687dc8a95c3f499bd457abc7ca4b98cc0d08c726f13d58593 SHA512 754efd869559f96eb244a603bf575e1b439d8aa4ad34485121c76c4900150ac8a81f7fcdde4b2af49bcd317eba2212ed60a16a10cff973c9f87516bf50ad0d2f
+DIST github.com-docker-spdystream-6480d4af844c.tar.gz 35407 BLAKE2B b0595179d4e86ba0a85d24e470fed3a406b16841b08a2f712d534498ef922e23f4789ca1e0f11f7a9820d8b27ec09210c2310086f1d948f1c2647bce45a6c05d SHA512 a973f346df1086bc3b24054f9a508ac334fe90011ca3e70c3b9c8df8773545bf82f93cf3ca49db28e1796bd71788f8d8bb14a2b014fe2148df352683c6993d00
 DIST github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz 59771 BLAKE2B 91eaedb1f78485b68000b02a9ea86f86a156e8109ea173b3593407ff5779ac1f4652465bd617b13e7ff95ddd7d12d1d39a284fee2c59dcc53e63626b5e1680ab SHA512 c762005454ce5247941d86fb8587ed8229927c1ce81fdac8601ffe41d535d1b3d89f81366be2c0bff13c8fdf2750c7db4b913b0548f19b71e2ab7a7654ab8a71
+DIST github.com-emicklei-go-restful-v2.11.1.tar.gz 66646 BLAKE2B 6ea876ed1956e706c4068b10b9df778caa5ed3ad7a5633a87a13a3663082262b22e904ab229991759278b0a226a7ef937ecee8749e79e1971cfeda2fd913939e SHA512 63da31ee5e377d9c76fcdda1bf4089e10edd5571f82782d350ae01a309aac0dfc4f8564ab4086c6fd4feb06bd59dcd2d0850a08951af8bc83ccebcfe7a7b8d18
 DIST github.com-evanphx-json-patch-5858425f75500d40c52783dce87d085a483ce135.tar.gz 14566 BLAKE2B 1e4e84030bc17a66a92a65cc0355b3a4983a6c932b8b88225c9b64db9a6e1980aa15a743525030f0554531afd103b010dcbfbdf062693ba5730904dc1b06006b SHA512 78e094dcff9c67887f8420baaa506591e8be09368bafcd750720a4c0b563860a94fa9d8cc4f53f231fe7fd34432c8f8c78b1bd3dc7588428599fad1c6faf6a88
+DIST github.com-evanphx-json-patch-v4.5.0.tar.gz 15076 BLAKE2B eae509cacc3942b7dc3c4f367278baafadb26123104c12a1449817e87c3cb1e1f775ea47878bc7f011ddd23213a08fb03c4654c840182296646caf7cdc51bcd1 SHA512 c97693e9b8ec2cca0b198d95c6c364e2d707c0c7b8bd01b8ddab02166eefe83bf2a610a9b1a2bba3f392b3fe1da5f272ee535bf693a69c2f6f2f15ac331600fc
+DIST github.com-exponent-io-jsonpath-d6023ce2651d.tar.gz 8224 BLAKE2B 8997719d55e4c051d7addc41bffbb11092df5dbfbcb35de6cbbd464c8232661c714bcf83eb652143b6cdf5e868b1df233d23c17c0341399410bc4f18d3188158 SHA512 1db86023b693c41a2bb80ac3e3a26f54aeb741b417ae2af81f5d4ca44772ba45a02cdb2c928cfcaca425212717ac3501b627a39fa5794b41d93976ba65c24602
 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
-DIST github.com-fvbommel-util-db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394.tar.gz 18976 BLAKE2B bfdcc567253a24f882f5e524ad7516356024f8d0a1f81958161cc9f450438d26f6df8d5db55bf9e9fb62b88a2339e09cbb4b0594fbfa8ded12c4cf3c72034eff SHA512 e2faaf999792a930991cb99b8bea916dda5a4d0ee8503fc597581a1caefd9835e513555844d7d8a7818dd3b17fb532dd2387b9277fd4adda34fa7881f397247a
+DIST github.com-fatih-color-3f9d52f7176a6927daacff70a3e8d1dc2025c53e.tar.gz 818620 BLAKE2B ac9796c56ad9495a5d209b6953f731d81317368f164dc9b6e7af2ac8a2430fee25a7667bc3b2a59b87aec8f8f5ac074c51b490007a9de76cd0f3943c83c4c6a4 SHA512 f4b07e214d43bb1cfa725bbf31035cb7874793d5097aa1a924566b4fad42c9a8209060fa43f871815a6d694b417d3e61382f49fab7e56e6d13113baf52d52def
+DIST github.com-fvbommel-util-efcd4e0f97874370259c7d93e12aad57911dea81.tar.gz 19033 BLAKE2B e68efaedf4d54041ff111dc00fa8d4470d0e0d89a2af0cd3dff09ee4d9307bfa9c15e22f5f52069e622fd895bcf101f9e0d125aefd84062147ddf851ff795a1e SHA512 f5038d650af6e794c57158c424d9a130412633dcde4a00dec9beb3819228a38faee59d91dba5ad21be12beef70581702aa22502d8ead1209458376da7d4fc418
+DIST github.com-garyburd-redigo-v1.6.0.tar.gz 42765 BLAKE2B c45429ba8544eb484f4ba1bee83e15e644f37dd72bbf9aba4668f736d3f5f735777a828b805e8e25086254db988401c3ebd5fc1c7b335efcf6e4da6abdef803e SHA512 74fc1d31c53ea00d21114dcdb2d8aba578bb86cf707680f31ecbc4d48983c9010a9da9fdc9036f2267cf7fd7e0ea9fe4bb1120898d445e1deb2d65030a49d133
 DIST github.com-ghodss-yaml-c7ce16629ff4cd059ed96ed06419dd3856fd3577.tar.gz 12713 BLAKE2B 639e75ce14b999ceaaaf70dd5cb1a261c1348d2ff04d754956e392e6ff486377d2d40ed155818680c7cbe399889c00a2e4cb9d36eae556442eb10ff84f73a1b1 SHA512 bacd77956e8647077700a3c6f6cd67462eb323c21aeb4185ae0f983ede8d099f84109df114cc3efb635c150d4b3729f3420920b51fc866a66210f3630684a2f7
+DIST github.com-ghodss-yaml-v1.0.0.tar.gz 11772 BLAKE2B 4fab0b1ab4ad03fb63dc1485111ebaaf494248488e8c9fb8ee665c160e8e26b275bd9a3909beb9095e650ba0959927d620595bd628da59850f1400cf4cf45b98 SHA512 ea6af2084d3d65d4afbcbf498deda1718e2e692e1bec6d46dd74f4e41ca3151f82d55b1f041ae689606363d37dc604ab20762e773dae964206cb446262963250
 DIST github.com-go-gorp-gorp-6a667da9c028871f98598d85413e3fc4c6daa52e.tar.gz 36804 BLAKE2B 3f6b78fbdafadd4a4ee7d4a071fd22bf27509e6359cfae78ad905f564704a8c11cdae9af55723e67891dcbaa136fa81d905babe8ade35284a4963643207b655f SHA512 ac6c55c12fe1a44d8adddcec3559b70dbbc4892a7a58ac679c951d6c48a008cad12a1983bf5ef3a8f247ba2e7ff58ebc7d5ddb846bfa4145c26cf8ea390edc55
 DIST github.com-go-inf-inf-3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4.tar.gz 13080 BLAKE2B 3dbd873e29a74847c0c19d743ac3ab7be243022c0bd4ff8b5eb3d130a4e8acf71fe27d3c4c8e93282077496600590e6c0c46dfebe751fc6cb92131236df2b762 SHA512 4508783b29a6ac4e0fd42d15df772294506775e590fc0ba74fff3da654d118e50ee47b827cadfbe8b0b001904705d1108ace744b90e47152099ff3b3caa177cb
-DIST github.com-go-openapi-jsonpointer-ef5f0afec364d3b9396b7b77b43dbe26bf1f8004.tar.gz 14878 BLAKE2B 168fcfdf3ac18df02ce0aacc72e65e5f28816ffd569b925d9f77f9310738ef1aab988004067834eebc7f721ed755a965c1113c95ad24d5d0015c747bf1e32171 SHA512 0ca8c915ad0198c3e7758a90add6a3efee623273f474b1ab316c6a4fca94cdab784c44169a6061d499816002d1bf4da64cfd17901bf8eab8dfb5cd8be9f2bbcc
-DIST github.com-go-openapi-jsonreference-8483a886a90412cd6858df4ea3483dce9c8e35a3.tar.gz 13009 BLAKE2B 67b2cd7d59442dabe1bee238f1a4ce7f43ad58fe2a9d854daeebc97129915e757d71b9ea906b0fd02c60c16679d6c9e7241096f6ce9445cbb607af6386c235a6 SHA512 456855e9e49955735a93a6f82ab8ce62294b85697565f78bffae6b6b4ac731dd0cf4ba3a8de826dad487fe0950e844cf7721cf9797daa54729cd0ababf2b9969
-DIST github.com-go-openapi-spec-5bae59e25b21498baea7f9d46e9c147ec106a42e.tar.gz 208745 BLAKE2B ac99284c5ab9a0d33647fbe35526c15e6827bd65330bfec72003559d271aa2ac7140d5ae62b6c390d2e4a7b0505dec6e5d86dfae569cda96a5733b4d5f8d8a20 SHA512 fa2a48be05e327f9b4f0d7d355bbc8719e104370d05ba351988512a5e330b5eee7ff735ec2749806a3cad05c0520807b879465b26594257d1e04185cbfbca61b
-DIST github.com-go-openapi-swag-5899d5c5e619fda5fa86e14795a835f473ca284c.tar.gz 30111 BLAKE2B 36c1fc29c12f6e42d4b1d38326022233836e7274d0cbbfdc6ebacb7e13c8371c02389031291f8612f18997d9f8be90a402f17c642f341c980a31521830da1deb SHA512 030d98c3fe62ac33bed1895e2312642bf526cc0bd91506f7b6f24500fde08cd4d7d7e3ed16778f9ecf35871a8c5b7857dc1a8cdccbb79df9a01590709671350e
-DIST github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz 70322 BLAKE2B e4284bbc1825c0e78cf2818091d2d25c581fd5da86d66eb8f91877b8a92f62400962391efb911ff33ffbe3db1de432a892dcc3670f96710fdb7c2cb191309697 SHA512 a5c4cbfc12e932f161c827537ad8366d8c003f40c3959c39bba9b6032e3d381516998a046429ef0980072b717dab0ab1df6b1ef24a43e66e1bf4bda176302b49
+DIST github.com-go-inf-inf-v0.9.1.tar.gz 13072 BLAKE2B d7418f32eebd7a31be97c25f876e91ca7b44235975f2f69d8f75c0009c097095ee2e847cf6ff8f552749b6efa1bb5098c72f29c624ee92cf573f8fc37d0e3e41 SHA512 8627b4a636005089669ab0c7262e7a5a1549941d049a66abe6b73e61533f45a953012615d9b114c883d68450608d69f8aa5d0b1e9ad67d95ce9916d4ede640a8
+DIST github.com-go-openapi-jsonpointer-46af16f9f7b149af66e5d1bd010e3574dc06de98.tar.gz 12870 BLAKE2B 652cdf7c1d1b05b7cb11c9a0ed9cfa26706efe99282485ab0b1f7418c56beb6dd5f1f531c46e76e8b964315d6222763c1124feee08f67d91aded20859d000775 SHA512 76219627b381d450d74ca4b613cacd2f61f06fe1c477844d2d9a004815749f668bb1e4d436567f8001811856a05efb0d8d06b7d16ea73040cfb2174c78c73dac
+DIST github.com-go-openapi-jsonpointer-v0.19.3.tar.gz 15377 BLAKE2B 2256fe8a963661658727fcd00a6c3596b5d9ccca602a4fec9d67f49eb820fd29161b49ff9138aab08fcb45ed6e07fd720794d7ab495a1747dfddba2dd9cd24c6 SHA512 5ab7f7e41a0a940e92663c6293d7adc22603dee742677270653e3bd9f38becb56a37b4faab9183de84b4cbb1037b1c051fbab093ad1c96a0d064aed5dfeb376c
+DIST github.com-go-openapi-jsonreference-13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272.tar.gz 12405 BLAKE2B d9d5f6715fa6bfbf7a385273264d2b0a059575fef5ba9c8767f4b8662cf80c9e850b67bfd544d526dfeda96620b99e3e2eac1a0437bdd662bb03a4c845b6a21c SHA512 df98feb60e7bafa5cbdb0c51f7fb22913b646070cf17f07901e146d770fbea8b6e1ea7c8e04dc7c4b5ec14207b8d046608310cf28cfb11cd084d25fe9287b91a
+DIST github.com-go-openapi-jsonreference-v0.19.3.tar.gz 13931 BLAKE2B cec29a5607d1dcd7864b0f09004f0ea5dc1e3f093e9bc37832feb83700afad559e9d4c9df7319edbba14a29966a861cf7311920e756712d1772cb76f2650f01f SHA512 6d0a1a49122b036da0c6bf1d1269f85e1a0f3d8034b3dc463be627f73870121413d82581df4386933933eb84fc00b76d4061ead433c09dbc9ccb5a0101746fa1
+DIST github.com-go-openapi-spec-6aced65f8501fe1217321abf0749d354824ba2ff.tar.gz 77740 BLAKE2B f048d3619926628ecc775f9c81f6d70c948e493656d704c571797e4112292d255611b44f791b6ff8cf5e8dac064506ad0f46fce03ef2180bb1b7fb34dd6557b9 SHA512 57d396e4da00c39b4ac3d3a924a899b784badda76abe71c6c717256c49a50887d3ae1afc7aded869becea3fb161342f03b37ab85ccff60c6e3417449abf879fe
+DIST github.com-go-openapi-spec-v0.19.4.tar.gz 217801 BLAKE2B d1578dcdf95f3da947c52f993bcb61e251d7f2676e9efaae76965373129978a67d9bbe721e8b48b804c09057319f9805f5db509ba405545ea75b2cb5ab927bc9 SHA512 b3f947ce06fca1b5ccb693f684372793f7ee3fc919c8e957beb41ef0e7efdf05fefbf258e7e36f05e3c8e69486b2710c78fb6d3cfc12436ff1e84ac0b1872b41
+DIST github.com-go-openapi-swag-1d0bd113de87027671077d3c71eb3ac5d7dbba72.tar.gz 22386 BLAKE2B f44219523228995462be58f864ba66587f8bf6dd957cd74ac869d59a21b904dc9459445852c9492ae46f46a5a006b6c897e5908eb3b0c3394b6aeea686aa77ea SHA512 67d3895fdd398a644c41750078052b9fb88ae401275d3cb351e9947d0c782cc9d569cc022a3c882b619905876259d004ae3c092b3da8ce4cf0ac99475d7bfaab
+DIST github.com-go-openapi-swag-v0.19.5.tar.gz 33023 BLAKE2B a974334212e3229ae59d074313ecd40316f360885b92da854a4cd7339a9ba227c096c3befbaa4a2982db99900c5bc5d74d075afb849a9047f1b80ec3e8497216 SHA512 9d74fb3b9b63344ce7aa026e4c4a9d6080defa79fc1b4b1dec4b7dac5cd1c5bb345d6c555f4793637a1696a99d0698fde692c8c4cb07aa6fbec2d392db9259b7
+DIST github.com-go-yaml-yaml-f221b8435cfb71e54062f6c6e99e9ade30b124d5.tar.gz 72297 BLAKE2B e9bf7f236c8bbed85ab885462790b1c5ef156ce2b58804d3562e3ffb5c26ea0214b1d185b38731befa2cbfaab6ac89face74c2207c1cd84f83701773ab94675b SHA512 b5f5e028c038cf16cb6b6d6fabf83522d9b19f2903e74004d611796a0d7c925d3e1509a8b3971b7349d05f106e69521fcefe7e9cbae1e9ac2c0180fef7ccf6e1
+DIST github.com-go-yaml-yaml-v2.2.4.tar.gz 72209 BLAKE2B df823cd5f6f734c11b9b19cd3cc205aa4bfc15bc90359a508220691867841698d0b9caa35b2aaa40b7c4c6c804bfaf9c7fb8d64f125726dc3728cd6833618c11 SHA512 2fd417b57a5adcd75ef34adbaccc0199fadcea42274fc77efeff601a0f12e376fb3d7ad62a65e1ba6f0b9eebc217b4c3540f6fbc6accfcb136e839a585b3e900
 DIST github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz 25955 BLAKE2B d6c9b20f80800396ebc3eba2b08ad48522d297bd0da90ed32d6ea2ea4e575e9feea112513332a3c55bbeae2569770433466536698084e787127866efaf0d25c2 SHA512 e5767898e8aaeff59219e0a0578586b63717d5c8507c74ecb813e8e8a7b02470b10df0452cc378c7f0a4b9bec030be22deb3c3ce7c5ae88fd739271cf05e36ad
+DIST github.com-gobwas-glob-v0.2.3.tar.gz 25962 BLAKE2B edc7e7ea8db6312690989d007d2a292f197a22c6efa7b5737cd925c2608e4a0ee38571082bb0dca57088d4531bb5b1dfad6341b09cd7fd4bbb57943640d9b441 SHA512 b91b27389e1f172d7c2c181f19ebc27d566e6bd6397cc6ad924ecf5f2ace98ecca639e020e05c9e281fb8549f9065610f7eb6070c63e3f9e7c6fd190c457e42b
 DIST github.com-gofrs-flock-392e7fae8f1b0bdbd67dad7237d23f618feb6dbb.tar.gz 7291 BLAKE2B f1b1025008a54f896c2d5ded4ae26f601fb9ccbe751bc06a1fc93e5963857d8ffcc1dd8a2709fe0b0762ee4b94e7e351d793b70f187f6ed9ceb35ded3aafdf57 SHA512 7309fe6301bf229002b28c0eafbaeb0e8d1e0500b09af6327e7e52490e003eeb291b982125780a0106333b3aaaaeaf888aef97bdf5ffbc015aff30d913f75637
-DIST github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz 1732674 BLAKE2B 2dfc3538a0f7e4b77f90795a6e76a0c962bcfdb7fe557e64484481cb6ad053ddd738abd1415cea69fc1305dd2d4e2301510c6715243c76e2251304b6f74d6649 SHA512 2b40b3eed0fe85fb111d49b0eaea33be382539c1829ab43da6da0cbe3f5f7db44422ee38e425d660e85d0541031364a8def3b2e4589cad326c29a1bc4ed8a6a6
-DIST github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz 213923 BLAKE2B a53b177f8b31b8927b923c5bcfc4ee4a1f48725e6652f38e20bcf1147a646411771bde259ed7917ad12913734375f880e7c4cc9b49b370e738928286b432a877 SHA512 903ded0a887db7a6b6783bea7d6af82087449ff05ac34367f3472f23c80965a4f6b4883e6983e57560a80a6b81eecbf285729d4c38b505cf1e99274d1d87c1a7
+DIST github.com-gofrs-flock-v0.7.1.tar.gz 7294 BLAKE2B e11148c7e96a6feb45a1d35085b67d11ea3111272ee56c3a816237b2c83010d8b10d4a4e41891953b30fa22038153d8364f0079f7cda4fd6350d8c758ba2f992 SHA512 9e5b20a788e8b5677ed8665286aad069b6caea0d5bd1f2301f9617fdabdc1f0a82f0db9a28225df759edb363382e061f9fc87a4e51fc5a4b720d13454deff4a6
+DIST github.com-gofrs-uuid-v3.2.0.tar.gz 17064 BLAKE2B 9e7e4d2f2d2ba248438e26825abdf71f6a948b4c6b684c3fd453c478c4994efd7d4476052cd5950ed33230f535d63de42225236a9c19558eedfc1a9a2bb45bcc SHA512 c7acb8c4090ba5acb2c741223ba924b7c08e14a724e289d4ed13451e9069923c1e4659837927b80c60a375eba8ead548a1547618937a239c57354eb4f25729ef
+DIST github.com-gogo-protobuf-65acae22fc9d1fe290b33faa2bd64cdc20a463a0.tar.gz 2046917 BLAKE2B b0b3f7a8409647435927434e79dd5d12dad0ef235ecb75e1a1d454b27236ba0bd61dd4978fbf2de30d2b2e47b3d2be184c6d27c66209cf447ee0aec197aad36f SHA512 409f246db5f76d72d1d27e405a2e9dc079114fdce33c448400d0f37c56ea0f6d1a7109253af9625c27e526427fa0d9155111c708b4e810193e82a0340becaed2
+DIST github.com-gogo-protobuf-v1.3.1.tar.gz 2038188 BLAKE2B aee5f1910018ada96b4e52070bc487f6703c6cce4366cf5e1f167234702a7a318dc8dc74c19fc6612579d7d59b7e8220cea0edb6e70ee37c141093d857872607 SHA512 a901a849d5161fb9806ded3b4e57afc53a355875625ef285a74895deff32d799bf96feace6fe55aff40be5f16347a491ec16529c8d1ca4cbf087174960f013a1
 DIST github.com-golang-appengine-54a98f90d1c46b7731eb8fb305d2a321c30ef610.tar.gz 326123 BLAKE2B fc4ad02a715532a99688dced5ed7dfdf7f7f22f8ec913de73e2f8d0feb95de84d46d497415f4d19796de37f2234dddf5c1b4c7a2bed69feebcf709d54669b2a8 SHA512 353f9a2705dacc5f485db1faaaac3ce51dddcc2f383f9e4a3874b199d5ddb1c2ac4a8d40d82ef3fe4f20cff8940edf5ffd09caa943096084364d06eac1e2e854
-DIST github.com-golang-crypto-de0752318171da717af4ce24d0a2e8626afaeb11.tar.gz 1636269 BLAKE2B 85529e4607b4efc684dd5a7aa726294a21f3cacc4c6331d91afa95e0e14756b8ccb7d461c6c4ac9f3e0d6b864e63afd763a41c8e7df23a2b8afe0a1264d635f2 SHA512 c1c5380ab03ef5fc8aee6d5937a90286bddc32d8b9488b38b890654657ecdf5f878d74eef2d32d6789053dade619e4aff006ecb003cdafd56b8730768660de80
+DIST github.com-golang-appengine-v1.6.5.tar.gz 332903 BLAKE2B 270cfef777d2c70521b09c6578821903f46579fd4fc0e1c49232357253f1e39f8ee9959668ff14cb046c3b007744d20d3c78ee6050c9c894a82e2132c44341e1 SHA512 394da1993b5979f8e174f80d68d6b1c165a11248c5d54aa61bf337541013d5f157e28946b8edf8259b2381bb4a59d0d1fa3e99596868681a586384bef87ab8c9
 DIST github.com-golang-crypto-e84da0312774c21d64ee2317962ef669b27ffb41.tar.gz 1641247 BLAKE2B eeeefcda7ca9cdbd1519ac03e4cb195d68041efd556b5ba7999b202fd993b3dde2455bf3fad3590dd00bb1a40b01141bee12a756a6db974c8b5deebba93654b8 SHA512 3d88feb4e9c840207f3f5185b6d33ebeab673746ae2fd7a8589e6180ba5d9aac6e18229415d1acc525854fc4c717b91702701edb73fd2e9979550f82908ca754
+DIST github.com-golang-crypto-f83a4685e152.tar.gz 1709294 BLAKE2B 9ae1d75eb1638f4014944f028bc983e515520f4b60e3895abfc3966f82621bebbe63eac0df5d975cf11f7c053d3498749e59f18fc1243e1e805ec1d967c8e09e SHA512 bbb4584e769161b76c9a9ffa74278fb8fafdd760b0c106fe86a09fc8159e9fba8950c52d58f0072b9748cc66d4364284748a8808fa45ee927163c8d93b312af5
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
 DIST github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz 25244 BLAKE2B bbfd67b7c9d34fe1cddab77a372fc53c899424122c46dd637186bb571e1a12dda7f0d6991bb5ad85cd0162803832e5843af6b184f861fa5dd1ac0a5cd8c7ed86 SHA512 e7ecb5c64bbb9e1fd2555ed496abb1e65f836b8017f21010dc853f8c527826eb6c315744ce991725d85e3500a6c877b3f25ba22090584c4c75dec6e6cbdc938d
-DIST github.com-golang-net-65e2d4e15006aab9813ff8769e768bbf4bb667a0.tar.gz 966021 BLAKE2B 0d5e297e6175faa704daff2de29b7dc3adbc9dc567cdcfa0813c1a75a7a88e47b991637abb3e12e40c4ba03aa6493bb45f7cc49dfc6a308c509b212f343d89b0 SHA512 22bead696af115d40f5b92c6188373815b024d467c2bddf19ad67750d6dbe2a12df169461b904aa6c677d4e2f2e07467f5479f2cac194acb18c0906b181a5024
+DIST github.com-golang-net-cdfb69ac37fc6fa907650654115ebebb3aae2087.tar.gz 966750 BLAKE2B fb24de16c0860ed2942a3819792d16d004be26c8682be3bd900ff31a37544791a131810dd02c90c76d3d8da0c05b441529472f69b000811bb44b8c1f18d6987c SHA512 a42d962489da4e29943bfec16a774f21bf9b63fe6e1887cded2b2c37de66d7d01ca6f34ca89eaffbc750d3cde11387b62d0487018a342dfca3969369e7651c17
+DIST github.com-golang-net-fe3aa8a45271.tar.gz 1103753 BLAKE2B f6275e938bb46dad65d065d838c9ea7c9d9feb1370527cb82f166db4fc085a3d88dcaa6ff1ed3650b978ce094493265a971a2cb2d1b05e8e81d8b66993b3f474 SHA512 99c5b7b08181ea29dd22975e58d5b49a1493ce3180a92f78e9763dc5af60905da0ee94e5b31c3f65b8c6b0295894f3ae3208509d50cdb212478bf716e3c9b692
+DIST github.com-golang-oauth2-0f29369cfe45.tar.gz 45476 BLAKE2B 42a97cfb38a2633d99e5995b75f055a6ae5bc3f34b3a501fd4b016c129a0e85fdf1412f5f8e5614ccaf19b1abf018e3b5da7339c9c796ed9d2bb40c25ee477fb SHA512 f7b55b531c924bcdae71beeae0191b0ba002a7551012e8a6e1c088fc74dc4c985353af362138fa9276eb5d965f25b45b3c87c8e1a756d8c0e89893816b825661
 DIST github.com-golang-oauth2-9f3314589c9a9136388751d9adae6b0ed400978a.tar.gz 45022 BLAKE2B 0b14e367f087601624a84ef25641b1f3338cc689ee92136ef51abbbdcf1b3b3dc1cad47b17868a39c1a9ecb2f792cdb1d5bb8f8ede300a5d9dc8445319c05132 SHA512 8a9ea21c4e7f9dd1ceeb069dee1987f5e5e5ba4f973572ab6f0ccf00ae6246a142dc517ef15ff83de5f3c16c267181ac3812d3c6bc0180d12b98d7540e1fc91d
-DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a
-DIST github.com-golang-protobuf-aa810b61a9c79d51363740d207bb46cf8e620ed5.tar.gz 332903 BLAKE2B b05fa3e3316bd6adbad623ab239795172ee70c38380873ee52a32c10f8f3e750c26b27fc43da4a290d82eda5723fd56063bffe01fdedb2d3a65bf5349abdb376 SHA512 80407835aef3553f655c35e89aa884038c90a3667460af1db60b069ae31e870efc59d6907743ee080d85e167c20d778440b9a6d19ff79f9055bc666c8314fe30
-DIST github.com-golang-sync-1d60e4601c6fd243af51cc01ddf169918a5407ca.tar.gz 16326 BLAKE2B d214c190a03006b726b4e5daa8320aa2f664572db46ac6a57545ccd3e98529c63fd5d9296e2afe0af0b781fcced4af52127d8079e72d116e0310688465e1882e SHA512 dc67de045513305edb3239b412b9154b44b6f408eace3cbbcf400c08d68322cec7090b9e6b22d63bcfaaec459e221d0e3f2c057aa19ae9b35a4a134dd72475c5
+DIST github.com-golang-protobuf-6c65a5562fc06764971b7c5d05c76c75e84bdbf7.tar.gz 312591 BLAKE2B 68f068eca7c4b2b7d54a1f8775f78441f94990e65ce389aeee932deb15099cefbc1e5e24d0dd270374283ab5e2191435b646f65c376f0997e74a9300cf9c7ef0 SHA512 46170e316d5e46f01c927d00d0c953ca430463356f08f904973229fac429903760c65cdfe34b60156bd79159dc1670c88589d19c3990d7460fe6d0e235c220de
+DIST github.com-golang-protobuf-v1.3.2.tar.gz 312285 BLAKE2B 381ae3c4bad3d3b3d489a3b66752e9e2405d17d9ed2c55aa1ec06ce6c18171b1c7625f6cc6e28490551a6410835f6e774a408de39f6e9ea9b3cddaf46e3b859a SHA512 ef9190f7773b18005760eb755a1dee25eff38c188687033362635e2431cf2c7372a59a3fec91acd6e4f63aa31d08391f7521a8dafef7895268b6a1a78735dd8a
+DIST github.com-golang-sync-112230192c58.tar.gz 16835 BLAKE2B 51efe53ea7ab1f11f8ff078fbfa91526b97a1d918101bdbc755aa500424dda860d3a11195c1e44d033eaf7e0d09e7f327e404ad9af84f4b9747d8805b53dcf10 SHA512 bd90bb14e688fa7613d83dc8718bbb688a2f05cc8eb8c3dfbbf71daa7dc08e35044803c4bf8e5d5aab625a612e986e6f76c822c437f52132581ac37e0e2e92f9
+DIST github.com-golang-sync-42b317875d0fa942474b76e1b46a6060d720ae6e.tar.gz 16241 BLAKE2B 64cd1b60a2eec29327f6438bcb6eee78eb81675996a04615aa43157b565abd3f6503edd3b6eb6c59d11351c1de1cad4d2f5ca7194f4b69ad61d198e6f90702e5 SHA512 02aaccd81a4cdbf26ef10f4693e4e102cc6616438a1d6cd326fc4d91f39ab0dee36cce364ca74c1a424a85d5d59cec6e3cf364f5dffe7262c6cb32d9e485e56a
+DIST github.com-golang-sys-195ce5e7f934.tar.gz 1516474 BLAKE2B 1250ecdbe45497c53c629a0564fbb651e00167d62bf74f2d0d2bc27928c128f17d14d6480e07c86b80b5ed304ce4c3bd4fdd596e73bd2da010b84f0e1941192a SHA512 0ce3571ec62cc80f486665abccb2ce565de997685ec86f58a33bace4e193f344f7016754950e2e4d43ac6b13d05f64d5235c26db12165335e37e941bac4b0f2c
 DIST github.com-golang-sys-b90733256f2e882e81d52f9126de08df5615afd9.tar.gz 1242904 BLAKE2B b25ad8ab9a4376ddf2b51303eec7cbb954c53693950b040bf118294484b22f27e2b463c3ee2c994b511c4d04119c85b1cc6f56a3ccee21b297bddab242f22b82 SHA512 b79478d67ae01728adcc6fe81ec91396ff2459ff0d48e05c235f618264262b393c566af902845d34f2ffecb9fcc02ced5a1476a3e00d66ee721cd20e7b49fb7b
-DIST github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz 4604452 BLAKE2B db401ddda5fe4ad1504a520707fb19053b36d99a3c47101e682ce9be8aaf7e216af586816cde01a3328f09d02e9d3c8adec35ea1f74299106b47853102de9206 SHA512 c613d40866803ea36cc43507fdd33dec8581bc6bf0bccdc53efac2fbb1f5903c94ffeea6deb18928fadb09aee673648d322bb7b8db34a7f630500248cc9fc87d
 DIST github.com-golang-text-e6919f6577db79269a6443b9dc46d18f2238fb5d.tar.gz 6588337 BLAKE2B f182e9a40157c43aa749fae5fd6aacadf994a7c2051fc23dfef8031b243f691446d4e5c93c9b363ab22df38f533b1635aa45e23f4d8de7947ad7ab0aa8e5898a SHA512 caae52905ffdaa8e712f6b92a03a8cf9d9eba227e04ee795977c2b76bd79bc16457f846c11e45525f3e3df557fab5e0279fe098c0145b5807c0e580dd339f452
+DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
+DIST github.com-golang-time-555d28b269f0.tar.gz 9592 BLAKE2B bf24959690760b113dc64c0f87069d5d271200fec989c6360063448cbad078b8ed8c405c7a6b62616e4a37cf584215c8ce7020f2a1e6000d2f0c09820a32beb6 SHA512 fb3aead0791f2012484f94ef97f12c7217fc56b583f39c4e38ccea5de26ee84a4e8274a044f96a62ec3cbc5e647ffc064fc613d2b7172187f283108171d12374
 DIST github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz 9005 BLAKE2B 5ad1988c9bd3a632ea4b248e32f6223a79d54b68b1c95bddcace042c22c20d3aee6192bf3d72def729292ed50e4d423935c3ec7004398e03037f91b7f401fd77 SHA512 65a69bfc6044de4ecacfad1c9c8add6312745bd2ba3dc46f522f1e7a424aac49b5e18aca60f8daabc340d50d73675cd5c06de9441060d86009a092feb4f5c9f7
-DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9
+DIST github.com-google-btree-4030bb1f1f0c35b30ca7009e9ebd06849dd45306.tar.gz 15299 BLAKE2B e7e700523dbf1ba2f8f71d2bf8279df517787971058a46d2599ff0d4c57c00943209a5411c044393e5a15c8a233ee7135f3436ce924a2b30f107b264bd71d3f9 SHA512 c2511fcbdc58b3574ee30e4cd4ef3ab7483ffe7792bde161a9d926c09fe4ecfeaadc87e9bda84c18a5439f26db9c48499706ce8766cb8c232d0dccecf53e7429
+DIST github.com-google-btree-v1.0.0.tar.gz 15292 BLAKE2B 663edd55fb375f2b2b1ea377efea8d891baa501161bd5b87a5d10cc84a65d4de0cd4e7b60f421d476f49f26b2ded0fb8633348392c993585790d1af194c147ad SHA512 1bbd6fff467a0f6f6ce074e94a1c13a019e7d37949cbc041d2886bcafa1076426146b46c21a15f55449d525265c04749312792006bd9ea6baeffa6f3d9705a20
 DIST github.com-google-go-cmp-6f77996f0c42f7b84e5a2b252227263f93432e9b.tar.gz 76176 BLAKE2B a2c233a7301def18dee5a8820daf83734c41022b391a9cc93f3af598ed60449a17d4c0ca5a6a54dae1e91375c86956accd608b1ca6941f00cec2f79d49505a0c SHA512 e2067f3159c0423b5b067581b116997d347f6f6fc7c43ccd7856877eee8c7d578350634405e082e287ae9cbb809e82eef83bc0624d25f011b6e39ef365ac09a7
-DIST github.com-google-go-genproto-09f6ed296fc66555a25fe4ce95173148778dfa85.tar.gz 954349 BLAKE2B 563f54c912499af269379e4d21b82cdb6040d363d327c9ca88aab8609a68b33d5d7e591346cd4f15544a347ce9a6648a5668cf327b556410e31c0e7ebdca3eea SHA512 d1c62a01e1cdd1e4f60603fc873d781f78a3a0b6ab0f43a028853911f80c6303b1aa2e9e7be4868f89068c7d20e5c4363df8e035a260f7d9b472e66b1c4566c4
-DIST github.com-google-gofuzz-24818f796faf91cd76ec7bddd72458fbced7a6c1.tar.gz 13166 BLAKE2B 83980ee59ba818996fbb52f7506b2870893be99d292d404fd924f30b401d1b505fdd8b83fb8dc9f45fbde5164fa125704d3dfc8edc02507c601af08463b854ad SHA512 09cf1bcb662369fbfac5c6a6e3af5d0adc3623eb7da384a57bd578f8359e341f0a8db597e21821dced1fdf055ca97ca3031a331954291779886fd156094b7bfa
-DIST github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz 12733 BLAKE2B fb29066f37f5f7d6aa5c7e0cf4a90b9b16de012d809034aaaf10ed4a43b5941e68c8925fe991ce5b25fde56995e8e66317fcab2caf97a722b12cc03825190488 SHA512 d3c2b411793681cf5b55438e3ba23512b6edbc48677c2efdbaea02d226519690525aba848cfde45205dafa39fda9f2868960b39f744aec80222b61dc42b77da7
+DIST github.com-google-go-cmp-v0.3.1.tar.gz 76403 BLAKE2B 868b09df4c8f84d945e66ab8f4c6fc20cb939459709d8479bf5ea2824f75e4f4850ef758818d75d11f86185772e7fa6f1a6ad4c5e7b593679f456aa81cebb69f SHA512 5cce583593d7d6bcab92271fa0d1b58f7b34bbedd9c3e1864f9e86cacb118b9bacd7b111165bd932b5f978d27fe0c779fc6f5edfb6c7b59f4d8b111511e7a782
+DIST github.com-google-go-genproto-919d9bdd9fe6.tar.gz 5549359 BLAKE2B 6c3a3172e33c5f7e8869ee79c60bb834aa11da173a1b7a8c71837efcf2c026ce9c6c27f7e83418e47f219b2c7486b81925eecba8581bceae3f986f60c5874f36 SHA512 e7f42b9a1d298e8a37d662fee6d478ecf515ae13b6e9418b1b8a73e46ae3c2a39b57db723891e9709f02cd48d2dc24d046c74997c31b2c186b44afb154a98037
+DIST github.com-google-go-genproto-919d9bdd9fe6f1a5dd95ce5d5e4cdb8fd3c516d0.tar.gz 5549359 BLAKE2B 6c3a3172e33c5f7e8869ee79c60bb834aa11da173a1b7a8c71837efcf2c026ce9c6c27f7e83418e47f219b2c7486b81925eecba8581bceae3f986f60c5874f36 SHA512 e7f42b9a1d298e8a37d662fee6d478ecf515ae13b6e9418b1b8a73e46ae3c2a39b57db723891e9709f02cd48d2dc24d046c74997c31b2c186b44afb154a98037
+DIST github.com-google-gofuzz-f140a6486e521aad38f5917de355cbf147cc0496.tar.gz 13207 BLAKE2B a64f29fbf7211d3285c46b0691e5f2ece230014c1e614552c150a45d1df218b321ab3b87c32f5055a7a0f1855d468c0246f2a9891fb116fc71005b978a6af636 SHA512 324543b6462cb05811240d4646c8c0d56ffbef7f8476d5091a817807fc941ac72311e27b31a20ccf2df894bb3360a8d36b34dd6fcb2069922ba5f3cd6777b046
+DIST github.com-google-gofuzz-v1.0.0.tar.gz 13201 BLAKE2B 3884b6e9a6f910986f6ff5705b505e9107200a034d0c99de426af38938a71adb3ed443bf45da70fe68133c528db69aacebf4be74fe47d5f8bbff0bb88a4d8bd3 SHA512 826cd0d22d8cfa724e4b16e052fe732f52c81ded6168b22eed1839fed2b12d020b98ff3518f8620bba3659cb404fae342875c16386f4ecdf48286e5b99b46a95
 DIST github.com-google-uuid-0cd6bf5da1e1c83f8b45653022c74f71af0538a4.tar.gz 13561 BLAKE2B d158ab89d96b1987a79d5ceec74ac002e5b4053a86cf3a3d407f26b27d425fcb11e113e388f688eb181229ca280548f6c3490077d01f994298a5d47ec68258d4 SHA512 c0185645a3df24ed5edff43004194f844b5e67c69b62dfc746b457cfe236b869b225b3d383e8bab161281aa1fdd667d4196a7b0ff81dfa32e3ddc73aab43af59
+DIST github.com-google-uuid-v1.1.1.tar.gz 13543 BLAKE2B 554d0cd47b38f272b4b6da0e7f326336c43bc2730ff595640c1ecbef2087fbfc063b21e6477003033ca2486c68fb91610f9e294a60f69fc72c60b1bc553eb778 SHA512 49d72c190422c1c7bd201f288a8bc644641ef61538b21d91e79d58d096f672bd49359d22be856d450f657848ff11b110ef325030565720f7bbc3e9d58b003f0b
 DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136
-DIST github.com-gophercloud-gophercloud-c818fa66e4c88b30db28038fe3f18f2f4a0db9a8.tar.gz 797285 BLAKE2B c21bf269e5b5b5b6b2e6f1dcddaa9ee517e1015db18d0459a04cc5cb3c0b916c63ce36afee28d5b99ba85c88788d71bd1e5d4351be963e4d086db48d63eb9e57 SHA512 4b92891255ae94c22e1fd262cd42f37a1f74f09d9afca582f7b54364889b8c74ee55fbccd82db45ed5ce19729975e0d07283a2677eeb7a9d42ac2fab8e2d8231
-DIST github.com-gosuri-uitable-36ee7e946282a3fb1cfecd476ddc9b35d8847e42.tar.gz 6864 BLAKE2B 71816efd7996458a90b192780fb720b9a0f7ee8bb01df6d1fa0e079ee56a426310f632839e921ffb89403145e63a34e90e985099221c4253bdc1c316f1aed37c SHA512 7cc647e6347258b9fc455cda220da8f59c3ea92f975369ce5901289102d5db8c45ea6fe24a587cc4dc95a502c4fc203c3503f9db0c427cca702418478eb25f25
+DIST github.com-googleapis-gnostic-v0.3.1.tar.gz 435152 BLAKE2B 4e44b4aa14ab0abdb64480284d0130a1b14654ea51ab64a6fb047f46fc0279b7cb92297d9f142978499145a4c1cfafb2ce467cca48a069c1ab9946119cdd19f7 SHA512 deb94ced6b07d76f827bdf9d5802e0734756ae96afc7c3fec7c602a17dcb55dc3228e8ff22869aa70c7be4a560cd2118218fa5056e19c198577b25c197d9b4cf
+DIST github.com-gophercloud-gophercloud-c2d73b246b48e239d3f03c455905e06fe26e33c3.tar.gz 875548 BLAKE2B 229cfc12ebc179242a04fc5fb80269f2b25e28d3e795a5f7ee4894b6717e9dba8240d5e0b5621dd8ced6809e4f13c0b2919b6455888534ea96d7fb106e9664d1 SHA512 bb6d896c5d830877d3ce8b865be99c3807558ca480e237530152096db3f1c4bf3ea757e3cec1c2206153e3721299f6a066784c7391b701f9de0e4a891e6edd09
+DIST github.com-gophercloud-gophercloud-v0.1.0.tar.gz 878471 BLAKE2B 14a11a26925d738024b38bb9417da8e0fb4462df825bab5093ded9d57cd0b7f1ce2c156a9d1946aef5ae40063961a759be4ebed9a5d717608398012eace393a5 SHA512 ecf6df2ae34e42119eb33b05d90d9885d45eff12ea18d6da539e7c57d986eb1bd2659e82943a55ce67bb78f91e05ad2813e298115b8bda5e2c86485f458bdd88
+DIST github.com-gorilla-handlers-v1.4.0.tar.gz 18379 BLAKE2B 6e8ce2f251b18a5e7323758181da27387e80525a7cab4c2ad6e479d4cf59a4fb5f79b27e773b2a0eb79768979de2f2c101ce1023344bed7dc913a177b2d27c8a SHA512 fb3f9d00b7a5e2d2381c1495b33a7426466d203657ff19e3f08b4bb81190d2039a85a165d3a16b9228f58a46d8d3b9befb566c62bee39879c6cc9bc58448e747
+DIST github.com-gorilla-mux-v1.7.0.tar.gz 40777 BLAKE2B 328c4e882b43293bbc0d7781dda02204f125f3c8947f4c282c228b773d1ed3b4e1a5ff9d95d6750c77a17b12ed64a9aaae9e78078897d3dd7cbcb1fa79a73e8e SHA512 d0e212b5bed8155bd84a63fd3655cfc27865125b9e2f828ef107cbcbadfbf6bfd0acce4af579f52deaffb0dbe20288ae178c1c5cadb05e525fba2efca5c0c8ab
+DIST github.com-gosuri-uitable-2cf933346b8370a3a3d8867ef5cf54b2129d8ecf.tar.gz 7216 BLAKE2B 59a08e73f84e424c5be5d811011996bccf2892295c49d658e90ef899349bbee0e1fd97ea6ce46a5fa5d41493a19ee552e0cb27ae0dff8fe47d49045b4c2b2c96 SHA512 151569d9477f3ca2c7f91f80ccd6dd15a5c7461f7918f2b38de5149a419b56bb2f5fcb79247fd74fb57143b74c28906f31ded794e7e89a50d4fede5e092a303a
+DIST github.com-gosuri-uitable-v0.0.1.tar.gz 6858 BLAKE2B 5868330856e262df2eea7a1710ece3d0c1e4382262589bfa2b75ea2a718a1660361b24c0499987044cbfd0ccc5fa3c40fc977b4debaa9945d5556ae441e9c44d SHA512 cf544472820310725dfb744c3d62a661831dcbe224cb8f40a8e33277b6eea0acb05adf0f2b048222dd1c045214697240644d85a134814913ac7be8ff11b7a1ed
 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-gregjones-httpcache-c63ab54fda8f.tar.gz 13973 BLAKE2B b7999233ba740e90789d970e89046fd705a7830878c782fc23b29fd82c5284d724df58d30fe831ebadde2efa2f3173f569232e1903903b1d31906f8c3c43254f SHA512 ad9d66e88867da3cebf877550f1e98c4258923a0e262a8863b5635cd926f2f798ff1e8efd3a8d0c3e614af748c44b5c5bfc08b8930ab2281be01c51f1bdfcdf5
+DIST github.com-grpc-ecosystem-go-grpc-prometheus-6af20e3a5340d5e6bde20c8a7a78699efe19ac0a.tar.gz 30622 BLAKE2B d877284cb5e2c544f56f4df5e61d3176da794e1af7c95497e0de654863feaa201dc5addeef0c04cd0871da643a56819466f3da129896befb10625e6234cb130b SHA512 8a3c39803f6a6a6236917a50ca319a7b13097332c8b8ee831a82214dd6b464e35e515c3058faaa0f2223671c44f9b2e0af64adf87f6e9cd1b21518a37ed06b08
 DIST github.com-grpc-grpc-go-a02b0774206b209466313a0b525d2c738fe407eb.tar.gz 590343 BLAKE2B b5f35015f4511024163a968d520f94f47dadf83e5514c24bbf990f460acd1a5389f2ccc015040d889216eda8cadaddccaa94841d52215a114f900c96406daaaf SHA512 f14f19bc116cf465da08244d924baaaecd1676a3ff19c9efc6e3fa5ecea60558826f945adb8b5f1231046220241b26e69247a108399a04de6289384d0636a3ef
-DIST github.com-hashicorp-golang-lru-20f1fb78b0740ba8c3cb143a61e86ba5c8669768.tar.gz 12932 BLAKE2B bc1b79ee6e403aac18a857bd6bd1083258a33f492821d141e66e7e851593c8ffa466e86edaee0e27a9ca04402b079c7fd53430c3e250924503e64407c299835a SHA512 bb057b39581e832316d52be23312d482f242a5f569feccd8a1c0b7365bda07ea6818b5c643da4610a37030e572bf395b2c62c30cceb12f94b928567e0b8db989
+DIST github.com-grpc-grpc-go-v1.24.0.tar.gz 755074 BLAKE2B d3f65458971195db3329807e147811e3ac049d0b6775498efee7a98885dfbfd616bab490f5684341a9968bda6573b89ac008219d76b224a8c25994e97453b36f SHA512 479dbb72eaaec6fd6e48006b9b2ae636b5fd08b1fe5aeeed18c40d794b1ee4d4fe473b3d2cc77fe5ceaa1ddd00221a64d940d8fb228612c9ed3c83c7d1b4c756
+DIST github.com-hashicorp-golang-lru-7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c.tar.gz 12983 BLAKE2B c600a2ee072ae86dc080f10232d079f5d0179e4f3ebc4c7db4ac2ef05ed99998843ce0882c38236552ce36ba38898dea6a13956e2da9ed58af91a728a34a980a SHA512 1a87bbb71da395c99b947aa85ccc8e8f680af14d0be3fcaf353bb058ffbde80252ee5dc5186e5a0a325cec0cbb8fd45cf86f3e6d4f8056515af1af4072c49308
+DIST github.com-hashicorp-golang-lru-v0.5.3.tar.gz 13348 BLAKE2B 598db380ae34bfc568d5a048e991e9bdd6d486800caa4c7d27ea96877f47e5fa5448b3bc30aa9d800a41755f9a17189c36ec738b8e7c00a51f2a80db3c270a1e SHA512 8775349e1c9df60a57a425f506ff53a1849aa4877a878583b59bc53f3e746f5b6c482ded9bed9182c68e1d12c5acc4bacebe7a6d41440234d4b40361bddb805d
 DIST github.com-huandu-xstrings-f02667b379e2fb5916c3cda2cf31e0eb885d79f8.tar.gz 16630 BLAKE2B a342eb5cc38aca4f5a5a5a36295c0c804997550997115b86373b6b6879b0d6faf1576aa0e0b550127a1b9fa477e2fa27c44c7a6be93c827ffb913419ba4792de SHA512 f291b9893795084d081bb6cf025ff82044b2ef436325a3f0e16f6a193e5ab516439895886a284ba45156839bcc643b5e702db7d1bb438b093d91a2ab4999c62b
+DIST github.com-huandu-xstrings-v1.2.0.tar.gz 16628 BLAKE2B 730e593c459a8b8719f0ef946b548ad27dddcc7620da7285417940c1cbc49b63b6c68b09fa4208643ec5c663cd8f32f28b7b4cd10c40c79ee063c16949d60e0c SHA512 f7e0258a706bfdb22ec954c0b61aefd1191993d465ee6c3b756d9ba40935b08b621275a5097c779e41ebd9592376e8e640532558b948acacb182f14dbbac759f
+DIST github.com-ijc25-Gotty-a8b993ba6abdb0e0c12b0125c603323a71c7790c.tar.gz 10563 BLAKE2B 1e14db7f262dc98146e9a7cecce50f60dd592c62b776432268f7203f10fd075b8039d5b0ff1292933e6bd2f3d7fbbf703a448d915fba1842164b6db70460fa37 SHA512 531bbc613bb6549653ecc7c9e4b7418505c9de93a2fd638a52ea6025c40416d46bab3476704661245edacc68cc200a32ea4cb7d4b0b6231b5ea1011f2bb18f27
 DIST github.com-imdario-mergo-9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz 15928 BLAKE2B 1a6f95308897829160a1a61d76fb17fe6da2159ec68a9def1294eee0f7c5acfa0de9581a7afe05353a79088374ebbe8ca1299844666ee52a3074b8a2ed04d02c SHA512 34bdc7ed182a4290862c4c21fd9442e6b3bc03a16aa04a54aede48f16c0baec62478dff97433c6d3370b110abf4a712b304064826589ef922d1bf8cfb80fd446
+DIST github.com-imdario-mergo-v0.3.8.tar.gz 18180 BLAKE2B cf61f9eea10b02f4a179017f2baf3462b8626880902c0fad48edc5baaf2acb95576debae34cb33bb09b2146e9353f44bfad3067c08157b6632532672fc0d3fb9 SHA512 aeb0b1463168cf9f4c84763694d366cfb67bee66e112e1bdf329fa72ec7e475182f9eb902c82cc9eb191b4a3309be2727759c591639a11e088121916018bdb6d
 DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
+DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
 DIST github.com-jmoiron-sqlx-d161d7a76b5661016ad0b085869f77fd410f3e6a.tar.gz 49619 BLAKE2B 69a7ad4e10d12420534374e36a0897aaf9219479a128842455f00f865fd9c15d0b580ccfab2ae0a98a4720b19f0230291d24c773b7c297b9e47306fedf68e6af SHA512 d52c306a0664135d8c6e63e836791ba829daf9cf23c656e8cf93ee258aef5c708a7a83d57efb0b0d78456b3c644677ca25c0dc9960a0a2aa058202f799880555
-DIST github.com-json-iterator-go-ab8a2e0c74be9d3be70b3184d9acc634935ded82.tar.gz 75753 BLAKE2B b813abddaaa09f947a1425ea097be3162b255e572d00c0eedcfd87883d31ee48a5e87f55a53f4640805ce779f4b34df43e4fc44c4f1a0beecfc25d13c7a401fe SHA512 065176d9d83c2ff364eba1a9f0081c68c305383cb70e5193a98e8bafb70bd8b562e050a070a63f7ae60f034bfbfa2bc47b764968818e9c30400aa73a57040a72
+DIST github.com-json-iterator-go-27518f6661eba504be5a7a9a9f6d9460d892ade3.tar.gz 77940 BLAKE2B 3e783fe2e4a2f2ae32944492d8c959968ed48a3d0c3eb73c8bdf91533bf09b954452edfa489f0f1e916956c764c07a6d6af8e2cbe2a5cbd843acc0bb0184b1e4 SHA512 3cf5fc88eff6625ef43dad53127c1499ec8edcca864ff4619fa9f1c28a2fa776cc9502afb40e775c08e0f269315a5abd16f939be25f5aac7c19a97d2e2b9b391
+DIST github.com-json-iterator-go-v1.1.7.tar.gz 77936 BLAKE2B 3bdebbc4c36c3fa6ea805a120b542768203460618b7a1cd566f7618b11096af9b6f378806074d06c5cdd17527e6ec7871e363ecdd17973a7a05d5c9c956fe98f SHA512 b93e335d828a4be5bbc402b17c24ede3c741e9ef4e62c91d8899c4fd70b567cbe841c175e3ce31a87d589627185ad3dd6c664b9db6170943451a4e66ab75ad02
+DIST github.com-kardianos-osext-ae77be60afb1.tar.gz 4860 BLAKE2B 8f5958f711e86899267876fa27d534a34e8d48d07eddb14a82cdad1bd4056e525e74e41161be398e7da9c8c4bf7e03a1dd90e897bda7463dd7c425a20b94c8f3 SHA512 924fb47d68a300e7a17e67259c1ca6f395c23a2d630cabccdcea7ff76a9087597b317c2cdc9cecc42d885ce1e8faab338539f210681f02c695657d7b17039bc7
 DIST github.com-konsorten-go-windows-terminal-sequences-5c8c8bd35d3832f5d134ae1e1e375b69a4d25242.tar.gz 1901 BLAKE2B f8abd760472e484d1d6465fcedb5240ac104556af67715860c0429b9dfd963441396266f3b1b0af2b6a62530dfa4f8ffef9414561ff64b8639e6eada9efeb301 SHA512 c8445e656d4042d0c31661bfef05cf918e84d5b4905de09553cad0682c83fdab60ed11c0fdbe90949566514125d2353aabad85d36c15825a48e86d8ed73a94fa
-DIST github.com-kubernetes-api-6e4e0e4f393bf5e8bbff570acd13217aa5a770cd.tar.gz 775958 BLAKE2B 0c30e606694c8457e0ce36aab860b93d6807020891be9a923ec3990b83d9f4a5d7323d9d283b7d5f1e0d122fde9f4d80b7860c2c2db19ff06ed93ab93a723199 SHA512 29a70fa69173d06ba84bd313d433cdeeee9a0326a5f2f4a7e859d6e5cc4fc4e6e7dde7d13b8002e0441dd42f84c170770b9855d3b4b5412e6cdf19bcba650599
-DIST github.com-kubernetes-api-7cf5895f2711098d7d9527db0a4a49fb0dff7de2.tar.gz 1447047 BLAKE2B 964cae79b15cc112d0f9cc91611b5103900d4e74aca63f731790caef2e2fc5f189e0c53d17b41b242565debbf032dabc8801a05bc2d886f522aede196ecc00fe SHA512 7b387cf705e547331d7ec106ea8ff9db1a114e231852795f2f2c0ea18634056ccd3a3dd4b5e18069b94a500a294865cf41d8aa1091f1aef0337e93bca150ec65
-DIST github.com-kubernetes-apiextensions-apiserver-14e95df34f1f469647f494f5185a036e26fddcab.tar.gz 283011 BLAKE2B 06919fe84a85cd31ab10a4b22db2ad1bb6dc33047a7f3a2a713dee2751c75acca3570deb7f9c3773b94522b36b44f2d5030a2daa7cc7bec1a831474cac4f5558 SHA512 a83793b4550f38457bbbf0a071c13974397dc9ec1a5d6848612044cf2722531c965f1533b6d6000b0fce6fb4fa73dbd281914895fab02d2d4a7c02dc3217f837
-DIST github.com-kubernetes-apiextensions-apiserver-727a075fdec8319bf095330e344b3ccc668abc73.tar.gz 6258035 BLAKE2B 7419fe02e398c4764290f21e20992c9449ea212e43a15c6db44dd78c21b5572fbd842a977dbd02e8c084c88aa0dd39283681fc92eb9a1b4c6f37e4c8c58fd93e SHA512 1e5ef8152ac7a85ac6d6de99fa5a4c5900c748aab292b6d7a8af4e7fa865a9f6336581953ca8c0a6cd3b8b3cd6eb4748d373da483ade428865275d987d0193a5
-DIST github.com-kubernetes-apimachinery-1799e75a07195de9460b8ef7300883499f12127b.tar.gz 491755 BLAKE2B 21ca16da64c0b657e6dbcc27eb26dad784c7fc6be16669447a55ed2ca264fc72963dd53ac0a3cb165437df4a5018444dea5f051b10d47633c730f4fbbcad4424 SHA512 7d63539d33aa99e1cd32e079ad303ab9223a3a248df146152d1d1df4ce31c8ad8025546dee33b5f87a5be5c3b9080c07e95291cb2d9ece83bebaed736c4e2e45
-DIST github.com-kubernetes-apimachinery-6a84e37a896db9780c75367af8d2ed2bb944022e.tar.gz 474085 BLAKE2B 6f14c64b7d4092350f5cb70c2648f5285cadeee4ffc70331fd7135f7dbbed82e4109a433e04d5e6691576cbdfc15e31d1b673eec94bd79fdf7c65e3d5d3626a9 SHA512 8c3acc2935ef84c516607bf93419e0fccc09e56e4101e1d8330a975a3e6171d21397cb2f98ccab6a3e7a9597bb1f9b1e936fa53746442f2cc5de1fed75a95c69
-DIST github.com-kubernetes-apiserver-1ec86e4da56ce0573788fc12bb3a5530600c0e5d.tar.gz 703289 BLAKE2B 23d5b25741c33355e738ea50914f4f585db7bd6246ceec1c0ee0f9a246fb61c4e6a2f751bf33ed958204ab2af91e371e9f5d5c5266df15387309ef64a986d307 SHA512 8155d908db3264aa7252d72367c10567b5b274027b2ef90c71c3e2a4ae86ed3fb1bc946511814ca94937773a345453145df079ac23cb77b795f4afb60e1876df
-DIST github.com-kubernetes-apiserver-47dc9a115b1874c96c20cea91d02b36e4faa1bb1.tar.gz 734024 BLAKE2B 7f2b51bce843124c4fede88a473bcd7e3aa071b525290d95d35a989d748e89086e09449ce66a765476ea462fd4b9b346872f2aae46757ac02b6551d690baffb8 SHA512 792e7ded55535d102c1d331fcc0e26e51a0b2430a63eca7b006c1be97f8f154e519037e3cf5cc4667c16cbea3a951cbdf21148277732c23c5d5e9eeccb9c36c9
-DIST github.com-kubernetes-cli-runtime-2090e6d8f84c1db3e23968b0ee97fb677b363fcf.tar.gz 86163 BLAKE2B 8b58fd17d380720afe988eae3f3daf29e88339220fe4a4c8e0b06db32ccb057c4e4bce8145b492d96a03829beb3c9b1866bcec60956860c4c7fa94bd635ced68 SHA512 e619c24b2f79b66d39acd4b88862e8161fa543264597cb5f10e7901c3b3e7fdfbf5de825b81e5b833ce179a673b3351eb621ac3334f1365821a5d32ea4934e24
-DIST github.com-kubernetes-cli-runtime-d644b00f3b79346b7627329269bb25f2135f941c.tar.gz 80440 BLAKE2B b1ed3f539b9fdfd8de63d769fe5ec83b25e155f7f49fbf2a22b25f147278fa5c66941f2a680e6e92867340d910e7bbb4daedacf494735ae8ba54676b38a6abd4 SHA512 736dc5b9cf0023c11a813c6121dc694598a81de886db1eebc9d29684a0ca4f47024db812de37ce5b0b2ab875c8355483a48690a88d45e782c56dbd15174aece4
-DIST github.com-kubernetes-client-go-1a26190bd76a9017e289958b9fba936430aa3704.tar.gz 543092 BLAKE2B b4913101d300c949a9b0c5396d2f5ae433f8bdabbf736ebc197c07471d7076e69d793923c84c6de19cba454e5327e84977ced6dce6b94f2c842a60e4de02802b SHA512 a2eae2811d7ee942b74a24e976c2840df9985e16d46f1c890ce7591341ecd60664979b6f825abd30fa0569607139e6ec208d40e98507ec3d364d52958c2c8818
-DIST github.com-kubernetes-client-go-78d2af792babf2dd937ba2e2a8d99c753a5eda89.tar.gz 560611 BLAKE2B 2d4f996b26573099b6c1efcb25da61400a4f994c59ed4fcc896ef3064ed5ef9260f5ba2ef3d9fdafa50195edd687c914cc0a874e562c235b3d135d1edb41adc4 SHA512 06c2c6329aa980726e56d52563af7dd4e191e0c1209f0c2e79978877cca13e1f6b022e8da4069916a95f84f81f07c8d6cea9b2d832935b3ed00cf7559bb86894
-DIST github.com-kubernetes-cloud-provider-9c9d72d1bf90eb62005f5112f3eea019b272c44b.tar.gz 1491284 BLAKE2B d9ca8dffff0a374fe1a6faffc202d6793e9be10a10c1de9f76d5fad37fe26a45ff8ca949f5eb43889c1491c9c85ff714eff55f3690ce12a791493cccc91fb26d SHA512 d48c0d88fda9a68be9550c7498cd0e2073acba6187a9d2d90f54a66261bae22a83fe7b20dda67e7003ffff1c1d3dcaac757a3f7edbc91a3850a6b5b7ec6528b9
-DIST github.com-kubernetes-component-base-185d68e6e6ea654214f444cab8f645ec3af3092e.tar.gz 44010 BLAKE2B b04235683c8e6b46b00e7fa302b5ac0aaaf26f68433e6f8205fa839ac5ade1e711a94c4acad7c96a3b0920a85d28a3fb3412cfb2202b2ae7d5b7b77f7981b242 SHA512 37267c1c07c3d5622be3177488d8118817735289be17e66652acbbac03b49ae50918f63b104a3e203f1ed7d08634f792f58ebd19a3e31013a95d33fe55868933
-DIST github.com-kubernetes-klog-89e63fd5117f8c20208186ef85f096703a280c20.tar.gz 28889 BLAKE2B 1039dd12ccb380dad94fd3e4cf3093bb445a9f92bbaa3c9590a7575628ff25a8051154ce2a1365ba9cb3d7cf540724c5756f3c067a529af5d6aeea52bd430bf2 SHA512 6874d3a90f42c3b9f4c4c08644273c167f0c6306568139e1ee6821ac85b4063bfb4abf78e6168987bcb2d55711fcac28c8f25679720928eb4e873cdb5ef3aff4
-DIST github.com-kubernetes-klog-8e90cee79f823779174776412c13478955131846.tar.gz 27368 BLAKE2B 5eb6965407074c30e8d9fa81c413564cc020e8b4142c1b56330f8ad8efe7a343ab5c7ebc41b7ed433b60a4355f1a18e25de69cf1e02608cdc2e7ae4f7d3b5654 SHA512 8a7540e4a0e5e601e784475aec61addb8e190c2c5090fcf98ac748761dd19e4e01370322cdc92459d97b3d1a6828f7333ce053ae59c989c3d054f0e0fbff978b
-DIST github.com-kubernetes-kube-openapi-b3a7cee44a305be0a69e1b9ac03018307287e1b0.tar.gz 729058 BLAKE2B 68da0c27466683767deeb8e5a3e690628e49fe545254ac72676ee0b1b433f971e7810266e1bf2746d14ae954395c2f70243fe6487113522de3f47f171116bbb2 SHA512 de84c8d256dd331abdb9928cbf889fd0d887f3f6c843cc8eee847e1ffd0562bc58ceea4ad95f1253890111187e9411727a269baa3768a8b45aee2784275e412c
-DIST github.com-kubernetes-kubernetes-b7394102d6ef778017f2ca4046abbaa23b88c290.tar.gz 28009514 BLAKE2B 80cc0733172650ecf89b2579b43a75c532d47029a414f2bed1f18cd0e548a72d7aa0e573a196ef118e10aecf8f1e7db02bbc28a96443f4e9b3c806e4103409ad SHA512 fb59da6510d217623bc06d25414290b6174f80be01f67e025fb2277372f7de78c78e0600eac76110c17c87fd28dcffca47ebc58c70d9733b66e595ecff3a4818
-DIST github.com-kubernetes-kubernetes-e8462b5b5dc2584fdcd18e6bcfe9f1e4d970a529.tar.gz 26590117 BLAKE2B 8ab8a1ac5882e142bcd0f50770a8e0175431e96fd17047f4af0d7bf5d1718ab5687f910d1513a0e22632b0f09167d1d86f2b3cbe7ecb9e21b7778883c54471c4 SHA512 a71a27b51160442f350b45fe0a371cb432ce4fe8d22dfcbe2674aeaa0c4c34b4e1d1063b825635829b1add550fad457d1b3dc088fb0ddfb0fa5cf96c2952e8ea
+DIST github.com-konsorten-go-windows-terminal-sequences-v1.0.1.tar.gz 1909 BLAKE2B edc8dc8f9a9c27d724b98614c2d937f5fed94977c1590f542cb1c8724478a63bba61cd6569fc7daed1e870bc59fc5ca0f5acd501f58e7c93e5c69517c9ca80ac SHA512 8c781a4c17df20623b8ab5af9757fedf6fae9362c10f195eaaeb821a0520ab9407de30607fb085a38a04915eb180bb8d5c4940f91db4fca7ce1cf69a8276bbe7
+DIST github.com-kubernetes-api-35e52d86657a.tar.gz 2540409 BLAKE2B 867f6230cf50a507b284b6e9345a800113c81bb497dfa8becfd926d2159154db39fc22d811448bbc2b812633444c8b262d14ba20395029b6f885f6138f498d43 SHA512 ff48c59fa4aed8e860115303b58f90104bdef4238d7aa6e6393dd342c4b9f3e07c7a4bd7ef6b3d3987cda819d5cc73345dac07fc58dcfde8389921d7df0fba85
+DIST github.com-kubernetes-api-35e52d86657aba06859dd22099bfa14faf1effb2.tar.gz 2540409 BLAKE2B 867f6230cf50a507b284b6e9345a800113c81bb497dfa8becfd926d2159154db39fc22d811448bbc2b812633444c8b262d14ba20395029b6f885f6138f498d43 SHA512 ff48c59fa4aed8e860115303b58f90104bdef4238d7aa6e6393dd342c4b9f3e07c7a4bd7ef6b3d3987cda819d5cc73345dac07fc58dcfde8389921d7df0fba85
+DIST github.com-kubernetes-apiextensions-apiserver-5357c4baaf65.tar.gz 376464 BLAKE2B 0cc999151e2e7fac2e92aae39d051a0a99f2a3f103456d2af803c56ee8d9e8d07027d99d5de50591ba61d5ec9cd48a228542ce1792c867a737172c696b10b4f4 SHA512 430954477f12ba2cdfcb9de5010fea62f9a1e8ac1926f2ce2fe7e6589763d0e44a741bd246e7232554860ba8fa2198ff76e478dbd7fdb45987c4a5f21a5c81a0
+DIST github.com-kubernetes-apiextensions-apiserver-5357c4baaf6562e4d37c9afc9fef99bd16d76a9f.tar.gz 376464 BLAKE2B 0cc999151e2e7fac2e92aae39d051a0a99f2a3f103456d2af803c56ee8d9e8d07027d99d5de50591ba61d5ec9cd48a228542ce1792c867a737172c696b10b4f4 SHA512 430954477f12ba2cdfcb9de5010fea62f9a1e8ac1926f2ce2fe7e6589763d0e44a741bd246e7232554860ba8fa2198ff76e478dbd7fdb45987c4a5f21a5c81a0
+DIST github.com-kubernetes-apimachinery-a2eda9f80ab8.tar.gz 504261 BLAKE2B 2cfd317dbd539ef44429ed651e939ca4e91b64a2f1bac801048b2499d7584696ad44f4846657a3be28d60dbe2f6814d51e45dc702396fd10efc56440b25c03c4 SHA512 93f3cb4b2be1f81ad8a343b47aa2c10f36f9178f93d921a9253605bf9e12473eae68649976abe6e3d6c68a1a2ddbfa95d5d3b1cab0ec7ef0552dad6169feac9d
+DIST github.com-kubernetes-apimachinery-a2eda9f80ab8a454a81bdde16d62a1afe5f931c0.tar.gz 504261 BLAKE2B 2cfd317dbd539ef44429ed651e939ca4e91b64a2f1bac801048b2499d7584696ad44f4846657a3be28d60dbe2f6814d51e45dc702396fd10efc56440b25c03c4 SHA512 93f3cb4b2be1f81ad8a343b47aa2c10f36f9178f93d921a9253605bf9e12473eae68649976abe6e3d6c68a1a2ddbfa95d5d3b1cab0ec7ef0552dad6169feac9d
+DIST github.com-kubernetes-apiserver-5190913f932d82e562d4eb91d0f3d7a063bdbc07.tar.gz 771653 BLAKE2B 1e078ad6acd4cec8d65df0175afb87b7bbf2a6e43d1e71f3664f4bc130bdb4f6202f20ddbf4b431c295bf363408c425025a150350e5b4804d9419f93eba69eee SHA512 da52a1e61394131281db0fd321ac119c613e01f875cd244b5517f6c3bbb86a5747759f3ecd6a0b9dffee27bf6767661c19a01e6fcf27dfb87e29f6b8bfc1e4d6
+DIST github.com-kubernetes-cli-runtime-74ad18325ed5.tar.gz 91304 BLAKE2B cd376f071227fda170fde7bc72ce4efa64d49a054d3e26c35119deae10cd63586f513fc1dfea45c354da092ddd13da827152984dd2de521a80289558cd1b6c71 SHA512 25e0d88e45fdfe3ccf3391de5b28f9669723d103dcd90653e9954df7c78a6c72c4c95ee9fb80f617491db7c4f3bd33974afcaf9a28a62282bb7884d0edd0af74
+DIST github.com-kubernetes-cli-runtime-74ad18325ed51ea6de9ee19bae59156bad18ecd2.tar.gz 91304 BLAKE2B cd376f071227fda170fde7bc72ce4efa64d49a054d3e26c35119deae10cd63586f513fc1dfea45c354da092ddd13da827152984dd2de521a80289558cd1b6c71 SHA512 25e0d88e45fdfe3ccf3391de5b28f9669723d103dcd90653e9954df7c78a6c72c4c95ee9fb80f617491db7c4f3bd33974afcaf9a28a62282bb7884d0edd0af74
+DIST github.com-kubernetes-client-go-bec269661e48.tar.gz 586153 BLAKE2B 959255e10caad42994001b1c8e39fc31eab28842ca36a48fffb2b9af5a7751d2a2fe59e2c40c6b13b083e9efca6051f22d04fc79641434ed156f84c06da4eea1 SHA512 c4f59febb8795b36fc3012d3abee4139f8987c46b3d696f540458e994ced5b9b3b2e9609172c77eb411b3cbfb303a6ca576684cdb049f3630d93084d47475973
+DIST github.com-kubernetes-client-go-bec269661e48cb1e5fbb0d037f356ffe9e9978a0.tar.gz 586153 BLAKE2B 959255e10caad42994001b1c8e39fc31eab28842ca36a48fffb2b9af5a7751d2a2fe59e2c40c6b13b083e9efca6051f22d04fc79641434ed156f84c06da4eea1 SHA512 c4f59febb8795b36fc3012d3abee4139f8987c46b3d696f540458e994ced5b9b3b2e9609172c77eb411b3cbfb303a6ca576684cdb049f3630d93084d47475973
+DIST github.com-kubernetes-component-base-039242c015a9f5eeaccea3ea17c6973b9c27166a.tar.gz 55170 BLAKE2B fd2a2d5d6c427449e4434f3dbf03ffbef1953294f22a32b005197bdcbef45cca3bb9ab5feb45d8f9e3cf8352764c11f25850376a0d975dcf83c5dc73e1e23d47 SHA512 1a968cccf2e060e9ccb052cacfa67be49aa13bea2cb0152d1833b238db23ccedcf102f0ef66895a9d9a6ef2b09648d7d9ddb0d13fd4ca3730a5bf175e26f0fc6
+DIST github.com-kubernetes-klog-3ca30a56d8a775276f9cdae009ba326fdc05af7f.tar.gz 32456 BLAKE2B e7ec2eb0097378d00a7ce7700a2428e36dd75d61cc2bee105661da7465a08dea3e1ba1070cd089deb8a07667cf39212a604f28268d44e53f51956062061c1a38 SHA512 2f16731f09ba48d2862c7744c700324966f28f9dc5135d6812de29900ec58046b88a1d0402976beede0c55b356dcf1b3612e1606bf0597f1da1dfdb1580ee53c
+DIST github.com-kubernetes-klog-v1.0.0.tar.gz 32366 BLAKE2B 8280be986eb5045c13762a97f96b006b38bdbab268a5b18940f18653fbebbfd00ffbb4d82f1bc8da6a2ed202108c1aef214233797309aed082c5870a344d0a5a SHA512 80a8796461e57b5781e2339ba9bd1f40af32e29638255e9ce2141075a8f3f981edcbf551502b0e9a8d23ce6a9ed52e8bd6fc33d7682cff8467ab0ba56b3f8b37
+DIST github.com-kubernetes-kube-openapi-0270cf2f1c1d.tar.gz 739768 BLAKE2B cd4126a01c5e67d0f87d2db5a45bb609bb2d3ffe9840fccf4d02025b8cdd04dfc145a3d48d79b52f4ee8efe27656222fdd007cc6bf482768674d51ceebe05d1b SHA512 51ce0f9476180d683a8f03c729cbb9e1e7e566eae2f2320a0be8831ab94454ce1f4b4132544f622ed1ba0948b772a16dcc48e8514cabfe4eb43f15fca6aef59b
+DIST github.com-kubernetes-kube-openapi-743ec37842bffe49dd4221d9026f30fb1d5adbc4.tar.gz 739569 BLAKE2B 7bb1b625c74a03e046895f21df2c8364b16109b150dd97cce5a882bb632d51dda1917062348ffd35d49c3d16842608ec50687369823df44face78a9ac78b6af3 SHA512 0ef0ea27c32f56a69c80b420658544dbda82d268a6d4269d71fb597a7e042a48088287580c078e1d164c36d16dc784175979ee55654465cd9e3f2e8070d0a893
+DIST github.com-kubernetes-kubectl-2ed914427d51.tar.gz 2760556 BLAKE2B 92ca4c84ff5208691c93fd3bb580c70886b9cb2517abb5518a6574d008b6b4aa3ba2fe7c3bb10605927772991c4e176207289e4a20d917dc5ed7be2834afe540 SHA512 6fe4656a9d2d5122116e01ca94980ee3c9a378ee83a2b314b9e50211854ed2db80995f1012fdd77d4a60a5c8a65e58256cbb342ed2409a21cea26bd4a387f9e1
+DIST github.com-kubernetes-kubectl-2ed914427d51f6fd865e0db43d72b2f22610cf32.tar.gz 2760556 BLAKE2B 92ca4c84ff5208691c93fd3bb580c70886b9cb2517abb5518a6574d008b6b4aa3ba2fe7c3bb10605927772991c4e176207289e4a20d917dc5ed7be2834afe540 SHA512 6fe4656a9d2d5122116e01ca94980ee3c9a378ee83a2b314b9e50211854ed2db80995f1012fdd77d4a60a5c8a65e58256cbb342ed2409a21cea26bd4a387f9e1
+DIST github.com-kubernetes-kubernetes-c97fe5036ef3df2967d086711e6c0c405941e14b.tar.gz 31200712 BLAKE2B 1e2019dbb270ab37fd8a882bf932d031b34a33a5e39db5c37e2779eecd5e228dc304cf928029d95c01ed2c8f77464b7e237f32569b865532bee498abd03180e9 SHA512 0189f8ee2de8c094676a72a3ba59ed5a77abd489ce583d37ed5b8a9d2e5e118140f38c83c68084738aba7fdad58776b6869edc4cc59368ec07b5d42dcf59d1ea
 DIST github.com-kubernetes-sigs-kustomize-a6f65144121d1955266b0cd836ce954c04122dc8.tar.gz 3437120 BLAKE2B 9eed49b8b5f924c7627304a48307de2f3db386c5817d8ad00ec1f15d6fc9900eb00b16508abee9c4176b3853aa940421d0dc6e9a7a900e4c4cfb85ed399cf42c SHA512 fac0eea0c20ce1c23986e77f6d7fcc783b044cd774f2cd05e50d6088ecfc179141d6d547e6537a0bcfe8d2291c2610bf4e6a1806d6d86eda4e93ae871c10f1ab
+DIST github.com-kubernetes-sigs-kustomize-v2.0.3.tar.gz 3433390 BLAKE2B fb5bba60d42a3fca2f6dcfcd71dcba9c5061d41e80ed0598f87ab3ce7b92ee2b39ce11a209e057029c3716af0ac748e4ad4450d964f595f3bf2a7a1bd5070eb6 SHA512 ceb528143af3288ff56002108ba307c997457957105d21d8539e25b907c36e2c8c262c281f61060e8aaab9a7c159646e9c01da52bd8c91ba59209dbee2d2680c
 DIST github.com-kubernetes-sigs-yaml-fd68e9863619f6ec2fdd8625fe1f02e7c877e480.tar.gz 14901 BLAKE2B 8403e128afa97525c6322e80fd9810334fa6cb8746254f98877478db49b7eac6dddb86ec4a980844ca1d4fa398d881a8338b80bfb51206017c771d6d4f07c9d4 SHA512 7bc311c2afca9d83af3242f008267e7f7ed9eb8320a55c09fc1d1a0854fbacbf04e38fe69efb8510aab54444e6b1bccb9bfbc5e54630a1cef153ea3caedb4f0d
-DIST github.com-kubernetes-utils-c2654d5206da6b7b6ace12841e8f359bb89b443c.tar.gz 41732 BLAKE2B 7e7a23cf383dd2a907c65110af4e9e240f94442e3a322eb8341e21e1c3252e1435766f4189d5e77e85c68117f2a7d2042826365eb99ef958bebfef788f7d90f1 SHA512 3a6c2944de6c9520a85ef1d0d90b07650c6b00619ab3cadaf85259ae43bf6c8b9202619598a87b11b3c8a1f77b621b3ecfbde667aec51d3441d5c96a4f0d7538
-DIST github.com-lib-pq-88edab0803230a3898347e77b474f8c1820a1f20.tar.gz 90417 BLAKE2B 080f410d849c6f1e55ee8f8fe8caee6acb2b5191d05b6c071dc87860e22cf9430eff823f1e8431a33acd99f0e0074cf776d68c4afb65b05e1b48bfa9508c2883 SHA512 889eb58cc417a8e128630b5511ccdca5d13c40cc96d449fa25a324485fc6b32e5d46c6bec33bda767b4c2c7804de4668762bdf34bbcea5b4d32ed5a2670f2019
+DIST github.com-kubernetes-sigs-yaml-v1.1.0.tar.gz 14890 BLAKE2B 0c4e040a25cc75839a748a7e1918167e3ac994195fd80201692946d2ad722ec234ee2c98fa6e5d799d4c74dfa7355418cfb1559f2d25f3a33034e6399f3b9101 SHA512 a6c8094a0ac9bf59e784ced474a402b0ddec48d4bc6280db3eda9b896b6ece8b995fbffec680661ef61c79aae40d578f47446fe3837d6d4903f84e26d875c9e7
+DIST github.com-kubernetes-utils-581e00157fb1a0435d4fac54a52d1ca1e481d60e.tar.gz 50736 BLAKE2B 0c465d040112f872f5958997a3e7bd5ce2baaee048a4b13f5f7510a7cf8eb4f1194a04e666dc695f2aca14a702215481a39891e9e15cc580ae4f0ae913cebcd1 SHA512 fb599fa617c50ebd9381f5d208fc1929adf5f44f61c5e7ba4fc46d9771aa985327284c1bfe3b4e4c1ca45312b3643391d8d145b29a93619e35552a30cd627a22
+DIST github.com-kubernetes-utils-8d271d903fe4.tar.gz 52024 BLAKE2B 3a5827e30893fc91155c7dfd80307f3b422f6bec79e4b283c29a6be823bb4f40be80be70f5a6736d665c542712143097768effac44202f5344da7fd2f56b560c SHA512 2b278aca2c13494d1e192062863b155a49fd3fa59eb76fd6531802b6145079273ac752611c7fa0a5275562814a89dceadd28c536798238ad3dc486d1f033fa59
+DIST github.com-lib-pq-f91d3411e481ed313eeab65ebfe9076466c39d01.tar.gz 96260 BLAKE2B f6d83f5dacb2b60f4cffe5211a8ab4c5838838a756e5bd33132501a74e9f92d0fb12600d1693ed538cbed8367df3e8206964b70b12b38b174c0fe6c06b3eadb5 SHA512 ef5204491ab76492dc4e05e8dfcbbc886a92ee614bb65b395cdb6050b208ad0b138d8c6907b7738e648f153e1b1ba2e60976d00960c41f0fdf4a2b34d018ef0c
 DIST github.com-liggitt-tabwriter-89fcab3d43de07060e4fd4c1547430ed57e87f24.tar.gz 12277 BLAKE2B 7c8c248116cd4feea2fb9bcf22d64e110feb6e377c9b2859a5f0786e3949b57505d1ed3d072bf2216a0ca0926978932d60ed84f236d9d2fee26309ac6582c6f2 SHA512 f1aa930429addd014ce293038087c447e44d0f840963b188930cfcac95490ea52df174bb662a0c5d506371342dbd8466223b3a0f6641017fc20d59f7f209b33a
-DIST github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz 70478 BLAKE2B 19c135401f34f8a8285c8bc315e6197c156de85fe9f4e65de7b71fbb73e37d57031915c2632930d5e76bf01e9038ba380150bdc78ec2cdac959e2cdb9571bc11 SHA512 319a7bd61ae490353a939a412dd00ffed9b6acd55bb739e8c259caed7904ec3407493888798addf89a15474053e125abe8818618240a55402b4351270cebfbdb
-DIST github.com-mailru-easyjson-60711f1a8329503b04e1c88535f419d0bb440bff.tar.gz 74976 BLAKE2B 7e9c0e6f36cd90393c593adc87fb8993cdb421c704bf7177bf4ad76b36dad6b293fffca1670a3f222567c9a27ed2890994dbaad57b82ea5a4f041f94def6fcb8 SHA512 3d7245572ab248e28c7d11778224ba572de77a73f2716c87cd0004d5f2601b0850f8722f17ad9dd8d1f9c968626ad5aefa7ebdceb887914b3661de7deb6e1ecb
-DIST github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz 5884 BLAKE2B 62f6d7217043f77a41e038c3f69c4fd20f71a9b203b29946b7dea5b9ddbcbb08b83ee40533c73cea681700c04ce2f15361eb43f6c9e86bff85318792e12f0968 SHA512 15e7ccac112c78e4fc8fc06f32c6b5864a945b0cea885856f12ab694020adef0af92b0f6a0d5e873891c3f68dfa0dae4c1f2de1ac7946ce570b155e6c5286d84
+DIST github.com-mailru-easyjson-d5b7844b561a7bc640052f1b935f7b800330d7e0.tar.gz 62806 BLAKE2B 6d5bb5130a2bd54ca893dd478de4933a788393f1aa6c54ba87664db97d0bf5e3664c535caedcc70b1caaeef45af811ed6f9465ca11e7f44ccf150b65a1413ceb SHA512 7db724ddcc594900a8b3bfc54eb19fe18e6e8f158453a0d31a834385f687dbeec27d73b07e25cee0026b1c9ea9ac5e793cf5f81dbed64e353ce7681d30c88c81
+DIST github.com-mailru-easyjson-v0.7.0.tar.gz 72804 BLAKE2B 444ed8bd5a242b40ace2525496cdf548d9d8732795533f41ae0db50451dc48e6c7fa8af328906bf46e8535fa03bcf1c640ffbac774f70ea8b2964859b1bc0e38 SHA512 f2ebd2f6a09483715808333d478b2563bd4e0e0659a4ddde8fe2ff7b86a4fbcdf2d07052bd2d4f69cc2e06156e03638b25545c070465931e5ef594bd0936a045
+DIST github.com-mattn-go-colorable-98ec13f34aabf44cc914c65a1cfb7b9bc815aef1.tar.gz 8980 BLAKE2B c4851097d20f928513ea60eba8119ef0a0878a5401ff46abb381ca39c47babe5a123094257bb0ee7c08b8d9e8df10a594ee1a3e967ffc1c913eb1a941c446855 SHA512 01dd99ffd5152ce8d3e45c3948ff49ab792531c02ba4155dad760a5c5191a0791aa410a7cca7b5d8fe49d8b143d761a7ccfd57f55389322b25aa31f40d638b26
+DIST github.com-mattn-go-isatty-0e9ddb7c0c0aef74fa25eaba4141e6b5ab7aca2a.tar.gz 4461 BLAKE2B c49434cb88ffa87793507a64a4acd17a877beefb7b403ee5524e1046f98511b3846c7b3a4f021cc33cd2804dc30e61cef83062f6e696579eaf7851ae51a8fb2a SHA512 fdd8ae0488ffc2a1a34f12dc1781c39c64677c5970fad6963394fef2462ac17b081f77d86cff171136f89016be5a47ab00d4242c58725b8bff6b1f554b58a58e
+DIST github.com-mattn-go-runewidth-9d4e0701ab53d89eeb2f46b282d1cd71f458f0bf.tar.gz 16016 BLAKE2B bf9413cb5774e487fcbf4d1eacf958a3f94a564d6b92df78a296c4a2a4b77e294c9e1c75ef2c481184563386f9294663a4d1aefc6a4bc8ac7878cf2130534de0 SHA512 8381b910c16b79661aeb5109a48ef1a3cc1f4eb3fe2cb4940ef23c0b9576258a59cbd163977aabc82cf103c588f33fae89a83dbb5749bb85a94452db8acb9bba
+DIST github.com-mattn-go-runewidth-v0.0.4.tar.gz 19827 BLAKE2B d2320759711986724f1feadebac45fc809a881031122585e26ab20f5144ed89101b338e5cbd736c7183d46d63f5913e291b14e035fb00a8c1d2bba21dcd0fcf7 SHA512 3f55e7cbd66014145593910a0e0fb37d0700c8ce6f1987ebefc5806626e7e5774dbce8af914ee8039cc20d38902d5cb8254a10638de3972f22131b7a058a0e64
+DIST github.com-mattn-go-shellwords-v1.0.5.tar.gz 4261 BLAKE2B c4ba9bc37d550ffe1e8a4447928aa4dbb652c2b8478eb4a9485e5f018896bf0a1ceb8cc02322a33553b81c2a64ef05dab5cd7a3acd973b4ed9691c5751eef688 SHA512 3b6607f35d7d617a2ba913f8d697b82e0ea867410572a29373ed09fe1b1e1e84509003476de39292e498601571cc1f78c3981ce14b04babad84bc85c6d9ad670
 DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 BLAKE2B b3b007f925a4a1c1862c8cbe34c5cd225dfa610ad8c56b5328e6920a44b507680daeea97209370bd6b259654d0ca5791f4bcc54b8bd8970b9aaf994eada16d4f SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d
-DIST github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz 2740 BLAKE2B 10127381356aff4d25d3b5da3d2db5f4565c8e5c4e16ffae18e481fcedc0616039cf3907fdb3c204d5f743bb5163bf437d549dea9fd46cc9141d8ef88cb36e21 SHA512 39cd6786782e3a29ad448db3ec815a6da029bc22fbe543fb04e0e869d8b4a698f20434bb24c09bd18b5d2cdb992fc28e21b7ae16b3e585412cede7b4eed2b26c
+DIST github.com-matttproud-golang_protobuf_extensions-v1.0.1.tar.gz 37184 BLAKE2B 9ad023f9b70938f45e6dd44624a7008c1895e488e63124bcd8f8492292ef98479e966ed627a62de32e0fe84a57e60710227e02e4a276aabece81f021af9408a5 SHA512 63d9963502e967e47253f638a19dfbeaa2b63efab74ed790539ceaa9b4a0b695aa107f9e0c920c0da547ac1abe81af22d47f6de547c500deeb005fd8a5e22660
+DIST github.com-miekg-dns-0d29b283ac0f.tar.gz 1318264 BLAKE2B 92ea7b517cb686210a8d13290a15d4eead3550b3a1d34a5cedb447c08e2a32a65073173688190f329928fa0e1b02bda91bc9195062b8380f4a23888ee07154bf SHA512 91baf45bfc9860c0df26ed1bfd1d326b2cfeca41365d7577c427861e12eb380816cdb8151e92b51ca8c4e018fae3cb53193e9f9b95725a1d44957638bfbc76ed
+DIST github.com-mitchellh-copystructure-9a1b6f44e8da0e0e374624fb0a825a231b00c537.tar.gz 8905 BLAKE2B 832bb9e9d51b2549a1bd83c85d4d9eabd0aeb32033304f8e1c6f487d0fbce1b252a2546bc35502df9f15e69097f35be601e98d2232607527b70f1246dc280f8b SHA512 932a1c50185fd1ff78636d004c4a4c8e7e69253a85d439a0775862258963c5d0b1ad4ffecdcce84ba61d01060ffc4f8f142d34fce73ff7c49c0f05e3bea8ddad
+DIST github.com-mitchellh-copystructure-v1.0.0.tar.gz 8903 BLAKE2B 8ceb61efdf28278953d7f7d4d9cf9219c74fbdac8f4b1ae3363bb9b207d56b50b1c6033844e548ec2c3266d5cc030bfc6fc57175642539deaad2db91215bf664 SHA512 689577f3b6f8ea80baf29ba9367298d35c5d023cdf85d2b998a38b9903fcad8c31731ebcef585cdd339e6ca647d8f6f4e8f637e77ccd6a5825d49c03a5a3d922
+DIST github.com-mitchellh-go-wordwrap-9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c.tar.gz 2785 BLAKE2B c049e833101c330e1c153b212e7a98f02be90333719d1ed5557f1ff52f9db9e82bcac942fdb2b6206c8e3ef5f5dda6b90e7f2b370b16b45c69413b0f93597850 SHA512 377d539b68744a2b03e9fa6990822fda18103854ddc93eeffa4d635864f44e00844b4bbb48b1d4149e6d456483337f357343fd806f9b150aa319a98a773407bd
+DIST github.com-mitchellh-go-wordwrap-v1.0.0.tar.gz 2777 BLAKE2B d2903b50f2bfd88b553845ea6b5748bd9b568b2e241a3f9dc78562a4549153d0fd8a11b3f1f33dfa44c9c7384d4a39b79e7a08a03f1768260c4a2ed430ab3de5 SHA512 b2a916a08f13847ef8c0da2c944604bd0c8c6283eadbf2f9b791538d26c17f2c1f73ce629b245320c1ff0fbbfa9525208dddcf3a21c1370ba97d9d82b35e2812
+DIST github.com-mitchellh-reflectwalk-3e2c75dfad4fbf904b58782a80fd595c760ad185.tar.gz 6446 BLAKE2B dc51802649e0c6f0ac20e3eeabd0b00d6a390d25c7a3be434cc3f3df5fa3ec21e2151ee7917a54e3fb675426413b5767a150ff79ee6bc913a967f7309aebe88c SHA512 357cd5283bfc5f6f1be47bd732caf26951775eeca233e76e9118da2c2a6f59b51613334e7390e6ea479af2d3fe462c711b8567491e7246df0cf9fe512001c784
+DIST github.com-mitchellh-reflectwalk-v1.0.0.tar.gz 6143 BLAKE2B c19360beab9e47373bc355f959a768ba199ab84bcaee66dc5da017a493f565c67f8b26e8ffc42b74d6a759d690f38fb7afbd2b6755dfa4f30b3f2c565c215466 SHA512 15c2dc2de1ec000d868b3d7a172f49ed038d236c70d77a00dc681fb78b7ac8ccb74158822706fc62132f96c9d564625c285252ffec25c6cad641734cbe6d6226
+DIST github.com-modern-go-concurrent-bacd9c7ef1dd.tar.gz 7527 BLAKE2B fe191bd398bbd1beac3de9a69b54b04e01436347f0f8933b8eb189dcafaf3d68bb76d6d738f5532e5e9d8e1631ef4d3785a110b69856c4e11d811b80dc31f19c SHA512 bca1593dea7cd004a0191420ccad56cffb91bc5523434f50920ce25c2ee82dc6a756e2eefdcee94ae0bb403fea881e42bf403d6218d6169f30dc9288e72d1c36
 DIST github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz 7527 BLAKE2B fe191bd398bbd1beac3de9a69b54b04e01436347f0f8933b8eb189dcafaf3d68bb76d6d738f5532e5e9d8e1631ef4d3785a110b69856c4e11d811b80dc31f19c SHA512 bca1593dea7cd004a0191420ccad56cffb91bc5523434f50920ce25c2ee82dc6a756e2eefdcee94ae0bb403fea881e42bf403d6218d6169f30dc9288e72d1c36
 DIST github.com-modern-go-reflect2-94122c33edd36123c84d5368cfb2b69df93a0ec8.tar.gz 14404 BLAKE2B fcf261bf39415ab06f03df46887f6373386007cab1c439733039a00eee7f3d430323f1589b422c458435809c38039d4440a537845ed0e4d49193b1448cca63c8 SHA512 1e622f71b935169c463b2cdb970c6f9c142e746a40daf760430f6a24a1e938a905d84793a7ef241a32cfcd7cbeca701714b69791b2117c46fb90490c39fe1ecc
-DIST github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb.tar.gz 18386 BLAKE2B c484694b778f0e71b94628ffebcaff6fec311f033540d2a27202b8e1bc6224b1a48a8670f6f7ecf10bc2f406a9cfed98f0c9565215e4a297786f041e940996d6 SHA512 3061c0372815652836db5245519ec2b0a2f71eac1af7c23a419edfa64063e6f39e91a1aae2ee1ccf1e97a96de620e15684ee660f9039e694c7b9b4ffac27879d
+DIST github.com-modern-go-reflect2-v1.0.1.tar.gz 14394 BLAKE2B 6169613fe7fda3f65902f153c0e87b11058ab72af87c669d71140cb19e835bcb2d84cd579544379ad7e77bfa4683b304c930e2bb833bcae035a71447bba1ffd5 SHA512 6c52772e7d164837b02fd6b5b5653b7633914e5e8cadbc071d4cd647cc05b0408c152e4334b30f43f6c5a8700b032e5a8ef35e6506961963bfad918b28f5df22
+DIST github.com-morikuni-aec-39771216ff4c.tar.gz 55447 BLAKE2B 6a4a25d99e789f7ac83bc581426708854a81cd2267b7b2a788e452ff03822e6adc07236c37801e9264c6f26cda4dff9399b7164bb3340f2465a5fcff4fede40f SHA512 bc3aec9e7b04d8555eb78734e2f154bf71494561fd6bcd58d876b86505b1d2c05d7200365846b333f040fb85a03d04df77bc5e49fec86b16c9fbaa766a2dca60
+DIST github.com-opencontainers-go-digest-279bed98673dd5bef374d3b6e4b09e2af76183bf.tar.gz 19205 BLAKE2B 752148dc0119bbfe1c956fe157b205e25fc4cadc71289bff0b3c4fe12a6ad5d8e555d0d782df33172a3619f022ab2b698c1671eb05b0ecc9e500e9829584ce46 SHA512 2a3f4eae058d7379be5495f2b253990dbb59bbc394b5cc2adb948be41e1e4cab76efe388eb9ccc1cb30cb51e0a9d9cb07357b6e24d07afdd52aa08a77ec8e01f
+DIST github.com-opencontainers-go-digest-v1.0.0-rc1.tar.gz 19206 BLAKE2B 41e5cf18fdeae0a27e311f7114ca2fb782c53c1bf1ddc627f2926b3c76118042beabb2e6dd6f9b518486f3cee955b458a28109e01696e119035eaa28deeedde3 SHA512 2b2e8d02d45d5d9f5a73abb8228b097a7db4f48afb4712f3cc98444493087c9dfa02e2bc192d8dece0d5d98ef07d23400ae0796301647e452d5fe4ae1bf42caf
+DIST github.com-opencontainers-image-spec-v1.0.1.tar.gz 138674 BLAKE2B 4cc13e304c7b328e03b59433b698940094a8d583fc8c7ac1b7245c5dc121c9d6b1b8ed98916b3cb9b2c16ba2c857f613dcfcbb8c3ead2b4bff2fe3d001d289a2 SHA512 762dce11fa262f0417e9bdd20ad4d75b3efa505705b2dd357889e14b4e0120c7655468dc1b998c8dd824ca1ba1f0293671e80d4ab6b21375c80c3ff89cee6d27
+DIST github.com-opencontainers-runc-v0.1.1.tar.gz 496426 BLAKE2B d15285608d43ae77ebeed3bb9087c5775cded87251f3d86769e6b93f124fa4324d1f5c8a696558b1610f1c979e04d8a50a21afa73de21c5e37b3da78cb866397 SHA512 c5bdbcb9c7d8f1be391a6cc0810a34a8471f80168d80fb153a60c8dbc7c58eedffd278c1206244d59943700fc148aca1c4b1053fb8d2e4273c0c8bac7cb4db25
 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-peterbourgon-diskv-v2.0.1.tar.gz 16077 BLAKE2B 8d1cc0a1bd6e84edb8fba63cd8ead9a390b43dae95c7bef74a81dc8302c760623a5e0377a2c3c0abb5a63a92802709ca2bb2375b0f2effaea2ce786c44262b24 SHA512 a568690b332dbe7f2ba3baa995e81428c13c01ca2ed65a1791ae99d1f315b00b66254888579ab829e9aa85f87b3bb7fc4de716cc7f8408a195f5cb4cb5ce93b5
+DIST github.com-pkg-errors-27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7.tar.gz 12294 BLAKE2B b25f0fb276d65047ca0fae8712150bb4f5e07b597f5a297b216eff8f6b0a3a25e484d72ff683494a48a047efc699c03c34a8e05cfe6caed5670ce82e74f9bb15 SHA512 361100e92b0dc27297ecbf1d72244ef2859456f37830c510a2b2bf39a277e9647c808ae70682eff7bf037c1e23563312a6e0a060b49e60747d1659c5f0cd60f6
+DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
+DIST github.com-pmezard-go-difflib-v1.0.0.tar.gz 11398 BLAKE2B 8f317c172d615e07c92337dd814c07c772347de3fe81b952bbc4fd1a643d495cfb6ec5b694a531f2745e1601eca2d4977ea2c1202ac7fb1e3cdba31e90c4ea34 SHA512 283927de73a3d0405bbca8b5b0c24137dde2f1063539c6ce4437331ed99e732175b2a384e5a70cb9a87cc74da94f5347e2a9785fbf3e46ec2431dc5071c3f045
 DIST github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz 130114 BLAKE2B df1149ebda18c7940ea35fbe09b08be6437a8d4c4f812e3b4b088da8a374718212f0b10a153f3e04a6ffbe0bac109a92e5eca8b95814d221cd6a01d5fcfd48c5 SHA512 27a3cd10256ba6784b2f1318919ad6ce9e2a15c029c18961cd760a7569d5c683097c7407478b2ec96852163a321cda854aba18b0a73e0dda836480d05451bd62
-DIST github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz 54855 BLAKE2B 2a7fd47a9e1dbc794f5de84d5ee3512b282f5f94d044dd9b471ab5ad138ebf2940c4441e6b4d89404f3443f0ba466fdab8fcf58c92d9c85798f23b5a0c57a6fd SHA512 9d4d52142888edff091f23496aad70ab2924dff3a27930cb6df81c5452ca897b9d61eff74fbd092372ecb4bb005b4d362ea6b0602e1764ea4f2a30e23048a81d
+DIST github.com-prometheus-client_golang-v1.2.1.tar.gz 142465 BLAKE2B 5570e7fff11db4372a6e3dfc465359e32ed51921372f0012768e23f0b49d84e8a10dc60ec09b50c50b51e2e566779ca7e0d034de7b3b62850d57b7890a88de10 SHA512 3ac98e101fb27cdaab5d282ed01eac2d4b8addd902fb40f67a3307f82f0a1c9f6ce15b706bf530d1bb55524bc1f2cc34359eda48676f76d68b26ef48e7c413c4
+DIST github.com-prometheus-client_model-14fe0d1b01d4.tar.gz 57541 BLAKE2B acc5701969d724df3d0c85a3b456b1e397b6c72ba33fb2ff98a04702423e8873c2c3ce2aa68ef7f62ab2a6b4ab881dcfec740217f88f29bd35a7d99df298ec19 SHA512 d9cf5775446d349767573831df1020aec72fb340e6fd3d181ff7e6cad9e972a2b26f1aeb1382d70431470933e1452d718782c8f0a0c4159a81069e9ee5623198
+DIST github.com-prometheus-client_model-5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz 57195 BLAKE2B 08fa9bf28957a15e543e2d86e5a19fc302f7ef5284796d6dec24c182ce7a3889a5bbe53d58fc018cabbd0bc717b36533043c3ccb3e3355d8434fa7e3dd399b50 SHA512 e44828e3790282e088bedd5c8786948192beb5061e8dedd4f0b2508e31f641569c2c2a7e3899c2eebf4aac0c0fb3a22fc9172e0460fa2372fa876e23807d23b8
 DIST github.com-prometheus-common-4724e9255275ce38f7179b2478abeae4e28c904f.tar.gz 80876 BLAKE2B 669ebe88636632ff26229b2e3ba261cd5a35bff4586df59950637fe169802fdf6e1fdd7d7c64fa6918aa26cc5dd196138f13a87dba7532d2e84ba2550bc5b705 SHA512 fe1895ba4410b326c80aca9cb97614e32daedc2f35af4a32b502a25ad3f98d6e47ed1b12c2066a8ea9eb2618ea60e1ee4d4b423e48bc337b778472c3897ede05
-DIST github.com-prometheus-common-cfeb6f9992ffa54aaa4f2170ade4067ee478b250.tar.gz 88669 BLAKE2B dbdce2a4a54f18a97363ad809d4283aa729082171a9c95ae202e8052ed32c3ae099e0afc2b4232f9979c2eec75ba24e6ab2957a25506d6055a428bb01a0391c6 SHA512 55c21f0b289e4bd7fd09c270ba0b86761d90359df4f934524185d8e11da668e44fcecbde9204b67b1642ab8ae86b75f359ced20a4de3ed917ac0302bf82e0ea9
+DIST github.com-prometheus-common-v0.7.0.tar.gz 100520 BLAKE2B b03ae3e46a9cd038b1123df7b230995c65f8002430f341cc94fc39ff59a3050c37cf1caac036c7c13798c1303ed13c67f3628a2f9e5c7a90b92f465b98f6acfd SHA512 47a1fec9bffb720a8fd20287c7628167e649c9fad436c3d6eb290863b30580dc9c9ca417dfae01d8d76c278bb021cb2288ff1d3fa9b598370be6534637fa8337
 DIST github.com-prometheus-procfs-1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4.tar.gz 61606 BLAKE2B f67de9c0f3e8d814bed1711f0e0771c13e7d4d8d9dcc67ede3615bb80f8a8f20bbcf9ef65e46dff4a41cc587ef10ad54ffdb6909fbe83f19993422ed5714dd81 SHA512 8cabd997ac2405fe53aa507b6755aff7aa4ae2a1fdb3711abfac5d29bdd369412a17359c3d9c3ebc4945d1b6310c2fadd25201ec7b040b20e2ac5d27b56c564b
-DIST github.com-prometheus-procfs-65c1f6f8f0fc1e2185eb9863a3bc751496404259.tar.gz 34890 BLAKE2B f0284354e3782e07371825b3fd6136a5fc516dae97218c90ac333ce749f87b435a55c6545691a7b71f90b98563fdba5f96c238007ee8187d98297edce1124cd5 SHA512 47cafa8b7a4f9496e1cfd6e2d24ae882ed3ac21a2417eb2ece2cfaa2e391d32b60d2ec8c3860988d8fe3af8bfa6d1430e938e5da1331a7e1df2828753dac82bd
-DIST github.com-rubenv-sql-migrate-1007f53448d75fe14190968f5de4d95ed63ebb83.tar.gz 22241 BLAKE2B 8ab7abaa0e50f5def70c56571e7c24e8c74daff80f09d553373b2b1e8824e3b173f2d105307cbd45e5eb39b9e0e36bebad6c98f4e6934e8827037735432d4268 SHA512 f6c1bd596f8d5faa0d43c6ed7f985ce565563643806cb7729adead8f594da5d1793bc83365a81ee850f4b1cc622e19ec9a4bf57263fe1f39110f9c8544dee955
-DIST github.com-russross-blackfriday-300106c228d52c8941d4b3de6054a6062a86dda3.tar.gz 69591 BLAKE2B af6a9dd3e0a9186bb6f96b73faf03ce69d15083fd664f212cee1aea8288094dd9a3a158da07d4a27a44a0c14f03fab50837f3cb517b0727b77ba8297651805be SHA512 616af6fc95fc5e4825413ec6590fded0cc837af3887cbab814828ffe9a55f27d212f0a67080b867d7051cca2a45266da8f8886360249451fd983cefd340f0023
-DIST github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f636973c77.tar.gz 1941 BLAKE2B 7ef4ed22d34a9dbc56396a0b04fdf75e5384f941588116a44ecbb7b19f070fb2f4930b93b364b97c784e3f0a60832a9ea4c8d2007623548f12c93928cb36682c SHA512 06b8bf3f8d89a93c565de9b4219211ad08c91b2442ba31ef8bffa02c7ee823ae4f57ed8b39b4ac1eb326e5d12c65b56b16833c28fc97623c732bb6ea685a3c2a
-DIST github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz 28245 BLAKE2B 2f37d14ee529db80301ffcc2c9c88e18cb21b0398333e5528494d143006ec9adc1ceac31d0de3ad30c30c442354220393fccf13fec251ff2cb27994435242f87 SHA512 85023d0442b05ac280d67f43443cbbd40cd4e21da10a6fc9f6f9395fc53e730c73591c9f5a74b910f4190fd8f52843836049ab62fc388bfd8e60338cdb1297a5
-DIST github.com-sirupsen-logrus-bcd833dfe83d3cebad139e4a29ed79cb2318bf95.tar.gz 37786 BLAKE2B 4bb2929236d710901b8750911287c844620aa3bb2baeeedeebf2c739e40f212ff351ad05ac8388c9408ea19182e1be09d06fcf33b049bdd11805f2f36e23c9c5 SHA512 78cd34082c52ef9cadc1765be312c0bf8f7c3a9a51f570a911f2b4b0a739f4cdde445ecbf3f079adfb98530a0933a095e0f5adedeb0ef86f62f8200b65968be7
+DIST github.com-prometheus-procfs-v0.0.5.tar.gz 112152 BLAKE2B d989dc38ab9e4b056884eedc61411d34ecbaa109d270820ce2bcac1abd40dc1c730071a0cc5bd1fd93191134a26f8475d682a17d517bac69e4ee37a93bf07a28 SHA512 35f29e69c4782f882d8f68ac448c6c7e2aceb93319d44a07c5ffbbcd61051e3ab1355e5191ccbd217146403492d33f8f35eb61e44c73dcbf1700b5cd72aa635b
+DIST github.com-rsc-letsencrypt-v0.0.1.tar.gz 605634 BLAKE2B 30457605f8f768844664fbbfe1ffcf83e93d94eab2f659bf026ec4354c6f0cbd1ab6ec5878fb052846472fd3157e7a4762da8dd73b78fb4d54f4c25f2b89d621 SHA512 fb0003e2baa9c477d9a1af00dbd408e6f47d25b74bfef69f111fccb5d3b9ed4ac56156f5e2f259af6ade1dcbc5ee86bac57ba50ef725ba12772f56a326d7521d
+DIST github.com-rubenv-sql-migrate-9355dd04f4b3dc9ed604623307307a3491a627bc.tar.gz 22615 BLAKE2B ae7b38054b394be2664e5b5001d8d718e83d1eb5a691dc2a76d37585f4d39aee8e56a822bf9162f9a717449f0df62ae5fd267a3fbfde3d2681dd4b705e1705db SHA512 104a21a84b8315f7ce16e41b587c01f441bc037e875b6552137a06c580e8ed2b2bd724bddd5c4edda7d7a259a1c55e866a342873467ea6b779c8b551c3571c19
+DIST github.com-russross-blackfriday-05f3235734ad95d0016f6a23902f06461fcf567a.tar.gz 75898 BLAKE2B dfde4cb8b2a7c18643926ed21b46ca0af43ea2302b055b4d40715a31cd11d398c1404db49a47703112e536a96bb2b05525123b4e197197e0b41f0e565c912194 SHA512 e6e442a45835e28ffe58667db018612862c33528af0c2e4aa3c1e4a7e89c503e59b004d42df76ccd4619a998d1796ffb106db20e0a01c8932aaa9f4175fff2c2
+DIST github.com-russross-blackfriday-v1.5.2.tar.gz 75779 BLAKE2B 0ac00fa2b2fd2f84951955848725871b4b50762e91cd5160a1428c1598ef1e88b8caaf6e45a1bfe859d53dbf70fae65938057feda9b657baf2c5637fda867002 SHA512 e7dc4dd6d7bce8819e525b6b2c9b729bbdbcfc96b7672e7b0f60970b3b75508155b2c73bf637cedb6e2362b30631278ae6d5669b5c11a04555db672805075c94
+DIST github.com-sirupsen-logrus-839c75faf7f98a33d445d181f3018b5c3409a45e.tar.gz 41379 BLAKE2B 6f33e420e837503679f0b330893d2cbf63751afdfcf5a1b9679d8fbc06ce6f0c9ef00a35d2be16a128513caf13d9b75830a63068af89fc5baaf92c9a45398b9c SHA512 606eff13fb7bad42f64b0f42d56eaca8a83bf9c1c88d69f5497f72e266ef177f3f36697bf60c24526a31a8c420723db26ef41de9b643f305c077ca1300779664
+DIST github.com-sirupsen-logrus-v1.4.2.tar.gz 41373 BLAKE2B 3675dd82fd9c174fddf93eea87f3ca2c2671d9719ba148b03136c35ce6a3ce95866c57cb706a641a14522a522606dc9ea9ec9f0a6c7da6f8cf18f46b9f4bd3ee SHA512 c29689e5ea0ff919afc6fe1c492898d8b898e6831c442d3fc45c29508bdfda08604b1ea09d3b17db401bddca69fd5f8f744610075ee3c0577df6a537e0980a13
+DIST github.com-spf13-cast-v1.3.0.tar.gz 11085 BLAKE2B f46ad23efac14d599ef7268c033c5f244ea7976982fee02b4d83ae65f91a72150bef359eb24b8c868f8a42ea8a0aeae839dcf82a7646648bf482f2a520704e09 SHA512 4cd15f59860fddbb67055beb15dfb8114ecaad5999a8fb46fbbbdea1cf78eaa094a4893c10b97efc7d2f95509920688659d609623135bf9871e6229043452194
 DIST github.com-spf13-cobra-f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5.tar.gz 111260 BLAKE2B 4ba7f888257cd5b883379d9bf137872b1ecdaee796ba7cde107ef7e85d1f55d45b039dc7d6e7bf170a6eeb76cf8a56e9a60325284f4318397edbfcbad5ed1bda SHA512 c9b210a7c08e96e66b14c03d8b4dc613092eda22b647f56da597d329203b594ce6358f34a2404a41ce8070250721e18e4defb7aa70fab8b3a6bc7ff81291f02f
-DIST github.com-spf13-cobra-fe5e611709b0c57fa4a89136deaa8e1d4004d053.tar.gz 102553 BLAKE2B f95eb665a52c1819bce2ba8ae05d9b5a3f0e27941af8ced5245d088840f605924abd17547fe51a0c0ed07ca2e28267be600c6e1fc95abe507dc53b7f7ce41e65 SHA512 c7adb5e8fe32aa0b8ebe85449e14bd57f00c60170f41167bf80710d32e83cc4fe37635a3c2b4ff49b2275050b749365c2aabf105ccdbf37bdb4bd251f14f1925
-DIST github.com-spf13-pflag-298182f68c66c05229eb03ac171abe6e309ee79a.tar.gz 46092 BLAKE2B b1e4bbebcdfd2bed394e0b1e93f47951c29a8b6c4b9e5435c73b34f18648ca8ac6d51e6c664dc41310f0b953c4f4d2cded88f43a27312f42d394e7e699cfb8ff SHA512 1e1ca10d2d42aacbf0da8d62dd786c024c86054212e1531ea7bbebe7ead1aa9e47646ec19d8895b6d3914da8b98dffad17fdb207bb917a9e19c9d777b9de6c96
-DIST github.com-spf13-pflag-e8f29969b682c41a730f8f08b76033b120498464.tar.gz 51007 BLAKE2B da20744103b89b62f7a411a7b210bf33065595a4e46fd80d6e209b833c93dcd5b27b3b6885bbff99812c823ad208da9cd1adb84e719952ab18fb5cd25ca1cf0b SHA512 b12a831c717d0a13486492aa0da170da22ffa47d839116b069bc04b59dc83c7733486753f6820ec94c921de52f53d3a1687e10bb6f8a4bb1c2e01df25e927fcb
-DIST github.com-square-go-jose-89060dee6a84df9a4dae49f676f0c755037834f1.tar.gz 289746 BLAKE2B cff786ac7a6c39829ffd4d7b7f0fac3893b7c469ca35f008558ca3a7dbfc376fd0166c8ed7becc73d0f8d67b456ca00104f08c8841ff156a9c1f9a6d68d3b25f SHA512 fac5e8d32f93f252b2e64d60f2e4da65a11e9408ac4db0afdb3f2357a814cb3992ade307bc8bec8799703c0cb63d05f7d4eaa19e13bab6402b50c1cd246bc50e
+DIST github.com-spf13-cobra-v0.0.5.tar.gz 111126 BLAKE2B 0f5fe38e3e278603fcc53edfdd72206d7b6850aa3ac4054b4242091949fe327bf80ddc46c20c3df1e644807e5b8882c528ca5d3bc184b9f039038cbe9043835a SHA512 c21a2c935365c74772152e37adea553dc89fd31dae794bd7e8f56d7c9eaafe717e2d0d6f56e1c8d2fe442df445dee9f03bbd30e802e2ac6911babf309b901c04
+DIST github.com-spf13-pflag-2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab.tar.gz 50880 BLAKE2B 49c7ffd77b8bb294ee5f35a9d0fb1567dc740723c7e7fcbfa54365ef1d4e91006032f3213771aee55b35eba418bda53c9da27da31ed4dbbb81a0987302883591 SHA512 c579ad91387f90e6fe630d9711904d63dc8b4fa71d49aac83d5e6489e5150f9d6c8aa5444bf5f2357f67eedab82bd7f32ad00975da5267290c8957fc416a904d
+DIST github.com-spf13-pflag-v1.0.5.tar.gz 50796 BLAKE2B 735cf4ab840354082dd104f417a938000ca53d60f71f201e1995a9d5a77b45ee0e83e41b1f16713224f6d16d52230ea75d651e8fb377c689c883998502080de6 SHA512 ffdfaa3b2431cbb0934cb996af158aa56132005f978a7e3a954e43f24efed36805213d5aa03bd04792119e909a0d54a8b76b0c891f83cb4f6a813a73a704e13b
+DIST github.com-square-go-jose-e94fb177d3668d35ab39c61cbb2f311550557e83.tar.gz 298098 BLAKE2B f9641af6620e68187360e8fb370de2f0a76e263662e1af5c039bec94c95894beea1d2af99b4ff6b6107aa3a504d137982ea32923c955a9cff4c5b382acdfd386 SHA512 f04896aa0c3a4bca3e435bf6d5b0f8968d21ad0bd06ce87f77054914a724cc1355fd20ce383a517a6e433362b9ac2a1f07f12fbd9875cea6f6736bb2f862187b
+DIST github.com-square-go-jose-v1.1.2.tar.gz 258878 BLAKE2B 586af6545ea3b53bb0c7e2ab558d4d849fc7ada4dc2d234c8abf0fb6a57a9e37a38d3a6c2700fbecbc543c0d5f0339eca037cd6229080b5cee849bc89a0114a3 SHA512 fbeef66e781ac036d62e2d56b1d00ee9c8ebfdef47d45ad1489e2880b16d34cd4d0b6d4ccef30c44fb981cffec8525287824ccee8460c0baf890d72240da8e7e
+DIST github.com-stretchr-testify-v1.4.0.tar.gz 110085 BLAKE2B 258f195090cdd71f977c77fe66ac7350a10487e43332bfb4d32bcaed91e0d7a84fb206415fd8c444a36b66f30ced41a9b31a7705a3249708e242c9a7ccaef799 SHA512 7a91c120f5425a1b89239a03ef9419d44c83342665beb3362384fe6512af52c49a5f914e5bbf9725656311ff0b826146f11b7db9f4cf4c1a69ce6033169d8c2d
 DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613
-DIST helm-2.14.3.tar.gz 1242779 BLAKE2B 8c16da15b54974b837397784734fa8bcf53240d075261a7dceecc6fb6cd172d72ba0d060d55001a87b5910b1b715646729b10e689ee6a1602aa26a4bf56013a7 SHA512 80f6c437235ca0d0c8f330135d689d2d5a9414d166717f72d8c3e2952c35f33fe621579e221078e65e2c5cc648e44ef037356b7ac18bce985daf642493ec4297
-DIST helm-2.15.1.tar.gz 1274091 BLAKE2B 028bf422e4d74153ad41353a4f49b7fe8642e766c50a2ae0b08fc60694d595d8f247bfc4d04430848a5342fc96df4c6a2dca044ed17b3ca9a12e5a623b8e1ac0 SHA512 ad4a4523e8aa57f939672a1ed9b19966e04bb6c557ec69ee5b363d0e4f0e4295798e4fe1f448878ffe8f13a6a5c56fd3b49795872b4b1fe45f2779331db9f9ed
-DIST helm-2.15.2.tar.gz 1276291 BLAKE2B 8dc01d20f179e2c78a833f3c2b5e7633fdf87713b68f3b1a1ec91ce0129031730b913b4b6a4e5339f9d450b77f304eee4f7bc11fc9b74e457e23413b7b9d237f SHA512 f25d5dd55444d5e8b2821600e0419be71e4dc39c4cbf73c203cdadeb33721ba2925481eb9504e33f52eb8f0ec03ae1e05ef8bee4b29e305d092bac1246ff50f3
-EBUILD helm-2.14.3.ebuild 9531 BLAKE2B ed454f1b092dfee9a4f160f769bf909d67c03f68f997d544cd88ff8851f860c47a85635931b6a24420fbb73fd5209ca1755d4cf3f1110ae60e3a72525408e4d5 SHA512 aa53e762ebc4747d231e9fb5383a985b53182e98416a4a154dcd3ed98cb0d389e154fc93117d2e4d2ffb8a42025c94c4008675e13dc914d9e4c2d4c5bf19fe5f
-EBUILD helm-2.15.1.ebuild 9760 BLAKE2B f11be52355fe5bdf47bd741fee22fb87fe1f6e1fb5858ef6a6e0ff7165b355b86cea37e3d8c25dac4cab72d7da38578ee90319b9a951a12ffb2905ce47cf0cf9 SHA512 3600c458d76dbcd322521a1b1b4144fd4cf2bfeb4ef454f831b988a62ced59785813b9d6feb3869d0e9c50780b76d9cf39d6d3db715b1b7a2d47a865bb88f98e
-EBUILD helm-2.15.2.ebuild 9760 BLAKE2B fce9d4f0226454098cc10c29c6d57eff1ee69ed8294b616ce0c311b7ab82cde7e869a88ccd567f6cc1db6c812e7b2928c952e6eaeacd309986e14e655b964b5a SHA512 bbaecdffe0908191a57d4d065327c18577f1092c8d20df336de5db84c5e6dda6a41a9679c1fb1b1c1b2607d54cf59a043574cab104b9e49bb7afc5d65b3e57db
-MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
+DIST github.com-xeipuuv-gojsonpointer-4e3ac2762d5f.tar.gz 7718 BLAKE2B 94b4c2ac92a683b2e26ec907cdb63826ebbef2da978d76146334ebd115e9dc95a69757ef91bdc1fe52d7de39b6e8f6400f9062a6d6ddf6637188f92e1c501fcd SHA512 c29d364a2c83d22546f9f22a3622f44662420f0d33b974138cc1f01218c7b0c14d59570a57bcfa8a55797425338aa227aa4347cf41c954e63437615736e38a5e
+DIST github.com-xeipuuv-gojsonreference-bd5ef7bd5415.tar.gz 6952 BLAKE2B 5390e11eaae7b3ef816f044874e665ce76cdf84cfdd19139a0923921f56e8cc24fc418952a0d1ec1ef56aa535fe314c131073ff0ae248f1c4b918bd70485d073 SHA512 e14f931af21c64ad4fd68e3f226d062938e747fc0107b00c41ffac489193b39874ed1ebe6dc24478f6979f9055ae4ca67c016c11952589c8a95ca3f3fc69c1ea
+DIST github.com-xeipuuv-gojsonschema-v1.1.0.tar.gz 70883 BLAKE2B 5cfa2dbabf97e74cac7b6f681b996d0f425318461095d5c3882d31fac0b5db9363e01e421bba99ba8ca2e7fc37861b4c9ec4d39821acc4276479fce205ca0708 SHA512 2f2352540120ba99081bc894e9f6346ff7093fd9caf1ad7caec41b9c56b0fe456be7f7adf45770d573843cddc215e892f157fafa518f359d0f19f423be9d5d0e
+DIST github.com-xenolf-lego-a9d8cec0e656.tar.gz 60136 BLAKE2B 0c1666a771c73fce645e36f807ad63ba74c8e3860d5bf76ce18d4f00479a79a8a58abe8cab6c4b53108bf3c2eb3a5b13af6c73f677fb2cf209e7742acb828e37 SHA512 bfdddb5e5019fb043db1d808b98cfeb44e3038519d29aaf8c3789a2bf9c55ebd3470ecc32102ffc4002896fe61a5a5985381b4c4f961390c1eac9be026a0741b
+DIST github.com-yvasiyarov-go-metrics-c25f46c4b940.tar.gz 30706 BLAKE2B 0f1b5c235b4625ee021d2f1254ffeb5e55ac99e705edc1c4a13ba55307f5dcde4ec4b42660795f0f76d12251d2e17b3602278d104781a5a46b564eff09f43af5 SHA512 ee183b481bd26936b9caed795e397c7667683c229107f690b2aaff0a73cf1d0fab19abcf77693b80123325f973c1fc6e5ea225ee3daaef5216f6696e4bf84f6f
+DIST github.com-yvasiyarov-gorelic-v0.0.6.tar.gz 8045 BLAKE2B 9c1265548490a1b2152f2aeb42ee31fda03c2d86611fe6a8b4f12c6963ee23aa417278994abed437086d0b2e8a29705ca8ec8053395c2a733e9c24e563585d43 SHA512 129ab577464b363ae07828e5cdf686ec6aca6e04240372ee61806412308c87163ffba4d2b57d1d6baf0b681cb9d6044cf94af05f840e4055809455a8c7d223d5
+DIST github.com-yvasiyarov-newrelic_platform_go-b21fdbd4370f.tar.gz 4637 BLAKE2B 48f88542905baf59399c3964e9c6f0f835e1427533ac959e1aabd282ef4df619dd1e3c48ea5de07c6c24c30ee21d426b2d73de5f1a53d7637bcc2bd9cad8655f SHA512 889e9c0c6292f313f348a2ad4c009d1559c774c7c6d12169d8fb666313f553318ceb2ed05e6823869916ece190cc41cd23a5a08a3f2f2c601172c7fb6984360f
+DIST helm-2.16.1.tar.gz 1283836 BLAKE2B f0a2cfb05adea2b0a98341962753e777e9329b669ca32a84ce0ed9b823df48f7884c6809d1625dd8cdfbf50efea31081c3c0400f0af65a67ab0fbf1afa3deba1 SHA512 eed2da36ba72da61c121d2cc2d4dc4ef2163f926579b2189b8b8113ba70102d0f63e48729e08b260fb3877d0fe1e0d6ed7eb8e9c67605d7d4a3bcdf7b33c2544
+DIST helm-3.0.0.tar.gz 498488 BLAKE2B e55b64d9547744118f35b83ed8ed3f1db168c491dff7d73c9871b7a5af36505b7be2ae861fbe3439463ae8459c71aa30e16fb49858ac9be09516a6e905ed8a51 SHA512 924df23cea78d91062f15156c989a84b223eda5b1e291f8a781c0be2334a6f2436936e88b7c800c3fc7f68b8d3ddb1f8be78573f014d17024b68f35f7e11b153
+DIST helm-3.0.1.tar.gz 498975 BLAKE2B 802b49ecc8888ef988571c9469be2dc039bb58373346a9d75284480b61971435774fcfffa42c1ffbc9d94d6f39fc1bc742c296aed2ba2676872bb50128d6333c SHA512 0fae3334e1c5c5a5e35c25a42d37bfdbbfcb40b6c1dc7a7b13dec4357ee0c538b619a2fd965921126ff8a652e1250fb158a502a99bf7da4ea697dff2e905d32b
+EBUILD helm-2.16.1.ebuild 10055 BLAKE2B 6a0279e082cd74eafb01b4fc77b97a62ddd2e6ce44969db65d053a507f081583501b05afe6220e86dae5b037700ba410a4c67e3c1fa92472360c774f7fd05ee4 SHA512 78f9aeb398ce93c64fb558be4edd3fb9cb55d42f2658cdf57f0bd8fcccb4269007c1d952494a50a655cd57d4b7a89690df9a48485c77876ddf438600d4153b6a
+EBUILD helm-3.0.0.ebuild 7131 BLAKE2B 50e7fcd49e605386d35ac98266d89da63e0e2f91f8daf31eb80c21d599e1851ff5ab3f0f82ea4ae3f1c31382aa2966eb588150a16c1e7351851b7872d3dd4d2b SHA512 48411846df850bf94f360007e6605341cf41a9de739108b1d944306263d18161dc248ab1247689b128d837c32c840f4102abe585647325f5b3a275031a7df306
+EBUILD helm-3.0.1.ebuild 7057 BLAKE2B ea4a09c1ed7a18e03e258a674b6587d38f915161c8fed17b7c5d92e800cd547f17b633ace759dd3cce5d3f0d584cf373df949dbb1a951d771fa1b0457e62bc12 SHA512 af0fdc6f3fe0bc6f0f12050a6c78f285a88c20ea418a25f44437fe8cf12905f644f54f1210dd2a9b6b316b1f40d62d7018ca9c550c3bee9c569a8cbeef49a390
+MISC metadata.xml 322 BLAKE2B b452dfaecaf6b32e7fc334ddb00444d739a618898f8e0d6905e8b3191acc7f0fc5e3929345405d86f9ab56e8ad80fbcd1dd46a0ea3ff5aaa2bb9f56407d10234 SHA512 ef4bb714213346e60a2a39833d0ab1987e10d2b34460a053b479775163e8778021ef3da63a8f5fede055281298dab88309a796cf3ad650c2d3ddeb17a7b0b4be
diff --git a/app-admin/helm/helm-2.14.3.ebuild b/app-admin/helm/helm-2.14.3.ebuild
deleted file mode 100644
index 7e9d9b482c47..000000000000
--- a/app-admin/helm/helm-2.14.3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="k8s.io/helm"
-
-MY_PV=${PV/_rc/-rc.}
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
-"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
-"github.com/Azure/go-autorest ea233b6412b0421a65dc6160e16c893364664a95"
-"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-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
-"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135"
-"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
-"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
-"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577"
-"github.com/go-openapi/jsonpointer ef5f0afec364d3b9396b7b77b43dbe26bf1f8004"
-"github.com/go-openapi/jsonreference 8483a886a90412cd6858df4ea3483dce9c8e35a3"
-"github.com/go-openapi/spec 5bae59e25b21498baea7f9d46e9c147ec106a42e"
-"github.com/go-openapi/swag 5899d5c5e619fda5fa86e14795a835f473ca284c"
-"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
-"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
-"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 24818f796faf91cd76ec7bddd72458fbced7a6c1"
-"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud c818fa66e4c88b30db28038fe3f18f2f4a0db9a8"
-"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
-"github.com/hashicorp/golang-lru 20f1fb78b0740ba8c3cb143a61e86ba5c8669768"
-"github.com/huandu/xstrings f02667b379e2fb5916c3cda2cf31e0eb885d79f8"
-"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
-"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-"github.com/jmoiron/sqlx d161d7a76b5661016ad0b085869f77fd410f3e6a"
-"github.com/json-iterator/go ab8a2e0c74be9d3be70b3184d9acc634935ded82"
-"github.com/liggitt/tabwriter 89fcab3d43de07060e4fd4c1547430ed57e87f24"
-"github.com/lib/pq 88edab0803230a3898347e77b474f8c1820a1f20"
-"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
-"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
-"github.com/Masterminds/goutils 41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"
-"github.com/Masterminds/semver c7af12943936e8c39859482e61f0574c2fd7fc75"
-"github.com/Masterminds/sprig 9f8fceff796fb9f4e992cd2bece016be0121ab74"
-"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 94122c33edd36123c84d5368cfb2b69df93a0ec8"
-"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
-"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
-"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-"github.com/prometheus/common cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
-"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/rubenv/sql-migrate 1007f53448d75fe14190968f5de4d95ed63ebb83"
-"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 65e2d4e15006aab9813ff8769e768bbf4bb667a0 github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
-"golang.org/x/sys b90733256f2e882e81d52f9126de08df5615afd9 github.com/golang/sys"
-"golang.org/x/text 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 a02b0774206b209466313a0b525d2c738fe407eb github.com/grpc/grpc-go"
-"gopkg.in/gorp.v1 6a667da9c028871f98598d85413e3fc4c6daa52e github.com/go-gorp/gorp"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/square/go-jose.v2 89060dee6a84df9a4dae49f676f0c755037834f1 github.com/square/go-jose"
-"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml"
-"k8s.io/api 6e4e0e4f393bf5e8bbff570acd13217aa5a770cd github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver 727a075fdec8319bf095330e344b3ccc668abc73 github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery 6a84e37a896db9780c75367af8d2ed2bb944022e github.com/kubernetes/apimachinery"
-"k8s.io/apiserver 1ec86e4da56ce0573788fc12bb3a5530600c0e5d github.com/kubernetes/apiserver"
-"k8s.io/client-go 1a26190bd76a9017e289958b9fba936430aa3704 github.com/kubernetes/client-go"
-"k8s.io/cli-runtime d644b00f3b79346b7627329269bb25f2135f941c github.com/kubernetes/cli-runtime"
-"k8s.io/cloud-provider 9c9d72d1bf90eb62005f5112f3eea019b272c44b github.com/kubernetes/cloud-provider"
-"k8s.io/klog 8e90cee79f823779174776412c13478955131846 github.com/kubernetes/klog"
-"k8s.io/kube-openapi b3a7cee44a305be0a69e1b9ac03018307287e1b0 github.com/kubernetes/kube-openapi"
-"k8s.io/kubernetes b7394102d6ef778017f2ca4046abbaa23b88c290 github.com/kubernetes/kubernetes"
-"k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c github.com/kubernetes/utils"
-"sigs.k8s.io/kustomize a6f65144121d1955266b0cd836ce954c04122dc8 github.com/kubernetes-sigs/kustomize"
-"sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 github.com/kubernetes-sigs/yaml"
-"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-GIT_COMMIT="0e7f3b6637f7af8fcfddb3d2941fcc7cbebb0085"
-
-ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="amd64"
-
-DESCRIPTION="Kubernetes Package Manager"
-HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
-		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
-		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
-		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
-
-	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
-	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
-	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
-	popd || die
-	bin/${PN} completion bash > ${PN}.bash || die
-	bin/${PN} completion zsh > ${PN}.zsh || die
-}
-
-src_install() {
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dobin bin/${PN} bin/tiller
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/app-admin/helm/helm-2.15.2.ebuild b/app-admin/helm/helm-2.15.2.ebuild
deleted file mode 100644
index 5bc8a3b1f1e9..000000000000
--- a/app-admin/helm/helm-2.15.2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="k8s.io/helm"
-
-MY_PV=${PV/_rc/-rc.}
-
-EGO_VENDOR=(
-"cloud.google.com/go 0ebda48a7f143b1cce9eb37a8c1106ac762a3430 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
-"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
-"github.com/Azure/go-autorest 1ffcc8896ef6dfe022d90a4317d866f925cf0f9e"
-"github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
-"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
-"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
-"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
-"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
-"github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
-"github.com/docker/docker be7ac8be2ae072032a4005e8f232be3fc57e4127"
-"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
-"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135"
-"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
-"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
-"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577"
-"github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d23f618feb6dbb"
-"github.com/go-openapi/jsonpointer ef5f0afec364d3b9396b7b77b43dbe26bf1f8004"
-"github.com/go-openapi/jsonreference 8483a886a90412cd6858df4ea3483dce9c8e35a3"
-"github.com/go-openapi/spec 5bae59e25b21498baea7f9d46e9c147ec106a42e"
-"github.com/go-openapi/swag 5899d5c5e619fda5fa86e14795a835f473ca284c"
-"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
-"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
-"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/go-cmp 6f77996f0c42f7b84e5a2b252227263f93432e9b"
-"github.com/google/gofuzz 24818f796faf91cd76ec7bddd72458fbced7a6c1"
-"github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c74f71af0538a4"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud c818fa66e4c88b30db28038fe3f18f2f4a0db9a8"
-"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
-"github.com/hashicorp/golang-lru 20f1fb78b0740ba8c3cb143a61e86ba5c8669768"
-"github.com/huandu/xstrings f02667b379e2fb5916c3cda2cf31e0eb885d79f8"
-"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
-"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-"github.com/jmoiron/sqlx d161d7a76b5661016ad0b085869f77fd410f3e6a"
-"github.com/json-iterator/go ab8a2e0c74be9d3be70b3184d9acc634935ded82"
-"github.com/liggitt/tabwriter 89fcab3d43de07060e4fd4c1547430ed57e87f24"
-"github.com/konsorten/go-windows-terminal-sequences 5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"
-"github.com/lib/pq 88edab0803230a3898347e77b474f8c1820a1f20"
-"github.com/mailru/easyjson 60711f1a8329503b04e1c88535f419d0bb440bff"
-"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
-"github.com/Masterminds/goutils 41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"
-"github.com/Masterminds/semver 805c489aa98f412e79eb308a37996bf9d8b1c91e"
-"github.com/Masterminds/sprig 2691a9cba2adee8d9a60100a1bc49e770f97b7db"
-"github.com/Masterminds/vcs f94282d8632a0620f79f0c6ff0e82604e8c5c85b"
-"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
-"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
-"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
-"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
-"github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
-"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
-"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
-"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-"github.com/prometheus/common 4724e9255275ce38f7179b2478abeae4e28c904f"
-"github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
-"github.com/PuerkitoBio/purell 0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"
-"github.com/PuerkitoBio/urlesc de5bf2ad457846296e2031421a34e2568e304e35"
-"github.com/rubenv/sql-migrate 1007f53448d75fe14190968f5de4d95ed63ebb83"
-"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
-"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
-"github.com/sirupsen/logrus bcd833dfe83d3cebad139e4a29ed79cb2318bf95"
-"github.com/spf13/cobra f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5"
-"github.com/spf13/pflag e8f29969b682c41a730f8f08b76033b120498464"
-"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
-"golang.org/x/crypto e84da0312774c21d64ee2317962ef669b27ffb41 github.com/golang/crypto"
-"golang.org/x/net 65e2d4e15006aab9813ff8769e768bbf4bb667a0 github.com/golang/net"
-"golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
-"golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
-"golang.org/x/sys b90733256f2e882e81d52f9126de08df5615afd9 github.com/golang/sys"
-"golang.org/x/text e6919f6577db79269a6443b9dc46d18f2238fb5d github.com/golang/text"
-"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
-"google.golang.org/appengine 54a98f90d1c46b7731eb8fb305d2a321c30ef610 github.com/golang/appengine"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
-"google.golang.org/grpc a02b0774206b209466313a0b525d2c738fe407eb github.com/grpc/grpc-go"
-"gopkg.in/gorp.v1 6a667da9c028871f98598d85413e3fc4c6daa52e github.com/go-gorp/gorp"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/square/go-jose.v2 89060dee6a84df9a4dae49f676f0c755037834f1 github.com/square/go-jose"
-"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml"
-"k8s.io/api 7cf5895f2711098d7d9527db0a4a49fb0dff7de2 github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver 14e95df34f1f469647f494f5185a036e26fddcab github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery 1799e75a07195de9460b8ef7300883499f12127b github.com/kubernetes/apimachinery"
-"k8s.io/apiserver 47dc9a115b1874c96c20cea91d02b36e4faa1bb1 github.com/kubernetes/apiserver"
-"k8s.io/client-go 78d2af792babf2dd937ba2e2a8d99c753a5eda89 github.com/kubernetes/client-go"
-"k8s.io/cli-runtime 2090e6d8f84c1db3e23968b0ee97fb677b363fcf github.com/kubernetes/cli-runtime"
-"k8s.io/component-base 185d68e6e6ea654214f444cab8f645ec3af3092e github.com/kubernetes/component-base"
-"k8s.io/klog 89e63fd5117f8c20208186ef85f096703a280c20 github.com/kubernetes/klog"
-"k8s.io/kube-openapi b3a7cee44a305be0a69e1b9ac03018307287e1b0 github.com/kubernetes/kube-openapi"
-"k8s.io/kubernetes e8462b5b5dc2584fdcd18e6bcfe9f1e4d970a529 github.com/kubernetes/kubernetes"
-"k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c github.com/kubernetes/utils"
-"sigs.k8s.io/kustomize a6f65144121d1955266b0cd836ce954c04122dc8 github.com/kubernetes-sigs/kustomize"
-"sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 github.com/kubernetes-sigs/yaml"
-"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-GIT_COMMIT="8dce272473e5f2a7bf58ce79bb5c3691db54c96b"
-
-ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Package Manager"
-HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.12"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
-		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
-		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
-		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
-
-	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
-	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
-	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
-	popd || die
-	bin/${PN} completion bash > ${PN}.bash || die
-	bin/${PN} completion zsh > ${PN}.zsh || die
-}
-
-src_install() {
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dobin bin/${PN} bin/tiller
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/app-admin/helm/helm-2.15.1.ebuild b/app-admin/helm/helm-2.16.1.ebuild
index dc055f1bf306..6f4db7a99f2d 100644
--- a/app-admin/helm/helm-2.15.1.ebuild
+++ b/app-admin/helm/helm-2.16.1.ebuild
@@ -8,118 +8,122 @@ EGO_PN="k8s.io/helm"
 MY_PV=${PV/_rc/-rc.}
 
 EGO_VENDOR=(
-"cloud.google.com/go 0ebda48a7f143b1cce9eb37a8c1106ac762a3430 github.com/GoogleCloudPlatform/gcloud-golang"
+"cloud.google.com/go 8c41231e01b2085512d98153bcffb847ff9b4b9f github.com/GoogleCloudPlatform/gcloud-golang"
 "github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
 "github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
-"github.com/Azure/go-autorest 1ffcc8896ef6dfe022d90a4317d866f925cf0f9e"
+"github.com/Azure/go-autorest 69b4126ece6b5257e2f9b0017007d2334153655f"
 "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb"
 "github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
 "github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
-"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/cpuguy83/go-md2man 7762f7e404f8416dfa1d9bb6a8c192aa9acb4d19"
 "github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
 "github.com/davecgh/go-spew 8991bc29aa16c548c550c7ff78260e27b9ab7c73"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
+"github.com/docker/distribution 2461543d988979529609e8cb6fca9ca190dc48da"
 "github.com/docker/docker be7ac8be2ae072032a4005e8f232be3fc57e4127"
 "github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
 "github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
 "github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
 "github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135"
 "github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
-"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/fatih/color 3f9d52f7176a6927daacff70a3e8d1dc2025c53e"
 "github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577"
 "github.com/gofrs/flock 392e7fae8f1b0bdbd67dad7237d23f618feb6dbb"
-"github.com/go-openapi/jsonpointer ef5f0afec364d3b9396b7b77b43dbe26bf1f8004"
-"github.com/go-openapi/jsonreference 8483a886a90412cd6858df4ea3483dce9c8e35a3"
-"github.com/go-openapi/spec 5bae59e25b21498baea7f9d46e9c147ec106a42e"
-"github.com/go-openapi/swag 5899d5c5e619fda5fa86e14795a835f473ca284c"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 6aced65f8501fe1217321abf0749d354824ba2ff"
+"github.com/go-openapi/swag 1d0bd113de87027671077d3c71eb3ac5d7dbba72"
 "github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
-"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
+"github.com/gogo/protobuf 65acae22fc9d1fe290b33faa2bd64cdc20a463a0"
 "github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
 "github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
-"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/golang/protobuf 6c65a5562fc06764971b7c5d05c76c75e84bdbf7"
+"github.com/google/btree 4030bb1f1f0c35b30ca7009e9ebd06849dd45306"
 "github.com/google/go-cmp 6f77996f0c42f7b84e5a2b252227263f93432e9b"
-"github.com/google/gofuzz 24818f796faf91cd76ec7bddd72458fbced7a6c1"
+"github.com/google/gofuzz f140a6486e521aad38f5917de355cbf147cc0496"
 "github.com/google/uuid 0cd6bf5da1e1c83f8b45653022c74f71af0538a4"
 "github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud c818fa66e4c88b30db28038fe3f18f2f4a0db9a8"
-"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gophercloud/gophercloud c2d73b246b48e239d3f03c455905e06fe26e33c3"
+"github.com/gosuri/uitable 2cf933346b8370a3a3d8867ef5cf54b2129d8ecf"
 "github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
-"github.com/hashicorp/golang-lru 20f1fb78b0740ba8c3cb143a61e86ba5c8669768"
+"github.com/grpc-ecosystem/go-grpc-prometheus 6af20e3a5340d5e6bde20c8a7a78699efe19ac0a"
+"github.com/hashicorp/golang-lru 7087cb70de9f7a8bc0a10c375cb0d2280a8edf9c"
 "github.com/huandu/xstrings f02667b379e2fb5916c3cda2cf31e0eb885d79f8"
 "github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
 "github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
 "github.com/jmoiron/sqlx d161d7a76b5661016ad0b085869f77fd410f3e6a"
-"github.com/json-iterator/go ab8a2e0c74be9d3be70b3184d9acc634935ded82"
-"github.com/liggitt/tabwriter 89fcab3d43de07060e4fd4c1547430ed57e87f24"
+"github.com/json-iterator/go 27518f6661eba504be5a7a9a9f6d9460d892ade3"
 "github.com/konsorten/go-windows-terminal-sequences 5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"
-"github.com/lib/pq 88edab0803230a3898347e77b474f8c1820a1f20"
-"github.com/mailru/easyjson 60711f1a8329503b04e1c88535f419d0bb440bff"
+"github.com/lib/pq f91d3411e481ed313eeab65ebfe9076466c39d01"
+"github.com/liggitt/tabwriter 89fcab3d43de07060e4fd4c1547430ed57e87f24"
+"github.com/mailru/easyjson d5b7844b561a7bc640052f1b935f7b800330d7e0"
 "github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
 "github.com/Masterminds/goutils 41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"
 "github.com/Masterminds/semver 805c489aa98f412e79eb308a37996bf9d8b1c91e"
-"github.com/Masterminds/sprig 2691a9cba2adee8d9a60100a1bc49e770f97b7db"
+"github.com/Masterminds/sprig e4c0945838d570720d876a6ad9b4568ed32317b4"
 "github.com/Masterminds/vcs f94282d8632a0620f79f0c6ff0e82604e8c5c85b"
-"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/mattn/go-colorable 98ec13f34aabf44cc914c65a1cfb7b9bc815aef1"
+"github.com/mattn/go-isatty 0e9ddb7c0c0aef74fa25eaba4141e6b5ab7aca2a"
+"github.com/mattn/go-runewidth 9d4e0701ab53d89eeb2f46b282d1cd71f458f0bf"
 "github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
-"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
+"github.com/mitchellh/copystructure 9a1b6f44e8da0e0e374624fb0a825a231b00c537"
+"github.com/mitchellh/go-wordwrap 9e67c67572bc5dd02aef930e2b0ae3c02a4b5a5c"
+"github.com/mitchellh/reflectwalk 3e2c75dfad4fbf904b58782a80fd595c760ad185"
 "github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
 "github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
-"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/opencontainers/go-digest 279bed98673dd5bef374d3b6e4b09e2af76183bf"
 "github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
+"github.com/pkg/errors 27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"
 "github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
-"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/client_model 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"
 "github.com/prometheus/common 4724e9255275ce38f7179b2478abeae4e28c904f"
 "github.com/prometheus/procfs 1dc9a6cbc91aacc3e8b2d63db4d2e957a5394ac4"
-"github.com/PuerkitoBio/purell 0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"
-"github.com/PuerkitoBio/urlesc de5bf2ad457846296e2031421a34e2568e304e35"
-"github.com/rubenv/sql-migrate 1007f53448d75fe14190968f5de4d95ed63ebb83"
-"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
-"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
-"github.com/sirupsen/logrus bcd833dfe83d3cebad139e4a29ed79cb2318bf95"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/rubenv/sql-migrate 9355dd04f4b3dc9ed604623307307a3491a627bc"
+"github.com/russross/blackfriday 05f3235734ad95d0016f6a23902f06461fcf567a"
+"github.com/sirupsen/logrus 839c75faf7f98a33d445d181f3018b5c3409a45e"
 "github.com/spf13/cobra f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5"
-"github.com/spf13/pflag e8f29969b682c41a730f8f08b76033b120498464"
+"github.com/spf13/pflag 2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab"
 "github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
 "golang.org/x/crypto e84da0312774c21d64ee2317962ef669b27ffb41 github.com/golang/crypto"
-"golang.org/x/net 65e2d4e15006aab9813ff8769e768bbf4bb667a0 github.com/golang/net"
+"golang.org/x/net cdfb69ac37fc6fa907650654115ebebb3aae2087 github.com/golang/net"
 "golang.org/x/oauth2 9f3314589c9a9136388751d9adae6b0ed400978a github.com/golang/oauth2"
-"golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
+"golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e github.com/golang/sync"
 "golang.org/x/sys b90733256f2e882e81d52f9126de08df5615afd9 github.com/golang/sys"
 "golang.org/x/text e6919f6577db79269a6443b9dc46d18f2238fb5d github.com/golang/text"
 "golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
 "google.golang.org/appengine 54a98f90d1c46b7731eb8fb305d2a321c30ef610 github.com/golang/appengine"
-"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/genproto 919d9bdd9fe6f1a5dd95ce5d5e4cdb8fd3c516d0 github.com/google/go-genproto"
 "google.golang.org/grpc a02b0774206b209466313a0b525d2c738fe407eb github.com/grpc/grpc-go"
 "gopkg.in/gorp.v1 6a667da9c028871f98598d85413e3fc4c6daa52e github.com/go-gorp/gorp"
 "gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/square/go-jose.v2 89060dee6a84df9a4dae49f676f0c755037834f1 github.com/square/go-jose"
-"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml"
-"k8s.io/api 7cf5895f2711098d7d9527db0a4a49fb0dff7de2 github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver 14e95df34f1f469647f494f5185a036e26fddcab github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery 1799e75a07195de9460b8ef7300883499f12127b github.com/kubernetes/apimachinery"
-"k8s.io/apiserver 47dc9a115b1874c96c20cea91d02b36e4faa1bb1 github.com/kubernetes/apiserver"
-"k8s.io/client-go 78d2af792babf2dd937ba2e2a8d99c753a5eda89 github.com/kubernetes/client-go"
-"k8s.io/cli-runtime 2090e6d8f84c1db3e23968b0ee97fb677b363fcf github.com/kubernetes/cli-runtime"
-"k8s.io/component-base 185d68e6e6ea654214f444cab8f645ec3af3092e github.com/kubernetes/component-base"
-"k8s.io/klog 89e63fd5117f8c20208186ef85f096703a280c20 github.com/kubernetes/klog"
-"k8s.io/kube-openapi b3a7cee44a305be0a69e1b9ac03018307287e1b0 github.com/kubernetes/kube-openapi"
-"k8s.io/kubernetes e8462b5b5dc2584fdcd18e6bcfe9f1e4d970a529 github.com/kubernetes/kubernetes"
-"k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c github.com/kubernetes/utils"
+"gopkg.in/square/go-jose.v2 e94fb177d3668d35ab39c61cbb2f311550557e83 github.com/square/go-jose"
+"gopkg.in/yaml.v2 f221b8435cfb71e54062f6c6e99e9ade30b124d5 github.com/go-yaml/yaml"
+"k8s.io/api 35e52d86657aba06859dd22099bfa14faf1effb2 github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver 5357c4baaf6562e4d37c9afc9fef99bd16d76a9f github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery a2eda9f80ab8a454a81bdde16d62a1afe5f931c0 github.com/kubernetes/apimachinery"
+"k8s.io/apiserver 5190913f932d82e562d4eb91d0f3d7a063bdbc07 github.com/kubernetes/apiserver"
+"k8s.io/client-go bec269661e48cb1e5fbb0d037f356ffe9e9978a0 github.com/kubernetes/client-go"
+"k8s.io/cli-runtime 74ad18325ed51ea6de9ee19bae59156bad18ecd2 github.com/kubernetes/cli-runtime"
+"k8s.io/component-base 039242c015a9f5eeaccea3ea17c6973b9c27166a github.com/kubernetes/component-base"
+"k8s.io/klog 3ca30a56d8a775276f9cdae009ba326fdc05af7f github.com/kubernetes/klog"
+"k8s.io/kube-openapi 743ec37842bffe49dd4221d9026f30fb1d5adbc4 github.com/kubernetes/kube-openapi"
+"k8s.io/kubectl 2ed914427d51f6fd865e0db43d72b2f22610cf32 github.com/kubernetes/kubectl"
+"k8s.io/kubernetes c97fe5036ef3df2967d086711e6c0c405941e14b github.com/kubernetes/kubernetes"
+"k8s.io/utils 581e00157fb1a0435d4fac54a52d1ca1e481d60e github.com/kubernetes/utils"
 "sigs.k8s.io/kustomize a6f65144121d1955266b0cd836ce954c04122dc8 github.com/kubernetes-sigs/kustomize"
 "sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 github.com/kubernetes-sigs/yaml"
-"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+"vbom.ml/util efcd4e0f97874370259c7d93e12aad57911dea81 github.com/fvbommel/util"
 )
 
 inherit golang-build golang-vcs-snapshot bash-completion-r1
 
-GIT_COMMIT="cf1de4f8ba70eded310918a8af3a96bfe8e7683b"
+GIT_COMMIT="bbdfe5e7803a12bbdf97e94cd847859890cf4050"
 
 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-3.0.0.ebuild b/app-admin/helm/helm-3.0.0.ebuild
new file mode 100644
index 000000000000..cc208bd7a447
--- /dev/null
+++ b/app-admin/helm/helm-3.0.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="helm.sh/helm"
+
+MY_PV=${PV/_rc/-rc.}
+
+EGO_VENDOR=(
+	"github.com/Nvveen/Gotty a8b993ba6abdb0e0c12b0125c603323a71c7790c github.com/ijc25/Gotty"
+	"cloud.google.com/go v0.38.0 github.com/GoogleCloudPlatform/gcloud-golang"
+	"github.com/Azure/go-ansiterm d6e3b3328b78"
+	"github.com/Azure/go-autorest v13.0.0"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/MakeNowJust/heredoc e9091a26100e"
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/semver/v3 v3.0.1 github.com/Masterminds/semver"
+	"github.com/Masterminds/sprig/v3 v3.0.0 github.com/Masterminds/sprig"
+	"github.com/Masterminds/vcs v1.13.0"
+	"github.com/Microsoft/go-winio v0.4.12"
+	"github.com/Microsoft/hcsshim v0.8.6"
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/urlesc de5bf2ad4578"
+	"github.com/Shopify/logrus-bugsnag 577dee27f20d"
+	"github.com/asaskevich/govalidator f61b66f89f4a"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1"
+	"github.com/bugsnag/bugsnag-go v1.5.0"
+	"github.com/bugsnag/panicwrap v1.2.0"
+	"github.com/cespare/xxhash/v2 v2.1.0 github.com/cespare/xxhash"
+	"github.com/containerd/containerd v1.3.0"
+	"github.com/containerd/continuity 004b46473808"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cyphar/filepath-securejoin v0.2.2"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/deislabs/oras v0.7.0"
+	"github.com/dgrijalva/jwt-go v3.2.0"
+	"github.com/docker/cli d88565df0c2d"
+	"github.com/docker/distribution v2.7.1"
+	"github.com/docker/docker 2cb26cfe9cbf"
+	"github.com/docker/docker-credential-helpers v0.6.1"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-metrics b84716841b82"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/libtrust aabc10ec26b7"
+	"github.com/docker/spdystream 6480d4af844c"
+	"github.com/emicklei/go-restful v2.11.1"
+	"github.com/evanphx/json-patch v4.5.0"
+	"github.com/exponent-io/jsonpath d6023ce2651d"
+	"github.com/garyburd/redigo v1.6.0"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/go-openapi/jsonpointer v0.19.3"
+	"github.com/go-openapi/jsonreference v0.19.3"
+	"github.com/go-openapi/spec v0.19.4"
+	"github.com/go-openapi/swag v0.19.5"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gofrs/flock v0.7.1"
+	"github.com/gofrs/uuid v3.2.0"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/go-cmp v0.3.1"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/google/uuid v1.1.1"
+	"github.com/googleapis/gnostic v0.3.1"
+	"github.com/gophercloud/gophercloud v0.1.0"
+	"github.com/gorilla/handlers v1.4.0"
+	"github.com/gorilla/mux v1.7.0"
+	"github.com/gosuri/uitable v0.0.1"
+	"github.com/gregjones/httpcache c63ab54fda8f"
+	"github.com/hashicorp/golang-lru v0.5.3"
+	"github.com/huandu/xstrings v1.2.0"
+	"github.com/imdario/mergo v0.3.8"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/json-iterator/go v1.1.7"
+	"github.com/kardianos/osext ae77be60afb1"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/mailru/easyjson v0.7.0"
+	"github.com/mattn/go-runewidth v0.0.4"
+	"github.com/mattn/go-shellwords v1.0.5"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/miekg/dns 0d29b283ac0f"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/modern-go/concurrent bacd9c7ef1dd"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/morikuni/aec 39771216ff4c"
+	"github.com/opencontainers/go-digest v1.0.0-rc1"
+	"github.com/opencontainers/image-spec v1.0.1"
+	"github.com/opencontainers/runc v0.1.1"
+	"github.com/peterbourgon/diskv v2.0.1"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/prometheus/client_golang v1.2.1"
+	"github.com/prometheus/client_model 14fe0d1b01d4"
+	"github.com/prometheus/common v0.7.0"
+	"github.com/prometheus/procfs v0.0.5"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cobra v0.0.5"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/xeipuuv/gojsonpointer 4e3ac2762d5f"
+	"github.com/xeipuuv/gojsonreference bd5ef7bd5415"
+	"github.com/xeipuuv/gojsonschema v1.1.0"
+	"github.com/xenolf/lego a9d8cec0e656"
+	"github.com/yvasiyarov/go-metrics c25f46c4b940"
+	"github.com/yvasiyarov/gorelic v0.0.6"
+	"github.com/yvasiyarov/newrelic_platform_go b21fdbd4370f"
+	"golang.org/x/crypto f83a4685e152 github.com/golang/crypto"
+	"golang.org/x/net fe3aa8a45271 github.com/golang/net"
+	"golang.org/x/oauth2 0f29369cfe45 github.com/golang/oauth2"
+	"golang.org/x/sync 112230192c58 github.com/golang/sync"
+	"golang.org/x/sys 195ce5e7f934 github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+	"golang.org/x/time 555d28b269f0 github.com/golang/time"
+	"google.golang.org/appengine v1.6.5 github.com/golang/appengine"
+	"google.golang.org/genproto 919d9bdd9fe6 github.com/google/go-genproto"
+	"google.golang.org/grpc v1.24.0 github.com/grpc/grpc-go"
+	"gopkg.in/inf.v0 v0.9.1 github.com/go-inf/inf"
+	"gopkg.in/square/go-jose.v1 v1.1.2 github.com/square/go-jose"
+	"gopkg.in/yaml.v2 v2.2.4 github.com/go-yaml/yaml"
+	"k8s.io/api 35e52d86657a github.com/kubernetes/api"
+	"k8s.io/apiextensions-apiserver 5357c4baaf65 github.com/kubernetes/apiextensions-apiserver"
+	"k8s.io/apimachinery a2eda9f80ab8 github.com/kubernetes/apimachinery"
+	"k8s.io/cli-runtime 74ad18325ed5 github.com/kubernetes/cli-runtime"
+	"k8s.io/client-go bec269661e48 github.com/kubernetes/client-go"
+	"k8s.io/klog v1.0.0 github.com/kubernetes/klog"
+	"k8s.io/kube-openapi 0270cf2f1c1d github.com/kubernetes/kube-openapi"
+	"k8s.io/kubectl 2ed914427d51 github.com/kubernetes/kubectl"
+	"k8s.io/utils 8d271d903fe4 github.com/kubernetes/utils"
+	"rsc.io/letsencrypt v0.0.1 github.com/rsc/letsencrypt"
+	"sigs.k8s.io/kustomize v2.0.3 github.com/kubernetes-sigs/kustomize"
+	"sigs.k8s.io/yaml v1.1.0 github.com/kubernetes-sigs/yaml"
+)
+
+inherit go-module bash-completion-r1
+
+GIT_COMMIT="e29ce2a54e96cd02ccfce88bee4f58bb6e2a28b6"
+
+ARCHIVE_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	$(go-module_vendor_uris)"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/helm/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.12"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" || //' \
+		-e "/GOFLAGS    :=/d" Makefile || die
+}
+
+src_compile() {
+	emake build
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN}
+	dodoc README.md
+}
diff --git a/app-admin/helm/helm-3.0.1.ebuild b/app-admin/helm/helm-3.0.1.ebuild
new file mode 100644
index 000000000000..7dc4fe85e786
--- /dev/null
+++ b/app-admin/helm/helm-3.0.1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module bash-completion-r1
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/helm/helm https://helm.sh"
+
+EGO_VENDOR=(
+	"github.com/Nvveen/Gotty a8b993ba6abdb0e0c12b0125c603323a71c7790c github.com/ijc25/Gotty"
+	"cloud.google.com/go v0.38.0 github.com/GoogleCloudPlatform/gcloud-golang"
+	"github.com/Azure/go-ansiterm d6e3b3328b78"
+	"github.com/Azure/go-autorest v13.0.0"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/MakeNowJust/heredoc e9091a26100e"
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/semver/v3 v3.0.1 github.com/Masterminds/semver"
+	"github.com/Masterminds/sprig/v3 v3.0.0 github.com/Masterminds/sprig"
+	"github.com/Masterminds/vcs v1.13.0"
+	"github.com/Microsoft/go-winio v0.4.12"
+	"github.com/Microsoft/hcsshim v0.8.6"
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/urlesc de5bf2ad4578"
+	"github.com/Shopify/logrus-bugsnag 577dee27f20d"
+	"github.com/asaskevich/govalidator f61b66f89f4a"
+	"github.com/beorn7/perks v1.0.1"
+	"github.com/bshuster-repo/logrus-logstash-hook v0.4.1"
+	"github.com/bugsnag/bugsnag-go v1.5.0"
+	"github.com/bugsnag/panicwrap v1.2.0"
+	"github.com/cespare/xxhash/v2 v2.1.0 github.com/cespare/xxhash"
+	"github.com/containerd/containerd v1.3.0"
+	"github.com/containerd/continuity 004b46473808"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cyphar/filepath-securejoin v0.2.2"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/deislabs/oras v0.7.0"
+	"github.com/dgrijalva/jwt-go v3.2.0"
+	"github.com/docker/cli d88565df0c2d"
+	"github.com/docker/distribution v2.7.1"
+	"github.com/docker/docker 2cb26cfe9cbf"
+	"github.com/docker/docker-credential-helpers v0.6.1"
+	"github.com/docker/go-connections v0.4.0"
+	"github.com/docker/go-metrics b84716841b82"
+	"github.com/docker/go-units v0.4.0"
+	"github.com/docker/libtrust aabc10ec26b7"
+	"github.com/docker/spdystream 6480d4af844c"
+	"github.com/emicklei/go-restful v2.11.1"
+	"github.com/evanphx/json-patch v4.5.0"
+	"github.com/exponent-io/jsonpath d6023ce2651d"
+	"github.com/garyburd/redigo v1.6.0"
+	"github.com/ghodss/yaml v1.0.0"
+	"github.com/go-openapi/jsonpointer v0.19.3"
+	"github.com/go-openapi/jsonreference v0.19.3"
+	"github.com/go-openapi/spec v0.19.4"
+	"github.com/go-openapi/swag v0.19.5"
+	"github.com/gobwas/glob v0.2.3"
+	"github.com/gofrs/flock v0.7.1"
+	"github.com/gofrs/uuid v3.2.0"
+	"github.com/gogo/protobuf v1.3.1"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/google/btree v1.0.0"
+	"github.com/google/go-cmp v0.3.1"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/google/uuid v1.1.1"
+	"github.com/googleapis/gnostic v0.3.1"
+	"github.com/gophercloud/gophercloud v0.1.0"
+	"github.com/gorilla/handlers v1.4.0"
+	"github.com/gorilla/mux v1.7.0"
+	"github.com/gosuri/uitable v0.0.1"
+	"github.com/gregjones/httpcache c63ab54fda8f"
+	"github.com/hashicorp/golang-lru v0.5.3"
+	"github.com/huandu/xstrings v1.2.0"
+	"github.com/imdario/mergo v0.3.8"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/json-iterator/go v1.1.7"
+	"github.com/kardianos/osext ae77be60afb1"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/mailru/easyjson v0.7.0"
+	"github.com/mattn/go-runewidth v0.0.4"
+	"github.com/mattn/go-shellwords v1.0.5"
+	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
+	"github.com/miekg/dns 0d29b283ac0f"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/go-wordwrap v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/modern-go/concurrent bacd9c7ef1dd"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/morikuni/aec 39771216ff4c"
+	"github.com/opencontainers/go-digest v1.0.0-rc1"
+	"github.com/opencontainers/image-spec v1.0.1"
+	"github.com/opencontainers/runc v0.1.1"
+	"github.com/peterbourgon/diskv v2.0.1"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/prometheus/client_golang v1.2.1"
+	"github.com/prometheus/client_model 14fe0d1b01d4"
+	"github.com/prometheus/common v0.7.0"
+	"github.com/prometheus/procfs v0.0.5"
+	"github.com/russross/blackfriday v1.5.2"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cobra v0.0.5"
+	"github.com/spf13/pflag v1.0.5"
+	"github.com/stretchr/testify v1.4.0"
+	"github.com/xeipuuv/gojsonpointer 4e3ac2762d5f"
+	"github.com/xeipuuv/gojsonreference bd5ef7bd5415"
+	"github.com/xeipuuv/gojsonschema v1.1.0"
+	"github.com/xenolf/lego a9d8cec0e656"
+	"github.com/yvasiyarov/go-metrics c25f46c4b940"
+	"github.com/yvasiyarov/gorelic v0.0.6"
+	"github.com/yvasiyarov/newrelic_platform_go b21fdbd4370f"
+	"golang.org/x/crypto f83a4685e152 github.com/golang/crypto"
+	"golang.org/x/net fe3aa8a45271 github.com/golang/net"
+	"golang.org/x/oauth2 0f29369cfe45 github.com/golang/oauth2"
+	"golang.org/x/sync 112230192c58 github.com/golang/sync"
+	"golang.org/x/sys 195ce5e7f934 github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+	"golang.org/x/time 555d28b269f0 github.com/golang/time"
+	"google.golang.org/appengine v1.6.5 github.com/golang/appengine"
+	"google.golang.org/genproto 919d9bdd9fe6 github.com/google/go-genproto"
+	"google.golang.org/grpc v1.24.0 github.com/grpc/grpc-go"
+	"gopkg.in/inf.v0 v0.9.1 github.com/go-inf/inf"
+	"gopkg.in/square/go-jose.v1 v1.1.2 github.com/square/go-jose"
+	"gopkg.in/yaml.v2 v2.2.4 github.com/go-yaml/yaml"
+	"k8s.io/api 35e52d86657a github.com/kubernetes/api"
+	"k8s.io/apiextensions-apiserver 5357c4baaf65 github.com/kubernetes/apiextensions-apiserver"
+	"k8s.io/apimachinery a2eda9f80ab8 github.com/kubernetes/apimachinery"
+	"k8s.io/cli-runtime 74ad18325ed5 github.com/kubernetes/cli-runtime"
+	"k8s.io/client-go bec269661e48 github.com/kubernetes/client-go"
+	"k8s.io/klog v1.0.0 github.com/kubernetes/klog"
+	"k8s.io/kube-openapi 0270cf2f1c1d github.com/kubernetes/kube-openapi"
+	"k8s.io/kubectl 2ed914427d51 github.com/kubernetes/kubectl"
+	"k8s.io/utils 8d271d903fe4 github.com/kubernetes/utils"
+	"rsc.io/letsencrypt v0.0.1 github.com/rsc/letsencrypt"
+	"sigs.k8s.io/kustomize v2.0.3 github.com/kubernetes-sigs/kustomize"
+	"sigs.k8s.io/yaml v1.1.0 github.com/kubernetes-sigs/yaml"
+)
+
+MY_PV=${PV/_rc/-rc.}
+SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	$(go-module_vendor_uris)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip test"
+
+GIT_COMMIT=7c22ef9ce89e0ebeb7125ba2ebf7d421f3e82ffa
+
+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" || //' \
+		-e "/GOFLAGS    :=/d" \
+		Makefile || die
+}
+
+src_compile() {
+	emake LDFLAGS= build
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN}
+	dodoc README.md
+}
diff --git a/app-admin/helm/metadata.xml b/app-admin/helm/metadata.xml
index 0eea3165859f..689215a977a4 100644
--- a/app-admin/helm/metadata.xml
+++ b/app-admin/helm/metadata.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">kubernetes/helm</remote-id>
+		<remote-id type="github">helm/helm</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/ide-smart/Manifest b/app-admin/ide-smart/Manifest
index 409cdeab8513..423aa6e2499c 100644
--- a/app-admin/ide-smart/Manifest
+++ b/app-admin/ide-smart/Manifest
@@ -1,3 +1,3 @@
 DIST ide-smart-1.4.tar.gz 19739 BLAKE2B d9c94b53855628ea10ea563f709754e7f79e50d43e24f76ac3c6dc9b5bdee81a547e63c4583c3506cc899c7e761b59dfbea6bb121f39053cefcac20a984b8d3b SHA512 9ac5cd03b67731aba5371ec9edb3aabb7d3e3b3680552b14741106d8d5ffe5a1705ad379dd8df60b972f3e23f66ed35b98341544feb4b856912138ccac109660
-EBUILD ide-smart-1.4-r2.ebuild 571 BLAKE2B 3965c37e9c49d26fbe06858608e4be7df16b76a3dc8cad6d9f4edd6be236cd5b1837477eecb8ec6a603e50cd89f2be5e9e7a4f390f5aee75316a778f7de8ff69 SHA512 d35f03930fbdefebb0f4ae453edf5e45ce8af73696ecb2f5a1da357c60cf3fb3c56493143144880ab8ff3551d6d75951fb6a8805996665c6682db8ef0a69fce6
+EBUILD ide-smart-1.4-r2.ebuild 564 BLAKE2B 64cebd0eccd111e75441b2fca3704c9750fa1dacf6306174f13ced1531a3f98102edb83e1791350f734f17d0b747aa7e70344c6e59c4528d94cb7a2d94cb01b2 SHA512 49f08361338af6f339894529ac9b5371d55b24bf20b5a5567074bce10b65d0cd53848fa718391e715d0279fca276974372b37f46345c1584e78b26a89aacd3ae
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/ide-smart/ide-smart-1.4-r2.ebuild b/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
index c4d034211730..b064d1e5e222 100644
--- a/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
+++ b/app-admin/ide-smart/ide-smart-1.4-r2.ebuild
@@ -19,7 +19,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin ide-smart || die
+	dobin ide-smart
 	doman ide-smart.8
 	dodoc README
 }
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index da0d0183010c..dff7dc399ef7 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,7 +1,7 @@
 DIST keepassxc-2.4.3-src.tar.xz 3301944 BLAKE2B ba95d5d48049367e7d3c39b5fdc9fc9816dfe2b257530068f229d1b5bd4eb9c137607f63bcce0aac4bc67ed41ee00c0385be800720acfdc3920c44444cade180 SHA512 893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d
 DIST keepassxc-2.5.0-src.tar.xz 6752776 BLAKE2B 90c82d6a3c8144797fc0cd379bbb7e6745cd4512a47bd04eb61b52205b6efe3ad8036a0f2c0012de4e710b6184526916ac4a4453bca90e18ccd9e6db1b86e9e3 SHA512 45f76491892ee5377eb803079ee6db2987d66e569c8c53ebc706cb51a4b8f37675801df484f03d486803de2675a3a46bed5d2b211ff7be0b83daf9c2f8607d00
 DIST keepassxc-2.5.1-src.tar.xz 6798880 BLAKE2B 428b5fb381c4a4c6f3b291ac203530a0ed07224edc10f55caaab243797a6c89cafcd08a9dcfcfad1dda2f73812397a4d7d6e26ef675627f29f7d4d7925a1aeb4 SHA512 5500a0e697758e7616754d1b612ad7a64485d9efa1aeb0c3714060db50ffd39ea0aaa0c42d86d17044b834f32e99172ea94bc2485d396a381c8e9212d8be8b37
-EBUILD keepassxc-2.4.3-r1.ebuild 2135 BLAKE2B 499b397116dcde99805b4afa4b38b4c25a8b3121e4cd8fe473cb584e295a77ad6ab36a47cfaf447cf09bfb0d12f45bd649e7cb4e90c031ab4dd68b9b04565787 SHA512 9f2651697c320325e7dc9aba2cbb9cc6c01173a2c82072b9df13b9a8292e841bbcd059ef95c21b52ffec1c0155b3c9787cd303512139a9db38b00274edaa9c36
+EBUILD keepassxc-2.4.3-r1.ebuild 2162 BLAKE2B 8fccd44699d94b2ec222cfbdf9b3b2c0426002f31310b17d3983269f0f33b6cfd518e2424efc34bd7fc2f743c776f1b4dd3245dd3f6a0c2d040fedd975c5a6c8 SHA512 a7ba232894cd90576cdbfe2e9313d146bae61c58b794fec74dc094621812b43f97d452687bd9e1ddc5f956326d6221b6c1526550ed9e11fc302bdceb7506f6f6
 EBUILD keepassxc-2.5.0.ebuild 2171 BLAKE2B 985380e34ea6f0786a85740a0d1c9cdf6d9cc34cbc25ae62b396d2ed2a6cf3e350182a0392f470a80a449e1d73b608b5b6f33aa0dfb0a2ebb2a5cc04005ba449 SHA512 d8f5a41f6c6535a300c1ec20e1e0c5701d3b2760fc05011b85f1fbd7c376359b2047afe509c3550f3c5898f2f535e45825f6b0337330f98477e3098900fa623e
 EBUILD keepassxc-2.5.1.ebuild 2171 BLAKE2B 985380e34ea6f0786a85740a0d1c9cdf6d9cc34cbc25ae62b396d2ed2a6cf3e350182a0392f470a80a449e1d73b608b5b6f33aa0dfb0a2ebb2a5cc04005ba449 SHA512 d8f5a41f6c6535a300c1ec20e1e0c5701d3b2760fc05011b85f1fbd7c376359b2047afe509c3550f3c5898f2f535e45825f6b0337330f98477e3098900fa623e
 EBUILD keepassxc-9999.ebuild 2171 BLAKE2B 985380e34ea6f0786a85740a0d1c9cdf6d9cc34cbc25ae62b396d2ed2a6cf3e350182a0392f470a80a449e1d73b608b5b6f33aa0dfb0a2ebb2a5cc04005ba449 SHA512 d8f5a41f6c6535a300c1ec20e1e0c5701d3b2760fc05011b85f1fbd7c376359b2047afe509c3550f3c5898f2f535e45825f6b0337330f98477e3098900fa623e
diff --git a/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild b/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
index b6dd4fd2a017..914683fba0df 100644
--- a/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
@@ -25,6 +25,7 @@ fi
 LICENSE="LGPL-2.1 GPL-2 GPL-3"
 SLOT="0"
 IUSE="autotype browser debug keeshare +network test yubikey"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-crypt/argon2:=
diff --git a/app-admin/ksonnet/Manifest b/app-admin/ksonnet/Manifest
deleted file mode 100644
index 6b3f39d27615..000000000000
--- a/app-admin/ksonnet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ksonnet-0.13.1.tar.gz 12336756 BLAKE2B 1952c02a0dbefc0efdcde1728348e62b23e9ef92fedb8444f98dcc0e670090be56aa001ee50f5e6885752e565863b3813556b091dc614a766677ea4d6e0722c4 SHA512 be16e986c27da358df27d632d1191837d3c16a92e702f3bc29d504de80128870dd4d97752db07c06bd5a11b517e69d6690b9608125d702f809c181d4109622f4
-EBUILD ksonnet-0.13.1.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
-MISC metadata.xml 246 BLAKE2B b7d647c23d2215c6d61312a66a7d3521c8c16f69cf801328c67e9017be2809c2d16e29d61f190837c9fabce655dc69a506311a7781f7aa57c320524ed1bcd463 SHA512 bd98d2c774eb61947df8860a6948cda7148264a3bc86b52d317b3d805e2ab17fe81fe94ffc353ecdda86ad56bbfa17a044c9a789a878e15c5cec13c8e6eeeb70
diff --git a/app-admin/ksonnet/ksonnet-0.13.1.ebuild b/app-admin/ksonnet/ksonnet-0.13.1.ebuild
deleted file mode 100644
index 0c4bbcbd400e..000000000000
--- a/app-admin/ksonnet/ksonnet-0.13.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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 https://ksonnet.io/"
-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/ksonnet/metadata.xml b/app-admin/ksonnet/metadata.xml
deleted file mode 100644
index fbe8de267df2..000000000000
--- a/app-admin/ksonnet/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">heptio/ksonnet</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index bf2096579561..d60f650c07ad 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -1,26 +1,74 @@
+DIST github.com-PuerkitoBio-purell-v1.1.1.tar.gz 11604 BLAKE2B 3cbd5a831338e0c252e87d680a886581889a1f5ed49789aba25ef99ae297f9c9e42f3ad04e77b6446f70dc07eb8b1a371f37e3a65f5c086ca35bd13a8f2d55ff SHA512 536681e7d92e4b3c5be53dc6cf4cc654348f8a76595b00647c9332528761441a601f354070ecd82c52944e6f6924a227eab88f6a67f52fcc64e7b177356589de
+DIST github.com-PuerkitoBio-urlesc-de5bf2ad4578.tar.gz 6799 BLAKE2B 8e27467b05093ef6af830c07a3a5a9fcfbd158c75893c6e0279538b02d70ed8ed48981ed1369aa1472903bec16c48b020a7949759dce625f6fa5cb8fe6fc4e03 SHA512 a7c80ad1cb51be792f92dd34fec99dd1d3f11e5762e196e8f2d126afaf7e62548f3355dcb2616a989d0e4afc4cd7f559a0bf528ca0e20b0d1013b27498308a30
+DIST github.com-davecgh-go-spew-v1.1.1.tar.gz 42152 BLAKE2B 3c6689b3d2861fbc4a70b8ab25b790d132865e4ec34062fd80005fc7d62c1b4cd77df534c27a2d8b1c42c63f8a551fc7d98e3649bf902d176fd965e933faf6be SHA512 b00621d2f11c4cc858e69fda3e6975f910deb375c4f2305a45b230e2d9be73f183db5d2ce4f5e30a14b27e11e79380233ee68fceeef0d855c64fca966e68111e
+DIST github.com-emicklei-go-restful-v2.9.6.tar.gz 64669 BLAKE2B 822338bccc3692477f1adbb1a3afd8735228da04569159987c95198aae02a59e806421f83ba83fb263156f2232ee42385c89ea49162b6c55778c93317612e765 SHA512 86c36919cc75e86bb6f7a676111ef9234382439d1269ea61ee3037bcaa0b46dc9f2a6dcb1acce8ddaef6a6c0cd900a01152f8b3aed1cc00e3e39b95c921ce0e3
+DIST github.com-evanphx-json-patch-v4.5.0.tar.gz 15076 BLAKE2B eae509cacc3942b7dc3c4f367278baafadb26123104c12a1449817e87c3cb1e1f775ea47878bc7f011ddd23213a08fb03c4654c840182296646caf7cdc51bcd1 SHA512 c97693e9b8ec2cca0b198d95c6c364e2d707c0c7b8bd01b8ddab02166eefe83bf2a610a9b1a2bba3f392b3fe1da5f272ee535bf693a69c2f6f2f15ac331600fc
 DIST github.com-fatih-color-v1.5.0.tar.gz 586937 BLAKE2B f9ee26f45c49261ae2ed708b32f878ee5499c2365f86148af23a7bce33caadd8bc5c26a54357f416d2f8f718329cc2aae4ac7ff2c6ef2dbdadfc03801ae926b2 SHA512 f58e9cfdeae96807058468efb162bcbde8445031bcf98fa0b08dbd2f1100efd40bdd44bb0c800a0eb386685fb2b0d75f0b0d0ec7d3674b739ef205fa5f59a044
-DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 BLAKE2B ced6ca6f115eedc954f6b583b28e470ec5dcfe0c279d55a63c00ee942acde095e9eef8fb4c3fa289f34871f43a7562fb71142d070a54398bc5d91122e64b4ad0 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab
+DIST github.com-fsnotify-fsnotify-v1.4.7.tar.gz 31139 BLAKE2B f2d0aaabfad525fb640beba78991a858ad23203a557a69fc15d2f017b2a693c64c244de435682b1cd9d59e89a97e4ba60c7f95fa99a6145a9dea73b0f334936e SHA512 840943043c49c837641f04b976f2ba610fc03bd31030ca6442744d51fa9241da1905730ea11466e249a5bd37437f1e2a433a012a64ce872a1562c941bd5bfcbf
+DIST github.com-go-inf-inf-v0.9.1.tar.gz 13072 BLAKE2B d7418f32eebd7a31be97c25f876e91ca7b44235975f2f69d8f75c0009c097095ee2e847cf6ff8f552749b6efa1bb5098c72f29c624ee92cf573f8fc37d0e3e41 SHA512 8627b4a636005089669ab0c7262e7a5a1549941d049a66abe6b73e61533f45a953012615d9b114c883d68450608d69f8aa5d0b1e9ad67d95ce9916d4ede640a8
+DIST github.com-go-openapi-jsonpointer-v0.19.2.tar.gz 15303 BLAKE2B 6e6e9846cc2cf2c4e6f4c71d3d6e6baaa793b8533c1495b9cd7fd305bbe4e0774c61ba5e68ea88298d158eac633ca8cac39eb644b0bfc57fb11cfefe1931494c SHA512 c73efab30330cd3d75bed27945432a8956ca5398daca157b94ccc4f02811f4e6e1b77a22e38a9a2a0ad9b481d4237030c39c077191ea18f6e69d872ee974c62f
+DIST github.com-go-openapi-jsonreference-v0.19.2.tar.gz 13662 BLAKE2B 1f8434dff032f2bc79162f90eac5ff6052d2200fa8343de468e352dca02fd12f2bd51de06bcdab745434783d8591cf4770c625775a8ef12a54e95013552442b1 SHA512 7cf42ee6090b6e9429b6ab5eb77eeacfb3a71959856e013079a22acbf008aee350e9edba2c3f4582760b91fa5d5dd87f160e7b03f23c1df7ddc9882607c8bc80
+DIST github.com-go-openapi-spec-v0.19.2.tar.gz 217440 BLAKE2B f03836ae5ad8bd6ef9f3d954d320e2e917ca1ee02c7421c84e336f82183be82f526a47d89279559116cfbfd5ee0fbc45557d327f1a62831493fd68a0d2d70c1c SHA512 72d11b6207fc1569469ffd1c4b37bda26786ae7e5284e73d42181c0ee64b1980cd8659da3678f0be9263525656ab75a24861d20455cd4d752cbafb2e8e87c26f
+DIST github.com-go-openapi-swag-v0.19.2.tar.gz 32195 BLAKE2B ad3b6d7f222f8d36e2368b6b355c132aad48b7a1d3f883366bcfba37e290ba98293b43527fe113ed2c8a3429efffd45d2ff239d4173322275647956972b35db9 SHA512 9614b50d660bd2de7c031a0e15258cbd1406698203c31c7232786238c6cd6f23f2e30d755f607fba5954e3734fdb0950048be847bdc1be21e6ee7d71ffbecf22
 DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
-DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
-DIST github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz 670015 BLAKE2B b457c61f036bab4bb9ed035855607027552a6ddce89f0725cd6615362f12bcd478966e4e4b287c05bc6d055ebb21032f5993e00fb772dc18ef9804e3b0e9978a SHA512 f1c7aac5ddb1ebd9bfb91bae24c78840f2d31a5305c8d2cc4e2f3a1fded0c4432a340d92f753e3aee717f7e5643f5187eb16ac645eb6ef86df1beabcfb97d761
+DIST github.com-go-yaml-yaml-v2.2.4.tar.gz 72209 BLAKE2B df823cd5f6f734c11b9b19cd3cc205aa4bfc15bc90359a508220691867841698d0b9caa35b2aaa40b7c4c6c804bfaf9c7fb8d64f125726dc3728cd6833618c11 SHA512 2fd417b57a5adcd75ef34adbaccc0199fadcea42274fc77efeff601a0f12e376fb3d7ad62a65e1ba6f0b9eebc217b4c3540f6fbc6accfcb136e839a585b3e900
+DIST github.com-gogo-protobuf-v1.2.1.tar.gz 2017393 BLAKE2B d55fc545759add352512c2ef81d948c598f71131fdb1649ee526b59989457a324b03144e989a3c651b5614a2eee9e7b1652d3d259733cd3752c97fc2f6720705 SHA512 7cb48dc85e76cf6b116015441e29e86a25514667b409c0a1d335ce1c844a080fc9b37f48911959531aac8ece009b6d8401b1fb7bc463fc8e6fb5e133c9846e64
+DIST github.com-golang-appengine-v1.5.0.tar.gz 325873 BLAKE2B b8f1e8b70cb8259264fd424ffd84852cb8d2a35b85c6f44513f542a403360607bd883e20a6cb405b6001f3b86775a8e3087e9f59df22aebfdcda3aa31f558785 SHA512 10d0d4d55030335d91da6d5a29606da94b11382df27d3f7363ec4d260241c9ecb7763da16393dbbc154622ce35bd544d5b47d318d96780b38edd8c1723ee1993
+DIST github.com-golang-crypto-5c40567a22f8.tar.gz 1690995 BLAKE2B ce33e064cf8ed8d1939dd39b5176293f5de1db975e5325d6eb4a481960451e8ad77cb48bc2bc36fead10a6a1811bfe95b44a191ca7272508d7776168033d9f52 SHA512 003608c7b791212dbec4c9d22dd695245a6b570e93dff06593e7baf9aed2e2cd02355a0fa8c12b69bb451b9ff27b85a82099a751872c5a0d02163a034f72d829
+DIST github.com-golang-glog-23def4e6c14b.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
+DIST github.com-golang-net-3b0461eec859.tar.gz 1099680 BLAKE2B 989a8d6c9166696bef1aff398acc8cd1e41e1240c5c113be030c80355cdf96eaa6d5f231c99f2c44d8eacf199579804c59fc45f999862bc4bf057b694841c8dc SHA512 5e42e26ac17f52d6408b63eebd740bedc5a78b8023b675688d7b39b20afa53b34ffde764b693828143483c8f5450180f6a00e9eb28b8f3f6e14303cc4cd7c62b
+DIST github.com-golang-oauth2-9f3314589c9a.tar.gz 45022 BLAKE2B 0b14e367f087601624a84ef25641b1f3338cc689ee92136ef51abbbdcf1b3b3dc1cad47b17868a39c1a9ecb2f792cdb1d5bb8f8ede300a5d9dc8445319c05132 SHA512 8a9ea21c4e7f9dd1ceeb069dee1987f5e5e5ba4f973572ab6f0ccf00ae6246a142dc517ef15ff83de5f3c16c267181ac3812d3c6bc0180d12b98d7540e1fc91d
+DIST github.com-golang-protobuf-v1.3.1.tar.gz 310884 BLAKE2B 704efef653d39b4954798537e7451d15dd1d913c67d1332ffc016b396b028a0dd03487765a89b0bc5f920b75cf4f51be79a8da9d3291e0f02873c47601360080 SHA512 7dfc6d7851c7181e1a73effe9e8a97752bb428bf207a44b065412a8e87e0e3e200b5eef3d8c68af33a0721d12a8b98bfa88b22add074b19b6e1759e9268abf25
+DIST github.com-golang-sys-d0b11bdaac8a.tar.gz 1244852 BLAKE2B 86e5871d166f45fec1180eadd8bc79ed77f2f254091f65bca2cebab90625470a81f9ba192c7f352b9e779e6487512c120cc0be42b45134fec6173d80edd3941e SHA512 62871cffa10554475b86be5f34c3b8067799ed81f85a37ee2e616dc24d4df39a73eae66dd20ab016095cd4fbfbb76bc877c61d284a648eab81e619fee0a3cd5c
+DIST github.com-golang-sys-d432491b9138.tar.gz 1448871 BLAKE2B 08763852d5fe0af14a48f00044398dae153392750a1fdfeb6238143e76debc15de6e54ab14984677f199a6875320d037a3124aaea0d0a7f2e4f19963daf50c19 SHA512 f337b115e8975a3ba0ca12c68d203a5223734bc204d617d90ea124e348a26f97a81ae493f537cf3f87b3a732fa5cfba6fcfad2225ee8b4129667eedf86dc1507
 DIST github.com-golang-text-17ff2d5776d2.tar.gz 6580833 BLAKE2B 85a9a26c6c5427cec821ce39fe3d01726271e2fedd24c280d63d57e426d8eff9aa355215cded6d2e8d754169f0ff5c8781b4a0cda481c6289b2016d9d1857bc5 SHA512 62318598606aab26b95cd62f8e30fd6519c2f2dfc2b5d6fc906ec70c0749745539ff983a6e084c3624d108231797d320b77b53a27aa18d9e83bf2af947dfdcd6
-DIST github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz 69787 BLAKE2B e1d034d5863ae8bca85736e971e613e6821665861e35954a067e5d659029a8680b6902387848a318aee374cd4f6b810ae160046979b5bc86e64df0e1ff5d08f6 SHA512 751ea2fcea04ab2a9b61a45443a71cdee9cd09c2576af048108ccb56027b34f46b00e14aa664b966165b7d8cbb994e49f128bf54e3469c627d73f7ee2809ebf8
+DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
+DIST github.com-golang-time-9d24e82272b4.tar.gz 9318 BLAKE2B f2d50340655d21b1bcded6cb76ae16026c1d43a40a45a45dcfdda8171722c64bde3fcdddde9eca4e1f9ceb994a58750687ebd439464f962652cfb004329b6310 SHA512 d4f6336675a491f5de855c33a506baa99c33c02f59fa9c5284e29ab4638eb55ff5f7d24dd5a1c480211f41cbd3bffa6366594828c333f5f039a7f3009515beb6
+DIST github.com-google-gofuzz-v1.0.0.tar.gz 13201 BLAKE2B 3884b6e9a6f910986f6ff5705b505e9107200a034d0c99de426af38938a71adb3ed443bf45da70fe68133c528db69aacebf4be74fe47d5f8bbff0bb88a4d8bd3 SHA512 826cd0d22d8cfa724e4b16e052fe732f52c81ded6168b22eed1839fed2b12d020b98ff3518f8620bba3659cb404fae342875c16386f4ecdf48286e5b99b46a95
+DIST github.com-googleapis-gnostic-v0.3.0.tar.gz 424461 BLAKE2B 72c93b8442cee6534cb0d076bb1e8239d7ba36f15e87c24f379d2f9f47f0c141ddfbd5331fda573e32e3de480165cec6a07205b5cf5e3dc80f4ac64ffbbf2e87 SHA512 e89129fd1c90373bb73aec85a8386402caaf11dd313ef550a31f5f255666e26197804c2daf3b0a43a345bd30cb3df4d178a0e75c4cb929a58370bdfb39d9aa1e
+DIST github.com-hashicorp-hcl-v1.0.0.tar.gz 70658 BLAKE2B f28dbe8171ce4fa94f57e8bfa8ffe7e16e57147a6a4525a8b5d31d3a47e817e056a85bdb8b91d56be202db27a29f37496f73014d1d97c5d55ce07b89f7ff6848 SHA512 044e3ba2a44a1abd9c851d4ec1f5c541663f8cd7f705c46c6ae2c377fae6df6315a6596c42f391e8239b61f0f0f6caed8d4156f8875cbddfbc7bcb78eaeb466f
+DIST github.com-imdario-mergo-v0.3.5.tar.gz 15920 BLAKE2B b0408e2c1897a95f03fbd2396c0576283962c3d86e6ff0467fabc5fe067278c300eb2943004052132c3cac56be22a986981dcce0c7246cc66c3c7f709f7aa735 SHA512 41c1919b1cc971db7225b7a1e4501b6455a5a092a9ce502e1a0d7063c86d1b5f018712a60da1fd152f462dfcebf45d3bca7599eb32cb09056ef8a0aa0cd3f2cc
 DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
-DIST github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz 70487 BLAKE2B 28c780726bbd8589beccce79f5af4a71a1ecec8438fbe77af846f79a1f8879cb8d6920b52367ff5c63bf9100c19e3c5a48ce77aa1a13ed1f17eff84529259626 SHA512 04c6a2d2c32e9a020f47f88a5e58dec47b500f387d798b98ebaada905d85ad014f78fe8683d662c61fa0c6286da1c0bc733b03f7f7ad912640cf01a4a7e4de49
-DIST github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz 4506 BLAKE2B bf66be135369acdef3c356310de015f9b0f3eeaaf9273e315d52ef21fad3d93d27a90535252a846e5f0c7d2680dccd1080c7f4c56d3d48ba38ef0cffba18129d SHA512 bf30d10b9e101c9fde9079b12b519e8bdeb5f40bc964109940b58a2bccdb2f9775c6bf25dfe47ae7b8bc7e34a0b9109a0d9f1f5b4e70cc4093264758bdce749d
+DIST github.com-jinzhu-gorm-5174cc5c242a.tar.gz 70487 BLAKE2B 28c780726bbd8589beccce79f5af4a71a1ecec8438fbe77af846f79a1f8879cb8d6920b52367ff5c63bf9100c19e3c5a48ce77aa1a13ed1f17eff84529259626 SHA512 04c6a2d2c32e9a020f47f88a5e58dec47b500f387d798b98ebaada905d85ad014f78fe8683d662c61fa0c6286da1c0bc733b03f7f7ad912640cf01a4a7e4de49
+DIST github.com-jinzhu-inflection-1c35d901db3d.tar.gz 4506 BLAKE2B bf66be135369acdef3c356310de015f9b0f3eeaaf9273e315d52ef21fad3d93d27a90535252a846e5f0c7d2680dccd1080c7f4c56d3d48ba38ef0cffba18129d SHA512 bf30d10b9e101c9fde9079b12b519e8bdeb5f40bc964109940b58a2bccdb2f9775c6bf25dfe47ae7b8bc7e34a0b9109a0d9f1f5b4e70cc4093264758bdce749d
+DIST github.com-json-iterator-go-v1.1.6.tar.gz 76814 BLAKE2B 7424a5e4fb178e511e45e5773965a00da7776165c1c3de4cc20d78678c98c156bf482a976456f4f138b094520804d03f0af166ed153aa7a5230f50baab33fa35 SHA512 a3e6357a1ccead33c0ba1f532a86618450c79303de181a39e8557a9ba6c62ee24c294784e4446aacbdb12bb84d9136360537f9447079085558cea4a2a6be4320
+DIST github.com-konsorten-go-windows-terminal-sequences-v1.0.1.tar.gz 1909 BLAKE2B edc8dc8f9a9c27d724b98614c2d937f5fed94977c1590f542cb1c8724478a63bba61cd6569fc7daed1e870bc59fc5ca0f5acd501f58e7c93e5c69517c9ca80ac SHA512 8c781a4c17df20623b8ab5af9757fedf6fae9362c10f195eaaeb821a0520ab9407de30607fb085a38a04915eb180bb8d5c4940f91db4fca7ce1cf69a8276bbe7
+DIST github.com-kubernetes-api-6e4e0e4f393b.tar.gz 775958 BLAKE2B 0c30e606694c8457e0ce36aab860b93d6807020891be9a923ec3990b83d9f4a5d7323d9d283b7d5f1e0d122fde9f4d80b7860c2c2db19ff06ed93ab93a723199 SHA512 29a70fa69173d06ba84bd313d433cdeeee9a0326a5f2f4a7e859d6e5cc4fc4e6e7dde7d13b8002e0441dd42f84c170770b9855d3b4b5412e6cdf19bcba650599
+DIST github.com-kubernetes-apimachinery-6a84e37a896d.tar.gz 474085 BLAKE2B 6f14c64b7d4092350f5cb70c2648f5285cadeee4ffc70331fd7135f7dbbed82e4109a433e04d5e6691576cbdfc15e31d1b673eec94bd79fdf7c65e3d5d3626a9 SHA512 8c3acc2935ef84c516607bf93419e0fccc09e56e4101e1d8330a975a3e6171d21397cb2f98ccab6a3e7a9597bb1f9b1e936fa53746442f2cc5de1fed75a95c69
 DIST github.com-kubernetes-client-go-v10.0.0.tar.gz 514946 BLAKE2B 16e6c6532770a142c267e9fdba2b447e3a3c4ec58ab064bec4368e7747e6d80e97c81fa1108d4155285fb3d2089345277a6fd39341c447f9feed61340b9688e3 SHA512 a6b9b976cd156a6d0aafaf2eae92cf03c543face13f332637dc50533d4ff3da338213f9b2cf55d1a9a36dce5eda76dd27819ab3d391f27b1f5785d2e68890715
-DIST github.com-lib-pq-83612a56d3dd153a94a629cd64925371c9adad78.tar.gz 90080 BLAKE2B e411640c603f1bffc0966c748393ef33172e326b452b5736288b720a14b6d6311f8265aaae958ef9a56c0c81cce53882f4ee88aa51b975ba8c57a9477bfa372e SHA512 f275a8d2b8705ad6e2e57a81072c16e4ce058fe658a57b6e4846c306363ffd5c675b3e6aaf9104a4fa5b7112e1f18e84474a7a494ffbee58d4d51e7e3dbef12b
-DIST github.com-magiconair-properties-49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934.tar.gz 27761 BLAKE2B 0f39a63d3d19ad5d3ac367739d568dd3abe74a8a6aa0e60cf19ca8203412270fc45dd1fea07627290a85c42db6ead0229f72bfd845b9e4f645976db1585838e7 SHA512 493a7493e415b45abe2109c79e02ed7903de6a559911cff0323f9577fcf41134ab8f4ac26d776fdf9a891654f063bd2452c7e557c643d73de5f558b13533f62c
-DIST github.com-mattn-go-colorable-5411d3eea5978e6cdc258b30de592b60df6aba96.tar.gz 6670 BLAKE2B 97161231d163ac1e196ef4038a77952e9258e256baaede2abd32d5ddaf2d9f06dd31764d59ee72c36953a9f423bd1338e0251145f1c6f55f02086a273f92b28b SHA512 a9f0dbb97686e819f1982406ae3a990c855116e60b18809ca926f040d426ca984613ce01461832369a96bcc61fb09e7e63a28d543feeccfe4935d848e8fcf543
-DIST github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz 3323 BLAKE2B b7f8fcc57dd652cc4c320237e3287286aa3dfc8cd5d6115b49835a4fa7f1d507963feaaf0103712b03a0ae09195aa863da31caedef549d9b29dde9f0daf82ab3 SHA512 30ef451bf1f85c7489464e367a95a7f558c2c1a424ff49c5148393d631ceb98c58edef23fcb2b4f1bed0e7c1b3fdd8b5273874ba9304e6f29e83c0d9e127d34d
-DIST github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz 15601 BLAKE2B c2212f4c34ae15eefa1a681b2beaa8cbf3f63fb2317a8fd95f21df54eb6a05b2d312d96848deb1afdd47aefdeecadd20920ae25a0d865f31c16b6a5da4ac6dbd SHA512 30b6f8f902ab7d4dad899c19687b6ec0e8c51655a04163c37ed1fa36cb420695631534097d4de0f342dbe649b412d38d0254b40bbb2970c3a70adc0244a6e800
-DIST github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz 56608 BLAKE2B fbe29d5ff5dabf6c6bc123c41fb341966c5d8b41582e3dbd241e26e6e1e6b2afe7f66927e84dd9233704b766d5f72acb451359e9034466de8700d30d09f50166 SHA512 5d1b21d5af4d148451ad040a80e8c9523c0553b3fda84bc3e079881bda06dde7cf00c2daaf790bbab12f2afd2bbe794b1b7982d8a3c84411f6af99c92ececeea
-DIST github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz 43598 BLAKE2B d7fe3fff67b37002696f6672a95bacd9a8cc30783162eb4fced93bd86e91e10cde84f94a53a3af488ec032e42e1ea21d7e3f4f215b3e2b50c7add042579b749e SHA512 8563490cbab569c9bd065ea4e530a1cb47f3159100af0ad21501f66f60316a12e8e5b497829250d4b64993baddbd542996ce073b68674172ab3fb7213106771b
-DIST github.com-spf13-cast-v1.1.0.tar.gz 9592 BLAKE2B 0591ad8a8540dfafccfa68eccdc9da028213032df0b51e0057421974e84de85a28bb76ffec798048603dd33fe134769f55ed92580f3ffeef6abf6cf36c0344fd SHA512 21b9c1e72fef53a2100004f9aa1d027e7e9e1f5796753a8c22cf3fde5204d0a61fc667656eebcf3791ffa967221aa61d359a81d0e6976b5741115ef8f3f861be
+DIST github.com-kubernetes-client-go-v11.0.0.tar.gz 543528 BLAKE2B 085805fd993e2d0f3a0e1df98cd2115c34a2b06910998c8674f78c0c2321eeabbbc61391eb1945b1ea921db723ddd8391d7230c5d0d119fe91b9183e4ef6cbfd SHA512 ea72cc9a17c7b3740fb77348da9d23843182ed464d9dfe1a5b6ffb6ed333456626fa6f0c21ceb597210bfd915f7b798187db255a217e3ddb02e54a816d02d2de
+DIST github.com-kubernetes-klog-v0.3.3.tar.gz 28852 BLAKE2B 9cd3b94702711ae581906102499450aaa59daba2e81529c3d7a79dde8769292754558506e2a8915538e529ba0625abfb95cd995d3cdffbb958a472c17774e3ea SHA512 470ba798fa9c4f938fd9d35560697d79e208bcdda1acb3f716341bf492026c6ba5be644315fa1550f8c2d50a9085f67038740b303530bc0102a714d749a7e3e8
+DIST github.com-kubernetes-kube-openapi-db7b694dc208.tar.gz 735897 BLAKE2B 81b6a341c77e82537e7d6dc36b4f39932417101e5c877584d00bc20b3d7521305960a8a1475869466734bb2ec96b35f704381c922ed11b5b65ab2215d63106c9 SHA512 f903794d2a4c42e482ee13c76421c9454601ae13303dafc0ecf5da9098e4961ee2144513b27ec1a57f8dc616a29d40cf99fa59f74055db2d02617dfb9bf917d0
+DIST github.com-kubernetes-sigs-kind-v0.5.1.tar.gz 1114558 BLAKE2B 04da5099ce6750caacc8d36cee8e6dc3efe40a7d24d27c18a58bf7b014d469f16d92511c1b06ff064e8985e47e880c70eb62ed3f7bbcd853a9b5ccac7c07833b SHA512 310df740f87150f9f29deed9e15a30a2e442e57aa3f07a3e0cd4bb5d63cf61fa53f259dc0633cb5db4871777639e42b1f2f1486862ddd108898b476850827f5d
+DIST github.com-kubernetes-sigs-kustomize-4b67a6de1296.tar.gz 672250 BLAKE2B e4982c2d6ffb98fd4cb1805be2bb89e5bf364802bb895e500e44e1126c87100f2d64a5b9857376918ea3f7d8735c66313923c3cc1186b1ab6bdfee0cefb5dd8e SHA512 9ae576f9a97ec60576ecb6f048ed526c7d94465fbfa5a6a1a2d261c328b8a5454c7304405f266944b8ac961a67bce5ece5fbace2ef0b638e4b991d3d5ede8398
+DIST github.com-kubernetes-sigs-yaml-v1.1.0.tar.gz 14890 BLAKE2B 0c4e040a25cc75839a748a7e1918167e3ac994195fd80201692946d2ad722ec234ee2c98fa6e5d799d4c74dfa7355418cfb1559f2d25f3a33034e6399f3b9101 SHA512 a6c8094a0ac9bf59e784ced474a402b0ddec48d4bc6280db3eda9b896b6ece8b995fbffec680661ef61c79aae40d578f47446fe3837d6d4903f84e26d875c9e7
+DIST github.com-kubernetes-utils-6ca3b61696b6.tar.gz 78496 BLAKE2B c50905930289d1c18a02edac0d7ca418045744db1870a14ae3c466b5b0c2e718bc1e2b25f7fc7eb78fca4c4902cabfdef3fe991efc3402cbb99679661c68bf08 SHA512 72037a958cd090d9075290e94c68c75d6b54fff1ba2f29ea5e443bdf980e03626964f3f6be5cf819c6d6247b84ec3d4c83eb9de5adf5369de063c3bcb1551ef5
+DIST github.com-lib-pq-83612a56d3dd.tar.gz 90080 BLAKE2B e411640c603f1bffc0966c748393ef33172e326b452b5736288b720a14b6d6311f8265aaae958ef9a56c0c81cce53882f4ee88aa51b975ba8c57a9477bfa372e SHA512 f275a8d2b8705ad6e2e57a81072c16e4ce058fe658a57b6e4846c306363ffd5c675b3e6aaf9104a4fa5b7112e1f18e84474a7a494ffbee58d4d51e7e3dbef12b
+DIST github.com-magiconair-properties-v1.8.0.tar.gz 29504 BLAKE2B 667b8e60ed2ff538a84f199e43c75d37998d6fcb2e9c3cd6b3e069ba9950d45b4cd775797879467ef86b701391078582be2100fe32fbfc4c794f728fb7f38527 SHA512 9790debc8def1a7eae5a1e530ca68e53e562e622b374752f69e40aa508a88b58b95e15a503a8314e7d4f71a42411d1ba462687184c2b251eb41b5ee3f12ce95d
+DIST github.com-mailru-easyjson-da37f6c1e481.tar.gz 75638 BLAKE2B 89c88e2a9d6d629ca5f10072dc644644f18f50856d1721aaaf299a872db21a326d0ff0746d0d530e711b8e1f08bb7dbcbf12acd81bb625dfcc2099713d2c360e SHA512 82f10622ec98e8380b80cf06a5c2a47386c685cf3c8df02a44720b35e35c07d9e9bd2dd2b5b1fd2c4787aa79ffb6ef4e1bb92487bc8b43aa55653c772f1240e8
+DIST github.com-mattn-go-colorable-5411d3eea597.tar.gz 6670 BLAKE2B 97161231d163ac1e196ef4038a77952e9258e256baaede2abd32d5ddaf2d9f06dd31764d59ee72c36953a9f423bd1338e0251145f1c6f55f02086a273f92b28b SHA512 a9f0dbb97686e819f1982406ae3a990c855116e60b18809ca926f040d426ca984613ce01461832369a96bcc61fb09e7e63a28d543feeccfe4935d848e8fcf543
+DIST github.com-mattn-go-isatty-57fdcb988a5c.tar.gz 3323 BLAKE2B b7f8fcc57dd652cc4c320237e3287286aa3dfc8cd5d6115b49835a4fa7f1d507963feaaf0103712b03a0ae09195aa863da31caedef549d9b29dde9f0daf82ab3 SHA512 30ef451bf1f85c7489464e367a95a7f558c2c1a424ff49c5148393d631ceb98c58edef23fcb2b4f1bed0e7c1b3fdd8b5273874ba9304e6f29e83c0d9e127d34d
+DIST github.com-mitchellh-mapstructure-v1.1.2.tar.gz 20980 BLAKE2B 6792e875503b852773e8f062808f7bfa5a7e77ab4ec9012865750a5e15a13a6338490e7dd865545b8055c043a9f016cdabe6fc71c031a1210eb3a5e0c28a3394 SHA512 86c9fb9494652dd391b67185aae44b9cb14fcf96ba9ff62ed95c8952b01f6485154102e5883d16c6007d18a02bbf34e5937e2842df72c0244d48b22ee6aa9fe3
+DIST github.com-modern-go-concurrent-bacd9c7ef1dd.tar.gz 7527 BLAKE2B fe191bd398bbd1beac3de9a69b54b04e01436347f0f8933b8eb189dcafaf3d68bb76d6d738f5532e5e9d8e1631ef4d3785a110b69856c4e11d811b80dc31f19c SHA512 bca1593dea7cd004a0191420ccad56cffb91bc5523434f50920ce25c2ee82dc6a756e2eefdcee94ae0bb403fea881e42bf403d6218d6169f30dc9288e72d1c36
+DIST github.com-modern-go-reflect2-v1.0.1.tar.gz 14394 BLAKE2B 6169613fe7fda3f65902f153c0e87b11058ab72af87c669d71140cb19e835bcb2d84cd579544379ad7e77bfa4683b304c930e2bb833bcae035a71447bba1ffd5 SHA512 6c52772e7d164837b02fd6b5b5653b7633914e5e8cadbc071d4cd647cc05b0408c152e4334b30f43f6c5a8700b032e5a8ef35e6506961963bfad918b28f5df22
+DIST github.com-onsi-ginkgo-v1.10.1.tar.gz 134847 BLAKE2B 6b8b2012cc0f769f45245cb164e8a7efe59a6438a364cba9e6eebbaa613b6eb50aaa507a09a9959ba8c54c008401e0e6e4011c351a7c57f257c95bb2d706d5fe SHA512 8d6dde123bb3257150a5665c1e3e3eb0912b463c2899beb9bc86f162fc594385a8baecec79d51564eecce4714c866f83a55adf226f7d168a09164b9b3ecd09a4
+DIST github.com-pelletier-go-toml-v1.2.0.tar.gz 57496 BLAKE2B 48ffbd6b1b06df31b89ccda4d5aa7f8b23215a2532aab102612231dcdda3fcad4c277f15a56894e10bb94cb3c891f50e87ef9c0e6c7e1f3f840d14bd85634b25 SHA512 07791bbc0e578ab383776d715942cd4fa723e5fa6f9879676b6820166ca9b776651fd62a0584cbcc52d2ba87cecf18184734ce9b06fb5b490013eb8dff6fbb4d
+DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
+DIST github.com-pmezard-go-difflib-v1.0.0.tar.gz 11398 BLAKE2B 8f317c172d615e07c92337dd814c07c772347de3fe81b952bbc4fd1a643d495cfb6ec5b694a531f2745e1601eca2d4977ea2c1202ac7fb1e3cdba31e90c4ea34 SHA512 283927de73a3d0405bbca8b5b0c24137dde2f1063539c6ce4437331ed99e732175b2a384e5a70cb9a87cc74da94f5347e2a9785fbf3e46ec2431dc5071c3f045
+DIST github.com-sirupsen-logrus-v1.4.1.tar.gz 40811 BLAKE2B cde067ff74800153f555e3f9f00021d4cd9d11adadfa6df6b3da0cf86cc7a8cf7137e5d8e12adc7fdfd45022e9dc0c309a6e23ec4b50d9b9cfc37d73038e21b9 SHA512 7e8e215abb0a7909602378caf8ad746b73f3097b56d2ffd81fc7fb4c9a6b68dd8be25ad452cb19b02d7129e0abbb1e29aca51d91a9421ecdec711abcb97da268
+DIST github.com-spf13-afero-v1.1.2.tar.gz 45309 BLAKE2B 0de6a204590f40cda8e80495bf57f55827aec4fb0fff58e0ae7d03b25d297edf530af4c8da94f11ad9bd25eb148fb72b083c75d513b8c4802e8d1a557386f101 SHA512 2ea3773346086d7f0e499653649ef9cbe71b5c0ea488b7650630f4262c13fa426522c9f9556ab127c7b8aa2aa97ff0b34cf3a9eba8b7c753ed200292a50a314e
+DIST github.com-spf13-afero-v1.2.2.tar.gz 46157 BLAKE2B c9cfe5ce721a9992b775f82521f769fb79c67743db499540bfc5ca371f2f927c715d3ca11a1231180f56c3dd6a844a69ceb3b84b33a37ee348f3e39fafd29df4 SHA512 6b4b39ed3f8c537069cdf26840f21ad15807621ad494c78ba6c376de3994842730282a7517a3c5f7919402a3ee06a5cc6988a34207a531b16933b403c1635ee7
+DIST github.com-spf13-cast-v1.3.0.tar.gz 11085 BLAKE2B f46ad23efac14d599ef7268c033c5f244ea7976982fee02b4d83ae65f91a72150bef359eb24b8c868f8a42ea8a0aeae839dcf82a7646648bf482f2a520704e09 SHA512 4cd15f59860fddbb67055beb15dfb8114ecaad5999a8fb46fbbbdea1cf78eaa094a4893c10b97efc7d2f95509920688659d609623135bf9871e6229043452194
 DIST github.com-spf13-cobra-v0.0.1.tar.gz 101512 BLAKE2B 1f61e9a6ce820742d5a575901cfea6188d8bed5d3034930649c73ffcdc3e3fccd5e6c55cf017197566b21a8e141e82f9363d4531f3ca3ba08ae3f34cefdfbf1b SHA512 e2d3865f90f20c144694a70b4b7b74baf636c31d9a1efedaa90135b01ee7673a17cfc51d4fbf11f220f9035ca52294b7ae4a61c42101da059911e4bba5b1918d
-DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz 6347 BLAKE2B a1e62d37f3f736086ba5b198ca33e243f4650571d42448c593ba7c0970883aea401e8ddfc90975686bb5c992e5133294662a05b245620ca52c254b2a7e866d29 SHA512 04522be3439a2c3a06f38f764e275d8d093b935d610386bb99364f105d7d805a6a7e7a928796682955549a88d43b21f385404c1401ee66374d324f954bd4769c
-DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
-DIST github.com-spf13-viper-v1.0.0.tar.gz 30804 BLAKE2B 9f88f872c1bcd0f3590f7b4bbc35e03b3d3fec5233eeff0ed1cc1cd68dff1b29a5170492683f864a8b66fddd57722cac2ecb06a0035f6b4dc40a636025e0ccac SHA512 a9264fb09dd9d069f3ec1543a32c55a1268e6b33c3715da9116fe6e23f7b6f179785331f07f13cc03db29eb38f017eb5e8569e144bcaafbd73801857e0387504
-DIST kube-bench-0.0.34.tar.gz 254837 BLAKE2B a7606ec52741bb0551a9073e1f58d23db6571c7d7ad6775ebe13ff32396530fd03b7845ede40baec6bea6cb437426454cef624b1c711bd5fef242a772e14e7e3 SHA512 4df1b88ae3d6425dff7473066bfa6561f32e5ef6f137984f7a90e713f3dd1e59f8551353cbc3e86fe35c6cd3793d2acc13b9db426bd7930d22d1a06e9c7f4156
-EBUILD kube-bench-0.0.34.ebuild 2313 BLAKE2B 1d824b63a5e504d63aab8ccf102d8fea764b6482c48c6def5ecf20b2bff24b440e453b73a2f2424ff7f673bcb355945a3d72a7412e25c538d742f876b537af1d SHA512 d98a5a4eda61429928e415f7505db1a28d35e351fd4d581a5bd5cd65aaa8b1acf55f2d8ebdedcb8e1c101af15a2eaca377c9763a89b75bee64eec0d3f44a8f56
-MISC metadata.xml 333 BLAKE2B c8437977b6a07e36929b13f767af0f09158bedd1ea7a0bee1da52dd1b83acb2929248c3c385a5fba14362721ab6871d399ddfba53d15bbe84a87af0ad771b73b SHA512 295cae435555436e9091195ac585fd30d022aba0b76244c85927f19f14b38dde95fb14192c832f00f52e3cf71aa3d95f7527b22a90690f85206178c49d620c8d
+DIST github.com-spf13-cobra-v0.0.3.tar.gz 101526 BLAKE2B 8613eccdd5bbd31429b7aa8260ee9367e34a5cc78075b394b09db91a97445ed1dadfb53a86105b55cb6ea3b4c2f9d50553e9198d64dfb6033dd1db2805984a2c SHA512 c38db9432a168f913b41a1e1b11d84bedfade82ff70791be9d343a6cc86b8a05b18bae344d67ebd8bae4c98662db7ac664a9dc86fa9b9ad4aa5c96cbf0178efb
+DIST github.com-spf13-jwalterweatherman-v1.0.0.tar.gz 6392 BLAKE2B 15ed225aa9eb6afca552a19a7ba22216454a27a29aa9f7ee39758100ff123afe8b10e06fce63bf2f4710fbdcbc5c680d3b4eef1cc3c8d363ce0a9f31ce8a34ca SHA512 13cc90c6f4a9fcdd29610773ada79fa2072223459c824b0f732ed3a6f4c61cb7a65c169f70007d3a08354f0a2e06b67e5257c4b0a0e1989fbc2309e69f7200cf
+DIST github.com-spf13-pflag-v1.0.3.tar.gz 46002 BLAKE2B b7caa90be69c7bb6a36b0da68af309debee6edd6e2596d39e286ebdb10f9f90246736f3af3a35c89ac704e2764d2ac40e76dad09c3147a942200592e3d234916 SHA512 d7121dade4fc06568cfb650a529dda350c60171e97ca405d29b9654a9fd06e453d20f8efc2fd8c51f530cfb0708648b2b2ba06ab40897b262ef2f3baf04d65a7
+DIST github.com-spf13-viper-v1.4.0.tar.gz 44183 BLAKE2B 4294bc3c5076f1305618f4caf5abdfdec200dbd140d48264495319a33c850a99b5bfa406f4987e58ae5b96321044e12235b60ffee018adfc6612daf04870074e SHA512 59d1ac2d84c4e72687df631fcdad723a5ad96e362a851a56fcf2f2dc57b5a9ac03f01f47fd24f5d3b027ffbd011b3981ce3abc21f3b98fcbe04c7f34752d4b01
+DIST github.com-stretchr-objx-v0.1.1.tar.gz 75768 BLAKE2B a394114d3d4d7d1a7fabd3f4b4e0a1722df8f1332685d1fdfff9662a7077ac43f5d6e5cd5f360fc47a9ca0852a81574f050e41a089ef40052c14311dc4fc3e90 SHA512 1db9240a7f4c1f34788418abe60bf566823d4881f5224eae9ba6cbf31e65177ef9f5f94b42fca2151bd0111a69b42f1fa6d5ec317955a32463199d4bd6d86b75
+DIST github.com-stretchr-objx-v0.2.0.tar.gz 79981 BLAKE2B 142269aa50602af8a00dd5f9acb0c85d3287c3d1fbfd953675c6023e597dad88462560ad02d3d20671fa1f3c89fdf66e46a94015e5c492287fb4973beb84d2c8 SHA512 d2b9b907c33b52e6ae5ef58280b3e8b2aa03bb7fe055275850cbe95ed4c62663867abe6ad7a5790ee10ecfab9c0cc7cbcefea1d3971454c02fb198c792402b36
+DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896
+DIST kube-bench-0.1.0.tar.gz 233675 BLAKE2B 1c4de681dd6239f79b552ad3cf165f0909fcf3c1b78c1b9092b6f2a254434ae755915db58ad78ee3c154dc5d19fe27619d2b7f3555673bed9b1f57911ed93617 SHA512 01f0bce866a828465848ace30c95bbec47b70e6475cebfe999966eb3ca8fcf16204e292b5b4005a6281ce03ea2ab61b9a6f98272255535ced1778556dd8b8fbf
+DIST kube-bench-0.2.0.tar.gz 251104 BLAKE2B 0ab76d6c25c46c16a592661715adac1b759799140162c844fd819fee018003e759b55d6d9d3aa96ce7cfe7649b33b3ab419c2e9e868d3c34155d509f1e1827f1 SHA512 bcb11305d9f7cc279f8fbdb0909210e22b699931a4bd26c9c5574b017b07c4a7dc6cc6f42397f35c744dd72c9227b656fa622318ab7af7704d748dfdf06dd6e4
+EBUILD kube-bench-0.1.0.ebuild 1995 BLAKE2B 3a8be59930b294fa55a27d4a8421f078b11a9444a1509f469b881b9a58fe160f6887004a5963fb6e083e8dbc00dcae0ced12735d8a43cc8cf4cefe78299bab7a SHA512 11f0564ce0a6bb22e6955dff286679bcfac6a102cbba70127c04030c77cfa608096bae1430ffc554d0adf1ca069ecb3ec63bdf8265d2f8db01ca711a774b1b1a
+EBUILD kube-bench-0.2.0.ebuild 3684 BLAKE2B aeca87cb41272d8edfe5004b5670e7a55d66a0741b961ee34b22208af63fb08bb68e84fb39ac963f2ab389eacf290b2bbc7d660ad248a598ebae5c051ef5cab5 SHA512 fef02a4817f6e8e937919e365d5dd75de2837187691cbc39a85bb8bd34c5563dfee7dde38e463fe043aad334ee7eb6613e737b52d8efc93af90e8faf6bc443bc
+MISC metadata.xml 255 BLAKE2B 628f9eaa8ba463b7c6c89c54ab2e4c349f67a9c9d6218761000be93c7c631ebb104c82980973b627e43ebfded8bf75b3f97045d904dcdc0b65ba7f1885de5040 SHA512 5f63f4f3ff0ee921947063d53f5c57f8888ae434eabda7042bd721677651ce801a89da67b4a3e125b5ef0f678f1d71a117ec1b768c4a469ade349d1d075e7843
diff --git a/app-admin/kube-bench/kube-bench-0.0.34.ebuild b/app-admin/kube-bench/kube-bench-0.1.0.ebuild
index 5b943f248d2e..c1b95c51d3b6 100644
--- a/app-admin/kube-bench/kube-bench-0.0.34.ebuild
+++ b/app-admin/kube-bench/kube-bench-0.1.0.ebuild
@@ -6,26 +6,30 @@ EAPI=6
 EGO_PN="github.com/aquasecurity/kube-bench"
 
 EGO_VENDOR=(
+	"github.com/davecgh/go-spew v1.1.1"
 	"github.com/fatih/color v1.5.0"
-	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
-	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
-	"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/golang/glog 23def4e6c14b"
+	"github.com/hashicorp/hcl v1.0.0"
 	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
-	"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
-	"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
-	"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
-	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
-	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
-	"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
-	"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
-	"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
-	"github.com/spf13/cast v1.1.0"
+	"github.com/jinzhu/gorm 5174cc5c242a"
+	"github.com/jinzhu/inflection 1c35d901db3d"
+	"github.com/lib/pq 83612a56d3dd"
+	"github.com/magiconair/properties v1.8.0"
+	"github.com/mattn/go-colorable 5411d3eea597"
+	"github.com/mattn/go-isatty 57fdcb988a5c"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/pelletier/go-toml v1.2.0"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/spf13/afero v1.1.2"
+	"github.com/spf13/cast v1.3.0"
 	"github.com/spf13/cobra v0.0.1"
-	"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
-	"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
-	"github.com/spf13/viper v1.0.0"
-	"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
+	"github.com/spf13/jwalterweatherman v1.0.0"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/viper v1.4.0"
+	"github.com/stretchr/objx v0.1.1"
+	"github.com/stretchr/testify v1.3.0"
+	"golang.org/x/sys d0b11bdaac8a github.com/golang/sys"
 	"golang.org/x/text 17ff2d5776d2 github.com/golang/text"
 	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
 	"k8s.io/client-go v10.0.0 github.com/kubernetes/client-go"
diff --git a/app-admin/kube-bench/kube-bench-0.2.0.ebuild b/app-admin/kube-bench/kube-bench-0.2.0.ebuild
new file mode 100644
index 000000000000..dafcaff2b9c0
--- /dev/null
+++ b/app-admin/kube-bench/kube-bench-0.2.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/aquasecurity/kube-bench"
+
+EGO_VENDOR=(
+	"github.com/PuerkitoBio/purell v1.1.1"
+	"github.com/PuerkitoBio/urlesc de5bf2ad4578"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/emicklei/go-restful v2.9.6"
+	"github.com/evanphx/json-patch v4.5.0"
+	"github.com/fatih/color v1.5.0"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/go-openapi/jsonpointer v0.19.2"
+	"github.com/go-openapi/jsonreference v0.19.2"
+	"github.com/go-openapi/spec v0.19.2"
+	"github.com/go-openapi/swag v0.19.2"
+	"github.com/gogo/protobuf v1.2.1"
+	"github.com/golang/glog 23def4e6c14b"
+	"github.com/golang/protobuf v1.3.1"
+	"github.com/google/gofuzz v1.0.0"
+	"github.com/googleapis/gnostic v0.3.0"
+	"github.com/hashicorp/hcl v1.0.0"
+	"github.com/imdario/mergo v0.3.5"
+	"github.com/inconshreveable/mousetrap v1.0.0"
+	"github.com/jinzhu/gorm 5174cc5c242a"
+	"github.com/jinzhu/inflection 1c35d901db3d"
+	"github.com/json-iterator/go v1.1.6"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+	"github.com/lib/pq 83612a56d3dd"
+	"github.com/magiconair/properties v1.8.0"
+	"github.com/mailru/easyjson da37f6c1e481"
+	"github.com/mattn/go-colorable 5411d3eea597"
+	"github.com/mattn/go-isatty 57fdcb988a5c"
+	"github.com/mitchellh/mapstructure v1.1.2"
+	"github.com/modern-go/concurrent bacd9c7ef1dd"
+	"github.com/modern-go/reflect2 v1.0.1"
+	"github.com/onsi/ginkgo v1.10.1"
+	"github.com/pelletier/go-toml v1.2.0"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/sirupsen/logrus v1.4.1"
+	"github.com/spf13/afero v1.2.2"
+	"github.com/spf13/cast v1.3.0"
+	"github.com/spf13/cobra v0.0.3"
+	"github.com/spf13/jwalterweatherman v1.0.0"
+	"github.com/spf13/pflag v1.0.3"
+	"github.com/spf13/viper v1.4.0"
+	"github.com/stretchr/objx v0.2.0"
+	"github.com/stretchr/testify v1.3.0"
+	"golang.org/x/crypto 5c40567a22f8 github.com/golang/crypto"
+	"golang.org/x/net 3b0461eec859 github.com/golang/net"
+	"golang.org/x/oauth2 9f3314589c9a github.com/golang/oauth2"
+	"golang.org/x/sys d432491b9138 github.com/golang/sys"
+	"golang.org/x/text v0.3.2 github.com/golang/text"
+	"golang.org/x/time 9d24e82272b4 github.com/golang/time"
+	"google.golang.org/appengine v1.5.0 github.com/golang/appengine"
+	"gopkg.in/inf.v0 v0.9.1 github.com/go-inf/inf"
+	"gopkg.in/yaml.v2 v2.2.4 github.com/go-yaml/yaml"
+	"k8s.io/api 6e4e0e4f393b github.com/kubernetes/api"
+	"k8s.io/apimachinery 6a84e37a896d github.com/kubernetes/apimachinery"
+	"k8s.io/client-go v11.0.0 github.com/kubernetes/client-go"
+	"k8s.io/klog v0.3.3 github.com/kubernetes/klog"
+	"k8s.io/kube-openapi db7b694dc208 github.com/kubernetes/kube-openapi"
+	"k8s.io/utils 6ca3b61696b6 github.com/kubernetes/utils"
+	"sigs.k8s.io/kind v0.5.1 github.com/kubernetes-sigs/kind"
+	"sigs.k8s.io/kustomize/v3 4b67a6de1296 github.com/kubernetes-sigs/kustomize"
+	"sigs.k8s.io/yaml v1.1.0 github.com/kubernetes-sigs/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
+HOMEPAGE="https://github.com/aquasecurity/kube-bench"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GO111MODULE=on GOPATH="${S}" go build -mod vendor -v -ldflags "-X github.com/aquasecurity/kube-bench/cmd.KubeBenchVersion=${PV}" -o ${PN} . || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/${PN}
+	insinto /etc/kube-bench
+	doins -r src/${EGO_PN}/cfg
+}
diff --git a/app-admin/kube-bench/metadata.xml b/app-admin/kube-bench/metadata.xml
index 9e426ff1b44b..4ffadfda2ceb 100644
--- a/app-admin/kube-bench/metadata.xml
+++ b/app-admin/kube-bench/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">aquasecurity/kube-bench</remote-id>
 	</upstream>
diff --git a/app-admin/kubectx/Manifest b/app-admin/kubectx/Manifest
index 85e61f24105d..929c0c63cce9 100644
--- a/app-admin/kubectx/Manifest
+++ b/app-admin/kubectx/Manifest
@@ -1,3 +1,5 @@
 DIST kubectx-0.6.3.tar.gz 483452 BLAKE2B 9f74a5df0c30e8414bfba0c2934ed0601dab249a78e8083179fc129dfe288b596f8f0932c3daf84b89ebb740a9c6694189f596c7a944bb6a584495a999d08192 SHA512 63054b51e3d2f52e895aa5b15162f67c81970c0d27e974f60f7f6641156d04cc4b590894e7eedcba3925f344009e65d04189c046f67d1edaf7f092ffe8d5dba1
+DIST kubectx-0.7.1.tar.gz 484162 BLAKE2B 54da3821da0fb992e1a12ad1e866f6f10c57a48da0414e8a48f293e090e289a0d26a70297974378b81f4e660ca13e85877c2f76b554eac526d1d830fdc439da1 SHA512 c78beba1820afb22548efb39e1fa704af017076096a4676d5a178bc3d65656f2352ee221d9754eb6fd8cc02a3aa96d743ce2c27a84a8b9c3684272cd2547fcf2
 EBUILD kubectx-0.6.3.ebuild 692 BLAKE2B 12a53742c7e79321ea3a3e2f534ba525e65d8d3968494908eae813933aa4de9f07310f2c151301eed696e15da27d6c1f1b444a5dc191ec479c0aeac0c3870915 SHA512 d672947603b0f6c3d2783082b25a3c5ae595d471251df46e8b6ed533c371211c781bc0b6330f14b7659bf88f285207cf74131e879823a600af9708a2576a6a40
+EBUILD kubectx-0.7.1.ebuild 692 BLAKE2B 12a53742c7e79321ea3a3e2f534ba525e65d8d3968494908eae813933aa4de9f07310f2c151301eed696e15da27d6c1f1b444a5dc191ec479c0aeac0c3870915 SHA512 d672947603b0f6c3d2783082b25a3c5ae595d471251df46e8b6ed533c371211c781bc0b6330f14b7659bf88f285207cf74131e879823a600af9708a2576a6a40
 MISC metadata.xml 247 BLAKE2B cc3ffec52f77e1ce57763359a7fc71a3225e3a2cda5cb797e98661c354fb9ee896033b1aa38c3a22c3587467da2833a801b710c8f43b3dffb2e9de327c48ab45 SHA512 a47289a415c6b8ee6759241cbaf42a851208f940432451a4b893f336d2c980aab922f8bb37de656465758532321dcbdfb372d1ee85739da46ec83ab89fa3f046
diff --git a/app-admin/kubectx/kubectx-0.7.1.ebuild b/app-admin/kubectx/kubectx-0.7.1.ebuild
new file mode 100644
index 000000000000..da79bbe5c433
--- /dev/null
+++ b/app-admin/kubectx/kubectx-0.7.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vcs-snapshot bash-completion-r1
+
+DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl"
+HOMEPAGE="https://github.com/ahmetb/kubectx"
+SRC_URI="https://github.com/ahmetb/kubectx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="sys-cluster/kubectl"
+
+src_install() {
+	dobin kubectx kubens
+
+	insinto /usr/share/zsh/site-functions
+	newins completion/kubectx.zsh _kubectx
+	newins completion/kubens.zsh _kubens
+
+	newbashcomp completion/kubectx.bash kubectx
+	newbashcomp completion/kubens.bash kubens
+}
diff --git a/app-admin/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
index 149ffbfd9d58..9786d6f29309 100644
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@@ -2,7 +2,7 @@ DIST lastpass-cli-1.3.1.tar.gz 114843 BLAKE2B 7983d4090092ef3443d8c502d157934fa2
 DIST lastpass-cli-1.3.2.tar.gz 116399 BLAKE2B d00ab9443935b90eab7337702a52e0ed2e7f2e67c20ed6764f72e25ae123e0420013aa9220ece8a57b7e3bbe2f243ff56bd054fecdbd064f086536bc5eaf0d88 SHA512 b293e86d70988aa5860a94fdc2bc65341bb253d2423c8f745730419400adc91ff860017d35657d283458c477c2385ff2532b8aefa752f886b207da8d10bf9018
 DIST lastpass-cli-1.3.3.tar.gz 116434 BLAKE2B 341f99a7a5edd157c271a0989a004ace8300f2121230b4c0b7c23152643ebc0e3f60717a057b4e6acc802fe641ccd84c770bfcb3d89c505713aea23692d1542b SHA512 9b9274cae1fe4045b7df4402170c522ab5765929739e76141b35a75ce3c8af824acd881e194face45e8721d6ce778bde97ff1a1ac23515de0c6dba28d61a8c7e
 DIST lastpass-cli-man-1.3.1.tar.xz 5700 BLAKE2B 736ab71ad55cfcb657c727f3dc9dc15775dab1a0232d1ffc51b8794e49911531c96a841b4a5ac0b31f0516cd7aa54027ac7d0eb096816730cdfd192c04d99449 SHA512 e60807683ecd681b3937ef447d3e6a487d25418fe99f51ba99e54bf643c5254dd18427a03e7f035198ef34ff578bbb6116baf04eb554f54d85e7d059b6bfed7e
-EBUILD lastpass-cli-1.3.1-r1.ebuild 1391 BLAKE2B b302f230665e0bb8dc206adac5f968674522531e4dec5042a6a6bb4d014aee1412bfed30c7ff48b788e16c8d1073f018292da1f3b896d6dcb6e6e84949ea97c8 SHA512 6d8d5009c546bcb7b7f2f5578dd5758b50773534246a76494bf3f16172a543392acecc3b825b3a10ba21262269ec46bce60e13d74026167c75704b85811eab9a
-EBUILD lastpass-cli-1.3.2.ebuild 1610 BLAKE2B e679b3ac32c95a9057166480363813d644a9a9d9e6e0b00273fa4f536d6c0c42299277d66e001dec2688456aa271061a0e8ffa243353fb0bbbbc9d6425bbcb7f SHA512 e5b983f52ec7a9c3f0f172bcb4cfbfe611dd57e3d5e9106ad1203315288f0b18e990cf095704581928676ec1e572a84c847a85debcff64e58bbe23b8d0c10fc5
-EBUILD lastpass-cli-1.3.3.ebuild 1610 BLAKE2B e679b3ac32c95a9057166480363813d644a9a9d9e6e0b00273fa4f536d6c0c42299277d66e001dec2688456aa271061a0e8ffa243353fb0bbbbc9d6425bbcb7f SHA512 e5b983f52ec7a9c3f0f172bcb4cfbfe611dd57e3d5e9106ad1203315288f0b18e990cf095704581928676ec1e572a84c847a85debcff64e58bbe23b8d0c10fc5
+EBUILD lastpass-cli-1.3.1-r1.ebuild 1415 BLAKE2B c3a538042b71247b6b8d3c54219f9ba52b0d86c43fe8ab8a25f43b74d729dd6db4347647177aab2589ffa3f8dfb6cdc64aa8b3c25223144d9507fb53fac03102 SHA512 c17c165c9816c02b54d3b7182d70f43ec0f65ee0130ef6060d8e0fcb1140d4bce6ebf8e9253eafa251d569064fa9699a892cedf1bd6d929380d88d948fadc734
+EBUILD lastpass-cli-1.3.2.ebuild 1637 BLAKE2B 0f2ea3383ffa4f3a0ecb6d0ec7bf7d5d3846616f66dacb1782adda191c35d206289e0abdf86d5201c09dec82d1b42c6e3b5526531b075e57956a470e235f6414 SHA512 888df5219a4702fa9829d6792af7adb82ead09ad479fc51986da11688b3552d77a50e7a20bfea448a4e73f93dc1ccb3ba30937a26555929ab3f4d7a7ecba32e7
+EBUILD lastpass-cli-1.3.3.ebuild 1637 BLAKE2B 0f2ea3383ffa4f3a0ecb6d0ec7bf7d5d3846616f66dacb1782adda191c35d206289e0abdf86d5201c09dec82d1b42c6e3b5526531b075e57956a470e235f6414 SHA512 888df5219a4702fa9829d6792af7adb82ead09ad479fc51986da11688b3552d77a50e7a20bfea448a4e73f93dc1ccb3ba30937a26555929ab3f4d7a7ecba32e7
 MISC metadata.xml 643 BLAKE2B a5a01a1dbcc257692bd14369470d69eef33a00a9910ed5006c62f1f5fec2a9a261dd6ece42bcaa68345a21f6e26958f965f90459501324b0e7a168f3fcc4f7f9 SHA512 6b1a7f6566687384d328260576dad306dd07add06001b3746b4f37f05ff91b6ee72e1e2ecfd35463a5b78b4ba8dd1a7757503bdf992372dbd474967e4bf0e9f3
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
index baa5af0d25de..4bc7be0358f1 100644
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ SLOT="0"
 LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
 KEYWORDS="amd64 x86"
 IUSE="libressl X +pinentry test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.2.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.2.ebuild
index d67ef36f961b..a8047a4f3661 100644
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.2.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.2.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
 KEYWORDS="~amd64 ~x86"
 IUSE="libressl X +pinentry test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
index d67ef36f961b..a8047a4f3661 100644
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.3.ebuild
@@ -15,6 +15,7 @@ SLOT="0"
 LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
 KEYWORDS="~amd64 ~x86"
 IUSE="libressl X +pinentry test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index 4061abaa4725..c361d5567a15 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,3 +1,3 @@
 DIST lib_users-0.13.tar.gz 25704 BLAKE2B 895f8b721216339fe4306158bf6282353d79584573091cc4e7c63c8096a9f9cfe380a8bce7229f168e44fe5d3641ceb8c91bd751316a6c6a467ace4ec0dce723 SHA512 588af7068728810832bcf4d1526f271e255d07c75d152fb41844c66f3598a71e9a96bee3426b31b58cd26af889bc42c0a7248731fdfe3623fd4567d2b6b7275e
-EBUILD lib_users-0.13.ebuild 1114 BLAKE2B ab26338a370609b310c18385e49d9855947268cccbbb48697ff1c7f40cf4a70c262d94bfc604cf6dd6ecb7ebd4bed5b33efb439b3fc9cbc8710e22eee7d62b50 SHA512 c07b09c78a6533fc8a46ccac6faec4f8b0d5d3072e85b43ab4e3699f0f636ece5b8e12b70dcd1e033b7b11df305a68197e1ef9ee3761f304c48b8b932240d40f
+EBUILD lib_users-0.13.ebuild 1141 BLAKE2B 8207a3a3ecdc77712bab4d902a777027daa5c8966fa87a0e59de366f5ad575a8f27319e1a829ee80850eb11ce701060e91fee954444b0ae6f65aaa9669ff982c SHA512 6c55d47620927133b930320cec61418e2931d76e2283006de86d639fedf557978a8434fe0878263716ac2c667584c09c29545ca752b46764aac97334f28b75e5
 MISC metadata.xml 454 BLAKE2B c545fd1db330988ad139de08b1890cfd9d6aac98947b954fb761515d314d8ebb941829e7767fe4fad6beb41caf3409111505d1a6378c852f15907933678ddd48 SHA512 c897ea5b6bed9fcc8715380a1b2756f376a095925a2c99a78ce6729cc9839683f40ce53f5faf0fb784169db5ef9162f1659ea6f24304bcc7cd47f90d49ec97dd
diff --git a/app-admin/lib_users/lib_users-0.13.ebuild b/app-admin/lib_users/lib_users-0.13.ebuild
index d4aca2e0ac61..3338ba112722 100644
--- a/app-admin/lib_users/lib_users-0.13.ebuild
+++ b/app-admin/lib_users/lib_users-0.13.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-admin/linux-bench/Manifest b/app-admin/linux-bench/Manifest
index 56aac315d692..10c4eb5062c6 100644
--- a/app-admin/linux-bench/Manifest
+++ b/app-admin/linux-bench/Manifest
@@ -20,4 +20,4 @@ DIST github.com-spf13-pflag-v1.0.3.tar.gz 46002 BLAKE2B b7caa90be69c7bb6a36b0da6
 DIST github.com-spf13-viper-v1.4.0.tar.gz 44183 BLAKE2B 4294bc3c5076f1305618f4caf5abdfdec200dbd140d48264495319a33c850a99b5bfa406f4987e58ae5b96321044e12235b60ffee018adfc6612daf04870074e SHA512 59d1ac2d84c4e72687df631fcdad723a5ad96e362a851a56fcf2f2dc57b5a9ac03f01f47fd24f5d3b027ffbd011b3981ce3abc21f3b98fcbe04c7f34752d4b01
 DIST linux-bench-0.0.2.tar.gz 73095 BLAKE2B c90b0185886a56a2afe2110c167dd2f7783f2bcdf50670d632ddd4c30f34a8186cb82fc477e6ddd9b9d8fbb22ce19438418dd3db62f8da851a20c04b23f61474 SHA512 acbabcebd5bd79d32863941e501b8e787ff89f92564ce7a0827fe1cde4f6c210bc4a5ff9d9a9e1f5db33b019f215eff3f27869e58ccd23e1eafcb8931dc3f0c9
 EBUILD linux-bench-0.0.2.ebuild 1639 BLAKE2B 8ce45b18d73324c1e377ace972227624a170de7c5ef32eb9f32e665ed5e1ee6ed075f562ef9de4d48a481fd518ece1d6437520fec1004d26092f568b1526541b SHA512 9ebd8c951d589f32a0ba7f42b8380c6d27aa8257efc2d109d9db0e230ee8232cef6be58434aff79fbee40a89cbc141829dec5a3c77ae4f5157dc0b813d6dc8d9
-MISC metadata.xml 334 BLAKE2B 4af62114a3b9a109691781ea413e8ac16d3a4a77d16dc55b8d6c17d294778998bb96f393e57b84f7f3dfee5281fc46de218f979cd6cef7a4147ab1970ae9f9c5 SHA512 3e3beff7662814028797343d2454c7a499862ee4304c5981ae81dd2b606bb01906468a02312fcbb99d7ca78d108da5d35f5769f9132a81b97c5b87af74c67017
+MISC metadata.xml 256 BLAKE2B 9c5d2003cd3eb6f4350366e0dfe187ec49639222e551b578a34c050faf6b2c968b483fae3a866e7940ad7398dae958886b373c30e7342b2c8256e0585bd61390 SHA512 02dc13507c7b2ea5001527e53576619236af3f224e694f33b3457db4fca4f33229b2cf31ea99400833fab20c1555afc4d0816aa3f13bcec1b047be9ad16ff475
diff --git a/app-admin/linux-bench/metadata.xml b/app-admin/linux-bench/metadata.xml
index 9787777fce9a..9ef050e329a6 100644
--- a/app-admin/linux-bench/metadata.xml
+++ b/app-admin/linux-bench/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">aquasecurity/linux-bench</remote-id>
 	</upstream>
diff --git a/app-admin/matter/Manifest b/app-admin/matter/Manifest
index 69f8f243f0a4..702d4d942299 100644
--- a/app-admin/matter/Manifest
+++ b/app-admin/matter/Manifest
@@ -1,3 +1,3 @@
 DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
-EBUILD matter-302.ebuild 903 BLAKE2B c1970417d8565c4d51b1aa6bc91e7e53a3303cbf0373a6f62aba3197b5796d19ea355d96b3d2c97923ed79976a2de4126560f9feeb3a6e39095248e6e7a9412b SHA512 5726e57bb3a94c9ca263a5be2aaf83ae2894f54b9a1f8958ceb286d13af609798f4928a498d6ade9f445d9554cbcf6d1449f303aa2c13f4e0e69058139f8c331
+EBUILD matter-302.ebuild 806 BLAKE2B c7d98c99f3ebdd52a9a6ba88abbc4a5e428fc27c771b4235953a153ec97b36bfcc0f0997e4c55a3adbf38b384feeba7cd6f407e192c43f56ebcf3b1a3a1543cf SHA512 88b1eeea0bab06cacd22a3baa00c85ab0f5f01fcd9852c67bf34e86ec3453cfce0d8169db5603cd34e950840ccb65eb7cefd02d9beaac4df87534a9413cc6219
 MISC metadata.xml 316 BLAKE2B a4b75b27426512d6fdcc5c82017121dbbd1e2a3438ade9329957bdce4c54b1d6f4c3404c577f50cbfcf8d03c41187b9efab14189a169c655bc2f98a6f9e82495 SHA512 f4ba14f543d1d69eb89eb098013f40a1cd7d872525e7ad683a6e4f6d6f4bb9a96ed81adb32aad5011c33dfebe694e10e429440343c16ed5497f03a4515ccffe4
diff --git a/app-admin/matter/matter-302.ebuild b/app-admin/matter/matter-302.ebuild
index 47f0521d6aab..23ff9aad401d 100644
--- a/app-admin/matter/matter-302.ebuild
+++ b/app-admin/matter/matter-302.ebuild
@@ -26,10 +26,10 @@ RDEPEND="entropy? ( ~sys-apps/entropy-${PV}[${PYTHON_USEDEP}] )
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	emake DESTDIR="${D}" base-install || die "make base-install failed"
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" base-install
 	if use entropy; then
-		emake DESTDIR="${D}" entropysrv-install || die "make base-install failed"
+		emake DESTDIR="${D}" entropysrv-install
 	fi
 
 	python_optimize "${D}/usr/lib/matter"
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 84cb9f90fb7a..f19cd0233857 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -6,8 +6,10 @@ DIST mcelog-162.tar.gz 308347 BLAKE2B bd438e85ea793c6c5ce4d561f0400e91b101a010cc
 DIST mcelog-164.tar.gz 308393 BLAKE2B da1f425faa88eb8377eb11c3e13aa6fd4c0b4f4d3b02afc2fba8e4137979bb5619b075b0d0ecd80ec6059c9eb912376291e56e667bf7b838bd2f641c4a6c175f SHA512 10c8c580b10caa6d40c2a4887cb9e9ec07eb81a353d24a4d1a89ad8ec5cc29f7976c26335f077393794b060e62b5cbbe348c64567a3cf3fabc3ec5c3fe59da5a
 DIST mcelog-165.tar.gz 308405 BLAKE2B 8e6cf59bfa3a5c667c1b709f9c0c5c82f8710ff1aa7c5758c1573a2c832030bb31735f8dd5a53fab26745739cdfac3001cb7a752df579cf452874d19e9e7da65 SHA512 466a07a90679380783524854934d6d66cbc53474616de9141cd36dd2a3b757cacccf1db50c8d4cd54763cea63ac9c09daf6e27ccf3bcf17d62da7fc3396281eb
 DIST mcelog-166.tar.gz 312451 BLAKE2B 430630f6f693ae22961bae2381117dbb6d3bca228d6bdcbbe007d2a2681cda53f8c29cf18b98a47a88d36fd059e3e08aff5b9ad22243d7ce5083f5643768b0e6 SHA512 35514188cf4932b4ecffb8d8149534367a424adb76f03833d53d3c2a0dae2ca89de90d071e48ed67a17a8a70a67efc14aa186280e9145b7572887dccdf9a01af
+DIST mcelog-167.tar.gz 312512 BLAKE2B 5642a421149847bddc46e776932c0fcaab1e281904a6be4ff8a3254d9e292d5fb77e6fbd5097c7afe0b39eca2f2db1752cdf67714a8a3d2f836785ebde3c0c90 SHA512 0229df9a4772e916af79aa35cdbc644feff76870d87a8c3c6ce5d132cf8c98bc48ec48ba564496071cb803537d3504c84963639370d9aed11d23833b65b3b306
 EBUILD mcelog-162.ebuild 1367 BLAKE2B 7fb646e842316273c540c327b2bbdc1c7c7f77f8e4150406f56bf207b581f1e9c05eb19c93a00ca924707f4af4b263665e81ca0f771e635340dd6ebfb6e1c9e6 SHA512 8d1e0e8caa4a685c1323a52c02a81f8de194c69fda836a3f70bba95b7c95fc18914c01cd2c0b76a25c849df4011c422216944684d1c9dc09774590ae788a3707
 EBUILD mcelog-164.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
 EBUILD mcelog-165.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
 EBUILD mcelog-166.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
+EBUILD mcelog-167.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
 MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/mcelog-167.ebuild b/app-admin/mcelog/mcelog-167.ebuild
new file mode 100644
index 000000000000..557b542b3a9f
--- /dev/null
+++ b/app-admin/mcelog/mcelog-167.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+}
+
+src_install() {
+	default
+
+	insinto /etc/cron.daily
+	newins ${PN}.cron ${PN}
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodoc *.pdf
+}
+
+pkg_postinst() {
+	einfo "The default configuration set is now installed in /etc/${PN}"
+	einfo "you might want to edit those files."
+	einfo
+	einfo "A sample cronjob is installed into /etc/cron.daily"
+	einfo "without executable bit (system service is the preferred method now)"
+}
diff --git a/app-admin/ngxtop/Manifest b/app-admin/ngxtop/Manifest
index c7e81f934470..e19f8d5d8dac 100644
--- a/app-admin/ngxtop/Manifest
+++ b/app-admin/ngxtop/Manifest
@@ -3,4 +3,4 @@ DIST ngxtop-0.0.2.tar.gz 9668 BLAKE2B becd0ba58490ad26dce2166ddf39d2064e797bc26d
 DIST ngxtop-0.0.3_pre141201.tar.xz 9012 BLAKE2B 9e8a7d2c3aadb302e0923fc7cb5b0219a56489993fdcf83fb7b38ba67036f2b5cae7e5bba2c9efc81d858c58b0f1e25f17fa8cc600e77f76b45aafd9d5a3354e SHA512 ce0c6d027eacfe553752a4a66b7d5823de45ef847d4db1a50d9677126a1d574c22e17b5a60f073bf74eb93d56d15d88d6201353324b201b77c1dd5bede6d7cde
 EBUILD ngxtop-0.0.2-r1.ebuild 642 BLAKE2B d2bbf0125bb2d13ddf424974863a8e2dff45f8d6c4404cbcfe890cd464d9ca86e38c86d36a701bb1beb90a6bb94a77c50f78d96ee805e01a1c8e00a9efd18510 SHA512 a1f667d09672711e14defbb07f26231785dc89baaa0f34be1de9d0aa161a690ecb045558dfe5ae69ed5a230de6238785a02cc140aa2bfa99189a6db37d8e2e27
 EBUILD ngxtop-0.0.3_pre141201.ebuild 721 BLAKE2B 1a192bc543ab4ed158746a9391aefa63082388759302ebd5115106147419942a863f3efdafd89e3c54709c3d5376f1f26561b6f0e31915d355b5640c771aa375 SHA512 b38d20205e937d5133789e3f4ad757e3516da59ec28a149024f35c7e83c1318b112de7be9f0626b1d09702b3c6a9fe89d03c7c83c2242f12e33fc79d6849e23e
-MISC metadata.xml 335 BLAKE2B e7a3dadd0a07d8bae375095732fd23ea9f95886f26acdf7fed053a2a75a799d37a6c64eb5ccf584fffc53a102ccf4925e10d95b146c8060275332f82858a1456 SHA512 6d525ce3c5a1efa8da1913ace611f778d2e0b7470521a970e26547ea921529a952576369f8fcfb19d39dea6222c0929ab475e5f7b0375d5ddf794a0303504ead
+MISC metadata.xml 250 BLAKE2B 7e40c73e3d292e399ced1a5e3ec95b9750283c1c78c78752f663890540158eb852cdbad513885f3f6a682d75b4569df0513db1d4271f3901dcb2b0e787c32b6b SHA512 3b834414c779d9155f38a0bddf7949a53b43da55fdffc52b32e1dcd1a666d3262187571cad366b89fc5985471e8ecccc7e241c497cf6104a31e83d4b0d555d11
diff --git a/app-admin/ngxtop/metadata.xml b/app-admin/ngxtop/metadata.xml
index 629c4b1c7e91..6352c64cfc66 100644
--- a/app-admin/ngxtop/metadata.xml
+++ b/app-admin/ngxtop/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mattm@gentoo.org</email>
-    <name>Matthew Marlowe</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">lebinh/ngxtop</remote-id>
   </upstream>
diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
index 857c8f78030a..ae90e301dec0 100644
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@@ -3,5 +3,5 @@ AUX 1.1.12-cache-qafix.patch 1103 BLAKE2B ab5fe2d05729dbd449e14aae25332172073554
 AUX 1.1.12-elogind-support.patch 6656 BLAKE2B 0bc942015430479fc1ae7c5cac080a8e68c53e4f5c45cea994bd44232f7dfe22e6623d31f9ed9a46bf31a851e888eea462785bc728db16951cf21c657fe1b575 SHA512 2126d57f2c0221cbad9f9796df0bfd817aaf26818f1287bf99c38a2396a7a0a140ff96c6369a18bfa008a91768d531fc4c0c5acd897fab3bbb35d755f39e946f
 AUX 1.1.12-use-autotool-python.patch 1072 BLAKE2B 8f96a404b3a80d13cb10488bf21a5710d9abf40e1725e47480a7451f7adcb9c4a0d834ac65f35d2013425b3c867d0126c23e999ff6077dd9735571fb9916432d SHA512 33e5d4364e32147de550204809fd86407607f102964986402379c8904f44f64db6ef7ac3a1b967fe6e70c8654f8a271b3f2934a370ec9422e58aaf54352d0320
 DIST PackageKit-1.1.12.tar.xz 1439024 BLAKE2B 458cb7a9a47941214ec58846fb840f852851555dbd94ed5113745f9e375cd28edaa8475db30fb889b1722ea01bce5200a5ea7a5f52e45b424703228bff59d689 SHA512 a7428416ae85df0c8e7dbe017396921e9214612c8eb7c91020523457d0feaff86ad50d595f702d255e4091364cb10b8d9506b603b9d0e449c39fced07180840b
-EBUILD packagekit-base-1.1.12.ebuild 3931 BLAKE2B 10c64f9a1db740257ba02d8d5eed2541fc153eb47291147b1770d44897ee2912df6cf3ecbdd747ee431e4ed6f0de9b89f2ae777bac0ed73c82deca907edc5bf1 SHA512 b457c367772214634bf53d021a0513cae6e6ab35eef7aaa7d98e1d4bb617a3b256203d7a313ccf6c0750013f887674a9ec5b56eac7fbb1db3ca7cd43963f5511
+EBUILD packagekit-base-1.1.12.ebuild 3958 BLAKE2B 5b4ffe7026a27988f2b721c45d75dcf8f20e4e1b30bac04c9a0787f026f05ae22b5775dff70ddf760c86d1167b99e4e2d82faf04608401a3341f3560a84896eb SHA512 0218990a84e43c49d8f6d5541f35da75a50a4cdb6c050890efaf2c7b79831f92b00c8ce5d1829bfef0af1cbb5f31b47a33de4c9078ace2073256a73b658a6f31
 MISC metadata.xml 772 BLAKE2B 88885c4f2b4c7ea16857f8727affd074dfc13a0a407f23a53e1a7dd7801c98adb4dde13baed734cc9b0f2aff1cc560dc45cd17c4c591acc0d9fcb1a95ce7e72e SHA512 14bf2712da5db44c38ebfab0e994a0a874213ce7265fce7a9f40b6b9e61b93a9935dcff532ade1980465b98d07b305c4ebcc69a344b7624c21b57d1b03bdb69a
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
index 0d5aba38b6d8..41466b8f3d98 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
@@ -20,6 +20,7 @@ LICENSE="GPL-2"
 SLOT="0/18"
 KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 x86"
 IUSE="command-not-found consolekit cron elogind entropy +introspection systemd test vala"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	^^ ( consolekit elogind systemd )
diff --git a/app-admin/pass-otp/Manifest b/app-admin/pass-otp/Manifest
index 43f553305be1..4dfabc106bd8 100644
--- a/app-admin/pass-otp/Manifest
+++ b/app-admin/pass-otp/Manifest
@@ -1,3 +1,3 @@
 DIST pass-otp-1.2.0.tar.gz 46789 BLAKE2B 373b1ddfb4cfae07e9e58bdad1c9c73ca6c6f53fc140ccda21527ad2ae237d3402bc52e95a180811263ef1a29f5c9da7db0063178b19a85b1dafc3d20e22996d SHA512 3d1417462998750ef1580169ed0e4b721b5f430cd86a678d1b6bc7b2ac123879902f7d22c28dc21e8a171ec80dfc51b6465d0dcc78cb009eb731651f2cb152f5
-EBUILD pass-otp-1.2.0.ebuild 642 BLAKE2B 3b9f99c333dab4b9286d152ea4af3cf9fa0379f45f9622466db7eae6a19f405fd069e647b338e3db2ccc46d710efc57d9df813029fbce6e1b8ccd8d008fc934e SHA512 8234117cae26405b9d6354677e8f87828076210287f41f2a8364c2bc7293955d44f19fce2da0d934f1d5ad945274c75263b18f498d88388c33adea1bfc4401f7
+EBUILD pass-otp-1.2.0.ebuild 669 BLAKE2B db38c8dd3cc486d4dbeb2df3c5a62a229bf492e29c5882cf743a9ed6afdf462eafea4dffe65eca09aa2a026b057a1e3f60f87cc08745abe4c2d9a1ec7666cebc SHA512 937dc998220dd15e7edb03fe390c79ad33cc87e07cd7eaabcdd8a10fea12d766a307b329151c5e65da224953e77a090ae567226b5fad3fbea8a4504bc20989f2
 MISC metadata.xml 661 BLAKE2B 34d62c5a12f51ddde97f0cc24ae0d6633844e847e9cfa81ffd4191b489f6fed7fc42a6e9f8ca75119f31f02306fbe958c68f220466d222db498fb6cff0e74a8b SHA512 071e5ad337d3e41afe2c6d4feb26f02c5f1105e5f51899af2f5021782c9a836b52e0575d8343bc3532fa227d2b385f248d72be46cc395233d7c77325beefea6e
diff --git a/app-admin/pass-otp/pass-otp-1.2.0.ebuild b/app-admin/pass-otp/pass-otp-1.2.0.ebuild
index 07731fc77c09..607af255b6ce 100644
--- a/app-admin/pass-otp/pass-otp-1.2.0.ebuild
+++ b/app-admin/pass-otp/pass-otp-1.2.0.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="qrcode test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-tcltk/expect:* )"
 
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index ce682dc974be..d406fc10ba57 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,4 +1,4 @@
 AUX passwordsafe-1.06_beta-system-gtest.patch 2962 BLAKE2B 1ef77391d355364e55da568c2686c1988916da9eadc312c37d01016df3449535b88b503dfd3aeac2bf3c8e613141552bb1d97f5f5a733becc33f3c565a610940 SHA512 2fc6745b84ad810a550c2b221aca4cd10f87d4bc77282cb31b3d3070b61a3958c126ce0d3da4eaf550d80be470ca4c5aefaeb863caaf2f9fb285bf844f5705bb
 DIST passwordsafe-1.08_beta.tar.gz 14409047 BLAKE2B 029568b435d4cc19f3a95364355546afb99c13bbee0e83c248d57f47e472da714b95be00658ec2bba161b8eab6f0d94bf2856a2198d29673987e5c0cddf69aaf SHA512 7c37a91c71c1a79ea2cac87ec310d08df7491affd02c073d674bbedbabf25c1a1fb807376dae378dc4395b2146f6eaae059a0b14e0d1ba369cfa91a2d29060a4
-EBUILD passwordsafe-1.08_beta.ebuild 2253 BLAKE2B bbb8a9d670d7a8fb1ff4fbac8eeee5a977f3b68735ec39d987d5a1be3c6c09c3d622652a1b0811d40134e4f893eb5997cd1f5a17fabb4f6dc3c5f81ffae9a2b4 SHA512 26605a7cf26f29dd9bd39ce6826171abe497a2e87cd6aa94084feabeb14b281deefaf548e9cd792ff24fb554ad1e6009446da486df8f1152a4a0fa542c847c1a
+EBUILD passwordsafe-1.08_beta.ebuild 2280 BLAKE2B 8868affd34cee8695bc69ca3a2fe29d4b84ba1da30ac03bf38acc0985a4ddc0d387a774150a6808ec814bbb49d96d988afcd0e42c989245484262b3edd7ed13e SHA512 f6db9cd2bbb29b1430f6600e7640e2ee4846fd107b8c28a607901c2d6a8031d1fee9e3adeb5ee973d1fafecf273904c3355e1a66c32019ec5e93675589993d4c
 MISC metadata.xml 859 BLAKE2B ebc13e88724302e4f2142d47f49f2c44e7f50c07d4219e06416c0173d5dcef313de1a9c6e71175da3c76e3377737b7369ade779f9ff94ff7d9921acaf4c69267 SHA512 14f66e229196c8c49843a17bd3f55181e0a77b6cfa223b1a776809380cb49c245ac1d61990f42967bb83be02c4dc68fa489a2485c6c52ffec7f5a8386d6db3f0
diff --git a/app-admin/passwordsafe/passwordsafe-1.08_beta.ebuild b/app-admin/passwordsafe/passwordsafe-1.08_beta.ebuild
index 6de1b662f2ab..fe48f7cee17a 100644
--- a/app-admin/passwordsafe/passwordsafe-1.08_beta.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.08_beta.ebuild
@@ -16,6 +16,7 @@ LICENSE="Artistic-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="libressl minimal test qr yubikey +xml xvkbd"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="xml? ( dev-libs/xerces-c )
 	qr? ( media-gfx/qrencode )
diff --git a/app-admin/paxtest/Manifest b/app-admin/paxtest/Manifest
index 350672a0525a..c15480c0d2f7 100644
--- a/app-admin/paxtest/Manifest
+++ b/app-admin/paxtest/Manifest
@@ -1,4 +1,4 @@
 AUX paxtest-0.9.13-Makefile.patch 508 BLAKE2B dddbe4e9c2cf761c4abcff5f2d708a90750a0f11dc685cd99d162ef4a90a3beaa9a3c12f01994ff34202ba33b8a04554c59213d4bbcb48491528ca957c443c10 SHA512 ed28fc2d852ef0f4da5268c8f66e9a5c5f2b75509cb67627ab1afbd9c3b89609a0e88686cb317f3e6e48874e02d5593b7a7661160ef849859cb9e77be375a6fc
 DIST paxtest-0.9.15.tar.gz 37929 BLAKE2B 0b0290212fa27b8f27bea62c209423b6ea57e9c3e7d972fd069f0213b3963eb7a65921c669ac402b5d83f6556ba9ede90375b58f0f7ec6daf6cc3a293372edf5 SHA512 e152f5ada943f69b3745b51ac6d80f35a4c1aff777e93360287ef18b117d07861216d9d0d2075d2511d33e2cb4ea07168bb9ff2f00e79de6060e546b6806c487
-EBUILD paxtest-0.9.15-r1.ebuild 942 BLAKE2B 87d557f82a0e54ddc70f1505c3b693f31beb307afb8603c67f70cf2bbfed2d788180f84358ef430a083faa8e2a76c98d77166316cd6f29962442e5aa628d1775 SHA512 c9bf34adbd5935fd323bc20fbf8e53a0c3fa436b0fe38cb1d347de9612a1b7019f26ce99afb12a4e66c9562e123f78fe52e68068d9f9c9b4893826c841d05199
+EBUILD paxtest-0.9.15-r1.ebuild 914 BLAKE2B 5b863582a7776d353c5d7fadd3a49f5ec5c30759b83fcc6df152d11812a55b4ca956901a0da560a21025c4aa9f4d919a4b05ef211d74a6641bb4c01edff81516 SHA512 4c41de979d2c2ecc0a04cf227743f19dd672cfd1132f24d151f9d7bcb535f34c975bdaf886bdf2f14aba76a7be5fddbe33ae77b54567facebf6af87421bc7706
 MISC metadata.xml 1140 BLAKE2B 4ba22a2a46b61986421373ff6a401f6c056bdb47b89b38552faa0e7b761b1bc171f253f238b59659183678590632d1f414f1108df2ad6ece17ffdb8eb32d45c1 SHA512 8abd1878f49a3e0fb560c0547555140f369d419b07ac05def097deaf386a162a4ce9fc7263dcf417e2909985900a8e01f517fcc3282c93c156c3339fe6a9f6ed
diff --git a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
index 4fe8a445c276..2919e526c917 100644
--- a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
+++ b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
@@ -33,12 +33,12 @@ src_prepare() {
 }
 
 src_compile() {
-	emake RUNDIR=/usr/$(get_libdir)/paxtest || die
+	emake RUNDIR=/usr/$(get_libdir)/paxtest
 }
 
 src_install() {
-	emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install || die
+	emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install
 
-	newman debian/manpage.1.ex paxtest.1 || die
-	dodoc ChangeLog README || die
+	newman debian/manpage.1.ex paxtest.1
+	dodoc ChangeLog README
 }
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index eeb185b93afa..4ccef73d0896 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -3,8 +3,11 @@ AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_6.10.1-1stretch_amd64.deb 19712026 BLAKE2B 82f5d9d18a3171b230d0e6027b9b8409b51096e12c5fd88844643320a0f5f654bc79880b35565571a6367a2d95f7a8f90ac811c2df1f1ec6c1866508c7e112e0 SHA512 8b289f8690fb67d353bc004a281e3e32a118048523bb6c743fa8ff46f2583c155ddffc22a7898662b598128f5ef75d77fd9a99b43c4afb72a23a2bfa3959f0c6
 DIST puppet-agent_6.10.1-1stretch_i386.deb 20055310 BLAKE2B 31bb9bd40f5098b666d911545b565654d84a422625536eff954256851089d211ea2660dbdab7b73df370efc0bbc41875617df3012ee734ec586af87967e8bc02 SHA512 33348839a245bcda4c76feae214d72bb36c1959c1b6f5f9c2db084ad1bb0018393ab6bd94e16ed987a23b2f253baf31f1df0453ead1cc6860941954ff31930c2
+DIST puppet-agent_6.11.1-1stretch_amd64.deb 19948710 BLAKE2B 256588922cfacb1d8146cd1142c43d893a55dfb67d7f70ca311df6178e7f9a82a0702d8306e0575d3f817e53c091fd3010027512cb4ce95956bdfa968372cc21 SHA512 90c39d55a8761185f82c9ac106d696ae48a170679e6043b6b3db32254e918b1b9c1b32c4e9721e5751189f84f002415f21a627daa22738a8c1ae3cb5df514eb3
+DIST puppet-agent_6.11.1-1stretch_i386.deb 20327410 BLAKE2B c2a105139df97395f54bb54d7ac971d914dcd3b69614dca55fe443d9fe5360118b899610a6d2d85b96b8b45715864df608d0783a3aabad3a2ae5555a0d510a2e SHA512 5d1173534beb53325d3c7c2fd500a7bd82a389fa8cbc9e867f6acbb6c2647190339d3b096e8a054aff268f27c5bd7de65c371a474b9c8263e8fa36bab75452bd
 DIST puppet-agent_6.9.0-1stretch_amd64.deb 19846122 BLAKE2B 7f9133d1f5cb85f45c96490c230ee0cfda707db390a3a39be218fcd730e2298099e6d70c4f44bb5c6af46736c2c8aa7906a16375088c0119045dc77b53343b91 SHA512 f96cb1a6108a21192493b7b9958243e537ab41ce3ab6a7dde4d12bcd5da25ec6a5b29632acb87c4e156256578e8348c6fdfe26043539292f98203cce69b04fff
 DIST puppet-agent_6.9.0-1stretch_i386.deb 20170516 BLAKE2B 391a61a847bc05f9f03885f2e2140ea42b4eeca247f3223f17a82d3ede2e1bbc88226f9794777f4b20e81943d94b11612f8d4ffd9f74c2f494bdc242fb05e1a1 SHA512 595dbe1591a8ee9d703a3efdf103a3095966b22cafd0fd63fb2a7b9274ea858b55d0b915ecc32e93c49bcbeba453654fc9126efe3855924fb5c5b6732e0af83d
 EBUILD puppet-agent-6.10.1.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
+EBUILD puppet-agent-6.11.1.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
 EBUILD puppet-agent-6.9.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild b/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild
new file mode 100644
index 000000000000..a72df734d6b1
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/glibc
+	sys-libs/readline:0/7
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index c44b9cf9406e..a92248993898 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -16,11 +16,13 @@ DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397
 DIST puppet-5.5.16.tar.gz 3084466 BLAKE2B f3e2f12331b4794b90a81a4f80e626fcd3d5252b7cbdacc1d6243faa557540d3a68e5e23b7b5c3e4f4286774e9a9198e59fb15d7d7c41d7193754ed5c80dd624 SHA512 7d9e533e352a22e347ac6467094c4bdbde893c2503f47b4a2d175fd6e759e6662991efdd1a0a83d9495d22f28da4ae7a30cc771c5d90b8252c4618bd8837833a
 DIST puppet-5.5.17.tar.gz 3090402 BLAKE2B 7722ec4196ee766c29eddd7dc73539a4a5a0e4cc781a84af25210488328b5ae01178ca64e8eef14152cbeca06dc8fe145b5e39ce6a120d7689fc32cbbbe16f9f SHA512 95c6cd836a9f732ccfe2d8b83096e79c32428c43390c0826663f896ca1388e1fe3b55d93a5a7548831e95de85247db717866c36786d591e207341c734d70168b
 DIST puppet-6.10.1.tar.gz 2809383 BLAKE2B 1589dcfa7d73b81ab7fbc3fca4b2fe956f5d240d11583c484262d5243e4713bb4aa9cd5c655e9566468050ab2e5c0ec0cc720e3ff9088add0744e02147b4e3bb SHA512 211c9837eb4a77a54bf09811a1a84709eef06f17e0c5c9c598d01bce2e183e69974709ad4dfb8f5fecd7433c1ff52757aa699c623155d1a0742f2e07eaf2ec56
+DIST puppet-6.11.1.tar.gz 2816525 BLAKE2B c4b188d5bf76b70a2748b86df78f1ca6ab99951cbc3a16377d3f2d38e165bc78ef8e5648cb09264a25ae81ac4d379b9323b1f2bbdea6679292c2cf38cabee662 SHA512 f44196206331448651e0ff0e865b09c6ccbb19115edeba4c58c8a29aa35e7d76676d5a3cb35c51cd511a44115c9c9434f1f90d5cbb0a5551a4004741d305c879
 DIST puppet-6.9.0.tar.gz 2911311 BLAKE2B 1d58d0e976430031732de4f63c3ec100088f1d93894cf52caff252befeabe1ea3cf51939063143bd7c9011bb56f2a6420ba38ae230edea19ac8f1f135ed6f56f SHA512 4d1bc1a398c1e75bf8e832d477a0fff4fa3613510f8d59d73594e6fc2f2bbbedf050b1e7729b71bb1428c230f42fcf7b98f7a7683fc3c52cb36a596e20e6540b
 EBUILD puppet-4.10.12.ebuild 5620 BLAKE2B 75fed43f7044fef014b1c9297066e07a5ef624fd187d141475e5fbaf69aab50494e783a16b212f3063cfaa059bec310b9771ccfa88d3f8ddcfc5458a75d2ba22 SHA512 8649b6811f330733ba25602e35e13bbd5be094c8f395d5f6c7a859662d831a579b9b3ad2a44b1ed9ea60882c32eb89a261f5e36977d79a2e9a88d5f12959a3cd
 EBUILD puppet-5.5.14.ebuild 3822 BLAKE2B b639a7bd6b1a2a0229271a2c00ae246e5cd219b91510f1fb1b5bcc4668d2f81c631233329628b78240354ae884ca9e4de02287896b326eef1220c81eb3d4e173 SHA512 1043b71e29082c1020a4c67814394dc70707c3f299afadb035bb2e15e4425a38dfa76b2323f4ad31b7142c1494cb05616ed28f0cf8f46b88760fcc53c3e734a5
 EBUILD puppet-5.5.16.ebuild 3824 BLAKE2B 0501c0a04cea8cd762732a7b6728833c99c828d79c39c18dc738e2c7cb063a8f14f997108a4d3863fc0abfbedf9546dd1541f01cbbb4ea3fdcb723a49fe6ec39 SHA512 baaadc5c82ea91dab0dbcf93a5b836248183777db978e0ec0621183b695191a19b6c7fdad892d0cec05c4426c64c949eadc4dce89f08cdea8b7b6f6913d01917
 EBUILD puppet-5.5.17.ebuild 3739 BLAKE2B 2f2e21bf61b695a74ccd42c19cd0138249f14141b8461a28a9ba26d473fe2b9635d7b2e2dcb36f2e2aba8e0fc1d1b5e9af93f363f903e2e3c845a5df68339e92 SHA512 e8a73db5ba89b73c3e92c1d5a9277ad0d7872a7d14898a52a7309393285479434b5609ef04e48615a76d17cff9388143600f3d06c55831c7f94ff31c2a311174
 EBUILD puppet-6.10.1.ebuild 3679 BLAKE2B be2b173b16da1eeed659baa79c9ae3ee953d17113ced882c5606dbcd397cfe2f41c0c78c9f6434d0dba97e332b87f00319d15d36ad924da83ce895cf5e650b81 SHA512 64a74e8402a9ae79cf1400f206ca5a0cf133d069d311b2f6bfd3b456974d8dbb134674fe0f53e51255cf27770b95a2b10fa11d1df181b3da05c89db3d8616495
+EBUILD puppet-6.11.1.ebuild 3681 BLAKE2B 8d64d23902331971a17c5868ff5a24b629c139fb9c03701f742ecab8f3c53f95cc12f919870300b98d96eca436799a0eb4e955cffa7faa808a77c6d11d2301bd SHA512 09fc378dddbd1d29abcf138dc13f4e08ada22de0f099790dc7136d82e80130f5d2b58467a1b96aabaeea8e7918884b527d016522c45fa1f1cc069b1b2162ea23
 EBUILD puppet-6.9.0-r1.ebuild 3678 BLAKE2B 2d18ebc4de1114501fc3bccfa0e91bc97e3c3616376154583da2040864234144fd66f7b7bb9caf2b979dca9d2feadc184fefc329b79c75c96ce82177b90dc01e SHA512 f861d29b8e6b2f6ddc86be8cfe2231847f5210b9bef1c1a4f75a7ef7bb13d11bd993a2e4292eb4b3880a90f3e188c9c9eb8ed95cb6b67c64a242d75fea92d532
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-6.11.1.ebuild b/app-admin/puppet/puppet-6.11.1.ebuild
new file mode 100644
index 000000000000..2fac345af4a8
--- /dev/null
+++ b/app-admin/puppet/puppet-6.11.1.ebuild
@@ -0,0 +1,139 @@
+# 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="https://puppet.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	dev-ruby/semantic_puppet
+	>=dev-ruby/facter-3.0.0
+	dev-ruby/concurrent-ruby
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+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.10.1.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
+	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
+	elog "not already done so."
+	elog
+}
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 37c9e1577f93..3891063ba3f2 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -2,6 +2,8 @@ AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
 DIST puppetdb-6.6.0.tar.gz 43366185 BLAKE2B 224c13ff2583a7c8124f03845eca4756be6446e7470565c44d3fe1fcb756d5564ae2ded69d0bef1dda939efe082756c0e44afd3c6b0fc4268a744946860b5a02 SHA512 5076f52af51b7a3b43a0deb9cf1f10d77da98a5e531983d3661cda522c8d46f70882457934be6f70e77587b930077c0a4d2eaf7ed41eff9c6bcf4bc5ecbf2205
 DIST puppetdb-6.7.1.tar.gz 43563417 BLAKE2B 902397b2bedb64f4ccb2d6932d6dbfb7d67c479640fb8429aecf3de558ce31ab0017175f183ee3e66268d802fc9901f5473271b6598414a7b57182bc1788f1e3 SHA512 58c6f3db268885e603bb1219f89c2aeb237c042fe7eccc95ce5622cfc739f971d9d37e0cc37cae335552d0d9845fccfd9425381faf6ec3534b20991bd9f7db0e
+DIST puppetdb-6.7.2.tar.gz 43566885 BLAKE2B b90376330cb084c2c14154d647ce334673c526e6f9b9d4430e0be4b420132a0c4c518a0c8ed98b15cfacc6716044f78c384123f3ff87ea1463736a352744b840 SHA512 2e32f7a5a3daf37d74082aa3a66c26fa23643e456dbf80cd16815687f289093c96defc9bfa10c3502f9a9f9a7674cef83b838163f11339c13d4b12c82f8e0664
 EBUILD puppetdb-6.6.0.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
 EBUILD puppetdb-6.7.1.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
+EBUILD puppetdb-6.7.2.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.7.2.ebuild b/app-admin/puppetdb/puppetdb-6.7.2.ebuild
new file mode 100644
index 000000000000..616793cb4123
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-6.7.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppetdb
+	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 3db22cb5138e..5b07ce9fa5a2 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -2,6 +2,8 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-6.6.0.tar.gz 59095750 BLAKE2B adbc08a68a1382106c43d27604c2cef52bd1d9875c5f555320d97d31dcf9d248c88baa2d6dfd37a855010fda76ad4d273a7bd5eca77bb216aabf6a120e41cee0 SHA512 2b43092752e246027a437398d6d23a4085caa2956a1453cec2e62f1001fca1c98bddca0a9d90c178ce9c89a06c26edcaee49416c1b8a4941e2bc4b6b5bb1fe0e
 DIST puppetserver-6.7.1.tar.gz 59202711 BLAKE2B 9f88617811d05dc09ee568b40ff332f88e44998916df6d2c88a268fe443d35b62e4d94816acc49a87dd355925bb13e99f8694596831423013b96119a4e1a0727 SHA512 80af1266d122f131f8d5385acbcf712d3042e7665eb739491d1d3d06adec8c0d78009aaec86161ed4fdb180bf529a48b2964c784ec728d40319f63c6d2f8f0df
+DIST puppetserver-6.7.2.tar.gz 59340246 BLAKE2B 635312cb2ea2f638617c10e05b9e1e8efa58caf3da8786155f44081f040a7b167d923e2266c57b43d855feb4bfd5280da85b5100a188e7f0f7dfde847f5abc45 SHA512 e2015554648dc861d513b5778c274e2b09c4ea2ebd53141d152a5bba1046ac6ef163083296c176008a7606581b8368df99aa72907e0edd59e687aa9991209fb5
 EBUILD puppetserver-6.6.0-r1.ebuild 5391 BLAKE2B a67b5f2f3d53fafe7922c96e579a6ff274b4246869987c97e4aa4f7e7f5d250e525f11a723de66266f440bf894c921c246edc8a45cbc78e80b80b6ed155f2bc5 SHA512 3490f2cfa072716aa24fb07d8ff24952bf0e1df60f6c5b33b84b5259b044c1875a9baff326e75c4d76afa8a0b4ff930aa4adee833be500be3a1fcc10ea3455db
 EBUILD puppetserver-6.7.1.ebuild 5391 BLAKE2B a67b5f2f3d53fafe7922c96e579a6ff274b4246869987c97e4aa4f7e7f5d250e525f11a723de66266f440bf894c921c246edc8a45cbc78e80b80b6ed155f2bc5 SHA512 3490f2cfa072716aa24fb07d8ff24952bf0e1df60f6c5b33b84b5259b044c1875a9baff326e75c4d76afa8a0b4ff930aa4adee833be500be3a1fcc10ea3455db
+EBUILD puppetserver-6.7.2.ebuild 5393 BLAKE2B 72168876f0d5ce90d779ddf60ed2069e284c3ef98a9e62a594e1b8614a3ac2f2681d25f7c3222ef0084d1d816d991d818d471f874bc8675d2a39fdaab260b288 SHA512 640a1e81775befe3a5a19ed8c8a19c53d11a30cbd9bf9613a5c19ee487bcc1d2e0948d91779a4c9bd7ccc1fb8e86f4c77fb0eaf1ddd5a13ad0158093729afed5
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.7.2.ebuild b/app-admin/puppetserver/puppetserver-6.7.2.ebuild
new file mode 100644
index 000000000000..45ac7ad8e73d
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-6.7.2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd user
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	dodir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
+	insopts -m 0644
+	insinto /usr/lib/tmpfiles.d
+	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE; do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-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-no-dependencies.txt"
+}
diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest
index fb55e75bb42c..6a30677d4b88 100644
--- a/app-admin/pwman3/Manifest
+++ b/app-admin/pwman3/Manifest
@@ -1,5 +1,5 @@
 DIST pwman3-0.10.0.tar.gz 75726 BLAKE2B ba7331bd3d36ac23d9151a5ebd4a343e2d8c523ba8b324850139a9ba4af8404ddf23380b3eaef523251e8f4137c5c56b6ab509c3927690fc612962ff872ea820 SHA512 a6dc24b2e1405a91f35a9a9155dde5409e35ce733bacee8858930d82443c09b8017e2701bc8c45688483b6c40554e4d6266f6cd21dc6f205b13f96e7de4f57c2
 DIST pwman3-0.9.11.tar.gz 74364 BLAKE2B 9544b692e8853b7fb8e1b4d51093e72e04f8d82888a9278c94aaa27716026b348bb16f0fa9c52af2144395a4ffb242c8a48fc34252890e68477d2e3a70ea4a88 SHA512 2aa5a7b4d810d1bbc6aea34b728f89190570cbfbedc33f45cc1aa4d737ebbb9e993d2d372b44f956d5cdbc07f911f289fd77d7df167100e820455650f5b3e46a
-EBUILD pwman3-0.10.0.ebuild 874 BLAKE2B 80cf90e2f46a226b6653689cec11f7bbc4668e2f6008402f3a249b3668be6e95c39a6de61db5279cc2a58b817909144adcfa22dced0b813bc8a29a5a35d3deba SHA512 6c8b3630c516846c5afff59853648411d9ca803d9764def00d70634a52d96c13ac7660eca4e93db691f6fbbba03a7829fbff534507632c02aec5d1790dac3d0a
-EBUILD pwman3-0.9.11.ebuild 879 BLAKE2B 867ec65bc9f56ca844eb0a21032173d85efc3b071f758f2e1521c4bd1e79fe2e5eed403ce6b1f0eb162dee1c3fcb6a7c38cb018ff441095de64cab7cc234e71b SHA512 77f6003c82a7af472e9bdde200b84af581ceed5eae6d6a666d277c6f4a73b670b19995e4a85f956754b5d8bf62138561685f1a3eb707856a5f671bfed5d37811
+EBUILD pwman3-0.10.0.ebuild 901 BLAKE2B eb17100fba148198526f5ab2066e831cf1dff88c21bf5f293b233b4f6400152de8870802eeaa3f7a493c360cc052c6691a3a5fc68ec241a0f27e2a6b7c2e1ba2 SHA512 b9b7436d1232a252a4984b7e3d72320bda92427a8162089fdb0eee4a20409e97ee381a26f142f50acc0a572e123541308032c84118b0d1f06bb99e5e3cf3770c
+EBUILD pwman3-0.9.11.ebuild 906 BLAKE2B ae156763dcf860943b0beb597376a842aa36f4b95305571f221716e11d34582a6e918210a9e7a855e6821d8ab7ef98a7851ce600c9d773b516dc0f055ec79f74 SHA512 e8b1875246c3cdc1d5b14e00440d87dfde51d4cdc05d58cb008ed5c1e8600d32d036067d05612726a51e9d2b4841a41532b75398c6c0e5c64ea792a892ee3daa
 MISC metadata.xml 966 BLAKE2B a024e2324e8a57f790d36a0091050510babb8241de2112546f9d760e3d5495a910d6baf91caf447acdacb4d464934248db3dc3e4ac1188e56ab82635a3246679 SHA512 f82ac9dd866b16f6583266bb2b748f713389e517eb51229481e902d2a232e4715146c5d8aeb7d572fea10f13f15cf700910f7c04231cf662859f1aa258c7bdcc
diff --git a/app-admin/pwman3/pwman3-0.10.0.ebuild b/app-admin/pwman3/pwman3-0.10.0.ebuild
index c63d60465f40..48418976fb21 100644
--- a/app-admin/pwman3/pwman3-0.10.0.ebuild
+++ b/app-admin/pwman3/pwman3-0.10.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="mongodb mysql postgres +sqlite test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
diff --git a/app-admin/pwman3/pwman3-0.9.11.ebuild b/app-admin/pwman3/pwman3-0.9.11.ebuild
index ba9a62305684..f83697e20877 100644
--- a/app-admin/pwman3/pwman3-0.9.11.ebuild
+++ b/app-admin/pwman3/pwman3-0.9.11.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="mongodb mysql postgres +sqlite test"
+RESTRICT="!test? ( test )"
 
 COMMON="
 	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
diff --git a/app-admin/rcm/Manifest b/app-admin/rcm/Manifest
index a74762f4f6f2..d07179aafa97 100644
--- a/app-admin/rcm/Manifest
+++ b/app-admin/rcm/Manifest
@@ -1,5 +1,5 @@
 DIST rcm-1.3.1.tar.gz 89437 BLAKE2B d897b793158da3a5e3975e283bd209f43f98eeb085bfb235802e8f1e3249ce2e09de2d8c391f89f4684afb78adc6c0b2bd91267cc32dcfe87b6b22296b47f309 SHA512 1fd8ad6f8bee16177444469bddbef8d9b99f0b2bedc82c9833523370dfda4583c425f1ab8f2195f11236d1385553a2a49ead6d4c5f0803deeb56737b6836a0d9
 DIST rcm-1.3.3.tar.gz 92193 BLAKE2B 42634fad58bf75b622ddf593cf83749113ffd35cba6b91f370b98b1211f5cb61274acd6f23e0be2ba7a49e966bb14c767b636aecc6c9a90b5802f13a2b123b53 SHA512 aa00edd76ab494a65cf3e97103d3bfffa427af83e57391cbe8e07ad2516b910c85d2e99a24405390fd27feee20752bab4b4856eeb8bac48eeb6f5707875df99a
-EBUILD rcm-1.3.1.ebuild 392 BLAKE2B 4bf90269b4c48782b17c6e92028956440dd4124baacd40f6bf78bd33e6d8d13ddc4a740ce1019e475827397d8ee267e1ca8f1810c50bbf57286461300133c08e SHA512 3aff0141d76288a814629fac6cdaed172627a64d4dac09291cce8cc56930943e09502ff3c6b74d22f7ca654eb25952f4a765c7f97a153f8b7474c730c89f2eba
-EBUILD rcm-1.3.3.ebuild 392 BLAKE2B 4bf90269b4c48782b17c6e92028956440dd4124baacd40f6bf78bd33e6d8d13ddc4a740ce1019e475827397d8ee267e1ca8f1810c50bbf57286461300133c08e SHA512 3aff0141d76288a814629fac6cdaed172627a64d4dac09291cce8cc56930943e09502ff3c6b74d22f7ca654eb25952f4a765c7f97a153f8b7474c730c89f2eba
+EBUILD rcm-1.3.1.ebuild 416 BLAKE2B 85848bef660645e77648d5b43a08db67bac029f715ca6881120ee0a90778b8327aed1352ec306de4b38eccb5db9aa0a37114e26892d2fcc84cc2e8604d72cb53 SHA512 8e1a547e68565ca4ddc011e716116dae636f6cebdb7f1f2627897fa6a8d087fcb49364add248891d2260932df95d0e90189b8fb93ae4bde472606268386f19b7
+EBUILD rcm-1.3.3.ebuild 416 BLAKE2B 85848bef660645e77648d5b43a08db67bac029f715ca6881120ee0a90778b8327aed1352ec306de4b38eccb5db9aa0a37114e26892d2fcc84cc2e8604d72cb53 SHA512 8e1a547e68565ca4ddc011e716116dae636f6cebdb7f1f2627897fa6a8d087fcb49364add248891d2260932df95d0e90189b8fb93ae4bde472606268386f19b7
 MISC metadata.xml 531 BLAKE2B bb5ebe54ebd4d547828eaa5c57b814c9ce235b1b38fbc1397e89a92ae2b7614595737b24594baa33f6d9c574b2a95edae3698b349a8481ea3f71fd3248dae057 SHA512 e78508053a0554f9ff72a04a5fbc7adf0b3d9a8f1b060361f58b15ff39b7fc2c2a7b50b44396b1a76a58c8896529932a80492df50e16ff4043ed51a26a74dff9
diff --git a/app-admin/rcm/rcm-1.3.1.ebuild b/app-admin/rcm/rcm-1.3.1.ebuild
index e068009d9cee..b83724655d3c 100644
--- a/app-admin/rcm/rcm-1.3.1.ebuild
+++ b/app-admin/rcm/rcm-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-util/cram )"
 
diff --git a/app-admin/rcm/rcm-1.3.3.ebuild b/app-admin/rcm/rcm-1.3.3.ebuild
index e068009d9cee..b83724655d3c 100644
--- a/app-admin/rcm/rcm-1.3.3.ebuild
+++ b/app-admin/rcm/rcm-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,6 +11,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-util/cram )"
 
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index d50f3f7eb0e0..3b32a556e997 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -3,10 +3,10 @@ DIST Rex-1.4.0.tar.gz 289330 BLAKE2B 70d74753e5b04b05ea7a5507f5c8c19ae953b4cc28e
 DIST Rex-1.4.1.tar.gz 317358 BLAKE2B 8c12d54e86684ec224a75693f82fd4728af32a986f166d530bccc2d06c5087fdb29f067d4419f3160244d37c12ace6cd29ba1322992bcc9f4a481c06e00efa51 SHA512 07e7d950326aaa60e05977f2acb2ac90f07efe0d56411ba202a4c60a890c37e984c6786383623ac67f8e36052cf8436e8430fd024dde282a7d2530425b420e8e
 DIST Rex-1.5.0.tar.gz 327424 BLAKE2B ea735ebeef7a4d879ec61783c7ee803f198b4091882bbdbaee1b415330fcb20ba408f082e7ecaaa5c63664d905690bd6b5601d2d726ff20f5dc9d1f8c6d470a4 SHA512 43a1e147e5d2dccdc641479f2bf5449b0051651d152823738caf946bb3ceecb444011c3273f0c70ca5feab737702f6cd609f5b211eec8261e1facd80c82b6c73
 DIST Rex-1.6.0.tar.gz 331330 BLAKE2B cb3a2895c1b7fd775aa762e8af7fbfdf3d14aac0d4ed5cd32bc65f4eb2b7794e438015daf9602cea3a852ed17dd207c9647303a106d8fff2cc89b5ce7a5ff0a2 SHA512 8e4421e034ddf7337266ce2002e96cad12a632ff37742991685d2919e3b11a4f6f3348097fd36717ab83a38e2e46aa974d0e56c67568a857c30f7ea673a51cda
-EBUILD rex-1.3.3.ebuild 1141 BLAKE2B 605593249d74463ab84d33b3c678176ab3ef1884387ddd72d98ad970c3d511f64df35c08035c7d5117dd2a94cd3b286b6669a1c4c07f8f15df72a66d682d9601 SHA512 f2ed11f8acf92f45b0fa649f84d4849b8cac068cfeeac93010383e2f8463f820cf50da99b9f1f7c76bc7cc268728e26800e97ae99ac28ae2e2d56da4783cb3e4
-EBUILD rex-1.4.0-r1.ebuild 1129 BLAKE2B c8ecaff070f15ebf7e521368d32949f1421d0d033f865c85a8f3939c57501affa45c5bee769ee1a87a56a5d8365823d447cf8bd11b2fe868ab5f7609d503d54e SHA512 56e4de394eadb91801dfb686b56f4e2e84908cb4f5ef358c88e6f25f94512e6497d923a71d7ac8bfa3713ab7db26e22108f6a2260bee310c514a5e7407381be2
-EBUILD rex-1.4.1.ebuild 1130 BLAKE2B ceb39e880a747e3ac7c5ce2e3169c0568eb129d012a8a8e9e229812c9d9c892321b8d1444bff2bfd25a30fc474255b2f0468df694334b3df3ecf52779df295b0 SHA512 0dc625298b996064fbfdc389fda95b7bcc6bcee7d9321da2e0c54a658e6fe741a11d345472f2d19f331bd89c0bb1d1262d694229d1f48bac6310b03202e18784
-EBUILD rex-1.5.0.ebuild 3642 BLAKE2B ad40f99c572a599b4779aed76fb2176fd2e488c34063d1a440cdc9d3c5d45cb71bdaa5aa3be292ec086dc5f47036a4056a8ad53afaf46856479cc143c9f5b6f2 SHA512 10806ed105703e4a8eac0c85b9bb6d7176943e8aa7ff744cc681af6eb9e042eb1b08832ab79c27016b1157bd62c0fa60a3415bdc7847c96f168bcc1e3e14573a
-EBUILD rex-1.6.0.ebuild 3666 BLAKE2B c6c91980826f316f658cfba66ffcd6ea87a74063c5bc6643df6e2941bf9d3bbbecc49fd7baac7f0057ab1e9649d96d4a0c1bef35225c57e7159d43791ab24ac3 SHA512 7b366e5f94d555dc61748d4d085a546edd092b0d435e3308ff264908e7a528585ca665eb7d0f5baa823b9b6d842c029372324def3e68c9028a2dff89a9f638cc
-EBUILD rex-9999.ebuild 3642 BLAKE2B ad40f99c572a599b4779aed76fb2176fd2e488c34063d1a440cdc9d3c5d45cb71bdaa5aa3be292ec086dc5f47036a4056a8ad53afaf46856479cc143c9f5b6f2 SHA512 10806ed105703e4a8eac0c85b9bb6d7176943e8aa7ff744cc681af6eb9e042eb1b08832ab79c27016b1157bd62c0fa60a3415bdc7847c96f168bcc1e3e14573a
+EBUILD rex-1.3.3.ebuild 1165 BLAKE2B 18d0b4b997e062eac059e348c19cc77f3dd20142f6b912ce9122029f9b020d06a757b6c42d36f9441c2d6f48649bbd93466d6eaad81325787b18a2bd124e1ca8 SHA512 f5a0e607a75089199e5a1979816916f3592844d8bf07eeced566aac2cf706b98096832e7303835cad200d2f8485c45bf5c1e92541beda4c321028c68e0884395
+EBUILD rex-1.4.0-r1.ebuild 1153 BLAKE2B b375b15001291702988f07603af9b54afc32c3762a5e78ea6f67706c943cc6af766e003dc1ad318bf299cf79a42f0e1c06c15de40d059487c0ee022958d0169a SHA512 819c53956bea6a3d165a9fe2528ddfb0b56743fe9d4389dae3f213432097a3cd30bfab396c96033c3cfc1cd6b0ed1d9594adaa026a0156cb8c4a38aa3a45bc76
+EBUILD rex-1.4.1.ebuild 1154 BLAKE2B 3f927f61e1d09229803df0e9e9fa9782ca819f4925b20e0b54ee9d4c3dc276d169c531ee0adc38bda25f6ef9834b70ab4c7b4e4d8712d501778e03a36df73d76 SHA512 0e3216353cd6861dfa8101599bf12e91fca589b0a085562d0b8aea95243506136725383a240a81bed32671e3e8d16cf2bc600a9cb31c81e55e75e2cd9433d273
+EBUILD rex-1.5.0.ebuild 3666 BLAKE2B f35b76024072e22c7252bc46fc568e6f16160e14ccce6aa684d177cfcd4febfe313aa4d3f5d13df9d1c43f48e62e4618cc226eccf408bfc2b65bd3c5270a11a6 SHA512 dc3f9ac8c3fa6c27ff6186950fd7a6af96839a4f52266a6a4749db85bcbc46d02f6806c35f8498f0a06e1c052deb3b882eb86b6403f599a91946ba1e156d388a
+EBUILD rex-1.6.0.ebuild 3690 BLAKE2B c7a716cdfaaae93100d0ad413ce33df190d73622502a2e75e2d21864dd60c5a03cef80ec6242af378c27594ae0f7ad303479d71cf5f2dffcc5e7081000daec46 SHA512 5421142ad66676135e369912ce069c01652b1d1436cd57030f282011e1c3fd7b695cc6ec2a446bd162e0eef31ff46cbe3ed4837c5505995e4b8ef04646fbac78
+EBUILD rex-9999.ebuild 3666 BLAKE2B f35b76024072e22c7252bc46fc568e6f16160e14ccce6aa684d177cfcd4febfe313aa4d3f5d13df9d1c43f48e62e4618cc226eccf408bfc2b65bd3c5270a11a6 SHA512 dc3f9ac8c3fa6c27ff6186950fd7a6af96839a4f52266a6a4749db85bcbc46d02f6806c35f8498f0a06e1c052deb3b882eb86b6403f599a91946ba1e156d388a
 MISC metadata.xml 23689 BLAKE2B 5aa6d9627f8f5b5564e231338a4b31893232a6593ba63278fdecf7cd345f1d7eadf756c4f0c77077c3b11b4b26646f9f1492c442cafb6f253d46cb3f72370e33 SHA512 136db3e5b2495b8e3b08feafeb4426c7692ee13d7366bec18e56e231d30823c3e36066a70538f0c3c972ec06955f746e8400819c22751caa164e1a72331a6148
diff --git a/app-admin/rex/rex-1.3.3.ebuild b/app-admin/rex/rex-1.3.3.ebuild
index 6081b372fac1..af414184c6c9 100644
--- a/app-admin/rex/rex-1.3.3.ebuild
+++ b/app-admin/rex/rex-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/DBI
diff --git a/app-admin/rex/rex-1.4.0-r1.ebuild b/app-admin/rex/rex-1.4.0-r1.ebuild
index 7fdb6b904a41..567130b86b33 100644
--- a/app-admin/rex/rex-1.4.0-r1.ebuild
+++ b/app-admin/rex/rex-1.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/DBI
diff --git a/app-admin/rex/rex-1.4.1.ebuild b/app-admin/rex/rex-1.4.1.ebuild
index acaf671c78bd..099a61a9bc6f 100644
--- a/app-admin/rex/rex-1.4.1.ebuild
+++ b/app-admin/rex/rex-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-perl/DBI
diff --git a/app-admin/rex/rex-1.5.0.ebuild b/app-admin/rex/rex-1.5.0.ebuild
index d7c75b836fb6..4eedb99641f8 100644
--- a/app-admin/rex/rex-1.5.0.ebuild
+++ b/app-admin/rex/rex-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
 
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DZIL_DEPENDS="
 	dev-perl/Dist-Zilla
diff --git a/app-admin/rex/rex-1.6.0.ebuild b/app-admin/rex/rex-1.6.0.ebuild
index 5a34558d4efe..796195929d6d 100644
--- a/app-admin/rex/rex-1.6.0.ebuild
+++ b/app-admin/rex/rex-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
 
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DZIL_DEPENDS="
 	dev-perl/Dist-Zilla
diff --git a/app-admin/rex/rex-9999.ebuild b/app-admin/rex/rex-9999.ebuild
index d7c75b836fb6..4eedb99641f8 100644
--- a/app-admin/rex/rex-9999.ebuild
+++ b/app-admin/rex/rex-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ DESCRIPTION="(R)?ex is a small script to ease the execution of remote commands"
 
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DZIL_DEPENDS="
 	dev-perl/Dist-Zilla
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 051dbfa16d25..89cd34f6746e 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -29,9 +29,9 @@ DIST salt-2017.7.8.tar.gz 12060430 BLAKE2B b2dde1b6f43bbb9b9db29b70dfd57591ae0e4
 DIST salt-2018.3.4.tar.gz 14404085 BLAKE2B 932b30b1ba60aefd3a6874a8ebe4cb6c469d82e31f6acdbe8a5641d09e3316796b5403ef803a355cec6255c1aede8bac3b66af179bd1bbaa5418c7076229cef9 SHA512 f17e06fdbf4741f231d9e769be57de4f6079e9283881b4bafa0d23928d7626a1f9c02b9f49c654b29c3e6ee8ed3d3ddf42c21baecef158ad63a97dc87895b21b
 DIST salt-2019.2.0.tar.gz 14952746 BLAKE2B aa3bba4b7d9548a8d333c242fc0265a743f56ff1a259da7c8618d37b3b022e12f09ac594a09f0ceec80fd9d3a6b6b9ec35b33e879b7a124e6612f2ec2a63a01c SHA512 de5a976213d011c230e423a172952effddb87168367958b8657eaaaf8fd2a8bec8471f547b6ff9e896a17064a13d387dbc12e12c605c8a241062e3238bd19eca
 DIST salt-2019.2.2.tar.gz 14420887 BLAKE2B 84e8a0aa72b88a66a1020b695849926669728ee02f8cb51a14853b5e9c2ab692fe65810367e5d53268f7b234c10911f16d063ce665b3761432ab1d9c0aa52d16 SHA512 2bbf9765384f1f6c2336a3f421298c8900cf459e6d1ebc7fb89284014ef8db9f5215a68de2bb06dfa3404983160a0c4c589ffa3dc046611dd5409bd502938677
-EBUILD salt-2016.11.10.ebuild 4855 BLAKE2B 8d6321e45aca368c5919104752f3ab5f0ba0778b183a232cbbbcd19da126eaecc2d0c40c29e3745a27d7f1cff9dc620840d7cbd86de7a3d8c6454bc2ff9b900c SHA512 a4e7ae265c66a659eb70fccba97c2c52ba9fe06fe20e23d3643029fd68442aad4f82d94f8a9dd55a5f040644a50571dec645ab866b20ef05a70ad8a550553c92
-EBUILD salt-2017.7.8.ebuild 4614 BLAKE2B 8974a75658aa59bfc4cd98efa9d601ebc374f407ea33d51b98b02fbcd00f195455c867f824cf16092e3859fcbccfc4a0c7ae2933a1724180d34a9f616432095b SHA512 a9a09dc1939775f46687e4e25fae24a3b7bfa48c1358bfec00fcc70fcd271d947c4f2ea5e9c0a9b4a522b87c5d2ab334f0df3d487dc2799db0531cafe23e7a2d
-EBUILD salt-2018.3.4.ebuild 4905 BLAKE2B 882cbf2fc6fd4547a19bbd078a27b6deb5053702fac869af73bac8a7a664f0d368e66a1a3da3b9c30bc0a892f71c1f7d5135fd14240b80cbe24c7fd9438276c7 SHA512 217870e4aef470660089e0627674b8001a3047c783a1fe6fe95c20084ad00ec089d51e0d2783c9a6a69f407aa475091bed4b8fc9a35001e32883440f30f5c1f0
-EBUILD salt-2019.2.0-r1.ebuild 5079 BLAKE2B 09f9672a3ff9e8abb40e5233a600f91b0ffcacd8011ee0d28be53b394fc796c23cdaf11f3b75136f31a1e184a49b95e358940102f6e3c309993823dd18b8d9ba SHA512 ef245c5e1f8a1b4a5c7b187608643099929f8165028aa3fc7649a5bb347a21e7a976e9c8a0ebae39f601ab6ce8e291cbb25af4d5505b8ce3b330f3a8d0918eec
-EBUILD salt-2019.2.2.ebuild 5070 BLAKE2B 35ff02500389792afd1b847caee031194610bf2c776033f193f6523a6b766635145496a3873060f53d72956a33cd7f74d27692af71acab70da7711f56ba58202 SHA512 5c478ac00fedf2b2c02fa65fedc426b052bf9ab24f98583f19e812cc5e47f361ea36a62b87106895b54dcb6fd02ce60aa154c3ab8efbe5fc4c4e72eb7f976659
+EBUILD salt-2016.11.10.ebuild 4871 BLAKE2B d10c0c7a6a3b865fa84a365fc3d97cc65e376867ed0229c6a3ecc79d721e1fccee9bdf5a8bf88f681d999bef06942dc9629d921aa334811655deebc4165509e3 SHA512 9370f1ea7abc8296181300b2d353789363f5a3f14a8c9e2af23a5cefd09b06e3d611c775479df266ba027fb36acc177fd6c9564396728784d80fe2e5beac6ff9
+EBUILD salt-2017.7.8.ebuild 4630 BLAKE2B a30efccb0845f435b351f40e64213ba1e751ac25a0400e27a5f8d238ecd0a30168c5ad58bfdc970dad7a3d24f8b4d89540928e7b15db0845bb58147a13f42880 SHA512 cbe73c8a757168efd558a8436efecdd0db0eab88c53c451bbf698a1290dab706347b86f9692782861c26cf501bffc44471a4f5811796c50a41e3926a9c9841c0
+EBUILD salt-2018.3.4.ebuild 4921 BLAKE2B 57f90f9404580c561f8b10f231e85b7f28f78669731e0c2e4842e7f3461eb4cef0cffb8de51f23b9a5e898d9c54f9203c38c1cfaceb8eb54286502a9d268d46e SHA512 ae5a10b97ae5625e274e1dcb31ace51978dbc4761dbbfb74ed450c2a9a2383b01519b2c7a2dbbb8f2051636b143768816ad887abe957a2ff16548572a437cf62
+EBUILD salt-2019.2.0-r1.ebuild 5095 BLAKE2B e4cba282b03284175714c2d77773d081c49b81d2f2d70af599d08f783293b17c61dab462b611084797bd6cb2b87ab9d81df7fc5e99efa2ea2481018a058fd2f7 SHA512 b1310b977b2308f5077e6c61d234b7e5d279c96a6400dd211266ec7f252f6f7e84751f6174ed57006942367893ca4b2b9be75f63dc81232ab5926bb18b50b678
+EBUILD salt-2019.2.2.ebuild 5086 BLAKE2B 54c95bf98ec8e562b031093233c3d35f147d2d1a9ca586ad67bdb0a7f7993b9e7ff0a4ab763afc281d2e03a2e132fbfca9408ccbe88d5216a03bf2948ce4ac96 SHA512 1090e3eec0c1efadd1f198be4301a10d113dfcdd51e2380081cacfab406c00f1472a6c5b73401209999d88453db3767fb648a1150bcd267a75b3413c584c040f
 MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969
diff --git a/app-admin/salt/salt-2016.11.10.ebuild b/app-admin/salt/salt-2016.11.10.ebuild
index 8136f0c369ce..7ad0ca40863f 100644
--- a/app-admin/salt/salt-2016.11.10.ebuild
+++ b/app-admin/salt/salt-2016.11.10.ebuild
@@ -86,7 +86,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 DOCS=( README.rst AUTHORS )
 
 REQUIRED_USE="|| ( raet zeromq )"
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2016.11.0-tmpdir.patch"
diff --git a/app-admin/salt/salt-2017.7.8.ebuild b/app-admin/salt/salt-2017.7.8.ebuild
index 2ae95c954277..de0fba5cc5ae 100644
--- a/app-admin/salt/salt-2017.7.8.ebuild
+++ b/app-admin/salt/salt-2017.7.8.ebuild
@@ -86,7 +86,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 DOCS=( README.rst AUTHORS )
 
 REQUIRED_USE="|| ( raet zeromq )"
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
diff --git a/app-admin/salt/salt-2018.3.4.ebuild b/app-admin/salt/salt-2018.3.4.ebuild
index 3e71e1254a62..e3e8f3743f3e 100644
--- a/app-admin/salt/salt-2018.3.4.ebuild
+++ b/app-admin/salt/salt-2018.3.4.ebuild
@@ -88,7 +88,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 DOCS=( README.rst AUTHORS )
 
 REQUIRED_USE="|| ( raet zeromq )"
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
diff --git a/app-admin/salt/salt-2019.2.0-r1.ebuild b/app-admin/salt/salt-2019.2.0-r1.ebuild
index eb02c39bf6f9..e1f7d05b2dfb 100644
--- a/app-admin/salt/salt-2019.2.0-r1.ebuild
+++ b/app-admin/salt/salt-2019.2.0-r1.ebuild
@@ -89,7 +89,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 DOCS=( README.rst AUTHORS )
 
 REQUIRED_USE="|| ( raet zeromq )"
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
diff --git a/app-admin/salt/salt-2019.2.2.ebuild b/app-admin/salt/salt-2019.2.2.ebuild
index 97d22f8486e4..ab00a4d5d798 100644
--- a/app-admin/salt/salt-2019.2.2.ebuild
+++ b/app-admin/salt/salt-2019.2.2.ebuild
@@ -90,7 +90,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 DOCS=( README.rst AUTHORS )
 
 REQUIRED_USE="|| ( raet zeromq )"
-RESTRICT="x86? ( test )"
+RESTRICT="!test? ( test ) x86? ( test )"
 
 PATCHES=(
 	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 12512972b02a..935a6fba175c 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,10 +1,8 @@
 AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff848000c3181e590e557413011ebd5db650f79dfad270f6506128ef9971975ec2b26323b18f793bb914759449679bc34f388c SHA512 c30d7fa3624164d3ec5574b1ae36cc896fb5132ed875f232e9e84cf080e7081dadce61f6d88b55aefa45e417a081622acf7aa2d9f10406d23be7646905dfb3e6
 AUX setools-4.2.2-remove-gui.patch 970 BLAKE2B b3d701d0e9b4de0a3f66ca8696700e70becfa5de068e385d12ca61f76ca59f495a69fac65ee986fa548bfec2487f21b5b948da2d729cef8a3008d906c9f7e73d SHA512 088be5d53e4402fa91bec20b3d85b8c1a77b41ebde1bbb44909e740b140bd6f79b641b68f56d258ad5a4af40df3023745663acb305a810ee19f126a0e99f1e6b
-DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
 DIST setools-4.2.1.tar.gz 365096 BLAKE2B f415ec15ce7caade2a511896c6027720ecd8b4fae938d9dee1e0b677388966557b9615503df58dd6057f5c0ef81690f753f3e1af773ef5fd8095b29aca0ab249 SHA512 7d00295fe7ff16e96e15266807f8e0a67cc2978f9051cd85afb9ee71ca7fad16ccf7421a4a163bb793950bc20a44f3cbb8409b4e0642d0f96cf7a3df7bc59c31
 DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
-EBUILD setools-4.1.1-r1.ebuild 1445 BLAKE2B 7f7549954ddd2b34d55960ac869f4cead17b6968bba0ca5634eaf5804ee31ffe08a232f93f6cc7aaaeb5f6485261f89ec27df6977195d734a8c0744e2aa91e60 SHA512 fd76c7f9e899f051388126b76c73490836ecc3937f8c31d8639d578e21c89487d5d2d90f6e68595fa660c5a49daff937ad050a12150b1d5863183664592c4ab2
-EBUILD setools-4.2.1.ebuild 1199 BLAKE2B cc0644c200c087907d0b4c29013b1e833976044de9b8e402ad9af2ceabde6f69a2dbdb1993ff8ec3aa2bb49f20347ef8cd4a179e3fd17ac3b8175d84eaf84971 SHA512 40712f5f7cae13f9f74a39dc58b2aca127b6901825bddab3bb045a7661c730659b28d0345719b50fd0f76d5144a84db4c640092cdb2110481cb7654b04970f37
-EBUILD setools-4.2.2.ebuild 1223 BLAKE2B 54d3f0e059ce452bae3dcc7829a411745a8382c2bd67f67b4c9e044b7a7bb424bfb25bc5ea382679651a3edce994d8bf37b77c27426f43ea07dddda552eb8bcd SHA512 be933b756cf01e925a74249f15b02bbc451182d5b795934352410a5ae5ea4f629d12f37dd823366e057928634db96d8ebeff7c816ae594fb1bb321e527bb2b95
-EBUILD setools-9999.ebuild 1201 BLAKE2B 2244435edf3e51f5727b6fe188462aedb64b68624a6d02ce32e48bd7c01e4a79db17d4f627d91a886c75803a92d005278ba8eda9bab777846718b3bd2a4c9049 SHA512 c5330e616e4d211754650994c65350137fc6cfd5f0be16e2f3cb295127c081f37946feb283713a7726462d0b367023b63f3051a807e2b24c78758009630613bb
+EBUILD setools-4.2.1.ebuild 1226 BLAKE2B c0b2e79c21e619c34e2191e3361641455380a897c5b889cb42d56c6a627b03661b0fe5c5f3d209bb55b80735626b949382c2bc639f1b155192c9852e07f1d5fe SHA512 b3c40a5f65fd2167eb4b8241ad69acc4bc38c677be3e57ba636b515a0a943a1b9bc0b27511bb878cdff719f48c4023d5e0abaca6523c34cd0df36da94dca7f01
+EBUILD setools-4.2.2.ebuild 1250 BLAKE2B 8e24854945a7cf9f535a45bc847e6d32b2328ce535d24f2b1e4d07d9571eb3f4aa9891f68f261c931ea9ff20b51e5040107800463f3c7ca440403607d1d17bb0 SHA512 f3c29e465a3e92ff1e4c17ca67d592c0d3f6f7b6b923357e4eac3acf7a7b4ac3c79ede85acea421ddf3706bf61a7be837066e1826769418a5d2ec32f308b7df8
+EBUILD setools-9999.ebuild 1228 BLAKE2B c0866df58ed5dc0f3a92b4abf0b20c3207b35c20b9dd0e64cf00b26fbc342e5404271de14639a788725a816a3dc9519887dc248cbfc0c7301ea88a073db15576 SHA512 21bad0e03734b09bbb659b92ad180cf390c40a0b29a1591aae819a97c721668b7c8e7b215a5dd30765f33322fd7cefdc4755dd20f6b9bfe2cf3d5d0b731b036f
 MISC metadata.xml 401 BLAKE2B dc411a73d59193727d72889e4e5f3840aa9cf7b1b6ef55f28ab6a6beee533276954e27fe105a60c392c49ac761745304865c221ff9417464112eb866f35bf6e9 SHA512 354eb8fc14e5673dfd6ad2781a784cd6d77442bf879a96c206b758615c1612397c09c20161efb9e37bc56a588e97a74a20939773dec0b1f137eb6ac353234d2f
diff --git a/app-admin/setools/setools-4.1.1-r1.ebuild b/app-admin/setools/setools-4.1.1-r1.ebuild
deleted file mode 100644
index 5a0548877647..000000000000
--- a/app-admin/setools/setools-4.1.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Policy Analysis Tools for SELinux"
-HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
-else
-	SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="X debug test"
-
-RDEPEND="${PYTHON_DEPS}
-	>=sys-libs/libsepol-2.7:=
-	>=sys-libs/libselinux-2.7:=[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.8[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	dev-libs/libpcre:=
-	X? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2.0.12:0
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-libs/libsepol-2.5
-	test? (
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-		sys-apps/checkpolicy
-	)"
-
-python_prepare_all() {
-	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
-	sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@g" "${S}"/setup.py || \
-		die "failed to set base_lib_dirs"
-
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-admin/setools/setools-4.2.1.ebuild b/app-admin/setools/setools-4.2.1.ebuild
index 3e80e5e19f6b..ee786fe4b51a 100644
--- a/app-admin/setools/setools-4.2.1.ebuild
+++ b/app-admin/setools/setools-4.2.1.ebuild
@@ -20,6 +20,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="X test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
diff --git a/app-admin/setools/setools-4.2.2.ebuild b/app-admin/setools/setools-4.2.2.ebuild
index 22da7166d078..20bb81b9fcd1 100644
--- a/app-admin/setools/setools-4.2.2.ebuild
+++ b/app-admin/setools/setools-4.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -20,6 +20,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="X test"
+RESTRICT="!test? ( test )"
 S="${WORKDIR}/${PN}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index 8df9cb7cd407..96ff5057cd8e 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -20,6 +20,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="X test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
diff --git a/app-admin/spectre-meltdown-checker/Manifest b/app-admin/spectre-meltdown-checker/Manifest
index a5765b9133a5..ac1112c8d52b 100644
--- a/app-admin/spectre-meltdown-checker/Manifest
+++ b/app-admin/spectre-meltdown-checker/Manifest
@@ -2,9 +2,11 @@ DIST spectre-meltdown-checker-0.39.tar.gz 43785 BLAKE2B c8688b28eac8951b3cf813cd
 DIST spectre-meltdown-checker-0.40.tar.gz 52463 BLAKE2B d0cbaf695bea41bf918900d1356b8dd26cd7ab7b66ce8a82b2e82a0554dcfe5435bb20262490dcab312e2be4962a2fabb1defba0295a84ee62b5fa876f20f5b8 SHA512 da2d63d9aa513a529537dc58f9370c811577f70ecd856ee001888108a871351484f47697cdefb1b0711be3fb342ba733e78b75fd154eec98c4c9a8504e6adcf9
 DIST spectre-meltdown-checker-0.41.tar.gz 56170 BLAKE2B 07ec1a56dd13c15463696d136652f67d771d71be5ff39ed0024ab69b5dc84b1bef0c695771b0966c89e7311a9c894e2f7b9ddb8ad2c4120da183948b63044c2c SHA512 4391098cd969a211ed77e386e79df3ea2c2482bc1817e9b037720922cbd845457c4192e1de7b0a62ec971c3b6c551240cf2ef29191fadce1698256af43737b26
 DIST spectre-meltdown-checker-0.42.tar.gz 57491 BLAKE2B b13fdf74e0b63db1dd1aaa6bc154ab2717ee4a3ca601d7c6fb18578e42d03545010fe74cb72fe17ccc8c2ff949d47af49704cd8bd7431b5ec3cf1d7fbd288d49 SHA512 721e9287ce367648e367850b94866a6465b92561a0c2f1699599ef333921fda988979db02004b2c83ec9c808f625f793d43eacdd84d44a9d1eba59b2b300174c
+DIST spectre-meltdown-checker-0.43.tar.gz 51651 BLAKE2B f94ad2d144709511738a0149ed133da1e46a57546eaf0a702e1713c66529155b6fe3772911099bd0228fb295a04cacbe4ea39998555c139cddb1bb4b2beff1fc SHA512 68ca476025e5862466ca5e12e6950a538b84f36e08dfb0650ab6d13b6e94762dda8a49d9f5e20d0ee585103199ed0ddaa9dcf7cd72378156a7e1e6c87f70afda
 EBUILD spectre-meltdown-checker-0.39.ebuild 609 BLAKE2B 36d1843107f84dd5e36b3f3548f64a6d34675ff83709430b7209ce817c362c7608a538439cec26d20c6507b556e822ea6e57ca9cc1260641092c55ed4b1c8005 SHA512 f1464c0b9ea01606833459688a90621b573c40ec598c39ec1bc4e41e48f8a5264345b82212d9332f09792a6cba1314f8bff2e519f982dbaf0a7b59e3b355dbef
 EBUILD spectre-meltdown-checker-0.40.ebuild 611 BLAKE2B be71069f07922e8bfe1ee4627a6483c22ad886807cfd95cd67151d45e38456c0e132ef2572ab0b2b4220c21ba76a5e2aeb7dcf1db4e745f5a7d24a9b9442e0be SHA512 9e9852fb0268f890061528c0e550f63b023aa966025b1d8dcde83e24f3de768eefd806aa90ec97c5e36b69e614b03c0218c2443d9d2af1b54da3d95b83536b13
 EBUILD spectre-meltdown-checker-0.41.ebuild 611 BLAKE2B 205796938c2b38c3dd99c7799cbf564be38be6ed377250e4f3e72da525ae80ce1966f53d6e4ea283496854923be899e9b01376f7ea952b6ec498b9f52ecec2cc SHA512 8f9b0362c498942079455927ac26dbefcdec549f216e1c250e0fd9531ff81ba1274f9142eb325bb0e0d3a5b6b8b006ced06714b9a0724f8be3904c137226fba7
 EBUILD spectre-meltdown-checker-0.42.ebuild 613 BLAKE2B 845c9882ebe3ea93f8658fe713845e4cab942fdd59a7d1888e4cc6a424defcaf4eee2a347169dce54b7ecd0f485c8310ddd6aa5b9ac260de3f213d9fb7347294 SHA512 af555d0e399c9cc9e100cb06e91821e74779286460262f87cf5bd0cd5832562fa6cad0a2f8bf80e01cfddd59a0722a4b2c5e3ed55d6bcc4207deb26e1e1577f2
+EBUILD spectre-meltdown-checker-0.43.ebuild 611 BLAKE2B 205796938c2b38c3dd99c7799cbf564be38be6ed377250e4f3e72da525ae80ce1966f53d6e4ea283496854923be899e9b01376f7ea952b6ec498b9f52ecec2cc SHA512 8f9b0362c498942079455927ac26dbefcdec549f216e1c250e0fd9531ff81ba1274f9142eb325bb0e0d3a5b6b8b006ced06714b9a0724f8be3904c137226fba7
 EBUILD spectre-meltdown-checker-9999.ebuild 616 BLAKE2B 1a0cd1b4cf550568a77bb037cd600cd9a54f4ff0eccd267a98b6849c1bfbee97ba967c78f6566a1b6349d50d4936b243714cec8b2e2d87509d3da9dee1048f18 SHA512 2c09e4d7b49095e2e1bd2a19fb26745898409295338167f5e8a77164b207984234b18c08916add448b7f31e6a2ae789ebc9bf955cf623e4678038d58fcaf572f
-MISC metadata.xml 461 BLAKE2B ffd3a0e87b161c95e73d98acfb9ce11068ff5698ad095703e48ff7a95bd9c65379bdfa87ed19f6a1c5e10458cb10042f33e986d58741f8667b49409c1d7083ad SHA512 9e59c70f06c412ef1a742d2edbf62ef5e69e3997e8ba713e61a91dfcdb4a399035e60d9ce6fad43a1568cec658f05d33bc3aaa5fd2efc1cf70eb0f5fd98e1dbc
+MISC metadata.xml 345 BLAKE2B 07f3a6efa5ff3dd3f5dad5ae3b4dffa1286648795a31075bf64ad2bdf25e8b712d6aef5de0aa48a31cc059d528fe4b8165b71725e6e3b6a40e5b2aae9242f5d2 SHA512 7229e00a28686eb602be0a9d0bfa4124acd1dfa73edb5e7975d5ead0bfa5e7d64888a0eb6e1c3c3828f48d2081d29b7bacb48375d75ebb780f2e94915f858661
diff --git a/app-admin/spectre-meltdown-checker/metadata.xml b/app-admin/spectre-meltdown-checker/metadata.xml
index 5e8946a7b96c..73a0024551da 100644
--- a/app-admin/spectre-meltdown-checker/metadata.xml
+++ b/app-admin/spectre-meltdown-checker/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>lucianposton@pm.me</email>
-		<name>Lucian Poston</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>candrews@gentoo.org</email>
+		<name>Craig Andrews</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">speed47/spectre-meltdown-checker</remote-id>
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.43.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.43.ebuild
new file mode 100644
index 000000000000..3d7f2444be11
--- /dev/null
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.43.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
+else
+	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
+fi
+
+DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
+HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+src_install() {
+	default
+	newbin spectre-meltdown-checker.sh spectre-meltdown-checker
+}
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index 544ce0c7de32..191669a0e939 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1,5 +1,5 @@
 DIST stow-2.2.2.tar.gz 579324 BLAKE2B fc4ab7f386e8245b361cee5fc0decd91caec543ec6178c82720866c33a974ba9d68e999a68c3b7357d873ab1b58bb8b022bf02dad029972f42c317ffc288bd04 SHA512 8a3e5da6b5cb4c1ee1b512bae5a9859f83659d5de05f7a9af1dd09df2a32f6b8c6d43b79736db91232c43621d542041d4ef92eb088925796adad0676f200a9b5
 DIST stow-2.3.1.tar.gz 654191 BLAKE2B 9fd54fd3ff76aa7b72ed973cd6d70b8dc747fa3bb1ecc6bedd221b308d7d141a21a2f077c67efb432f2c7c4fb6bd126639038b196946206bf4a7f95040477ab2 SHA512 e9a7de1a6f10eaf7cdbe6737e0a8be1498e2eac46b6c57e65b83759b061efd1c0db45f7cba123e35428307e3aebe5baef9ea8bd4b5eb6ec5e1b159117a760441
-EBUILD stow-2.2.2-r1.ebuild 620 BLAKE2B f6041e927a8c7369cc96c3afdc5ba4778ee9dcddd672a339fb369eb70a24d34ffc21d711ae36f004c3d65797bfcdd1a010cd1180ace4b4d14bc9d640bdf820d8 SHA512 51bada943c05c6ad71ba8ca6ff6678a51fc37c9df063977f9478403604acd7d9993b288cc21c3556922749000a5d34276d6df6575aa107378e8a5aa20611bc21
-EBUILD stow-2.3.1.ebuild 619 BLAKE2B 474edc9a9f6c99ff99bb2f7192cb83973b7d6d92d44d08f30605712856840901c0cbd99366ae5607f5d3af9dfed0c695afb48741ffa729805e1377dbb9483e91 SHA512 6c77dbf6b120b83e490d3748e0aa6c4a864bc6b512e0a7c0ca46b4e5dfeedea2d0e4437ca137124f09d34becd33700408c3f00cce54e22557659065256c71b46
+EBUILD stow-2.2.2-r1.ebuild 644 BLAKE2B 5df5695a345d135207741d67bea7c80b79de23b42297b93573ca587955307507ad91d6fd66c84d6554dd4395dd16e8f7c4088f9ba77e9e1eb17e02cc3deea07b SHA512 5767ac1057a4a7c9d897e500f78b3e2e355bedf758fbadb41f1864574e448f89abb24b976c2c4fd70024537a52c46906bff93c3cc03109e6e6e12f0dadc385e1
+EBUILD stow-2.3.1.ebuild 646 BLAKE2B e66805d8e0e6a73624c92ad211f961323fcd4603f6bb433d2744691a6a4eb7c07a6cec53e7a94ca8a5878a16b756a1a39be3d37fcb11a539c76d1ec49bc65edd SHA512 1d3d397826fc97f67b4d1ea81432db89ce7537fb84f709c2d842db7613b6d49543dfc2e56daa3a58e4ba9946d7d5539287bdad516f8c393b8e9893325b004b32
 MISC metadata.xml 249 BLAKE2B 210caabfc49730fad6228e8c34b09d11554fece8f3f754a26c6239b3b0de845ea128507b2c17d6e97343f9e6e2ae01272eb024992c3c64d3903794fbf73a66ed SHA512 c13d64a0d3034eeb4c9567f5e1236ecd6f3c3cbdec69b805627298cdb7050ae01a19a3cb075ec905de9497079a3e855bdccef2f37f65540b6ae184439f01cdae
diff --git a/app-admin/stow/stow-2.2.2-r1.ebuild b/app-admin/stow/stow-2.2.2-r1.ebuild
index 6c38e26d6bd5..5fc1dffc1261 100644
--- a/app-admin/stow/stow-2.2.2-r1.ebuild
+++ b/app-admin/stow/stow-2.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-lang/perl
 	test? (
diff --git a/app-admin/stow/stow-2.3.1.ebuild b/app-admin/stow/stow-2.3.1.ebuild
index 834867c86051..8d897c6cd2fc 100644
--- a/app-admin/stow/stow-2.3.1.ebuild
+++ b/app-admin/stow/stow-2.3.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-lang/perl
 	test? (
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index d30c246a2cc2..2399d6f81cbc 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,9 +1,9 @@
 AUX sudo-1.8.28-no_pam_error_message_fix.patch 1405 BLAKE2B 924c8be80bbbe75e1f3fbd9c598d91a02bd4a2c26efd8936c018d54f99977f0c64351f07a9fa5c6bffd52374accb143360da68c9a70eda0b16cf4019b419cb47 SHA512 9afcfc841635d5bcf67da292a205633fd7b4202d007dd3992e6e69ce98feb0cd5c8ebcd646ea8b46cdafad59779ae41dc3593b13ad35f9017e6c0c2cdc20ed2d
-DIST sudo-1.8.27.tar.gz 3293178 BLAKE2B 174d63ece5c24309dc0d237fadfc4131243aca333491ffa6dcdb3c44b53cb8149d3bf2f3aea2aa49529ea811d4727a11ac1909305e342b858a4c14f923f12956 SHA512 0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac
 DIST sudo-1.8.28p1.tar.gz 3310254 BLAKE2B a1810af7a42d05cce49bb9d0acf6f3731a5193e9e9c3b458691379131eb86d36995854d11c09525e8d999ed1da7e99cf170634667c5a444aa522b8f23db7d1aa SHA512 bda3de34c15fbb68fc29759542295560ccc1562b419d03709cea51613937e9b92ba689c79c3ef4858aeea90d3d1a4dc0148225b11b22cf82395ae1bad8cb1734
 DIST sudo-1.8.29.tar.gz 3338260 BLAKE2B 7ba29d155bfb1d7ba20e32ade2e8ee3919e70400b6c235e313052b247b48406b9a051e71daa7e47fdb0a9fd0889f4c05b8a1a170c027503b90081e8cec81660e SHA512 ea780922b2afb47df4df4b533fb355fd916cb18a6bfd13c7ca36a25b03ef585d805648c6fa85692bea363b1f83664ac3bc622f99bcd149b3a86f70522eb4d340
-EBUILD sudo-1.8.27-r1.ebuild 6605 BLAKE2B a27d6c43fbc7db19d41e566c5f7ea6d1d1a206b78f899f45218897f1823463b85cb3e85dac0ac37f667ec4f6cf22c6d8114635a4d430fab4a2d0e18e58039e6e SHA512 ff13c6e8825d0554977a13a331f7156c1d886202de4646de1385a1d85d69a84ed17c672836dc7993ed768a375bbc798d68032f7ab975396cfff614b3d0f8b73f
+DIST sudo-1.8.30b1.tar.gz 3341783 BLAKE2B fb950277ed66bd83516505cd2eb49b43412d5e95d4afcacf9cde34d685d5d80530deb248c3d421e1fc55343871d80eefdd492489f9bca6c952f81145f4a29746 SHA512 26525d2376fd80796fac146970ca5bbabe170900aca81f7ad71f80828920d27f323fbbf0191b1ba6ef027a53a156c5849aaee21e495b16f2b5188dfedf9746ba
 EBUILD sudo-1.8.28_p1-r2.ebuild 6943 BLAKE2B c4baa7977a7c46094d586fadfdf767c8b19a907f8431bf24ff7ed386bd4dfaaf270f3e9fb2b75d82a863a04ee69930b379b8a13515d25482cb24897bf11b0321 SHA512 aa59c884faa68e2905fdb84e9147fd2ccf1983649552dbaea456f0c529ae1dfe4b6b6aa1775d3c5124b82ebcb93086310ce76c884f2c210d67869a034a4f0bb3
 EBUILD sudo-1.8.29-r2.ebuild 6956 BLAKE2B 4065346eafcaf93f22182bb168b5ed753e65a59f2d5469c48883d19c962bd4754cff648d10bdd404d0ba846f74944670c194ad5740edcaafb605a596d214f664 SHA512 c034ce70c59e5d1bd51b1f9514aa410e372ad987776ec4447b368448770a677b548fd8aec27477f2e0c64ba050617714489f7406977e4cb762b9a14c815affb6
+EBUILD sudo-1.8.30_beta1.ebuild 6876 BLAKE2B 3fa9af915033ac10e6cf54880b64df0dadf7fa30ccf85d34fafa1c9fbc57cc187f7820086f242d90733583c79e82a50f336b9bdb9b21b98e72b2c377f6e550af SHA512 5efb6786e9d56e0b6b6f48fd4d25b24327772ce2b2ee0af366d73d67387f959159a83b66c2421e6a919b088d8143e3396f64423200bdfbb28a38e69043de0c7c
 EBUILD sudo-9999.ebuild 6876 BLAKE2B 3fa9af915033ac10e6cf54880b64df0dadf7fa30ccf85d34fafa1c9fbc57cc187f7820086f242d90733583c79e82a50f336b9bdb9b21b98e72b2c377f6e550af SHA512 5efb6786e9d56e0b6b6f48fd4d25b24327772ce2b2ee0af366d73d67387f959159a83b66c2421e6a919b088d8143e3396f64423200bdfbb28a38e69043de0c7c
 MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6
diff --git a/app-admin/sudo/sudo-1.8.27-r1.ebuild b/app-admin/sudo/sudo-1.8.30_beta1.ebuild
index 238ac099e8d0..fc4f44f8e4fc 100644
--- a/app-admin/sudo/sudo-1.8.27-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.30_beta1.ebuild
@@ -1,29 +1,28 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils pam multilib libtool tmpfiles
-if [[ ${PV} == "9999" ]] ; then
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-	inherit mercurial
-fi
+inherit pam multilib libtool tmpfiles
 
-MY_P=${P/_/}
-MY_P=${MY_P/beta/b}
-
-uri_prefix=
-case ${P} in
-	*_beta*|*_rc*) uri_prefix=beta/ ;;
-esac
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
 
 DESCRIPTION="Allows users or groups to run commands as other users"
 HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} != "9999" ]] ; then
+if [[ ${PV} == "9999" ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	uri_prefix=
+	case ${P} in
+		*_beta*|*_rc*) uri_prefix=beta/ ;;
+	esac
+
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-solaris"
 	fi
 fi
 
@@ -33,11 +32,14 @@ LICENSE="ISC BSD"
 SLOT="0"
 IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest"
 
-CDEPEND="
+DEPEND="
 	sys-libs/zlib:=
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
-		dev-libs/cyrus-sasl
+		sasl? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap[sasl]
+		)
 	)
 	pam? ( sys-libs/pam )
 	sasl? ( dev-libs/cyrus-sasl )
@@ -52,7 +54,7 @@ CDEPEND="
 	)
 "
 RDEPEND="
-	${CDEPEND}
+	${DEPEND}
 	>=app-misc/editor-wrapper-3
 	virtual/editor
 	ldap? ( dev-lang/perl )
@@ -60,8 +62,7 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-sudo )
 	sendmail? ( virtual/mta )
 "
-DEPEND="
-	${CDEPEND}
+BDEPEND="
 	sys-devel/bison
 "
 
@@ -103,7 +104,7 @@ set_secure_path() {
 		local newpath thisp IFS=:
 		for thisp in $1 ; do
 			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:$thisp
+				newpath+=:${thisp}
 			else
 				einfo "   Duplicate entry ${thisp} removed..."
 			fi
@@ -116,8 +117,8 @@ set_secure_path() {
 	rmpath() {
 		local e newpath thisp IFS=:
 		for thisp in ${SECURE_PATH} ; do
-			for e ; do [[ $thisp == $e ]] && continue 2 ; done
-			newpath+=:$thisp
+			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
+			newpath+=:${thisp}
 		done
 		SECURE_PATH=${newpath#:}
 	}
@@ -184,6 +185,14 @@ src_install() {
 		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
 		EOF
 
+		if use sasl ; then
+			cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
+			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+			EOF
+		fi
+
 		insinto /etc
 		doins "${T}"/ldap.conf.sudo
 		fperms 0440 /etc/ldap.conf.sudo
@@ -200,7 +209,9 @@ src_install() {
 
 	# Don't install into /run as that is a tmpfs most of the time
 	# (bug #504854)
-	rm -rf "${ED%/}"/run
+	rm -rf "${ED}"/run
+
+	find "${ED}" -type f -name "*.la" -delete || die #697812
 }
 
 pkg_postinst() {
diff --git a/app-admin/supernova/Manifest b/app-admin/supernova/Manifest
index 14dcbe8ba9b6..de867d28f6be 100644
--- a/app-admin/supernova/Manifest
+++ b/app-admin/supernova/Manifest
@@ -1,3 +1,3 @@
 DIST supernova-2.2.0.tar.gz 24068 BLAKE2B 129c077baf9b415851f3c17eb5a9870ff2d8109a54c424d9039204620b6dd68d8f17183b5c52d863882bd2586ed03b7d1c397f70f337bfba9e9c8255b6feb578 SHA512 436ec13dfaf5ff7cadacc1dedc3545a579784cfce3b0c7925cc0d877ba76a4c865ad3687ae8ae22fdb11d880282dd555f9a9d709c005ad024299a34607fd8063
-EBUILD supernova-2.2.0.ebuild 1250 BLAKE2B d11584d3ce23824667282c76544d25b041142409c01b28145da5f8e71c2e5dda5b7152747654dd459ef5def68359e66f632816cdbb0b756bba5c3f07a32e345d SHA512 dea7ee0c403649b78a1ea4a2a203d9eea60f45203ba33bcb17cec1061ebce50df9f82f4324a8ee7ed1b2dd264960e53a21e00c9cdc7b2a5b83494bedd2d29b38
+EBUILD supernova-2.2.0.ebuild 1277 BLAKE2B 99548d16e291593ae9bf224c691180a5cd48625a0d1f21ab2debd1d076ed43b828c1816cdd7cf78241b646078c7d33a50614f52028fbe0ba2e139334d2720b62 SHA512 3efd410bed4a6bfe85108e4036787a311ad0e912e67d07acc9efeb98b714aae795758d9a39b855cd2c3ae5a9aa704ed807096002fcfd33954d813e16db7c7c57
 MISC metadata.xml 513 BLAKE2B 902b49ed2456d8b8742d17a03370e66a3299b540cf5d6c84b39333d3de8fd849fbae680378b79397bb00faeed0e1e54c9fc160fd710f11888ca442f0dff6a074 SHA512 8253bfed9a47098f43a96906fbd72144005ca7bae46aa3f4e2f3bdc00b95a7dfc5d8b7106a1127cb3a6b3d3ab34748f6560bb38917047074674ed4955f389834
diff --git a/app-admin/supernova/supernova-2.2.0.ebuild b/app-admin/supernova/supernova-2.2.0.ebuild
index b4c0f23b7752..098c36756865 100644
--- a/app-admin/supernova/supernova-2.2.0.ebuild
+++ b/app-admin/supernova/supernova-2.2.0.ebuild
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index 71640e30c0e1..906bfdacfac6 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -9,8 +9,8 @@ DIST supervisor-3.1.4.tar.gz 392321 BLAKE2B 316789fae200f02242a90d3a22a3c6486576
 DIST supervisor-3.3.5.tar.gz 421220 BLAKE2B 63e9db005596921c4a4426de361fc20992a27b67b67ee1256cd64fe6d385909682a5055e4797512410f36f6855592f53c9c5720c54a2dae967578691d05ff3fc SHA512 66c43d40c216e5c3120e083407c848295fa1e59d6d9da916a4bae5c37d4d13208c3bf7c0c8b8a5d570270eb44fac0b1bbcceddb2e84e4f3fc1b6241b43116af7
 DIST supervisor-4.0.3.tar.gz 435960 BLAKE2B 001f556b955311e2453fe1091e46696f3712751e20fad54437fd86c6020e844047ac6cd8983d46a07dd1830e6324d198c84c9d0c8fe301bb5ca568e4c7345d72 SHA512 09de52dca9f71409954fb4782d42099d19892bd82797d2b3dc7100b2693da292fe9822b5144eaf4dcbe295f4e227d62601c8791016e1bcd5c253d99c89f59368
 DIST supervisor-4.0.4.tar.gz 437708 BLAKE2B 211726da07ce31c00da0d6edba57942d78ee5d2757927b22afe569364c29aaf55375d4895b381f06071bc6b6c39a926ca2073e8fcb8e0ea9673a89aafd08b346 SHA512 22a38f759b0584310f5e16acbfc7b0c4cc59f3206fbfaf6295bd40a826d50ad02c8b0093821362c5038dd987a6599879d82dcefe948a2eda702b89e9f92e471e
-EBUILD supervisor-3.1.4.ebuild 1190 BLAKE2B 914c69c7e7d8146273fa3b2dc9445a5fee5f7d52692884a208d1b4cd3b3ac11d902823ebf1f33e2d82aaa0bdf316de85b12d04917cd115d800516733b20fc445 SHA512 be9e9ece37f97cc515679f06ca358e3af4b06039ee9009be02e28c6acecbd157fde107622201e6cea2a5c00221a6ffb078a98611662ab002edc08e3ade26c983
-EBUILD supervisor-3.3.5.ebuild 1955 BLAKE2B 6d44be853df4e29b5595e8d7f73ca77e2df8190ec6387358023692f8cd8f365905d25ec3bc5d256ff166c19b979557cf517d757fa625acceb5f6af9307cda971 SHA512 8a7125fa5c688270afb47f020745318966aef286e9b5c10ba8ca641e63590c6013f984086ff440cc9826db71415734e3018e3d3b5ecc422954d1b477c11ffc7a
-EBUILD supervisor-4.0.3.ebuild 1794 BLAKE2B c67b4e0bd44643a3032df1c59fc447d5bd6508b8216466d93c218a47af8518aefeb0e947759c19e656c418a94cbf11595c4603cec6e6ea9b8418bf86f71e7a26 SHA512 a402fdebf7cc149aca71bbedfb0124e1be7129da1dfe11a104581c0cc59c28ebdb843e664f6895d80ea0751c1fc16d848b9109cb93d55af6af7ca7dc91f2b419
-EBUILD supervisor-4.0.4.ebuild 1866 BLAKE2B cafa95ca8305accb642c7bd5e831a722ed0559921604b0a3f7c4b65cda771967ae01b2510d10cc7465585599b86e2528a29a5de1d4808705b9f2148e23f23a84 SHA512 3509d7a5ec6bbc74e2ef6b21872d28e0d5969152359f61d1c10d1f65cecc0980b24c4073059693372c09ab6844a5d9ab540d9b874a09d9feceaa932d306366e1
+EBUILD supervisor-3.1.4.ebuild 1214 BLAKE2B 1587b1975317464ae5803c79200269478ed991ca9e1615285e542cd816f62688b1f1012cec61045dd7a08ae4bb08c8470cdbe45cb081a4683f122e6ab3cc2e78 SHA512 77b7311ee159ccac840736c4fefb0e1db357ad5a7a23f2afd8f23636d41e69ec9654a6ce1967ee1ca147938a6bcd6aca21cc660edbe7d94963c28ef9b2f866ec
+EBUILD supervisor-3.3.5.ebuild 1982 BLAKE2B 40204a17f5a3ca850d86ea555733b12a3945f716ae889a6d215eb8cee4eaef123a471bd8cb83927392a9eb66068b7e9dbdd0f1e938f50db31649520cb9b1380b SHA512 35bc9633f8470dcb17e414e7051d6a45eb59169136b3f05252e525fcffd75907e62a38bb9b77aab997ab86c14826d91909c3a9a58364a788164f21497886df7b
+EBUILD supervisor-4.0.3.ebuild 1821 BLAKE2B 3bc84c2060d3069683f7f6e841fe2f2eb62442b4e0b3c11281f83caabd1a75821d91a16952b716ab8c5f1875378949408253b434ebe9414bc99a525128a5de16 SHA512 988b6334775f754dbbd74d02dfb0e037fbb43ad67aa6160f3d31fc1a0406f357fc2b70074fe4644389df87effc636f29e4821c436319a573cc1f707e4b585cb5
+EBUILD supervisor-4.0.4.ebuild 1893 BLAKE2B a10927078cdf5d8547885a1747cd6180db2e47fc4b58f3696803c3243942548bd8f60b6d21aa43eba80b9d8b7ddf28720877260d20f336c4b79f93ca7412a470 SHA512 61f6af0946cc283b7bb64aa2244e9e28b87af602c014f41d3f4432b13009db781b973733fcd573bc9187079e5eea6189eb55d48fc4df0eedfd7d8ad58eac8074
 MISC metadata.xml 623 BLAKE2B dc7acae3a83fce87bdaf98f65ba4ac2434e0344faeb8ad302dcba5be3a59f2b6ffa9d85338ad432100d5e1017e40bbeb606724a214097e14bcc7082eb331986a SHA512 f05e62f68c51fe2bab054d03b3a902682eaaa133de08ac558a92736868dcc8049d1f27828e3ecae8f5f64b038bb8a322e58c90401e6fe01d215941e1507076e8
diff --git a/app-admin/supervisor/supervisor-3.1.4.ebuild b/app-admin/supervisor/supervisor-3.1.4.ebuild
index f7356ad7d5c8..7eb4c5a33259 100644
--- a/app-admin/supervisor/supervisor-3.1.4.ebuild
+++ b/app-admin/supervisor/supervisor-3.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -19,6 +19,7 @@ LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 # ALL versions of meld3 match to >=meld3-0.6.5
 RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
diff --git a/app-admin/supervisor/supervisor-3.3.5.ebuild b/app-admin/supervisor/supervisor-3.3.5.ebuild
index 4f3af393c545..3abc9b5b4158 100644
--- a/app-admin/supervisor/supervisor-3.3.5.ebuild
+++ b/app-admin/supervisor/supervisor-3.3.5.ebuild
@@ -19,6 +19,7 @@ LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/meld3[${PYTHON_USEDEP}]
diff --git a/app-admin/supervisor/supervisor-4.0.3.ebuild b/app-admin/supervisor/supervisor-4.0.3.ebuild
index 2437be46ea19..3490eb975f45 100644
--- a/app-admin/supervisor/supervisor-4.0.3.ebuild
+++ b/app-admin/supervisor/supervisor-4.0.3.ebuild
@@ -19,6 +19,7 @@ LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/meld3-1.0.0[${PYTHON_USEDEP}]
diff --git a/app-admin/supervisor/supervisor-4.0.4.ebuild b/app-admin/supervisor/supervisor-4.0.4.ebuild
index bbb3b923c1de..4f4436c3ec1a 100644
--- a/app-admin/supervisor/supervisor-4.0.4.ebuild
+++ b/app-admin/supervisor/supervisor-4.0.4.ebuild
@@ -19,6 +19,7 @@ LICENSE="repoze ZPL BSD HPND GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/meld3-1.0.0[${PYTHON_USEDEP}]
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index b135cec01488..3c0b91fc66ae 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -5,10 +5,18 @@ AUX sysklogd-1.5-build.patch 626 BLAKE2B 03fe37ad2095f88cfa5cf3b79ece26acf4d70f9
 AUX sysklogd-1.5-debian-cron.patch 913 BLAKE2B 20c0fc489b5ed90576f02f400817537ba6a59dd3521de2bacbc97964748792069bbeb1a656e4384ce8edfca320c9f212f4f04f2c4c49374f9cd5b0b59bb30c2f SHA512 5af0a61e5fb8dd78c30fa42d747b4de3a4f68b80b86a2f53447d2277c98d72972c242ffe5649c30a9f08f30e27974fd3bfe4a5537fa1c7b8658312b0550b28e0
 AUX sysklogd-1.5-glibc-2.24.patch 279 BLAKE2B 635ad71844161a13f5c95e670db49c486a856556f10ccd04ea7f4b9cb1252aa9788a2f4e17864d4e0155fd3ca148862a48ce0c4808e389d37f146087088e60be SHA512 35d92a0f1665d38201bdb2f4d4c0e5f17a6086f7a38e489ac4820cdff166419992253fa6c73e321c73e209e4b41a6e2363e19060ef48f18fef8c5ea65ac2664e
 AUX sysklogd-1.5-syslog-func-collision.patch 2273 BLAKE2B 7aa2ccaf4bb1663c7c71f0d9f67c17f39b6c61b4706352bf779eb9a790e2fed8753afeaa4c2234739513500383593ee2f59a87485378fb554589e0e9a77f61ad SHA512 1fc3e215a45d95dd11ca2d1713f9a3f416e82b9d60127da62d904071f02ec1e934aa099a20d09a7c1eea37f9d93dbaa0e0ce8118af9b58b92d781cc26659e5fc
+AUX sysklogd-2.0.3-no_parallel_build.patch 1525 BLAKE2B c428f26bd96afed63b4df50f1cf99954fce78c45f33efff91ad03c22176c1b647669f94de9b0276b2f5460ddab96fdeca7a0925c11f78ee219a45634b716083b SHA512 e1386135e46b28fb9207a36dcd45a3b3dbc5abeedd814a57082ffd03604d70c03bf5ec14ff90698dc085ce55d1cbb2682f11aca652c64bbb755bbff1f55c2c70
 AUX sysklogd.confd 113 BLAKE2B 392d4c0ac09d5dd85d01e4d57cb541271e3c09ce90671d6bfcbecfde64184c94603929bee0fe3ae2d65af2b6283919b8a6517c1e551f870d4c0e25bf1ffad051 SHA512 4553d85e93fb07e7d4a6ed0b47a3ea2044a5605adaac05223724c32a60bb8ae96d99ca95965c3931640beef234e976c1141b83f603aa8c6e8aca1dec20ca807c
+AUX sysklogd.confd2 129 BLAKE2B 1b58336456d16fc93b3141adbe1730901e87ee991cba61b1ebc83542b521c2131afe0005a1a5629f884758ff70dc798279ecb3b456e895e879df4c08fa102043 SHA512 d106937527abc14921b973dbd4a90c90b1ae640f10e6d286c16d5f6ef91205cd3a2f2bf7323afb463e59d00995379123a88d22adf4458c58eb9b2cf4a221f5c4
 AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659427f24a286661c500e6ff92b387f184bba84d0f10669ff9c917d7c8ee613c7fdb3a472434485b5f8c78 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7
 AUX sysklogd.rc7 1447 BLAKE2B 352be79eca7a99213557f29110a53eca85dfbc11e134eac48801b5d61ebca9e77beadbee10c7f86267fe3509e17352468f9f777d25a875d583292a409d5db071 SHA512 f3c8f00fbf65833735d57927fe25c6299103bbc0b8fa548103b4f2f06f0dc2aa2276f12326ff7477f4ba491a96ccd30fe01cc53e841b0ccee83c4dacabb5a94e
+AUX sysklogd.rc8 1666 BLAKE2B 2646e706933318d03471b18f69123c845d125dfcd98eb118a2d5ca8e0bc174edccac63950f56ff4e076dc158b93d0b9bdacedc7419535dbbcce4574fadb381ac SHA512 e2da064c9525bb755dcd31861016bd61b99fc8fdd845c8246fe64792f118c5c2f21656b7a69c9ab459e627b5e443505cfad0449a9b378cc999e53018f221655d
+AUX sysklogd.rc9 1550 BLAKE2B 8bfa8e31e42c4d06b630a79b80031c6e8ad5334bf8353b2217e23dfa69d3a7a11dfed8b614aec6bc22d374e97878bc0339af6094ce3aa9ad4021c35d9261b6fa SHA512 58aafffa09fc5eee28478d86a3a6b568c6c38106b796409b1f4a41edc10389875a4750fe0f34fb165af27cc85143963d51a873603a90fbee5ae7da923ac6c8c9
 DIST sysklogd-1.5.1.tar.gz 90011 BLAKE2B c40bd8d5769f7d3d4141d602c74ac41e05a140743d18c4923d9368da7ba193ccb89a6837173994f0b7a9c290cc23f64513040434d7ab8df81b5d09b73b0263ad SHA512 a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7
+DIST sysklogd-2.0.2.tar.gz 465933 BLAKE2B bc0181e43ca5996cfbf8a8a35d083f332e15f5c83215ec60b406cefc7817bb742d0ce094d6c0d9fe708d345db630a73ce408992d9aade18e5b69414ca4e2b2a6 SHA512 1e5e30162b1091c37801542ae44df3e5d1da09ead02dd74f81e1e35ebb2fea99bab372f00eca621340ca306a41629ccdfb3caa0d46db0fecf46e3030da932473
+DIST sysklogd-2.0.3.tar.gz 466919 BLAKE2B d9ada06dadb5a43ca7102cb24eaffa0494af2743f4714bab7d362cf480835ea9c3fc51ee171e4eb3b90380d63abe78c759bdfc5d946ec4d5bf8fce748cd916b9 SHA512 95ed0465e37b438d624b0a78d74c1194c57d117890492b5773c9ccefa7aa2c1f54ed510e54a29019fb2d7274200370031fe822a9316c154e64a2a01cb912d7a8
 DIST sysklogd_1.5-6.diff.gz 25677 BLAKE2B 3cb1f596490998b6002d4656a2321a500ce9941a37737c0b9d4702bbb87d7bc9ba21b68e06d175e3c1714a701adc6b3312e18a556ebc9ef395d8968762830cb5 SHA512 816961a835a43057569f62fd20d9f7b5e0bfcfcb173b68947457708504db3ce47e635956c8a9564f9bd577d8f3c49dfc725d321dfd3370b2de918363c30f838e
 EBUILD sysklogd-1.5.1-r1.ebuild 1703 BLAKE2B 1b5f75d79a86e05f3b7f71523f794a1bcf4cce6b0242dd8564204edcb886c1c9e7a450f25e00e3899f159643dc9d65da38d8c40fbe25becda0522359485b4347 SHA512 f7355db8d66f1b73b09381aa43f9d7112646229bf2a68facc9cf2a5fdf290f95adbc7bd48203473f7d2a21ba608c23aba267d0a5875c5f6b464bff5d1b2752de
-MISC metadata.xml 378 BLAKE2B b2ff06a70503694dcc5349aebb2d043cb74c10463e137c7bdd9ee6b5c1241e67fab49c201d08858b200a3007bea36e1d0ae1460e569b0b9e6f8281cf39c58c48 SHA512 9d7311cf197ebeec7e989d97d08a35360242ee0aa467e38e1715c6a425e1e279ddd75da8e2856c1238f357741d67bd67d07841425d7dcc3f8f964def8f02d15c
+EBUILD sysklogd-2.0.2.ebuild 1704 BLAKE2B 80878e7f9b5b3f4b83bc4cc81140592dee743d5224fe39e5a5801726b5b8a78885b29deabdb2db73ecf4c88525aa6f9c1a4f7d4a4e1c34d16a3ad25fc24cf327 SHA512 0a35aee84334b06d152601c3fdeb7ac175686a37be4475d88b5cfbea38d6f299569d2004dbf4ee8f67156b7b31414964214364a3ee524e497aafa48d632f6c07
+EBUILD sysklogd-2.0.3.ebuild 1820 BLAKE2B af54756110e0528f3c5f59e1e9fd7ab890f305903649a22a4d3c37bd6b90e0a9eb93c5f4319c232bcf2726891a38b800478dcb8d3a585f55ec0308b72dc14c35 SHA512 c1c8f47062fcf0adfbde35a7d711744f5fcec56d922b057cc56dd6ec404e327643db70df3d4d1d7fc3ca630ecf27ba96a0d2fc08f6766429b7b05eefe3f63bce
+MISC metadata.xml 513 BLAKE2B dbb65f1982fba7751a6c64809adcbe4d44ee4313693b9999dbd8d4e6596325fcbea9d8eef294821967f5ccef4f3f5da32510474dbfcc0d29743d42237e1efa85 SHA512 76e47e89a7eef4aa7156145447003085cea5670881e2228c2b8baad238a4bb1b0efe95c3829656119d9f6d291fd49ca0b424f66d17e8989ec71f39355c504218
diff --git a/app-admin/sysklogd/files/sysklogd-2.0.3-no_parallel_build.patch b/app-admin/sysklogd/files/sysklogd-2.0.3-no_parallel_build.patch
new file mode 100644
index 000000000000..fa0f96ce2c81
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd-2.0.3-no_parallel_build.patch
@@ -0,0 +1,40 @@
+From 9cf1f97cef04fed81c2407f7207795d7592ccb96 Mon Sep 17 00:00:00 2001
+From: Joachim Nilsson <troglobit@gmail.com>
+Date: Fri, 6 Dec 2019 18:19:05 +0100
+Subject: [PATCH] Fix nasty parallel build problem reported by Gentoo and
+ Westermo
+
+Independently of each other both the Gentoo project and Westermo found
+an issue with massively parallel builds on monster-core-machines.  At
+Westermo there are 40 core Xeon monsters that stumble when building
+sysklogd.
+
+The Gentoo bug report is here:
+
+    https://bugs.gentoo.org/701894
+
+The problem stems from strlcat.c and strlcpy.c being used for both
+the libcompat convenience library built for libsyslog and als for
+syslogd when the system does not have either of the APIs in libc,
+i.e. most Linux systems with GLIBC or musl libc.
+
+I can either rewrite the Makefile.am files to handle dependencies
+better, or we just disable parallel build like this patch. There's
+too few source files to gain anything from parallel build anyway.
+
+Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
+---
+ Makefile.am | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index c4cc80f..7e2b854 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -46,3 +46,6 @@ release: distcheck
+ # Workaround for systemd unit file duing distcheck
+ DISTCHECK_CONFIGURE_FLAGS = --with-systemd=$$dc_install_base/$(systemd) --with-klogd
+ 
++# Disable parallel build in top Makefile, we might otherwise get a very
++# bizarre build problem with strlcpy.o in libcompat and for syslogd.
++.NOTPARALLEL:
diff --git a/app-admin/sysklogd/files/sysklogd.confd2 b/app-admin/sysklogd/files/sysklogd.confd2
new file mode 100644
index 000000000000..077f36bf6b64
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.confd2
@@ -0,0 +1,6 @@
+# Config file for /etc/init.d/sysklogd
+
+SYSLOGD="-m 0 -s -s -r 10M:10"
+# send warnings and above to the console
+KLOGD="-c 3 -2"
+
diff --git a/app-admin/sysklogd/files/sysklogd.rc8 b/app-admin/sysklogd/files/sysklogd.rc8
new file mode 100644
index 000000000000..920ab9633264
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.rc8
@@ -0,0 +1,94 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_started_commands="reload"
+
+depend() {
+	need clock hostname
+	provide logger
+}
+
+has_klogd() {
+	[ -x "/usr/sbin/klogd" ]
+}
+
+start_daemon() {
+	local retval=0
+	local daemon="$1"
+	local options="$2"
+	local fg_opt=""
+
+	case "${daemon}" in
+		syslogd)
+			fg_opt="-F"
+		;;
+		klogd)
+			fgopt="-n"
+		;;
+		*)
+			return 1
+		;;
+	esac
+
+	ebegin "sysklogd -> start: ${daemon}"
+	start-stop-daemon --start --exec /usr/sbin/"${daemon}" \
+		-b -m --pidfile /var/run/"${daemon}".pid \
+		-- ${options} ${fg_opt}
+	retval=$?
+	eend ${retval} "Failed to start ${daemon}"
+
+	return ${retval}
+}
+
+stop_daemon() {
+	local retval=0
+	local daemon="$1"
+
+	[ -z "${daemon}" ] && return 1
+	
+	ebegin "sysklogd -> stop: ${daemon}"
+	# syslogd can be stubborn some times (--retry 15)...
+	start-stop-daemon --stop --retry 15 --quiet --pidfile /var/run/"${daemon}".pid
+	retval=$?
+	eend ${retval} "Failed to stop ${daemon}"
+
+	return ${retval}
+}
+
+start() {
+	start_daemon "syslogd" "${SYSLOGD}" || return 1
+
+	# klogd do not always start proper if started too early
+	sleep 1
+
+	if has_klogd && ! start_daemon "klogd" "${KLOGD}" ; then
+		stop_daemon "syslogd"
+		return 1
+	fi
+
+	return 0
+}
+
+stop() {
+	if has_klogd ; then
+		stop_daemon "klogd" || return 1
+	fi
+	stop_daemon "syslogd" || return 1 
+	return 0
+}
+
+reload() {
+	local ret=0
+
+	ebegin "Reloading configuration"
+
+	start-stop-daemon --signal HUP --pidfile /var/run/syslogd.pid
+	ret=$((${ret} + $?))
+	if has_klogd ; then
+		start-stop-daemon --signal USR1 --pidfile /var/run/klogd.pid
+		ret=$((${ret} + $?))
+	fi
+
+	eend ${ret}
+}
diff --git a/app-admin/sysklogd/files/sysklogd.rc9 b/app-admin/sysklogd/files/sysklogd.rc9
new file mode 100644
index 000000000000..b0479f1c1754
--- /dev/null
+++ b/app-admin/sysklogd/files/sysklogd.rc9
@@ -0,0 +1,82 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+extra_started_commands="reload"
+
+depend() {
+	need clock hostname
+	provide logger
+}
+
+has_klogd() {
+	[ -x "/usr/sbin/klogd" ]
+}
+
+start_daemon() {
+	local retval=0
+	local daemon="$1"
+	local options="$2"
+	local fg_opt=""
+
+	ebegin "sysklogd -> start: ${daemon}"
+	start-stop-daemon --start --exec /usr/sbin/"${daemon}" \
+		-b -m --pidfile /var/run/"${daemon}".pid \
+		-- -F ${options}
+	retval=$?
+	eend ${retval} "Failed to start ${daemon}"
+
+	return ${retval}
+}
+
+stop_daemon() {
+	local retval=0
+	local daemon="$1"
+
+	[ -z "${daemon}" ] && return 1
+	
+	ebegin "sysklogd -> stop: ${daemon}"
+	# syslogd can be stubborn some times (--retry 15)...
+	start-stop-daemon --stop --retry 15 --quiet --pidfile /var/run/"${daemon}".pid
+	retval=$?
+	eend ${retval} "Failed to stop ${daemon}"
+
+	return ${retval}
+}
+
+start() {
+	start_daemon "syslogd" "${SYSLOGD}" || return 1
+
+	# klogd do not always start proper if started too early
+	sleep 1
+
+	if has_klogd && ! start_daemon "klogd" "${KLOGD}" ; then
+		stop_daemon "syslogd"
+		return 1
+	fi
+
+	return 0
+}
+
+stop() {
+	if has_klogd ; then
+		stop_daemon "klogd" || return 1
+	fi
+	stop_daemon "syslogd" || return 1 
+	return 0
+}
+
+reload() {
+	local ret=0
+
+	ebegin "Reloading configuration"
+
+	start-stop-daemon --signal HUP --pidfile /var/run/syslogd.pid
+	ret=$((${ret} + $?))
+	if has_klogd ; then
+		start-stop-daemon --signal USR1 --pidfile /var/run/klogd.pid
+		ret=$((${ret} + $?))
+	fi
+
+	eend ${ret}
+}
diff --git a/app-admin/sysklogd/metadata.xml b/app-admin/sysklogd/metadata.xml
index 094ccd37b3fd..be89c65a5ee9 100644
--- a/app-admin/sysklogd/metadata.xml
+++ b/app-admin/sysklogd/metadata.xml
@@ -6,6 +6,8 @@
 		<name>Gentoo Base System</name>
 	</maintainer>
 	<use>
+		<flag name="klogd">Build and install (deprecated) kernel logging daemon</flag>
+		<flag name="logger">Build the logger program</flag>
 		<flag name="logrotate">use app-admin/logrotate for rotating logs rather than custom cron scripts</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-admin/sysklogd/sysklogd-2.0.2.ebuild b/app-admin/sysklogd/sysklogd-2.0.2.ebuild
new file mode 100644
index 000000000000..e9298b83532c
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-2.0.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
+SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="klogd logger logrotate systemd"
+RESTRICT="test"
+
+DEPEND="
+	logger? (
+		!<sys-apps/util-linux-2.34-r3
+		!>=sys-apps/util-linux-2.34-r3[logger]
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog.md README.md )
+
+pkg_setup() {
+	append-lfs-flags
+	tc-export CC
+}
+
+src_configure() {
+	local myeconfargs=(
+		--runstatedir="${EPREFIX}"/run
+		$(use_with klogd)
+		$(use_with logger)
+		$(use_with systemd systemd $(systemd_get_systemunitdir))
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins syslog.conf
+	keepdir /etc/syslog.d
+
+	newinitd "${FILESDIR}"/sysklogd.rc8 sysklogd
+	newconfd "${FILESDIR}"/sysklogd.confd2 sysklogd
+
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
+		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
+	fi
+
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_postinst() {
+	if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
+		elog "Starting with version 2.0 syslogd has built in log rotation"
+		elog "functionality that does no longer require a running cron daemon."
+		elog "So we no longer install any log rotation cron files for sysklogd."
+	fi
+}
diff --git a/app-admin/sysklogd/sysklogd-2.0.3.ebuild b/app-admin/sysklogd/sysklogd-2.0.3.ebuild
new file mode 100644
index 000000000000..be89e5f845c6
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-2.0.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
+SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="klogd logger logrotate systemd"
+RESTRICT="test"
+
+DEPEND="
+	logger? (
+		!<sys-apps/util-linux-2.34-r3
+		!>=sys-apps/util-linux-2.34-r3[logger]
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no_parallel_build.patch #701894
+)
+
+pkg_setup() {
+	append-lfs-flags
+	tc-export CC
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--runstatedir="${EPREFIX}"/run
+		$(use_with klogd)
+		$(use_with logger)
+		$(use_with systemd systemd $(systemd_get_systemunitdir))
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins syslog.conf
+	keepdir /etc/syslog.d
+
+	newinitd "${FILESDIR}"/sysklogd.rc9 sysklogd
+	newconfd "${FILESDIR}"/sysklogd.confd2 sysklogd
+
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
+		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
+	fi
+
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_postinst() {
+	if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
+		elog "Starting with version 2.0 syslogd has built in log rotation"
+		elog "functionality that does no longer require a running cron daemon."
+		elog "So we no longer install any log rotation cron files for sysklogd."
+	fi
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 752600412bcb..382c7e53e49a 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -10,5 +10,5 @@ AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a0
 DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B e4f7e47f1939fb07d204c4721ff558a606cf6c6ee072278ff7c9bc1db7406e6abf058ac8a96bd4df0b867272bdbc5401528d47c94e60d90ff5ebb1aaec49e223 SHA512 4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f
 DIST syslog-ng-3.24.1.tar.gz 4909513 BLAKE2B 4b8d05899f9767784b6d24008d55808bee0af4a29883b2cb67031d23f4937632ba00f2ed7a9e969984ebec2785243a9e60811c4c2ccb3c6188c66a71af004f36 SHA512 b5326193e20db16763d3e187292bf683ebb77032b800a6e54a4ce2dd3864dda48b3d0ffc4d442eff0261117ac7a76d7927f4c8d0d96fc59ce29b46da6bd052d5
 EBUILD syslog-ng-3.22.1.ebuild 4950 BLAKE2B 8f357d97832fa2b34281ca0db58afbd648d33d9cb9de955edfe6f22fa442bd0a1a9661ea398ed2d7d964de416d73d338ca8237d881348f9e5a6438454a11c504 SHA512 8c91d2a427f451eb6fead571a9101615faf2f8aa29c0938fe491662ddda4e073efd2efb029fb1b56abb56985e2defb2e56b9ef16c46f77a38c06197668c90890
-EBUILD syslog-ng-3.24.1.ebuild 4897 BLAKE2B 779e2c58e303606079e830fa123bfab8e5efc1729ff48e9086b82efe996360978590db4117b61b08bb264080e8f5d9959b68c4d9fd4cc399d3f7dc4fc210611c SHA512 d2c3c294cd7195b7c290230080669b0b56686c51f577a09d4e7e75ffce12bcfa77894f6eab862b49725e41880a00f357423c92b19d35e82b926e4ed827d00e67
+EBUILD syslog-ng-3.24.1.ebuild 4899 BLAKE2B 00de8e10a135a8daab3870d741e7265668eb954145e8cd36d5aba37e6e8d92e4ad6fded9e960ace454c6da781ca110511dbf4d4fb4cc6f0a8fa5e3ca7c5cd8e4 SHA512 e2ff6e772e1a37184193b4ff9f2ec432bcd5b3780f505f7fc482d876f4e726206694daf30cbb1414d4ee93f443c490adc5b9748b8a1dfdd761e8f43ca6e52bac
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
index f3b04f13b93f..80737a7e69b0 100644
--- a/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.24.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 324106cb80dd..53a5ed316e4b 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,5 +1,8 @@
+AUX system-config-printer-1.5.12-check-for-null.patch 2048 BLAKE2B e6a87f6ae92cd29f3fa4900be4df2bcfb54892a87346a24baabe8fa4ea779d69a259bab7f25f7121d90b7599c15721044fe530b80654160501631857b332d705 SHA512 4a640793f89b637620c12d99ddc53b7ed87ba5cfc19bf90a3c8f7c2938bb17deba540bfe4312556fe253be52f087340d6b2a794c305c78443515a4f6c1eceace
+AUX system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch 2206 BLAKE2B 82195b83923cf84bd33ea141f0e7443d16b3540845fe867251f77e53324b255a076ad7d14f4e29690ef139fd1a53f832968927d03e8885648d377ab466305667 SHA512 d093a81ec6d92f242b18d5f5bc1fb96d36797fe85dfd2a7c7edf99138a3bf392543a350fde4e051e97d7640cb14323a7754029d4a082adde3d7f2d89f1262a1f
 DIST system-config-printer-1.5.11-patchset-01.tar.xz 6948 BLAKE2B effe29c51cbe74fc72566df65f10ab845c9dc1f40ca2966c40be87e19f98046f34311c24b7bc77f471b840e35b0c8eb7754a7c5464d50335c8ab2e2ed0e79afd SHA512 2501bda0e75ea51cc8e14df6b3746a0ea51618919ef35ace849efeded0cddc49e6e3793142d1cd128ce3ce62c21661d5fdb85b19718df07b87a20f5fc641885b
 DIST system-config-printer-1.5.11.tar.xz 949816 BLAKE2B 96b41d64e0aa3494b7fc7ed15ac926d833a046ba2880b36b6f5dd4e7508e2bc1fac4cb52c9940c13cec6e34cb8972fbc11fcd5a7df510296444ca08a23f4cb2b SHA512 cc0a6faec0022092e64de3d7ab28669039c93853c6931d26c264f0035486e09ad0af784833e88ee8e3dc1b6f5be9dcf84144a2a6464dfa9711172966fa6a22b4
-EBUILD system-config-printer-1.5.11-r1.ebuild 2384 BLAKE2B 2f0904200c9d0fdbe5451be4e5c89b1dcaf6e35b36d5d0db12a2333dc3e28e65974b20515bb416cb6b3d7835db078b2d959caac3af57a02e711c9f5e3d089910 SHA512 5e9ae2a8bc648f4daf019c646003785bd45bf108913b55323d46dbb01ed0bb830ca74665725916bb26ea08ea368b211ffa2d707489055e13803a1aa9ed197add
-EBUILD system-config-printer-1.5.11-r2.ebuild 2391 BLAKE2B a9ae83182a784c3ad131ab3445a75a5a334a68d95ef78caac0a52be8bd548ef5772adba59161e2c9df1c770c6293f0f58e0474b18e5c51480cecea4d2b5a88e9 SHA512 ce543d1b878d214133efb5452fbd74c53471b562647834e33b108fb81f899022ceb44aa63809c7bc6e9073ce313818173a7c635ff3a5176441f3a3c864231824
+DIST system-config-printer-1.5.12.tar.xz 955756 BLAKE2B 766cc7307382a7b0ab65387650f1568fd5108dae2693dfc93684c6593e28837d513e4c823bf4e07c3ba2123eea8aba0649135020318f06f38633b9837683d7f7 SHA512 c8b0702dcdf99c4e8a19274dd4a3f82d9263bd5f51d0c19edf7d71fb13095f57a35e643ddbe161ffb5805e72bf7da0cb6a3de44a554854390ac05d8e56644c32
+EBUILD system-config-printer-1.5.11-r2.ebuild 2386 BLAKE2B 0795c7ffe9cfa37c599066d487c83c93ad87e9ec57c7abb46adaad777867a5551cb49187ec301bae117c84bc1e2daa9e6b675e3968fb1575c4258db21205e6b0 SHA512 f9c6d857b69223f39f49d6004950237e12f08aa471330150333b0fbd053ed9ae0d2d9ae4c8b2ef702521ca524df04eddae69c59e5a6905559d78ee8757546e61
+EBUILD system-config-printer-1.5.12.ebuild 2099 BLAKE2B 240ef800834f33113bce3762decaf4bd78914f8ea22fe966c75e2bef987156266cf547e450899042f69dbfc6fcf11e563ce4bdb2bd1b3047453da6a9cb9e4df3 SHA512 6665bd581070d6ec88e137d38afe2ad342d7fe312627e99f5fbb1cd4a8ef9fabda003edc7c500793a0df76935e0a812f77c9d6a9bfc7283eecf7aa8c729b210a
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/files/system-config-printer-1.5.12-check-for-null.patch b/app-admin/system-config-printer/files/system-config-printer-1.5.12-check-for-null.patch
new file mode 100644
index 000000000000..1c03bbd193fc
--- /dev/null
+++ b/app-admin/system-config-printer/files/system-config-printer-1.5.12-check-for-null.patch
@@ -0,0 +1,58 @@
+From cf9903466c1a2d18a701f3b5e8c7e03483e1244d Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Mon, 14 Oct 2019 16:39:28 +0200
+Subject: [PATCH] udev-configure-printer: Add checks for NULL
+
+---
+ NEWS                          |  1 +
+ udev/udev-configure-printer.c | 12 +++++++++---
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index f4b774e5c..0b53aa8ef 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,5 +1,6 @@
+ 1.5.13 changes
+ --------------
++- add checks for NULL in udev-configure-printer (Fedora #1761097)
+ 
+ 1.5.12 changes
+ --------------
+diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
+index 83092fc21..d753bbeaf 100644
+--- a/udev/udev-configure-printer.c
++++ b/udev/udev-configure-printer.c
+@@ -1411,7 +1411,7 @@ for_each_matching_queue (struct device_uris *device_uris,
+       const char *printer_state_message = NULL;
+       int state = 0;
+       size_t i, l;
+-      char *this_device_uri_n, *device_uri_n;
++      char *this_device_uri_n = NULL, *device_uri_n = NULL;
+       const char *ps1, *ps2, *pi1, *pi2;
+ 
+       while (attr && ippGetGroupTag (attr) != IPP_TAG_PRINTER)
+@@ -1448,6 +1448,8 @@ for_each_matching_queue (struct device_uris *device_uris,
+       for (i = 0; i < device_uris->n_uris; i++)
+ 	{
+ 	  device_uri_n = normalize_device_uri(device_uris->uri[i]);
++          if (this_device_uri_n == NULL || device_uri_n == NULL)
++            goto skip;
+ 	  /* As for the same device different URIs can come out when the
+ 	     device is accessed via the usblp kernel module or via low-
+ 	     level USB (libusb) we cannot simply compare URIs, must
+@@ -1512,8 +1514,12 @@ for_each_matching_queue (struct device_uris *device_uris,
+       firstqueue = 0;
+ 
+     skip:
+-      free(device_uri_n);
+-      free(this_device_uri_n);
++      if (device_uri_n != NULL)
++        free(device_uri_n);
++        device_uri_n = NULL;
++      if (this_device_uri_n != NULL)
++        free(this_device_uri_n);
++        this_device_uri_n = NULL;
+       if (!attr)
+ 	break;
+     }
diff --git a/app-admin/system-config-printer/files/system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch b/app-admin/system-config-printer/files/system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch
new file mode 100644
index 000000000000..7aed67584f70
--- /dev/null
+++ b/app-admin/system-config-printer/files/system-config-printer-1.5.12-fix-abrt-in-udev-configure-printer.patch
@@ -0,0 +1,72 @@
+From b9289dfe105bdb502f183f0afe7a115ecae5f2af Mon Sep 17 00:00:00 2001
+From: Zdenek Dohnal <zdohnal@redhat.com>
+Date: Fri, 1 Nov 2019 15:55:34 +0100
+Subject: [PATCH] Fix abrt in udev-configure-printer
+
+The abrt was due invalid free - several printer models have its normalized uri cropped.
+The original pointer from strdup() was lost so its freeing was invalid.
+---
+ udev/udev-configure-printer.c | 21 ++++++++++++++-------
+ 1 file changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/udev/udev-configure-printer.c b/udev/udev-configure-printer.c
+index d753bbeaf..a44520f9c 100644
+--- a/udev/udev-configure-printer.c
++++ b/udev/udev-configure-printer.c
+@@ -1285,7 +1285,8 @@ normalize_device_uri(const char *str_orig)
+ {
+   int i, j;
+   int havespace = 0;
+-  char *str;
++  char *str = NULL;
++  char *cropped_str = NULL;
+ 
+   if (str_orig == NULL)
+     return NULL;
+@@ -1333,7 +1334,11 @@ normalize_device_uri(const char *str_orig)
+ 	 (strstr(str, "packard ") == str) ||
+ 	 (strstr(str, "apollo ") == str) ||
+ 	 (strstr(str, "usb ") == str))
+-    str = strchr(str, ' ') + 1;
++  {
++    cropped_str = strdup(strchr(str, ' ') + 1);
++    free(str);
++    str = cropped_str;
++  }
+ 
+   return str;
+ }
+@@ -1448,8 +1453,6 @@ for_each_matching_queue (struct device_uris *device_uris,
+       for (i = 0; i < device_uris->n_uris; i++)
+ 	{
+ 	  device_uri_n = normalize_device_uri(device_uris->uri[i]);
+-          if (this_device_uri_n == NULL || device_uri_n == NULL)
+-            goto skip;
+ 	  /* As for the same device different URIs can come out when the
+ 	     device is accessed via the usblp kernel module or via low-
+ 	     level USB (libusb) we cannot simply compare URIs, must
+@@ -1509,17 +1512,21 @@ for_each_matching_queue (struct device_uris *device_uris,
+ 		  break;
+ 		}
+ 	    }
++          if (device_uri_n != NULL)
++          {
++            free(device_uri_n);
++            device_uri_n = NULL;
++          }
+ 	}
+ 
+       firstqueue = 0;
+ 
+     skip:
+-      if (device_uri_n != NULL)
+-        free(device_uri_n);
+-        device_uri_n = NULL;
+       if (this_device_uri_n != NULL)
++      {
+         free(this_device_uri_n);
+         this_device_uri_n = NULL;
++      }
+       if (!attr)
+ 	break;
+     }
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
index 3138fdc7de8c..506b95217fad 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.11-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/zdohnal/${PN}/releases/download/${PV}/${P}.tar.xz
 	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-01.tar.xz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86"
 SLOT="0"
 
 IUSE="doc gnome-keyring policykit"
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.11-r1.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.12.ebuild
index c1bd77fd2c90..f4c8f7a381cf 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.11-r1.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.12.ebuild
@@ -3,19 +3,17 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE="xml"
 inherit gnome2 python-single-r1 systemd
 
 DESCRIPTION="Graphical user interface for CUPS administration"
-HOMEPAGE="https://github.com/zdohnal/system-config-printer"
-SRC_URI="https://github.com/zdohnal/${PN}/releases/download/${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-01.tar.xz"
+HOMEPAGE="https://github.com/OpenPrinting/system-config-printer"
+SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 SLOT="0"
-
 IUSE="doc gnome-keyring policykit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -56,15 +54,8 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${WORKDIR}"/${P}-auth-dialog.patch
-	"${WORKDIR}"/${P}-libsecret-optional-{1,2}.patch
-	"${WORKDIR}"/${P}-scp-dbus-service-{1,2}.patch
-	"${WORKDIR}"/${P}-typo.patch
-	"${WORKDIR}"/${P}-appdata.patch
-	"${WORKDIR}"/${P}-empty-LC_MESSAGES.patch
-	"${WORKDIR}"/${P}-fdopen-utf8.patch
-	"${WORKDIR}"/${P}-typeerror.patch
-	"${WORKDIR}"/${P}-debugprint-typo.patch
+	"${FILESDIR}"/${P}-check-for-null.patch
+	"${FILESDIR}"/${P}-fix-abrt-in-udev-configure-printer.patch
 )
 
 pkg_setup() {
@@ -88,4 +79,5 @@ src_install() {
 	use doc && local HTML_DOCS=( html/. )
 	gnome2_src_install
 	python_fix_shebang "${ED}"
+	python_optimize
 }
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 9e7a6464a8d7..9d6531cfc6b8 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -1,7 +1,13 @@
 DIST terraform-0.11.13.tar.gz 10906645 BLAKE2B dafdc1acddd4ea97b41cc5899a541701731fce7b13b914c0859fe148b10b5c8ac877d71b665e8d80a65f376bb09fb8ae6fd0e0263ff711a156ca48119522f89d SHA512 1c16f20d1a65c763f1091ff2d20e0752e62903e07a12d41dd722e5c4c989f477da7d64901336d7536ed1693d5c82f4548ae5a643edae85b4e83325fc8c81b245
 DIST terraform-0.12.11.tar.gz 10338506 BLAKE2B 62c33591d55345e8c3b9c61b6f9279a81f1df86f5942cee787e4b525eefdf7834f0e4a6a42835b4ae038591fd467941454be674a3c1c8b329ef52c7d5e39359b SHA512 2b9fc6157aea8e7159d7089135620433d75843f2b3dd48af18ecb7837a5ca3ea72d9dfb8b36a25a65f9b9cc29b11bc7910f124a359a6589bfb941a714e0b7b23
 DIST terraform-0.12.12.tar.gz 10441883 BLAKE2B c30366c46bc77b7b5c1a44766ce891db01a139e1fa9f936962341d2b9230f85c9137ffc3236e6baad5aad5bada845fd0327846ebfb0c93037ae7c9c46fd70f13 SHA512 58e15da1cc5345e7780573bfeda4a6f34dc281682a0e3f7bf6b129d0db42ff343b79575bb06472e1c994f8d3e3d7e3ab507a4a09f1cfd166690a611af221bd8e
+DIST terraform-0.12.15.tar.gz 10432372 BLAKE2B 9d8d70cf88ef56dbe891be266353fe2eb89b51740e22264f46e0b20785bbb8b6752e2465b02dba79bd9a30a6d0914ddfc7e9b7000f38fcbeb01580d1ac52eec3 SHA512 a63b0acd81e814b679a479ead8afe023d5fca0a925eef6b7ccbfa1916554e47a383dbe73f97d036c0c8ebe3e2289c9001ce24c50eef4e5d5eab3ca48d766150b
+DIST terraform-0.12.16.tar.gz 10435715 BLAKE2B 1f2f221130ebe8df45cdde5fece7773af16b4dfc0a1a336109c9ea3eafcc5f8382069e60b7efe702b9683ab3ed586e1c1fbdbd1582423642485274490df01255 SHA512 8f499843f53a27587b08beb25973fccd08ee84191a53407ee3aa2e9aad483e597791665485a7ed6d7c94f96b611956e83fd610e603a2e8e7732eaa78d3920ed5
+DIST terraform-0.12.17.tar.gz 10508005 BLAKE2B facef6de57333586445ce8839c03ccd633fe9ac68619e384b71fff921afeaf260e01b8783d61e4cc04882aa644e8eb706b08c88216f093d85e0fd081363c4103 SHA512 6311fdbf6764e585126a1e177dc498634a799ba1a68ba98682e2be29d14b40c09d0a780555f10bbde0587445d31a1e0d9810226f9e6bd3fcb248428ceb864c87
 EBUILD terraform-0.11.13.ebuild 876 BLAKE2B 5b62cb3e2ffffc599f1da2c7fe0a083f944b95a86e617bf7fefda8fecb0f7a92936990c3fff78f219c0e2b31a9264067e7b6c2ee6e4e38f0e5700af392e5e415 SHA512 f94d55f7c68710d082c8afadfe5a75a7daff664588becfeddeb3055b6e5e316ce35bb46dfe278e342922e95fb5d1ce89a13c286c4b03f2511db9ea49e1d4e253
 EBUILD terraform-0.12.11.ebuild 836 BLAKE2B bf02adfb19a15f2a4b12409226d8584e648f98dd46b062d3a24f6e710c99c53fa137004288ba61da51b2783658b21161ccc8ac9e5502b1b31bca9e272bf81e5f SHA512 cd9e8d65da3da000cbb02ba39c885ca95a412ac672c2c568e5767a1718e1d49f8dcbb43c442d5167bf0a0f5e914ca0c93fae69c9803dee8ff97e2cbfe2f45743
 EBUILD terraform-0.12.12.ebuild 836 BLAKE2B bf02adfb19a15f2a4b12409226d8584e648f98dd46b062d3a24f6e710c99c53fa137004288ba61da51b2783658b21161ccc8ac9e5502b1b31bca9e272bf81e5f SHA512 cd9e8d65da3da000cbb02ba39c885ca95a412ac672c2c568e5767a1718e1d49f8dcbb43c442d5167bf0a0f5e914ca0c93fae69c9803dee8ff97e2cbfe2f45743
+EBUILD terraform-0.12.15.ebuild 1107 BLAKE2B e704685d71d44b56a78e3519c6ac0fea8f100f4059cb28c13a8738458aa9f968c286470ae89a40f627c1a475e2d314e8be8f78023c4fce6c873e65fcbf545c2d SHA512 6b2be84260ab7f4424d3d805a9dac363a5d5ade6c861c825f8f5de3549a35a275478c4b4b22ec5efdb0be633fd9ebf1fd262c2f238f55f54cfd275bf7da71926
+EBUILD terraform-0.12.16.ebuild 1107 BLAKE2B e704685d71d44b56a78e3519c6ac0fea8f100f4059cb28c13a8738458aa9f968c286470ae89a40f627c1a475e2d314e8be8f78023c4fce6c873e65fcbf545c2d SHA512 6b2be84260ab7f4424d3d805a9dac363a5d5ade6c861c825f8f5de3549a35a275478c4b4b22ec5efdb0be633fd9ebf1fd262c2f238f55f54cfd275bf7da71926
+EBUILD terraform-0.12.17.ebuild 1107 BLAKE2B e704685d71d44b56a78e3519c6ac0fea8f100f4059cb28c13a8738458aa9f968c286470ae89a40f627c1a475e2d314e8be8f78023c4fce6c873e65fcbf545c2d SHA512 6b2be84260ab7f4424d3d805a9dac363a5d5ade6c861c825f8f5de3549a35a275478c4b4b22ec5efdb0be633fd9ebf1fd262c2f238f55f54cfd275bf7da71926
 MISC metadata.xml 1185 BLAKE2B 4e3e36b75d012f5a48886bc4cbce9f2f597b15060cf5298036690e3832e909ac6e08a729b477de9b893a38ea8cb634c8abefeb5776a14a790f5b4d8a7b86bc38 SHA512 8f52d688db4c37ddbdbca03c5a2f8fc49fa9a0765902e34559408f5f14230c12bc2b160768d3c9cbc978a0ee01e5f3c8a50aef00786a96f42725db54cb845d03
diff --git a/app-admin/terraform/terraform-0.12.15.ebuild b/app-admin/terraform/terraform-0.12.15.ebuild
new file mode 100644
index 000000000000..6183146d4a09
--- /dev/null
+++ b/app-admin/terraform/terraform-0.12.15.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-base go-module
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+
+EGO_PN="github.com/hashicorp/${PN}"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_prepare() {
+	default
+	# the sed command is necessary to generate tests outside of the
+	# default git root of `terraform', in our case the working dir
+	# is `work/$PN-$PV'
+	# sed -i -e "s/!=\s\+\"terraform\"/!=\ \"${P}\"/" \
+	# 	./scripts/generate-plugins.go || die
+}
+
+src_compile() {
+	GOCACHE="${T}/go-cache" go build \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/terraform
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
diff --git a/app-admin/terraform/terraform-0.12.16.ebuild b/app-admin/terraform/terraform-0.12.16.ebuild
new file mode 100644
index 000000000000..6183146d4a09
--- /dev/null
+++ b/app-admin/terraform/terraform-0.12.16.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-base go-module
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+
+EGO_PN="github.com/hashicorp/${PN}"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_prepare() {
+	default
+	# the sed command is necessary to generate tests outside of the
+	# default git root of `terraform', in our case the working dir
+	# is `work/$PN-$PV'
+	# sed -i -e "s/!=\s\+\"terraform\"/!=\ \"${P}\"/" \
+	# 	./scripts/generate-plugins.go || die
+}
+
+src_compile() {
+	GOCACHE="${T}/go-cache" go build \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/terraform
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
diff --git a/app-admin/terraform/terraform-0.12.17.ebuild b/app-admin/terraform/terraform-0.12.17.ebuild
new file mode 100644
index 000000000000..6183146d4a09
--- /dev/null
+++ b/app-admin/terraform/terraform-0.12.17.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-base go-module
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+
+EGO_PN="github.com/hashicorp/${PN}"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_prepare() {
+	default
+	# the sed command is necessary to generate tests outside of the
+	# default git root of `terraform', in our case the working dir
+	# is `work/$PN-$PV'
+	# sed -i -e "s/!=\s\+\"terraform\"/!=\ \"${P}\"/" \
+	# 	./scripts/generate-plugins.go || die
+}
+
+src_compile() {
+	GOCACHE="${T}/go-cache" go build \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/terraform
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 01e273375b6c..959978fe8311 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -7,6 +7,9 @@ DIST vault-1.2.3-webui.tar.xz 1916848 BLAKE2B 503425336fac45645b837380dcf94be4bd
 DIST vault-1.2.3.tar.gz 27773681 BLAKE2B 862b386c96e7d284c5b82a89dca5a0a8668a900a5b32758a472b5d7ea4ed995dce608dfda0398bcf15e703f21099ddc662abb585cca0e2d2f43a0863184e055c SHA512 9543e394f187cd9b06e88b64319504e07519041741650db3b7b905f1b34348ed7d9e22955ce2a456ffd2e06210e9e01b1a0ded459cde4840fbf5903ff6e21e75
 DIST vault-1.2.4-webui.tar.xz 1919024 BLAKE2B c1fc1460d70f33695ce9f7571a701035b02a376e4d336a9e368190a5ec08dc3ef417d2553a0e3ca5e745721eef49caeaaf294bd8b44550938ab02c7d63460744 SHA512 9b431083b1850e6e18b5212f04cc2d9305832c02594984caef298b2b33e176b6cc7f767e9e137208e005778d249410e482cfe4b6f6bfdb6f2ba54de9bcc4c7f6
 DIST vault-1.2.4.tar.gz 27778766 BLAKE2B 536dd114c0268f91eb6b5c13cc30d22cdb9d1085c1378c6e39a6fcffeb4d5313363d225c85073a4da124962d6f7de8e4800a6648e392909a9595341ac178d94a SHA512 35a91088ac6949863e2de651edac19d73586acc2f42d14e48d3b41236d9458c95e60f8ec2285b3846ff04ebe59a4d4b308686151d758b5af8caad711441e2ee4
+DIST vault-1.3.0-webui.tar.xz 2004176 BLAKE2B f17b51346e694e13cb51779f158116cd1e241ba1a90c5e384b40fafc916386fd12ae7e09e11b083f1ff8cb8aa89a94f811029edc10fceec2a08cbe8e65b1bac4 SHA512 2f3695134ffd9af478568b08fc66b593d00c0990178af2f3d0e8b27c53afeed1f7926d97afa688b21cca931665b435e85c036a9970f71355977815f214c66c0c
+DIST vault-1.3.0.tar.gz 31098388 BLAKE2B 81ac68f47eed4a9e0187774558d38701f4e1481b07bd8a6f310741741a112dcf8e8344e156b6cef2a05e115da998fafab9627d62e261ffb8995ebdd2468f770a SHA512 4011706c2d418e4e13369f5afa5541af8296d6731c12aa670ed0fce66cc4d950edb76a0d24722be6b63538dc3479dcf68bb89ce7d9f37437062635feb6432165
 EBUILD vault-1.2.3.ebuild 2356 BLAKE2B c68a7cc7b1b93c93a9a0bb9e4e67ce6900071650f567054a9e4fe5b9b383ea106635ad4a595219f16c877c767ce751d8fbb679cb6d442c2098e5e7e9d7200079 SHA512 55f85e6d4781cd7ad278942f080081bfdc7a6587405a84f79a842680a6142b32a4e32d5547874790556279bd39d9e9279ff3735025552502ffe6ba56159ac4c7
 EBUILD vault-1.2.4.ebuild 2356 BLAKE2B c68a7cc7b1b93c93a9a0bb9e4e67ce6900071650f567054a9e4fe5b9b383ea106635ad4a595219f16c877c767ce751d8fbb679cb6d442c2098e5e7e9d7200079 SHA512 55f85e6d4781cd7ad278942f080081bfdc7a6587405a84f79a842680a6142b32a4e32d5547874790556279bd39d9e9279ff3735025552502ffe6ba56159ac4c7
+EBUILD vault-1.3.0.ebuild 2356 BLAKE2B c68a7cc7b1b93c93a9a0bb9e4e67ce6900071650f567054a9e4fe5b9b383ea106635ad4a595219f16c877c767ce751d8fbb679cb6d442c2098e5e7e9d7200079 SHA512 55f85e6d4781cd7ad278942f080081bfdc7a6587405a84f79a842680a6142b32a4e32d5547874790556279bd39d9e9279ff3735025552502ffe6ba56159ac4c7
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.3.0.ebuild b/app-admin/vault/vault-1.3.0.ebuild
new file mode 100644
index 000000000000..ba761e123410
--- /dev/null
+++ b/app-admin/vault/vault-1.3.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+	webui? (
+		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+SLOT="0"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.12:=
+	dev-go/gox"
+
+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
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i src/${EGO_PN}/scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-i src/${EGO_PN}/Makefile || die
+
+	# Avoid network-sandbox violations since go-1.13
+	rm src/${EGO_PN}/go.mod || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	mkdir bin || die
+	export -n GOCACHE XDG_CACHE_HOME #678970
+	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) \
+	emake
+}
+
+src_install() {
+	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	dobin bin/${PN}
+}
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index 18c5742e9050..51ace9c57011 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -4,5 +4,5 @@ DIST webalizer-2.23-08-RB30-patch.tar.gz 45723 BLAKE2B 510e984121cc5109e44218401
 DIST webalizer-2.23-08-src.tar.bz2 308090 BLAKE2B 84f56b8b6a7e2b382040649ca8c6b6b7b57de92a09922253473f6cf920a4dd10a2c268b926c0cdd4fcf029dbbe39d629eecbd74cc42f62c018a00c3cc86c4f7d SHA512 23fe6e3ef1c85aa527ffafef16c31c13ad8e1f9feb774557c07a5c8fd6c67986b98180ef16d6cebe62d59c5f7ca214b8292e94ce8f195fa0541de9c5438fb9bd
 DIST webalizer-geodb-20140201.tgz 733070 BLAKE2B fd97dfd14e2fcbc6c97d6cb423c922d6bf7504f156fb61fb11319094a4d2e25fd8fa2623f419b57d06ef0762a507799cfd750a5e3a86a143aa1afcc790942cae SHA512 c31bbf39ab2a27712f83e7c1cf4297bc26850ed72e68bb4b47233b062055cf26931e859cdbc70dfa7737e17a3c05d4858b4e9c9c3a0492b0b285f92c0f992223
 DIST webalizer.conf.gz 8986 BLAKE2B 6cee5f96c31a189bf7ce75ec845081d9a2f0e547362d415c84f78f1ddaa8e3ffd327517968037ac1606a485d9cba740054bb9851065d0ea03739b5558c7ef6f9 SHA512 ec7f815e0215116d72e6d93b471a4b86a1c152a8ebae7c374144cabeeb06750d3a39fde65faf069e9aeb133f27b0b4cdee16bed5442e7fbd4eb4f45a4f3cd84b
-EBUILD webalizer-2.23.08.ebuild 4222 BLAKE2B abf62b488d87de185333e3900fe995400416acca263ede382d5da791304d154d95d0651a4531d453fbcf9d674f5733585044ba428bf80705bc13c1573310067d SHA512 8267cb7a29cb7cb006a631b6e04cb01c701f14c602ede2a0ab0dd40da6d15edc70adf118a2fcc4561cc8db975c71642f9fb97e99dfaa44ee5957d8eade13f862
+EBUILD webalizer-2.23.08.ebuild 4196 BLAKE2B 82794ce6d61dffd1f2c63a74494bc597c4cfcb8cf7d919d648b3dd03fd87d06c9174a8cfdde6f37385ec289b39ecae853aa045f714e147ca77edb1b4a5d69e90 SHA512 51f3865ddde62f7c5599b7d8c3c37433db5bd2565885a6d1ae47ceeaef60f32dab0074049cab14cb145d29854edf46753555db978e49652fdd6d968292ae6dad
 MISC metadata.xml 434 BLAKE2B 72cde450aa4735601e14978c5bfc3be91f257907988e6017dc27f7aca8dad9b8586dc78943d69a10344d25d2435fb8394b5fe1239a0ea7ff2ae3ae2b26ba0eec SHA512 9d006c56a0019b4ea29e8f9f845ca9006ecdccf64b9e50c343420af4b3852b5c08f09a23d792c3d1454454f8a0696a0dbc4b36b4da2c6f0d4967f533ad3a3149
diff --git a/app-admin/webalizer/webalizer-2.23.08.ebuild b/app-admin/webalizer/webalizer-2.23.08.ebuild
index 605bbadefb1f..dbe21c66ca5d 100644
--- a/app-admin/webalizer/webalizer-2.23.08.ebuild
+++ b/app-admin/webalizer/webalizer-2.23.08.ebuild
@@ -76,8 +76,7 @@ src_configure() {
 		${myconf} \
 		$(use_enable geoip) \
 		$(use_enable bzip2 bz2) \
-		--with-geodb=${GEODB_DIR} \
-		|| die "econf failed"
+		--with-geodb=${GEODB_DIR}
 }
 
 src_install() {
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index 20fa1fef277a..b1d37cfc5083 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -1,5 +1,5 @@
 AUX 99xstow 65 BLAKE2B c3d3dae69e0ed5251a996ddfb164795718974e1c2464176e680373fab25ceeb8a22392ac8de0dd489462e28bc48512c151f3f438ddc7f9bd093d5c63b46ba29b SHA512 0ade954fc07ba98be74d79e8ce842fc4e3e12f83d59f76eb78810251cc9e1612d963401be99f38002d94a2a32c9c2a32429f73d7ee69e97c12f6a05db14a3476
 AUX xstow-1.0.1-ncurses.patch 1070 BLAKE2B 58782b144bf997d88e1480f7743afb8d6dc2e814a4a412bb0d0ebf8cc83ae0d1aab5605228e7a6228e0aec6b8fca83104249e80e7f2406aafe2f9ab8408cf6eb SHA512 63fce626ad5b376a5aa2d335fdd4d73ce3a1b7fccc5a6ff5ab92182d6f3ca40417926b9d35f3447ed73f386d3022d6dc81ec39a2f790fea46b681d344fdad389
 DIST xstow-1.0.1.tar.bz2 153530 BLAKE2B ad5d2677725f2254bb87a4cf8f73e8158868a206f41e9a2ee7bb2547ae6e8634ab65f58655a04051425e5818071253672ccf96b8ddccd01026e992d085e0c1c5 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b
-EBUILD xstow-1.0.1.ebuild 1233 BLAKE2B 4e9f6f5dc62d3865a724f13038865faa05567d0677fecae352d001427b8e67ddcf2aa52e7090d46ef7c1c406373240cc9df1c55872d3199f467fbbe1db336c3d SHA512 8fcfc7e9bf0d041bc868a949f96483188dbe0a9070028466d948e6432f249764571c564789ee0476d9e4eb0882efaffcda1753a313ce9c7659d37c3f2d7811f1
+EBUILD xstow-1.0.1.ebuild 1210 BLAKE2B e05705c7ca16a1f3767ea0b7520262142ccbd3ba07f880ad92b587f58d065a0c0f96b248799d92f792c30349cf37893e3bd398f5ebbb9c17e81cf925f0279d1b SHA512 c33be296f15d73fc57622ef8cd41ac6984a36ab07932ca84eeed71535add7e1125752f8f324262c02fc06ee1c0963744360d66451f273b27dbeb997b6a05dc98
 MISC metadata.xml 422 BLAKE2B b4f2fdf4510d87729e84ce43f6576e220eae0e82219c62e18ca7d3db1483d819fe60218df9baf68292463e326860bccf180f961a1b2c9df884c209f232b7a705 SHA512 c78f69be0d671d4d92a65412327ae34d9a61777227194b3d41032232da8e623be99ce8c7d6897b65e4b2971e37cad1ec1d5f180779c31cca55bbddd5e74e5344
diff --git a/app-admin/xstow/xstow-1.0.1.ebuild b/app-admin/xstow/xstow-1.0.1.ebuild
index de7357598a6c..8bc68e8c4517 100644
--- a/app-admin/xstow/xstow-1.0.1.ebuild
+++ b/app-admin/xstow/xstow-1.0.1.ebuild
@@ -34,7 +34,7 @@ src_install() {
 	dodir /var/lib/xstow
 
 	# install env.d file to add STOWDIR to PATH and LDPATH
-	doenvd "${FILESDIR}/99xstow" || die "doenvd failed"
+	doenvd "${FILESDIR}/99xstow"
 }
 
 pkg_postinst() {
diff --git a/app-admin/yadm/Manifest b/app-admin/yadm/Manifest
index e6ce0c2b1eb8..086550147b9a 100644
--- a/app-admin/yadm/Manifest
+++ b/app-admin/yadm/Manifest
@@ -1,3 +1,3 @@
 DIST yadm-1.12.0.tar.gz 47340 BLAKE2B ef710f56c96244c082bfcc887cae4aee00aaaadec5e7466500dde263c5e4f43df046e11742fd275e989bd9704b39a123f17248cd70d64f6ca552b28db6c44814 SHA512 402a67770154ce3ae7ab947ff4d4e26ca5040d343110fb749195ca5c3f4ee435aba1d8cdf02d4ecf4a81d3f331c1b891bed4fb3fcfcc893867e0fce45b9c8cd8
-EBUILD yadm-1.12.0.ebuild 1234 BLAKE2B 73b60da066947ed5ff45950e5809695be1b234e01005103eee4076efcab65fc3acb193716590974caca0a5c209dc13fff77ef85f778c5aa2f8c65d1c67e9ffbe SHA512 9321ffa59728389909b187a1da4cf230467ab180f9ecc24e3137dfc1909329ab68e40066c622ad1c411ff5ed3dfdce9c6b2c1f69ec77f248d7e2361e38f99218
+EBUILD yadm-1.12.0.ebuild 1258 BLAKE2B 6c1cda1aa6ff1f7ee5eae8dc43cee7aed49b7eb6e7d1a130c932fd58c8518268fa56024cf18dde7eeec50c0053693493a1cf452ea169ab1668a22a424b3f1167 SHA512 78d6becc931275ddf9a63b55f270b7c4145e364b81d0c512742b5b3c7532c7e1242f840513614343c325a176d9126232de16a50cca977764fa16726820bf94c9
 MISC metadata.xml 825 BLAKE2B 6fbf4554179cf6141396b8e21be3dada54c0eec7c5c5bd1e18860b73f1d170044006b92010f7dd5d3c2238f8545024ee43dc2c86305e8bc91871acdd497c8749 SHA512 0c8facf902245118eab0d6c4b48eb5a2fb63aa6cb7fe4581cc0353bd164912b7620eb2f42984b45410065d3a6e1af1cffa5028f5c26a4ecd38a9983da6b34feb
diff --git a/app-admin/yadm/yadm-1.12.0.ebuild b/app-admin/yadm/yadm-1.12.0.ebuild
index e6b2381a71ff..55922bd1e757 100644
--- a/app-admin/yadm/yadm-1.12.0.ebuild
+++ b/app-admin/yadm/yadm-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="zsh-completion test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	test? (
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-admin
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)