gentoo (leap year) resync : 29.02.2020

70 files changed, 712 insertions, 1329 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index a5d3987e15bb..bb617dc1725f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 7bda312ab3dc..ffcb706ab734 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,10 +1,6 @@
-DIST ansible-2.9.2.tar.gz 14157188 BLAKE2B 4c1207bd43f7797d8d9cb1d4612e866eebbf8c19ee060cf1eb7daa68415be5d7718c79d756454648e66a13434eacba6a07c8de31c4ec4b12e0474563d8844e46 SHA512 522dd84af9493ceafd95ff0fc806a671f3d1f10d0ca074ef41875eb966d39e64b834e0b98a35d81d9d9d96efef8069db604c8080ce8cbb1ce2e8b13bf5c30a6a
-DIST ansible-2.9.3.tar.gz 14170666 BLAKE2B bb27d249e2390888ee3c28fdb48c1ceff346d2903089c70b451f793742238498aed7c33be056cce9790f44f5cdb74b5020b6decf4f1242904bd9c8f7b5077ea0 SHA512 02cfa2c7c43506dc602e92aed66c920243222b82bc4852f1a4d786cd3ff26fe17eda18d35ac7301cd9bf26366df9b18776e2a27e8d54fc92c3128f52ec7f58e8
 DIST ansible-2.9.4.tar.gz 14170264 BLAKE2B e230837360d29df460906d118b3c2ebb9a9dc1ac2a4427809a16716e67a79db8e737ed1beca757bd8a75b631c8cb6c26e58b1caeaaeb613731d63031f1e4e34e SHA512 21020548100fc31b59d4ee1b461f2a14359f2f18752d431cd041eb987c8c8b308f1aa1687461a9b3f5a086485b77b3a38c8f006b942cc24cb2157b45e6582822
 DIST ansible-2.9.5.tar.gz 14186885 BLAKE2B c64fb384ab55c5b9cca753319fba911b8a40d634b59998f2e4c65ccafaa536788f3ac8c18a45a4b0d322ecca9b7fa2c580311a35a202ad70c2de2157ab04bfaf SHA512 cd2ce807b3136e2c02856339ea910b0a5cae8ca946da804ed7d3ec5725d3eff0fe5b4bd8527b2a17d6f3109e16859d52045b50f2ffd21169b30768e65b813407
-EBUILD ansible-2.9.2.ebuild 1704 BLAKE2B 5222fcb64c188bb54bfa1a645a45179f9f9e9ba98020e824c2b355a567e0790c0c6bd2c0c149121fadb7dc1ce110cf4837519cb5df8d48fa9cd4cc3366e33cea SHA512 ed56bca21b973e313e8e08d5cc71856becc53ecf6eacb7e6e921c280f89a0a49edb5f0bdfe0354bd0280800ce80a14bdf557acc78de7f39067f338b91e28f24a
-EBUILD ansible-2.9.3.ebuild 1706 BLAKE2B 5587541a8ebb57aff8dbc1f446a4d79aa2e9f1672461384999e7f6958b9eb72d9b031a28a22db9bed74b8dc296b387b1555ede35fd5b43a61b0926b22d33bcce SHA512 a4f3ae33c8044f301bb0057db5ed10698f1f015480e7d20a6836ccefe9784bf1fcf11c802a291420078e60585fd73f8646f307435e1c815a4333171d93947c40
-EBUILD ansible-2.9.4.ebuild 1706 BLAKE2B 5587541a8ebb57aff8dbc1f446a4d79aa2e9f1672461384999e7f6958b9eb72d9b031a28a22db9bed74b8dc296b387b1555ede35fd5b43a61b0926b22d33bcce SHA512 a4f3ae33c8044f301bb0057db5ed10698f1f015480e7d20a6836ccefe9784bf1fcf11c802a291420078e60585fd73f8646f307435e1c815a4333171d93947c40
+EBUILD ansible-2.9.4.ebuild 1704 BLAKE2B 5222fcb64c188bb54bfa1a645a45179f9f9e9ba98020e824c2b355a567e0790c0c6bd2c0c149121fadb7dc1ce110cf4837519cb5df8d48fa9cd4cc3366e33cea SHA512 ed56bca21b973e313e8e08d5cc71856becc53ecf6eacb7e6e921c280f89a0a49edb5f0bdfe0354bd0280800ce80a14bdf557acc78de7f39067f338b91e28f24a
 EBUILD ansible-2.9.5.ebuild 1706 BLAKE2B 5587541a8ebb57aff8dbc1f446a4d79aa2e9f1672461384999e7f6958b9eb72d9b031a28a22db9bed74b8dc296b387b1555ede35fd5b43a61b0926b22d33bcce SHA512 a4f3ae33c8044f301bb0057db5ed10698f1f015480e7d20a6836ccefe9784bf1fcf11c802a291420078e60585fd73f8646f307435e1c815a4333171d93947c40
 EBUILD ansible-9999.ebuild 1697 BLAKE2B da48c9b97787143e815cc768b5aebbf7bf005ac8a8562a3420f4d4594214e601e90cab78a447017de45b7217952c5c2b0922e37c2e7770b2e786632089230b22 SHA512 0276bdacbfef27725a2714d8cc56d05c2c64d2b37fcbe77d7cbeebaf30828364a7ecf86ea960327d01ae1e3202387777b32d5903152b405036c2541bc38c7f9f
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.9.2.ebuild b/app-admin/ansible/ansible-2.9.2.ebuild
deleted file mode 100644
index 4e4f9dd72e82..000000000000
--- a/app-admin/ansible/ansible-2.9.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.9.3.ebuild b/app-admin/ansible/ansible-2.9.3.ebuild
deleted file mode 100644
index 73f6fb55df55..000000000000
--- a/app-admin/ansible/ansible-2.9.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.9.4.ebuild b/app-admin/ansible/ansible-2.9.4.ebuild
index 73f6fb55df55..4e4f9dd72e82 100644
--- a/app-admin/ansible/ansible-2.9.4.ebuild
+++ b/app-admin/ansible/ansible-2.9.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
diff --git a/app-admin/bcfg2/Manifest b/app-admin/bcfg2/Manifest
index 1e45b90f1fe8..b466390d431a 100644
--- a/app-admin/bcfg2/Manifest
+++ b/app-admin/bcfg2/Manifest
@@ -1,4 +1,4 @@
 AUX bcfg2-server-1.2.0.rc 481 BLAKE2B 745d64db46f3398ceb47ccbdd34985dd31dc1bc502b754e844c55c956546aebc512486b4c32a1f4e5a6087e1f4f04c8410762aa6bd9280d3b9a024f9a0949f73 SHA512 06a0134018d2475ce116b9dbcceeedba00dc4392d7dbb3ef7bfb42294806476613ab596e08656cfbd30661cc700a9f4fa122d330c4ed48006c572658298fd65c
 DIST bcfg2-1.2.4.tar.gz 1959767 BLAKE2B abd99f054a549c1239c938591ee4d5bd808a6fdad36d784d5efccbcc878b1a8b64413dcf84adce547ba46f036b612f76ad8d748fcbffe33a87501a0f63ec67e5 SHA512 15f9079dd18485088464da5ea63e53435e2a2141970e6c0400797424bd3c612928349438ed0f6bb2874eb4599768e210e3fef970ed09f8fb2c2d673b986221d9
-EBUILD bcfg2-1.2.4-r1.ebuild 1603 BLAKE2B 9bc807a21d1a2937b39c8a5afffcee1edd086444b4fa7f2041f0380930f0daaae02a964e1099f26175abba5aa038fb9755c4aeecf7d1b0580d7022d2dc9c1cbc SHA512 e2626067f2c0d515d0c89bdcb51735b667e94781807e242e6e52d8404b09c5a01dd518274f47b2dae8daaeb2ed374ef32a3997181aef98745e80f706c8dcf5ad
+EBUILD bcfg2-1.2.4-r1.ebuild 1599 BLAKE2B 83ba82a84573680dfec91063fcde69dbcaeb4594daed4cd51edccb6c921f6a6ddb5d17aae8c4d730fd1e0526693afe488a02cbe6184a6257b48b85bf4011ebe4 SHA512 4ddbca44dc0a74a149dd47d4d3f98ef4478d3b7399e0fb0f39e4a9ce04998261c07ab0077d47209128b9f10759d4c7ee0a0dc0a8ef00c95f550b6a689ce18d6d
 MISC metadata.xml 392 BLAKE2B e7b3e92750ec4d4be5c01440dc2b129fc94314d8e930edcf9c2e9636a9f0244c7205bd4ec0b1631e326b6c9c7d94128e0387336f0ed4b22f0b13e70b798d07dc SHA512 7e68a750feff611711cf80bfa00cf23a615f9fc9810396e65f21d3e6421a59dd5c22f7c806891dfa4f1b66cf74fa2a8b303f87e6b2ac349d7cf916e807d13d37
diff --git a/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild b/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
index 99526eb04d2b..8b8b427e03e6 100644
--- a/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
+++ b/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -58,7 +58,7 @@ python_install() {
 	fi
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	if use server; then
 		einfo "If this is a new installation, you probably need to run:"
 		einfo "    bcfg2-admin init"
diff --git a/app-admin/cgmanager/Manifest b/app-admin/cgmanager/Manifest
index eaf730c4092d..428e79577c96 100644
--- a/app-admin/cgmanager/Manifest
+++ b/app-admin/cgmanager/Manifest
@@ -2,6 +2,6 @@ AUX cgmanager.initd-r1 331 BLAKE2B 725b5044fa567e7f7146bd62cc63a0674873d6fcb022e
 AUX cgproxy.initd-r1 661 BLAKE2B f84189b5fe16b6327cd1a6a2cd1805f1bbd75791d0f6f75a601ea58fa51d5a490d655371355205c499a51628b4e9cdf21f98431adcb3000397508cdacef2928b SHA512 7f43ea6369428d71d122a191c6a1718987ed09eafe2217ae326606ddf2a50f0500d0de0520fe21e5d2edefb8ddd4c3a85623d2aac1212e821ea922cb8256fffc
 DIST cgmanager-0.41.tar.gz 461805 BLAKE2B 22c779953d637012694c19490da9d3707b9e2a935f910d192fd1e6a44c27e933e93b6ae516399991924175a9e8e05fd650cf3117d3e7bde034a20bc083ebaa09 SHA512 e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd
 DIST cgmanager-0.42.tar.gz 467980 BLAKE2B 70df5ebda230773f3a2a4ed6f784e591126769122533182821b0fe2c157f9bd7b9fd58a3bb104b0ef089320b167d3136c379d760ea6c65dab0c88f46d41596cb SHA512 d92113a6748084f1c0708f75c8bdf5de484d534bf00f664a5288902be887c2a1c7cf3d91afaab3331f0d573a86fbc6edb2fa1d37c070250cf53e0621213d7d74
-EBUILD cgmanager-0.41.ebuild 1236 BLAKE2B dfc3201caa1cd5d98f6d2281faf03884d05ea2bde88e91eed498ca62f8a008b31023f29356a5b9e6de0f0794601c1027b87223b441e4d928eacf6659140d414a SHA512 5ca36931d5476ae710dca68f4c0a5a7e0b4037b7c3860b6c0198d9eedf4b615f6d60c57c7d219934b45a07e1721502d63c246bc9b1b53f9198e0189d82c6c10c
-EBUILD cgmanager-0.42.ebuild 1246 BLAKE2B e19151bb91d70f7b3c37d0093a5865d634b8c3075782cd470a7d03c3ee7ec20e64dbe746bf1b9f1f53f2838bfabadf1e082162291cf2034c2b577b81dbb91363 SHA512 1815e5d14be783fddc7c3bed7b52c64e48334f39a2fe57a4ae8ade298493cccbd8a8aad25fec6a08a48c8578d07193c61b7585c64a35d91d39c79f6a8a264ff4
+EBUILD cgmanager-0.41.ebuild 1235 BLAKE2B 6d32956b45b484667a50930ffcbe015292a45aa84c47ca82e764329938f50a2ccb9222394ea760e71ae46e78278d4cdb5024fec8ce1284f507e906bf4db66945 SHA512 b1ed17e13d09d7e32f1002cdbee9bf1c820c7e965a3deea364f462775322b363b07207b7f523af1cb96b87e9b8beebf199a92792bf16d449e5655d92f9f7ac3c
+EBUILD cgmanager-0.42.ebuild 1245 BLAKE2B 527c823491ebc2152517b196da4fdb766c2332696c49c3252fca30dcd01d29a0847fe636b7dd5d0710f2a812d212f8a7264f45ff77ca133b85f4ed8159493b70 SHA512 e6ef521ea70992a4ab5527e7c22f44ede3b5821b6dd37752def52b7900f38b2d275682a9c860f9d3070cf27e2859aa59aee2c814d17f5fe7eb5886cc5a0155db
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/app-admin/cgmanager/cgmanager-0.41.ebuild b/app-admin/cgmanager/cgmanager-0.41.ebuild
index 9f2cbede4729..877c4a579cfb 100644
--- a/app-admin/cgmanager/cgmanager-0.41.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.41.ebuild
@@ -38,7 +38,7 @@ src_configure() {
 		--with-init-script=systemd
 }
 
-src_install () {
+src_install() {
 	default
 
 	# I see no reason to have the tests in the filesystem. Drop them
diff --git a/app-admin/cgmanager/cgmanager-0.42.ebuild b/app-admin/cgmanager/cgmanager-0.42.ebuild
index ec194ccee43a..af8480ae28ea 100644
--- a/app-admin/cgmanager/cgmanager-0.42.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,7 +38,7 @@ src_configure() {
 		--with-init-script=systemd
 }
 
-src_install () {
+src_install() {
 	default
 
 	# I see no reason to have the tests in the filesystem. Drop them
diff --git a/app-admin/cli53/Manifest b/app-admin/cli53/Manifest
deleted file mode 100644
index e07959bc06a7..000000000000
--- a/app-admin/cli53/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cli53-0.8.15.tar.gz 9263514 BLAKE2B 9fd9342510146119e5b566f92a13d65fed3fec27017607e690c9fa14f7751e16cd2ee87e1d22f6c062257e6ed6e998d574a754af4ae5206bc128c24d72edb904 SHA512 849e7f1e868591e23b1a834b49afad08681ca367bce163bb2382c775eeb79a7db4d6212ad3140ba69b8d4a13fcf53a31f7d5f061e7f68cba1a933e35e7562e2d
-EBUILD cli53-0.8.15.ebuild 686 BLAKE2B e46fa385a9cf28b4cbd4aec42595c613e0bb63de8ac5474c9a2979f554e2d7fcf309697ee669a913032633c88f29e919bbb99b25abab31bf80f134828c851467 SHA512 0dd2fdf1a07d2da59a357f158291174457b9894884330307bd2c32cdb2e567fc3016e607971642b6a26d61666287343a929da0477bc6b8b9865e44e80ed411fa
-EBUILD cli53-9999.ebuild 686 BLAKE2B e46fa385a9cf28b4cbd4aec42595c613e0bb63de8ac5474c9a2979f554e2d7fcf309697ee669a913032633c88f29e919bbb99b25abab31bf80f134828c851467 SHA512 0dd2fdf1a07d2da59a357f158291174457b9894884330307bd2c32cdb2e567fc3016e607971642b6a26d61666287343a929da0477bc6b8b9865e44e80ed411fa
-MISC metadata.xml 325 BLAKE2B 30e300a3cb064a2eaf04123f7e2943924e91515325d5b30c2a7aa2cc58b69f73ffb92c7da37a87eaf4e0925374234c7d6e1ea56634702879a8286b295fe64b74 SHA512 febb62ce8c56413c541726fdf6c61942a075b7c21d52ca24bb519fea2a271abc9034cc283f300fbf0458f73c6e5a4729308a3676899d0e5d3915d45939e88ad6
diff --git a/app-admin/cli53/cli53-0.8.15.ebuild b/app-admin/cli53/cli53-0.8.15.ebuild
deleted file mode 100644
index aecaffe6fdb0..000000000000
--- a/app-admin/cli53/cli53-0.8.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	inherit golang-vcs
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Command line tool for Amazon Route 53"
-HOMEPAGE="https://github.com/barnybug/cli53"
-
-LICENSE="Apache-2.0 BSD MIT"
-
-SLOT="0"
-
-EGO_PN="github.com/barnybug/cli53"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" emake build
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" go test -v || die
-}
-
-src_install() {
-	dobin cli53
-	dodoc CHANGELOG.md README.md
-}
diff --git a/app-admin/cli53/cli53-9999.ebuild b/app-admin/cli53/cli53-9999.ebuild
deleted file mode 100644
index aecaffe6fdb0..000000000000
--- a/app-admin/cli53/cli53-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	inherit golang-vcs
-else
-	inherit golang-vcs-snapshot
-	SRC_URI="https://github.com/barnybug/cli53/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Command line tool for Amazon Route 53"
-HOMEPAGE="https://github.com/barnybug/cli53"
-
-LICENSE="Apache-2.0 BSD MIT"
-
-SLOT="0"
-
-EGO_PN="github.com/barnybug/cli53"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	GOPATH="${WORKDIR}/${P}" emake build
-}
-
-src_test() {
-	GOPATH="${WORKDIR}/${P}" go test -v || die
-}
-
-src_install() {
-	dobin cli53
-	dodoc CHANGELOG.md README.md
-}
diff --git a/app-admin/cli53/metadata.xml b/app-admin/cli53/metadata.xml
deleted file mode 100644
index 236c772d21c3..000000000000
--- a/app-admin/cli53/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">barnybug/cli53</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index 0aada9a56277..87ce4eb9e925 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -2,5 +2,5 @@ AUX clsync.conf 589 BLAKE2B fb7736b0972c91916770c6cfca693267bdf0cb3f6ad540388967
 AUX clsync.confd 645 BLAKE2B f2e2f70f5a88ea3a416f4151637d63f79cce483b499ee0c1b5005ef8e9d16558f0d1c23ddd182335f7e963172bafaf4b41a37c1288f7fe55e7a57e2868418ae1 SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5
 AUX clsync.initd 555 BLAKE2B 18b3f0e1e8e079eb306709d2b55b99100ce3efa852f285d7ac9acd4269fe41e0fe5d1b7c12fa966dc01f60a598d6178cf5c8b6a2cd21410bdcf0f66c1facf1d2 SHA512 a5ee987466dec0e8ca7ce2502bd71d000419e03f33e1585e47fa5d91fdb5321f949f3d3ca566e68a0aedcc50ab6a84a92210aa866520d1703805958a2bfa270a
 DIST clsync-0.4.2.tar.gz 256042 BLAKE2B 28474fc66341b93705a502fcff390e3affcd89a9e1eb272dce9b28be709562e09c03e9c300cfeb5371e2e618a2239468a58c46212a39d751fbbfddeaab12bcf6 SHA512 d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200
-EBUILD clsync-0.4.2.ebuild 2774 BLAKE2B c7e59a66c0228f9ecf94b442eb0f141849925e15827cda9a2e0946ae761dbfbddb2aa300524aab3a6fc85e9807378c6a207b648c2ef0377caa5ba398b3fedbf8 SHA512 c80cf6048dff40e50db099f1898a10451771015e2ba89cf8d5f0e16e3031c34e32095b9ca1a625d2b09991c8a937f7e283d7d207a463db52992e6a9c5989c913
+EBUILD clsync-0.4.2.ebuild 2728 BLAKE2B 164359485c64116501a2b5c43252003846c103ee8489664c6a88bbdd55e99f8fe2df3fd913906cbc1e7d54fdedca4f0e6fe28b55ba9e5b69629707f955d96f21 SHA512 1ff01617f74e030d1ad48c5177550272e56d633ad22493e774a7937f8172ffab51316e8872f74da4266dd02eea93758d00319fdd408d902519717e9fce4260f4
 MISC metadata.xml 1757 BLAKE2B e907cb32524743bc5571eddc4d0c7a30b51b82f49f72405939110e3085a8561b55e5927950be83ae3a647418479183aeae8491092ba8e5432a7633365f769e2a SHA512 6f853983a4886bbacb2fe1e26b728ba5d86b05f348b6df2cf0779725ef11623f73274829605b88aacd4300b4cb28ff6fbeead916c8dd01f4a07c9780218f1bfa
diff --git a/app-admin/clsync/clsync-0.4.2.ebuild b/app-admin/clsync/clsync-0.4.2.ebuild
index ed88b00512a1..d40e8568b97d 100644
--- a/app-admin/clsync/clsync-0.4.2.ebuild
+++ b/app-admin/clsync/clsync-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,7 +55,6 @@ src_configure() {
 	use extra-debug && debug_level=2
 
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-socket-library \
 		--enable-clsync \
 		--enable-debug=${debug_level} \
diff --git a/app-admin/eclean-kernel/Manifest b/app-admin/eclean-kernel/Manifest
index 3e213fecef42..409c41bbfda2 100644
--- a/app-admin/eclean-kernel/Manifest
+++ b/app-admin/eclean-kernel/Manifest
@@ -1,6 +1,6 @@
 DIST eclean-kernel-0.4.3.tar.gz 10650 BLAKE2B 228d17cfc5bed34e892dd6340498b87cbc32f22e83aff70824ef24f88836e3ad2306eda8704e25b7cfbadb33984edee8effd613dad67ada25519c601ec6b6ec7 SHA512 a2ffbfe800672ad0cd105425497dae72c0779ec9da5ba6a6b4efd8846762467acf6b8e70c67744e7c7639d5ba2ba4643ad344aae193e72d12d12f48b1793ff4c
 DIST eclean-kernel-1.99.4.tar.bz2 78909 BLAKE2B 0cac3a001c3180c57bdf9a63366d9950928690328fd560f984c1d35bcf88712e897462a153bc3f0250ebbbb42518798e3407c3533351543ff32bd68ecee2ee5e SHA512 f3263b83b36878104e21fe122eb96a16c5c5a930b062fdd62d6a574db597644222d5a19d7833cbb894a955076b06bcb1a22c94d5f87c2787420dd1de32d0f789
-EBUILD eclean-kernel-0.4.3.ebuild 473 BLAKE2B 27471f26b03396e6dd1371ad6ee0db6177ad0f4c56ec87939facffc4dceef48e609a4a262d1ac2059072f34f0d76f4c113046ccdd36f023bf0063af1ba625ea8 SHA512 c2700ca92813b664d109735472cab65c4e9a93af29cb73d591589cfa2aa01ed053680c731f42653cd60ff4e457d0e659daeb393af15099d80d5408c423d669d5
+EBUILD eclean-kernel-0.4.3.ebuild 504 BLAKE2B c655f9fcd2ed91fea54d637d0d4f04275d7b8bbccb82ecc07f70b8a48b9307037fe2243013fcb180232b6a8e55c1634084a9ddf651eda2bd05a5b71bbc9429dd SHA512 6a3675baf96a4c883f14b9f2d21a4d4f2aaa26d7ffb773de9df7d159510a9fc23592b155d35dcaf45337350a1fc49e2c2b82b8f86e978cf4b052f3f736d9c346
 EBUILD eclean-kernel-1.99.4.ebuild 362 BLAKE2B 20894519cc3270ab4880c0373894638d18ecfeb34fa49a7f801e4889d22f78702c87201c3cba929092b38149f3b14109b058f95f597eea8c1507011af37b14d8 SHA512 61b64ce5d1f0e842de988f1d62bb41af6e16ef73a05ab35b90d97410292c5409c3873fac6dbd9a09e4be033cd19e70a283cfd6be48183409822c29ef26abdc85
 EBUILD eclean-kernel-9999.ebuild 401 BLAKE2B 075d11ebda0764b47d16b0bf36174af6554ea42b1a62450890b7051f33a9fcc2691a6da8a1e73161e38879af2eedefb6b5bd7aceb01c5ed92050f505e805c75c SHA512 efef86fdb8d6d8f65f6be0693967449d6fb36bb45e9346de2ea60ef9ca0178bb61303b2415a0a589482ff0dfdd020812206dc0fdefb6ac97a6c2e6de880a3843
 MISC metadata.xml 539 BLAKE2B 23dbdae146e666b8698181642673dc708027ddac7c33a9f53edc9cbf1d1e1ce62e8d4531a6962098bdd6cd2029369b587823b2f9630e285b43c0db340b29e70f SHA512 2a74b715ba28178d042f907014b02fd181e0e481f4eb9230b15ef542be61b2e1fce17efba4819b6d06de09ed7988b39047b59182b6c4de86a2a05ad0350635dd
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
index 89a5c4d8fe0a..9407f165eeb0 100644
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.3.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index bcc7143b55c7..ca8833b87419 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -7,12 +7,14 @@ DIST filebeat-6.8.4.tar.gz 35552503 BLAKE2B 165edceffa71318d77363e4e8e737663eb45
 DIST filebeat-7.2.0.tar.gz 46415588 BLAKE2B a8940e9a4a85e6eac79dca3418d3dcd14c5a1062741dd895c561d1498c287bb974a5ac89d5b353dbb75e78e6c67cba97a08d41528042db4e4d76bb46016fac60 SHA512 67d251cabca10a1f6d392be8e6203e66d4cf5d63ceb2af88185ea4824259995dafd3aa8dd2da326d079cfcfedce5996f173cd6c50972db67cbe25f660683e5d1
 DIST filebeat-7.3.2.tar.gz 49977990 BLAKE2B 6219a382b415572fdea2ff4b0aa3f02b3c1e500d77ed5200b6d5b4334a08b8e91d389ea41b3afe98355f8b20e7f8ecaccf5996f0bb7aad5f10e0f0d69400a0d6 SHA512 75943b251343d28f478f2f19665e4ba31f5bc6e4b26f6e6da8aa062322da4ab8e134c87a9557a97677ba3b22484c44ebaeaeeb87866e0f12e67f1647fe34131a
 DIST filebeat-7.4.1.tar.gz 59665819 BLAKE2B 5af538d317713d42d79d43b58344149980d4bf07b99ea6e6b29562cbce8e221f067881b85a78e4b6dee4973f42aaca1108e4941b1c3041df6162885a7c49d57f SHA512 917942f2434ed09ccc998e75d4272ff03ed1536bfa8c7f09d48f11bccdbe0315d298bc3aeab3c66be3ac3d9fabac506c8b797aa4560dceb7f1978ac420d35696
-DIST filebeat-7.5.1.tar.gz 64347061 BLAKE2B 02187df1cbeb3bb2dace7b69a8d507c613126d213e5521bd637b808f1060463a8065c706e247381905a376fb5b91044760d0a5676bb7016b14b0445bf73e0100 SHA512 b1be054ba97b5bf491bffc3167efe66a698600956e1de358294af0853d36df9dc3612dd232d1e40e745d419426dc5b4c0effcfa8d738f78a2d6064519a5570a6
+DIST filebeat-7.5.2.tar.gz 64360149 BLAKE2B 2bcbe19b9354c7039c652e6edd4b2cac688b136188f55caaf070dc9d60bd775eb2f0a4016725bf48baa5d26a056f74226d6bec09d1909fcbaf36ad2703d06f2e SHA512 8911e05b489e07f4ec6ee6397e916186ad618bfe97c43c509d564a828a1938eeea6c57cf66f2e93216b5d6b3958e0450d3aab24b65ef7209f0040f66ee36e74a
+DIST filebeat-7.6.0.tar.gz 77777633 BLAKE2B 50d461f2ed254da9ff0987a3bf55a3e7513f74167b2e1fe2c237b756e341a22a3b9a70a423a6c19015d6833ff9fd45777d652bae0a49dac8e2608ad99ef1682e SHA512 93f1e56986e6c983bfaf9781f09072040774c1a02edd2d0ffbf4e5392e0c93a85421123e78244688b89cb62c06a69f1cad9e56c2933a1818aae9a45f64cef892
 EBUILD filebeat-5.6.13.ebuild 1593 BLAKE2B eace0e8d7977b82028436e2c55c4a4bf19a7c0b57714cf6b7cc1e7176e9013edb889065f58740f8db51e38164f6e567cf809d9c4fb82de1d7e064580ef8cafaa SHA512 8eeb1e64ea6d8e06a79ef9b25103d523718f779e351ee5c1f0a00db67d1e28405ccdc371ae5c0177861276db40c848b78ee2d1eff16c14da3efca3c7576ae399
 EBUILD filebeat-6.6.1.ebuild 1477 BLAKE2B e77d50b39c421fcd161d066248e4af864f8c9e414ac36d9c043ee40372ee0c7e84f2e72d45d00a7252877f1910cf5db11dec88a5e0ed7008c7600ce9826c358f SHA512 ba38e1a89475555f7941a566b717ccf26d27694914615fd4c1d3b8916a1b6d20bf395412bd1a25d8a6f62d06a301a36325acbfb32b0b37dc0270b55e31bec284
 EBUILD filebeat-6.8.4.ebuild 1508 BLAKE2B e83622851a3dcdc4bb54c20f8f3e62c682a5bcda3e6fd4165bc6551724c5fae6da3fd1f818fc23b64f3b07b2891c270730ea66da66e53ef35b17942bc872c75b SHA512 3e0d35163aa280ac21092c0f9bfef094fdaa6716e92089add9775c07d37fbaa127766fc60c202222f6e25fea919d2473a80e6f0944219da55a886572ee3bb11e
 EBUILD filebeat-7.2.0.ebuild 1500 BLAKE2B c21cf6b0e97aeb03ed9975ab64e50cafaec0920767d839ddbbfdcd4cfc2751d2f6852d45e95ef8d3d4ed8852e0f3166467b5c8e89cf5e127bf7a03f346c189e0 SHA512 9e2c8832931b23958a18b7acda6edd91672c2f9c9e033196e4d83c57eb54fa73663006844739fa9d628ce81bcbcd307ce78f1ef3d243d5db3af361f7ae95444a
 EBUILD filebeat-7.3.2.ebuild 1497 BLAKE2B b130f2fa0916e4b37b238fb87ef6ab80f4d94bee5df788873537b9031a718c4300d3582d7fd070421f06a8b034b853d3b4a89353d572006160a660cf8882ee8d SHA512 900e496e61e21a2ccbc5eb657161c03021f0b95315d688ace1d4ef1c00b73d20f015aec5e562d7d3d72a139daf3b342501d2515d782635bbd64fd2752641a422
 EBUILD filebeat-7.4.1.ebuild 1508 BLAKE2B e83622851a3dcdc4bb54c20f8f3e62c682a5bcda3e6fd4165bc6551724c5fae6da3fd1f818fc23b64f3b07b2891c270730ea66da66e53ef35b17942bc872c75b SHA512 3e0d35163aa280ac21092c0f9bfef094fdaa6716e92089add9775c07d37fbaa127766fc60c202222f6e25fea919d2473a80e6f0944219da55a886572ee3bb11e
-EBUILD filebeat-7.5.1.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd2521334c42434e30ac0a29b7647930c9265dacafb517d681746e919db3ad67fa07f142bef3a7e302e826137957af5131 SHA512 7a8a32a3e8f1677c496df38b22764340f7ded39500a6dcd9f9c28fd82eaae0131e9d17ad43b4952744e9b486ad868ad779bd696af203bf1663c1d5143dbe5cf9
+EBUILD filebeat-7.5.2.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd2521334c42434e30ac0a29b7647930c9265dacafb517d681746e919db3ad67fa07f142bef3a7e302e826137957af5131 SHA512 7a8a32a3e8f1677c496df38b22764340f7ded39500a6dcd9f9c28fd82eaae0131e9d17ad43b4952744e9b486ad868ad779bd696af203bf1663c1d5143dbe5cf9
+EBUILD filebeat-7.6.0.ebuild 1508 BLAKE2B 96f0c9cf11a57514fc929223e3a489dd2521334c42434e30ac0a29b7647930c9265dacafb517d681746e919db3ad67fa07f142bef3a7e302e826137957af5131 SHA512 7a8a32a3e8f1677c496df38b22764340f7ded39500a6dcd9f9c28fd82eaae0131e9d17ad43b4952744e9b486ad868ad779bd696af203bf1663c1d5143dbe5cf9
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-7.5.1.ebuild b/app-admin/filebeat/filebeat-7.5.2.ebuild
index 8836479b860d..8836479b860d 100644
--- a/app-admin/filebeat/filebeat-7.5.1.ebuild
+++ b/app-admin/filebeat/filebeat-7.5.2.ebuild
diff --git a/app-admin/filebeat/filebeat-7.6.0.ebuild b/app-admin/filebeat/filebeat-7.6.0.ebuild
new file mode 100644
index 000000000000..8836479b860d
--- /dev/null
+++ b/app-admin/filebeat/filebeat-7.6.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.12.9"
+RDEPEND="!app-admin/filebeat-bin"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+S="${WORKDIR}/src/github.com/elastic/beats"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# avoid Elastic license
+	rm -r x-pack || die
+
+	# use ${PV} instead of git commit id
+	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 3344e1631017..bc37a9797db4 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -8,7 +8,7 @@ AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bd
 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 3268 BLAKE2B 34a8589862c834f4d07eca2c639fe2c3f27713dd85a28465c4a9da1fa1fced310b3a2698bee646a0b08134cef58b7404c26745cbbc3c825c22a949a75f2c88fe SHA512 595a9774896eeb8328c2cc9e08ad88275887dbcd1cbda440b062f816fb3c150927753974afb88a0e4c6c64703b05ea65f2c462b1efb92f5a07e56c98eca8a9dc
-EBUILD gkrellm-2.3.11-r1.ebuild 3340 BLAKE2B abbdc51c93283e45f59bce3d08cea145d25e53745b74a78031681e3dae31ecefb9c6ba57a0e93f2952fe2f576c587ad1733688a40258467f2218391a89191965 SHA512 4868a487263094f3557998fabf8f908a05b1023983d45b576f1c14295df880356647e7f1588f5ac0de8f0b1d21ab16379e4a4d96f7dbe455a960f35f11a54c36
+EBUILD gkrellm-2.3.11-r1.ebuild 3338 BLAKE2B 39a1a4c3a932e01f351383b8daddb4e174df5b55996a32574d30747a023b59b8a70e069ed585bb0474cc6813e047c8e04a4de04372b251829b12fbde9ac22682 SHA512 b944afe8465f452cacf65f0312e3af3b851ba6761064a595b88d4a8442dd5f7fb4df4dfd41f5d0a3bc8e9deee0ced256211b48f48198a7ef9381a41477a20ca9
 EBUILD gkrellm-2.3.11.ebuild 3380 BLAKE2B fcbdcea39dc5cd9d3064b88135cfb3e0157005df600c4e527b33401fef53d51b81d6aba724e732b63e71a38235e6955fddff697d1aa86afd9213b57901acb071 SHA512 1cf4e0fb31e9e323ed1859c847ebded405489376c3cbec6365d63a62aba7362c3b355a330574aaab40ce7338da1a12a0871e45960a787eebe83f9a37ae419290
 EBUILD gkrellm-9999.ebuild 3340 BLAKE2B abbdc51c93283e45f59bce3d08cea145d25e53745b74a78031681e3dae31ecefb9c6ba57a0e93f2952fe2f576c587ad1733688a40258467f2218391a89191965 SHA512 4868a487263094f3557998fabf8f908a05b1023983d45b576f1c14295df880356647e7f1588f5ac0de8f0b1d21ab16379e4a4d96f7dbe455a960f35f11a54c36
 MISC metadata.xml 917 BLAKE2B 88567611e5ddaed8c1f81e639c7e82a120f9201f56b9e512bca08d948c78a967e57490e754f7e3b2c9a4a9a2c216b1288c8059593589378b5404b51db50a9644 SHA512 8b880d60459e4cba922f2fe586f0dfdcc4b0f8054e5f5cf8650ab10bacb30380b67f81795c671e28bf0c51bd6f3379c3b653bc78c0ec954bc7456dccdad274f0
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
index 1e4443fdd6e6..1fa9c0422d1b 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	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 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-3"
 SLOT="2"
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 4619a649d078..dfb26dd3bb45 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,7 +1,5 @@
 AUX glance.initd 375 BLAKE2B 3d061f0357b8782e6abb0e2f6c779d8901fc7211238b877f3078cea66bc6086e80a530729b6484f110c02e23375fddde7f0ddfd22a6451ef84d9ec3caaa9d6cc SHA512 c6c433334bb337c708e31fac7869bf29e89516b857800d7cb77d264766483f54976dda6d83460078eed0dee14f0770a31adce344ec7fca04c2040b21dcf239b5
-DIST glance-19.0.0.tar.gz 1942312 BLAKE2B b4b3e6cd86385dfe19d4a3b2e9c900006aed984457da71433ea1608b177702f1f0cc5c5057f475f7c0024d18fd196b48a774514511534cf6d325d5c9ccc1cb2d SHA512 7c72f988f2baebd6af17cd7de8e5daaa0ec889d8f210e3bb5cf45bd4d9296b45f1dd2dbbd1709705d0e2b6203bad60faaa11a56328124d47b95328b6678827a6
 DIST glance-19.0.1.tar.gz 1943385 BLAKE2B 5e2530a05a171f640499a3e595ad15be29e95a10e6f22a186514cc73c4fc77d0ae5bf00a3d43616e8cb53ccde748a6560dd448db631c86343b2667c0dc6719a1 SHA512 b672d84d709149191103ed54cca91d604b43460b1bd6ab56263c1b8c382d1c4261ebfd58ca9e233ee50b248327bcbfd7bfd47fee57c8c08a9635b2ca0c0cffe4
-EBUILD glance-19.0.0.ebuild 5193 BLAKE2B c157bd026ca108344b34c165b63be02b4e9e0ff2e73b8848827e1014a0fa528e9508e6066188dd3edbd3a40456c2b725e17d7e495e408578a9e7ceeec8b9dcce SHA512 884ac4dcc7a5f656b42086451a2b9c2ecfc688314fe93c6edb09141a84dc32dd84b9587d6dd105c124d339bc6222ae402c52daa9437d704be06db8e717f2e50f
-EBUILD glance-19.0.1.ebuild 5133 BLAKE2B 42a2ddaa7b201f54435990b6e0e61d9959b5ffa1ac03c54aad5f899f54cc5cbc59d1c9c3abd35167093694ef94bb4969f60e0f3b435caab2ddfdcab094fa83df SHA512 f48d2c7e92b0b1854872a9ed237fd3c4a79022e0f6bfa1162ba74ae50a7348f0db04832d47d9c64dcde0abfa72422c4bed8092afaf8215e4e95d32c8305e32c1
+EBUILD glance-19.0.1.ebuild 5131 BLAKE2B a5f35f76dc9a26571c1a369b670240de63e8d437a20eb6db1d3df517a6117f4ea3f2508af05ecdfcd5ab6528f652d634c056ef26227aef6c6742f57eddb2e449 SHA512 57f5801915e951b019ec8afc759a6380663cdddc626c496834ac00763800862de3c67c5939dd4de66fc1edfe4d3a090c1bb1baebfa6af4efdece09b2c88f6f8f
 EBUILD glance-2019.2.9999.ebuild 5133 BLAKE2B 42a2ddaa7b201f54435990b6e0e61d9959b5ffa1ac03c54aad5f899f54cc5cbc59d1c9c3abd35167093694ef94bb4969f60e0f3b435caab2ddfdcab094fa83df SHA512 f48d2c7e92b0b1854872a9ed237fd3c4a79022e0f6bfa1162ba74ae50a7348f0db04832d47d9c64dcde0abfa72422c4bed8092afaf8215e4e95d32c8305e32c1
 MISC metadata.xml 786 BLAKE2B 2d0d8d4d270200eafcb2570528bfc0fb0f3932295550186f9cf930c05d7ade06faf004d159047fe347716249166cf9f595c2512cea86aa86fc2c604582380106 SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a
diff --git a/app-admin/glance/glance-19.0.0.ebuild b/app-admin/glance/glance-19.0.0.ebuild
deleted file mode 100644
index 92286c644782..000000000000
--- a/app-admin/glance/glance-19.0.0.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 user
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/openstack/glance.git"
-	EGIT_BRANCH="stable/train"
-else
-	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc mysql postgres +sqlite +swift"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
-	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/glance_store-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.17.0[${PYTHON_USEDEP}]
-"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
-	enewgroup glance
-	enewuser glance -1 -1 /var/lib/glance glance
-}
-
-python_prepare_all() {
-	sed -i '/xattr/d' test-requirements.txt || die
-	sed -i '/pysendfile/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if [ ! -z ${EGIT_BRANCH+x} ]; then
-		use doc && "${PYTHON}" setup.py build_sphinx
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}/glance.initd" glance-api
-
-	diropts -m 0750 -o glance -g glance
-	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
-	keepdir /etc/glance
-	keepdir /var/log/glance
-	keepdir /var/lib/glance/images
-	keepdir /var/lib/glance/scrubber
-
-	insinto /etc/glance
-	insopts -m 0640 -o glance -g glance
-	doins -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
-
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-	rm -r ${ED}/usr/etc
-}
diff --git a/app-admin/glance/glance-19.0.1.ebuild b/app-admin/glance/glance-19.0.1.ebuild
index 35a2c3732358..a166d654eaa6 100644
--- a/app-admin/glance/glance-19.0.1.ebuild
+++ b/app-admin/glance/glance-19.0.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_BRANCH="stable/train"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index c89797fca928..cd500ff7d973 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -4,6 +4,8 @@ AUX graylog.initd 825 BLAKE2B bfcd79f71d996ca1761a79119f8ca29e531dbd9a40411c0c13
 AUX initd-r2 872 BLAKE2B 500a428a0f479dc79b1d8b7d6a1acfafe9a205a65adfacd10aa6f5e89c105c30e095e69799acd8739d9ed2b7dee0ed6d053497a74495a986b6d9b24122c29a75 SHA512 43632bd345bb3772018ce1fe32a97c85a1ad812dca2ae229dccb65302e686597dad4b62ecbc0cc5358c34761f354d51de2c9fe81bd3db71af5fdc0a6cbc0e95e
 DIST graylog-2.5.1.tgz 123878927 BLAKE2B d168579be4d20e3a8081d608247e7101fc5d99ddd2b5f063f94d7e91d4095c6bd016a4bc1be0f0e08b5043b771070312286404ece5eacc51e4a8730dfc13dab1 SHA512 44e2ca00e47a34708cea94b74fdc0f56f3a381f161d25633bdf7685fbcd989937163508f8b47b0869c7daacec6c8bd2c874f9381e196ffb3194eb6e3f96b3ce9
 DIST graylog-3.1.3.tgz 120983897 BLAKE2B 68e1dd7b8de7ab9fb12fd2035bcf6f0901d8d9f5083ff8efef09736819ccd70ae4dd6f466cf2fa1eaebb24b4098a26d72524f9b9a47e8dd62d0224bad189bb62 SHA512 8eec2339db474b89fc717e693ec23ca32d9a018f9bb924aab895d1a1f4e90afa9fe9547e432d13b9d0bf5831f8772763f19de41ac66f3e09ebf7e96ebd6cbccf
+DIST graylog-3.2.2.tgz 125510385 BLAKE2B 87895af9c495361c03b0a6cea6299fb206152a05a69be63600cb15e57ed1c6bb90dcf58539c136361dc95bd7d138b9e6c5bc33c3ccc409e392e4b5857d175951 SHA512 c13c3daee81cd553f40156fc5add46e4af9a3436b04f2216a1460a9af7b5fe07e866451243cc04b756247d513ef76ab43ee52dc7cb67fd1b593a22e490227db7
 EBUILD graylog-2.5.1.ebuild 2292 BLAKE2B 6445d3b665015da099c6eb2bae405159fbb6e176307115553d84bbecf52ab56a466fc16a53ea95d10d3588b2eaddb6f8f5dd7ffe8f60276a9fa14a2de2042f38 SHA512 040ff5ccccd24be6cb2d9c13caaa8d72fbbbd4582d079cf04d9e174b6bbbb2f770076ebaeb0bf20b72c3d8c9645eba878752892dd5cdb2614be2bee1b09c6114
 EBUILD graylog-3.1.3.ebuild 2253 BLAKE2B 4e460d732415ce33f104cfdd2371f0a3975659183482a84a1b1f846552a7d13b330b4c6c188f0f3d6678ed7fbc1d03797e6b0bb070206aef6432e86ddf80d589 SHA512 f3398f5debe254150a0e1dfab2a1a3316a4aa8eb16591bebd4526bba4c057425cacebbaa7cbc34c6bb36471cd8464a3063fbae28b17dc295b8020191232f4c74
+EBUILD graylog-3.2.2.ebuild 2255 BLAKE2B a8e39a5ba451672d598fa6317231e411e0127855252272d67fd90433b16801356cb08683fe0e709d331301251402822c9d22c8e5589f93dfcaabf8e31106a2c1 SHA512 7207cc432927cef54445fc5af8626fecb8679efb26d09dc7fa05149fec3c10e66799458f003069ed99ce65ee7a75c3d4b0427115b33701f2c47ba3ccb6c7f254
 MISC metadata.xml 584 BLAKE2B d19e09582932c7986c85059766f2a845c0e85d214b9af6c61d9c26005e31c208a8ab59e6d82e5870162314c2cb4a9d3e852f12c02551d399c1eb3063449501bb SHA512 c32525442e20550c7e3b0ac8b74d896f35b2de1e87d57befb152047840bf4811c8df135f828b1c95505b4a348f25478cd7b2b186c36f93c6055086437f257505
diff --git a/app-admin/graylog/graylog-3.2.2.ebuild b/app-admin/graylog/graylog-3.2.2.ebuild
new file mode 100644
index 000000000000..cda5c7e5b52d
--- /dev/null
+++ b/app-admin/graylog/graylog-3.2.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Free and open source log management"
+HOMEPAGE="https://www.graylog.org"
+SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="!app-admin/graylog2
+	acct-group/graylog
+	acct-user/graylog
+	>=virtual/jdk-1.8:*"
+
+DOCS=(
+	COPYING README.markdown UPGRADING.rst
+)
+
+GRAYLOG_DATA_DIR="/var/lib/graylog"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog"
+QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
+
+src_prepare() {
+	default
+
+	# Stick to architecture of build host
+	if ! use amd64; then
+		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
+	fi
+	if ! use ppc64; then
+		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
+	fi
+	if ! use x86; then
+		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
+	fi
+	# Currently unsupported platforms
+	# QA warning galore but testing/patches welcome
+	rm lib/sigar/libsigar-*freebsd*so \
+		lib/sigar/libsigar-*solaris*so \
+		lib/sigar/libsigar-*hpux*.sl \
+		lib/sigar/libsigar-*macosx*.dylib \
+		lib/sigar/libsigar-ia64-*.so \
+		lib/sigar/libsigar-ppc-*.so \
+		lib/sigar/libsigar-s390x*.so \
+		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
+
+	# gentoo specific paths
+	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
+		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
+		graylog.conf.example || die
+}
+
+src_install() {
+	default
+
+	insinto /etc/graylog
+	doins graylog.conf.example
+
+	insinto "${GRAYLOG_INSTALL_DIR}"
+	doins graylog.jar
+	doins -r lib plugin
+
+	keepdir "${GRAYLOG_DATA_DIR}"
+
+	newconfd "${FILESDIR}/graylog.confd" graylog
+	newinitd "${FILESDIR}/graylog.initd" graylog
+}
+
+pkg_postinst() {
+	ewarn "Graylog does not depend on need.net any more (#439092)."
+	ewarn
+	ewarn "Please configure rc_need according to your binding address in:"
+	ewarn "/etc/conf.d/graylog"
+	ewarn
+	ewarn "Graylog requires Java >= 8"
+	ewarn "Elasticsearch 5.x or 6.x (does NOT work with 7.x)"
+	ewarn "and MongoDB 3.6 or 4.0 (does NOT work with 4.2)"
+}
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index f04965f3926a..1411608c50bf 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,5 +1,7 @@
 DIST hcloud-1.14.0.tar.xz 643088 BLAKE2B e360b06796e718df31b1640d78153a843a17a8d70a27a1771fc264b01b5649aa7b6344feba1d2856348070a74df6731d462f178cb23fdd1ada051c5695e237f2 SHA512 1fc9a776d89ee8c4f00ad71994a55151f1758ddff1083b0bdd24e569200ec996b4502ae7f8ba0fe9700a35c082385fafc817abe04aa0a7e9980b225b92ab8c6b
 DIST hcloud-1.15.0.tar.xz 647676 BLAKE2B 23a77fb74eabb1d8f21d84ac79768bedb7fc1f6bd24785eae041440b1de73de0e3815983ebb505b5b4e200238f02cf9bd443cea5f719bf441b14ea3c83c4792a SHA512 5683d5972fa6469833c86c58236e67002ba1a95c0b6e67051d7de9e8fb958cbdb37e0ffa20b2a9e6688fadcc2adbf59ea0258203e1e9156fa88fe8c7a0ad1636
+DIST hcloud-1.16.0.tar.xz 648732 BLAKE2B e477a7c60b0d9d18b644e1eb81e42002d82dde23c09c88d0d8d5ae21b835e279c4152b46742cfe5e53d2f12ee68582eb8da303a09d3204c2643d942ca41da2b0 SHA512 4d50184e9bc26dfd4d02f08fa7089b9d0e297502d22ca08d301676d8cd05298097dc72fc8e61033ba83e1eac4ea8bf7e1a6340463512643b76ad5eb7d5c7da02
 EBUILD hcloud-1.14.0.ebuild 553 BLAKE2B 83f94fe447972429f478b2f60df1c2cdac0d67a7886c2aaa1ec9beef7bc932182b386c53c7ab928b19b789bfb839c11a8ecc1729bb6c3a473646df3a8058aa42 SHA512 7030b9b8444d564185eb27682c388d8c078ab9994387e93b415d9083f005063df9ae9d5324e2daf77d54256d1a00a0571730de354e744cbd9e219cd562ef83de
 EBUILD hcloud-1.15.0.ebuild 554 BLAKE2B d47c96e84796e3ae3380c07351af1f96137e1e5088d954f64271400afbb5bfb13c659d626a7f5810563182982e13e43fc6f18f2564ceb1d3b9c47c4a07943f3d SHA512 b67c7b9baeae237e4b0d68d3e31551387f4ae984bd31891d36528aa5700c75f673809eadd8cb0f97ddc1529032d8553a46290d3c89c73e2c3b55a89856369de0
+EBUILD hcloud-1.16.0.ebuild 554 BLAKE2B d47c96e84796e3ae3380c07351af1f96137e1e5088d954f64271400afbb5bfb13c659d626a7f5810563182982e13e43fc6f18f2564ceb1d3b9c47c4a07943f3d SHA512 b67c7b9baeae237e4b0d68d3e31551387f4ae984bd31891d36528aa5700c75f673809eadd8cb0f97ddc1529032d8553a46290d3c89c73e2c3b55a89856369de0
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/hcloud/hcloud-1.16.0.ebuild b/app-admin/hcloud/hcloud-1.16.0.ebuild
new file mode 100644
index 000000000000..f5620e0f972f
--- /dev/null
+++ b/app-admin/hcloud/hcloud-1.16.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A command-line interface for Hetzner Cloud"
+HOMEPAGE="https://github.com/hetznercloud/cli"
+SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+
+src_compile() {
+	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 4151357baea9..aab077880ef0 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -239,9 +239,12 @@ DIST helm-3.0.0.tar.gz 498488 BLAKE2B e55b64d9547744118f35b83ed8ed3f1db168c491df
 DIST helm-3.0.1.tar.gz 498975 BLAKE2B 802b49ecc8888ef988571c9469be2dc039bb58373346a9d75284480b61971435774fcfffa42c1ffbc9d94d6f39fc1bc742c296aed2ba2676872bb50128d6333c SHA512 0fae3334e1c5c5a5e35c25a42d37bfdbbfcb40b6c1dc7a7b13dec4357ee0c538b619a2fd965921126ff8a652e1250fb158a502a99bf7da4ea697dff2e905d32b
 DIST helm-3.0.2.tar.gz 499904 BLAKE2B 0a3fb3912a1cca4c2539922ad5759196de5d4d7e61acb9370017a5053a519ebfd2eaa7bfa3514a05c28e40ba2d0d8bf55b7651fffdc2f32e69d0e0db50bfdb17 SHA512 c45ca39603e14c75812c695ffd1d67b070144c5311de369a53fbe10d2935ae616d5fd8e79fb81bbc8485061f649b63446b4f081152c3de0a3a0b4bafac7104a3
 DIST helm-3.0.3.tar.gz 499874 BLAKE2B eda691d2b02fb5aaee7e09dd846c19650c3fc0e5d46e703a768b3db5a9966c8bb5548beb1699c5c8771e8e39f8fe35558e601a961d900cd6ebd2e813dec1e6b7 SHA512 9dc776f0638350ba09f7a1af383160a56b0badd3c353f57173ea2540625eb36afe2c0cc1a203b6bcef738d32e4d914028a9b0495d2b652a8cbee4317bca47f0b
+DIST helm-3.1.1-vendor.tar.xz 3264936 BLAKE2B 13de28687f23bee91c14df5ccd6a3dcce428c1cc4bf9af4948cb0e4ecc54682ceaf2e6549b9df2c1e98c303efe63a919b8b996101f29f381f4ff6dabc837f4ba SHA512 c8216a37c26dc3fd4b8d2af670920195394d9fe2a400cb69e6dad1e480ad967adce7367f153068c0629c066eccb685caf4d1d70c09a580eabffd0bbcceaa69a8
+DIST helm-3.1.1.tar.gz 530397 BLAKE2B 02e92379a9d2010e2126e9b24b48282ff607c4850328d7988e7110c33c509b606d4f48b4cc6413ef4fbc3613536dca6f8ca118921da8b53fe976ecc82bf6b41a SHA512 c48a6cded6c65b44f75d45136a2b9f661a4c2b3ced3ab479558f2cf4d7eb0921b10852ebf998582f607975b4e5b5258dce0e2166f55facbfcffb023cf486b276
 EBUILD helm-2.16.1.ebuild 10055 BLAKE2B 6a0279e082cd74eafb01b4fc77b97a62ddd2e6ce44969db65d053a507f081583501b05afe6220e86dae5b037700ba410a4c67e3c1fa92472360c774f7fd05ee4 SHA512 78f9aeb398ce93c64fb558be4edd3fb9cb55d42f2658cdf57f0bd8fcccb4269007c1d952494a50a655cd57d4b7a89690df9a48485c77876ddf438600d4153b6a
 EBUILD helm-3.0.0.ebuild 7131 BLAKE2B 50e7fcd49e605386d35ac98266d89da63e0e2f91f8daf31eb80c21d599e1851ff5ab3f0f82ea4ae3f1c31382aa2966eb588150a16c1e7351851b7872d3dd4d2b SHA512 48411846df850bf94f360007e6605341cf41a9de739108b1d944306263d18161dc248ab1247689b128d837c32c840f4102abe585647325f5b3a275031a7df306
 EBUILD helm-3.0.1.ebuild 7057 BLAKE2B ea4a09c1ed7a18e03e258a674b6587d38f915161c8fed17b7c5d92e800cd547f17b633ace759dd3cce5d3f0d584cf373df949dbb1a951d771fa1b0457e62bc12 SHA512 af0fdc6f3fe0bc6f0f12050a6c78f285a88c20ea418a25f44437fe8cf12905f644f54f1210dd2a9b6b316b1f40d62d7018ca9c550c3bee9c569a8cbeef49a390
 EBUILD helm-3.0.2.ebuild 7057 BLAKE2B 35d906b9ff6ffabe35a88d069652c3efba27c4c3598713cb332cdd7b1835ebd47f50c5e6dbf0e62a13079ada2808e5aacce7167fb918d30ccbf0f6f8ac57627f SHA512 c05e5e8a9eee9a6a698af4c8fad82f5f664ec9a549001966f41f674451b4991c3bd3b1c11d0cd67dfb55152a072a1a4ef7e1251ba010e8a2a656b906557ad62b
 EBUILD helm-3.0.3.ebuild 7057 BLAKE2B f9ed7e57a6e35e1c102af2b905fd040c7493641b028ce03574b4dc2dca4917c2a40f9dffac3ed67f5742ffeee2690bc310ecb4a5e63203401c2a7efa588b5f26 SHA512 a5fc4965b25f830bdb078c3fd485f9fcfb96c9d6da79ee8c2e3cbe2b0fb764ffaba972c957bef80ea188e60b93e62033b96eac37f9f6743635ff0ad6cb186ed6
+EBUILD helm-3.1.1.ebuild 1186 BLAKE2B 636cdc90432c69eda862750e7a66a5db4b1e946df01002100af2e29c0bf9b725490e7d415bfd5030811df269d15107d900b75b9407327286e362bc6538c89535 SHA512 a3bf56080f17f714f8d60610cb7521b914aafed690b2167505ba23c48e7287652e07224752b73bc7177317f039b0f4d0668d3103626df19cf986df783e3432fb
 MISC metadata.xml 322 BLAKE2B b452dfaecaf6b32e7fc334ddb00444d739a618898f8e0d6905e8b3191acc7f0fc5e3929345405d86f9ab56e8ad80fbcd1dd46a0ea3ff5aaa2bb9f56407d10234 SHA512 ef4bb714213346e60a2a39833d0ab1987e10d2b34460a053b479775163e8778021ef3da63a8f5fede055281298dab88309a796cf3ad650c2d3ddeb17a7b0b4be
diff --git a/app-admin/helm/helm-3.1.1.ebuild b/app-admin/helm/helm-3.1.1.ebuild
new file mode 100644
index 000000000000..bae1ce69b17f
--- /dev/null
+++ b/app-admin/helm/helm-3.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module bash-completion-r1
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/helm/helm https://helm.sh"
+
+MY_PV=${PV/_rc/-rc.}
+SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip test"
+
+GIT_COMMIT=afe70585407b420d0097d07b21c47dc511525ac8
+
+src_prepare() {
+	default
+	mv ../vendor .
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" || //' \
+		-e "/GOFLAGS    :=/d" \
+		Makefile || die
+}
+
+src_compile() {
+	emake GOFLAGS="-mod=vendor" LDFLAGS= build
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN}
+	dodoc README.md
+}
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index 96b60d5d8d15..142a9613aa96 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,5 +1,5 @@
 DIST lib_users-0.13.tar.gz 25704 BLAKE2B 895f8b721216339fe4306158bf6282353d79584573091cc4e7c63c8096a9f9cfe380a8bce7229f168e44fe5d3641ceb8c91bd751316a6c6a467ace4ec0dce723 SHA512 588af7068728810832bcf4d1526f271e255d07c75d152fb41844c66f3598a71e9a96bee3426b31b58cd26af889bc42c0a7248731fdfe3623fd4567d2b6b7275e
 DIST lib_users-0.14.tar.gz 25746 BLAKE2B 4aa2dbbd7c53be13f79988a62c7997f0787ea9b773fc57681a021ff75ba9ff0988ac3032b21150c4e4958849a6195df09d388b6341e1ac139f34ce9555786233 SHA512 533c6e8f486e58d0fd22aea9a30adf91c3a8340a8a3719f6374ddfa8120d402c8202ab8ceb0e78aedd46e3e5875795392ed40497a66d51de5c2ca6a275a1a777
 EBUILD lib_users-0.13.ebuild 1134 BLAKE2B 75e0d5b887a13b1607e780a27d02c71f9770fb5c521581f8fb1961a7ca031ed3f19e369a439ab2c08a0b02bd14119a1321b76093875a5b2d26512bbc2e8f4881 SHA512 4fff666e0faabf4d7b88f852a53460a83c8650b1ffd406a0583eaf2d94b02395652af337eae71e84d7afffae5a37cb91a97a198998581af7d7cca8f4001fd417
-EBUILD lib_users-0.14.ebuild 1084 BLAKE2B 408749ee3456ec0d57dd52ed1467c81858e67cee0c85bc56570659e7375d2890608485cd7ddfd9b00b043ac45e4e39a2366c46a8447e84447e0646e6a32b54a9 SHA512 7957c4b6155fbc8f788dad4f51b45c3729e3be87a0a4d331c6a3456c2cfd2be568806ad21ab3eded95176b8e70b321333f25ec06719f9570857c17f581e11f0a
+EBUILD lib_users-0.14.ebuild 1080 BLAKE2B 44639a47c757a711780a76afc78ff5829edbae289af9d0a0f31da4b5429a23644c0d87674f14b18a5da4d226c23898271fb77570fcdd6e3e1fc1bf06e1b66e82 SHA512 2e831e25ded0a0fda2a3a927e398598fc33ffb293522f0e9013076417904d4f7cb84783ae7467fab93244a1697c42317232abf6f2042a4cbcad2cf4c053da95a
 MISC metadata.xml 454 BLAKE2B c545fd1db330988ad139de08b1890cfd9d6aac98947b954fb761515d314d8ebb941829e7767fe4fad6beb41caf3409111505d1a6378c852f15907933678ddd48 SHA512 c897ea5b6bed9fcc8715380a1b2756f376a095925a2c99a78ce6729cc9839683f40ce53f5faf0fb784169db5ef9162f1659ea6f24304bcc7cd47f90d49ec97dd
diff --git a/app-admin/lib_users/lib_users-0.14.ebuild b/app-admin/lib_users/lib_users-0.14.ebuild
index d60d13898433..7edb2878fdc4 100644
--- a/app-admin/lib_users/lib_users-0.14.ebuild
+++ b/app-admin/lib_users/lib_users-0.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 5aafbb074c66..490627c82212 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -12,16 +12,19 @@ DIST logstash-6.8.4.tar.gz 172186036 BLAKE2B b1219dab8dd1f88d01def54306ae09b3e9c
 DIST logstash-7.2.0.tar.gz 171299740 BLAKE2B cfdbabc11d6e0d182ea7bdff1d30ca3a5bfbfe036f952c0d944c105f563dfa1b444c8dd1e9f023301abfbf9a86708d6bde2689b462b28f00a34d09f78fe3898c SHA512 955358d504b6626ba9ac88a2d65b161044180c3085f8dbaedfb8b85b092ecc65721bbda73b750f7d8b78a052828a54f7ed7ad16ee7ec72f3ed5e428ba291a173
 DIST logstash-7.3.2.tar.gz 171783584 BLAKE2B 0a936edaa57ae5552b79bead754b75c8a8c7a920461b720c58dc8e32c2aae342f3639955b63264e8704093c0d30d5d801f468d1b391e9efb2c5d605dcb2ebf5e SHA512 311b849cb8e1f336908aefa1cb2f0e2d76b696410346dd3fa0560313f9cbd3f098c93aee68c9fead736a3edb39ca543161eb7de115597e034eb0a015904c7417
 DIST logstash-7.4.1.tar.gz 173284835 BLAKE2B d1d3fe199175d57e4b47fe50f26d6d54486182d6e69b6e50cccceecf1cf02484c6d9f1a8cd0ef72ea82b1da9550787cb5ac37bbf93a91b4d0518dde415479a1a SHA512 c89d530f16e5c6953d97708b6ff2f46bbb518a93652f11cad988841a73bf5862beb4a5326de1e63d0ffb65a498fc33235ab4fc950e8087aed5815b3a65e81ef6
-DIST logstash-7.5.1.tar.gz 165760774 BLAKE2B 803b8d90d637f57a4fbece491f0ea4f749c00d674ab12782cd5b7a588f967121a7f48ca2e594862999957aa9239b40876816c2971b5590b6fd3ef47d6faeaa90 SHA512 a7841423db3e66680227b3ae41622c531d47baad9b01830fe6e6823e8cdb78b98987ecd8cc2d0a3ffc3ea822bf69f8df000d4ffac708788ddb9279e15b38b9b4
+DIST logstash-7.5.2.tar.gz 166254387 BLAKE2B b93cc90ecb8e88cb3dd9970b4e67d950322ad500f94277963d1c7c58b61f0ad816ee030fac25cbff286847484f0d79cb0d34259ab7edc630026ce0fc58a23d7a SHA512 955e546372466fb557eb15b9f466decef24c520c7ff16afd5432d5a8d1dd1f061f11fb9178678bed74b3c16a2d5ee6cd72fc8e4d757c8af36747dc25522c443e
+DIST logstash-7.6.0.tar.gz 165923191 BLAKE2B 27efe97619d9ea595b11f12bec0c39dcc9d795b0d862ff73107283ca82fc54ac4e8ac8f98c6199d0b0a4cc30521769bd05e99e0ccdfda85ac9a778f53b514718 SHA512 cd6e483cfa91b35a96c853e4891d7ecd719ba36df965f1c5ab099ca8ed9ae2862bb8248d13c0a62a3f9f4ebfe47b5afa5842236ba2779adfbdadc36e68bff6d2
 DIST logstash-oss-6.8.4.tar.gz 172055711 BLAKE2B 696769dbb94ed9a6c9a84fb54ba35fedff360bff39c61ba7ef6a9a5f00e59dbc3c8d15f6b9080e39ce87f17553f04b831f029e8f779c75f0f28b673a2aa2e697 SHA512 6f7fe35f6e84417332093d089dc737f89737f30718d5ce843dfe6d3ba85d098e2a01da6c191729b68a7a326d4d65f6bcbdfeb656d5120401478dacb96b1f0671
 DIST logstash-oss-7.2.0.tar.gz 171128040 BLAKE2B f0f3d4f0d5228918d8435c521d10ff5070e23561c25ce28e8d58997d499a7c7697354c1fb1cb70bf2bd832ad50c04afb00cbde4b3053f9f24d2619f3fbfffbdf SHA512 24120740bc727b6da50b865bb85bf61f013a38b6679d679ecc75a73c69766a5133fd47ad99fa0220d5dc6cceb506fbde206787adcee31483288c68c228edd1fd
 DIST logstash-oss-7.3.2.tar.gz 171613705 BLAKE2B e1a0c512cadd5855e1a1524e1c44214aeb792361493406c5cacde1bd72243178d03113c08a1fe0d1c2212cec5a2947074911bf19eaaedc636db754081c3fe32c SHA512 3aac74966b27d0d551f49c78c457b18a1a76d0e5a7b2fa1dc9a7776927145b28a6c02f51e4dd7e9ca49dabe5f63effd4227fc6980e522ab7da4ef847da6bda12
 DIST logstash-oss-7.4.1.tar.gz 173114578 BLAKE2B 5530e3275be095168d845381ac2ef92c3fa2e3783b7d9749d88465239751bc74d0483a51fd61ac75f46a569201c5fd34bd1553db32ca84e911dbf34ddd5e6b14 SHA512 26defcb5777c044030081e98cc47a040c72c7a8261f8f2cb9349181ec6a375b4969e1fbd00c8046da2c3fae5a6dea45e53c41d1c84325cd75af766f6a1d4b3c3
-DIST logstash-oss-7.5.1.tar.gz 165585724 BLAKE2B dd6ae7cc6bf69e780773b8f382da23abe1642984073c2eeee8cf2527d2b5d13b071c69b74bd0001abd2cb2a8d5ffac9d396c96f731043e208f93770579236870 SHA512 db1ff3a13df9c5873fd08aadbe2c6cb23e9697653a18d054da774ba8448d6654cf0b41cc05db0a0788d75e325569965c8478fa91864694827daa82fc30c1a279
+DIST logstash-oss-7.5.2.tar.gz 166077841 BLAKE2B 93a66c1632a41029a954208b1aebb14802bb45c357cc484025d7e06cb11d30d31301dfe44318f1d8db423a9536802e3969a0643dbc4d27a01db45a89cfec5bfb SHA512 34b95e5d8001f1ba361ae41ac2aee495eb46432ecce44455e6dbf63cd9d2fe5175931a6e4eb8be227b28be420111e370599f2e8b1ba7a158ad8504a657e2b1d3
+DIST logstash-oss-7.6.0.tar.gz 165747338 BLAKE2B a8212198a3c244b0318e49e207b04cc8ca6ddab042cdfe441141e143db73bb13bfe925b457f25b2580d53db276f4dbcd0bf3485e1d979220a5aa6a99f6a2f3eb SHA512 264bc67ba567b598b5deacf90ad4ebe7a2ed0c385f4cee096c19dd939888f7656f2453995806feb9217dd6c36c8e2196c47de83beee05da463be9fb553fb0e65
 EBUILD logstash-bin-5.6.15.ebuild 2195 BLAKE2B 1ef9e7d8a825109a85e850c2e9b971c3b16d435f1a0e3dce40e18b48f64c5b83a3cedd0d85a15d422a3accccb0ffcbe79b2a0812fda24c04fd0f07a0e37b9436 SHA512 6026cb3d76dbab56a4a495b1bc3abea2d0c4c731261047e76acf792840f3deb1fdd0fd181b5b6a599f2056f22b76920e7844f1e76516919c7404c1d10e1b7259
 EBUILD logstash-bin-6.8.4.ebuild 2099 BLAKE2B e7cd6249e76d9e3629cc640542aef942ad893d4643c803a10c789a1070775996364aa0caff337bf2eb18cdd2bdd534941a5637f23e44d370a87bc017bc931fde SHA512 aadfd4248e27c0c0134a7c7705dc3c8cfb9b031a963214174664c8c2438ba8e1e466025337fc9a9a531ff5f6bc16b7e1f25d3362205b0ca2793bdb8482a9e202
 EBUILD logstash-bin-7.2.0.ebuild 2102 BLAKE2B 4859b52ecbe2d3cb0fa31768cbfcfe59ff4ab1ccfb70ed1b0b30edf33415a7107a246ab902fc3c42897804482dd91a25bd8da6af29374c424bc53e700ed1b797 SHA512 3e346deb2bccc47fa55d2de9afbc6bea15f28d235e93fae323620a24a70aa6671072ab90f778d3157ba74c860056a1f76d5ad0ac678b6d658bd49ffbb8fdc3dc
 EBUILD logstash-bin-7.3.2.ebuild 2095 BLAKE2B 80aa953c2657cc0218b18df01e67279384fcc57f8fb3931121c787caf0c198e9d87c138bc2c6d809d0766fd67e8e5046d10ca0d4826047f845d89931bf63e5b5 SHA512 4db211818a819557d904ced91163c2bdfeb3ed9a1ae5ecc9873c1973b5137aca526164fe04c35984b9f97a56564c3e2627d4b952775dd3b0ca220c2cca37fe54
 EBUILD logstash-bin-7.4.1.ebuild 2095 BLAKE2B 80aa953c2657cc0218b18df01e67279384fcc57f8fb3931121c787caf0c198e9d87c138bc2c6d809d0766fd67e8e5046d10ca0d4826047f845d89931bf63e5b5 SHA512 4db211818a819557d904ced91163c2bdfeb3ed9a1ae5ecc9873c1973b5137aca526164fe04c35984b9f97a56564c3e2627d4b952775dd3b0ca220c2cca37fe54
-EBUILD logstash-bin-7.5.1.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
+EBUILD logstash-bin-7.5.2.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
+EBUILD logstash-bin-7.6.0.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-7.5.1.ebuild b/app-admin/logstash-bin/logstash-bin-7.5.2.ebuild
index 9e7d19873de3..9e7d19873de3 100644
--- a/app-admin/logstash-bin/logstash-bin-7.5.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.5.2.ebuild
diff --git a/app-admin/logstash-bin/logstash-bin-7.6.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.6.0.ebuild
new file mode 100644
index 000000000000..9e7d19873de3
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-7.6.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="acct-group/logstash
+	acct-user/logstash
+	virtual/jre"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/{pipelines.yml,startup.options} || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	doins "${FILESDIR}/pipelines.yml"
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT}/usr/share/${MY_PN}"
+	elog
+	elog "The default pipeline configuration expects the configuration(s) to be found in:"
+	elog "${EROOT}/etc/logstash/conf.d/*.conf"
+}
diff --git a/app-admin/packagekit-qt/Manifest b/app-admin/packagekit-qt/Manifest
index 037e8f9f6326..688924ccd701 100644
--- a/app-admin/packagekit-qt/Manifest
+++ b/app-admin/packagekit-qt/Manifest
@@ -1,4 +1,3 @@
 DIST packagekit-qt-1.0.1.tar.gz 53503 BLAKE2B af96899e520f4139d6025746c2a2e7a65c67c2900cdf4fbdb410c12e33f494343d078ec24e7dcdb33749b1d5206b0bf622809827ed64beae162888e48d0aaec0 SHA512 e1291545b496571c00a6a24586c45b7173e85e3704d419af6a0ec47ea5ce256c8ec7e887721b1bf8038cb967ceb82726925800ab06aa784b2bdd560e49be724a
-EBUILD packagekit-qt-1.0.1-r1.ebuild 603 BLAKE2B 0fb3f58a5297828d87e166554a879489b3418ba6a029f3a900b9c15d0acd0d72fef76088ac7506dc58ee1243839957cd885d689976cd7c8e1fabc732008cb33e SHA512 95b6d0799ccf82ca9c9753ed7f23608c2f9a3a354fba37087c6b8d18c69daafb3fc0d2ff1778eb4d8692ed96647c5b7abedc2f20bd5eee3ec7c00a85324c6d35
-EBUILD packagekit-qt-1.0.1.ebuild 593 BLAKE2B da4d9255ac6569cae36ba9527248fcef33970d0bbc4e210835aaff48fe65262dfd9da204d80ca9faf2833d3130fe5281eeea67d19e4dffa00a71f80239f9ca17 SHA512 b536a04eefaea32a7931851527c296220934718edb1788fe97df4bbe03179d87ba8a92c4808a658de1a1c92621fce670b9b189bc47aa53c4f2a0781091016688
+EBUILD packagekit-qt-1.0.1-r1.ebuild 601 BLAKE2B 2cfd1d69acbb38cf0dace59ef3afe0c57cabcb3c2c9f9aed00dd83f21f53270e88349a16918b83a9d658cb0853b511793d3d6dc4b968ef212d5a88f47b0ffa2e SHA512 f441ad562dd51552e9ef4ed8687d32fd10edab9b0e6036e63dd7344a3a76698d6d986b86ce52440c3486dc843f3fa72565ab6bcd533467c1f5fe8f52b9fec4f2
 MISC metadata.xml 443 BLAKE2B 83c6d5495baf3a9909dbb0ea06f912b92f6faf6f48e6f1da7610a16cca3770c097516a748b44fc0aef99985929e16b7dc20de131bf5404bfd72895acca56f04b SHA512 f63f424329b0ffeac0dcfb50841e94644bd3a44852bebd0834fc36bedbbe4bbbb13bfdfd46e065ca3ddd9cffac1ba86590310267939c486f108913db84e1d093
diff --git a/app-admin/packagekit-qt/packagekit-qt-1.0.1-r1.ebuild b/app-admin/packagekit-qt/packagekit-qt-1.0.1-r1.ebuild
index 5099e2dc49a7..1aae6eaace85 100644
--- a/app-admin/packagekit-qt/packagekit-qt-1.0.1-r1.ebuild
+++ b/app-admin/packagekit-qt/packagekit-qt-1.0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/app-admin/packagekit-qt/packagekit-qt-1.0.1.ebuild b/app-admin/packagekit-qt/packagekit-qt-1.0.1.ebuild
deleted file mode 100644
index 8e125d096722..000000000000
--- a/app-admin/packagekit-qt/packagekit-qt-1.0.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="PackageKit-Qt"
-MY_P=${MY_PN}-${PV}
-inherit cmake-utils
-
-DESCRIPTION="Qt PackageKit backend library"
-HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
-SRC_URI="https://github.com/hughsie/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=app-admin/packagekit-base-0.9
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index cfb44b6e71f9..0ddf9ece8779 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,11 +1,10 @@
 AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
 AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
-DIST puppet-agent_6.11.1-1stretch_amd64.deb 19948710 BLAKE2B 256588922cfacb1d8146cd1142c43d893a55dfb67d7f70ca311df6178e7f9a82a0702d8306e0575d3f817e53c091fd3010027512cb4ce95956bdfa968372cc21 SHA512 90c39d55a8761185f82c9ac106d696ae48a170679e6043b6b3db32254e918b1b9c1b32c4e9721e5751189f84f002415f21a627daa22738a8c1ae3cb5df514eb3
-DIST puppet-agent_6.11.1-1stretch_i386.deb 20327410 BLAKE2B c2a105139df97395f54bb54d7ac971d914dcd3b69614dca55fe443d9fe5360118b899610a6d2d85b96b8b45715864df608d0783a3aabad3a2ae5555a0d510a2e SHA512 5d1173534beb53325d3c7c2fd500a7bd82a389fa8cbc9e867f6acbb6c2647190339d3b096e8a054aff268f27c5bd7de65c371a474b9c8263e8fa36bab75452bd
 DIST puppet-agent_6.12.0-1stretch_amd64.deb 20011636 BLAKE2B f83b795f07771d70220cac71d9b6d8ac7270a20fd5b78471ccef1c8ff802af3c035477f7741e775b10bc609d016a6e9fb79b199987e34b7d4f9a427c4adcd39f SHA512 dda8fa45b961d4a775da7eb128887eee3ceb9887d1062bc2fc748f6055811600162dfb2c4fbf87e401ad404813d2de0cc58ce7aade0aa23af637bb3707896126
 DIST puppet-agent_6.12.0-1stretch_i386.deb 20369446 BLAKE2B f01e39a1b307657569084e2ade1d41f17eefaa2048035f635437159e4373386c6413fa71756594d4a8748ffa0bbbdc2c54c72e696a390380bc9c57721ef010b3 SHA512 fc58e5ea22bd3dd36278db37e46d20809e284db5645ab680fb2c461ee9e4f9e635550f924278905ec13a8f9a71fbf604959e8522e4c0da52709c42f309a04921
-EBUILD puppet-agent-6.11.1-r1.ebuild 2046 BLAKE2B 25710cb43fa1df4e83a2e3fc6d54305685303bfbb8de9eb30a9d98789479a31139eaebad70e1ee85ca2a84f4a4fbe67d8101c83522b1d362d10e64bf2233f309 SHA512 1a7efcbef24345ba3ef59c0621e9efdc9ef898b8976a0efdd4525f2201f3e297be4f9f6d73456029cb560bdc0569635f0af7b6d8ef117337cb3b0eaea3b706d3
-EBUILD puppet-agent-6.11.1.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
-EBUILD puppet-agent-6.12.0.ebuild 2046 BLAKE2B 25710cb43fa1df4e83a2e3fc6d54305685303bfbb8de9eb30a9d98789479a31139eaebad70e1ee85ca2a84f4a4fbe67d8101c83522b1d362d10e64bf2233f309 SHA512 1a7efcbef24345ba3ef59c0621e9efdc9ef898b8976a0efdd4525f2201f3e297be4f9f6d73456029cb560bdc0569635f0af7b6d8ef117337cb3b0eaea3b706d3
+DIST puppet-agent_6.13.0-1stretch_amd64.deb 22432484 BLAKE2B 231f8683afbf4d2c5ded7bfec323baecbfd52446bb3483c2c16764bc57b79a18d256ecf94b27d4db1bbe88038d7f3eef037c500a39e3b66d641e4effa94cd2d3 SHA512 6101e84e5dbfa64bd336bb23595fe559165e4a159fa5de739aa1617e6825ab11ad62d1abbee26ff94b9f68caa7a192c0339a0c721efcc534ae9ddbba161af907
+DIST puppet-agent_6.13.0-1stretch_i386.deb 22787442 BLAKE2B 1bcea00b2da5c5b0db51fdd12d3828492a9a56af3a8c84919258ac7b90f7d135df708aba602a6d517364ac8b42f1ee3f1c11596cca0e89809a72d1d04c7ecc58 SHA512 55afd1ec6d331808a2a5adcd9c41803d932bcd7e2653da42c81c8ea1179649ae7ac642993813d527b2f365fb4f21d67015a0c2eb5379de2184585475521f8726
+EBUILD puppet-agent-6.12.0.ebuild 2044 BLAKE2B c1fc5e90fce3d25fe49f30b842b8bd907924e602469417c14141de1f17075fef1353e839f308735d40d9aca7649f402319d5b1ac386deb9953e782711fd57dd8 SHA512 19acdc04d6713eb281d98a00c3ea16dfb9864f17241cadd4965315b5550fb4628f70ddd0321afe4095c17aa20fb1b6b8b8ada8e9077b1f59b61a0180b5ddc84c
+EBUILD puppet-agent-6.13.0.ebuild 2018 BLAKE2B 74f72ffb55bb069bca1a2ea3db686ae1d5236e8c180b3b14afd18f451c7718e51ff09413380abb0bc79497ccde9aa011d7de55a9f7f92ce213d9b8361dde3d50 SHA512 f4aa0379772aa69bc9bb75fd085000e1ea64a889919b025372244f8a72df2da2f5bd27d51844d34985a8f397e9d6b8159ac46da647f62ae7f9e1cb2ec25d7000
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild b/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild
deleted file mode 100644
index c648209a4a7e..000000000000
--- a/app-admin/puppet-agent/puppet-agent-6.11.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/glibc
-	sys-libs/readline:0/7
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-}
diff --git a/app-admin/puppet-agent/puppet-agent-6.12.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.12.0.ebuild
index 36e4354f6f34..166b77d76f3f 100644
--- a/app-admin/puppet-agent/puppet-agent-6.12.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.12.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-6.11.1-r1.ebuild b/app-admin/puppet-agent/puppet-agent-6.13.0.ebuild
index 36e4354f6f34..6ef508024129 100644
--- a/app-admin/puppet-agent/puppet-agent-6.11.1-r1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.13.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils systemd unpacker user
+inherit eutils systemd unpacker
 
 DESCRIPTION="general puppet client utils along with hiera and facter"
 HOMEPAGE="https://puppetlabs.com/"
@@ -20,7 +20,9 @@ RESTRICT="strip"
 CDEPEND="!app-admin/puppet
 	!dev-ruby/hiera
 	!dev-ruby/facter
-	!app-emulation/virt-what"
+	!app-emulation/virt-what
+	acct-user/puppet
+	acct-group/puppet"
 
 DEPEND="
 	${CDEPEND}
@@ -28,6 +30,7 @@ DEPEND="
 RDEPEND="${CDEPEND}
 	app-portage/eix
 	sys-apps/dmidecode
+	sys-libs/libselinux
 	sys-libs/glibc
 	sys-libs/readline:0/7
 	sys-libs/ncurses:0[tinfo]
@@ -39,11 +42,6 @@ RDEPEND="${CDEPEND}
 
 S=${WORKDIR}
 
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
 src_install() {
 	# conf.d
 	doconfd etc/default/puppet
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index a94673ee99b7..371dd5c78112 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,23 +1,15 @@
-AUX 43e2c935252b995134ce353e5e6312cf77aea480.patch 13618 BLAKE2B 91727c30b968b41dc8f6bb2ca217d5b9ccc2b5d08872be5a65a45b7f8bc37130255df139a17b7ca09b39b5b1a0b9ddcd6c54d2448148495cf493e7a085d2f0f5 SHA512 65b303c957a29bb5782a2b849944fba029dea3a533c25d4c17830391b5e4963fef304c0be876f5e7892b1a0eb4da16390d4ab1e39f459c05ecbb7100c9c0a9ca
-AUX puppet-fix-tests-4.7.0.patch 1102 BLAKE2B e5c98627620f9f76f1421a13969dba3b1d279a63cdb65fc28713a9a2849c8e8cd0e42a30c9058e341d5bbabd3d24ae17c050fa551566e6c61301b83396a0b80a SHA512 81485af1a218b5616195ed80b3fc963c42d56265477be9a636c0e915a18771ff93e12cdbded45ce90da17ce72be4ea4881b5ad8e9d5a997be271df3cd2e8a2c8
 AUX puppet-fix-tests-6.10.1.patch 1163 BLAKE2B c2b0dd51aca250b06bdcefcf59fe0e33244aaaca90ead498fc7254a148ee4f4a5b89e8fd99259fce380517827f75720728610ffb79b90c3416f86de2988126db SHA512 2c97b9929c8a66ffb1ae4a16600e1ffea40b04e13f8cfc320a1d681317b3b348918d8e6c66c9be746db19cfb65b615afe94a4e30a8f6a350cb64cf437415e4ae
 AUX puppet-systemd.patch 481 BLAKE2B 8ca58755e5c3a235c60eed11c98e20bbd3cb27c81531709b27981ee61f6f5dea63d2487d49761ff84e7590b608c170bcd369fe7ef3700a5df1bd03b29c66ec71 SHA512 08bb997cedea378efa4614e4b2ff04acdd68cdc376fde422677b64dc56b8256ecf7221210c20529bb5a9a49fa8c92f67667c7acd6ac64b665e79639318a3df97
-AUX puppet.init 917 BLAKE2B 0ebbcdd8c9d4154984130ba3f597969f5f070f65f246770583663df4f192052a0ed666d09d4d417864457814d6a680ac4f327dc2a83b774da3a3c0d4efea1c8d SHA512 6bd2e1c21abaa5149b853f1732a6bb84335a8b4ae4129db52da463597691fd983d347bc04aad69724034d37f953f50c6aa5316d517b9efed2414db8e3d94d7bf
 AUX puppet.init-4.x 764 BLAKE2B 997fef3e95718f3e0f46fa2ab5994ac994a585bcfe728a9dcdfb3ccd5b76e6fd879a4160dce1402803713344fc2082b43e3116b468e9b49fd1b17a043040f860 SHA512 170100981c7e24284a12a208cede1a73afbaeab73315fd15a7337d416825c6d26a29ee272244d39764ad4086bc6a6f99cdc56ed6a600282d6ff9ed74794bfaf8
 AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76655a4897fdf128fb38950ff8e62abfa806785906fdae648c544310b75f9a33694ce1fbc0c31fe4f04a8 SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d
-AUX puppetmaster.init 1090 BLAKE2B 367b678860b955003ff8d79e69cd8c4a6d652ae738bec3c3314a3586b485ddafbfd9609e6f589472cd7c12b234e9ca1fa3cf492c1649b03c371ad29384df6555 SHA512 cb8b63aecee163c680449edfa63f9070582d3c1c924e3692dc7c18a7f84e166e9e4d88abae44d6e828eb3d4ab57b0d3a1f64e3a69453fa30d5559e4ae1716975
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
-DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
 DIST puppet-5.5.17.tar.gz 3090402 BLAKE2B 7722ec4196ee766c29eddd7dc73539a4a5a0e4cc781a84af25210488328b5ae01178ca64e8eef14152cbeca06dc8fe145b5e39ce6a120d7689fc32cbbbe16f9f SHA512 95c6cd836a9f732ccfe2d8b83096e79c32428c43390c0826663f896ca1388e1fe3b55d93a5a7548831e95de85247db717866c36786d591e207341c734d70168b
 DIST puppet-5.5.18.tar.gz 2984835 BLAKE2B d5a1d023d3d26e04ccc81efa772131c06fc7ace8ec59c7efa97bddb775bb492d3256290824a87d54df5c28862cbba98c58cf41bb4a0c27a4128701652c06eee0 SHA512 86f210ee783ca36340b22463cd4ac237d8dc1c6a35526530af0696bb3f0373b0b22f690d3e3f8e31655ea182a33eb60b66b5826bd6c4d1b0059a8e46152416e6
-DIST puppet-6.10.1.tar.gz 2809383 BLAKE2B 1589dcfa7d73b81ab7fbc3fca4b2fe956f5d240d11583c484262d5243e4713bb4aa9cd5c655e9566468050ab2e5c0ec0cc720e3ff9088add0744e02147b4e3bb SHA512 211c9837eb4a77a54bf09811a1a84709eef06f17e0c5c9c598d01bce2e183e69974709ad4dfb8f5fecd7433c1ff52757aa699c623155d1a0742f2e07eaf2ec56
-DIST puppet-6.11.1.tar.gz 2816525 BLAKE2B c4b188d5bf76b70a2748b86df78f1ca6ab99951cbc3a16377d3f2d38e165bc78ef8e5648cb09264a25ae81ac4d379b9323b1f2bbdea6679292c2cf38cabee662 SHA512 f44196206331448651e0ff0e865b09c6ccbb19115edeba4c58c8a29aa35e7d76676d5a3cb35c51cd511a44115c9c9434f1f90d5cbb0a5551a4004741d305c879
 DIST puppet-6.12.0.tar.gz 2825392 BLAKE2B fdb7007ca337654f5ee89cd6f3beae300c3eb952570eaf1aa9baad407b84b418916e42aed63855bbb250f1d367be12f98261df54253f6438d33950134ef01cce SHA512 bcb77699f4a4a058ea0fa47ee2b449f19053e3ae859e3e30c65a57ad65fc052a4f05d7a932b9cc4b9974b36dc343ac482258ad8d5a44a151362df474b82c11fe
-EBUILD puppet-4.10.12.ebuild 5091 BLAKE2B 4a556264af256eaa8a13a33048fd0a2d372381da9f63b63e148848a1094a85e948eb0f99728f8b3fe037aec57fcb9693dd96961f24fc8042d7fa25ab9e4d30f7 SHA512 ae33aae116ab8477644bf84d438ad7e301ba168a92e857b79a35dd33b6f2d853b1074f1122b180d4f6cff9cad0d802d58936f7162a30ce6f1ea341032ff1fcc0
+DIST puppet-6.13.0.tar.gz 2837171 BLAKE2B dc64b23fa2d5fcb978cfb03bf67f89ff0ae084883320f267bbb7fd613fd8948193658d717ecbf30f73e313c4530f872617a186675547509db9492589e4f226d6 SHA512 fb7abc9cf79a3de1daf597c0c1768ab4abcc11a236beb8294c5fc69d07ae23149216f7c8d33599365d3c10485f3fb3f8f5fe492e0e7312d19ffdaa0bc8b87d0c
 EBUILD puppet-5.5.17.ebuild 3737 BLAKE2B fdef57a527cacfe399a1acc5cf6a098c0de6a6676d51e2da0c11c37036f7d3e55d98140f5c7cbf52c610edcd6cc9e35b2a0bb1ccf92d52aef7d0de08e4b3c805 SHA512 b83747415c59389373f07ddb32f70fa22d8baf89f1d229dbea3931e1a41e03592e66ddeab2be2a21810d17097e205f1db035007376e692c68ba1682d6ee36a2c
 EBUILD puppet-5.5.18.ebuild 3739 BLAKE2B 180f08d4120e872353af7efec593fe400552a642ada66bb3ade49a2cfc4b58b012a2bcde6c85b61f029b633c67e455e081e37260e50aad9ba5275447bc45181c SHA512 57023e9d13e829f71ddbc790dfc3b9a334ceb707050ba728b954c6f7b2e534173c86abf7f53834847be0b873dd1e4b9cde493f43be7fd2269daf128449582fe8
-EBUILD puppet-6.10.1.ebuild 3679 BLAKE2B be2b173b16da1eeed659baa79c9ae3ee953d17113ced882c5606dbcd397cfe2f41c0c78c9f6434d0dba97e332b87f00319d15d36ad924da83ce895cf5e650b81 SHA512 64a74e8402a9ae79cf1400f206ca5a0cf133d069d311b2f6bfd3b456974d8dbb134674fe0f53e51255cf27770b95a2b10fa11d1df181b3da05c89db3d8616495
-EBUILD puppet-6.11.1.ebuild 3679 BLAKE2B be2b173b16da1eeed659baa79c9ae3ee953d17113ced882c5606dbcd397cfe2f41c0c78c9f6434d0dba97e332b87f00319d15d36ad924da83ce895cf5e650b81 SHA512 64a74e8402a9ae79cf1400f206ca5a0cf133d069d311b2f6bfd3b456974d8dbb134674fe0f53e51255cf27770b95a2b10fa11d1df181b3da05c89db3d8616495
-EBUILD puppet-6.12.0.ebuild 3681 BLAKE2B c5252e97bbd5db75358f4a22dd9a01a89b69a44e9deef3f024bc13b65077ca838fc6aa529e37d57efc575a57508a8e3ceaab12beac80f5d469edecdff0a1e08f SHA512 d61b57c3203e71e5b086a0d1fafe3796cd2235ef4a1772ecc8e9641193e098702a993a0aa39d10384871de4908c075f5176648d78df9be66bc6969711e8ed5e2
-MISC metadata.xml 1638 BLAKE2B 627235302890d6ef2d65d2dd0cc1a8ccf9f37a19a33e4fce7b3912c80f799250d7d0dd098af816491b9d17e4e1215c1d088236f45cad8bba4f6b7f381b3c7190 SHA512 90b95b925e4ac88c9133505e5da85372b3ca23dcefed9baaee030337d0319fec60cde843fcdf3f38d85d1956fa90a1d2d908758289c3deb1acc13164b0e8eb6c
+EBUILD puppet-6.12.0.ebuild 3679 BLAKE2B f7687670c5cf491f7e67d24d1bd4e3155f404a4a21aa4478a6d05a78604f0865deb1e64fdfcbfa4221ede08e5a15610c428f145b0bda059236966bf2dc02b869 SHA512 4932b7c5e0590bfc7c149546701647f963306b41550550407df83ce7ca2e20db7f80ab3b33cc0370a5283b4ece4229346a1cadc742fe125325ddb00a5db9f28d
+EBUILD puppet-6.13.0.ebuild 3632 BLAKE2B c31b356950b8247bd9bd9161c6c51a8ee36be6508d64e925001e86a787788eae3af5379b30313a0f7e7d5a7104b44417f1cab30d415baa49dbc90db4f2c9ee2a SHA512 b5be8b20c4ad992078a8607f0679e45820a665a571aa870a79c29c8382656ec238f79f71bbdab9376aeb0b72532ad7f641990c3f0d5aa26288209ccef15e1ea3
+MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/files/43e2c935252b995134ce353e5e6312cf77aea480.patch b/app-admin/puppet/files/43e2c935252b995134ce353e5e6312cf77aea480.patch
deleted file mode 100644
index 09b345e8bc97..000000000000
--- a/app-admin/puppet/files/43e2c935252b995134ce353e5e6312cf77aea480.patch
+++ /dev/null
@@ -1,329 +0,0 @@
-diff --git a/lib/puppet/provider/package/portage.rb b/lib/puppet/provider/package/portage.rb
-index 374667c..12160c6 100644
---- a/lib/puppet/provider/package/portage.rb
-+++ b/lib/puppet/provider/package/portage.rb
-@@ -2,14 +2,19 @@
- require 'fileutils'
- 
- Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Package do
--  desc "Provides packaging support for Gentoo's portage system."
-+  desc "Provides packaging support for Gentoo's portage system.
- 
--  has_features :versionable, :reinstallable
-+    This provider supports the `install_options` and `uninstall_options` attributes, which allows command-line
-+    flags to be passed to emerge.  These options should be specified as a string (e.g. '--flag'), a hash
-+    (e.g. {'--flag' => 'value'}), or an array where each element is either a string or a hash."
-+
-+  has_features :install_options, :purgeable, :reinstallable, :uninstall_options, :versionable, :virtual_packages
- 
-   {
--    :emerge => "/usr/bin/emerge",
--    :eix => "/usr/bin/eix",
--    :update_eix => "/usr/bin/eix-update",
-+    :emerge => '/usr/bin/emerge',
-+    :eix => '/usr/bin/eix',
-+    :qatom_bin => '/usr/bin/qatom',
-+    :update_eix => '/usr/bin/eix-update',
-   }.each_pair do |name, path|
-     has_command(name, path) do
-       environment :HOME => '/'
-@@ -24,15 +29,18 @@ def self.instances
-     result_format = self.eix_result_format
-     result_fields = self.eix_result_fields
- 
-+    limit = self.eix_limit
-     version_format = self.eix_version_format
-     slot_versions_format = self.eix_slot_versions_format
-+    installed_versions_format = self.eix_installed_versions_format
-+    installable_versions_format = self.eix_install_versions_format
-     begin
--      eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
-+      eix_file = File.directory?('/var/cache/eix') ? '/var/cache/eix/portage.eix' : '/var/cache/eix'
-       update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
- 
-       search_output = nil
--      Puppet::Util.withenv :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format do
--        search_output = eix *(self.eix_search_arguments + ["--installed"])
-+      Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
-+        search_output = eix *(self.eix_search_arguments + ['--installed'])
-       end
- 
-       packages = []
-@@ -57,65 +65,123 @@ def self.instances
- 
-   def install
-     should = @resource.should(:ensure)
--    name = package_name
--    unless should == :present or should == :latest
--      # We must install a specific version
--      name = package_atom_with_version(should)
-+    cmd = %w{}
-+    name = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
-+    name = qatom[:pfx] + name if qatom[:pfx]
-+    name = name + '-' + qatom[:pv] if qatom[:pv]
-+    name = name + '-' + qatom[:pr] if qatom[:pr]
-+    name = name + qatom[:slot] if qatom[:slot]
-+    cmd << '--update' if [:latest].include?(should)
-+    cmd += install_options if @resource[:install_options]
-+    cmd << name
-+    emerge *cmd
-+  end
-+
-+  def uninstall
-+    should = @resource.should(:ensure)
-+    cmd = %w{--rage-clean}
-+    name = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
-+    name = qatom[:pfx] + name if qatom[:pfx]
-+    name = name + '-' + qatom[:pv] if qatom[:pv]
-+    name = name + '-' + qatom[:pr] if qatom[:pr]
-+    name = name + qatom[:slot] if qatom[:slot]
-+    cmd += uninstall_options if @resource[:uninstall_options]
-+    cmd << name
-+    if [:purged].include?(should)
-+      Puppet::Util.withenv :CONFIG_PROTECT => "-*" do
-+        emerge *cmd
-+      end
-+    else
-+      emerge *cmd
-     end
--    emerge name
-   end
- 
--  # The common package name format.
--  def package_name
--    @resource[:category] ? "#{@resource[:category]}/#{@resource[:name]}" : @resource[:name]
-+  def reinstall
-+    self.install
-   end
- 
--  def package_name_without_slot
--    package_name.sub(self.class.slot_pattern, '')
-+  def update
-+    self.install
-   end
- 
--  def package_slot
--    if match = package_name.match(self.class.slot_pattern)
--      match[1]
-+  def qatom
-+    output_format = self.qatom_output_format
-+    result_format = self.qatom_result_format
-+    result_fields = self.qatom_result_fields
-+    @atom ||= begin
-+      search_output = nil
-+      package_info = {}
-+      # do the search
-+      search_output = qatom_bin *([@resource[:name], '--format', output_format])
-+      # verify if the search found anything
-+      match = result_format.match(search_output)
-+      if match
-+        result_fields.zip(match.captures) do |field, value|
-+          # some fields can be empty or (null) (if we are not passed a category in the package name for instance)
-+          if value == '(null)'
-+            package_info[field] = nil
-+          elsif !value or value.empty?
-+            package_info[field] = nil
-+          else
-+            package_info[field] = value
-+          end
-+        end
-+      end
-+      @atom = package_info
-+    rescue Puppet::ExecutionFailure => detail
-+      raise Puppet::Error.new(detail)
-     end
-   end
- 
--  def package_atom_with_version(version)
--    if slot = package_slot
--      "=#{package_name_without_slot}-#{version}:#{package_slot}"
--    else
--      "=#{package_name}-#{version}"
--    end
-+  def qatom_output_format
-+    '"[%{CATEGORY}] [%{PN}] [%{PV}] [%[PR]] [%[SLOT]] [%[pfx]] [%[sfx]]"'
-   end
- 
--  def uninstall
--    emerge "--unmerge", package_name
-+  def qatom_result_format
-+    /^\"\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\](.*)\"$/
-   end
- 
--  def reinstall
--    self.install
-+  def qatom_result_fields
-+    [:category, :pn, :pv, :pr, :slot, :pfx, :sfx]
-   end
- 
--  def update
--    self.install
-+  def self.get_sets
-+    @sets ||= begin
-+      @sets = emerge *(['--list-sets'])
-+    end
-   end
- 
-   def query
-+    limit = self.class.eix_limit
-     result_format = self.class.eix_result_format
-     result_fields = self.class.eix_result_fields
- 
-     version_format = self.class.eix_version_format
-     slot_versions_format = self.class.eix_slot_versions_format
--    search_field = package_name_without_slot.count('/') > 0 ? "--category-name" : "--name"
--    search_value = package_name_without_slot
-+    installed_versions_format = self.class.eix_installed_versions_format
-+    installable_versions_format = self.class.eix_install_versions_format
-+    search_field = qatom[:category] ? '--category-name' : '--name'
-+    search_value = qatom[:category] ? "#{qatom[:category]}/#{qatom[:pn]}" : qatom[:pn]
-+
-+    @eix_result ||= begin
-+      # package sets
-+      package_sets = []
-+      self.class.get_sets.each_line do |package_set|
-+        package_sets << package_set.to_s.strip
-+      end
- 
--    begin
--      eix_file = File.directory?("/var/cache/eix") ? "/var/cache/eix/portage.eix" : "/var/cache/eix"
-+      if @resource[:name].match(/^@/)
-+         if package_sets.include?(@resource[:name][1..-1].to_s)
-+           return({:name => "#{@resource[:name]}", :ensure => '9999', :version_available => nil, :installed_versions => nil, :installable_versions => "9999,"})
-+        end
-+      end
-+
-+      eix_file = File.directory?('/var/cache/eix') ? '/var/cache/eix/portage.eix' : '/var/cache/eix'
-       update_eix if !FileUtils.uptodate?(eix_file, %w{/usr/bin/eix /usr/portage/metadata/timestamp})
- 
-       search_output = nil
--      Puppet::Util.withenv :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format do
--        search_output = eix *(self.class.eix_search_arguments + ["--exact",search_field,search_value])
-+      Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
-+        search_output = eix *(self.class.eix_search_arguments + ['--exact',search_field,search_value])
-       end
- 
-       packages = []
-@@ -127,10 +193,19 @@ def query
-           result_fields.zip(match.captures) do |field, value|
-             package[field] = value unless !value or value.empty?
-           end
--          if package_slot
--            package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], package_slot)
--            package[:ensure] = eix_get_version_for_slot(package[:installed_slots], package_slot)
-+          # dev-lang python [3.4.5] [3.5.2] [2.7.12:2.7,3.4.5:3.4] [2.7.12:2.7,3.4.5:3.4,3.5.2:3.5] https://www.python.org/ An interpreted, interactive, object-oriented programming language
-+          # version_available is what we CAN install / update to
-+          # ensure is what is currently installed
-+          # This DOES NOT choose to install/upgrade or not, just provides current info
-+          # prefer checking versions to slots as versions are finer grained
-+          if qatom[:pv]
-+            package[:version_available] = eix_get_version_for_versions(package[:installable_versions], qatom[:pv])
-+            package[:ensure] = eix_get_version_for_versions(package[:installed_versions], qatom[:pv])
-+          elsif qatom[:slot]
-+            package[:version_available] = eix_get_version_for_slot(package[:slot_versions_available], qatom[:slot])
-+            package[:ensure] = eix_get_version_for_slot(package[:installed_slots], qatom[:slot])
-           end
-+
-           package[:ensure] = package[:ensure] ? package[:ensure] : :absent
-           packages << package
-         end
-@@ -138,10 +213,9 @@ def query
- 
-       case packages.size
-         when 0
--          not_found_value = "#{@resource[:category] ? @resource[:category] : "<unspecified category>"}/#{@resource[:name]}"
--          raise Puppet::Error.new("No package found with the specified name [#{not_found_value}]")
-+          raise Puppet::Error.new("No package found with the specified name [#{@resource[:name]}]")
-         when 1
--          return packages[0]
-+          @eix_result = packages[0]
-         else
-           raise Puppet::Error.new("More than one package with the specified name [#{search_value}], please use the category parameter to disambiguate")
-       end
-@@ -155,39 +229,73 @@ def latest
-   end
- 
-   private
-+  def eix_get_version_for_versions(versions, target)
-+    # [2.7.10-r1,2.7.12,3.4.3-r1,3.4.5,3.5.2] 3.5.2
-+    return nil if versions.nil?
-+    versions = versions.split(',')
-+    # [2.7.10-r1 2.7.12 3.4.3-r1 3.4.5 3.5.2]
-+    versions.find { |version| version == target }
-+    # 3.5.2
-+  end
-+
-+  private
-   def eix_get_version_for_slot(versions_and_slots, slot)
-+    # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5] 3.5
-     return nil if versions_and_slots.nil?
--    versions_and_slots = versions_and_slots.split(",")
--    versions_and_slots.map! { |version_and_slot| version_and_slot.split(":") }
--    version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot }
-+    versions_and_slots = versions_and_slots.split(',')
-+    # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5]
-+    versions_and_slots.map! { |version_and_slot| version_and_slot.split(':') }
-+    # [2.7.12: 2.7
-+    #  3.4.5:  3.4
-+    #  3.5.2:  3.5]
-+    version_for_slot = versions_and_slots.find { |version_and_slot| version_and_slot.last == slot[1..-1] }
-+    # [3.5.2:  3.5]
-     version_for_slot.first if version_for_slot
--  end
--
--  def self.slot_pattern
--    /:([\w+.\/*=-]+)$/
-+    # 3.5.2
-   end
- 
-   def self.eix_search_format
--    "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] [<installedversions:LASTSLOTVERSIONS>] [<bestslotversions:LASTSLOTVERSIONS>] <homepage> <description>\n'"
-+    "'<category> <name> [<installedversions:LASTVERSION>] [<bestversion:LASTVERSION>] [<installedversions:LASTSLOTVERSIONS>] [<installedversions:INSTALLEDVERSIONS>] [<availableversions:STABLEVERSIONS>] [<bestslotversions:LASTSLOTVERSIONS>] <homepage> <description>\n'"
-   end
- 
-   def self.eix_result_format
--    /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
-+    /^(\S+)\s+(\S+)\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+\[(\S*)\]\s+(\S+)\s+(.*)$/
-   end
- 
-   def self.eix_result_fields
--    [:category, :name, :ensure, :version_available, :installed_slots, :slot_versions_available, :vendor, :description]
-+    # ensure:[3.4.5], version_available:[3.5.2], installed_slots:[2.7.12:2.7,3.4.5:3.4], installable_versions:[2.7.10-r1,2.7.12,3.4.3-r1,3.4.5,3.5.2] slot_versions_available:[2.7.12:2.7,3.4.5:3.4,3.5.2:3.5]
-+    [:category, :name, :ensure, :version_available, :installed_slots, :installed_versions, :installable_versions, :slot_versions_available, :vendor, :description]
-   end
- 
-   def self.eix_version_format
--    "{last}<version>{}"
-+    '{last}<version>{}'
-   end
- 
-   def self.eix_slot_versions_format
--    "{!first},{}<version>:<slot>"
-+    '{!first},{}<version>:<slot>'
-+  end
-+
-+  def self.eix_installed_versions_format
-+    '{!first},{}<version>'
-+  end
-+
-+  def self.eix_install_versions_format
-+    '{!first}{!last},{}{}{isstable}<version>{}'
-+  end
-+
-+  def self.eix_limit
-+    '0'
-   end
- 
-   def self.eix_search_arguments
--    ["--nocolor", "--pure-packages", "--format",self.eix_search_format]
-+    ['--nocolor', '--pure-packages', '--format', self.eix_search_format]
-+  end
-+
-+  def install_options
-+    join_options(@resource[:install_options])
-+  end
-+
-+  def uninstall_options
-+    join_options(@resource[:uninstall_options])
-   end
- end
diff --git a/app-admin/puppet/files/puppet-fix-tests-4.7.0.patch b/app-admin/puppet/files/puppet-fix-tests-4.7.0.patch
deleted file mode 100644
index 7d62e0c1f786..000000000000
--- a/app-admin/puppet/files/puppet-fix-tests-4.7.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- spec/unit/network/http/api/indirected_routes_spec.rb  2016-10-11 13:24:09.500955469 -0500
-+++ spec/unit/network/http/api/indirected_routes_spec.rb.new  2016-10-11 13:24:00.501700977 -0500
-@@ -139,15 +139,6 @@
-       indirection, _, _, _ = handler.uri2indirection("GET", uri_escaped, params)
-     end
- 
--    it "should not pass through an environment to check_authorization and fail if the environment is unknown" do
--      handler.expects(:check_authorization).with(anything,
--                                                 anything,
--                                                 Not(has_entry(:environment)))
--      expect(lambda { handler.uri2indirection("GET",
--                                              "#{master_url_prefix}/node/bar",
--                                              {:environment => 'bogus'}) }).to raise_error(not_found_error)
--    end
--
-     it "should not URI unescape the indirection key as passed through to a call to check_authorization" do
-       handler.expects(:check_authorization).with(anything,
-                                                  anything,
diff --git a/app-admin/puppet/files/puppet.init b/app-admin/puppet/files/puppet.init
deleted file mode 100644
index d30367ad3fb2..000000000000
--- a/app-admin/puppet/files/puppet.init
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount net
-	use dns logger puppetmaster netmount nfsmount
-}
-
-checkconfig() {
-	if [ ! -d "${PUPPET_PID_DIR}" ] ; then
-		eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
-		return 1
-	fi
-
-	return 0
-}
-
-start() {
-	checkconfig || return $?
-
-	local options=""
-	[ -n "${PUPPET_EXTRA_OPTS}" ] && options="${options} ${PUPPET_EXTRA_OPTS}"
-
-	ebegin "Starting puppet"
-	start-stop-daemon --start --quiet \
-		--pidfile "${PUPPET_PID_DIR}/agent.pid" \
-		--exec /usr/bin/puppetd -- ${options}
-	eend $? "Failed to start puppet"
-}
-
-stop() {
-	ebegin "Stopping puppet"
-	start-stop-daemon --stop --quiet \
-		--pidfile "${PUPPET_PID_DIR}/agent.pid"
-	local ret=$?
-	eend ${ret} "Failed to stop puppet"
-	rm -f "${PUPPET_PID_DIR}/agent.pid"
-	return ${ret}
-}
diff --git a/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init
deleted file mode 100644
index 687003752329..000000000000
--- a/app-admin/puppet/files/puppetmaster.init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "puppetmaster" ] ; then
-	PUPPETMASTER_PID="master"
-else
-	PUPPETMASTER_PID="${SVCNAME#*.}"
-fi
-PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
-pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
-PUPPET_LOG_DIR="/var/log/puppet"
-
-command_args="master --pidfile ${pidfile} ${PUPPETMASTER_EXTRA_OPTS}"
-if [ -n "${PUPPETMASTER_PORT}" ] ; then
-	command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
-fi
-
-command="/usr/bin/puppet"
-extra_started_commands="reload"
-
-depend() {
-	need localmount
-	use dns logger slapd netmount nfsmount
-}
-
-start_pre() {
-	checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
-	checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
-	checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $? "Failed to stop ${SVCNAME}"
-}
diff --git a/app-admin/puppet/metadata.xml b/app-admin/puppet/metadata.xml
index e6af7c47ff3b..1bc7eb60719d 100644
--- a/app-admin/puppet/metadata.xml
+++ b/app-admin/puppet/metadata.xml
@@ -35,6 +35,5 @@
 		<flag name="diff">Enable diff support</flag>
 		<flag name="rrdtool">Enable rrdtool support</flag>
 		<flag name="shadow">Enable shadow support</flag>
-		<flag name="experimental">Add patches for things in testing</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-admin/puppet/puppet-4.10.12.ebuild b/app-admin/puppet/puppet-4.10.12.ebuild
deleted file mode 100644
index 7e3b54d90ab3..000000000000
--- a/app-admin/puppet/puppet-4.10.12.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24"
-
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem versionator
-
-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 experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/gettext-setup-0.10:0
-	>=dev-ruby/hiera-2.0
-	>=dev-ruby/locale-2.1
-	>=dev-ruby/rgen-0.6.5
-	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"
-
-# ruby_add_bdepend "
-# 	test? (
-# 		dev-ruby/mocha:0.14
-# 		=dev-ruby/rack-1*
-# 		dev-ruby/rspec-its
-# 		dev-ruby/rspec-collection_matchers
-# 		>=dev-ruby/vcr-2.9:2
-# 		>=dev-ruby/webmock-1.24:0
-# 	)"
-
-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 )"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	if use experimental; then
-		epatch "${FILESDIR}/43e2c935252b995134ce353e5e6312cf77aea480.patch"
-	fi
-
-	# Use working version of mocha
-	sed -i -e '1igem "mocha", "~>0.14.0"; gem "rack", "~>1.0"' spec/spec_helper.rb || die
-
-	# 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 specs that need further investigation.
-	sed -i -e '/should resolve external facts/,/^    end/ s:^:#:' \
-		spec/integration/indirector/facts/facter_spec.rb || die
-	sed -i -e "/describe 'cfacter'/,/^  end/ s:^:#:" spec/unit/defaults_spec.rb || die
-	rm -f spec/unit/indirector/ldap_spec.rb \
-		spec/unit/parser/functions/create_resources_spec.rb || die
-
-	# Avoid specs that rely on tools from other OSs
-	rm -f spec/unit/provider/package/{dnf,tdnf,yum}_spec.rb \
-	   spec/unit/provider/user/directoryservice_spec.rb || die
-
-	# Avoid specs that depend on hiera-eyaml to avoid circular
-	# dependencies
-	rm -f spec/unit/functions/lookup_spec.rb || die
-
-	# Avoid specs that fail due to an unpackaged file
-	sed -i -e '/when loading pp resource types using auto loading/,/^  end/ s:^:#:' spec/unit/pops/loaders/loaders_spec.rb || die
-}
-
-all_ruby_compile() {
-	:
-}
-
-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
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "3" ]; then
-			elog
-			elog "If you're upgrading from 3.x then please move everything in /etc/puppet to"
-			elog "/etc/puppetlabs/puppet"
-			elog "Also, puppet now uses config directories for modules and manifests."
-			elog "See https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html"
-			elog "and https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html"
-			elog "for more information."
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-6.10.1.ebuild b/app-admin/puppet/puppet-6.10.1.ebuild
deleted file mode 100644
index 477c81270a05..000000000000
--- a/app-admin/puppet/puppet-6.10.1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	dev-ruby/concurrent-ruby
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppet/puppet-6.12.0.ebuild b/app-admin/puppet/puppet-6.12.0.ebuild
index 6c3ebe7649a8..c07935b87c88 100644
--- a/app-admin/puppet/puppet-6.12.0.ebuild
+++ b/app-admin/puppet/puppet-6.12.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.11.1.ebuild b/app-admin/puppet/puppet-6.13.0.ebuild
index 477c81270a05..e60e40c04d63 100644
--- a/app-admin/puppet/puppet-6.11.1.ebuild
+++ b/app-admin/puppet/puppet-6.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_DOC="doc:all"
 
 RUBY_FAKEGEM_EXTRAINSTALL="locales"
 
-inherit eutils user ruby-fakegem eapi7-ver
+inherit eutils ruby-fakegem eapi7-ver
 
 DESCRIPTION="A system automation and configuration management software."
 HOMEPAGE="https://puppet.com/"
@@ -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"
 
@@ -55,14 +55,11 @@ RDEPEND+=" ${RDEPEND}
 		sec-policy/selinux-puppet
 	)
 	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
+	>=app-portage/eix-0.18.0
+	acct-user/puppet
+	acct-group/puppet"
 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
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 5800fe400708..2ba5f524d313 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,7 +1,7 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-6.7.2.tar.gz 43566885 BLAKE2B b90376330cb084c2c14154d647ce334673c526e6f9b9d4430e0be4b420132a0c4c518a0c8ed98b15cfacc6716044f78c384123f3ff87ea1463736a352744b840 SHA512 2e32f7a5a3daf37d74082aa3a66c26fa23643e456dbf80cd16815687f289093c96defc9bfa10c3502f9a9f9a7674cef83b838163f11339c13d4b12c82f8e0664
 DIST puppetdb-6.8.0.tar.gz 44216021 BLAKE2B ac5641ee0bceef3948d108c725e2ff53d76e897cafd75c9bc6978462f4b157c3d30146ce2f57fd2aa7610b2defc4e074c168847d8aba5501cde16ee0ab7b5aaf SHA512 2dd01058edbd8a4bb3f4717dc518e58ac57139ccc0651e8e39c721a32651bd932fe4ec747c7da23561ab33d7d4d7ddc448fe9b05734d1562f799e183c5e236d5
-EBUILD puppetdb-6.7.2.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
-EBUILD puppetdb-6.8.0.ebuild 2765 BLAKE2B 81a1ebaccdf046d634138d9f14c86faaaee14d4c1fa6c1c96eb0b8958de155ab7b081290ed9abf5b963e42ce48a6ce0b72ecea1a40e746746292ad1cf01c15c1 SHA512 a10cb89b0fc91505e3952589b0a8153002bad6b162f63d4f7c8f2b0189a2bf78c913bb319335ebd90da325bee1015c1586b1f299e09497cd8c4fab45c6595ca0
+DIST puppetdb-6.9.0.tar.gz 44270700 BLAKE2B 2346bf8cf3c944b1a75d0ed9fc32678909f0a6615ea615b7d89316ce470eaaa9540b56550b655214711564c6f0f0e2931a0f037e0ffad983f5578a54b4b180ec SHA512 2450f82bcbcd84fd63f107ea69dc3890a77fc94a54b2c5601c5aa3ed80fcc12e26302f6150777fbcbc1fbedb3c9fb9dd60e6aea37101c0abb2cf19a1696be2e7
+EBUILD puppetdb-6.8.0.ebuild 2763 BLAKE2B 913c721b82a8ae802f53ea1fa332f5cc1a60183103b80d53d1c22aaf467f157d553ef8b7b278a561e0187b4bcafdff4bf14679cdedf7a76a093ea00559d57111 SHA512 3b913c9578b32300e711fa7e3c8fef072546adffedbf96ae62a3b69c2789277f90b6ccecf51da07c1400956f913ab2e67b6b7c008f7e5a557a24905769fad486
+EBUILD puppetdb-6.9.0.ebuild 2649 BLAKE2B 61c2280603f62775d7e3c06142c0bad6d28795dfd396c45c73680e7d33b034e8f656994a21b304e438f89fc9d700e722bdbbc94dec544cda0f6abbe560c9d1e1 SHA512 1dbf062b0f95659020fcd4ec207aeb658a62e35e74f868d95c91ccabf1115b22536be505fb2de84427a6506c47ecd7cbb3ca0164f618e4d297b921a629065b6c
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.8.0.ebuild b/app-admin/puppetdb/puppetdb-6.8.0.ebuild
index 93e0bdc2929c..bca5e3ccebd4 100644
--- a/app-admin/puppetdb/puppetdb-6.8.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.8.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+=""
diff --git a/app-admin/puppetdb/puppetdb-6.7.2.ebuild b/app-admin/puppetdb/puppetdb-6.9.0.ebuild
index 77d1c1ca9cc4..5a7a32bcf49c 100644
--- a/app-admin/puppetdb/puppetdb-6.7.2.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib systemd user
+inherit multilib systemd
 
 DESCRIPTION="PuppetDB collects data generated by Puppet."
 HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
@@ -12,16 +12,11 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppetdb
-	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
+DEPEND+="acct-user/puppetdb
+	acct-group/puppetdb"
 
 src_prepare() {
 	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 87e26c0f7f6c..1aab5f66a837 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,7 +1,7 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
-DIST puppetserver-6.7.2.tar.gz 59340246 BLAKE2B 635312cb2ea2f638617c10e05b9e1e8efa58caf3da8786155f44081f040a7b167d923e2266c57b43d855feb4bfd5280da85b5100a188e7f0f7dfde847f5abc45 SHA512 e2015554648dc861d513b5778c274e2b09c4ea2ebd53141d152a5bba1046ac6ef163083296c176008a7606581b8368df99aa72907e0edd59e687aa9991209fb5
 DIST puppetserver-6.8.0.tar.gz 59370389 BLAKE2B 227512d3a054980867730882459bff32559f8baa5fb0c807a14fcc827b8f41fc1da2cceab6bdbd6162bb4e6e6e4312f5d47d478f6887a978c359c6a4225d663d SHA512 9e4d0ea1aad1209342151cfcfd304e4a296df0e95fefde46d4e4a28a9da62422194492d430c3492cc717a7c872ee0f448a89a40fe1e1cb565f865fc0aca7089b
-EBUILD puppetserver-6.7.2.ebuild 5391 BLAKE2B a67b5f2f3d53fafe7922c96e579a6ff274b4246869987c97e4aa4f7e7f5d250e525f11a723de66266f440bf894c921c246edc8a45cbc78e80b80b6ed155f2bc5 SHA512 3490f2cfa072716aa24fb07d8ff24952bf0e1df60f6c5b33b84b5259b044c1875a9baff326e75c4d76afa8a0b4ff930aa4adee833be500be3a1fcc10ea3455db
-EBUILD puppetserver-6.8.0.ebuild 5393 BLAKE2B 64edbd4b7f7227c3893bf3fb174ac93457c1ac2d75ecb22feb119ff263d555b9b9c4afe842c07a65bb1c2bd1b7fabafcb433951ef7f298223811e959e9f001d7 SHA512 68f06b847a448dcae327e5ae7960f1d16438e5945f0eafcd6be6814c96941f96257160fbebbe683d343afb0e1e87712eba06c153f42b9dcdf90555b09450b38b
+DIST puppetserver-6.9.0.tar.gz 59495229 BLAKE2B 17e02d201dd39a7c9a060c8898c76de3b85c5ffceb8dae128c032352e8f2959b6084558790c14979f95b7904bc70db0b3374d81f2b0c1f70bfb286084d6ba3a4 SHA512 b1446d407d50e3da502e2cd882647379fb51334bf5d4cc13d3654c8f7cbec2d6c4d7efd8acdfbdc1c70c6e30e3b420ed642cbdb97ee5f6a16b3b404dbd42bba7
+EBUILD puppetserver-6.8.0.ebuild 5391 BLAKE2B 3db19d3de9931dbe5b79271c5d8c8400227f03de2e7cef8e9d1f265caee0b0ee8cbe8d045087f151dd45514118b171ec517d60f0430f765fc8f109393001e22c SHA512 678422ef9c9b792bb646d2392b1efcc354c906dbf514a72c6ef1fad4b8704f891a458576463f6f1138fc8468c9d7644cc55e0e2ebee3960406a4dd4a61c5a307
+EBUILD puppetserver-6.9.0.ebuild 5315 BLAKE2B 0b2fd54543dd6308d1a27157580387a5a2c1e8bb8144f435650eec139637478744d201e21f0607a4de8a7c21dfa0b862ebdface2baea6e115d94759e62a0957c SHA512 4f62ab911d8d6a3f6e723e7d2b3aebf2aa22798011b9494c552c5c09115e6e31e2835c2c6b071d7601187d089c106316a90d9eafbd6ceb67a63ecb4814a1a902
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.8.0.ebuild b/app-admin/puppetserver/puppetserver-6.8.0.ebuild
index 18d113cb5e6f..3d317193a278 100644
--- a/app-admin/puppetserver/puppetserver-6.8.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.8.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-6.7.2.ebuild b/app-admin/puppetserver/puppetserver-6.9.0.ebuild
index 19d3602bfcbc..aefa1d0021a2 100644
--- a/app-admin/puppetserver/puppetserver-6.7.2.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib systemd user
+inherit multilib systemd
 
 DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
 HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
@@ -13,17 +13,13 @@ 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
 		app-admin/puppet-agent[puppetdb?]"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
-}
+DEPEND+="acct-user/puppet
+	acct-group/puppet"
 
 src_prepare() {
 	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
diff --git a/app-admin/pwcrypt/Manifest b/app-admin/pwcrypt/Manifest
index 7d7ae9949e04..d211d51b223b 100644
--- a/app-admin/pwcrypt/Manifest
+++ b/app-admin/pwcrypt/Manifest
@@ -1,3 +1,3 @@
 DIST pwcrypt-1.2.2.tar.gz 36902 BLAKE2B 3cb63bf2a907f4394a7bb5317c7c0bf9ac493de41a54f7107c01a46dea41d32c8e24631f5197e3c62c62d6d44d959f505874e0a3d6ab7c0fc04863165b37ec56 SHA512 41644e82f8306003e9346900d7a961e87a5b8103ebc411cf09b5e0e40d8253b4c38a83db57c60f09d2dd2663ecc2e2edc10ea2b6d095c102ee10ae251b471ddf
-EBUILD pwcrypt-1.2.2-r2.ebuild 604 BLAKE2B 0c68ed9a4bbd8ae2ff627aae38ef052ccd2a42e28c8b59e6549ef548a746fb2447141d694a8ffb61634d9e853b4b88af0c351997fe1870b531128f526707a47c SHA512 495eb4e524da4ce8933ef2474383b36854978c4293fbe8d68cf69aa0c82b8e9c62d3f34ee948c5e15c163084514edbbb344811df1777e2ad5c212fcf137282cc
+EBUILD pwcrypt-1.2.2-r2.ebuild 603 BLAKE2B ac51bb99c0ab2e51d612cedefa18222b936c353b50233a399108257d7355a2f3355592ffe8906d91e9f1358189d5d470d652027521f51446936c16936d88c7e1 SHA512 88797f0e9d81baf5416ccb14c8ee302ffbb47c09f4dc6f69270acbe71285e2e962e26fa9da7b320a84611382986c6d65166525121aa523e2a1434a922a1d2409
 MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild b/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
index 817082f7df2d..7a0b4f3d0921 100644
--- a/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
+++ b/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ IUSE=""
 
 DOCS=( CREDITS README )
 
-src_prepare()  {
+src_prepare() {
 	default
 	sed -i "s/make\( \|$\)/\$(MAKE)\1/g" Makefile.in || die
 	sed -i \
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 79167a5f8815..94d045a39de3 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,4 +1,5 @@
 AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f43d5bf06fb77b86959a75c7680df87e7ded7fd72073ad469a06bdec1e739784c82776d04a91bd3add SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e
+AUX patches/syslog-ng-fno-common.patch 8521 BLAKE2B 6dc0654aefed1c480507269766f18eb9c1c88e8d9a5fe3c5394c108ea750aafe33858bc3c99957e3989b121a39345b6feffc80c588551145720573d5991fcae9 SHA512 c011f0973c8e3c3220bf9e7dc68176b6b4ec36d7e3030680a42862d31d951c499c81b5bd438622c9f7d41af61c2e24750d38b1c869e3e240e7c22ff8cd5d1f2f
 AUX syslog-ng.conf.gentoo.hardened.in 4509 BLAKE2B 39f130c008df8d5e31c121246997f8f31d2d8e2a78f1a881f4ca07ade0b3a5386c6e8c3fd8518e2ae471751564263886b8e3b78e8651efe0eeccd1d06c23c2a5 SHA512 0670952e6f5d0405e90bb5cb1ea168832bb2293095250c01a9baaf9e4fcdf8578ecf5b60809bd9e5089096a4d97fa966fcc47324fbe70cfd14266a10eb0001c6
 AUX syslog-ng.conf.gentoo.in 1198 BLAKE2B a95b1fb9f46655502a41b0381c7388c9b54cfe9b8c3fd68dc68bd473175688e8ae72145a0ef718ef65220ecced7ecab00b39755cf41d4e21a6d375059cf6f309 SHA512 2830d1c5071a50c4aea6288b35c2880988111f29a11a641ee89f001a4ca4319943f87fdb1fd7079988888efa55401e2ed62f7a507c452de137f2e97a445d60e1
 AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530903659828565018dff71d62e56bfba28afa6c5e9fcb55aee2a41bcfff53c9ad006ee319124adbd66a SHA512 c945d27560afa310ac7f15e0cde3a564d5296892c747827d68df1b49c728998b056b596f93ac2564a5cb349f88db6585de58ec64cdaa13b92f20f5aac213ef44
@@ -10,5 +11,5 @@ DIST syslog-ng-3.24.1.tar.gz 4909513 BLAKE2B 4b8d05899f9767784b6d24008d55808bee0
 DIST syslog-ng-3.25.1.tar.gz 4938596 BLAKE2B bfcbd19b5a06c7ea15899bb919564661043bc7ab87bed147f77ab1aed153d70522aba9a42ab7dfa66d3b52a5f8432954b8a00594f428ddeb202979c5b9260da3 SHA512 79e09f1ba11080179c572016ce27328a28d479e68e663d39fb16624c03dc37d8439020ede922f78680e31e21629a6c13a4671464a31213c1dcf6acd2c5cd4b13
 EBUILD syslog-ng-3.22.1.ebuild 4939 BLAKE2B 54b5c8436d431e3ffa6cba23d663cc8f73f6cba61837023ac775695f6844bd9f783fc7ef4ef624544a563fc8c15846e4227fc83477ee0b2eeac027b3a24f58ba SHA512 5a0e30fb6e759052e5018d2315abfd55ea3e0fb8bc008ed17dfaab70de6d34a471f1981efcc16c0087f91dc11de0cb08e1da63156c1c1843b4cc42a16c16c26f
 EBUILD syslog-ng-3.24.1.ebuild 4887 BLAKE2B 7950fc8fed41219ea4f7ffb7493cd8366f57dab738595b2326efccc5261e1e84e926dff63644e719e7a43d6b305deef7b3a9ed871e97333631ffaee38230a39a SHA512 018ba2ad27069103f3afe8f662f2efc43904e0556da2df12c5b864535925e931247ac3c26be95e1969fb47ea137f42cc72dfe66c50a50afe0f814f61cef50eab
-EBUILD syslog-ng-3.25.1.ebuild 4855 BLAKE2B 25a40382fc792fabe62e33fd44ba08fb86ff733cd110d3df5295411a95d2fecb7f41e9d2362cc9cc8b96b377a363d90741e4b9ffbe2f5474e06ad6ac1954fdae SHA512 e388af0421d156fbcea5b6d9f3696e19a052b09c23246a56cae01ec972cf28d0701789ef5f7dfebf2b98fb5525145ed2404c1ab8a1604525be6f3d17d042ac26
+EBUILD syslog-ng-3.25.1.ebuild 4913 BLAKE2B 4c218effef9a8b58a1df5a75affbb9ed67b3185bf5ff93c575c9607c7b84ded0c9ca67819364f4d0c3449fac05596c222bf28ec51b826f78643b630a90c67d58 SHA512 bdf400344c4a82819ce404ff01d4d848f0dd24ff83f28834fe7db245299bb91c18825aa9d761e5ea030f4b8386545d70a7c17efe56f9a3db63fd052e176b3f17
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch b/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch
new file mode 100644
index 000000000000..abec9213cd18
--- /dev/null
+++ b/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch
@@ -0,0 +1,320 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e9b4183fc..1f8f16c13 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -331,8 +331,7 @@ endif()
+ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -j $$(nproc) --output-on-failure)
+ 
+ set(IMPORTANT_WARNINGS
+-  -Wshadow
+-  -fcommon)
++  -Wshadow)
+ 
+ set(ACCEPTABLE_WARNINGS
+   -Wno-stack-protector
+diff --git a/Makefile.am b/Makefile.am
+index 8b24eeaed..86c090638 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -54,8 +54,7 @@ AM_CPPFLAGS		= -I$(top_srcdir)/lib -I$(top_srcdir)/modules -I$(top_builddir)/lib
+ 
+ # Important warnings
+ AM_CFLAGS = \
+-	-Wshadow \
+-	-fcommon
++	-Wshadow
+ 
+ # Acceptable warnings
+ AM_CFLAGS += \
+diff --git a/lib/logmsg/tests/test_log_message.c b/lib/logmsg/tests/test_log_message.c
+index 245568ce5..e51d78b94 100644
+--- a/lib/logmsg/tests/test_log_message.c
++++ b/lib/logmsg/tests/test_log_message.c
+@@ -32,6 +32,8 @@
+ #include <stdlib.h>
+ #include <glib/gprintf.h>
+ 
++MsgFormatOptions parse_options;
++
+ typedef struct _LogMessageTestParams
+ {
+   LogMessage *message;
+@@ -151,7 +153,7 @@ void
+ setup(void)
+ {
+   app_startup();
+-  init_and_load_syslogformat_module();
++  init_parse_options_and_load_syslogformat(&parse_options);
+ }
+ 
+ void
+diff --git a/libtest/cr_template.c b/libtest/cr_template.c
+index 35e47aa3f..4f0913368 100644
+--- a/libtest/cr_template.c
++++ b/libtest/cr_template.c
+@@ -34,10 +34,12 @@
+ 
+ #include "msg_parse_lib.h"
+ 
++static MsgFormatOptions parse_options;
++
+ void
+ init_template_tests(void)
+ {
+-  init_and_load_syslogformat_module();
++  init_parse_options_and_load_syslogformat(&parse_options);
+ }
+ 
+ void
+diff --git a/libtest/msg_parse_lib.c b/libtest/msg_parse_lib.c
+index ae0d1654b..b3c7cb652 100644
+--- a/libtest/msg_parse_lib.c
++++ b/libtest/msg_parse_lib.c
+@@ -27,15 +27,13 @@
+ 
+ #include <criterion/criterion.h>
+ 
+-MsgFormatOptions parse_options;
+-
+ void
+-init_and_load_syslogformat_module(void)
++init_parse_options_and_load_syslogformat(MsgFormatOptions *parse_options)
+ {
+   configuration = cfg_new_snippet();
+   cfg_load_module(configuration, "syslogformat");
+-  msg_format_options_defaults(&parse_options);
+-  msg_format_options_init(&parse_options, configuration);
++  msg_format_options_defaults(parse_options);
++  msg_format_options_init(parse_options, configuration);
+ }
+ 
+ void
+diff --git a/libtest/msg_parse_lib.h b/libtest/msg_parse_lib.h
+index d86f178c2..5a9b4277b 100644
+--- a/libtest/msg_parse_lib.h
++++ b/libtest/msg_parse_lib.h
+@@ -30,9 +30,7 @@
+ #include "cfg.h"
+ #include "logmsg/logmsg.h"
+ 
+-extern MsgFormatOptions parse_options;
+-
+-void init_and_load_syslogformat_module(void);
++void init_parse_options_and_load_syslogformat(MsgFormatOptions *parse_options);
+ void deinit_syslogformat_module(void);
+ 
+ void assert_log_messages_equal(LogMessage *log_message_a, LogMessage *log_message_b);
+diff --git a/libtest/proto_lib.c b/libtest/proto_lib.c
+index b69195865..105e390b9 100644
+--- a/libtest/proto_lib.c
++++ b/libtest/proto_lib.c
+@@ -23,7 +23,7 @@
+  */
+ 
+ #include "proto_lib.h"
+-#include "msg_parse_lib.h"
++#include "cfg.h"
+ 
+ #include <string.h>
+ #include <criterion/criterion.h>
+@@ -164,7 +164,8 @@ assert_proto_server_fetch_ignored_eof(LogProtoServer *proto)
+ void
+ init_proto_tests(void)
+ {
+-  init_and_load_syslogformat_module();
++  configuration = cfg_new_snippet();
++  cfg_load_module(configuration, "syslogformat");
+   log_proto_server_options_defaults(&proto_server_options);
+ }
+ 
+@@ -172,5 +173,7 @@ void
+ deinit_proto_tests(void)
+ {
+   log_proto_server_options_destroy(&proto_server_options);
+-  deinit_syslogformat_module();
++
++  if (configuration)
++    cfg_free(configuration);
+ }
+diff --git a/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c b/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c
+index 79a4b97ad..d4d0d45a9 100644
+--- a/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c
++++ b/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c
+@@ -31,6 +31,8 @@
+ 
+ #include <criterion/criterion.h>
+ 
++MsgFormatOptions parse_options;
++
+ static LogMessage *
+ kmsg_parse_message(const gchar *raw_message_str)
+ {
+diff --git a/modules/python/tests/test_python_logmsg.c b/modules/python/tests/test_python_logmsg.c
+index 9a0343b07..51651ee9d 100644
+--- a/modules/python/tests/test_python_logmsg.c
++++ b/modules/python/tests/test_python_logmsg.c
+@@ -30,6 +30,8 @@
+ static PyObject *_python_main;
+ static PyObject *_python_main_dict;
+ 
++MsgFormatOptions parse_options;
++
+ static void
+ _py_init_interpreter(void)
+ {
+@@ -95,7 +97,7 @@ void setup(void)
+ {
+   app_startup();
+ 
+-  init_and_load_syslogformat_module();
++  init_parse_options_and_load_syslogformat(&parse_options);
+ 
+   _py_init_interpreter();
+   _init_python_main();
+diff --git a/modules/stardate/tests/test_stardate.c b/modules/stardate/tests/test_stardate.c
+index e48cfb6cd..7d55fc1d0 100644
+--- a/modules/stardate/tests/test_stardate.c
++++ b/modules/stardate/tests/test_stardate.c
+@@ -33,6 +33,8 @@
+ 
+ #include "msg_parse_lib.h"
+ 
++MsgFormatOptions parse_options;
++
+ void
+ stardate_assert(const gchar *msg_str, const int precision, const gchar *expected)
+ {
+@@ -58,6 +60,7 @@ void
+ setup(void)
+ {
+   app_startup();
++  init_parse_options_and_load_syslogformat(&parse_options);
+   init_template_tests();
+   cfg_load_module(configuration, "stardate");
+ }
+@@ -66,6 +69,7 @@ void
+ teardown(void)
+ {
+   deinit_template_tests();
++  deinit_syslogformat_module();
+   app_shutdown();
+ }
+ 
+diff --git a/persist-tool/add.h b/persist-tool/add.h
+index 981e0cc61..2d3524cb0 100644
+--- a/persist-tool/add.h
++++ b/persist-tool/add.h
+@@ -32,8 +32,8 @@
+ #include "cfg.h"
+ #include "persist-tool.h"
+ 
+-gchar *persist_state_dir;
+-gchar *persist_state_name;
++extern gchar *persist_state_dir;
++extern gchar *persist_state_name;
+ 
+ gint add_main(int argc, char *argv[]);
+ 
+diff --git a/persist-tool/generate.h b/persist-tool/generate.h
+index 237a8ae24..34f7dfec9 100644
+--- a/persist-tool/generate.h
++++ b/persist-tool/generate.h
+@@ -32,8 +32,8 @@
+ #include "persist-state.h"
+ #include "cfg.h"
+ 
+-gboolean force_generate;
+-gchar *generate_output_dir;
++extern gboolean force_generate;
++extern gchar *generate_output_dir;
+ 
+ gint generate_main(int argc, char *argv[]);
+ 
+diff --git a/persist-tool/persist-tool.c b/persist-tool/persist-tool.c
+index fd96c856d..4e4adc88f 100644
+--- a/persist-tool/persist-tool.c
++++ b/persist-tool/persist-tool.c
+@@ -135,11 +135,17 @@ void persist_tool_free(PersistTool *self)
+   g_free(self);
+ }
+ 
++gchar *persist_state_dir;
++gchar *persist_state_name;
++gboolean force_generate;
++gchar *generate_output_dir;
++
+ static GOptionEntry dump_options[] =
+ {
+   { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL }
+ };
+ 
++
+ static GOptionEntry add_options[] =
+ {
+   { "output-dir", 'o', 0, G_OPTION_ARG_STRING, &persist_state_dir, "The directory where persist file is located.", "<directory>" },
+diff --git a/tests/unit/test_clone_logmsg.c b/tests/unit/test_clone_logmsg.c
+index 57c0b181f..7b738b1e5 100644
+--- a/tests/unit/test_clone_logmsg.c
++++ b/tests/unit/test_clone_logmsg.c
+@@ -38,6 +38,8 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
++MsgFormatOptions parse_options;
++
+ void
+ assert_new_log_message_attributes(LogMessage *log_message)
+ {
+@@ -69,7 +71,7 @@ void
+ setup(void)
+ {
+   app_startup();
+-  init_and_load_syslogformat_module();
++  init_parse_options_and_load_syslogformat(&parse_options);
+ }
+ 
+ void
+diff --git a/tests/unit/test_matcher.c b/tests/unit/test_matcher.c
+index a92c8e458..d43755bea 100644
+--- a/tests/unit/test_matcher.c
++++ b/tests/unit/test_matcher.c
+@@ -31,6 +31,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++MsgFormatOptions parse_options;
++
+ static LogMessage *
+ _create_log_message(const gchar *log)
+ {
+@@ -128,7 +130,7 @@ void
+ setup(void)
+ {
+   app_startup();
+-  init_and_load_syslogformat_module();
++  init_parse_options_and_load_syslogformat(&parse_options);
+ }
+ 
+ void
+diff --git a/tests/unit/test_msgparse.c b/tests/unit/test_msgparse.c
+index 6b9e1045f..0ed91f638 100644
+--- a/tests/unit/test_msgparse.c
++++ b/tests/unit/test_msgparse.c
+@@ -49,6 +49,8 @@ struct sdata_pair
+ struct sdata_pair ignore_sdata_pairs[] = { { NULL, NULL } };
+ struct sdata_pair empty_sdata_pairs[] = { { NULL, NULL } };
+ 
++MsgFormatOptions parse_options;
++
+ static unsigned long
+ _absolute_value(signed long diff)
+ {
+@@ -130,7 +132,7 @@ setup(void)
+   app_startup();
+   setenv("TZ", "MET-1METDST", TRUE);
+   tzset();
+-  init_and_load_syslogformat_module();
++  init_parse_options_and_load_syslogformat(&parse_options);
+   /* Fri Feb  8 09:37:49 CET 2019 */
+   fake_time(1549615069);
+ }
diff --git a/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild
index 5566d7e43e41..6a918ed857db 100644
--- a/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,8 @@ DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunO
 	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
 	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
 
+PATCHES=( "${FILESDIR}/patches/${PN}-fno-common.patch" )
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index edb0dd98ce4f..c4cdbfa32fc0 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -1,7 +1,7 @@
 DIST terraform-0.12.17.tar.gz 10508005 BLAKE2B facef6de57333586445ce8839c03ccd633fe9ac68619e384b71fff921afeaf260e01b8783d61e4cc04882aa644e8eb706b08c88216f093d85e0fd081363c4103 SHA512 6311fdbf6764e585126a1e177dc498634a799ba1a68ba98682e2be29d14b40c09d0a780555f10bbde0587445d31a1e0d9810226f9e6bd3fcb248428ceb864c87
-DIST terraform-0.12.19.tar.gz 10526213 BLAKE2B 89acdb2e099532a922d49ac3d0049c522b7936817afb7836ebf643ef21fd35f3be495cde5a92ea93add144dada0f54de55b4b42a668bff08c9db789a1d4a77d1 SHA512 3acf327bdbaeddf6f13fc1a2a2335675dd3910137ef685224e7c1eafddf18d0aaa8c24aa3b1b5027b21905d2d87fbe3d49904e196c9881063d01670c4de3db66
 DIST terraform-0.12.20.tar.gz 10383312 BLAKE2B c9e9c7e8328cfbeb533d12a2acee133cc049b06e9a30c9fdc5708c674c272af264ae34c8c850924ae08885237a2e4d6c55d43d92b350104c6afe66d2f50e31ec SHA512 df92422426e7ebaf2c3a6b953de9fc9fcb461f7227835e728bbccf5b796995d818a39817913d6010fadb8b3618710f77f50e36eb6ce4176e7312b68c7d7f7e96
+DIST terraform-0.12.21.tar.gz 10420614 BLAKE2B 0c10cc7c33381330e7bbf20a1502019a6c651b0b0c5c3ca6713b76dd7f81a5f0d45affede0ba9ea9c2fe66585a87dc1e3be00c930d713a3eaabe865af1eb35ab SHA512 3b0dd3e6d8ae4b172d0be934ada6a8dcadc3024d0f27450ed107d55cf7f08b6b0b5eeb739a210fc9a76db42f7cc75ad5842ca7415afa3d7b17d9a34f23920a59
 EBUILD terraform-0.12.17.ebuild 1106 BLAKE2B 93d76a95bdb6ec98cab68cd32950208ed629736ed67f14db9b9939229c60b100ba3e9542f0ef892846e7df01bb6fe8778349598d99bf0f78506706a190510338 SHA512 57a8732da235be34eadf501bdaa0ecae0523a08a4f40250a1db8b0a03b5091458fe1754241e9109d307e4e9d2b78fb3770c0660d78a5fef36226cbd5e7e8737f
-EBUILD terraform-0.12.19.ebuild 1107 BLAKE2B e3512147aa9c4528641b465180d0c9678856b743b3852903ba77b284ba978c620f777aab6656132b8d9ce1258d1f6f6f1f9d6db94b76b1d49b9590619c937f5b SHA512 4d65da7087d667e3d5878d9a8377293f13d537b335478d666994d71d803b45385de1e8dda07c88498d46f3edbda41ebe2539e66f22cd1a4c8210ced449195125
 EBUILD terraform-0.12.20.ebuild 1107 BLAKE2B e3512147aa9c4528641b465180d0c9678856b743b3852903ba77b284ba978c620f777aab6656132b8d9ce1258d1f6f6f1f9d6db94b76b1d49b9590619c937f5b SHA512 4d65da7087d667e3d5878d9a8377293f13d537b335478d666994d71d803b45385de1e8dda07c88498d46f3edbda41ebe2539e66f22cd1a4c8210ced449195125
-MISC metadata.xml 1185 BLAKE2B 4e3e36b75d012f5a48886bc4cbce9f2f597b15060cf5298036690e3832e909ac6e08a729b477de9b893a38ea8cb634c8abefeb5776a14a790f5b4d8a7b86bc38 SHA512 8f52d688db4c37ddbdbca03c5a2f8fc49fa9a0765902e34559408f5f14230c12bc2b160768d3c9cbc978a0ee01e5f3c8a50aef00786a96f42725db54cb845d03
+EBUILD terraform-0.12.21.ebuild 1107 BLAKE2B e3512147aa9c4528641b465180d0c9678856b743b3852903ba77b284ba978c620f777aab6656132b8d9ce1258d1f6f6f1f9d6db94b76b1d49b9590619c937f5b SHA512 4d65da7087d667e3d5878d9a8377293f13d537b335478d666994d71d803b45385de1e8dda07c88498d46f3edbda41ebe2539e66f22cd1a4c8210ced449195125
+MISC metadata.xml 1293 BLAKE2B 3eb41154bf01edc7b8f524c38d0594fc1cc45957cb262041648f316febb591fcaf83c0f8c7e330905f02b23a7bb7ee62dff04a4eb1402e551ad7762200564250 SHA512 56a520331a0b88e408c6686365ef364e949cda9b6c631a49ca1352f39af1a275e4a5cfba03987e12817f0f5491bcbe2747236e4ba4db244fec422e1e9f2ca0cb
diff --git a/app-admin/terraform/metadata.xml b/app-admin/terraform/metadata.xml
index 6cdb29b9fbee..73899f500882 100644
--- a/app-admin/terraform/metadata.xml
+++ b/app-admin/terraform/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>dan@danmolik.com</email>
 		<name>Dan Molik</name>
 	</maintainer>
diff --git a/app-admin/terraform/terraform-0.12.19.ebuild b/app-admin/terraform/terraform-0.12.21.ebuild
index 4196f78931b6..4196f78931b6 100644
--- a/app-admin/terraform/terraform-0.12.19.ebuild
+++ b/app-admin/terraform/terraform-0.12.21.ebuild
diff --git a/app-admin/verynice/Manifest b/app-admin/verynice/Manifest
index f7059dceaebf..c2611fbe6b16 100644
--- a/app-admin/verynice/Manifest
+++ b/app-admin/verynice/Manifest
@@ -2,5 +2,5 @@ AUX verynice 372 BLAKE2B 995a40cf67092736685e16b9a5429467972db32debebd64915e233e
 AUX verynice-1.1-build.patch 2529 BLAKE2B 5ec0b3c4b4c1a91d3f7076068bfd3a39128d896682a8b356100240f7daf1b885d2606ec8c2dc1afdd29add09649f8642158f6dad373aeb7ba349e46997aa1a0a SHA512 d532a4a80b8d0719c07a5171403b90eba6562b6645703e4b7c79368cc71eca546cd0033796def0d3016c6ab2a62db85e266ef67ffdff5a6268f403213bf2ab70
 AUX verynice.service 158 BLAKE2B b71905d327904eb6a524e5d6b2dbc1606ffd0b5bbfad659c9d336ea41edbe8e6510966886cf814888bf8ec55cdd033299b1c91b7e7e3c3f455fa0f8a6ab8ddd3 SHA512 03a88cc405c8d6fa18f1e523e6987b1455011cf17ff38f1e937d523b33d88cae839f256811b487ec3141d8b396a15b8af778998d53bf55dd69f6a6a6dbc6a148
 DIST verynice-1.1.tar.gz 37576 BLAKE2B ac499b298858ada109f298bb2d37dc5fc7ecd17386994749a5a8a3612038eaa98d1f122ed990d9c8bd9e17a428b0a3b4c0c7f0df4a9f1c0441e3fe22fbeb1d07 SHA512 731fa22162bb4f48b943839ccf8ccdc769587e323da11e4a77ad14539a724ffbb89e5f4122e1ab36df3306c507afc958d1125160d34d9cbf55df4dc69e4a0139
-EBUILD verynice-1.1-r3.ebuild 723 BLAKE2B 59611da18ccf8f8791951405dda3f0f94edaa10daa64bac56d61ec64c08c3b8ffbaaa48fd8ce0e69f94a35d0a17661fb0e5ed38edebb5341d2b75e031eed3692 SHA512 c42875c438ad660d22de873755709a7c5ae3cec73265286068654ea316d471e1a8f5049c0e2ef5cd1cffe491fe4c688f6174db6041376ef3b9530cfde2e8c266
+EBUILD verynice-1.1-r3.ebuild 724 BLAKE2B e2ce6f00a8230f0c18d8ad80a7f5c46d77a9c34108e2d704b7d2b21c19700bdcc606bea015e5e765220363f12e4a4d0dce023d7f92cd63d15564025698f84941 SHA512 497e0b2229baa3fd5d566554d4b2d028b34ccc45dc4be387ef0052b030900178ab697cf3b9b4ff9c690f0f2b09ee05c5ffc1f00590f207b3c973272ccae02815
 MISC metadata.xml 318 BLAKE2B 1786ed2568f2f60dcaa875da07b616c2c77a1d4fe0151463db5542db66caef11931259da6bca4b437e125849caa3a3505ee607eca6c57b35ecfa75f45c82f370 SHA512 04cee3becd3a20c8f455969ea4c38d7a0843283bafded1af5310fe090159ad2ae0c804fc4893fa88138ad98aa3feda6991624c8a4942b245b64db5eebb3dcf46
diff --git a/app-admin/verynice/verynice-1.1-r3.ebuild b/app-admin/verynice/verynice-1.1-r3.ebuild
index 7df42daf3590..bcb090717f3d 100644
--- a/app-admin/verynice/verynice-1.1-r3.ebuild
+++ b/app-admin/verynice/verynice-1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ src_compile() {
 	emake RPM_BUILD_ROOT="${D}" PREFIX=/usr
 }
 
-src_install(){
+src_install() {
 	emake RPM_BUILD_ROOT="${D}" PREFIX=/usr VERSION=${PVR} install
 	doinitd "${FILESDIR}"/verynice
 	systemd_dounit "${FILESDIR}"/verynice.service