gentoo resync : 02.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
commit: b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree: 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /app-admin
parent: 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
68 files changed, 952 insertions, 671 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f58764c381a5..3c14ae3adebb 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/analog/Manifest b/app-admin/analog/Manifest
index 794d606de9c0..ef544ba83fd5 100644
--- a/app-admin/analog/Manifest
+++ b/app-admin/analog/Manifest
@@ -5,5 +5,5 @@ AUX analog.cfg 3992 BLAKE2B 8e68cc26a59a5bbed57f84e06ac8f5c9874cf1a36bdbb5c6f914
 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 1376 BLAKE2B 2fc261f284e5bff679a5b22a8c16858a4fd6c4add1755df37f85dd4bbfb31d10b2b6a145b5543e1b20bbdc7d38670424da6c743277161ed3652bf05cd7e3803a SHA512 5cf1b8008948ed9c8d4e46751a143b81ad4c526cd6b1fb20567c18fb496162e50d9387dfc5ffc56f31f36250c9310b401631812cb1f062339c44f010bcbfb058
+EBUILD analog-6.0.13.ebuild 1375 BLAKE2B 6958e8335810fe01c2803af543855edeb2f32947147db6acb392600e0b73179335af21418ddda27c91162bc91d56043c340cdbee3e0fbd47f11d56478f71011d SHA512 4a252dfa76940584f26f8e01e1b79a7f00695214c77aeaec42a2b6ec55e947ee762f157cc87d585b79a92690bdfd05d8a73f771ea9a9da9021962704f951f35c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/analog/analog-6.0.13.ebuild b/app-admin/analog/analog-6.0.13.ebuild
index 29ce2146a449..cf508ebd6e23 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/Manifest b/app-admin/ansible/Manifest
index 77d411907683..3d7e03bf523e 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -2,9 +2,11 @@ DIST ansible-2.7.11.tar.gz 11855636 BLAKE2B 3de8fa1287655f778b1d9036bf78a91387cf
 DIST ansible-2.7.12.tar.gz 11860944 BLAKE2B 52cc79a88bbff9dc009ead8ab9f9d299420ae060e211aab23fe3bbef8c8229cd9e526dc3df518a4285cc17c1448ab4892cc3059d70bfef2fd332a44c72b57019 SHA512 0ab68af8239f6d4d2a13bd38a09fe6f3c700231e7c83df0af77c70ea62faebd0d45e1ff316963c6c72931608d49a79b98e8d3ddc6f4c8b826aabe87dc71cc6f9
 DIST ansible-2.8.1.tar.gz 14299403 BLAKE2B defbe8fa8db7ab3325cf57df3bdfe901f53544b4c1b6460cefbfa9393acfe2a0e104f99468ad8e907d90d33842563bd7ab666d30f64572fd146c7ce46ff77048 SHA512 08be80584edfe28f11fe750735ade117deaf3a7c98fe15fb2fa0e3a5ed0c3f98cd126b60386e51d15ce275e8f1fc3eda0177bb56e0823b2f2b7702cc0e35be92
 DIST ansible-2.8.2.tar.gz 14328267 BLAKE2B 9548af73914b68374f71ab83e5a68e86e75b8ccf86066831699b147091d067a3f1e0b59d94b22b42151d90779f6d3bb39856a3d205862c933aec6bbe76824e22 SHA512 02cd8fd214f61041914abeebf2395f16acf370e110bdef0181689f604f06504902f9a05a2413877a31680528af539f078e2cd7b7f2eebe2389c9aa441b063305
+DIST ansible-2.8.3.tar.gz 14343746 BLAKE2B 3859d88d8462f7109ab23c169b4a91c7a03940b5a8aaff4bfc7ab430fb533898a44221dee18f481612abe1cce1270211a34c2bc1dc7603d89adeb11e50d2b242 SHA512 cee2c663577155269c4d762816590200224e87979411dc7486f5840783f23aaa688577a3f75e272c4875af30397bb383d11eaa7d122d5f304388d5b45ffb9b6f
 EBUILD ansible-2.7.11.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
 EBUILD ansible-2.7.12.ebuild 1637 BLAKE2B cafff348e72d7970fe6851e36c2cab55e18583dbd4ec2cf018a04ed2f7093e91c341c32458d334996f7779477409d47fce82477ab812e607ba1d9d624e6efc73 SHA512 b3760d5cefead4d7965b1d1dbbcf7fd41f2bbd2b8a4941fb02791832fd60c4b0c289ba34fbf945b8889a4b15b286e051634adb90296ff81e43a15f71cad66f47
 EBUILD ansible-2.8.1.ebuild 1661 BLAKE2B a9dfb3a4da7bd2f7519eff255ec9ec465ec68160724fe680426db756aaf5e3ffdffb6947faf200c83a4cab5e0ef5b11b71de530901273f2b382c062520fc9c02 SHA512 c564e5417b1181d49cae05eb7275133c1f5cb76a18b11fb679b6267186d5bd7bba62303481601aab47d4c2bc9cf6133311591a8933584033bb92f837483158c9
 EBUILD ansible-2.8.2.ebuild 1663 BLAKE2B 45885bbb6444622d27827ad2243ce05aa2062bdde7e545aea5617b1c3979c088ea4565e0ce07f9fda2e9bc14bb819aa89954d51bb3eb1a287acbec1da0792d54 SHA512 e679d5e32060071736fd555ef68d44d8ca28e44cdb8229f2c79019f5c05b36fc8d095b33ff5e651d89d9a07007401178024593b3f6e4ac055961a3eecdc36af6
+EBUILD ansible-2.8.3.ebuild 1663 BLAKE2B 45885bbb6444622d27827ad2243ce05aa2062bdde7e545aea5617b1c3979c088ea4565e0ce07f9fda2e9bc14bb819aa89954d51bb3eb1a287acbec1da0792d54 SHA512 e679d5e32060071736fd555ef68d44d8ca28e44cdb8229f2c79019f5c05b36fc8d095b33ff5e651d89d9a07007401178024593b3f6e4ac055961a3eecdc36af6
 EBUILD ansible-9999.ebuild 1654 BLAKE2B eb0aa61cfa0eab600a18d26cf8d7060be0f93cc0413a844ac5e6a9938010b52d77a0ef28a2b36b802e7e8deba33caf5c4f6659410c2d74b13a13f92d50c0106a SHA512 040e5403acec6a13ca5042a3840480c4993eff4beef319229bd761c3a46cb673473d9c0297be176a3806f4cc15b30586a8af5e7743778de36d19d16dc5512b79
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.8.3.ebuild b/app-admin/ansible/ansible-2.8.3.ebuild
new file mode 100644
index 000000000000..e6b530db760c
--- /dev/null
+++ b/app-admin/ansible/ansible-2.8.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	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
+	)"
+
+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/certmgr/Manifest b/app-admin/certmgr/Manifest
index 81e33db4cc2e..6130ee8f0975 100644
--- a/app-admin/certmgr/Manifest
+++ b/app-admin/certmgr/Manifest
@@ -1,3 +1,5 @@
 DIST certmgr-1.6.0.tar.gz 31187831 BLAKE2B a1269aac2817f077fa2aae3d14f692aa5c83b0f53ffe041b9436754a93c7970dcc24bed94259e05b99105de5400b3b8c5e22bde087fe365a1c21b8eaf4b3e4a3 SHA512 65b0cb8d5b7a3b76698b3b3aa8c2b9db88d08fed209044668cb19f13eca69714a7a4bc8a20bbf60af05f5c9e39b221801a36e90c8b1c647dbf07952ac385e6ea
+DIST certmgr-2.0.1.tar.gz 2696154 BLAKE2B 0267c82dcf89297495bd46930bb53a176b0329aa933dd8a8b8a96b377133741f45e1a16e0beccb36540ef3c25d28f2af324a976ccac7c769c0cad06d2fb4d20c SHA512 b0de0fff3af435631b26ad4f3b0c1178b3f2e784545939b8dd4a90ee29918c879aea1afc774a23655e7e10526d7a8d13f95cb0740e407eb60110dabc56fdeeb5
 EBUILD certmgr-1.6.0.ebuild 636 BLAKE2B 04c13ebf4349cb36bd4df1b5f97775d6614e7666168f29b0ece03cb020d0dccb6759c4d0c77c433a789a93eb92891f720d2a06e90370cb3e09210037d7ef96d3 SHA512 6268aae4ca61265579e263ca766a6fdac438e5ef79730e10dbf467384c6040113fa31600bc149794151f7fff45c63587faeee17a33480e6761ae012c4688b5ca
+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
new file mode 100644
index 000000000000..eeb5ddc69b9e
--- /dev/null
+++ b/app-admin/certmgr/certmgr-2.0.1.ebuild
@@ -0,0 +1,31 @@
+# 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/checksec/Manifest b/app-admin/checksec/Manifest
index 47623c3d2461..9b2962252746 100644
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@@ -3,8 +3,12 @@ DIST checksec-1.11.1.tar.gz 198151 BLAKE2B 2b45834adb045dbf75a0ffab4f03b2640d068
 DIST checksec-1.7.5.tar.gz 51266 BLAKE2B a77e6d0bf52bc8a0ec18c0f1ffe883b68acccaaee6fd0d1714d456c31c3004b5d9279c3926885be168befba1dc7a75b1269dac5cb5847c247470e765601f08e6 SHA512 7269fb3628907f6fe4e8b720d2dcbd5bf8586e1821bd758533dff6255c6a52be9146b58f60abea798ee92471c3d5ad9e867fa7ad4b8e5ea2d8aa03d5a3b83098
 DIST checksec-1.8.0.tar.gz 52391 BLAKE2B 3720e4faae5aa82172c673ce7ddc662db1433b82d25f25be4c219f1664da8af687d2a5ee9c05703e9f151a998be9226e896e125b7cff05d3881e61e8a9f5c918 SHA512 0236e40ba8b4f7c13ebd3b51f22dd05e6c4442e8646b5a1ee814556d9a6ca19f9bae638af33a6bfec2f8ef95567d222a20dcdcd9eae6ffb7ea5261919f020283
 DIST checksec-1.9.0.tar.gz 196168 BLAKE2B f9095a516f166e9a407c9796e28ed7da4ffd97686923745e46b0ab4110f084690781995b6cc190234b8a26fe1e6eb2c8f32f7f15191f0dbc26b38048c87e9a2d SHA512 8bf68dd0b86a6eceb6f5eb016a15ed1bf7d086777c3ec1c62848ec23e62dceed4579404d76824f17b8e1305e679ba6204f0dc4c224f7a11067651f33c2d96515
+DIST checksec-2.0.1.tar.gz 199903 BLAKE2B 726d3f868cc73649f7a3cd42270ab1c6965d6bed772f3c612064c54dad569e748f5a2d24df2b8663328442ba8126fe0edac04b0034ba6a23bf6e32ca93a78e30 SHA512 b2466b621b6ddb3fa01cfc5eb3dc301d6d616b26ddd2017a622ba2a24e9daf8f5e294236d1dda695fd9ab25fa411724b5f7dbdabc944cdc124e4369c176f35b4
+DIST checksec-2.1.0.tar.gz 200384 BLAKE2B 6e954f574c632da1aee629aecd7ded6286879ba6156252c3d4b5d11f52e3c457bb1d9223934c70f402aaa1e8a8f8d530b55c7f860c024c86c2c2bbcbe9216646 SHA512 66090777de15c492090da3494127037ffe20a169b426b054b3a8f642e9c980b2a99d5c8f8411715d74b1faed41023fb17770d3f07eec5b9efda0a43b64c07a74
 EBUILD checksec-1.11.1.ebuild 757 BLAKE2B cb3a4bb1505399b4b6b8f13e5237bb17f74d153a088d782427e2e8c53b2422f740455dca99ff29de6bf3fccaff2b1c8b1bea7ba760d08fadf8eb99bfee9f6150 SHA512 5669162f5f0d7e6c679bbf4cbb374d71c18452c7ac59451d5a4d39979f14dee9cebb91d63a37b61e38ea09d62e6931c3c48e853219dca6109c1cba32aceba52c
 EBUILD checksec-1.7.5.ebuild 761 BLAKE2B 928d7f91b7ac04ac04a9bcfaa14f8ea781eaaf2be75182d7b8d0f3cf63e0bdf9178d03da87732da11286ba172e2368eb5fa490021c3d5d71f3419d426b7b911d SHA512 5a15da1104314647688e68017189e1b661f0efd58d3a7ad5a788ab2cdda79249dce9c07e9db48d775ace6d8fb8679f2cb6669c1f16758f9c6e736e9eca2d57ba
 EBUILD checksec-1.8.0.ebuild 763 BLAKE2B 3456a3d42a58795e00cf46689bc60a99357dfec5a8ea7c43841584c10d4fe8bceb3d3c0e3a4965cd38e7c718b6c716a36cdbf895635a458122aaa34324f13600 SHA512 dd2af6317e19baef0e21112b6a64783dd1ccffaf2f0f2d80acf802b4ee14b021be23548375c9c86c8a073da38bbe4f1c58c533cb5b16cf60e082f8164dc84738
 EBUILD checksec-1.9.0.ebuild 757 BLAKE2B 526fb5bd77d4f06d01dafef1174eae285b5ee2a1ae72882f1d05d07ec141b519ef39f622f16f4e098c3df0b31f8419b6460f2d51a462b09324519efa3235fa67 SHA512 29ec62f61fbf71e19aae933ea6b01e6f606c043e50d4c004214219a04cbc96d8ede61a444a822e1a83c0245e0e379ee553e5f4bc2d7d11a2577aa0b2e9f9eeae
+EBUILD checksec-2.0.1.ebuild 759 BLAKE2B 18b155566819f22cd16c0c13798bda4b70da1bbdc5cbf94c0977d2edcf6877f7819fc91421d6be8619c8a20f7d2fac3fce2f698a41f25aea727e3f843b1ddaab SHA512 3b34ecfcc2c1c73ec5a8565e9c07415bf6b1d6a682c6f7c8b17db07917706c9247c7c67aaca7d03d894547892a978efe11e4fa01322e80c9093d0a6d3b0d0386
+EBUILD checksec-2.1.0.ebuild 759 BLAKE2B 18b155566819f22cd16c0c13798bda4b70da1bbdc5cbf94c0977d2edcf6877f7819fc91421d6be8619c8a20f7d2fac3fce2f698a41f25aea727e3f843b1ddaab SHA512 3b34ecfcc2c1c73ec5a8565e9c07415bf6b1d6a682c6f7c8b17db07917706c9247c7c67aaca7d03d894547892a978efe11e4fa01322e80c9093d0a6d3b0d0386
 MISC metadata.xml 334 BLAKE2B 96b933c9475a18c3957d46b58c41162e396f27ff7c53eaf4ba5be2a24e22e8a136a0814cce5c0d3c113e5d18a286fdd34a1b3cd46e509a7eec986f82d7d8ea9c SHA512 dd9373f93f165e576bd930ae4a49019d0c53359c4ef288c5d1ed5fc1033b82afff7d0421551eb9518bbfb3f25bc7cdab09cf89b1e0bd9c1ffe0137432d70b716
diff --git a/app-admin/checksec/checksec-2.0.1.ebuild b/app-admin/checksec/checksec-2.0.1.ebuild
new file mode 100644
index 000000000000..3dd38365d970
--- /dev/null
+++ b/app-admin/checksec/checksec-2.0.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.2-path.patch
+)
+
+src_prepare() {
+	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
+	default
+}
+
+src_install() {
+	default
+
+	doman extras/man/*
+
+	insinto /usr/share/zsh/site-functions
+	doins extras/zsh/_${PN}
+
+	dobin ${PN}
+}
diff --git a/app-admin/checksec/checksec-2.1.0.ebuild b/app-admin/checksec/checksec-2.1.0.ebuild
new file mode 100644
index 000000000000..3dd38365d970
--- /dev/null
+++ b/app-admin/checksec/checksec-2.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.2-path.patch
+)
+
+src_prepare() {
+	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
+	default
+}
+
+src_install() {
+	default
+
+	doman extras/man/*
+
+	insinto /usr/share/zsh/site-functions
+	doins extras/zsh/_${PN}
+
+	dobin ${PN}
+}
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index a44f628e3cbd..cbdb471d84a0 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -3,5 +3,7 @@ AUX consul-template.initd 592 BLAKE2B 21d6ff6bee67a82c4305eba3765f8e9c49ee59357a
 AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed1e57c23fb3bb3df4066cfdc1ff70f2eae6a67c7816d8d38d41106f003fe2a98732a9180838c05d04a710d9bef09 SHA512 642b53e43fd7a4da00907600f26e3814893b61856a62083c804b0077043a4f8f6603f0ae4461e901105f8e1fe52c2f34f3e949e752441f5f510e9cc21890ca75
 AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1
 DIST consul-template-0.19.5.tar.gz 6054881 BLAKE2B 48d691f9d09531248310ec50c6c59d3c74db4c8ca5f0236ac8336df92c75da89677e64cb593518032f48f53b9f5aa914a7b6ac0a2dc6bf6d32ae7c1f6d1dc60d SHA512 bdba4e821e353a71f9f6287b8ff352e85a916201314229b998bfbebb066fec17c5d7f12e224bf2920b018a4f5fec9000f122f6c04cb2e455a195b945e35235a5
+DIST consul-template-0.20.0.tar.gz 46430965 BLAKE2B 025919b928e07cda618e05aab4488214459e6bc443524bbf8fa83331c3ad5708ebbeaf0cf20351ff70a325fb56aed9cede3010b43726fa32b5b1997d6f4f294a SHA512 a09ff31ddd7d11d78e8c2afcc9a63ab4458cc9feacc02fbf95a30c82b9ad58526c6e6575f5b3ddb21d0dd720687b9ee135bacdbe761f1b5f95592a3e3e74c170
 EBUILD consul-template-0.19.5.ebuild 1493 BLAKE2B 97b6e2745eff7a2387e972630c9518b374f81e65766875287e5ef97859421ab02df9224f84a5711013c6b59fc02f1e6e94a33f29255dedae44e7cae088ad3bdd SHA512 b62365114f34c528d591235cfd8fa9f7a9b40f9c6a0030a72588a141d3372e515bccbbcf72c13d434fae399ad20b2f3a03b71e1b61f29af3f5297f88d8eb8e9a
+EBUILD consul-template-0.20.0.ebuild 1497 BLAKE2B 84b85a577ddf7cdd29eeec7ba7c95874f0e50ed5ea03754f4536d4a8cf9becc52a06ba1e89778737df2d5561380878b32a3d86d6696a513f032e8fa5c12fef2f SHA512 ae28bd90cc5ab445c81968585e62877fc58bbac0e8060186c767bffbca5deba7056749b8aa307e7246389fa2be2c10b5aaad7ffa36af2e5f1afaf16801cae510
 MISC metadata.xml 316 BLAKE2B 857b3a0a26e35ac2f52f797b85a42f91c74a10b4d8d6a1f5394465e68f6ad57bd732286650966f99cc516ec68d00f31f0f880931e2041cb596d50e521ac3a599 SHA512 e66cfdeeab0bec39ed4149454fd1876ce963f7bd0012fc659abf92aefbad4e5fba90c9fe84019273d5f837f6bdf438146b433d9ea00cfe1cf4356e112522f1ad
diff --git a/app-admin/consul-template/consul-template-0.20.0.ebuild b/app-admin/consul-template/consul-template-0.20.0.ebuild
new file mode 100644
index 000000000000..e76748e495cc
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.20.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="Generic template rendering and notifications with Consul"
+GIT_COMMIT="9a0f301"
+EGO_PN="github.com/hashicorp/${PN}"
+HOMEPAGE="https://github.com/hashicorp/consul-template"
+LICENSE="MPL-2.0"
+SLOT="0"
+# TODO: debug test failures
+RESTRICT="test"
+
+DEPEND="dev-lang/go"
+RDEPEND=""
+
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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 src/${EGO_PN}/Makefile || die
+	# Printf format %q has arg r.config.PidFile of wrong type *string
+	sed -e 's|remove pid at %q: %s|remove pid at %v: %s|' \
+		-i src/${EGO_PN}/manager/runner.go || die
+}
+
+src_compile() {
+	export GOPATH=${S}
+	cd src/${EGO_PN} || die
+	#XC_ARCH=$(go env GOARCH) \
+	#XC_OS=$(go env GOOS) \
+	emake dev
+}
+
+src_test() {
+	cd src/${EGO_PN} || die
+	emake test
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc src/${EGO_PN}/{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 496b0a515d84..ce8b024993f9 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -9,8 +9,10 @@ DIST consul-1.4.4.tar.gz 22736827 BLAKE2B a1b973a303f77d84993e4879aa92072d4f2d36
 DIST consul-1.5.0.tar.gz 20830405 BLAKE2B e64fbc22ade0c737db4f2f1b0e3966dbe617456a35d18a7a3cfa1b0f6ce2e335542b3add06c8b8e49995135b5a1576c824840030ac8dd46019bee915689bc5e2 SHA512 8cefb77b56b27995bba38517144bf42585bd1d9ad9a10fc0c9b6bc1a87bfbd042e336ed5e945cfce1fb8eb4b8162dbc8246e2b4109dea5767b8745a7b2159ef8
 DIST consul-1.5.1.tar.gz 21123963 BLAKE2B 4fe6a45f442d849196a7b9961110cdcc6f92931626ab583859efabe62038f6b2c356b27b37ea41b27755cca138c567be5c81854794a1ba0ccae3f9e0dfd10749 SHA512 7486d24bf1fa9fe94175abf9e008dc4fe4277c509381a524a9ee20e17bc4959f621e39be29e33622cb672ef3a04f9161e575009197bcd35c78b45f1d2637a2ea
 DIST consul-1.5.2.tar.gz 21697719 BLAKE2B 782d6fe02cda097db9256a7e508cf19cf4d514d7936022d339fa62db705f6c60468cea907cd22338bb61c3287bfccb3a4d435a4f9222aa7558999553909e5d40 SHA512 e0820592abc5e119f74c8bf3d11a23726ee6dda7d193864a4486d64deef0bfd6ae4c9170b57d6f978e7ddfeb425229a019c45a8edcdea0938bce9315f2444fd6
+DIST consul-1.5.3.tar.gz 21743194 BLAKE2B c797b04457c5f0b12f06732a94038b25367b53a9e6088d725eea61786a0e18bd905ad680bc12c4bfa30b44292d2676689dd6f18e9e2143bf6e1b02c2c55f678f SHA512 3f275ec160b9e583b81ba8d463fdb05e9fc9058db2453d9393a56b67337ea04df98a89225323192230938e1abfb48fa60fe0a32b4d8980573b749217b69933e9
 EBUILD consul-1.4.4-r1.ebuild 1548 BLAKE2B 65d5c22f412b28abf5c7067b5744ca2fb627f6513eca10d91055276016487f0123e6636c080d4841be9d05f4e26fe332f1867e7d540c7810ae43a187b1485988 SHA512 9ce2e18e5177ed96d005b6967d68e8df138ff18e47b28b52ea4fb971323c5cced167bc26fc08a30d39cb243bcaa275697fe7e10c6cacb87c12d969a00bd154b1
 EBUILD consul-1.5.0-r1.ebuild 1548 BLAKE2B b70a82e758c23c2c34ecd0fa5d45e56d840966135c8d578b09d702bed31b5148bffa2eb68412a0555464018ad04e62922a4e75d5c8a2fdc779b8497a6a539159 SHA512 00c8ddee82cacfaa5092bf45a37bccf7475e8fb6402579ee95188a9334f12309ba9a70771fb49f1b43bebec1e37ae68eb7d260a34c3134009f0b4507447c8504
 EBUILD consul-1.5.1-r1.ebuild 1548 BLAKE2B d1d499907ec300d216e6884fb3c31d741911a799185f8220e0f4bb1f141105781368f9cb7c98bcd8ccd790e34b667f33b0dddc8eb5f1185318bf6c70917ead33 SHA512 6ab3f29b2416dd52250589d2ccae36f86161edea4a103d16a00e21e78c630fe8a6c7a61e8a50c08e3df546698e91f577e6ed94dcaeaf766b51f97ca93f894837
 EBUILD consul-1.5.2.ebuild 1548 BLAKE2B ef17177024301747b243ac1b77fd9061cd76a661af705ca1beee37709ee03b07c2a1738a5e2277b8db93d377c442ba3831511c6df73c6096639971236b819e76 SHA512 41dd870ec80824c66139d4e44d10ec22079fbca640213f3454dee789ef535ef13605742f2999448475e5107134f436e3d8f9cb9e3d3fe3de021e45fc7ed67421
+EBUILD consul-1.5.3.ebuild 1548 BLAKE2B f8cfe586cc76eb91db2369980ad8dd3b13f305baaca3aecd69eae820a6d2dfec0927dbae152cef61f7960d8eabd508089d2441319ea1ffb2423a97809826f71c SHA512 7f046114417edd0b55be2d1800076ce735305df2dccb188e0e4a5c228d63266ec74419b55d79645f77482a1e49bf23e237bf0ffe3dbd5b91a16b99e271f3fb6c
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.5.3.ebuild b/app-admin/consul/consul-1.5.3.ebuild
new file mode 100644
index 000000000000..13ebbc13a381
--- /dev/null
+++ b/app-admin/consul/consul-1.5.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="a42ded4"
+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"
+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/dxf/Manifest b/app-admin/dxf/Manifest
index 1da8adfd1b13..bacc9e05ca24 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -1,5 +1,7 @@
 DIST dxf-7.4.1.tar.gz 300216 BLAKE2B 53452e73a10912a09e912fc0710fcdd1b0a6be4f78e95c704526852deacf5a7bfd2d3b73bc165f178f732249a64547e13bf9f58f77159c31908e954d6d3a4161 SHA512 a7a2ba4da675f1dea73f2e3d7db63804eb2b68cbb859e43235997b3bc5b8e7ef209705935182ae33d4b28cec5857d2ede738375e19df72134a5695190fd609a1
 DIST dxf-7.5.0.tar.gz 301822 BLAKE2B 33f2356cc6e3567b11d48b63ae9951bdbf5e77726e7f6081b3d299b0560646fd775060b3fe2766d3de69b33cedf4c3f21810bbb4429402a1d9c616da2f7c0ba6 SHA512 82a4a4d2b8baaba242f82b2c01ae47adc4856250bf558d28e0582e6a92b081ff9512e33d3b02d022232880003df40dbd62b7a6401aa5bac83cb673ebb9c85435
+DIST dxf-7.5.1.tar.gz 308004 BLAKE2B 6f8aaf39fbf3a9ef813d5af502361fac3827db17fa5279c3a53e8b87826cac15ef59cb41b2682c9eea065e0a30d98c2b22f72b4922869a012eab76274b1ff325 SHA512 f1a5082d70c115da9f01385e40ed7d2c1ce82af6fb9e55c8f3173e544a9ff3e98c8c565c9e6a2ca1e9a688665944ec0d9dd873f621914d5b746ef4a145f308a0
 EBUILD dxf-7.4.1.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
 EBUILD dxf-7.5.0.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
+EBUILD dxf-7.5.1.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
 MISC metadata.xml 295 BLAKE2B b3270ada06f2998a84e5484b6b063cb5e1c397be2bb266ba10352e811f35e25576469488cb42eb49ac718c6e788861b706aba3e1cb673cbbf176c576fc5745a5 SHA512 99b0deb01ac0e00d6f958c41a9ad8a68bf606a178924c0f052a656d0bdc2638b711e4fe10ab49e1a943ce7a8c29fc77b94abd4a91f6f65a3debd892d8a099339
diff --git a/app-admin/dxf/dxf-7.5.1.ebuild b/app-admin/dxf/dxf-7.5.1.ebuild
new file mode 100644
index 000000000000..2b55ca80585a
--- /dev/null
+++ b/app-admin/dxf/dxf-7.5.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Docker registry v2 client in Python"
+HOMEPAGE="https://github.com/davedoesdev/dxf"
+SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
+	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+# Require dockerd running
+
+python_test() {
+	emake test
+}
diff --git a/app-admin/gentoo-perl-helpers/Manifest b/app-admin/gentoo-perl-helpers/Manifest
index bef3f4e8e23a..fd4ae3a5a371 100644
--- a/app-admin/gentoo-perl-helpers/Manifest
+++ b/app-admin/gentoo-perl-helpers/Manifest
@@ -1,15 +1,5 @@
-DIST gentoo-perl-helpers-0.1.0.tar.xz 6692 BLAKE2B 46484aa35203d5bfd03a7bbeea12cb598842cf569502a03c94319d6b5399cfc8b1d1789eaf6e2d6e7c213d6d93b275b5a54f8a52d092d1e599a5d508d4637572 SHA512 929921c4584d990b53163413b58d4fd7a8868073c03095e90914c3565e65d5ee3e86e2c5269079b4c683c9db6fe5e035358539f62091fbc24af818e6330d414b
-DIST gentoo-perl-helpers-0.2.0.tar.xz 8876 BLAKE2B ccfcddfe3356b972c78900508fee3c1510623d42299a2558439a645cca3a6c74432b52b7f1366a1a322d04848cb081a5d49e439ef3905ec4c99c00e88191aec3 SHA512 f9c534436dc3ad7bc2c50e47491ef3a76bf949e2065c182391b3526e259ce93e9eb4ef1b9d981d6dbf3924394150b90ee6460f51f67d79505039b826af374d95
-DIST gentoo-perl-helpers-0.2.1.tar.xz 8904 BLAKE2B 8fb93a47beaef233a10c065368dcdee01d1b99340d710f0954210805af95b642b9728d5b725965d06c2b06eb7872ca2d0584d6679bc56d6557617a13bb0d5984 SHA512 f2815f0bc893faa815482333c79da0ea81eedb0919d9eec9d2403e0f6d886fa28561221a4f1b4b9d48b6182dea37a02ab79fcea2322a837817948428146a5ba3
-DIST gentoo-perl-helpers-0.2.2.tar.xz 9096 BLAKE2B fe53c1fc2742c256b5a62188f82ac257df9a67ddde95ce8ad760976cfb0bba956aebb915388b22ebe2899546a24dec1385a07521405758fbd7e14112cdf0e32e SHA512 97653cbcff01cb65b5aa8b5e56ecdafedddfed773b8f41120707066d8c3d837634b9d2996eeed069cf434175684ac38a0e829719dd88a3bfd14e2e0ab6f80a14
-DIST gentoo-perl-helpers-0.3.0.tar.xz 9392 BLAKE2B ef20955add23d834f85781c90de3c8d439c9659dca330a444a6041a0e1c99ca7a378bf88425f4ca021d4ef607fbffe0d7a6e43a92085f8d488179114b2d23a37 SHA512 3feaf287457d0b4fa29cc58878566b38674b0c112ba356727bbce2bcff9b9cca07cec34cfb960260a0a32542c43611b783f74ee4127c9c0aa33843a144544c13
 DIST gentoo-perl-helpers-0.3.1.tar.xz 9420 BLAKE2B dea001473832f4412ae090afbc458720ec1d40d19ac3db3a6a57b26115603f224f2f1c4155ecd3190866dfa0ab648fdd3a98a90e9ed576e7bd3ad8bdaf9a73c6 SHA512 dce6addfebbdfd16da3b580776c34346eb60b2eaef9cc7bed03d5ae0bf028de7a0175fbf7f68113d44b645c3d5ca7f5175389478655b08c115a5342ff930e096
 DIST gentoo-perl-helpers-0.4.0.tar.xz 9580 BLAKE2B daea9e3f43bcd24ea34c9448294fb730595e8a021dffcbbf7f123ff5439455aa362c623affee29341266a0494f4744df0bf195d2db422d6276eb54fdca07149c SHA512 fbbd33122028ad12cbec7adbc97faaa32aa485ef21ca38dc2e1906610fdea7709e5da7e8164f5f86afa3607928837f3b35468274b6c626e3bd843432d780701b
-EBUILD gentoo-perl-helpers-0.1.0.ebuild 1055 BLAKE2B 9e9ea153fe4ca9d8e34492bf34ba30563326cd5d72052fe2ec2d2be795607f69f873f4b13739462f711486ebf9186db7014e576a211274148e45e950febef67f SHA512 78c626c5652693877c5cbeca909ecc2e93a798af83b1b6fef70b7be0a41b2e8ada39b752fe0c982670eb7cfc77525d94fe5c5294725848d339dba8d3b96adcd1
-EBUILD gentoo-perl-helpers-0.2.0.ebuild 1218 BLAKE2B 4baf35b2b995c5bacf1cccc464e752070f32ff2c9dd1bebedc25bbbcab2e7a26bfcb4f3ecb61f003874a74e6b6aea18d21cc569350b13fd2f23468683f42ac45 SHA512 6a3381deac08ecca97f24f3ff2d8582658998167d18f6267a2ea83eb312b433c37803e3004038e02a2085e853f840cbb8ed1b6135db7d7abb68260ff9f962324
-EBUILD gentoo-perl-helpers-0.2.1.ebuild 1225 BLAKE2B b8ae3e131353a8da9c3194ce8bae01c5c2d4593b3c842cfdf5acd15d0e99098056c16e9462b9eaf1e4c531bd4b512f951becf87742a00931baa8dba8302c62d3 SHA512 60a21a692d621e44e0592576112d66ba14fc01b86874678ff56ee843cc27dbf1ca95d849b6aec6040ee76e0a58add2d07445d2be9be4293e61821464f1c4e426
-EBUILD gentoo-perl-helpers-0.2.2-r1.ebuild 1255 BLAKE2B 117575619f67a68822e1e3f349447befc0f9b3e3b312297f1ba91a136904d4afb730eea2a170ba660a6441ccfdc92c8f44b42cdab7911e433a69b9499e94cf70 SHA512 62e682d07a9d61746378e7f56adcf7bf624b1f41a30065b2fb246ca008d39876cb03152bbbc23d5225895ff735d5479f53125d4b8f428eda6b8a7dfe2049673c
-EBUILD gentoo-perl-helpers-0.3.0.ebuild 1255 BLAKE2B 117575619f67a68822e1e3f349447befc0f9b3e3b312297f1ba91a136904d4afb730eea2a170ba660a6441ccfdc92c8f44b42cdab7911e433a69b9499e94cf70 SHA512 62e682d07a9d61746378e7f56adcf7bf624b1f41a30065b2fb246ca008d39876cb03152bbbc23d5225895ff735d5479f53125d4b8f428eda6b8a7dfe2049673c
 EBUILD gentoo-perl-helpers-0.3.1-r1.ebuild 1255 BLAKE2B 59495c331a5363515ee725ca8ed048454023aa5b68db0d28e11d3d10df091a06b8790e5af778da55525bd04266e8107060f0a626c318582bfee92dcfe4f3aca5 SHA512 2dad7ad8fb595480d533a31e6c4b2c79b0975aec0e1782e17e3ead8e10ea3298217f66f2665977f511d9feb5aae536e74979a9d5cddca8250008a157c8aa937c
-EBUILD gentoo-perl-helpers-0.4.0.ebuild 1271 BLAKE2B c449bd661acd7dc57d9a21b3875e5fe2b893da8b265da90e279f02edd3b68f59ac46b99741d8a0ce8b014aab02034d611ff3acb5cdbb7db5225e6234b2e7f43f SHA512 9c815a5bc27803e6be4363cd911ade02d0af16d28b41e9ac5b5d9dae0ee3e0840ce7a6dddf199f01a8602b4f73d35ae481badaa7062b1c9f357cb795bbcf353f
+EBUILD gentoo-perl-helpers-0.4.0.ebuild 1276 BLAKE2B db543f194acbf5efca2e4cb3800d0b5d481d9dacb870d6c68fc29809d9ec45786d9237f7c48529cf7d082aa6b72922f2fd5b8ebc27567f64c8053ea5192ff086 SHA512 a32f1f82eaf1622abb4866ae2c29f4046729e578a2a6b1b668f62a70d7970437cac25e0b9acca224e222de94412f2f5941238dad2a18094431554657e8569da1
 MISC metadata.xml 453 BLAKE2B 0a9ea49a54e1b0ac4c4d98615b15251770556bfe672eea650b8b52ac7dc9a0492d3456b894b8724c033aa272567bb0c7ad4847451ed3f29fd5aa365ea2e2d315 SHA512 a32d375d6aa0ac38a20cdec805c887be0d6493be5d47572a0e950e1f4a8b28018ab364cd06668ff59c52fe89487853c9c4bffdf05b79913c691d99fdc848b201
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.0.ebuild
deleted file mode 100644
index a5dad27b3230..000000000000
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
-HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
-SRC_URI="https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Assumed System:
-# sys-apps/coreutils
-# sys-apps/grep
-# sys-apps/findutils
-# sys-apps/sed
-# app-shells/bash
-
-RDEPEND="
-	app-portage/portage-utils
-	sys-apps/portage
-"
-DEPEND=""
-
-S="${WORKDIR}"
-src_prepare() {
-	sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" 		\
-		   -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
-		   "${S}/bin/gentoo-perl"			|| die "Can't patch bin/gentoo-perl"
-	default
-}
-src_compile() { :; }
-src_install() {
-	exeinto /usr/bin
-	doexe "${S}/bin/"*
-
-	exeinto /usr/libexec/gentoo-perl-helpers
-	doexe "${S}/libexec/"*
-
-	insinto /usr/lib/gentoo-perl-helpers
-	doins "${S}/lib/"*
-
-	dodoc "${S}/README.mkdn"
-}
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild
deleted file mode 100644
index 4a2b5e0ef725..000000000000
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
-HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
-SRC_URI="
-	https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz
-	mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz
-"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Assumed System:
-# sys-apps/coreutils
-# sys-apps/grep
-# sys-apps/findutils
-# sys-apps/sed
-# app-shells/bash
-# sys-apps/gawk
-# app-arch/tar
-
-RDEPEND="
-	app-portage/portage-utils
-	sys-apps/portage
-"
-DEPEND=""
-
-src_prepare() {
-	sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" 		\
-		   -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
-		   "${S}/bin/gentoo-perl"			\
-		   "${S}/lib/core-functions.sh"		\
-		   || die "Can't patch bin/gentoo-perl"
-	default
-}
-src_compile() { :; }
-src_install() {
-	exeinto /usr/bin
-	doexe "${S}/bin/"*
-
-	exeinto /usr/libexec/gentoo-perl-helpers
-	doexe "${S}/libexec/"*
-
-	insinto /usr/lib/gentoo-perl-helpers
-	doins -r "${S}/lib/"*
-
-	dodoc "${S}/README.mkdn" "${S}/Changes"
-}
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.ebuild
deleted file mode 100644
index 573d0e36bc7c..000000000000
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
-HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
-SRC_URI="
-	https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz
-	mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz
-"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# Assumed System:
-# sys-apps/coreutils
-# sys-apps/grep
-# sys-apps/findutils
-# sys-apps/sed
-# app-shells/bash
-# sys-apps/gawk
-# app-arch/tar
-
-RDEPEND="
-	app-portage/portage-utils
-	sys-apps/portage
-"
-DEPEND=""
-
-src_prepare() {
-	sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" 		\
-		   -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
-		   "${S}/bin/gentoo-perl"			\
-		   "${S}/lib/core-functions.sh"		\
-		   || die "Can't patch bin/gentoo-perl"
-	default
-}
-src_compile() { :; }
-src_install() {
-	exeinto /usr/bin
-	doexe "${S}/bin/"*
-
-	exeinto /usr/libexec/gentoo-perl-helpers
-	doexe "${S}/libexec/"*
-
-	insinto /usr/lib/gentoo-perl-helpers
-	doins -r "${S}/lib/"*
-
-	dodoc "${S}/README.mkdn" "${S}/Changes"
-}
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.2-r1.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.2-r1.ebuild
deleted file mode 100644
index b725db35e2e2..000000000000
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
-HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
-SRC_URI="
-	https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz
-	mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz
-"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# Assumed System:
-# sys-apps/coreutils
-# sys-apps/grep
-# sys-apps/findutils
-# sys-apps/sed
-# app-shells/bash
-# sys-apps/gawk
-# app-arch/tar
-
-RDEPEND="
-	$(: --format support)
-	>=app-portage/portage-utils-0.60
-	sys-apps/portage
-"
-DEPEND=""
-
-src_prepare() {
-	sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" 		\
-		   -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
-		   "${S}/bin/gentoo-perl"			\
-		   "${S}/lib/core-functions.sh"		\
-		   || die "Can't patch bin/gentoo-perl"
-	default
-}
-src_compile() { :; }
-src_install() {
-	exeinto /usr/bin
-	doexe "${S}/bin/"*
-
-	exeinto /usr/libexec/gentoo-perl-helpers
-	doexe "${S}/libexec/"*
-
-	insinto /usr/lib/gentoo-perl-helpers
-	doins -r "${S}/lib/"*
-
-	dodoc "${S}/README.mkdn" "${S}/Changes"
-}
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.0.ebuild
deleted file mode 100644
index b725db35e2e2..000000000000
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
-HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
-SRC_URI="
-	https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz
-	mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz
-"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# Assumed System:
-# sys-apps/coreutils
-# sys-apps/grep
-# sys-apps/findutils
-# sys-apps/sed
-# app-shells/bash
-# sys-apps/gawk
-# app-arch/tar
-
-RDEPEND="
-	$(: --format support)
-	>=app-portage/portage-utils-0.60
-	sys-apps/portage
-"
-DEPEND=""
-
-src_prepare() {
-	sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" 		\
-		   -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
-		   "${S}/bin/gentoo-perl"			\
-		   "${S}/lib/core-functions.sh"		\
-		   || die "Can't patch bin/gentoo-perl"
-	default
-}
-src_compile() { :; }
-src_install() {
-	exeinto /usr/bin
-	doexe "${S}/bin/"*
-
-	exeinto /usr/libexec/gentoo-perl-helpers
-	doexe "${S}/libexec/"*
-
-	insinto /usr/lib/gentoo-perl-helpers
-	doins -r "${S}/lib/"*
-
-	dodoc "${S}/README.mkdn" "${S}/Changes"
-}
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
index ec93bc39e770..c3d693f9dbbd 100644
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 "
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 # Assumed System:
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 157815f1aa78..3abc16694e41 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -6,6 +6,8 @@ AUX gkrellmd.conf 250 BLAKE2B 2b0cfcd1940cd695c67db32c13bbb7f372936b1f88938a2e43
 AUX gkrellmd.initd 345 BLAKE2B 922967be33dcc733c55cfffa59addc01bbe2ba0298be14541925e88bac16f2310f226448545263527a96499454007baf04272fc5ce136628f03587bbc322f74b SHA512 197ad175f8e8afbc9bb81957d594ee2190c7fb3e251cfda5e987c140174a6a08e485ce2fa4e3d7a21b9bb19979c853e4c04f33021beb497f084f0ddfb2c725ba
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
 DIST gkrellm-2.3.10.tar.bz2 782794 BLAKE2B c0aac7df866d40c79667551ca4b25346da4267a0aad8853776425a08097dcfe3a24082e7e5d17db6d3936b59d10c29afa11e8a425319c19696141c02f7d95f25 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295
+DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
 EBUILD gkrellm-2.3.10-r2.ebuild 3276 BLAKE2B 621c5b2210a1dae150216d1e2f75ba537ac9dea5e22db9fb2722e642f6f8c05b8611b4a572567b88d5e75e3446d270a367ba1b61d2c04d50624c109186c96e6f SHA512 2391488443ac81a5024e3bddb7097b5819c703545f3146519fd572be76f3bd161c5a83f7879cedc6ef3cdbc971db94d8ad2f693d4c69f5486321254973cf34d9
+EBUILD gkrellm-2.3.11.ebuild 3390 BLAKE2B bc12fdade844680c79dd3212081ee9bff5b6a8f270f6320dd1f96c939b97e9daeb4f955f66aa1f48f5f00d13ceef9a06c61685f64baca9bcee99dbf8a50ad0fa SHA512 65b89fadf2bc0ccc50f27fd70040096d14c460f90c8461198653ac37509977ed68155c48f19adc56249a47fd14ba27610b9b92b6d925ba5e9d18275a2a1699e3
 EBUILD gkrellm-9999.ebuild 3390 BLAKE2B bc12fdade844680c79dd3212081ee9bff5b6a8f270f6320dd1f96c939b97e9daeb4f955f66aa1f48f5f00d13ceef9a06c61685f64baca9bcee99dbf8a50ad0fa SHA512 65b89fadf2bc0ccc50f27fd70040096d14c460f90c8461198653ac37509977ed68155c48f19adc56249a47fd14ba27610b9b92b6d925ba5e9d18275a2a1699e3
 MISC metadata.xml 917 BLAKE2B 34cca38c9abfdd920abe9bf75e8569d652f3575e3c9f81e40f90255464021cb9f1768f742f30a8e6469a9e74342231380b9bc465a95ee1963e03d87238725e86 SHA512 8896a7f487c9089202c78589eb62c47f1705d41000a562b40a08eea660d0fe4fec422026329dedb4a33bd0dd63da5249e8dfd03590cadcf7088c0b31d55a34af
diff --git a/app-admin/gkrellm/gkrellm-2.3.11.ebuild b/app-admin/gkrellm/gkrellm-2.3.11.ebuild
new file mode 100644
index 000000000000..d205ffcda8a5
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.11.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multilib user systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.srcbox.net/gkrellm"
+else
+	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-3"
+SLOT="2"
+IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+
+RDEPEND="
+	dev-libs/glib:2
+	hddtemp? ( app-admin/hddtemp )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	lm_sensors? ( sys-apps/lm_sensors:= )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	X? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/pango
+		)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.5-config.patch
+	"${FILESDIR}"/${PN}-2.3.5-width.patch
+	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog CREDITS README )
+
+pkg_pretend() {
+	if use gnutls && ! use ssl ; then
+		ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
+		ewarn "No ssl backend will be built!"
+	fi
+}
+
+pkg_setup() {
+	TARGET=
+	use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+	sed -e 's:-O2 ::' \
+		-e 's:override CC:CFLAGS:' \
+		-e 's:-L/usr/X11R6/lib::' \
+		-i */Makefile || die "sed Makefile(s) failed"
+
+	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+		-i src/${PN}.h || die "sed ${PN}.h failed"
+
+	default
+}
+
+src_compile() {
+	if use X ; then
+		emake \
+			${TARGET} \
+			CC="$(tc-getCC)" \
+			STRIP="" \
+			INSTALLROOT="${EPREFIX}/usr" \
+			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+			LOCALEDIR="${EPREFIX}/usr/share/locale" \
+			$(usex nls "" "enable_nls=0") \
+			$(usex lm_sensors "" "without-libsensors=yes") \
+			$(usex ntlm "" "without-ntlm=yes") \
+			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
+	else
+		cd server || die
+		emake \
+			${TARGET} \
+			CC="$(tc-getCC)" \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
+			$(usex nls "" "enable_nls=0") \
+			$(usex lm_sensors "" "without-libsensors=yes")
+	fi
+}
+
+src_install() {
+	if use X ; then
+		emake \
+			install${TARGET:+_}${TARGET} \
+			$(usex nls "" "enable_nls=0") \
+			STRIP="" \
+			INSTALLDIR="${ED}/usr/bin" \
+			INCLUDEDIR="${ED}/usr/include" \
+			LOCALEDIR="${ED}/usr/share/locale" \
+			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+			MANDIR="${ED}/usr/share/man/man1"
+
+		docinto html
+		dodoc *.html
+
+		newicon src/icon.xpm ${PN}.xpm
+		make_desktop_entry ${PN} GKrellM ${PN}
+	else
+		dobin server/gkrellmd
+
+		insinto /usr/include/gkrellm2
+		doins server/gkrellmd.h
+		doins shared/log.h
+	fi
+
+	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+	systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+	insinto /etc
+	doins server/gkrellmd.conf
+
+	einstalldocs
+}
+
+pkg_preinst() {
+	enewgroup gkrellmd
+	enewuser gkrellmd -1 -1 -1 gkrellmd
+}
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 1083168724bd..e9f4f7062ccd 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -3,12 +3,12 @@ AUX hddtemp-0.3_beta15-dontwake.patch 515 BLAKE2B 56061289e8d247a11a3172eebf3ed7
 AUX hddtemp-0.3_beta15-iconv.patch 780 BLAKE2B 568a920c7f43a53031212cf059148e618235292fdf6de157b4a3440a06e03c2be66f4e90c72d87da7ffd122fea4a0f37df56a8465966e58e8b142fa61c86e633 SHA512 53f988655d59dff675bb5a103b5688b1d564032350eb915c364e5aabd562d643e6fc9a9eb6bececba886d50b07162fb36d78702e1378f6cdb4a3f67f57209dce
 AUX hddtemp-0.3_beta15-nls.patch 414 BLAKE2B e488ab41496786676920b946e9aab4cf40c959f9799238da65586d0f3391060650ab2aca93b634519404b15279469579a573834e54bbcf170edb9c8284a72a15 SHA512 bbed2015e4a1ff44f0daa5591502d15cb02b9f3e7da8ab490d1ce761db823855c12d2889d9a5abf3924aecb522f9f27167e798ace3147c85ab50983457a480a6
 AUX hddtemp-conf.d 304 BLAKE2B 76c717b744b0539c74bf2e8d0423a0b85c43156d34c170dd69442e5b7f5b800a27324ab556f41077eb5240adba21f42522061e57483796743edfecf2bf315172 SHA512 b82d4be9edceac534bdb953b9ae5b49f4eb717fad8de8847bf43678451361438397b98280c291c638f93dc7d3b4dbb9d7cfae9c8263be007f908eaf6473b198d
-AUX hddtemp-init 434 BLAKE2B d7ae9e8dc490d7ba49725567926d34b1f22688e20a3df169db5e271367638ff382cf60ed58df0752639823477e3f2929758f9b90cd96db751dd57414f4b9b74b SHA512 cb08834efd0e8f1a69bb07d7eb8ae75997072c0c1c04ac4ef1f10d561a29b56593efe52a30346b2fd88e0a50baa791c2a10655415a1ce97afd50a39effbaed64
+AUX hddtemp-init-r1 252 BLAKE2B efbd2da8d0f6125582ab388f0fde87a37ef8d3f6ac781ace2c9f0c23ba6010fda2686b831593c930cb3957e88348b031577082193c9fce8b0080ceae4d6a82b0 SHA512 4d09b626fe2994f90fd3a99a5cfea974759ce7b8c02234b83623e94a275766d3df172aee37ce2be5775c48b8dd8cd99b5cf8700d244bca7db173e7e661ee32b9
 AUX hddtemp.service-r1 214 BLAKE2B 201eeeb152e80c9f5579f5e52e475f061bfe587e2025d6e2824a3118d079089e56b34ed2895e7a1d0db8f21158409dd7247408368a2c1684e6657412abce6e10 SHA512 2218864bead8a0cc0f99d5125940f397fc1396d2e3f7afaf276c3bae0d6c2b2d23ebc51d3a93d3a492d055c8dcdaf44c56ed289d0343b9e264de48971d9153fd
 AUX hddtemp.service.conf 88 BLAKE2B 310463288da0fdee89d914c70aed0175b62d53a382851b9f65702c1137cbeb803a80f5d186a2d0a81ec3dd94fe9733501b28399647fdc864db1f11ab12f21b71 SHA512 dac10db31111623f20580d36b49f2d9b292df39991a4b2590085c08b7a8dbda3903d5dc268d328a71c0bd8d02e781949ab2abde243ae35da8f79bef21aa3fae3
 AUX update-hddtemp.db 819 BLAKE2B 2322abe8bc4c4f49a4c16267783d9d7ee46666e1e11b70438914d3c770b75f5b4912ddb17dff0555d9847b43d1e43b19a5a54598778b97bfb4c6829f7424f09f SHA512 7d923d582da2e8012de4ebb4243a4fccd6135cfca7d06f02f50b290c5984af288942f7588da7c8c57b91e362a8febc76f14b489798af14f66e3ec7bec9518ba4
 DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd05007f4b4b8d74eb378ba810ea9aad96951b7a9b3b0f872130677fca1f294d86f855327dcfa5a263c9f3c7d58fbbba502e SHA512 7db5a3dff60c59ce147b996ea4f8b6de1abcd34301bb863507b4d4b44e72fdc031078867a7f37161e67e74f6b426a1d856d3081179c678d2a442815bb0faa94d
 DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
 DIST hddtemp_0.3-beta15-53.diff.gz 52845 BLAKE2B ae4ef1f98ff39a39bdb49b2752f6f442c6ebe8ea6b0e8e743cc3ab9ef39d07abe8970648b841b3974cd814fdef72bc59cfe93c4b4d1cf2a85de1a0d94c4409b9 SHA512 1006ffa92f9973eb1da6444f8e8eed681e641efd17a52954b0e6c5041ecae13108af4ed89534ec4f2799685f96191769d3b168dbbb96085dc801150c7c547511
-EBUILD hddtemp-0.3_beta15-r28.ebuild 2709 BLAKE2B ebbb144c74db3e8949572e47099997424fdcee172cf008ae115681a9ffeebc632a106cc827dd0c3556fb5c7c637dde66e32b735a0705553613088f7fd077263c SHA512 1da0ab1e855b471c5b461258985b579cb33cc47ad8f5697c781fd0bbc3875180115c562adeb8a86b5d8fc82eca01da9cf4cc1a0e54365be3ae51ce27c245641c
+EBUILD hddtemp-0.3_beta15-r28.ebuild 2712 BLAKE2B 3b6511cca80f057c0cd686ff7ecd55cb24e3e4528759693706d3e30d78161af64f9f16c488dd68dd23ea831dd6223b2cffe6c6d000f29676dbe3fcdfb2fa8f16 SHA512 b1e93db75db755060271cc0b3c0d725fb4500df80c903fb9ca0bce6f640e223aff42e26774c780baf802850f4ff8eff4fca690a2fbbc159b9cd980f05717a8f9
 MISC metadata.xml 260 BLAKE2B 41040f0f9342dec7a3993d99bd9fb49f624c8fc8a0be036b3c2e3f2f20d4182d23c5b98a5451f5d2d6906d749b7756b7ec10b1e135bfa7b1633234ebdae1370a SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3
diff --git a/app-admin/hddtemp/files/hddtemp-init b/app-admin/hddtemp/files/hddtemp-init
deleted file mode 100644
index 39a640997cfe..000000000000
--- a/app-admin/hddtemp/files/hddtemp-init
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-}
-
-start() {
-	ebegin "Starting hddtemp daemon"
-	/sbin/start-stop-daemon --start --quiet --exec ${HDDTEMP_EXEC} \
-	-- -d ${HDDTEMP_OPTS} ${HDDTEMP_DRIVES}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping hddtemp daemon"
-	start-stop-daemon --stop --quiet --exec ${HDDTEMP_EXEC}
-	eend $?
-}
-
-
diff --git a/app-admin/hddtemp/files/hddtemp-init-r1 b/app-admin/hddtemp/files/hddtemp-init-r1
new file mode 100644
index 000000000000..00d09ac2c610
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-init-r1
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="${HDDTEMP_EXEC}"
+command_args="-d ${HDDTEMP_OPTS} ${HDDTEMP_DRIVES}"
+procname="hddtemp"
+
+depend() {
+	need localmount
+}
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild
index c1ffdee13a6c..293c78379cae 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild
@@ -70,7 +70,7 @@ src_install() {
 
 	update_db "${ED}/usr/share/hddtemp/hddgentoo.db" "${ED}/usr/share/hddtemp/hddtemp.db"
 	newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
-	newinitd "${FILESDIR}"/hddtemp-init hddtemp
+	newinitd "${FILESDIR}"/hddtemp-init-r1 hddtemp
 	systemd_newunit "${FILESDIR}"/hddtemp.service-r1 "${PN}.service"
 	systemd_install_serviced "${FILESDIR}"/hddtemp.service.conf
 
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 9094d8d18b3b..cfc81651e57a 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -4,10 +4,8 @@ DIST github.com-BurntSushi-toml-3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz
 DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
 DIST github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz 3384 BLAKE2B 5eb9bb3c88a3bee70cd64f30afcc039f2f43b68be23f39c72f9091765388229a8f5bdbfba8d11d1916d18e9c785e15959c000337461e44940df0ea40ecce40db SHA512 b877b8b0e67f300ed9773b32593a1edec2fb6df3b0d5026cc7b67490ec9a4cb0d9630fb30dc3dee6b7081f81c3fbf1399809c4bb171a5afab665ff93a9f3a034
 DIST github.com-Masterminds-goutils-41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0.tar.gz 14603 BLAKE2B f8f04dd7fb48c67ea31e2c438210100d671c0c017026317f43428d0460970cc6e07faaf6b3d4c2d554851dd962a7f62c8df617d0a42bf30f4d7038108f9df8a3 SHA512 05d67b1d5eb8881a9a4223d823412826d2ec035782a58879645c53e75d4e3a0a312ff70e32020d385faf6c345125edd8808b63d33c4f53542cdba73b3901d3b6
-DIST github.com-Masterminds-semver-517734cc7d6470c0d07130e40fd40bdeb9bcd3fd.tar.gz 15744 BLAKE2B c5ebbc22c9d995a9bea44742bdc513dea977276d43306f1c9edd2c59eb9844c1e6f304ba4fa5f340b6052abea5294314049bd9055154af2d6f3e2ddac3d6cdaa SHA512 321734efb1dc3d7c6e5795c991511340330c0ecd44571f84fe6d5f6e36945c68b3fe2c47c8bceb4c80d0eaeb21b7a2e45f856b65e942a74434e1f28892120460
 DIST github.com-Masterminds-semver-c7af12943936e8c39859482e61f0574c2fd7fc75.tar.gz 15906 BLAKE2B 0063a5faf829f84578364629c3bdb74db6485ee360f6fb62c273f580865dc2455eeee35016bc1f32d8a7b91544df4550b890a713b47f08138d4dd63994cbc41e SHA512 32ebd89448ef9d135fda47f9b0e9c98729a867295af6c9ad4441eccfdfb19e251d8d3270e364a42e26abd59c3f838ef6c37149e5bcc432a19c524d1e6490e453
 DIST github.com-Masterminds-sprig-9f8fceff796fb9f4e992cd2bece016be0121ab74.tar.gz 36657 BLAKE2B f40e9fc9982b24e72f463af5f05cd26b903b5f457c8601e1419b5262fd18a2dc206b5fbce86f110aeb01b457f90ac587a1786429d7c10cedb610131acaf1ded7 SHA512 4ea351b3345ff1d8cb57dd7827378dfdc5047f622d8a64300b46c1197f833fe9179d2b8fc9a006d01683214de0df0903e257a694da646bbb89369580eda1585f
-DIST github.com-Masterminds-sprig-b1fe2752acccf8c3d7f8a1e7c75c7ae7d83a1975.tar.gz 36935 BLAKE2B eaa2702b01bae171bf03fa74b21d80bf16dc5e81e51df5b2b14cf58ef7d68563acd8a12a441301814dcd8a45ed8b88243f33e358c1719ae2e9eb0ac0109ad804 SHA512 736a93543f4456a0e2cb7332e89b3b90a29dfc1dcca82ace22bd0321f973cc26c0d85297db01a8fba3fedfcdcc762e2c09e59e06809794de549a7ccecef4d709
 DIST github.com-Masterminds-vcs-3084677c2c188840777bff30054f2b553729d329.tar.gz 27278 BLAKE2B 072014886aba809af343bd5b5a2cf21ef95a5712ed80662f62591fb58dde6e71f075d74d93b755845cab571f510ce1e59b0cdcbf61fd8a485738acab14345c29 SHA512 77a2d594f7da607c9c1502e9ad64414c177450a40853d6928c690df2ff6adce0fa79627ea437e07e7459b1956b00db9d1fb8b0e08bff2c0e2c1f98420b36ee53
 DIST github.com-PuerkitoBio-purell-8a290539e2e8629dbc4e6bad948158f790ec31f4.tar.gz 11532 BLAKE2B b39c15b219e296663d8b60e2899128bfe688e1833111a2e40425c1c88f88ac4703b45c244a8cad93ea3c39e0052c74ce0745b7b77ab2a686a29110b94cf36e7b SHA512 ae439ee73627ed3ec83759daf5944f62e8734f5232f92d552c8a7ad6887d4bd3e8ba8a22dca7cb1793485a426c0112aa6354eafd76273220385f890de5d14de9
 DIST github.com-PuerkitoBio-urlesc-5bd2802263f21d8788851d5305584c82a5c75d7e.tar.gz 6787 BLAKE2B a5741976f00b3b7d02d98854fc53c4a996c5afe5e97f91de943bda1fde9aa7b88c913b1e52038ebe61bb1629c9bf25ff56a119fad7a84b21a544a6eacbf7899f SHA512 0f33b69ba89ebdf04a082daa87efcdcaf4cf1d703443879b63e3ce6410a7bb6fec657c014a65ea620ca7a63afd681514559f766bd5028d7e8333bd7de8d33f3d
@@ -23,12 +21,10 @@ DIST github.com-docker-docker-a9fbbdc8dd8794b20af358382ab780559bca589d.tar.gz 76
 DIST github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz 11094 BLAKE2B efc28ea5f3db552cacd9c48d7ec4de65a4f50a9463ac964d98782d62ae8c6103c119bf443d3219a39e0ed4658228a04b4a388c29ee38a05ffc3c78c25456abf0 SHA512 baf231424d453bf889e8614c54cf28f0f37f8b8e06e841c2b42ef82729afc4036018b1ca0116da33a8452a2d2345bebef5e8c66be489896db813abaac79d668b
 DIST github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz 35378 BLAKE2B dab00cf2ff22077187532a66abdd609a9101a0ca4b0fb6bcd31647e72dc491ba6ad2c2f82d3780d687dc8a95c3f499bd457abc7ca4b98cc0d08c726f13d58593 SHA512 754efd869559f96eb244a603bf575e1b439d8aa4ad34485121c76c4900150ac8a81f7fcdde4b2af49bcd317eba2212ed60a16a10cff973c9f87516bf50ad0d2f
 DIST github.com-emicklei-go-restful-ff4f55a206334ef123e4f79bbf348980da81ca46.tar.gz 59771 BLAKE2B 91eaedb1f78485b68000b02a9ea86f86a156e8109ea173b3593407ff5779ac1f4652465bd617b13e7ff95ddd7d12d1d39a284fee2c59dcc53e63626b5e1680ab SHA512 c762005454ce5247941d86fb8587ed8229927c1ce81fdac8601ffe41d535d1b3d89f81366be2c0bff13c8fdf2750c7db4b913b0548f19b71e2ab7a7654ab8a71
-DIST github.com-evanphx-json-patch-36442dbdb585210f8d5a1b45e67aa323c197d5c4.tar.gz 13289 BLAKE2B 4085dcd289abae0130a053349c1d0165858f7407fc3a93dcd5875c45a8fb1dd1b182a266735a02041492fb905d273fc84a9e36bfa41132bb7445158c98f7dce1 SHA512 c2006b4b5f7fb97da69b6a7144dcc5256e2987c0d58da7e62f59b0defe9c8aa3b4a3bd83a3bd9d960c1434f910480d87c45be0b0f1af323159d2de7ccc9d10e7
 DIST github.com-evanphx-json-patch-5858425f75500d40c52783dce87d085a483ce135.tar.gz 14566 BLAKE2B 1e4e84030bc17a66a92a65cc0355b3a4983a6c932b8b88225c9b64db9a6e1980aa15a743525030f0554531afd103b010dcbfbdf062693ba5730904dc1b06006b SHA512 78e094dcff9c67887f8420baaa506591e8be09368bafcd750720a4c0b563860a94fa9d8cc4f53f231fe7fd34432c8f8c78b1bd3dc7588428599fad1c6faf6a88
 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-ghodss-yaml-73d445a93680fa1a78ae23a5839bad48f32ba1ee.tar.gz 11681 BLAKE2B 324d15744ed3c966870108c6a55ad41a275c05457738dcf9be94e8be5c0a17d198a3347b858f788ec60ca1dca0bf0d5b65bca7010aac49cee90fe199f22bf5db SHA512 b8b3d46f3b3a6bb7c59db4623a44c938d6e9ccf521fe271342778261590c5f702af743a845c29d17d4e8c83e7c68228a7c93e3f43af536d6239ea6b4cfb7d2e0
 DIST github.com-ghodss-yaml-c7ce16629ff4cd059ed96ed06419dd3856fd3577.tar.gz 12713 BLAKE2B 639e75ce14b999ceaaaf70dd5cb1a261c1348d2ff04d754956e392e6ff486377d2d40ed155818680c7cbe399889c00a2e4cb9d36eae556442eb10ff84f73a1b1 SHA512 bacd77956e8647077700a3c6f6cd67462eb323c21aeb4185ae0f983ede8d099f84109df114cc3efb635c150d4b3729f3420920b51fc866a66210f3630684a2f7
 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
@@ -37,14 +33,12 @@ DIST github.com-go-openapi-jsonreference-8483a886a90412cd6858df4ea3483dce9c8e35a
 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-yaml-yaml-670d4cfef0544295bc27a114dbac37980d83185a.tar.gz 61351 BLAKE2B 78103165ce41b2185f103d62cffc0fbc410aa05928a574b0cba2caa9e2f3d2868dec8f8220657e01edd4b86eb33e412512dc8b4275c918e6a55dc2d240720657 SHA512 d7ab43b219828773ecb8fc5be0a52ed83c9c8e195bd318e68fb741b487c4ec20847f04e828737196360fca7f62ff04839c676ff6cc181890d725bea457342ce0
 DIST github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz 25955 BLAKE2B d6c9b20f80800396ebc3eba2b08ad48522d297bd0da90ed32d6ea2ea4e575e9feea112513332a3c55bbeae2569770433466536698084e787127866efaf0d25c2 SHA512 e5767898e8aaeff59219e0a0578586b63717d5c8507c74ecb813e8e8a7b02470b10df0452cc378c7f0a4b9bec030be22deb3c3ce7c5ae88fd739271cf05e36ad
 DIST github.com-gogo-protobuf-342cbe0a04158f6dcb03ca0079991a51a4248c02.tar.gz 1732674 BLAKE2B 2dfc3538a0f7e4b77f90795a6e76a0c962bcfdb7fe557e64484481cb6ad053ddd738abd1415cea69fc1305dd2d4e2301510c6715243c76e2251304b6f74d6649 SHA512 2b40b3eed0fe85fb111d49b0eaea33be382539c1829ab43da6da0cbe3f5f7db44422ee38e425d660e85d0541031364a8def3b2e4589cad326c29a1bc4ed8a6a6
 DIST github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz 213923 BLAKE2B a53b177f8b31b8927b923c5bcfc4ee4a1f48725e6652f38e20bcf1147a646411771bde259ed7917ad12913734375f880e7c4cc9b49b370e738928286b432a877 SHA512 903ded0a887db7a6b6783bea7d6af82087449ff05ac34367f3472f23c80965a4f6b4883e6983e57560a80a6b81eecbf285729d4c38b505cf1e99274d1d87c1a7
 DIST github.com-golang-crypto-de0752318171da717af4ce24d0a2e8626afaeb11.tar.gz 1636269 BLAKE2B 85529e4607b4efc684dd5a7aa726294a21f3cacc4c6331d91afa95e0e14756b8ccb7d461c6c4ac9f3e0d6b864e63afd763a41c8e7df23a2b8afe0a1264d635f2 SHA512 c1c5380ab03ef5fc8aee6d5937a90286bddc32d8b9488b38b890654657ecdf5f878d74eef2d32d6789053dade619e4aff006ecb003cdafd56b8730768660de80
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
 DIST github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz 25244 BLAKE2B bbfd67b7c9d34fe1cddab77a372fc53c899424122c46dd637186bb571e1a12dda7f0d6991bb5ad85cd0162803832e5843af6b184f861fa5dd1ac0a5cd8c7ed86 SHA512 e7ecb5c64bbb9e1fd2555ed496abb1e65f836b8017f21010dc853f8c527826eb6c315744ce991725d85e3500a6c877b3f25ba22090584c4c75dec6e6cbdc938d
-DIST github.com-golang-net-0ed95abb35c445290478a5348a7b38bb154135fd.tar.gz 930720 BLAKE2B 73434ace62ef2a9db1b551075baf05458b8a8ed25b44ce88ca0780d9ff38a2fc176ab3040b198d5a8b2b8744ba60aa97f57cefdeed5cf1574c010b933bb033c2 SHA512 0e5bfc2f04e44b7eb3b1aa44a77f0a5e40e0df5e80284cb4fca267ee224f44089f1d28d1486cf5748fbeb4bb8818159dcd019de9e1f24f016f06b05c5379f41c
 DIST github.com-golang-net-65e2d4e15006aab9813ff8769e768bbf4bb667a0.tar.gz 966021 BLAKE2B 0d5e297e6175faa704daff2de29b7dc3adbc9dc567cdcfa0813c1a75a7a88e47b991637abb3e12e40c4ba03aa6493bb45f7cc49dfc6a308c509b212f343d89b0 SHA512 22bead696af115d40f5b92c6188373815b024d467c2bddf19ad67750d6dbe2a12df169461b904aa6c677d4e2f2e07467f5479f2cac194acb18c0906b181a5024
 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
@@ -55,44 +49,31 @@ DIST github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz 9005
 DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9
 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-gofuzz-44d81051d367757e1c7c6a5a86423ece9afcf63c.tar.gz 12668 BLAKE2B 01b0f7b14690c4c2b45d789773e4cd8bfd3e94d66ad08b43bd06511535deda5b6b3ea611ec1023cefbf272153fc37cffabeb45d714d72ded6fb95cba77a47ca1 SHA512 312a5a60e11c3dffe9099a033a4f2349d6caae14139e9b6b25429a42bf3f88dde08dd81c2443f2a7ec44505c990d50e059002e0d81fa105bd68c2a221bacb557
 DIST github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz 12733 BLAKE2B fb29066f37f5f7d6aa5c7e0cf4a90b9b16de012d809034aaaf10ed4a43b5941e68c8925fe991ce5b25fde56995e8e66317fcab2caf97a722b12cc03825190488 SHA512 d3c2b411793681cf5b55438e3ba23512b6edbc48677c2efdbaea02d226519690525aba848cfde45205dafa39fda9f2868960b39f744aec80222b61dc42b77da7
 DIST github.com-googleapis-gnostic-0c5108395e2debce0d731cf0287ddf7242066aba.tar.gz 300660 BLAKE2B 7f3bf228cdb0566d0226daf05fd107f79b135ceaadc55a84a30d5d595a2254282bc33646284ab48e0459d48abc977f30957df8c3c9bab26c435c611e81ec6e0f SHA512 0c888ba583a7320ff0b3e55e7543b96ce4f16069bdd3c6319cbbbd36325fe28e96c1464bcc989aa3573021f9a8644d692ee943cf9cf9fefe391ba313e76e1136
-DIST github.com-gophercloud-gophercloud-781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d.tar.gz 543860 BLAKE2B feb8c6b67ed4af87e1aafa1f93ebbe1f3e79f69382d93b4298b69e17a4d0b079f1341da6d1c740c1d9e62e7e072e6e2b87a3effbd10dfb996b2fd741f01f4af4 SHA512 5e6aaef5d0e75dee5c4531441b1b0580a456c7c7c98d69ba37c37928d28fbc0136765d7a62a3564259460d817906b77bf8e3bcf76515c3a7ce4690a62acf414a
 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-gregjones-httpcache-787624de3eb7bd915c329cba748687a3b22666a6.tar.gz 13588 BLAKE2B 2e86bdb3f8a6dd2a02145aa328ef928d5aa732a3b88df4285265632b3f490dbbcb8836db6abea5fbbbb97df1f1fe89b3e4df8a1d87367d0027aa517fa5437082 SHA512 4e777e600903a3463c451ff5121a57795f4815e0c3004a6447baa9824c9b60e994fe05761c63cfbb462d13967f381249b47d7292a635b87096a2c71f53a81f7d
 DIST github.com-grpc-ecosystem-go-grpc-prometheus-0c1b191dbfe51efdabe3c14b9f6f3b96429e0722.tar.gz 20764 BLAKE2B cb5d2ef073be0df0b185cede4c4fd924d160a4beed06fe6ed748734865272ca958cd69208684492932cd4ecb5b36c07413cd0cda3fa43ac4cc1b0e8337407eb7 SHA512 6b8b8b980ee9b98b7508045c4dfb5be38dac586d0bc2fb3b9118824336e8a32b2428265e9aac427bea68cb7ed5079cf1ef910de284862b1845f05c23e09dcbc3
 DIST github.com-grpc-grpc-go-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-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.tar.gz 12309 BLAKE2B 1ec44016ab8d83bc9bfbd99216d72fdfe96959ee4644ec3dbd60893de121361d506930ef2de5aee8815ffa96754985895132fdc30678aa9bbe26a67091223743 SHA512 bfe0d2e0a7d11aa4bb03a4c3c0941ea5cf2f295b45120ac37ae705659a4700c0ed3df3b140443fb223514d8a5da9b53758bd133ce733b6f7da257785a6ffd995
 DIST github.com-huandu-xstrings-f02667b379e2fb5916c3cda2cf31e0eb885d79f8.tar.gz 16630 BLAKE2B a342eb5cc38aca4f5a5a5a36295c0c804997550997115b86373b6b6879b0d6faf1576aa0e0b550127a1b9fa477e2fa27c44c7a6be93c827ffb913419ba4792de SHA512 f291b9893795084d081bb6cf025ff82044b2ef436325a3f0e16f6a193e5ab516439895886a284ba45156839bcc643b5e702db7d1bb438b093d91a2ab4999c62b
 DIST github.com-imdario-mergo-9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz 15928 BLAKE2B 1a6f95308897829160a1a61d76fb17fe6da2159ec68a9def1294eee0f7c5acfa0de9581a7afe05353a79088374ebbe8ca1299844666ee52a3074b8a2ed04d02c SHA512 34bdc7ed182a4290862c4c21fd9442e6b3bc03a16aa04a54aede48f16c0baec62478dff97433c6d3370b110abf4a712b304064826589ef922d1bf8cfb80fd446
 DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
 DIST github.com-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-kubernetes-api-05914d821849570fba9eacfb29466f2d8d3cd229.tar.gz 737787 BLAKE2B c07c3c6d6e86c4c8b20916c86ec53673a45a64b297ceb4ae0e617f887dc8b3de7bb83fc1e07476062be8e6f5f493c79030b5736109d7fab1e4ea03f3d24bbedb SHA512 6fb81d5b872625c6e51ef981c37de13f073537c56f0b3ca26a489150097e5743dc0caa72cce3117a4538a737efffcb3039144f2b815744367e93aae44ac2fd18
 DIST github.com-kubernetes-api-6e4e0e4f393bf5e8bbff570acd13217aa5a770cd.tar.gz 775958 BLAKE2B 0c30e606694c8457e0ce36aab860b93d6807020891be9a923ec3990b83d9f4a5d7323d9d283b7d5f1e0d122fde9f4d80b7860c2c2db19ff06ed93ab93a723199 SHA512 29a70fa69173d06ba84bd313d433cdeeee9a0326a5f2f4a7e859d6e5cc4fc4e6e7dde7d13b8002e0441dd42f84c170770b9855d3b4b5412e6cdf19bcba650599
-DIST github.com-kubernetes-apiextensions-apiserver-0fe22c71c47604641d9aa352c785b7912c200562.tar.gz 6326569 BLAKE2B c59204cda5a4fa07cfe4df6134f1f3b23e1060a7abab1947aa6633076f98278fc9d0a37c7453fdaf945fd2d3855633a273ac312ba11f3aed5d7f564c9c431c06 SHA512 fd50592515972f325355bb01d548eb0a45addd90844f2c67e492a6eca6e1ef690c149876319b68ed77488869b33898ab11e26876745b4c9ac630ad464cd08910
 DIST github.com-kubernetes-apiextensions-apiserver-727a075fdec8319bf095330e344b3ccc668abc73.tar.gz 6258035 BLAKE2B 7419fe02e398c4764290f21e20992c9449ea212e43a15c6db44dd78c21b5572fbd842a977dbd02e8c084c88aa0dd39283681fc92eb9a1b4c6f37e4c8c58fd93e SHA512 1e5ef8152ac7a85ac6d6de99fa5a4c5900c748aab292b6d7a8af4e7fa865a9f6336581953ca8c0a6cd3b8b3cd6eb4748d373da483ade428865275d987d0193a5
-DIST github.com-kubernetes-apimachinery-2b1284ed4c93a43499e781493253e2ac5959c4fd.tar.gz 460798 BLAKE2B 6603f9d9b606ca8f40eb1e68957e0ab3c82328fbca602333909d4ffb7fb6944d8b2490ea5f3265deed719fdbfd1af31309ae707544f4cdd03d04304e4ce804be SHA512 66e5b0c0d78f7d86693b349dba9386877e22e6d1d57c086ef7cbcd911c058c2250bdadf4621395f4feb3e1011a08cd8d4ed58a0740932360755cef3e36eace0d
 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-3ccfe8365421eb08e334b195786a2973460741d8.tar.gz 1194733 BLAKE2B c1ed5fbb1a1bc9aeae04f74a8911d15ed385dbe614767d2c059d8ab6ce57038d3ae9f699397bb78ccd46b4018e9a28c7906a1dd30a3088c4c5582f95c4c72b2c SHA512 dcdcb996445726dd7faca266e5886c3023a20043aa66f52c2bbf3fbec6eb34022a9fe1dd2f2ad541ac147dab35feb19d34b8c184479ab47f9f7efe8ff7c1cca2
-DIST github.com-kubernetes-cli-runtime-835b10687cb6556f6b113099ef925146a56d5981.tar.gz 61485 BLAKE2B c00185bc4ca03d1630095629a61d5c8421ea8943f37a683c8adc03bbe450f324304d8560c1dd3c5b7e974ab7f8f8b9c7b7da3a16e8295d3cd59368dbb813755a SHA512 48c1decc3fd73908ef3333431fbe0769ffa2a035b2bfc4997db0458c15f64a357d773d4f881e702a86952d66b5a1e315bf4f2005635921b6976c565a47ba50ab
 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-8d9ed539ba3134352c586810e749e58df4e94e4f.tar.gz 515829 BLAKE2B 05e3e89336ed657a86c1bb0ac19c32b5aac4c86e36d31d59f12fd37246b3c3f727a896b5d168eef12bf492386c4ebe19b3c15c208584f9c94f14904a56b31c0b SHA512 0b6d0d4ac568afc1f0174e9f174bf4044d269b0a7e6789702519633ff19c37b7c286f185ce2032150bcbfe5d1d0b95ef0a35e3cc426375f9440a0d9fd7973cb0
 DIST github.com-kubernetes-cloud-provider-9c9d72d1bf90eb62005f5112f3eea019b272c44b.tar.gz 1491284 BLAKE2B d9ca8dffff0a374fe1a6faffc202d6793e9be10a10c1de9f76d5fad37fe26a45ff8ca949f5eb43889c1491c9c85ff714eff55f3690ce12a791493cccc91fb26d SHA512 d48c0d88fda9a68be9550c7498cd0e2073acba6187a9d2d90f54a66261bae22a83fe7b20dda67e7003ffff1c1d3dcaac757a3f7edbc91a3850a6b5b7ec6528b9
-DIST github.com-kubernetes-klog-8139d8cb77af419532b33dfa7dd09fbc5f1d344f.tar.gz 23223 BLAKE2B ccc8c95a1df0da21baad483728c7583480ceab472d9ada63ee9801c89fd69014960cedbb5a800105f16530de0e27302997297ad442de06c50f6386a468e49292 SHA512 124a02ba552792b9ecc542a3e60637a04daed1f1a0f786820adfe71556b4f8c57d829dc0a6634ed21b7bc462e121d45d5562b5d790cfca816f8acfdbf33aec00
 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-kube-openapi-c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d.tar.gz 373109 BLAKE2B 02d4aa973802168a1d74c3065e8dad056d7863613d78aeadab5cbec040d0990905e654018ba44d9901909c723ddb9138379c2b4edf816c6af91e70008eca147b SHA512 9bd3d4b34be0446b463f7a244578248a65edc95aeaec6b976f4f08b1f5e08d6d9fb3c0e83f7141589129f3b4669644b4f4d0197e0084dd595b689494e927ce42
 DIST github.com-kubernetes-kubernetes-b7394102d6ef778017f2ca4046abbaa23b88c290.tar.gz 28009514 BLAKE2B 80cc0733172650ecf89b2579b43a75c532d47029a414f2bed1f18cd0e548a72d7aa0e573a196ef118e10aecf8f1e7db02bbc28a96443f4e9b3c806e4103409ad SHA512 fb59da6510d217623bc06d25414290b6174f80be01f67e025fb2277372f7de78c78e0600eac76110c17c87fd28dcffca47ebc58c70d9733b66e595ecff3a4818
-DIST github.com-kubernetes-kubernetes-c6d339953bd4fd8c021a6b5fb46d7952b30be9f9.tar.gz 28786830 BLAKE2B 071cbcaba23e4ffe55c2c0ed2f201d8ddb7a62dba94e67a6eef000af3706fc45ab7513617435539103f71917893f369f6ac5ea47c8ae8e2ae1ca1767298128d4 SHA512 8ba6cbc46ba8c734c70c84139db2e2e033ea320e720605654225fd37265e9f1b4f32f381b0e78cf23f0f459475e7bbb02fad5ff0c924942bfbfda9da809507b8
 DIST github.com-kubernetes-sigs-kustomize-a6f65144121d1955266b0cd836ce954c04122dc8.tar.gz 3437120 BLAKE2B 9eed49b8b5f924c7627304a48307de2f3db386c5817d8ad00ec1f15d6fc9900eb00b16508abee9c4176b3853aa940421d0dc6e9a7a900e4c4cfb85ed399cf42c SHA512 fac0eea0c20ce1c23986e77f6d7fcc783b044cd774f2cd05e50d6088ecfc179141d6d547e6537a0bcfe8d2291c2610bf4e6a1806d6d86eda4e93ae871c10f1ab
 DIST github.com-kubernetes-sigs-yaml-fd68e9863619f6ec2fdd8625fe1f02e7c877e480.tar.gz 14901 BLAKE2B 8403e128afa97525c6322e80fd9810334fa6cb8746254f98877478db49b7eac6dddb86ec4a980844ca1d4fa398d881a8338b80bfb51206017c771d6d4f07c9d4 SHA512 7bc311c2afca9d83af3242f008267e7f7ed9eb8320a55c09fc1d1a0854fbacbf04e38fe69efb8510aab54444e6b1bccb9bfbc5e54630a1cef153ea3caedb4f0d
-DIST github.com-kubernetes-utils-66066c83e385e385ccc3c964b44fd7dcd413d0ed.tar.gz 15766 BLAKE2B 0f38b77113a1a8cf963cf5e44d1594d4b08b8c71519b41c86ebc2d3b7f234785493510a8cb678775e5a9ca2ee0ed248efba5774eb10750d18ee939cc64c7f074 SHA512 2bd4e85b36949070f8a8d2d73a43ae8a91617fd395de57ac7b40bc20b7cb4b35185ce3a3d1b333152ee0f3415a5d8e2eb806b168f5d07b934e20cbf6d9fc5c12
 DIST github.com-kubernetes-utils-c2654d5206da6b7b6ace12841e8f359bb89b443c.tar.gz 41732 BLAKE2B 7e7a23cf383dd2a907c65110af4e9e240f94442e3a322eb8341e21e1c3252e1435766f4189d5e77e85c68117f2a7d2042826365eb99ef958bebfef788f7d90f1 SHA512 3a6c2944de6c9520a85ef1d0d90b07650c6b00619ab3cadaf85259ae43bf6c8b9202619598a87b11b3c8a1f77b621b3ecfbde667aec51d3441d5c96a4f0d7538
 DIST github.com-lib-pq-88edab0803230a3898347e77b474f8c1820a1f20.tar.gz 90417 BLAKE2B 080f410d849c6f1e55ee8f8fe8caee6acb2b5191d05b6c071dc87860e22cf9430eff823f1e8431a33acd99f0e0074cf776d68c4afb65b05e1b48bfa9508c2883 SHA512 889eb58cc417a8e128630b5511ccdca5d13c40cc96d449fa25a324485fc6b32e5d46c6bec33bda767b4c2c7804de4668762bdf34bbcea5b4d32ed5a2670f2019
 DIST github.com-liggitt-tabwriter-89fcab3d43de07060e4fd4c1547430ed57e87f24.tar.gz 12277 BLAKE2B 7c8c248116cd4feea2fb9bcf22d64e110feb6e377c9b2859a5f0786e3949b57505d1ed3d072bf2216a0ca0926978932d60ed84f236d9d2fee26309ac6582c6f2 SHA512 f1aa930429addd014ce293038087c447e44d0f840963b188930cfcac95490ea52df174bb662a0c5d506371342dbd8466223b3a0f6641017fc20d59f7f209b33a
@@ -106,9 +87,7 @@ DIST github.com-opencontainers-go-digest-a6d0ee40d4207ea02364bd3b9e8e77b9159ba1e
 DIST github.com-peterbourgon-diskv-5f041e8faa004a95c88a202771f4cc3e991971e6.tar.gz 16071 BLAKE2B c65da7576174a8e8d316c46263352ae205bb83d2d3388cef32eebb8e30cfea446ca8dcee97677f8e7d5abac1f0fb4236d1eb67e58072cda679ee13957f4315a8 SHA512 d735dd7755307d2b85a23a4606302f59dfa7d4f8a3797594166c2db165f64fdd103f821175c50fdb3f34c9f15cfb78e0c9932f9ef014addcba6a93e6ed5e1747
 DIST github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz 11345 BLAKE2B 9f25872e040b5e0602e658fa728e93a300c00ed1064966370e1b676eea6a94d6bca491b2f6c33a9f2c4d1c522a3ceee540aede2dc638eed238de8485500821e9 SHA512 fa82643f622150b44b198451c1e41e042fd7ceefad9d68e32238d48c9a29c6fb14780fca9d9a7dec660365062d4089c638196960fac056b685e7543410774228
 DIST github.com-prometheus-client_golang-505eaef017263e299324067d40ca2c48f6a2cf50.tar.gz 130114 BLAKE2B df1149ebda18c7940ea35fbe09b08be6437a8d4c4f812e3b4b088da8a374718212f0b10a153f3e04a6ffbe0bac109a92e5eca8b95814d221cd6a01d5fcfd48c5 SHA512 27a3cd10256ba6784b2f1318919ad6ce9e2a15c029c18961cd760a7569d5c683097c7407478b2ec96852163a321cda854aba18b0a73e0dda836480d05451bd62
-DIST github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz 75589 BLAKE2B b739cbfdbdc070aeae55f25d263ae74fa07cb4af0b8d7b9504ccb954c4df7c8bd40f6e2392f16f63cb0f3f41c282e16655ab0d04ffddab241e3472cb6ef04faa SHA512 5fe34c1cbd9aee1d1e50424aec83a1e72d834b25208e35c1af8b30519f6db26a6d54adeacf40006f4d04539c1d2e8f577641c8d796314cd71e9b87b20847b2d7
 DIST github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz 54855 BLAKE2B 2a7fd47a9e1dbc794f5de84d5ee3512b282f5f94d044dd9b471ab5ad138ebf2940c4441e6b4d89404f3443f0ba466fdab8fcf58c92d9c85798f23b5a0c57a6fd SHA512 9d4d52142888edff091f23496aad70ab2924dff3a27930cb6df81c5452ca897b9d61eff74fbd092372ecb4bb005b4d362ea6b0602e1764ea4f2a30e23048a81d
-DIST github.com-prometheus-common-13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207.tar.gz 58775 BLAKE2B 05173a41bfaa944e2096b4360e0974f921934b6e6ec8b34cb7322158cabaa73e60ab091d4a5bcc9696b29995e7f71bdf55cb832af140a153452cf66c85c9a3cd SHA512 9d4a937d12a738a7802102415cb061e0009ed43f901420560637e13f7952c26dab52e67011d8b1f8ffe474e223198a23becb65a6eb07cee1be9f6b1add566fd4
 DIST github.com-prometheus-common-cfeb6f9992ffa54aaa4f2170ade4067ee478b250.tar.gz 88669 BLAKE2B dbdce2a4a54f18a97363ad809d4283aa729082171a9c95ae202e8052ed32c3ae099e0afc2b4232f9979c2eec75ba24e6ab2957a25506d6055a428bb01a0391c6 SHA512 55c21f0b289e4bd7fd09c270ba0b86761d90359df4f934524185d8e11da668e44fcecbde9204b67b1642ab8ae86b75f359ced20a4de3ed917ac0302bf82e0ea9
 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
@@ -119,10 +98,10 @@ DIST github.com-spf13-cobra-fe5e611709b0c57fa4a89136deaa8e1d4004d053.tar.gz 1025
 DIST github.com-spf13-pflag-298182f68c66c05229eb03ac171abe6e309ee79a.tar.gz 46092 BLAKE2B b1e4bbebcdfd2bed394e0b1e93f47951c29a8b6c4b9e5435c73b34f18648ca8ac6d51e6c664dc41310f0b953c4f4d2cded88f43a27312f42d394e7e699cfb8ff SHA512 1e1ca10d2d42aacbf0da8d62dd786c024c86054212e1531ea7bbebe7ead1aa9e47646ec19d8895b6d3914da8b98dffad17fdb207bb917a9e19c9d777b9de6c96
 DIST github.com-square-go-jose-89060dee6a84df9a4dae49f676f0c755037834f1.tar.gz 289746 BLAKE2B cff786ac7a6c39829ffd4d7b7f0fac3893b7c469ca35f008558ca3a7dbfc376fd0166c8ed7becc73d0f8d67b456ca00104f08c8841ff156a9c1f9a6d68d3b25f SHA512 fac5e8d32f93f252b2e64d60f2e4da65a11e9408ac4db0afdb3f2357a814cb3992ade307bc8bec8799703c0cb63d05f7d4eaa19e13bab6402b50c1cd246bc50e
 DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613
-DIST helm-2.13.1.tar.gz 1188128 BLAKE2B 6bd73fcce610a8cc00a1fc9114646f1e924d99056ff09e9e0abb6c389eb7e4290e1331b856ee6ec7180e8efe0cd4e5df27b40886e9346be26f4ede9722f3bd14 SHA512 bc917c5d9a51d4ee7b05e539b07819367edf3cde02a5c8ed19d8578fa9b0a708c37552d46f07b5c1a93e77235b273a3ada786f3ea5a626d1bb391074eb827b47
-DIST helm-2.14.0.tar.gz 1239286 BLAKE2B 6749b3fbbc6f9299f37e0041fb1f0d2120031631434f61c07220f6c9edcff479d7ca821e41b2daf0699b67e5ba5277636b07c7cabc1d0f9e49c9a6d048d6db44 SHA512 04daed048b1892fc896d710f616334d7885a3a04d01a79e4d884acd57d36d86f77cdb13541594ea35f5ba78712b0502515e194e210695b44a2f2f6ce858f70d3
 DIST helm-2.14.1.tar.gz 1239597 BLAKE2B 349f57163c9e1cebc61e5a717c08d5bfc0fc549c98f47e9e942ae4db80e5f5d231e9a47e910dfbe126c3e65f63ac71de18ee9271bbe4ac6398efc4eaf49ad787 SHA512 4dd94c965ff5a28332fe68f397419e586253cd3e74131645566e1f4db0290906e4a49707d7cf53fd05d63953b23b6bc2eae86dc311a2758ebc4e60b54558cff4
-EBUILD helm-2.13.1.ebuild 8867 BLAKE2B b820ca25fffd469d127e02af8752ef284031804e5c06aa152fbcf8c06432d858ac8c2ad01c5cbeb83507cbba23dbc15f303c40240116ca2d4f7a1d4e9e040f24 SHA512 7f03979c65de8ad4cf5e8cbb56532a9ffa820eb9e5a3a21a6838ab1292eae0de74ca09c2465abffa9f3483d476d53341b32411b43f800fe23f0f71c3f6cb6544
-EBUILD helm-2.14.0.ebuild 9532 BLAKE2B 822c91a7830b5c068e4adb5d677b9c5b78811f4fc672d3d603bedae7e3d9297da78d8ca99564e351ad304b2a963b7b4a243be3a2550afa1d56ba864e65c3cb90 SHA512 1d96bc96a68e64048d91c26acf5922946d4ddda881e48ab8253f841984ea627f40dde7958bfb5fdfdfe0c42d06c9f5cb40c5ee38b315321273a0f2f043d56c3d
-EBUILD helm-2.14.1.ebuild 9532 BLAKE2B 50824e3fed45a11ea5a46c99fea7574c81d41aff1b4509784e70abb62c2faa0c4a0dece2a5cd000121f2730543e40f3ce34cd64a92d4d326c5b75c5a1efb1671 SHA512 ec71ebbf82ef887b289c501bf299eb87eb126a319224afbb1e6269f6b353bdfb64b3e705c3048b1331689f7bd90e3083516358f46aa6af33b2180244369efe1d
+DIST helm-2.14.2.tar.gz 1241660 BLAKE2B 6c29bd606c8628b4ec581704ea5f6e062428886e19c5c3ad688364369a5085322bd3685375801d27ce1c087af0c318c25bcc49ba9d3b46d9757c8345dfd62537 SHA512 ef742407f1fedc95dccab17d2c7cee3e96eb309f782b65e4f74a221b0bd51e93eaaddf0ce6fa008d97bf90e1a91fbc2dc5a9a80ad49b03f731e9a624ab536169
+DIST helm-2.14.3.tar.gz 1242779 BLAKE2B 8c16da15b54974b837397784734fa8bcf53240d075261a7dceecc6fb6cd172d72ba0d060d55001a87b5910b1b715646729b10e689ee6a1602aa26a4bf56013a7 SHA512 80f6c437235ca0d0c8f330135d689d2d5a9414d166717f72d8c3e2952c35f33fe621579e221078e65e2c5cc648e44ef037356b7ac18bce985daf642493ec4297
+EBUILD helm-2.14.1.ebuild 9531 BLAKE2B d29b86b461e47b6edfdebd759eea24b117469d983b9b3cb82172948083cefe3cbaa681ac3cec80a0d88edf29de82d33b95a63ebc38ad5e19b8b5b5a0be07ea6d SHA512 8f6ffa09ee52edc13e17c5eab351cd487d843fd7136480eef82bec8708940009bdc8b529df0ce0418405448aacfc5efabc3afac9d3d193a1a2d6b6f32b2f74d7
+EBUILD helm-2.14.2.ebuild 9532 BLAKE2B b9d0f9eeb6c78f842f048bbf544e524393d0c46edb197d6d95414b706a548a13259b5d254be97d33968a7c342c677d661ad9ea0ffb4f7c24925ebb1663106a25 SHA512 e7ecbe436f5d0261bda7021a7cc3e7ce4761394c2d99bfc8e4a5bd523abb264e4bc74b03d32f20bf80142eaedfbcd967fdd7871ccdc9e01de0b33fae1cc87d9e
+EBUILD helm-2.14.3.ebuild 9532 BLAKE2B 7f5b9a35d5b48f5ea74862dfbec5dfcf02030d7a1eae45623bc6aa5f0c1d06a9a71435adacee7f29e5328a1d5ab8fe44a68be2a2c5688f9e13c5d14ce9b709c9 SHA512 c06ae015fba06aff3d0dc7517da0ed17ee0518a7e4f3ff37276e687c9e17f44110f2013dead95a86557793b97ab97a79d38fd0b7d4a0e6c541cfaffaed59a774
 MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
diff --git a/app-admin/helm/helm-2.14.1.ebuild b/app-admin/helm/helm-2.14.1.ebuild
index 026af23e8342..094c689bda90 100644
--- a/app-admin/helm/helm-2.14.1.ebuild
+++ b/app-admin/helm/helm-2.14.1.ebuild
@@ -116,7 +116,7 @@ GIT_COMMIT="5270352a09c7e8b6e8c9593002a73535276507c0"
 
 ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Kubernetes Package Manager"
 HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
diff --git a/app-admin/helm/helm-2.14.0.ebuild b/app-admin/helm/helm-2.14.2.ebuild
index c414ad4da5a5..c521271d6a86 100644
--- a/app-admin/helm/helm-2.14.0.ebuild
+++ b/app-admin/helm/helm-2.14.2.ebuild
@@ -112,7 +112,7 @@ EGO_VENDOR=(
 
 inherit golang-build golang-vcs-snapshot bash-completion-r1
 
-GIT_COMMIT="05811b84a3f93603dd6c2fcfe57944dfa7ab7fd0"
+GIT_COMMIT="a8b13cc5ab6a7dbef0a58f5061bcc7c0c61598e7"
 
 ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
diff --git a/app-admin/helm/helm-2.13.1.ebuild b/app-admin/helm/helm-2.14.3.ebuild
index 35d9af3f671a..5d54fb819d86 100644
--- a/app-admin/helm/helm-2.13.1.ebuild
+++ b/app-admin/helm/helm-2.14.3.ebuild
@@ -23,10 +23,11 @@ EGO_VENDOR=(
 "github.com/docker/docker a9fbbdc8dd8794b20af358382ab780559bca589d"
 "github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
 "github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
-"github.com/evanphx/json-patch 36442dbdb585210f8d5a1b45e67aa323c197d5c4"
+"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 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
+"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577"
 "github.com/go-openapi/jsonpointer ef5f0afec364d3b9396b7b77b43dbe26bf1f8004"
 "github.com/go-openapi/jsonreference 8483a886a90412cd6858df4ea3483dce9c8e35a3"
 "github.com/go-openapi/spec 5bae59e25b21498baea7f9d46e9c147ec106a42e"
@@ -37,23 +38,26 @@ EGO_VENDOR=(
 "github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
 "github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
 "github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/google/gofuzz 24818f796faf91cd76ec7bddd72458fbced7a6c1"
 "github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
 "github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud 781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d"
+"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 a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"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 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
-"github.com/Masterminds/sprig b1fe2752acccf8c3d7f8a1e7c75c7ae7d83a1975"
+"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"
@@ -63,12 +67,13 @@ EGO_VENDOR=(
 "github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
 "github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
 "github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
-"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
 "github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
+"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"
@@ -76,7 +81,7 @@ EGO_VENDOR=(
 "github.com/spf13/pflag 298182f68c66c05229eb03ac171abe6e309ee79a"
 "github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
 "golang.org/x/crypto de0752318171da717af4ce24d0a2e8626afaeb11 github.com/golang/crypto"
-"golang.org/x/net 0ed95abb35c445290478a5348a7b38bb154135fd github.com/golang/net"
+"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"
@@ -85,30 +90,33 @@ EGO_VENDOR=(
 "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 670d4cfef0544295bc27a114dbac37980d83185a github.com/go-yaml/yaml"
-"k8s.io/api 05914d821849570fba9eacfb29466f2d8d3cd229 github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver 0fe22c71c47604641d9aa352c785b7912c200562 github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery 2b1284ed4c93a43499e781493253e2ac5959c4fd github.com/kubernetes/apimachinery"
-"k8s.io/apiserver 3ccfe8365421eb08e334b195786a2973460741d8 github.com/kubernetes/apiserver"
-"k8s.io/client-go 8d9ed539ba3134352c586810e749e58df4e94e4f github.com/kubernetes/client-go"
-"k8s.io/cli-runtime 835b10687cb6556f6b113099ef925146a56d5981 github.com/kubernetes/cli-runtime"
-"k8s.io/klog 8139d8cb77af419532b33dfa7dd09fbc5f1d344f github.com/kubernetes/klog"
-"k8s.io/kube-openapi c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d github.com/kubernetes/kube-openapi"
-"k8s.io/kubernetes c6d339953bd4fd8c021a6b5fb46d7952b30be9f9 github.com/kubernetes/kubernetes"
-"k8s.io/utils 66066c83e385e385ccc3c964b44fd7dcd413d0ed github.com/kubernetes/utils"
+"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="618447cbf203d147601b4b9bd7f8c37a5d39fbb4"
+GIT_COMMIT="0e7f3b6637f7af8fcfddb3d2941fcc7cbebb0085"
 
 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"
@@ -118,6 +126,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
+DEPEND=">=dev-lang/go-1.12"
+
 RESTRICT="test"
 
 src_prepare() {
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 3b5c30718ef1..20e454376ad3 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,15 +1,13 @@
-AUX mcollective.initd 469 BLAKE2B caf0474a121950d72d6e6edac6ccc2ad12f47e916970cea005a29680078d560ef67b277c1308e3d62435b4aee1d264bc8774bd4e4a6e3047079b35f87c72f6c4 SHA512 f8356e70bdc879f1ca9e8528c0109db890e26e2b843bd454a08350fd3bfeafabfcf30ba6b5d39e0b843e3d063221a220fc8af80f42d2360a73b5f7bd95e6d462
-AUX mcollective.service 390 BLAKE2B 3d032bfbcc0499af0beafae05c008b420f3b598c4906e57a587e9a400f76a9d918d7d7c4c8543e3abd61f68e29e5e1b8a6ecb99e9bbdfaa34aae7b1a54d5c71f SHA512 28fdc1f094d8995c806e2bfbd5b5ba8299603e19d379270be009f69b5ae186abfde65d1b7d0c0213e686f0c1cf944731a22b1ebbef1bb8c12edaf298b6c05901
 AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
 AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
-DIST puppet-agent_5.5.14-1stretch_amd64.deb 17369338 BLAKE2B bc0544d49f704b07fe058164eb9e1f3f9dc8613337942043a1f4d1359105c986b3b170fda076e8bb4fb74a4d0a423c434d27669410edefe7834ab633217e1ff6 SHA512 410f3e76a571f48456ce6e6b83a957fe33391db72c428d2518001ccce23d29e4911d740cb9c70903050f9a69c815fce8988caa1ba469742b334b1f61229f1a31
-DIST puppet-agent_5.5.14-1stretch_i386.deb 18294894 BLAKE2B 928ea0c7113dc6789a37b83f4499485d17f09cf7ac1ace5c3aad87f0a93e4143cd4763f61e42d35a7561d5438d7b5d70d6181ab7233f72eaccb67cc4d5388d18 SHA512 8ae02257cf729ce41e6437d9ee2f221884b0e49dda7b3fc04ef200487c937f258075f563817bb064a19c30ec19b790f4d9d03e240d8a363f2942cd613c579c1b
 DIST puppet-agent_6.4.2-1stretch_amd64.deb 18776024 BLAKE2B d8fd52357abb9649d74c9b7e54eb0f599cc2b6b1cbe8a4bdd3bd21c69904379dcda2fdea4e642d3f86bef846d1bdfb14eb8c3daed50958ad3add46bde96fe5d2 SHA512 b1bdbcb1cb87bbf4391073b0596d759e1386bd5b93046d25be112f1ddad6a0d4da162116dc9f85908de67bfd3d956a1c418faf39a85c3ed0d02f9891d4d9906c
 DIST puppet-agent_6.4.2-1stretch_i386.deb 19250972 BLAKE2B 8424047586f7747daf24901f7ba134bfcd1fc4db094fd458f4298251880b0446221575cc463c511a32a6f7cf4c635c95b6132631640b5091e48b1e7cec67b844 SHA512 0041b1e3ff1401b21f7d9ab3b3aee66d76e30acd4748571ff3ff595d7006008e0d9d3f4c28db85cccece0cf08595cf4a3342353f5b18ea3e02ae02a094e42e41
 DIST puppet-agent_6.6.0-1stretch_amd64.deb 19177382 BLAKE2B c8034e4a943394da7fd97756b3dfb59897f3d787a8f49743a4c42ed47db4411f6d0e125cf6984728a108e5070cc8e42ca0a203d2afdcce99e08ae38a6ebb9293 SHA512 f0d129b357feb6e5d05c080437910e119bbce0e97e36927c2f97d3d7fb8f54a0eb1503a74ffec3cef7fd29785fe97ffd53f04a4be6a35b558ee278af8871289b
 DIST puppet-agent_6.6.0-1stretch_i386.deb 19443284 BLAKE2B c017abc3166b3cb04a98c511b5ab05dd7076906a38edd8ee919848c130ae5b1cb6c7542b6c6c3da267fa801e152ad963c84293083c709dd769185f943a4bebcb SHA512 adadc3201dae261f2000282b67b8c4735eeb588c4c6c5dcbcde2e655772bebb1c343611607d84ba1b019279480445dc44cd4e3cc3d64e89b70e93b85a37678d5
-EBUILD puppet-agent-5.5.14.ebuild 2478 BLAKE2B cf031524bec5e192c4601d0078db68fdf87f11dc589d7116e67cbb3a11467712a04fd2244bb45970e891f953a168631d15628b1214e4ceed76971577a9f5043a SHA512 c7c5641b67cbfa72f726f420447567b3b89d676a1ffaf07b4672e86874a876b34909659ca32035ec4398c4dcd9f44f1ce0dff336fbc3b13a9bf81c4112e7f8ba
+DIST puppet-agent_6.7.2-1stretch_amd64.deb 19184682 BLAKE2B 6078c1b21f0e737881d949cfaf052571b40df450e53724696e2738141da30e59da7abf03ce00285ab77fd4ac52291ab6e42da373420807499f37b75c872fa83e SHA512 1c464448b1478397af7b806f8bfcaee0378af9d4b6bfa5a73e8245064329b1b49136107c5fcbaea0ef6cd4e1daf840d1ba331e798b2cd255ead54969520315c9
+DIST puppet-agent_6.7.2-1stretch_i386.deb 19452604 BLAKE2B 1915e7b7085db6cb87980a98a7cb85881331719e2af98b07f8461514a0296b3cf5181eb88f78893055a0fa09fc2ffce0e81e866db27abcecf9d8f745e329311c SHA512 8d89735601c9764e207eef77f5d42e836ee9d7c0c0f2856e0f293919cce52e7a42fc28fca42bd0e0bed760063aae527007ef7ce25503ce05fcfd495a44243ee3
 EBUILD puppet-agent-6.4.2.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
-EBUILD puppet-agent-6.6.0.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
+EBUILD puppet-agent-6.6.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
+EBUILD puppet-agent-6.7.2.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/files/mcollective.initd b/app-admin/puppet-agent/files/mcollective.initd
deleted file mode 100644
index 6500cd878815..000000000000
--- a/app-admin/puppet-agent/files/mcollective.initd
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-MCOLLECTIVE_PID_DIR="${MCOLLECTIVE_PID_DIR:-/var/run/puppetlabs}"
-
-command="/usr/sbin/mcollectived"
-pidfile="${MCOLLECTIVE_PID_DIR}/mcollectived.pid"
-
-command_args="--pidfile ${pidfile} --config=/etc/puppetlabs/mcollective/server.cfg --daemonize"
-
-depend() {
-    need net
-}
-
-start_pre() {
-    checkpath --directory "${MCOLLECTIVE_PID_DIR}"
-}
diff --git a/app-admin/puppet-agent/files/mcollective.service b/app-admin/puppet-agent/files/mcollective.service
deleted file mode 100644
index 9a6fdefb8ca8..000000000000
--- a/app-admin/puppet-agent/files/mcollective.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=The Marionette Collective
-After=network.target
-
-[Service]
-Type=forking
-StandardOutput=syslog
-StandardError=syslog
-ExecStart=/usr/sbin/mcollectived --config=/etc/puppetlabs/mcollective/server.cfg --pidfile=/var/run/puppetlabs/mcollective.pid --daemonize
-ExecReload=/bin/kill -USR1 $MAINPID
-PIDFile=/var/run/puppetlabs/mcollective.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/puppet-agent/puppet-agent-6.6.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.6.0.ebuild
index a72df734d6b1..c648209a4a7e 100644
--- a/app-admin/puppet-agent/puppet-agent-6.6.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.14.ebuild b/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild
index e56b95fe5bbe..a72df734d6b1 100644
--- a/app-admin/puppet-agent/puppet-agent-5.5.14.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit eutils systemd unpacker user
 
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+DESCRIPTION="general puppet client utils along with hiera and facter"
 HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+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"
+KEYWORDS="~amd64 ~x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
 CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
 	!app-admin/puppet
 	!dev-ruby/hiera
 	!dev-ruby/facter
@@ -48,7 +47,6 @@ pkg_setup() {
 src_install() {
 	# conf.d
 	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
 	doconfd etc/default/pxp-agent
 	# logrotate.d
 	insinto /etc/logrotate.d
@@ -66,9 +64,7 @@ src_install() {
 	fperms 0750 /opt/puppetlabs/puppet/cache
 	# init
 	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
 	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/mcollective.service
 	systemd_dounit lib/systemd/system/pxp-agent.service
 	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
 	# symlinks
@@ -76,9 +72,7 @@ src_install() {
 	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
 	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
 	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
 	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
 	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
 	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
 	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index bf0bff39976c..162d67502bf5 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -12,12 +12,14 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
 DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397dd0a4aa26f5d0fa9ffa94477a5cc59b3724ab9ae3ee2e7e9230881676582c328c804ce9138dc484b9bd92e0ec3 SHA512 861100c02e0b8a5bb232d266bcd5e54b0e32cf26954ea37f276690aa3159ffdb28195ab8691df61ee0098300d226ea1d369dbdff8aae69101c2bbe6068ede8b1
-DIST puppet-6.4.1.tar.gz 2893151 BLAKE2B 5c48b30083f93ce3625551020cc3b386cbc4ca8ab249099249099dc7aa8866186c197732ad603366d5fa54c3fc1664d7b457d323a2e6d9266faa754f7d4fa4ca SHA512 260f933dac3a3033e807c5b7c63d5562d9d8d29d11550efd38b0a94eac811f27444156cc11db38da170dc2369981072288df471fd05738a0f0e951bbdffe2a52
+DIST puppet-5.5.16.tar.gz 3084466 BLAKE2B f3e2f12331b4794b90a81a4f80e626fcd3d5252b7cbdacc1d6243faa557540d3a68e5e23b7b5c3e4f4286774e9a9198e59fb15d7d7c41d7193754ed5c80dd624 SHA512 7d9e533e352a22e347ac6467094c4bdbde893c2503f47b4a2d175fd6e759e6662991efdd1a0a83d9495d22f28da4ae7a30cc771c5d90b8252c4618bd8837833a
 DIST puppet-6.4.2.tar.gz 2891159 BLAKE2B dfd8e5d9935d54272096fac66a037b8eab75dedc42caf18bafe29738e749a66869ad2e741753e8b38d872e21b1a261f2b4017c54faa57043754d619cf27652ed SHA512 7ec2746ef2a021d1cc3e3076840a9f1195fe51ba591cf2907e542b3f450cb1f4002fa3c958aee966c5976245073ba3cfacc9fd2a653d1d823720b33984aff911
 DIST puppet-6.6.0.tar.gz 2898687 BLAKE2B 67370b191985f75f783d795d7ef38df53fbf28efa8ab79ae309dba985f4ba296d2862fb366b68a46d03f526c3f27c51b1e1cefcccbaa96f6694dc888a7adcc2c SHA512 e7e7367565d12c208654bd353112542fb84b736f262dc86adb940e02a4e34d473e7bb5f084e0caa5fab01be4ef479ad2baa3e751d4d86ee447cf960f400413e5
+DIST puppet-6.7.2.tar.gz 2907345 BLAKE2B bbb0f789ae64b5039e5b1bd2ce985e89ba693d33352baee7a1d11df7f314663aa3606a73d42d6b20042f81ee405a72cd17b9cf8f3c3cb257869e982f84cfd552 SHA512 6ebcaff30bda27fc17870b991287d620d455db8cf9a41c59833efc2a7541d3622228a7278689eb0494d0f6328cd334764f21ffe8700a567696e05398a5c16b7d
 EBUILD puppet-4.10.12.ebuild 5620 BLAKE2B 75fed43f7044fef014b1c9297066e07a5ef624fd187d141475e5fbaf69aab50494e783a16b212f3063cfaa059bec310b9771ccfa88d3f8ddcfc5458a75d2ba22 SHA512 8649b6811f330733ba25602e35e13bbd5be094c8f395d5f6c7a859662d831a579b9b3ad2a44b1ed9ea60882c32eb89a261f5e36977d79a2e9a88d5f12959a3cd
 EBUILD puppet-5.5.14.ebuild 3822 BLAKE2B b639a7bd6b1a2a0229271a2c00ae246e5cd219b91510f1fb1b5bcc4668d2f81c631233329628b78240354ae884ca9e4de02287896b326eef1220c81eb3d4e173 SHA512 1043b71e29082c1020a4c67814394dc70707c3f299afadb035bb2e15e4425a38dfa76b2323f4ad31b7142c1494cb05616ed28f0cf8f46b88760fcc53c3e734a5
-EBUILD puppet-6.4.1.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
+EBUILD puppet-5.5.16.ebuild 3824 BLAKE2B 0501c0a04cea8cd762732a7b6728833c99c828d79c39c18dc738e2c7cb063a8f14f997108a4d3863fc0abfbedf9546dd1541f01cbbb4ea3fdcb723a49fe6ec39 SHA512 baaadc5c82ea91dab0dbcf93a5b836248183777db978e0ec0621183b695191a19b6c7fdad892d0cec05c4426c64c949eadc4dce89f08cdea8b7b6f6913d01917
 EBUILD puppet-6.4.2.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
-EBUILD puppet-6.6.0.ebuild 3654 BLAKE2B f29afbb842ad182df92104a03d02770c607f54ba228a694659b09d83c512bf9d7f269da42257e3ff92e68cd77e98da9f1b1ab317e791b97d338a3e30cdb3998d SHA512 4a197ad3b8114a4e7c685ff7b0ca21411645f542f1f3a948382f2755db126b6ad0cb61dc37f938a5c38a0c1ef27c5df4c91ea043ff2a3813f61406e63da4a84d
+EBUILD puppet-6.6.0.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
+EBUILD puppet-6.7.2.ebuild 3654 BLAKE2B f29afbb842ad182df92104a03d02770c607f54ba228a694659b09d83c512bf9d7f269da42257e3ff92e68cd77e98da9f1b1ab317e791b97d338a3e30cdb3998d SHA512 4a197ad3b8114a4e7c685ff7b0ca21411645f542f1f3a948382f2755db126b6ad0cb61dc37f938a5c38a0c1ef27c5df4c91ea043ff2a3813f61406e63da4a84d
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-5.5.16.ebuild b/app-admin/puppet/puppet-5.5.16.ebuild
new file mode 100644
index 000000000000..b28efbe22bd9
--- /dev/null
+++ b/app-admin/puppet/puppet-5.5.16.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+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/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-5.5.14.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
+}
diff --git a/app-admin/puppet/puppet-6.6.0.ebuild b/app-admin/puppet/puppet-6.6.0.ebuild
index 0038f1ebf433..eeefd4e8c63d 100644
--- a/app-admin/puppet/puppet-6.6.0.ebuild
+++ b/app-admin/puppet/puppet-6.6.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-6.4.1.ebuild b/app-admin/puppet/puppet-6.7.2.ebuild
index eeefd4e8c63d..0038f1ebf433 100644
--- a/app-admin/puppet/puppet-6.4.1.ebuild
+++ b/app-admin/puppet/puppet-6.7.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 33a713926060..218e68a84da7 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,9 +1,9 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-5.2.7.tar.gz 24353701 BLAKE2B 196b336a92031a25f7f28ca070a831857f3e0dde3ecc02e12e6884f3628c12dcc27b347c39147636addc975841f340fbf89196e86b3c10efc2ad1f16cf6f882a SHA512 989fa232d0fbd90c975fe110caca9b9c92a90167eb7b8d0384282dd8cf85111a56174c6785d7c73800e19185e879e258b8e6cefb210c1c44a229ce994336ef1d
 DIST puppetdb-6.3.2.tar.gz 41707817 BLAKE2B 480737af3abc862e90a7075011327ce3821a5d9460c785602c105ec7accc82f2ea712ae488c585226126e88f817cbb1acda7fa09793b7508aa38cc47e1c76ab0 SHA512 e2a3ce73c976cbbfa6acc62612187478cf5ecc9d514ff4866a74e2c6364979f17c3daeba0f03a01e7fc3eeb1ca84a3c886fd5eed07d2a9fbaa5fd9f7c9d577af
 DIST puppetdb-6.3.4.tar.gz 41716289 BLAKE2B c2f0c074229340234e8ce146d6d711f0311f4a4d6c091ef497a376a5cca02f7bc5a85fc63555f7408f16dc60784266ba126149fb27a9e0bf0592d7ee314e4b4a SHA512 9da3707f0ecf1b7664dbf44dbc6dda79adce6928298aa8e263bb134bfccaf2403245ed0176f8929583f5631ba3927f99d6d06233eca07720d0fd174da33e4990
-EBUILD puppetdb-5.2.7.ebuild 2760 BLAKE2B e5c86d79191a026de2ffd9e322669c07258ef6fe4ddef436be534c580fb14e7ba5fb13c91d1cae61e7addd3571a938e2ec23c0fb61d6a4318f7807f08f1bdff9 SHA512 e60d80aa5c60d54b904e8402bb9e729e2216c2b038b34aff64ad5234cdeda32418da10b3f79029a879f20bfddcfd6923647aade0e3c566672316f72c9dd78761
+DIST puppetdb-6.4.0.tar.gz 41720668 BLAKE2B a4637750c553eed8ee5bdd46212a7455fe1d59015aa78fe01f6fa9ee2b4a98ec50a2a8b551f65d4bc6965b2a969f559c53f5a6324a8e48983a1d027948387ce7 SHA512 c49afce1661ed284280e89ed9dbc2406a657e5f2cdbc501acf50900d431b58a341f1541789ea4ffe9109e8d30faf47eb85573a589426c40ad50597a7d81b5552
 EBUILD puppetdb-6.3.2.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
-EBUILD puppetdb-6.3.4.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
+EBUILD puppetdb-6.3.4.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
+EBUILD puppetdb-6.4.0.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.3.4.ebuild b/app-admin/puppetdb/puppetdb-6.3.4.ebuild
index 616793cb4123..77d1c1ca9cc4 100644
--- a/app-admin/puppetdb/puppetdb-6.3.4.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.3.4.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+=""
diff --git a/app-admin/puppetdb/puppetdb-5.2.7.ebuild b/app-admin/puppetdb/puppetdb-6.4.0.ebuild
index 5a1f774d271d..616793cb4123 100644
--- a/app-admin/puppetdb/puppetdb-5.2.7.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.4.0.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
 
 inherit multilib systemd user
 
@@ -13,9 +13,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-RDEPEND+=">=virtual/jdk-1.7.0"
+RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+=""
 
 pkg_setup() {
@@ -77,7 +77,7 @@ src_install() {
 	newconfd ext/default puppetdb
 	systemd_dounit ext/redhat/puppetdb.service
 	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
+	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
 	# misc
 	insinto /etc/logrotate.d
 	newins ext/puppetdb.logrotate.conf puppetdb
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 3b7d534cc755..9e1d0952ffa8 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,8 +1,8 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
-DIST puppetserver-5.3.8.tar.gz 53615153 BLAKE2B 82de090126c18a607089c2d260c38c4dcf28c9dd55dedde43952493ac0dd0553b718f1e96c36737514527e72fbd04a4b54eb5667123dd46d21ff7e7e6688dd08 SHA512 ac2b28bd506a92606f5458a079fe9ffcd8a7d3b091ccbfcd649f0a818d0459b57bc3f40fa599f2f6e7012ffbd4b7e95af8ac9787cda74928bd29bb59b7633ba3
 DIST puppetserver-6.3.0.tar.gz 75698674 BLAKE2B 4eb88b15c936f8a66c5447e5761cc35772632420ca74de17f06453c9645f6f4d6483ec6a850810401efddf07f40710bd9563e78f5f870faaa85c0c6b2e450fa1 SHA512 a3c3e9c00e3dae274a2139a166c121d1d9b1dde8ad640e70d68433eee53a9bcf7ad8ba53d6e355ee1de93a522f8e0169eb80f52fc438ce6a76ebcd007398108b
 DIST puppetserver-6.4.0.tar.gz 75721867 BLAKE2B 299d73bab6f76464fc7b2e3b5a5b63e4b0d6f11752990d2926db247dc5d6aa475f5de571640ae38f22da75505153ce0f83e7a952bd0d037f4d3d12fd37c8f269 SHA512 cc9ac9a163b1ee7488b1afb95457cea4ae9da205d4cd91dd70c8cc995fad32829b5c4d9de8baa3ca325ac235bcaee2dca78ea9cd50bc9dfe11f2837f64587a11
-EBUILD puppetserver-5.3.8.ebuild 4891 BLAKE2B 98328c3b80442b6d2d2900f1fb9064074a04687ba4bfad2c34745a448c05a4a021c50aa53646139006a457b09249d951628be4ea340b8ab0d8dc9450b7529c71 SHA512 2e94ec40dd0b3dff133bb702fb002862373901fc84350c093b98970c567d2946902b0eda72770cdaa12e6d952b840c99b02159ec09157a84a22775e5197923e1
+DIST puppetserver-6.5.0.tar.gz 76080713 BLAKE2B 0562128001a24eae6cec071a366e16ab3ce5b0babbe50330ecddd13ab3dbfd35d6cb23634770e4bd7904cd231752ce923d4af8dc42d783cc137f300efcb05fb2 SHA512 d871f3817c370ddd08e8d791deb1a30aa50ab0d801192ebfb5ef225d8dce21885175fe4e9911287437b687b2bcbf5a098d8b9511b24bd05fdf4854575a686cfe
 EBUILD puppetserver-6.3.0.ebuild 5354 BLAKE2B c75b4c97ebd41fadf589e7ef752291425935af7d1f1528401f7dd1b2b670cc865570b8a610f1901eba1037bdaebb2d8dd2998380e001c046bcf54fe35b02153a SHA512 613533ffbcc1925f2ff040880d82f2a20c231d66697a49d6fc5fbf5a17528d3b3d1285918b83bf8ef4b4ee729656be610bb30f0bbefa827376f57da1fbd34950
-EBUILD puppetserver-6.4.0.ebuild 5372 BLAKE2B a4a00a13309207dc0cfc8f584bab29add3a2dd21c83cc1ca165e55631002fdb645c036665f55f580c27776dd4ac67dc993749a01d9938189442020660ab70598 SHA512 cc4934c876b59eb4eed05e4bbde2c6973623236c5fe243a4b6245aff2816477cbe9f168c89dfb9530ef5a2cd1f67410c8c532e5c8b6b29426ac2c6f18b189c19
+EBUILD puppetserver-6.4.0.ebuild 5370 BLAKE2B b3b8bbba45305b658c94fcc43c9e2d11b854e80f536e5e3c3afc7c4182f954b9491f47eb83529dbd00a894b793c9a0cf660ed7b52051b840b24e7fedec97a6b2 SHA512 31b6e681af9dd22d9388a447237289e3e48d79d2e7e1ba79d10e70084b99a9d7cf99fdd19b58a210f990ed1b202af2367a0e0911f8579a876ff284413f6051ce
+EBUILD puppetserver-6.5.0.ebuild 5372 BLAKE2B a4a00a13309207dc0cfc8f584bab29add3a2dd21c83cc1ca165e55631002fdb645c036665f55f580c27776dd4ac67dc993749a01d9938189442020660ab70598 SHA512 cc4934c876b59eb4eed05e4bbde2c6973623236c5fe243a4b6245aff2816477cbe9f168c89dfb9530ef5a2cd1f67410c8c532e5c8b6b29426ac2c6f18b189c19
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.4.0.ebuild b/app-admin/puppetserver/puppetserver-6.4.0.ebuild
index e064d2554eb5..9200fa82fd3f 100644
--- a/app-admin/puppetserver/puppetserver-6.4.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.4.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/puppetserver/puppetserver-5.3.8.ebuild b/app-admin/puppetserver/puppetserver-6.5.0.ebuild
index b2fc283c15d0..e064d2554eb5 100644
--- a/app-admin/puppetserver/puppetserver-5.3.8.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.5.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib systemd tmpfiles user
+inherit multilib systemd user
 
 DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
 HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
@@ -46,8 +46,6 @@ src_install() {
 	insopts -m0644
 	doins ext/ezbake.manifest
 	doins puppet-server-release.jar
-	doins jruby-9k.jar
-	doins jruby-1_7.jar
 	insinto /etc/puppetlabs/puppetserver
 	doins ext/config/logback.xml
 	doins ext/config/request-logging.xml
@@ -65,6 +63,7 @@ src_install() {
 	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
 	doins install.sh
 	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
 	doins ext/cli/irb
 	doins ext/cli/foreground
 	doins ext/cli/gem
@@ -107,8 +106,11 @@ src_install() {
 	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
 	fperms -R 700 /var/log/puppetlabs/puppetserver
 	insinto /opt/puppetlabs/server/data
-	newins ext/build-scripts/jruby-gem-list.txt puppetserver-gem-list.txt
-	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+	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() {
@@ -122,9 +124,12 @@ pkg_postinst() {
 	elog
 	elog "# install puppetserver gems"
 	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
-	elog "while read LINE"
-	elog "do"
-	elog "	java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt"
 }
diff --git a/app-admin/reportmagic/Manifest b/app-admin/reportmagic/Manifest
index 40f40bdaeff4..09b46885b1c8 100644
--- a/app-admin/reportmagic/Manifest
+++ b/app-admin/reportmagic/Manifest
@@ -1,3 +1,3 @@
 DIST rmagic-2.21.tar.gz 451179 BLAKE2B b52d8dc7473d8679c0698a4d053a9740e72242b5e4de75b9ac44b9f38709c81f61da3b2dda814f5ed1e503192891fe33f070fc037e88fe7cc26c542fc67da02a SHA512 ed9f4e6f8d6160afbe138125c4cb65010a08b95390117ebf07ccde289ff42b78664b1fe677e23f46a221d153889f807c545329936829fceeae4690b00732a637
-EBUILD reportmagic-2.21.ebuild 915 BLAKE2B ca5be4252741dabb895e444c0f6c104b9b7c667c227ee25014b285efb789872bfd7f324ee344f6042a623a6d53d7d4550183bb10a3e2199a9e1b44cf92e952b5 SHA512 e02d7013ac519ce0568a46d1d7ce66dd6de2f2982aef7f9e8f9aed9f120e448a12e0d68a2bcb505179283972bd6c0898d89132931ceb3c5efffd6586b2a81d72
+EBUILD reportmagic-2.21.ebuild 918 BLAKE2B 0a6d0aa7bbefab15fdfaee46e525a51dd9745236a3487dd580b84b42afe8a22d08fdb83e26929793029dd09a76414a0051366652a4bafb3ea2d33f276304e38d SHA512 38dfcf32628ef422aaa461a57ce27f82e9674a183f2820b7dae1f5917e4e17c3f9e8dc560bf5dbe19b6e0f961a24172563cfa06d5c8eb1b40ba6899ca5e0e032
 MISC metadata.xml 275 BLAKE2B 3d57550415af007a55b63e9043ab4d6a6e77c51dbfd7e1e9368e18c0078e7a9f096ef3d5dbaf4d65ed3cf1bde0d32b184724ad06c93e654d07f9c4b83b1d04fd SHA512 8c3747aa12bd26e790ea267481292eb4ebfc2d27b7acb498547aae3d8479654ac9d13aecd61a49be21de831924ee3fb809d4da5a4c765127af10e13a9cb32fd2
diff --git a/app-admin/reportmagic/reportmagic-2.21.ebuild b/app-admin/reportmagic/reportmagic-2.21.ebuild
index a0214e8b9306..2993a06ce843 100644
--- a/app-admin/reportmagic/reportmagic-2.21.ebuild
+++ b/app-admin/reportmagic/reportmagic-2.21.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.reportmagic.org/rmagic-${PV}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="truetype"
 
 DEPEND="sys-libs/zlib
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index a3685888c9ce..6e68e6284d9f 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -28,7 +28,7 @@ DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd1
 DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f
 EBUILD rsyslog-8.1901.0.ebuild 12354 BLAKE2B a5907ced4f42a503ce63d19bdb2fdcca4db442cd64e053f9858d3809e7a40ccb879bc00ae2021daedf6463cb16767413c9b530476ae5f4c326779a808657f390 SHA512 961b98101d517510c3de600e1e2e74cc5d7533de2d6317b53cce49a8a6d704729cf4b10b6f502d65c0ae876257ce8d42a46319b718763b4cb59eef03ebbccff3
 EBUILD rsyslog-8.1903.0.ebuild 12531 BLAKE2B e8ad30c6ca996894be5a84be8a8b19ec2354aaf44aaf915c8471c0cc51156080a45fd2c422d2dbef50904f8a820693ef5e1f93267ce9fa12b37cb863028dd91b SHA512 5918af3232e7d2bd9b6e8511a9f29f276b081ffe2a4f6b3c0773b737b97d104b0722a64a3506360ae8794c2b1aa7c8c6327d63a3fcf9385db6324a409b940060
-EBUILD rsyslog-8.1904.0.ebuild 12568 BLAKE2B 6a94ed244881136b7cecd3ac1d6eeb71bbdd410e9b6f2365ae2058c713568089da38aca6f2d441c5c70edf8cc98940a2cafb1062bae6d02e90ee484d7c96d26c SHA512 3f70d0ae0380a5ec1831f70b9750613037add7921f6484d0f67dd91b7d89bc0e77cdbedd378d8f7f8d374407a054aff1fc735b4d5f05251563e7843b53596dc5
+EBUILD rsyslog-8.1904.0.ebuild 12567 BLAKE2B 191746200f4a5e059c45f94ebc401a14afb6cfa5d5fff0efbeb453f694d7051f3ce550a7eee329a9f32ef1cacda575b395d1b3f8ad978cb5579a9247a7dd68c0 SHA512 3943480907c10c61405cf134ecd4e9284bb66073741f6eb638e3e568a6e65f829990027904b0d02f93fb00f39529343dac94780981e4d182821087b92b06ecd2
 EBUILD rsyslog-8.1905.0.ebuild 12571 BLAKE2B 0d892e66f94d73b20c0addb444edd904d6961cd7918adcc024f813776d766775fad7c0a288df2656f1cee14387d33949bf1c85cb86f85158b1a700393aa3396e SHA512 2826e3eeff416a5673f8810673097a524ea34718af98d934a8eac7a3417167d167ea880bc3ec1ff0b984ab6d95bf3344566d557978c0cd04052d177ca55992f0
 EBUILD rsyslog-8.1907.0.ebuild 12546 BLAKE2B f4d18548e77429e8696925f7d3e16e9b3b16a9845ae3c118f6741d3f0d2b96243ef86436a5995f64591557e0e418647e4bbf53a2900278ac09a3c1a44569cc7f SHA512 703242178569e869bc3584486827c8a8401dd71532929da9d8f2ce56861774bc1fa0c04da4ebe9de48ff4060add22da35656c4d9f497409e3a76a742270db1c8
 EBUILD rsyslog-8.38.0-r2.ebuild 12281 BLAKE2B 8debd0ba1551ece2c24fbfb8893204e592ed40682eeab26ea2b32febfbf1442aeabf3f7215bd5371fc9c6abfe6923da887f71d12be1e7e57193b03d6b65c4a21 SHA512 7c95fc07a96854386a611878a53b625b0d95615058c9c2c97dd2ad2e563bca1cb14e81be747dab108e7304734d2c2f86a8d626626ee52178dd769fefd8339260
diff --git a/app-admin/rsyslog/rsyslog-8.1904.0.ebuild b/app-admin/rsyslog/rsyslog-8.1904.0.ebuild
index ecbf4356b0e3..599b21057acf 100644
--- a/app-admin/rsyslog/rsyslog-8.1904.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1904.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~arm ~arm64 hppa x86"
+	KEYWORDS="amd64 arm ~arm64 hppa x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index fb1e789d7d83..71640e30c0e1 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -10,7 +10,7 @@ DIST supervisor-3.3.5.tar.gz 421220 BLAKE2B 63e9db005596921c4a4426de361fc20992a2
 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 1959 BLAKE2B 168867deedc11199bff5b9d25d44056219809f35c3627a720469d755b3312f704d6568ef9331d46b4b177154707b10721c7058ead18af690b57c98f5ce912262 SHA512 9a35ea4c5381762644e00c2de4ae3272537e12357fdf17f2daa7b8c9a9187075f4625c38c555a3d6f32c4690fd8940deebaf3a27d4de9ca08fc8aa1797ebc30e
-EBUILD supervisor-4.0.3.ebuild 1798 BLAKE2B 0101fb3f69ba6750541015c4fad57bc9d195ba46d9ae0c09d4de30ef6d9acf950023fdb2ca8f201cd010391163a076ce436a0b2cf5a7ed8c62ba3417bb3ccc7f SHA512 ac93e1a1845809f3e9cb03c413bd42025e1f5c2105c7f4c4e9d07a1d371e373d0e93c006029aa7ba60a06c23f9ae10bf9da2c247623c6ddbeb8b97ec7b68ce80
-EBUILD supervisor-4.0.4.ebuild 1870 BLAKE2B d79b48739fcce9a26088df5d2fa7d0e06b0ae6351b90940b333f32f470959c49e6025a7493899d4e9eb364ed3d3364617bc71cc4b3b048d04f412b9f37608ca3 SHA512 8701e74eedc2a69358ca0b0c34d6d4ae22b54d9e7a304cbe6528ffb6cec619a0323914552e7192d23d16a6b29e1b445206cb6f322ad8a5770ea422275e94e4f0
+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
 MISC metadata.xml 623 BLAKE2B dc7acae3a83fce87bdaf98f65ba4ac2434e0344faeb8ad302dcba5be3a59f2b6ffa9d85338ad432100d5e1017e40bbeb606724a214097e14bcc7082eb331986a SHA512 f05e62f68c51fe2bab054d03b3a902682eaaa133de08ac558a92736868dcc8049d1f27828e3ecae8f5f64b038bb8a322e58c90401e6fe01d215941e1507076e8
diff --git a/app-admin/supervisor/supervisor-3.3.5.ebuild b/app-admin/supervisor/supervisor-3.3.5.ebuild
index 4aa769a63805..4f3af393c545 100644
--- a/app-admin/supervisor/supervisor-3.3.5.ebuild
+++ b/app-admin/supervisor/supervisor-3.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -73,8 +73,8 @@ pkg_preinst() {
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		# This is a new installation
-		elog "You may install your configuration files in ${EROOT%/}/etc/supervisord.d"
-		elog "For config examples, see ${EROOT%/}/usr/share/doc/${PF}/sample.conf.bz2"
+		elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
+		elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
 		elog ""
 		elog "By default, only members of the supervisor group can run supervisorctl."
 	fi
diff --git a/app-admin/supervisor/supervisor-4.0.3.ebuild b/app-admin/supervisor/supervisor-4.0.3.ebuild
index 2741d256322a..2437be46ea19 100644
--- a/app-admin/supervisor/supervisor-4.0.3.ebuild
+++ b/app-admin/supervisor/supervisor-4.0.3.ebuild
@@ -67,8 +67,8 @@ pkg_preinst() {
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		# This is a new installation
-		elog "You may install your configuration files in ${EROOT%/}/etc/supervisord.d"
-		elog "For config examples, see ${EROOT%/}/usr/share/doc/${PF}/sample.conf.bz2"
+		elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
+		elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
 		elog ""
 		elog "By default, only members of the supervisor group can run supervisorctl."
 	fi
diff --git a/app-admin/supervisor/supervisor-4.0.4.ebuild b/app-admin/supervisor/supervisor-4.0.4.ebuild
index fe9a32ed05ea..bbb3b923c1de 100644
--- a/app-admin/supervisor/supervisor-4.0.4.ebuild
+++ b/app-admin/supervisor/supervisor-4.0.4.ebuild
@@ -68,8 +68,8 @@ pkg_preinst() {
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		# This is a new installation
-		elog "You may install your configuration files in ${EROOT%/}/etc/supervisord.d"
-		elog "For config examples, see ${EROOT%/}/usr/share/doc/${PF}/sample.conf.bz2"
+		elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
+		elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
 		elog ""
 		elog "By default, only members of the supervisor group can run supervisorctl."
 	fi
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index dcba31518551..ffb6c0a27663 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -31,11 +31,13 @@ DIST syslog-ng-3.17.2.tar.gz 9119227 BLAKE2B 3268a51c587e66579b30ee8d27397eeeb3a
 DIST syslog-ng-3.18.1.tar.gz 4259746 BLAKE2B 3878a87bd195aadb0f9d024e1336e50268d69c00b438b5e3471f21bc4592ebd97980004c3624d9b92232b38068ebefa0c3317cb0d9b5dfeba37c479aeadc32e4 SHA512 2e6ea690f8762f3f37885118f023048c4cba59f58002c87fa1c469cb991b2ba707015b3e54c50f17c3d6e6251d798557406925a9159f4fa914331f281dc39e48
 DIST syslog-ng-3.19.1.tar.gz 4224779 BLAKE2B e938c91101c18951a5c921bea51631400bf579ebc840300c6d8411da9b8db69935d104bfe00525512ab0173b932a8e24e2fb102e17bc4ecf58b268e52ef5b41a SHA512 f625073bafa9378109d5be34591247766a62cb5a76e814f42bfbf03472e96ebe2833f19779812abfdd950a3498115f57b97c1427c280ee0dab21d3e2eb92ca57
 DIST syslog-ng-3.20.1.tar.gz 4312715 BLAKE2B df37ea15937d67823ddf25fb935be90fed2cb9b1a653d90bb447a3d674c250f6a7963a9bf4623685c5a19e11b928d02aec508d5f061135d67cd4b6d922795ed0 SHA512 19e3896a750ef68923950ca037846808f5d8bd24e64b41a024776a19654def83fce5d48b6e0805b1389494ad1435c5c7af9d79c1188454492f7228f5644ddc5c
+DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B e4f7e47f1939fb07d204c4721ff558a606cf6c6ee072278ff7c9bc1db7406e6abf058ac8a96bd4df0b867272bdbc5401528d47c94e60d90ff5ebb1aaec49e223 SHA512 4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
 EBUILD syslog-ng-3.13.2.ebuild 4701 BLAKE2B 4bc557a7545796a5c0c883ac3cee067396636e2292261db4f4c98c330e58b1d20e796f7214fd856d885f99fdc9f3db59ab59d3e1e0febda23ff97fdf9fedfc9c SHA512 f9ff35932c0e1af04ed237e9ded764ec1dc38d0cf952aeb1335d67b73f73262f8975cdb2f3908ee77252eef9d4ad3f6228025219bba9df263cd2b380c1c5df81
 EBUILD syslog-ng-3.17.2.ebuild 4920 BLAKE2B 2ee995d29e470961d08a0ed8dfeba52eb3a091b2fe17be737e504ec114566db57ac2b933fb1c3b851421e729990ab55c62d56dde80d923f2af67797ec1f53eeb SHA512 ba6e29ea457743897c950ba44785975134aeec9780b064bd1a935d398593a96618688f6b8a13cfabfc61bd5b38cc9640e0422bbc299dc7e190a2348877bdbc07
 EBUILD syslog-ng-3.18.1.ebuild 4897 BLAKE2B e6159007fb47bbe44110bfdda23250761901deb7a071430bd7a37df197375d5f079f8d038b064961eb07cfb6e6bbd044e5bc96c94809af2078652418b07f6da7 SHA512 c1b00c4cc864f145097533d0a6708e1daf3d840c1aea660c149e970fff099b0d3fc83eb5cc4b480c37e5a0325c97a3cca14d1a869f3a14a3eb2055f9127b9421
 EBUILD syslog-ng-3.19.1.ebuild 4920 BLAKE2B ad9cb81bc112bdbb4ae9cf36e53cd11eaa7380e180d2f44f025f46291a8c41c11071ad275d77a063e03ce0472c88c2341d3400a312988ebecbbfa173ad6b76bd SHA512 c937db23ab18b175b5f622a95701531ee43d42b9ca480778608e05fa57bf91635a8517b4f1b86a967d93815b7d77e7f45bb800a6cdb04db9e734a1cf3b0700c2
 EBUILD syslog-ng-3.20.1.ebuild 4951 BLAKE2B 45ad3ab6ebacbc0b0d2da1ce090d53e1ffc97d2c18648bf6763e6b7e4c0c9f8fa7bf6e746f85553aeeee144e3bf8997d6e0534357ee900fa26408b94ff815a7e SHA512 1164b8784d1061af518017698e71ce7ff48ecbc1a964eba9babe8436af141a2be119a9bd3553d1d3b90026df27f051c3a70dff23a1c7614752627f8583d1b028
+EBUILD syslog-ng-3.22.1.ebuild 4958 BLAKE2B add0726a5e7e776d7f5361900ddad8850c394beb631ce2837ce12b50ae046c5afb2780831f812ea8dfd0ad2c55c8a250e56088f64122c3cb287877c77fad6384 SHA512 5d75b179d339b2fdcc6eb8977e86fec921150ea5e25f6f300d159894c0efb8dfe2125dff25e54b22cc0aac3a32aa1490336623577ba57c430b636fcdcef52ed9
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
-MISC metadata.xml 1186 BLAKE2B 8fc7edd7e310b01dc6080332a62ed4ffc5d690d4082f800d8306232c138fac46f07ab7cebcbd40e91c2c41467880bbf61b4bbec0907e84f26cde51d24277f47c SHA512 5d8a62c83706e3bcb01b67e6873f7052c941518d566667e5b50aacdc8fcaf07a02c76ca3705369181795c2c62b5ea990cdb93501e1719d0693d597b5e6f8bee2
+MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
index fbeea5ea70d4..4f02d274612e 100644
--- a/app-admin/syslog-ng/metadata.xml
+++ b/app-admin/syslog-ng/metadata.xml
@@ -14,6 +14,7 @@
 		<flag name="geoip2">Add support for geo lookup based on IPs via <pkg>dev-libs/libmaxminddb</pkg></flag>
 		<flag name="http">Enable support for HTTP destinations</flag>
 		<flag name="json">Enable support for JSON template formatting via <pkg>dev-libs/json-c</pkg></flag>
+		<flag name="kafka">Enable support for Kafka destinations</flag>
 		<flag name="mongodb">Enable support for mongodb destinations</flag>
 		<flag name="pacct">Enable support for reading Process Accounting files (EXPERIMENTAL, Linux only)</flag>
 		<flag name="redis">Enable support for Redis destinations</flag>
diff --git a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
new file mode 100644
index 000000000000..7d9070a2279d
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
@@ -0,0 +1,171 @@
+# 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} )
+inherit autotools python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# unit tests require https://github.com/Snaipe/Criterion with additional deps
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.10.1:2
+	>=dev-libs/ivykis-0.42.4
+	>=dev-libs/libpcre-6.1:=
+	!dev-libs/eventlog
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.9.0 )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	geoip2? ( dev-libs/libmaxminddb:= )
+	http? ( net-misc/curl )
+	json? ( >=dev-libs/json-c-0.9:= )
+	kafka? ( >=dev-libs/librdkafka-1.0.0:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	smtp? ( net-libs/libesmtp )
+	snmp? ( net-analyzer/net-snmp )
+	spoof-source? ( net-libs/libnet:1.1= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
+	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	# remove bundled libs
+	rm -r lib/ivykis || die
+
+	# drop scl modules requiring json
+	if use !json; then
+		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
+	fi
+
+	# drop scl modules requiring http
+	if use !http; then
+		sed -i -r '/slack|telegram/d' scl/Makefile.am || die
+	fi
+
+	# use gentoo default path
+	if use systemd; then
+		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+			-i contrib/systemd/syslog-ng@default || die
+	fi
+
+	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
+		sed \
+			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
+				"/etc/init.d/syslog-ng reload")#g" \
+			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	for f in syslog-ng.conf.gentoo.hardened.in \
+			syslog-ng.conf.gentoo.in; do
+		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-docs
+		--disable-java
+		--disable-java-modules
+		--disable-riemann
+		--enable-manpages
+		--localstatedir=/var/lib/syslog-ng
+		--sysconfdir=/etc/syslog-ng
+		--with-embedded-crypto
+		--with-ivykis=system
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng
+		--with-pidfile-dir=/var/run
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable amqp)
+		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+		$(use_enable caps linux-caps)
+		$(use_enable dbi sql)
+		$(use_enable geoip)
+		$(use_enable geoip2)
+		$(use_enable http)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_enable kafka)
+		$(use_enable mongodb)
+		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
+		$(use_enable pacct)
+		$(use_enable python)
+		$(use_enable redis)
+		$(use_enable smtp)
+		$(use_enable snmp snmp-dest)
+		$(use_enable spoof-source)
+		$(use_enable systemd)
+		$(use_enable tcpd tcp-wrapper)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Install default configuration
+	insinto /etc/default
+	doins contrib/systemd/syslog-ng@default
+
+	insinto /etc/syslog-ng
+	newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	find "${D}" -name '*.la' -delete || die
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+	fi
+
+	if use systemd; then
+		ewarn "The service file for systemd has changed to support multiple instances."
+		ewarn "To start the default instance issue:"
+		ewarn "# systemctl start syslog-ng@default"
+	fi
+}
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 427591d74573..b93d59beb7ff 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,16 +1,11 @@
-AUX sysstat-10.0.4-flags.patch 887 BLAKE2B 289e53b21e8f3cd2b1a46219ec7fe7ba82b6fb660580481faa7a3142e8a664d16e4fe9213a5fe396d72bcd6a003ea9b7d06a3f5e4557ae05d3a225427f273b6c SHA512 7daf43a8b09af67781ae33cbaaf7d6da9bb1f6f750428a08c3ddde8ecb94e0de27d5746a332086eb5191cccd8e6dbc37c263ab3046294b4b3df1a2666c1ab6ee
 AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d88cf326e0e8109dc5996c22c812c64f2dfaaa6b0456b368d2b59aa30271b4de402bd83c2754c0224b4fd6598c604 SHA512 531340bb0770c07743caa6c760584c0f4cda5a5db7dd46bd2eee8ae1cccabecffee084571fb68a3510735b04430f2bb454068d9983da2856a0459ccb258eb89d
 AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f49718cc0fb3c70bc681e8cdda29394ea5a75d871c76f658305b26d44d1034d09079f3b6306a4dd466cd0775b5514b2 SHA512 80dd658b06f2e1072a3a58bbe84770170f1cb6c3e2ae0d660713a007b0e9e59c45b710cc1484c94ec466759455ae18a7fbae237b6674ee9ddb43a7a4502cb0d5
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
-DIST sysstat-11.4.0.tar.xz 343968 BLAKE2B e34da8cf0216f66fad3ade0ed40e8ec3b7641f7568ebcce5bc3122f888c90885ece346bf7f4f8e71e92435257ee5c6c0e5a89913c0e22a0ad28fa1018a73ea71 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604
-DIST sysstat-12.0.4.tar.gz 711554 BLAKE2B b671e185d70787f5773d6824a9838ddd5d5f537c66ac37895f88b6bbddbb78b4d81efa6f962e3b812d025b361ce388583811d4f199e1ffcfe1ba0f2119b6eb88 SHA512 0a47e2b692ac3317cfd72784f21cc03970d7673727c579d403895df0377d09836a1dc76ee5d99076f2c9347f033059d000d982f33ef915130c3a89afdd6dad96
 DIST sysstat-12.0.5.tar.gz 711967 BLAKE2B 96aa49d82e71407dbd99d840ca5f71af83f54ba6315c858fae71f97290e8cf9c4f5358ad6389c7489366a62667c35835151e3187382a56c98153d3a04bcc2b8d SHA512 c1061f1af35430e81e488e4b2f18b8588ec4f3c419ade004c49ca24baf60b5b76a6a59eb25f3b17b51a9f60c5833a914a514872d0235b2ca405341a2f4a32cb3
 DIST sysstat-12.1.4.tar.gz 738031 BLAKE2B 6803a727bb67e5027400f684d9d93efa6ca22526a1363e04f8bce06a6cd300d4ebf7e02c8f9048fc25794974efa38117dacdf12831bee4bfd43fe40d0b34dbb6 SHA512 e60721408861045bcb1a52b170682df54631926bf4eef5a2709e25b1469c13377026bac3e51f5eeed11c7149b916c00bf5c06a2ff65d9c28063de1ae108b61c2
 DIST sysstat-12.1.5.tar.gz 1032031 BLAKE2B 9fbc0c0d132983daa334345f1f83ac8a46092cf52f35bafd443febd8ce40e4ab11b5b9b05b92e4074ecf9feab682035b2e08094ce10f3287036821be57db0800 SHA512 9dbc44b0226efc2f219ff71d2f0b83c930263fe8d6d0b451ae8404b3056558de04c76c16f2e8ba62083cde3a37cabbcd466d9247bd61ba5921dbc2ab6a1f686b
-EBUILD sysstat-11.4.0.ebuild 1943 BLAKE2B 18bfa393fccb957e8ff519b5e6182f5a3b9155997e9d8acf256d0ab3ead8bf92e0b12a7fb1aa64fea9be7712c8432e049c20d49f41abdb4f233bfa57db20217b SHA512 5186353168b53a613ee0e8d5eeae38e315056b00a71140e3f347c4c8af5e963dada702618e8f3c84f2c25ef483d3270cc50135b28294d32fa5c14ad1cb00a5c9
-EBUILD sysstat-12.0.4.ebuild 1838 BLAKE2B caa28ea7a3eff2d9eb22a805485b31923ea3071757cc37af64ab55e412047eef1f4062d0df9f5c6cea958262190f466d2bd290187faae021fe44f06fdda1c1ed SHA512 a21db0825e71acba0c9ff658b9530f8ef00593a6d95dd5ce0c4ef8212af5f54bccda5f9a6ff2fee444245521c4eb50120f80dec434fdbfcf74696bf82e6661cf
-EBUILD sysstat-12.0.5.ebuild 1689 BLAKE2B a37f9953c43500112e59d06369a1236b495165ef7f4232c37c45263c966a3a8517f232ecd137633086d28799771601276eb266a9ab0f8e6ed955a726dcea9976 SHA512 e7e7a723e18a21470b18f3e3aab4d9a7b43ea86239e1c29be5d21effd531ec79e6e32a012855026125b2f88bbb798a00a9ce8942fd4ea160b2d72e24159112d3
+EBUILD sysstat-12.0.5.ebuild 1693 BLAKE2B 13fe90d234884fe0e164ac2e2e69643383b6e2dd6048d8886f2871d5fd5e77dd81bd4e9a2b83f0e2e2a604d71cbbf1cc44eb1f320ef7c4d7114da1b3359999f0 SHA512 b072840085d01d79dff0b65988f54425dc900f7c2d98c9e3ed20fc91ab3e886fc117ae6d0d3327d2fa3ec40c46ff1dd25bd6f9a9005e52c4b845dc1429d10d15
 EBUILD sysstat-12.1.4.ebuild 1838 BLAKE2B caa28ea7a3eff2d9eb22a805485b31923ea3071757cc37af64ab55e412047eef1f4062d0df9f5c6cea958262190f466d2bd290187faae021fe44f06fdda1c1ed SHA512 a21db0825e71acba0c9ff658b9530f8ef00593a6d95dd5ce0c4ef8212af5f54bccda5f9a6ff2fee444245521c4eb50120f80dec434fdbfcf74696bf82e6661cf
-EBUILD sysstat-12.1.5.ebuild 1703 BLAKE2B c6373e3f3a8ac71a024224b162b86aababc192194e1c5483858267eaa26f690245f047a11eb3906a7a47bcb052ab5b4c90a5e2e0f4dd70088ea62c1d9a1aef57 SHA512 cad78b01e166983d8746c37039530c7f82a5a7074558ab6ba977d89562a92e45235d204e6182b363e7251214faed5f5dd12e638d9847304f65d048d703687657
+EBUILD sysstat-12.1.5.ebuild 1708 BLAKE2B 3ba833b6ff81e4a5599367e15bac6370ef91069ee909a05c22b339faee931c8f6b84cef9795585b3b1f94f09bbf7f99624047fbcb814ba3581176d4db48ba0d0 SHA512 960934a753749b6a82368da345402c434810e1e8eb98575ef3363b95f9f99a918e70b1882fda51bb9bc349dbffcdf53e55553318c85eec97484a62bc03dcbf93
 EBUILD sysstat-999999.ebuild 1741 BLAKE2B 17d47e7c1a6f90d9930b1291d54f684889e7f617cd29030cdfecd4909c50c4008e5a35a860a2b1b165c432d7b444debf2fbd2f8aecafe51532ee3b35740f126e SHA512 450f00d7fdd18fff61eac06f2c4cb02aff1a540593812965aa8f29f3338da6c0950e89314eab5fe870a8d024e58126b7015f1b1c920b5a9012099c54a3394260
-MISC metadata.xml 336 BLAKE2B ba4225003301f291de8d348fcec269a2f7dc8f729a93e3c974a3eb9712f7fe08f59d799e4bf2e936a1224bfa5fa59d4b4b333aeacde9864313c20e1d3a7f4580 SHA512 63adb90aca54ec347aac7feaad3b2ee3c707fc536c0de0e0ee045d4fe2c08e231bdbd4473b9722a747ef1263cb98a067a43cbbbae28aabad71458c16df946bc6
+MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/app-admin/sysstat/files/sysstat-10.0.4-flags.patch b/app-admin/sysstat/files/sysstat-10.0.4-flags.patch
deleted file mode 100644
index 402e7d604b1a..000000000000
--- a/app-admin/sysstat/files/sysstat-10.0.4-flags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -69,9 +69,8 @@
- SYSCONFIG_DIR = @SYSCONFIG_DIR@
- 
- # Compiler flags
--CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2
-+CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes 
- DFLAGS = @DFLAGS@
--LFLAGS = @STRIP@
- DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
- DFLAGS += $(DFSENSORS)
- 
-@@ -154,7 +153,7 @@
- 	$(CC) -o $@ -c $(CFLAGS) $(DFLAGS) $<
- 
- % : %.o
--	$(CC) -o $@ $(CFLAGS) $^ $(LFLAGS)
-+	$(CC) -o $@ $(CFLAGS) $(LFLAGS) $^ $(LIBS)
- 
- all: sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat locales
- 
-@@ -196,7 +195,7 @@
- 
- sadc.o: sadc.c sa.h version.h common.h ioconf.h sysconfig.h rd_stats.h rd_sensors.h
- 
--sadc: LFLAGS += $(LFSENSORS)
-+sadc: LIBS = $(LFSENSORS)
- sadc: sadc.o act_sadc.o sa_wrap.o sa_common.o librdstats.a librdsensors.a libsyscom.a
- 
- sar.o: sar.c sa.h version.h common.h ioconf.h pr_stats.h sysconfig.h
diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml
index b62be5070572..a8fb43312942 100644
--- a/app-admin/sysstat/metadata.xml
+++ b/app-admin/sysstat/metadata.xml
@@ -2,10 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>jer@gentoo.org</email>
-	<name>Jeroen Roovers</name>
+<email>jer@gentoo.org</email>
+<name>Jeroen Roovers</name>
 </maintainer>
-<use>
-	<flag name="isag">Install isag, the Interactive System Activity Graph tool</flag>
-</use>
 </pkgmetadata>
diff --git a/app-admin/sysstat/sysstat-11.4.0.ebuild b/app-admin/sysstat/sysstat-11.4.0.ebuild
deleted file mode 100644
index ed42ea423d35..000000000000
--- a/app-admin/sysstat/sysstat-11.4.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="debug isag nls lm_sensors selinux static"
-
-CDEPEND="
-	isag? (
-		dev-lang/tk:0
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-	epatch \
-		"${FILESDIR}"/${PN}-10.0.4-flags.patch \
-		"${FILESDIR}"/${PN}-11.0.4-cron.patch
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
-		econf \
-			$(use_enable debug debuginfo) \
-			$(use_enable isag install-isag) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_unitdir)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc contrib/sargraph/sargraph
-
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
diff --git a/app-admin/sysstat/sysstat-12.0.4.ebuild b/app-admin/sysstat/sysstat-12.0.4.ebuild
deleted file mode 100644
index b9ca3b9892bd..000000000000
--- a/app-admin/sysstat/sysstat-12.0.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors:= )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-	"${FILESDIR}"/${PN}-11.7.3-flags.patch
-)
-
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
-		econf \
-			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
diff --git a/app-admin/sysstat/sysstat-12.0.5.ebuild b/app-admin/sysstat/sysstat-12.0.5.ebuild
index 6c2d9dd9d9d2..d28c04c0297c 100644
--- a/app-admin/sysstat/sysstat-12.0.5.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="debug nls lm_sensors selinux static"
 
 CDEPEND="
@@ -77,5 +77,5 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
 	systemd_dounit ${PN}.service
 
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
+	rm "${D}"/usr/share/doc/${PF}/COPYING || die
 }
diff --git a/app-admin/sysstat/sysstat-12.1.5.ebuild b/app-admin/sysstat/sysstat-12.1.5.ebuild
index d27352ddb874..88dd13ade1dd 100644
--- a/app-admin/sysstat/sysstat-12.1.5.ebuild
+++ b/app-admin/sysstat/sysstat-12.1.5.ebuild
@@ -77,5 +77,5 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
 	systemd_dounit ${PN}.service
 
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
+	rm "${D}"/usr/share/doc/${PF}/COPYING || die
 }
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 54c30f9f177a..324106cb80dd 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,5 +1,5 @@
 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 2385 BLAKE2B 662c0baddb0b4118b4a54aff12dce7403f2a8a11856759fc322cbbe1be0869be81767a7791fbc6c12838b57bb0cb77b2f820b4dc57c546fbb9181f4fcf383844 SHA512 e2d9732510cd65a0814540ee1729ebd1bc876c94f30a16a08b4b2e9596e492a0228f8dc1b01cdb01758345206e03c61d3f7ac95b630d2fff2075592f8e530123
+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
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
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.11-r1.ebuild
index ddb3f080a3c8..c1bd77fd2c90 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.11-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,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"
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
commit	b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree	0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /app-admin
parent	121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)