gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /app-admin
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
171 files changed, 2501 insertions, 2876 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c5c7f88d7a68..61af9717f328 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index f41850225777..d377a2cc1c31 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -7,5 +7,5 @@ AUX abrt-2.0.6-format-security.patch 911 BLAKE2B e502ea10a65de1b0ebff3f7d954d42a
 DIST abrt-2.0.12.tar.gz 1090121 BLAKE2B 272f486bd166a33fea3e340763b3443b5643a650fe16ad326e249309c355f214c67937456dd2d8f3e7cdac65cb85bd8030e6b89671f427085a05dca64b8f874d SHA512 5432205edb4483fb1883b9bcebab48784b16dd9e72c3a929ea0d50c48dab638d80f136b6b0d7648d8ec9fcb79d5ce8c1be37d36301d3b2b151868901be82a63a
 DIST abrt-2.10.10.tar.gz 6830586 BLAKE2B 5cd45144678e6355cb1362c3ebe5531104bb150ff95c42d10e3056f7619cdc7dc3da57e4025cab05234866a4634f29bc07fd78f574800d6b303385c6befa25bd SHA512 6daeea898c9328d31b952ef12202162e002f91b4115301e5d66a0e6991251f9a8322b87201128f7efd54b42b76cb94abc4cf01e5d5b563f254f6757ec7e2127d
 EBUILD abrt-2.0.12-r2.ebuild 2643 BLAKE2B 2799f38b03a18400cdaa0d471a64aada8204cd837198b107f1217740d00c50bab937f98a46354811fe573d99d5e84b61730a60d39ea45cf5d1c1d31f57ce4de1 SHA512 f9fcd1f028b14744c7f9e930ee684bd6e010bd453d7d4b44b689cca103e7a5770a1b5a6a041193826a29229ab6acde442b8f91cc1714384a3312e0560beb4809
-EBUILD abrt-2.10.10-r2.ebuild 2727 BLAKE2B 365cb1dcfb1e6df0a3512593c5fc448ef51e443d93c477691c1c0890ede105a8097a8c354a70ae43792223e856f5b1bd4dc32a09cf4a270fdc0866bd03037755 SHA512 712f39c2c79955ec3061503c0655e30fbbe07f402003ce5d870307c4517507d6380d63de9ed0958d5d5d1c0acfb88483e1e0736dba736a6960397b2062ec4a03
+EBUILD abrt-2.10.10-r2.ebuild 2722 BLAKE2B 1d23ed3fb43dc4a9b99d1c7e7aee8a7205455c7e419d70ec8b37d3229c5ce5ea6d6d421243183017ecd4620dc4678731832c5fa80d2e18ed6792124be4e935cd SHA512 e6ba43c2a16c9bcd09c54552b81ca73196335b1a818c50db621726b8d340ef5bcdfaa567e7fcf22de514bd1a80345346a13cfa0c6c193455c08e97c3ee9a83c1
 MISC metadata.xml 327 BLAKE2B e5a24f189c128e35fd3b878143c5d99da897af8535258f7eece0153df8a5b2dfc8b4f19000c60a6fcb70bb4f0b9efad98d2deab9e36dd205615e4176a06c0c45 SHA512 687cee8b12e63a46b815a1d6099a2853ed72d3d19d118e4e0cdbe67f501475ed02949848a4537a7c5eef0ac4a398edab868f816bdff277e3c1b348e5ab73ee40
diff --git a/app-admin/abrt/abrt-2.10.10-r2.ebuild b/app-admin/abrt/abrt-2.10.10-r2.ebuild
index b1301efc7478..9eea3e3a6ebd 100644
--- a/app-admin/abrt/abrt-2.10.10-r2.ebuild
+++ b/app-admin/abrt/abrt-2.10.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="debug selinux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 08f0e11c0cf4..2311e9d0820e 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,8 +1,14 @@
-DIST ansible-2.5.11.tar.gz 10114022 BLAKE2B 196c657c66b588ed709b8354d7f043c12701f08e263ede1224f59457b7d65c113d6a936150c0379378615e7a89a66db6a8cfc52304f2c3431a4cafbed9a3bdb5 SHA512 b0da66fb67bdd33b42b35239d392793cc19b98650990028ef89b83384285ab6185accbfe15edb030b9e9a62e59961a22e2002b6aeea34f1f063da857ad199358
-DIST ansible-2.6.7.tar.gz 10708387 BLAKE2B cfdd8940e3c23183fa8650d9c5a46b9af056dc9850b25b7969925ea66f2ec7d78945efaf982bc8c8752a285295461922b3e047b4edf75ecf3e3d4c893f0dafbc SHA512 23fde88f7e2151154cd77bb8a946c06c703b620456e0f1e9dc74f532b95d2868eb96e9c6f52fc48fc75ed5ad77d45d61be48fe4b7bd11ac8baa4745a026852bc
-DIST ansible-2.7.1.tar.gz 11738557 BLAKE2B 8d154d9f09eabd851fb182cea3a6a810385ed971429f4968b649ccd7e5cbbb5c6cd884a478b235f04f12134b471c99a4f77c32826661cc73cbb9e3a1159c377c SHA512 263ebc5fb172c7eda0cc703508ba06a5a6ab197923597a616bcdf28b8bc673ff6117c72cbff4546a1f3628656b0c4d7dd05c34c75e68b9a0d9c29ea9b5a4162f
-EBUILD ansible-2.5.11.ebuild 1621 BLAKE2B 7374dd46389da290959d922ea41086b94dc1c15ae17cffcbb211f1415acaeecc3d5be1f5c4c27ce5ee60454a49b453cca06587a64259e7091d9242d8f7e07cf8 SHA512 641a4babfab26eced6fabc54587d77b5e750c8b0af3e024a493f55444585167bb4e21aa9eae77ea5322d3c9071ea3097c3d79343bdc3854c372d9a944f7dbf18
-EBUILD ansible-2.6.7.ebuild 1621 BLAKE2B 7374dd46389da290959d922ea41086b94dc1c15ae17cffcbb211f1415acaeecc3d5be1f5c4c27ce5ee60454a49b453cca06587a64259e7091d9242d8f7e07cf8 SHA512 641a4babfab26eced6fabc54587d77b5e750c8b0af3e024a493f55444585167bb4e21aa9eae77ea5322d3c9071ea3097c3d79343bdc3854c372d9a944f7dbf18
-EBUILD ansible-2.7.1.ebuild 1626 BLAKE2B 84fe58d2c7daf64cd7a4fa3f22b2a09738c3c8aa88a6a6fe4dc0367189e1e6d8530054fb38f317adc95bc6a909a99939aa8d54ab77bcf8f7f4e748b9b08cb6db SHA512 75b8810271fcf75da109e5641d58b1869d9a2e5874c4c2744c25d970ae6d7787d856362672644aea6b38e7b133bab51f2d1c8412df32d614fb0558789da7b92b
+DIST ansible-2.5.13.tar.gz 10117549 BLAKE2B d5a53f411ff7cc8dfa3cbbcb6623b95d0a736b7359579aef1c81b391d75dc90c81396ffdd1906d1306d1d5ded7a745499fc82db086758b85ece027d9d243ad63 SHA512 f9968738b4aea6d6e84cca888827159c757b2248bf9fccbc2db0bcafccaba4700ebf87718fe98c912481cb0e8ed6b7a3b7be7a88ab7824092a2db838301fdec2
+DIST ansible-2.5.14.tar.gz 10119785 BLAKE2B 6e771aafc16053185ee6d275d6d41f64aa3f0d6dffbe721a66b548b97e84d78916e03827d592b961f9a4e0bb03fae09320731a4b8fdb814126cecdfb51f9f136 SHA512 9635b1c4bc9a93a24f4bb2894c9fed63803cecb01c5562559e3b808791d1007b26aa0aade4aa05fd4bae0f7d01216588d4e2e0bf4c5fb6cdf677d9b40e9e2de8
+DIST ansible-2.6.10.tar.gz 10716578 BLAKE2B cf769c65a25cebe799c9aedebacb3f07e9fa95dc8dfa57ec805861679ac5917432ec894ccd68bef7cb78dcf3b2bb2165c94274ebd932fd376b80ad17238e8922 SHA512 8eac8bab53042c25d12aef8ee3fd1b5361a339c176cd21daf8782150183fa5ab05ad65ec4636178c341771544742a487c5ce06f8e9b1492dcab3140788784b5c
+DIST ansible-2.6.11.tar.gz 10722546 BLAKE2B d98a82323409b894343c22c0b6226ef643bae34198627a6de426fdb65ef2a9892429edda20d522b8f501fe34c47b463f844abc7e6cf38009bd22398ca0c35f11 SHA512 5b795644d2bc02470b8a71be42720405614eac3e602a8906257c82ace36dc4c3727322b12ffadda6e2b752d963a40559cc35b1bc0a85596123896e7d1ac75b6b
+DIST ansible-2.7.4.tar.gz 11769861 BLAKE2B 3aee95d19ab057e39d174b19f29acf8d2c1011c0f5408f0a78ddd172089794a40a11455cc693a6457f3fd6e30eeb986579bbcc57a384cef0d8aef1013f7f71ec SHA512 4b7cb202577e3c87ec89598ec9a81ebac4b60f62f670322c24b655f5f3a7fab4657c27cce6cfa4f1bb41e7d60f7f6cf80251d86fcb36b1312f6f3ad47be777c9
+DIST ansible-2.7.5.tar.gz 11781337 BLAKE2B cbb1ae02ee5733c03797db8acbb79980e24afe6e265aa609bbb22d8b43675c8ec995a4b10f3212e8dbf2fe49fdbccf1d2f8ee251bb4bd11ee5198a2ca2443147 SHA512 b3a8a2c10e42f4dcf0f3867901eaaf555e6b9bcbd808b91765a8825db3ec49d618d8893f244d52e49e944d0900a876bbb31b3a7b89d636e435e94cd4b281be18
+EBUILD ansible-2.5.13.ebuild 1621 BLAKE2B 7374dd46389da290959d922ea41086b94dc1c15ae17cffcbb211f1415acaeecc3d5be1f5c4c27ce5ee60454a49b453cca06587a64259e7091d9242d8f7e07cf8 SHA512 641a4babfab26eced6fabc54587d77b5e750c8b0af3e024a493f55444585167bb4e21aa9eae77ea5322d3c9071ea3097c3d79343bdc3854c372d9a944f7dbf18
+EBUILD ansible-2.5.14.ebuild 1623 BLAKE2B 28e5e0c4e05904fa61ccb810b8ab546a41824c52a6d1246d9f9ae6e3d60d6d6c99ef91fda9aa304d0dda7fc3afcaf78e38731a189ca5fd5ccd1cf3e7dd7a0dc6 SHA512 44fe0eb5c7b0fe17db4e42abdb0c1294769527cdd724929799d517e1b21ce4a75ccdfa1a8099aee75bbd579f3cb820b00ac41ecc6903c18f03ea3a3ac31956bd
+EBUILD ansible-2.6.10.ebuild 1621 BLAKE2B 7374dd46389da290959d922ea41086b94dc1c15ae17cffcbb211f1415acaeecc3d5be1f5c4c27ce5ee60454a49b453cca06587a64259e7091d9242d8f7e07cf8 SHA512 641a4babfab26eced6fabc54587d77b5e750c8b0af3e024a493f55444585167bb4e21aa9eae77ea5322d3c9071ea3097c3d79343bdc3854c372d9a944f7dbf18
+EBUILD ansible-2.6.11.ebuild 1623 BLAKE2B 28e5e0c4e05904fa61ccb810b8ab546a41824c52a6d1246d9f9ae6e3d60d6d6c99ef91fda9aa304d0dda7fc3afcaf78e38731a189ca5fd5ccd1cf3e7dd7a0dc6 SHA512 44fe0eb5c7b0fe17db4e42abdb0c1294769527cdd724929799d517e1b21ce4a75ccdfa1a8099aee75bbd579f3cb820b00ac41ecc6903c18f03ea3a3ac31956bd
+EBUILD ansible-2.7.4.ebuild 1626 BLAKE2B 84fe58d2c7daf64cd7a4fa3f22b2a09738c3c8aa88a6a6fe4dc0367189e1e6d8530054fb38f317adc95bc6a909a99939aa8d54ab77bcf8f7f4e748b9b08cb6db SHA512 75b8810271fcf75da109e5641d58b1869d9a2e5874c4c2744c25d970ae6d7787d856362672644aea6b38e7b133bab51f2d1c8412df32d614fb0558789da7b92b
+EBUILD ansible-2.7.5.ebuild 1628 BLAKE2B 75c493a396ecd1289471706473f927ef6142e680684934a71627dc7db9bd98ec574e05cd15b5fa70d931d4fabcc7007dfed980b9af639591e056f0db1ff39e79 SHA512 c44d7752ce67fdcc289081cef230afc7dc38bf187a9bbfe9ca1fd8c055c55b64fab153b9fb5f6faa34af57349db40d249308a65496e4f2aecd78d9bdf4848535
 EBUILD ansible-9999.ebuild 1639 BLAKE2B 363a22df345822cd047685b7cdf7114e5e1a1276bf90463799712ee90f751deea4c487f9c96a807558428d3e5993f4fded0017fb5d37b75ff6e550a6ccc32b2b SHA512 10d18db06a345555299b342eb01c7f3355f9f71d70f0ac6b3f2fc3837859161821c8c5771bec3d943647cb1c5ba8abae8c4febdccbbc4f2d747aa0f848682b46
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.5.11.ebuild b/app-admin/ansible/ansible-2.5.13.ebuild
index 652b1374c856..652b1374c856 100644
--- a/app-admin/ansible/ansible-2.5.11.ebuild
+++ b/app-admin/ansible/ansible-2.5.13.ebuild
diff --git a/app-admin/ansible/ansible-2.5.14.ebuild b/app-admin/ansible/ansible-2.5.14.ebuild
new file mode 100644
index 000000000000..71d5cc29eccb
--- /dev/null
+++ b/app-admin/ansible/ansible-2.5.14.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.6.7.ebuild b/app-admin/ansible/ansible-2.6.10.ebuild
index 652b1374c856..652b1374c856 100644
--- a/app-admin/ansible/ansible-2.6.7.ebuild
+++ b/app-admin/ansible/ansible-2.6.10.ebuild
diff --git a/app-admin/ansible/ansible-2.6.11.ebuild b/app-admin/ansible/ansible-2.6.11.ebuild
new file mode 100644
index 000000000000..71d5cc29eccb
--- /dev/null
+++ b/app-admin/ansible/ansible-2.6.11.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.7.1.ebuild b/app-admin/ansible/ansible-2.7.4.ebuild
index 3098582f06bf..3098582f06bf 100644
--- a/app-admin/ansible/ansible-2.7.1.ebuild
+++ b/app-admin/ansible/ansible-2.7.4.ebuild
diff --git a/app-admin/ansible/ansible-2.7.5.ebuild b/app-admin/ansible/ansible-2.7.5.ebuild
new file mode 100644
index 000000000000..2f38c77741e1
--- /dev/null
+++ b/app-admin/ansible/ansible-2.7.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/bcfg2/Manifest b/app-admin/bcfg2/Manifest
index 8e574f6b688d..1e45b90f1fe8 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
-MISC metadata.xml 465 BLAKE2B 96452846cb478484b00ede7c16b6b8b7f5f47f6635c513d5ec52be8fa120a7c2777a22a215d3a2cf0780dae0d7e1cd5a18cc09c5fc256f0a031bea5036028bc5 SHA512 97d6a0be1c4b11585e0acbd0b9f150890d761ebbcf6ad4609c929ba1179a08682d84c366b4f5f48b18a577ae730cbfc204f1d39a2d1f6cef2dd1b2ea6e24b7eb
+MISC metadata.xml 392 BLAKE2B e7b3e92750ec4d4be5c01440dc2b129fc94314d8e930edcf9c2e9636a9f0244c7205bd4ec0b1631e326b6c9c7d94128e0387336f0ed4b22f0b13e70b798d07dc SHA512 7e68a750feff611711cf80bfa00cf23a615f9fc9810396e65f21d3e6421a59dd5c22f7c806891dfa4f1b66cf74fa2a8b303f87e6b2ac349d7cf916e807d13d37
diff --git a/app-admin/bcfg2/metadata.xml b/app-admin/bcfg2/metadata.xml
index f46d2d0d99a9..882636d976ea 100644
--- a/app-admin/bcfg2/metadata.xml
+++ b/app-admin/bcfg2/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="cheetah">Include dev-python/cheetah support</flag>
 	<flag name="genshi">Include dev-python/genshi support</flag>
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index bddaa21cbc83..3ec64536196a 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,7 +1,9 @@
 DIST cdist-4.10.1.tar.gz 660264 BLAKE2B 7e4c9bc1e4a750865880aa442ed6c8a125b80d35ba2fbb49f6549c25764a8aea62defd95d3e32782a7290729f45e6a9a658fd2d6abaae15b3686c3ed312dce37 SHA512 d5852ddceb869a5d70c77d65b9288a780cc62794472fff1537a22d3e890b87ffc15181bc425f0bbbf43952eba12aa99046f482cf97f4afa6ca747d2cb55bea98
+DIST cdist-4.10.4.tar.gz 679595 BLAKE2B ae22287a4424dbcc2dc8c58db2ca3e0af3f526525277208f2256df615d8c214e15483b2c13af882e56121c4bece0f61fb259d2c5f44f02a2f6807451c986554c SHA512 696563dc0cb5a9f25b0d9282017de6315addb999cf63b3de87c1f5de4ce3f1fb99ee0c03f346aacebebfa2dd7f8eed58d22cdb05d2d4c26474963d29688056ed
 DIST cdist-4.6.1.tar.gz 454461 BLAKE2B 5cf5ba376b981feb6d740f53b4c4cdf51a8f0b4d4422db2c2c7312dd1288e006bfcae7c3459707e361536002a2a6b49bb8ef836783fac8167834978fb5737683 SHA512 f0c3759d00221fbd36d7662de6ccc57fc0070b8aee6a0d80e6bab6f41215c537a1cf1a6ec9fdebf81c45ad8126b8e730a14be8f1286d5baf5f4a5672611e31dc
 DIST cdist-4.7.3.tar.gz 497537 BLAKE2B e743e49291d6b212810911607ac149a54e6c8423841c4149f620d2127bbeb2fdce7d5ceff76572f1599a3a3326944066ba336f93f25de50d98ad972188562709 SHA512 9b69e257c816d515e4d94bc73d26ca1cfb2343fc4fc8298aadfbb82417aa28c9759831c304b90d6427e275988442cd19681e455c98757c87426d0435dd90ae41
 EBUILD cdist-4.10.1.ebuild 596 BLAKE2B 68bdf8cedb9d41f9ae5b276c1c8f81bc71096abefdab55f9abe9def93e4fc33e9ce170faa5240fd9006b23ef363ef9d2c9c446a6be1d7b7d61c723a7b6f9a37e SHA512 95f4fadaf35314bc667a3f6eafade25820dd3fbe07c96158285c35f1fee2681f577135c10e954ad518b56780ec86c5a4e9db579563488335cda9252d1b70d802
+EBUILD cdist-4.10.4.ebuild 593 BLAKE2B 3388765f2c830362b7d28999a26ecfc1c9855d0217763d9d3a3306e8daf5354cf29f9928eac52e05b161ed551b7d7cc3007c2fd687f724fc9645b67d2337f094 SHA512 f6467c1c8363777783ded046bd669b27d6adf218931d7072b6f5e17e69bbf0531d850261ecd879334c3701557e30e1ed8b02d7736269b271b49d0da52e28c89c
 EBUILD cdist-4.6.1.ebuild 596 BLAKE2B 68bdf8cedb9d41f9ae5b276c1c8f81bc71096abefdab55f9abe9def93e4fc33e9ce170faa5240fd9006b23ef363ef9d2c9c446a6be1d7b7d61c723a7b6f9a37e SHA512 95f4fadaf35314bc667a3f6eafade25820dd3fbe07c96158285c35f1fee2681f577135c10e954ad518b56780ec86c5a4e9db579563488335cda9252d1b70d802
 EBUILD cdist-4.7.3.ebuild 596 BLAKE2B 68bdf8cedb9d41f9ae5b276c1c8f81bc71096abefdab55f9abe9def93e4fc33e9ce170faa5240fd9006b23ef363ef9d2c9c446a6be1d7b7d61c723a7b6f9a37e SHA512 95f4fadaf35314bc667a3f6eafade25820dd3fbe07c96158285c35f1fee2681f577135c10e954ad518b56780ec86c5a4e9db579563488335cda9252d1b70d802
 MISC metadata.xml 443 BLAKE2B 2742628c4f58fc21f1fca78752bce1e6275ec34ca7aa547a39d8a11cf3c7d9c149030078a55383f706053fa3cd70f071d5d5c571f3b009e941cbbc2c29b6c21a SHA512 5d1dbb6742101c7b89662f3edba9d3eb7da595611fbb613a1da1482e76cbf563fdf5fbf227471ca4c90e5a96d62c65433beaf9b90bbc716c7614ea5fe6b5063a
diff --git a/app-admin/cdist/cdist-4.10.4.ebuild b/app-admin/cdist/cdist-4.10.4.ebuild
new file mode 100644
index 000000000000..9c275ce8259b
--- /dev/null
+++ b/app-admin/cdist/cdist-4.10.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A usable configuration management system"
+HOMEPAGE="https://www.nico.schottelius.org/software/cdist/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
+	distutils-r1_python_install_all
+
+	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
+}
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index f14e01773faf..d29e0d536a61 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -4,5 +4,5 @@ AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a645
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
 EBUILD conky-1.10.8-r1.ebuild 5148 BLAKE2B bb6889a8179156c0b53afc5650d7a12ccd9822ce71996301a77f093a835a78d9c7798fb5f3dd8d8e6263c1a1c7a2f1b1b84a3cfc932c2f7028a5973c7a536956 SHA512 94e69572ab007c4fe2b1289b2b6073031c7975ea7c0339ec34326d74a185858acb9677621f69043fe51caa79bb9b5df005b319d100bf05257c6126e654fa2bc6
 EBUILD conky-1.10.8-r3.ebuild 5175 BLAKE2B beabef522d97c4a2bf565824f2d58ee4cec4ded348789142fac8c20dcb2e266bdd70da896b48c36a9c9a93347ed527d691ae7be2c8d18b1969614e99f2b7712a SHA512 d8a054c323877a249502ca41661336e04ce8a2dae4dfaabf092d4b2e6a37ee763e3dc730c75365ce562d3f843f790c5e8654ae732c5b56e1e499f81ca2851b29
-EBUILD conky-1.10.8-r4.ebuild 4838 BLAKE2B fc223ec31a18119c8a1ca53dc5199ea8ac243fa0be83b42d71a84244707fd696287679f2423d5639c712a5428b2e7465bfd3f73621126471237964d4667f77df SHA512 ca508786932793bfc9c4e9bc02f2425b77c2813093f83fae7421f3e625a8c26c6e363cd1e5dbc8b9ddbc64cb704f3939c5f173012136986119ceea16499b0b43
+EBUILD conky-1.10.8-r4.ebuild 4727 BLAKE2B c2e8bdd83c6a811595b7f5210d45a3e003f18b75a3b42558154897f945539538e2ccead510cda94378cd322a056be49dbf7f4f0d3b19c21d5f63292efe81a56b SHA512 eec2f0d04eff1ca91c4f8766d4be1b7784966c22d50ab3cf562ed636fbf29e643fdc9902647bdf1aedcf50f28aa694b31734c1c18e9353d9451c44a0c856524d
 MISC metadata.xml 2524 BLAKE2B c86460a6b065874ba17b35f4aba4240424a71bddf0d6648555d936259a2e9ef46ae373bcfc91a5382edd79e830945baef6c54eff52ed88a7f6648254c447675b SHA512 7f9aa6dcd65d7e4a9e1829cb273329b08cadec8820afb65de5e9fb189981b7084384e759909365adad36ea587161c6eb5a193363cc1a95e0aef65434ab827d55
diff --git a/app-admin/conky/conky-1.10.8-r4.ebuild b/app-admin/conky/conky-1.10.8-r4.ebuild
index b6d120f7b1cc..a2bc7d317c41 100644
--- a/app-admin/conky/conky-1.10.8-r4.ebuild
+++ b/app-admin/conky/conky-1.10.8-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
+IUSE="apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
 	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
 	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
 	weather-metar webserver wifi X xmms2"
@@ -30,7 +30,6 @@ COMMON_DEPEND="
 		x11-libs/libXinerama
 		x11-libs/libXfixes
 		x11-libs/libXext
-		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
 		xmms2? ( media-sound/xmms2 )
 	)
 	cmus? ( media-sound/cmus )
@@ -110,7 +109,6 @@ src_configure() {
 			-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
 			-DBUILD_LUA_RSVG=$(usex lua-rsvg)
 			-DBUILD_NVIDIA=$(usex nvidia)
-			-DBUILD_AUDACIOUS=$(usex audacious)
 			-DBUILD_XMMS2=$(usex xmms2)
 		)
 	else
@@ -120,7 +118,6 @@ src_configure() {
 			-DBUILD_LUA_CAIRO=OFF
 			-DBUILD_LUA_IMLIB2=OFF
 			-DBUILD_LUA_RSVG=OFF
-			-DBUILD_AUDACIOUS=OFF
 			-DBUILD_XMMS2=OFF
 		)
 	fi
@@ -154,6 +151,7 @@ src_configure() {
 		-DBUILD_I18N=ON
 		-DMAINTAINER_MODE=ON
 		-DRELEASE=ON
+		-DBUILD_AUDACIOUS=OFF
 		-DBUILD_BMPX=OFF
 		-DDOC_PATH=/usr/share/doc/${PF}
 	)
diff --git a/app-admin/conkyforecast/Manifest b/app-admin/conkyforecast/Manifest
index 579cefa2c44e..d2b9b629078c 100644
--- a/app-admin/conkyforecast/Manifest
+++ b/app-admin/conkyforecast/Manifest
@@ -1,3 +1,3 @@
 DIST conkyforecast_2.24.tar.gz 11347231 BLAKE2B 76d77229044375e7852823b92ac60cfafd190731e823a6e0d639ece16ef0dc94b7e182b4c6735529fc1f3145baa52c25412436acfb67ea69398a873aee81b14d SHA512 dcff08915c00915f6be4cd25824e3d8de978ed15ffb6776f002d585d95856f5e0827632371dd4d37016e07d58542e2bc95a7a859ebdc8ab9d1200ac04d4364e0
 EBUILD conkyforecast-2.24-r1.ebuild 1143 BLAKE2B 618f34f3c0260394f72ba7fadcabb372e7cc4cd63594e4abda88e5ad8399f28ea2931d09f6bd992ebe2339f717d4c37b89de14dad30e2e120ce7ee8ad5fe5308 SHA512 b269faef892efa7ded0d49830e0232fb2eefc95c55e24a6e50935aa40b9e2c0ad198c061237d7200a252a6169cc2480df6b1d865423963374375dc264f4c5695
-MISC metadata.xml 328 BLAKE2B 88458a82a675c10e772d5cdb3d84b2aeb55a12a2e24228d5cf4a8534851daba5cd244dfc20409988b25b7b5ea0cdbc61619fcf3a618e8633a9d47fa35765bce0 SHA512 b82738da77f143327af6973f163191826c7883fb1d3991f2c369ebcc84e50c71b1ea714d124562236501788fde015c3c3b33c4300561cc549a275931dc9fe426
+MISC metadata.xml 252 BLAKE2B 8405041f79f507686df5b7ac19534b6a561ebc2f49b731b755acb886332bca8fa7bc10115229b19e23762a779cdf613eb232dcbfa1981306d6fedd0ce01e7b9b SHA512 98a18ba2acd187bdaec4f059bf263d2d78c2d243aad0c52d7730d1cf61d29a318c2bf31cab791b9190fc7884bb602167a3aafa05f24e690757cd5f0d7eed9084
diff --git a/app-admin/conkyforecast/metadata.xml b/app-admin/conkyforecast/metadata.xml
index d9f08c9f2411..3d71692a6bbd 100644
--- a/app-admin/conkyforecast/metadata.xml
+++ b/app-admin/conkyforecast/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="launchpad">~conky-companions</remote-id>
 	</upstream>
diff --git a/app-admin/elektra/Manifest b/app-admin/elektra/Manifest
index b71f58559d39..a5b5d14810fe 100644
--- a/app-admin/elektra/Manifest
+++ b/app-admin/elektra/Manifest
@@ -1,7 +1,3 @@
-AUX elektra-0.8.15-conditional-glob-tests.patch 415 BLAKE2B 5f0d1b8cbdd88e032bad09064a17caae9ade647f747718cd1ff936c95a107c9323ff66b9c24fd4edb42655c9a180d967d3a8e70ca8e3ea40e85f431877f5c7f3 SHA512 e57b317716979a5cb94e11094db8eeaac2941640262eec011329d1f6b1cda27c19999099e0b9a5bc9a7131de730a7065ac9256d965bf8d553afbadb94172a27c
-AUX elektra-0.8.15-gcc-5.4.0.patch 639 BLAKE2B 35664032dbbea5926c8886313d87893a00b46304d8b3d69f4d88fc503a3105b32e94696126a0786a761414debfad5bc6cf3fc8734331a8b8c00fc50a8cd25a3b SHA512 8b6eeec8f46fc92db86e19f1401a49fa129c5658a7c63e1307e990be69b873d2c1099fce0bca8224ea20ae4ff30b71c4dd6b69dc5bc9fd12ec45add6d2e76960
-DIST elektra-0.8.16.tar.gz 2405443 BLAKE2B 221f254b240f4f38fb0975749003f8b4c9fbfbd28df2b42b99c8e1fa7795cb4a1565b77cc424b6180abd481326ccab4c8f554749150e36f0ab01146aa72575f8 SHA512 b225e61379907365a423ea75ec7138e5257bb78c526bb05a1ec21f66a52eb4bad9e6f1eb23209d700670b21b86166497b47c3bc46bc9d45f6d366cd544afc326
 DIST elektra-0.8.20.tar.gz 4740032 BLAKE2B e76ad93eadbbec9bb273da4f7bab5622d47deebdab6736c430543159c0754f3b96696954891962b60716d5b969e64bf5ef6886a6239abee8b98888aae09fcdd9 SHA512 11cc88329f84ad4d6337132d76479d26f2d9c12f7a939558a79ea96540129096ea0a26ffda3705c01a2c7c749453588bb1654a4c07cca3374e4076ce768c5848
-EBUILD elektra-0.8.16.ebuild 3622 BLAKE2B 2965fca55d877a08a22b1e9ddbbd766b28e23c8a7c44080f4230ddc5f9e68ee08dd82f16e125a94c710e9ba81bf634867a5e1daea9365b476dc734ff49787ad1 SHA512 f27a11d7298d202200356989cb22c8168ef54f67eee0a166e80453da6415392c290880f5001b159212c4d685ce9f59b3edcc095ef0fb265f0cd331276c9736bf
-EBUILD elektra-0.8.20.ebuild 3484 BLAKE2B dc46c7ae8750b51d5723dd6532291cb9cf8e35bdb2febc6370b87c96a1bcbadfcbeccd11e60629a472a643155fa37f09b21a92892ad94342d92a84b5165643a9 SHA512 eb3bb23a08f2cfa6b7cf3072df6384a2b6551c663651a5a9ba84414c7d8c09deff271f3ac7420cebc9882f2a151b997abdc05c1814cc8881f8754db6cdb7743b
-MISC metadata.xml 604 BLAKE2B 21568cf18684b7339416099a2d406729e65519a4dbcc1ba72696c04328274246929d90bf8133d1e683d23c58c7fabf8ed03735dcfd9ef1478d91e5487db703a3 SHA512 5bc058ef5858f1a2916c9fffa87fbd11b4e7017498db402dd0e782d098ef7f71f098184d9aa936023cfde538ce4c2fe93402b2d5f7ba12c7ea52700d3301ffe3
+EBUILD elektra-0.8.20-r1.ebuild 3575 BLAKE2B e5bb278044733e4106cbf98ac2e41fd2a545461e7c2431a0fcbaff85c5be84cfcc1d115b2c7bc849612b92bcaab4197b2e1b1974fa9aee99bcd0088bd72d941a SHA512 2e0bace57e18ac5f027e82f468613120d182f075fb73e0a1231e9bde7ea90ab1165594e76d7c5183205b0aa9fa849fcc828de8c632e6abd29bdcbc4ebb00c4de
+MISC metadata.xml 528 BLAKE2B 157f4ace6565691b24887dd8df8500edfa4e52be29674a7e64b0a1cd68d3cb6d2a064f92c6684afc65500d8c9c42dab4228f1c9fcb4389f2e13917e407a3fb9a SHA512 38f65b68fb892f63f998267c293385fa0e66f79cfeeb9186ed6ce49b131e17344260df575821669df0b893b6f7d4fde7dac24e3d62cf7b387ef0a806a8a005ce
diff --git a/app-admin/elektra/elektra-0.8.16.ebuild b/app-admin/elektra/elektra-0.8.16.ebuild
deleted file mode 100644
index a87cd518643c..000000000000
--- a/app-admin/elektra/elektra-0.8.16.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib eutils java-pkg-opt-2
-
-DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
-HOMEPAGE="https://freedesktop.org/wiki/Software/Elektra"
-SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
-IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
-
-RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	augeas? ( app-admin/augeas )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.8.0 )
-	qt5? (
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qttest:5
-		dev-qt/qtwidgets:5
-	)
-	uname? ( sys-apps/coreutils )
-	systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
-	yajl? ( >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-cpp/gtest-1.7.0 )"
-
-DOCS=( README.md doc/AUTHORS doc/CODING.md doc/NEWS.md doc/todo/TODO )
-# tries to write to user's home directory (and doesn't respect HOME)
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-0.8.15-conditional-glob-tests.patch
-	"${FILESDIR}/${PN}"-0.8.15-gcc-5.4.0.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	einfo remove bundled libs
-	# TODO: Remove bundled inih from src/plugins/ini (add to portage):
-	# https://code.google.com/p/inih/
-	rm -rf src/external || die
-
-	# move doc files to correct location
-	sed -e "s/elektra-api/${PF}/" \
-		-i cmake/ElektraCache.cmake || die
-
-	# avoid useless build time, nothing ends up installed
-	cmake_comment_add_subdirectory benchmarks
-	cmake_comment_add_subdirectory examples
-}
-
-multilib_src_configure() {
-	local my_plugins="ALL"
-
-	if multilib_is_native_abi ; then
-		use augeas || my_plugins+=";-augeas"
-		use java || my_plugins+=";-jni"
-	else
-		my_plugins+=";-augeas;-jni"
-	fi
-
-	use dbus      || my_plugins+=";-dbus"
-	use iconv     || my_plugins+=";-iconv"
-	use ini       || my_plugins+=";-ini"		# bundles inih
-	use simpleini || my_plugins+=";-simpleini"
-	use syslog    || my_plugins+=";-syslog"
-	use systemd   || my_plugins+=";-journald"
-	use tcl       || my_plugins+=";-tcl"
-	use uname     || my_plugins+=";-uname"
-	use xml       || my_plugins+=";-xmltool"
-	use yajl      || my_plugins+=";-yajl"
-
-	# Disabling for good (?):
-	# counter - Only useful for debugging the plugin framework
-	# doc - Explaining basic makeup of a function //bug #514402
-	# noresolver - Does not resolve, but can act as one
-	# template - Template for new plugin written in C
-	# wresolver - Resolver for non-POSIX, e.g. w32/w64 systems
-	my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
-
-	local my_tools
-
-	if multilib_is_native_abi ; then
-		my_tools="kdb"
-		use qt5 && my_tools+=";qt-gui"
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_PDF=OFF
-		-DBUILD_SHARED=ON
-		-DBUILD_STATIC=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-		-DENABLE_TESTING=$(usex test)
-		-DPLUGINS=${my_plugins}
-		-DTOOLS=${my_tools}
-		-DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
-		-DTARGET_CMAKE_FOLDER=share/cmake/Modules
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	einfo remove test_data
-	rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
-	einfo remove tool_exec
-	rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
-}
diff --git a/app-admin/elektra/elektra-0.8.20-r1.ebuild b/app-admin/elektra/elektra-0.8.20-r1.ebuild
new file mode 100644
index 000000000000..ccb2065bb7c2
--- /dev/null
+++ b/app-admin/elektra/elektra-0.8.20-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
+HOMEPAGE="https://www.libelektra.org"
+SRC_URI="https://www.libelektra.org/ftp/elektra/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+PLUGIN_IUSE="augeas iconv ini simpleini syslog systemd tcl +uname xml yajl";
+IUSE="dbus doc static-libs test ${PLUGIN_IUSE}"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	>=dev-libs/libxml2-2.9.1-r4
+	augeas? ( app-admin/augeas )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+	iconv? ( >=virtual/libiconv-0-r1 )
+	systemd? ( sys-apps/systemd )
+	uname? ( sys-apps/coreutils )
+	yajl? ( >=dev-libs/yajl-1.0.11-r1 )
+"
+# 	qt5? (
+# 		app-text/discount
+# 		dev-qt/qtdeclarative:5
+# 		dev-qt/qtgui:5
+# 		dev-qt/qttest:5
+# 		dev-qt/qtwidgets:5
+# 	)
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-cpp/gtest-1.7.0 )
+"
+
+DOCS=( README.md doc/AUTHORS doc/CODING.md doc/todo/TODO )
+# tries to write to user's home directory (and doesn't respect HOME)
+RESTRICT="test"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	einfo remove bundled libs
+	# TODO: Remove bundled inih from src/plugins/ini (add to portage):
+	# https://code.google.com/p/inih/
+	rm -rf src/external || die
+
+	# move doc files to correct location
+	sed -e "s/elektra-api/${PF}/" -i cmake/ElektraCache.cmake || die
+	sed -e "/^install.*LICENSE/s/^/#DONT /" -i CMakeLists.txt || die
+
+	# avoid useless build time, nothing ends up installed
+	cmake_comment_add_subdirectory benchmarks
+	cmake_comment_add_subdirectory examples
+}
+
+src_configure() {
+	# default storage and resolver requirements
+	local my_plugins="NONE;dump;resolver;resolver_fm_hpu_b;sync;"
+	# defaults chosen by availability in 0.8.16
+	my_plugins+="ccode;conditionals;constants;enum;error;filecheck;fstab;glob;"
+	my_plugins+="hexcode;hidden;hosts;iterate;keytometa;line;lineendings;list;"
+	my_plugins+="logchange;mathcheck;network;ni;null;path;profile;regexstore;"
+	my_plugins+="rename;semlock;shell;spec;struct;timeofday;tracer;type;validation;"
+
+	use augeas    && my_plugins+="augeas;"
+	use dbus      && my_plugins+="dbus;"
+	use iconv     && my_plugins+="iconv;"
+	use ini       && my_plugins+="ini;"		# bundles inih
+	use simpleini && my_plugins+="simpleini;"
+	use syslog    && my_plugins+="syslog;"
+	use systemd   && my_plugins+="journald;"
+	use tcl       && my_plugins+="tcl;"
+	use uname     && my_plugins+="uname;"
+	use xml       && my_plugins+="xmltool;"
+	use yajl      && my_plugins+="yajl;"
+
+	# Disabling for good (?):
+	# counter - Only useful for debugging the plugin framework
+	# doc - Explaining basic makeup of a function //bug #514402
+	# noresolver - Does not resolve, but can act as one
+	# template - Template for new plugin written in C
+	# wresolver - Resolver for non-POSIX, e.g. w32/w64 systems
+	# my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
+
+	local my_tools="kdb"
+# 	use qt5 && my_tools+=";qt-gui"
+
+	local mycmakeargs=(
+		-DBUILD_PDF=OFF
+		-DBUILD_SHARED=ON
+		-DBUILD_STATIC=$(usex static-libs)
+		-DBUILD_TESTING=$(usex test)
+		-DENABLE_TESTING=$(usex test)
+		-DPLUGINS=${my_plugins}
+		-DTOOLS=${my_tools}
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DTARGET_CMAKE_FOLDER=share/cmake/Modules
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	einfo remove test_data
+	rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
+	einfo remove tool_exec
+	rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
+}
diff --git a/app-admin/elektra/elektra-0.8.20.ebuild b/app-admin/elektra/elektra-0.8.20.ebuild
deleted file mode 100644
index 43f955bb844b..000000000000
--- a/app-admin/elektra/elektra-0.8.20.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib eutils java-pkg-opt-2
-
-DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
-HOMEPAGE="https://www.libelektra.org"
-SRC_URI="https://www.libelektra.org/ftp/elektra/releases/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
-IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
-
-RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	augeas? ( app-admin/augeas )
-	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jdk-1.8.0 )
-	qt5? (
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qttest:5
-		dev-qt/qtwidgets:5
-	)
-	uname? ( sys-apps/coreutils )
-	systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
-	yajl? ( >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-cpp/gtest-1.7.0 )"
-
-DOCS=( README.md doc/AUTHORS doc/CODING.md doc/todo/TODO )
-# tries to write to user's home directory (and doesn't respect HOME)
-RESTRICT="test"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	einfo remove bundled libs
-	# TODO: Remove bundled inih from src/plugins/ini (add to portage):
-	# https://code.google.com/p/inih/
-	rm -rf src/external || die
-
-	# move doc files to correct location
-	sed -e "s/elektra-api/${PF}/" \
-		-i cmake/ElektraCache.cmake || die
-
-	# avoid useless build time, nothing ends up installed
-	cmake_comment_add_subdirectory benchmarks
-	cmake_comment_add_subdirectory examples
-}
-
-multilib_src_configure() {
-	local my_plugins="ALL"
-
-	if multilib_is_native_abi ; then
-		use augeas || my_plugins+=";-augeas"
-		use java || my_plugins+=";-jni"
-	else
-		my_plugins+=";-augeas;-jni"
-	fi
-
-	use dbus      || my_plugins+=";-dbus"
-	use iconv     || my_plugins+=";-iconv"
-	use ini       || my_plugins+=";-ini"		# bundles inih
-	use simpleini || my_plugins+=";-simpleini"
-	use syslog    || my_plugins+=";-syslog"
-	use systemd   || my_plugins+=";-journald"
-	use tcl       || my_plugins+=";-tcl"
-	use uname     || my_plugins+=";-uname"
-	use xml       || my_plugins+=";-xmltool"
-	use yajl      || my_plugins+=";-yajl"
-
-	# Disabling for good (?):
-	# counter - Only useful for debugging the plugin framework
-	# doc - Explaining basic makeup of a function //bug #514402
-	# noresolver - Does not resolve, but can act as one
-	# template - Template for new plugin written in C
-	# wresolver - Resolver for non-POSIX, e.g. w32/w64 systems
-	my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
-
-	local my_tools
-
-	if multilib_is_native_abi ; then
-		my_tools="kdb"
-		use qt5 && my_tools+=";qt-gui"
-	fi
-
-	local mycmakeargs=(
-		-DBUILD_PDF=OFF
-		-DBUILD_SHARED=ON
-		-DBUILD_STATIC=$(usex static-libs)
-		-DBUILD_TESTING=$(usex test)
-		-DENABLE_TESTING=$(usex test)
-		-DPLUGINS=${my_plugins}
-		-DTOOLS=${my_tools}
-		-DBUILD_DOCUMENTATION=$(multilib_is_native_abi && usex doc || echo no)
-		-DTARGET_CMAKE_FOLDER=share/cmake/Modules
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
-	einfo remove test_data
-	rm -rvf "${ED%/}/usr/share/${PN}" || die "Failed to remove test_data"
-	einfo remove tool_exec
-	rm -rvf "${ED%/}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
-}
diff --git a/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch b/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch
deleted file mode 100644
index 413515e05605..000000000000
--- a/app-admin/elektra/files/elektra-0.8.15-conditional-glob-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt
-+++ elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt
-@@ -4,6 +4,7 @@
- add_cppheaders (HDR_FILES)
- add_toolheaders (HDR_FILES)
- 
-+if (ENABLE_TESTING)
- include (LibAddTest)
- 
- file (GLOB TESTS testtool_*.cpp)
-@@ -11,3 +12,4 @@
- 	get_filename_component (name ${file} NAME_WE)
- 	add_gtest (${name} LINK_TOOLS)
- endforeach (file ${TESTS})
-+endif (ENABLE_TESTING)
diff --git a/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch b/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch
deleted file mode 100644
index 9bab2a61c9f5..000000000000
--- a/app-admin/elektra/files/elektra-0.8.15-gcc-5.4.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 05c925972224afd3fa28f34b9a762364a38f6850
-Author: Markus Raab <elektra@markus-raab.org>
-Date:   Tue May 3 14:25:54 2016 +0200
-
-    add vector kdbtimer
-    
-    fix http://build.libelektra.org:8080/job/elektra-gcc-configure-debian/lastFailedBuild/console
-
-diff --git a/src/bindings/cpp/include/kdbtimer.hpp b/src/bindings/cpp/include/kdbtimer.hpp
-index ae4c242..b7f731e 100644
---- a/src/bindings/cpp/include/kdbtimer.hpp
-+++ b/src/bindings/cpp/include/kdbtimer.hpp
-@@ -13,6 +13,7 @@
- #include <sstream>
- #include <string>
- #include <sys/time.h>
-+#include <vector>
- 
- #ifdef __GNUC__
- #define TIMER_NOINLINE __attribute__ ((noinline))
diff --git a/app-admin/elektra/metadata.xml b/app-admin/elektra/metadata.xml
index 0cc6943fa1fb..6f5f3e3ebc04 100644
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="augeas">Enable plugin for reading and writing configuration files with help from Augeas</flag>
 		<flag name="ini">Enable new, advanced ini support</flag>
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 56b5277b5853..3b5a316a32d1 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -2,11 +2,11 @@ AUX filebeat.confd 269 BLAKE2B f9cc2a3d96be870d755c41606a274e94d6f6a2a5be71aeb3f
 AUX filebeat.initd 1388 BLAKE2B 2a427750a15e6910344dee1d2707773b01961360ae3a7e3337a761b759b2c9fcd9a914385e8ff6292841ad6c07781af3b5cf059f1338a6f2f33bda576bb125cc SHA512 9b08635b9ba6e180881780de0fa9d6c8c1b2e7496fc803c2b38127fee13d13ca5d00792132cdc8bd4073018e3f6e374d4164a86e450a1dbeb68b2694fa0dbb12
 AUX filebeat.initd.1 1388 BLAKE2B 6ca4f3f4d50bba2a036a35b8e74bfa92d5b03ccaf8548df215d3d68ba9a2eaf9e2996374d49011f9e4380bc59f6307e262eee1367801bfb8279eb0b1639b83c4 SHA512 374b466b39feb832b414d0491510190758007079b6c865823878db00d5c17235f657deb0822066f124e3f07616dc4ff3237e87f6f35785e071815ec4e533b1dd
 DIST filebeat-5.6.13.tar.gz 18212575 BLAKE2B a0b8810523cecd1c6c87a69832c92b39fdc4cbe199eeae3c837f60b5057915e4d1ffb0fd371b3296cea398a11135b9d8da147451997514c85447722d086b8739 SHA512 fd572666858f1aeeede9e1b2074668d0bd691f58d51acd7955a3203b27d3ee850784a39e47941a570a833926a4109645eb98c24b49263276d1df475578c17efa
-DIST filebeat-6.1.1.tar.gz 17061456 BLAKE2B 5a5d23618f8140f3815c499305d99ae3dc4c4caa49535043040387922f924ee49a9494b5139f34a70d74173d97332b92909fc74e2f91a2fc0f288ef5d1493ade SHA512 54e85cfce58ba724f6b2892f115ac9ef5b1bb89ce8dc6f2a977e50ccfc07cf95fc578e46e0cadd96acd90c59f4b01446851b93c519afa094ff6dcdb7e716219a
 DIST filebeat-6.3.2.tar.gz 20923316 BLAKE2B 70ac7e574f94a6141a7c6a1bd0af45ddbda3d01d6ea006c90ea341d2df03cac320d53496833cace3b394b9433251ea68a248dafdc8e28a85a6014314d5a2f3c4 SHA512 3d6ed03c9286bc7784444ad979b1398fcd70d870be184f912202ee5fab7c0ff23df639f445ec14cfcfd4d41ef648f33e88c2959f3c5f966fd3986884a223623a
 DIST filebeat-6.4.3.tar.gz 22085261 BLAKE2B 466580ba371d02bd0b51bd80f0e8d9766f2af1d371f88cd01144a648cd8d5488ca54447e925e9014790a836009d76be9eec9ef9b14a102287d3f4a71b852d20d SHA512 c28d9939c2082b586ddf744b4e18427096290987efd74f7ea03d2632a1cdcbc5dd2b043ee7ceeb0457098faeb52abbac57652077c518112fb65858954ee27f34
+DIST filebeat-6.5.4.tar.gz 25286147 BLAKE2B c3eca03c8e8e2b863918f3fe65bdea46b351739569f5570daac3e321963e98190331c5bf99c2451db5faa615620e023d2fd9c73060d4d775392a86a2f5578d80 SHA512 a48b9ae267ec80c1b45e4e07644f8080f8ba280da5c3543022b73472eb70de9d836cfffd387e576298becf9313d2cfa67d835158442f163b1a1bd0e72df31297
 EBUILD filebeat-5.6.13.ebuild 1595 BLAKE2B ab657b0be80c86c637aa30fb32a2011aec931c43ce4a839f0040dd749321ff8bc0a67c249bc64356736cc8afc18dd9b25df2fca51bfdb6ba176c0af5cabea39f SHA512 801f38077f15698eafe43ed6138d014108ce0bb9178de2fd166874ed0f21e56da415f2f476e1b0b00929c359a286847742a732a2dc001700c4994cf9f92f91b8
-EBUILD filebeat-6.1.1.ebuild 1303 BLAKE2B 9e3c7601566336639171e69171b51d1a7ca33d8636de2cca01709d1c97a65a82fda7b650efd682fd4d4909587a5868a84c4ea4053798b1daa73f11a036951a82 SHA512 fa282f9c87f051c0f33f0344f34d81c8dc9d8beb7d8b8d74ca8490bfb4f727f557145d138f7397452635b96b9be1a0a82e52f6b894a9e0b48cff16a11065491b
 EBUILD filebeat-6.3.2.ebuild 1477 BLAKE2B 9600502c104f8db4f8661a354bee5160b5780fb4ae3cf84a1353ae5b774ed01e61aebd66ad530550691a43ae62ebb0cf7607591c5b582564b69d81c8af64f68d SHA512 304cb456b2b56d2005b8dcdf56817005e7843c5073ef1aeedd75e69a73178eb184910027d94522e586e6492d80f86d8c49787a7d818292695304815fbecfa239
 EBUILD filebeat-6.4.3.ebuild 1478 BLAKE2B a8430ed2d2c0bc2411300514a35a72ae3c6765c54c6ec49c8deca06f02b7e2f543788e77cf48ddb08492dcadd4ae4ba0ad3b27ac6e3497ee4d29ea91f9e3482d SHA512 597ab402cd5a644892926595c65edf5853b5173e5b76d46f116dc02dbb995110a774181b7e9c3dc149ed4fdcf7b9d89d3a9c6ee36b158ab983e37d36467582bc
+EBUILD filebeat-6.5.4.ebuild 1478 BLAKE2B 4eea3c20260b9e8c32b0fe66108378fcda572d3d80bf435c341b6b0ac6e18f4a95eb4d430a13d2fbf775216d857f1877327c724d9abf9e8acf7efd33a2f57473 SHA512 3ae3570cbe614358eead82f36aa79008e317164c62f779eeee33e5ad067c58bdd42389db57f52ad4e909fff67f48043bfec3bcb4ed478b05fbbf75d43d39157c
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-6.1.1.ebuild b/app-admin/filebeat/filebeat-6.5.4.ebuild
index c50b43ae9724..9c0c5d215f46 100644
--- a/app-admin/filebeat/filebeat-6.1.1.ebuild
+++ b/app-admin/filebeat/filebeat-6.5.4.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit versionator
+EAPI=7
 
 DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
 HOMEPAGE="https://www.elastic.co/products/beats"
@@ -11,25 +9,35 @@ SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 
-DEPEND=">=dev-lang/go-1.9.2"
+DEPEND=">=dev-lang/go-1.11.2"
 RDEPEND="!app-admin/filebeat-bin"
 
-ELASTIC="${WORKDIR}/src/github.com/elastic"
-BEATS="${ELASTIC}/beats"
-S="${BEATS}"
+# 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 "${ELASTIC}" || die
-	unpack ${P}.tar.gz
-	mv beats-${PV} "${BEATS}" || die
+	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() {
-	cd ${BEATS}/filebeat || die
-	GOPATH="${WORKDIR}" emake
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
 }
 
 src_install() {
@@ -49,10 +57,10 @@ src_install() {
 pkg_postinst() {
 	if [[ -n "${REPLACING_VERSIONS}" ]]; then
 		elog "Please read the migration guide at:"
-		elog "https://www.elastic.co/guide/en/beats/libbeat/$(get_version_component_range 1-2)/upgrading.html"
+		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"
+	elog "${EROOT}/usr/share/doc/${PF}/examples"
 }
diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index ad54b206b291..84fdbb498bdd 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -1,15 +1,18 @@
 AUX fluent.conf 2728 BLAKE2B 1986af0d4062e7d85590e044d47ec77e3a46d9d4e8e79e42a30db05f0c5b730ebdef3f5f233bf929ec05311e644ade0fa89144323fe5ed8a8089dea8e3c5b103 SHA512 b400910c76fe2286e7887643471a55dfbad4aceb8dce07fba33d34923dcc13a609b909394bab50d509719d76a231a77441431e2d6dad75dd62b69ad05a5a804e
 AUX fluentd-1.2.6.initd 421 BLAKE2B c245bfe6fb30a699616f503cd5e2f09f1d84c2a6b605fe244ccf25d2ba3500dd497f950103c99816950541b10e7f0885470510531ad361b76ae882e466423d0f SHA512 fa636af8e7129129887b981bd5e5af68414ceaf32f3de8bbd754e37e29a2bc0a6c44e300000034b8e99fb0df7976ddd331d91001eb11d4b6bfb29886d3a7fa19
 AUX fluentd.confd 85 BLAKE2B 742ae368e0a8dd99f2f697c9438fc0ae4814693ee547be39b3bd8c9956fcb9acd5b6cffcf2a033e987b9a6eb7557a628f360fdd3f0053d055faeb62cad3f1d6a SHA512 9774f8fb0c9db7a501011558ac0c6222bed42501be90ac1c70ae0333cb3dd5ee5bc38417cd5ec3d1e0d8769d7f90bcc230746aed3fd30f28ea643c97d54d1f09
-AUX fluentd.initd 389 BLAKE2B 224ae3df5f6f7406a7bb7c735baf164598d1a42f5bb18d1948738492012a46e547f1ed4ffb68ca9a53a84930040f4bb50c67adb487b78a58a8257000ca3f3d7f SHA512 47704319bebb56ea28bb1331794f7838291a1ec0f841765b5b907c014cd58286d90707c55c28b219e495c56bbe39d19c82fc81969de83fe9499e81cd0ff0cbd7
+AUX fluentd.initd 420 BLAKE2B 4498ab59ed5cd542d4a760fdb324c27849680a41df9a8b696381f796a6712fe89caedfd1c038119640621093d4dcad3b67b70092101bbf36370d9824cb9ff199 SHA512 d039c1a7854b7f5f3088b8d4ff38d3357fb13eb4d00cb5e80bf1c8999637a750ffd9299957c64657ce9f62a2ef28ff8bf8f5e95fc493dd5d7934f7b8e3ed328f
 AUX fluentd.logrotate 191 BLAKE2B da3f35ab90d627f35aba5a1b5e51ec54d649c725bb50ca2e5cc66561c94bedb2eaa83e6489051dbf2c1ea209fe35f0b77be1228f1b8e46d61aa00775e65abfbd SHA512 f74c0ef04f479adb7c11074ddd803c2574fadb7ce90022f3efc28c1d44d0b77b1483c7bb217652decf22f879a69c7ba1ee7bdc78e5b153762a4f535ea5faa404
 DIST fluentd-1.1.3.gem 413184 BLAKE2B facda41a26f9fe4f55a4ae6f97336acaa818534b6ac8740badcb132a18497e8767723e931bb2506843b56208deaf41cdaf9ac81821618cb223b8035527d355d7 SHA512 0d17668c06e515219a39ddc7ecda6b5ec5d29e7d4d3799e3447034ad731568d870ac3d36d468be21b6ef7a4198353c3045872902c41a54c0c2eacad8ec12f357
 DIST fluentd-1.2.0.gem 430592 BLAKE2B 698666a5c1dfc3f90b6b1f5b9e58070b71caef859f5d41472185a6f9f1d1d2b1c3631ca0ad01fbac4b4f333484a539aedc70a90a4381fef90c5c4130ffd61b61 SHA512 928ad81381c024efa2ad1e5b0f3d3a74f4bf8e3373c8f835925e89739c6536048a8a16e6b59accf4719192118b86b2fb49b3e9536611381a8a236997fcc96651
 DIST fluentd-1.2.2.gem 431616 BLAKE2B 854f23908f10d0bbae1a48392f439ce33e1e3619eb887235b2018bc30166faec8c40d05b9fc1b4aac44befd7afea87b3547a7d458c6e471bde65616e92f41951 SHA512 2a582bfd54f290612cdfee5e3ff9e5adc894bc02639991ccfd551c90070167837288d33fecf1e4975165b6f6758d124ff0b0fed715c9276ef9def566057d9e57
 DIST fluentd-1.2.6.gem 434176 BLAKE2B 05fb0a29def48b673f458a19eb2662b0e447d949284af3a2aa28694e0cef8177c5a584d9f475ff71a548d7acdde504e8843a312ed0dc85e892b0f2dd59cdf8ef SHA512 9faeef818195d0014f9fffc29222d031a819ef8af323700b26290d5b394bec6815e86699ab89ba4e8d428321e10d3463c297d6c9046dbb46fdc061777206f8ae
+DIST fluentd-1.3.1.gem 437760 BLAKE2B 59afdadc2d67e30d35df2f33c169e9f2cbfd44ac6b7497b025fd9229921f91ac37ce8b6f80f37df26a03e5062ce2f5187156a70302ca11f9a7d9db9cfccebf9c SHA512 84351148809332c9a703243416004f18d0470cafc04cf63de7c52d9b6da18f1c6f2de0682ff1d5283f28013707fcfe24cbcf67aebc3be91090c4d5cca80ec2cc
+DIST fluentd-1.3.2.gem 438272 BLAKE2B c7a239928e251b84217cba4181e81f58dda42065c07c254ec5ed1012f8ebd98323cfbd671d5e9f940025d049c67b6dedd4f0feb9a079291e83f465e107e105d3 SHA512 8357ae88ed028778f6c7ae3dca051b32840bcf8cd344292e1fd3d203dae85e32d8263dea72d657010d803bb36d78d27a8441a8a7edf49439609041acac39f967
 EBUILD fluentd-1.1.3-r1.ebuild 1173 BLAKE2B ba1b38a72d8830ad9b2b8232274929a21d645b2a3a6f3ce1f0c6e3c793a06d7d52bc0c9b6bade0850502bd0c72ec08e1ef15356183725d5d377c6b41404acd9f SHA512 5c1f89f3394bbfbf6a9de90a7d666eb288c055a0c0c2d605207083b9a1511b774729e24a96b20644265cdac884ef40967278cfae2fbf3e2d13c8c35e7d29f099
 EBUILD fluentd-1.2.0.ebuild 1175 BLAKE2B 89bdf7cbf46df0894f653b0de9064aed66d0d8fbe566dee7087ff431b3ee86884a017ba6199c3991187c30c9074257c22b606b0d5c7c880b030dd577a4a46dff SHA512 2b12a2adc48b4189006adc5ebdd34e99d7e5ddab4e65c8991aafe040cde4e72eb112971db180f390e19f35335d44ceb1eaca34c65647b22e377114912c002e31
 EBUILD fluentd-1.2.2.ebuild 1239 BLAKE2B 2e50f7ac980ca902390e2b5bdb63e48d8b95ac3a732f6cf3dee9d2489b2f6f370500781a0a51d380973f312cb5ca9f13aa6a9722ee903c2a758c33eea9e87f65 SHA512 775d02b67182d4fa78889c14ad4c45e702da064996623998822058ebaa5fe459f5c5668237b3f4fae631d6a37060429552ff477250b0947ad2dcb37059f654f0
 EBUILD fluentd-1.2.6-r1.ebuild 1321 BLAKE2B 61dc1451550625f564ca392cfaf85e55041f9cda108ac62f60f8cf83a4d6af1d1583dd2c031e07076fa87520d9b868870faceb38854ac2aff0551c3ff2f1ecc1 SHA512 e0b1b558b84f71af90c3d05484e1ea740a71a2f8f07ac6cd971aa2389a8c396c25a9b5005095d9c402603f8e952c921ddecc34acf0a2de4997c4280d19fa6c91
-EBUILD fluentd-1.2.6.ebuild 1306 BLAKE2B ef2bb25281faed75cd3dfc9e9c1c32371adda152ea4232a700b7d4bd9fbd351e1a1afc69868f73bef884a79d35c527ba74014b71e2fc6edf462ec1b60ce48f6e SHA512 d6a39557e413c862a8162fd3f2ec814405826afc04904ecb16a78d92aeab9e4b18f7f2a68833faae3f6afe3987d50a8a46b684862c47b8f136e01ff10d7b9dba
-MISC metadata.xml 557 BLAKE2B a4f765631fe109d217f577b3de01c7fe4901e7b7ad92d38e2844720188f3316e0c6f288065aa1b4e27e53d4b1f562d65839502d755081423b55e239119beccac SHA512 214770043d1c60e385a509faa12f4b7c04bbe0137b9dd9082c49fa6adea2e1a4555e38695bdb7b14cffe6a700430202e2ab711ddcfe413c6a7986584010f133f
+EBUILD fluentd-1.3.1.ebuild 1292 BLAKE2B 96937096ac662d8c61f03cd98d7042ef4485f881512768b989f5674b632b77d94c60934a87db2b5080dad9e1b4e30c7dcae4b5a7a3cb4d457c93dcbf4ed98554 SHA512 c01132839e15fe58d6c48b6d6b9885b11fbb8d1f2ac193c377d9e107548f72e1742d7134e8ab85d3c91563c79a458563ae5696a830f1efef0175c261355e6961
+EBUILD fluentd-1.3.2.ebuild 1324 BLAKE2B b790236e46c31cbd53337cdf38ce51d8184f1bcca6fd7b5722b39afa1b6218f0e94a79a551495c6355ec18ce600ff362c4741e27427c9608bf8ef4436c162395 SHA512 bdd1ee61c01eda0f9e38ecf3467461f3afb2bba08615680aaf8e7139e94af08e87f8c17bd98499ef55f93da2a6ad2a607bfd590f6e70d21e4b4b4ebb8154b7fb
+MISC metadata.xml 665 BLAKE2B b2487570d210ca695ec87ff2643128d9b7ccd84820efc9de8c3785298c0462ec1eb93abd3a9c481264aa564ceab8371db370b2b5d78975ecbcf8d812c6652ea4 SHA512 8b2888a9b821c0629750471fb3304e399122652a36e605adf3c11b8340ceafae5467035737d9c13a55aeab3b6dda79bb623b524fbb8fa6a1bbe0c576f32b2407
diff --git a/app-admin/fluentd/files/fluentd.initd b/app-admin/fluentd/files/fluentd.initd
index b2e39d55f60e..03fb7fbff7e7 100644
--- a/app-admin/fluentd/files/fluentd.initd
+++ b/app-admin/fluentd/files/fluentd.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command=/usr/bin/fluentd
@@ -8,6 +8,7 @@ pidfile=/var/run/fluentd.pid
 command_args="--daemon ${pidfile} --no-supervisor -o ${logfile} ${fluentd_opts}"
 command_background=yes
 command_user=fluentd:fluentd
+retry="${retry:-TERM/10/KILL/30}"
 
 start_pre() {
 	fluentd -q --dry-run
diff --git a/app-admin/fluentd/fluentd-1.2.6.ebuild b/app-admin/fluentd/fluentd-1.3.1.ebuild
index ecc42f637b01..5e5149235966 100644
--- a/app-admin/fluentd/fluentd-1.2.6.ebuild
+++ b/app-admin/fluentd/fluentd-1.3.1.ebuild
@@ -40,7 +40,7 @@ all_ruby_install() {
 	keepdir /var/log/fluentd
 	fowners fluentd:adm /var/log/fluentd
 	insinto /etc/fluent
-	doins "${FILESDIR}"/fluent.conf
+	doins fluent.conf
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	insinto /etc/logrotate.d
diff --git a/app-admin/fluentd/fluentd-1.3.2.ebuild b/app-admin/fluentd/fluentd-1.3.2.ebuild
new file mode 100644
index 000000000000..03f9259d8a00
--- /dev/null
+++ b/app-admin/fluentd/fluentd-1.3.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem user
+
+DESCRIPTION="data collector and unified logging layer (project under CNCF)"
+HOMEPAGE="https://www.fluentd.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+	>=dev-ruby/msgpack-0.7.0
+	>=dev-ruby/yajl-ruby-1.0
+	>=dev-ruby/coolio-1.4.5
+	>=dev-ruby/serverengine-2.0.4
+	>=dev-ruby/http_parser_rb-0.5.1
+	>=dev-ruby/sigdump-0.2.2
+	>=dev-ruby/tzinfo-1.0
+	>=dev-ruby/strptime-0.2.2"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tzinfo-data/d' \
+		-e '/dig_rb/d' \
+		"${PN}".gemspec || die "'sed failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+	keepdir /var/log/fluentd
+	fowners fluentd:adm /var/log/fluentd
+	insinto /etc/fluent
+	doins fluent.conf
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "A default configuration file has been installed in"
+		elog "${EROOT}etc/fluent/fluent.conf. You will need to edit"
+		elog "this file to match your configuration."
+	fi
+}
diff --git a/app-admin/fluentd/metadata.xml b/app-admin/fluentd/metadata.xml
index 1fbe5854b306..d4977789cb11 100644
--- a/app-admin/fluentd/metadata.xml
+++ b/app-admin/fluentd/metadata.xml
@@ -5,6 +5,10 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index 232db8a46c14..85363a22c619 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -8,6 +8,7 @@ DIST github-backup-utils-2.13.0.tar.gz 79173 BLAKE2B 567865ede11d200a9dbc4641d98
 DIST github-backup-utils-2.13.2.tar.gz 83126 BLAKE2B f79d378a1126a16f366930a40ca6db43865c2615edb65b13a3b4a1ac693f3f3419f6b821ec4454cd2b4858fd13038ca66e158c37338b671f69f14aca2e36c6de SHA512 b394dfde420d2f1adbaad6b61a665fa99e6a35007fd5162114ec01629a04be31780f3f36e9133456bbb015c6a3939430b5d65572e580d8757f023a2309d104ca
 DIST github-backup-utils-2.14.2.tar.gz 84628 BLAKE2B 579088448da16330083ee4ffbbd2d9e286eac7bf89bc9146bb4eaed8aee42971238ea997625da2e5c6f10097b329ffb7db876aab20acdbe7d17c1a8bcb9a3801 SHA512 6a93861441388866ba57c8be13ece0df6967e711fd643138c00490ce439fb74d29ceb5b482f6315d1a47df0cb90ab4a835bb25bdcc92172f5f200b5900108bd4
 DIST github-backup-utils-2.15.0.tar.gz 84856 BLAKE2B cc31d45711d4b26d246e08565b48bf5b65e3c6127bbeb01064273e4bcc8e3f3b5fd8e439cd4717c4c8d103113b00eba4ed670737169ce6ffa7a8256b08386e01 SHA512 3294641c8220cd7d5e212e47b7011f188432e5e6437e6d97a9d6c38182fd451a0229588ee28872d5c1bb1b0cab93eb612586a268761d42cb763f38ad13ec0ab4
+DIST github-backup-utils-2.15.1.tar.gz 84627 BLAKE2B 14f448a8c15b45cdf2a2868d70d90bd91228bbeb3d7534fd89ed1812fd1bcc52e9720d4063fc33f9463035eb34736c919c888c17b2602ebb772fdef4830592f5 SHA512 72a0c70ef629f17a2b3be12661379a94150181c0ac87803e4490a9b927e84760917e936e3346d2da6a0ec004ef8fa9b1297b41341bce115a2dd26bbcc62c1843
 DIST github-backup-utils-2.5.0.tar.gz 40850 BLAKE2B 34f16e290619a21edef11410a583357a15b57c9a6a0d20b188863f5c41a7a30bcc168a2337ff7203de6f5659c611178bed0e0cff3d802c1ec923d7c4d8e1ee3a SHA512 ecd5b85e0e2e300a9f40ecb8f545868554c7b48bdf800a21cf111ead80c185c96d475c67487c9b9e8af676f8c71a001730084abde79e05860b3e24004888292d
 DIST github-backup-utils-2.6.0.tar.gz 45970 BLAKE2B 855c7e93aa4db136629db8ba109328d51b9e9ca82aef1190a9703be2cc456ac006cd6bacaf1d3ffe9ccd8d43fb83c15c30c9b514abd37fb2104e62b2e1ed51fa SHA512 a795e439f9d28e27b457c5b6eb42f35d6aea1527c2a01a26b81d6e86829db14a0b27a366d9358214bbe1c16540fe524fb0010d5f509c78ba5398c6bdbf04182e
 DIST github-backup-utils-2.6.3.tar.gz 50884 BLAKE2B 43e8c398da11f891230a7910fc29d9fc702f5985c8bda5388f8415446e12a3408383ee5a76a26f2519625be3bf442600e4281a4e10e24b5a1143ac4ca1934442 SHA512 dff092325ad6f3502c8c0afbea90a53469af0ab4b98eaa39a950022c5b4e199cd3b48b5ec0585e3ea39b9bbd707dd037e8e0ed00ed8c6858276ba1a8e1075290
@@ -28,6 +29,7 @@ EBUILD github-backup-utils-2.13.0.ebuild 930 BLAKE2B 185c34081fd6caa7343747e0ac8
 EBUILD github-backup-utils-2.13.2.ebuild 930 BLAKE2B 185c34081fd6caa7343747e0ac870f18a24c6d580250774815fbc2d1df9b3c3a24823018f00bfb80d2b038a4c1dca32da50824daf558d77d27afe84c2681b348 SHA512 f6c25a3358217c0090a52e076eb138cdd82a349a8f32f1530a6cb1ce02e52acee765ad139244ba7c13c0930eacd7212706bfa00702dc089778e430e53bed6655
 EBUILD github-backup-utils-2.14.2.ebuild 930 BLAKE2B 185c34081fd6caa7343747e0ac870f18a24c6d580250774815fbc2d1df9b3c3a24823018f00bfb80d2b038a4c1dca32da50824daf558d77d27afe84c2681b348 SHA512 f6c25a3358217c0090a52e076eb138cdd82a349a8f32f1530a6cb1ce02e52acee765ad139244ba7c13c0930eacd7212706bfa00702dc089778e430e53bed6655
 EBUILD github-backup-utils-2.15.0.ebuild 927 BLAKE2B 80a84b7e2b39824b1ca6fb87294670baa9ffd8d4b9d38a522e5084a51e57ca3faf05ddedee7f3102c62cf5f9a7c42a5be99554dad1163065ee26a55af5d8113c SHA512 e6796e02b950114b60a8c3a0ebfea255155eca9bca0307b9d2e385bf6e317936c35082b2ff10013d1e57e38298baf0b9d9adff56cc6b671be30be2dae9423960
+EBUILD github-backup-utils-2.15.1.ebuild 927 BLAKE2B 80a84b7e2b39824b1ca6fb87294670baa9ffd8d4b9d38a522e5084a51e57ca3faf05ddedee7f3102c62cf5f9a7c42a5be99554dad1163065ee26a55af5d8113c SHA512 e6796e02b950114b60a8c3a0ebfea255155eca9bca0307b9d2e385bf6e317936c35082b2ff10013d1e57e38298baf0b9d9adff56cc6b671be30be2dae9423960
 EBUILD github-backup-utils-2.5.0.ebuild 868 BLAKE2B 36bdc6369b2b535dac992641bcfa4c323325e5811d9a581742d5c06079a10c75220f7b11557b983e77ca83cdb9757f38a11ebb421d2fa9fdce5bc0e82c5a3f70 SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274
 EBUILD github-backup-utils-2.6.0.ebuild 868 BLAKE2B 36bdc6369b2b535dac992641bcfa4c323325e5811d9a581742d5c06079a10c75220f7b11557b983e77ca83cdb9757f38a11ebb421d2fa9fdce5bc0e82c5a3f70 SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274
 EBUILD github-backup-utils-2.6.3.ebuild 868 BLAKE2B 36bdc6369b2b535dac992641bcfa4c323325e5811d9a581742d5c06079a10c75220f7b11557b983e77ca83cdb9757f38a11ebb421d2fa9fdce5bc0e82c5a3f70 SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild
new file mode 100644
index 000000000000..bc589b56f9aa
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.15.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	sys-apps/moreutils
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+
+dodoc -r docs/*
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
new file mode 100644
index 000000000000..9e05eede2059
--- /dev/null
+++ b/app-admin/gopass/Manifest
@@ -0,0 +1,3 @@
+DIST gopass-1.8.3.tar.gz 6374004 BLAKE2B 1f3b66e8a631d94fbbb33347009a4614f180d7bd30f3d73e98f476fc81a3f5f0aef15c80705b1b4e871f333a3366cc051eb41785082bb90420a5d34f38e35e16 SHA512 bcf8e4cdb37355ae43d0d6d21e3248d3547fb3f1892bb2e8d5d8ddc47a784f75f4f404429733ac824bd66d719fe63fef7a1d58facde65a6d1820ecf14e7bd77e
+EBUILD gopass-1.8.3.ebuild 1041 BLAKE2B 4fa9681eeb9b8c0b9be470cfc8fe3b3f2ef806e4b64238b412d67deb72bfff4cf9cc0bd4977028287ff6e5ce5fac26874925da6e181068c4c69555b3a7c4bfbc SHA512 1bbff9001cad0448f310a5db019117b13edc2c81a66025b10a0e491fc9f6d6f2bcc1837e5ffeae46705911aa7d8d4ba288efa92888fbfd3785805195733a7ed5
+MISC metadata.xml 326 BLAKE2B fbff56ecc7a4bd866c1220fc218f9233ed0660b04cde03047df5db992557bf5d20f518815dc15eba2a22f6b2b8cc4eb5ed1c0f2cc2753e18ce4cafd59b768637 SHA512 2d43a58c7997bd539d9aa5659fe7cfcd947c97c49d31dea4ee1230b06b0ae2c8cef4fb228b889968f65c36693d5befa76828da3644bea0852ead709bbf7d760c
diff --git a/app-admin/gopass/gopass-1.8.3.ebuild b/app-admin/gopass/gopass-1.8.3.ebuild
new file mode 100644
index 000000000000..1345581a840c
--- /dev/null
+++ b/app-admin/gopass/gopass-1.8.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/gopasspw/gopass"
+
+inherit golang-vcs-snapshot golang-build bash-completion-r1
+
+DESCRIPTION="a simple but powerful password manager for the terminal"
+HOMEPAGE="https://www.gopass.pw/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.11"
+RDEPEND="
+	dev-vcs/git
+	>=app-crypt/gnupg-2
+"
+
+src_install() {
+	dobin gopass
+
+	local DOCS=( src/${EGO_PN}/{CHANGELOG,CONTRIBUTING}.md src/${EGO_PN}/docs/*.md )
+	einstalldocs
+
+	# install fish completion
+	./gopass completion fish > "${T}"/${PN}.fish || die
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${T}"/${PN}.fish
+
+	# install bash completion
+	./gopass completion bash > "${T}"/${PN} || die
+	dobashcomp "${T}"/${PN}
+
+	# install zsh completion
+	./gopass completion zsh > "${T}"/${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins "${T}"/${PN}.zsh _${PN}
+}
diff --git a/app-admin/gopass/metadata.xml b/app-admin/gopass/metadata.xml
new file mode 100644
index 000000000000..06eb97b4a0f0
--- /dev/null
+++ b/app-admin/gopass/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gopasspw/gopass</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/gtkdiskfree/Manifest b/app-admin/gtkdiskfree/Manifest
index 0e65faf6359c..6b5048559500 100644
--- a/app-admin/gtkdiskfree/Manifest
+++ b/app-admin/gtkdiskfree/Manifest
@@ -3,4 +3,4 @@ DIST gtkdiskfree-2.0.1.tar.gz 354661 BLAKE2B 39731b38eedf92554303fa8f6784c1cc9c6
 DIST gtkdiskfree-2.0.3.tar.bz2 216189 BLAKE2B 146dae89b0f66328840f22bd7b9e8ad751759dea3a67c332d71e513388be46122cb761fec6229258b63e85c726ee889e04a56d405437904f1eb8060ea31ee88a SHA512 c6f093ff023cb8c67090b3bd3660a998163e786b08386f346bdc1aa7b29e030a31cfb0ef54c55f109f211bf045f90afd20558b91849a4f82d041c99532f170fe
 EBUILD gtkdiskfree-2.0.1-r1.ebuild 920 BLAKE2B 7ec5ce54e5a949d75ba8836162d2361340d1c115d028fce633815ce19b4aa8f0e3283f2e3b03e8b8069d498f4d6fad454151dd4505e18acf17f8620d359b3e02 SHA512 23d755ed23fcebe32e44de66bbdf92048eb80ca0e7060130c74ebd6444d944e1f906bf4f2b013c35f2545dbe69db8bd7976c00af3b23bce5eaf82cd13dfa03b3
 EBUILD gtkdiskfree-2.0.3.ebuild 606 BLAKE2B 7e437ee97362a5b8152cc036b8f92854efb9eaa3871f3a694795603b4375fa1e52f2eb70c5cfd8ce18b25606185d45dc74164e8b0d178d5c6ad2d1673f4c06f7 SHA512 b40217538674ee82af7902d25144acdfb4a3940aed487c2030687271e2107103fba230e611d57c23f6998c7194047b0707e0b98a7701bd843491221930da4962
-MISC metadata.xml 691 BLAKE2B 779f040306522d07f46279e074c83763a51bff2f994a132f9b8994f5ad51fd0625c371c161819777bff5cf0b75af17383bf8553d1b8dd38f3042fe66286e9bd5 SHA512 03a0399885deda4dc74e710ab00c8123222da16b8e690b755a5d737ff7d500676dd79c865d6ea77e44d584925c38f72232c66ad4669eeabc95d213d744ae177a
+MISC metadata.xml 587 BLAKE2B dd739127e2229dfa3136f32152b74dd6b001947195b57776ddc4fd41a892ae77ffdbc42d9b0078f20b45be2538b655e05f99e8a67ce0d43474217a6cb8e03ffb SHA512 1d4a058ba9e674c69dd5422af178c7067772532a963fea5d1ba85efe88cf4e576b4f434721f76cb7be6aa7d6873b506faaf8009adcea135e90d9c08beebf6ec6
diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
index bae1c66e0447..88053de1aaef 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -5,10 +5,6 @@
 		<email>BM-2cTVBXjxdVtEQCycBQjMxszLsgTNVujvM5@bitmessage.ch</email>
 		<name>Samuel Bauer</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 12d85a86a6e3..fb7f0e23a37d 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,4 +1,4 @@
-AUX hddgentoo.db 19595 BLAKE2B c02a706c8afc92f17854ae6b0b8d7071e95a5d53b8e4962e53d8209c0c70bcaed4392b2a3233717854838200cfd7d75b4a19444dec03719fb9f5a0bac8a61152 SHA512 097acfa6127ff3628e71edf72fec67731b6d9d2f105f62ce757fb67caa19afa16c7f2e21361fdd647209c33ecd5f97a44be209773c5b1fe3d175eeb441933593
+AUX hddgentoo.db 19666 BLAKE2B e4d5d391941a848c9ff3146e375180e2ee283d6ee73574becac35e90fd538d6fec7230c505f2649be0b1d421a48e2b5e52283e738af0c471318e4de8bd887f81 SHA512 a5480b37cc73485a602a042999335718a6a22328ab695f37dfc2903881e17fd6e7a79d243ff714f6e47c1e1e3365291d4ce852700ca9f2de821a0fac298b5bd9
 AUX hddtemp-0.3_beta15-byteswap.patch 1037 BLAKE2B 5e0df7da8f67facd8f5d466c502b44aa1e58822ec6b91992b973aea0d3e70fdba0812746fd697341419b670a984e14c1c44a1b952d27ffc82df56b06bf6a27a3 SHA512 4d37b31129be7f767a416d4b15e3eaf94af297a7d2f4ed57f900fc48775bbb389ca1259c13dd048d670f32fe53f8d0e06c6f1c02485cb95a08d2a80aac4f76a8
 AUX hddtemp-0.3_beta15-dontwake.patch 515 BLAKE2B 56061289e8d247a11a3172eebf3ed7f04f6b55b6021c9d79dbc41553828d4b265dc049ac139473dfd48c8e904d3cd4023405f9c787a21537872c6e2185395ee4 SHA512 ff5cfeb9fcd6a17ab3937212a85076fafa9abfde72a1b602ada09b5fb71f89a200e91398e9682a17034f630b90e57559e550c0f1565d12ca642af0c2e10a99e1
 AUX hddtemp-0.3_beta15-execinfo.patch 751 BLAKE2B 955e4d3501f7a8669036168740d67574f912197110cb2a156b3aef884596346bd1cbc32279248bc91f8e94993139092b80db02fe4cc42124ada99915fcb0b899 SHA512 cd320985142df5f07cb8c56613aa4110a63fed34e2e08f95272f3d43b75289d298e9dc61e86a42e0be5f15f9a76007d894d515d4d09c8a9deb41b16aa4ea3bc6
diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db
index c4f679052577..994b9cb26736 100644
--- a/app-admin/hddtemp/files/hddgentoo.db
+++ b/app-admin/hddtemp/files/hddgentoo.db
@@ -66,6 +66,7 @@
 "TOSHIBA MK1637GSX"						194 C "Toshiba MK1637GSX 160GB SATA2 5200RPM"
 "TOSHIBA MG03ACA300"						194 C "Toshiba MG03ACA300 3TB SATA3 7200RPM"
 "TOSHIBA MD04ACA400"						194 C "Toshiba MD04ACA400 4TB SATA3 7200RPM Enterprise HDD"
+"TOSHIBA MQ01ABD100"						194 C "Toshiba MQ01ABD100 1TB SATA2 5400RPM"
 "OCZ-VERTEX2"							194 C "OCZ Vertex 2"
 "SAMSUNG HD204UI"						194 C "Samsung Spinpoint F4EG 2TB SATA2 5400RPM 32MB"
 "SAMSUNG HD154UI"						194 C "Samsung Spinpoint F2EG 1.5TB SATA2 5400RPM 32MB"
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 1179e2bfd083..79916abd167b 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -1,6 +1,10 @@
+AUX helm-2.12.0-sorting.patch 2886 BLAKE2B 5af6ba5363e531e1edbd437b7567a57ed5bb692bc93d3229d30973c43d643d173fb8d6e3b41c80bb697ad7cc1e1b12ea6b958dcd6af9586c9445349da6ba6464 SHA512 6afb9872742c90edfb02ced188dd324c529fc1238178ffc8a3bb3e8c1240c3d7c95d12a5b8f1a65f6e7c379e19d65f7c23c91b2b9ad5257fb66a5c175c6742ba
 DIST github.com-Azure-go-ansiterm-19f72df4d05d31cbe1c56bfc8045c96babff6c7e.tar.gz 20757 BLAKE2B fb024665eb8d49579b9ae67f706e524dfedab3b0f212f18516ba720e5f5d991609fb3a37eb6c960881d4dfeb83a001c8a345de222978222f276232a742a55224 SHA512 a70922a199719936c0d7801a5750bd6893f5e119bd7c592af096d9d82a3f4aab859649126eae60faf70a908e8a28c0cb7b54e8288365276eecf7ce8c6dabdbf4
+DIST github.com-Azure-go-ansiterm-d6e3b3328b783f23731bc4d058875b0371ff8109.tar.gz 20948 BLAKE2B 36ef6d0327a373d105a891d28de4a2e620856c902f5159330d8c316a31e3dab77847c292bd14e3c014203744ebdf0dd1ba1431024a52b55991e87b92a43535f2 SHA512 079dc6400c2dc53d46cad809a1bc7723b43b10939d51624a0aa48d2734f2d44b1621748ef1820843f55c07f233bcf394d2ae63ff356aa22f66df32ca40556e44
 DIST github.com-Azure-go-autorest-1ff28809256a84bb6966640ff3d0371af82ccba4.tar.gz 113471 BLAKE2B 32f7566c24603f3f355d37367ee7eabc9cd7a97d0834425b9a5f25a6f5a79da95408cc27e224e74439d83b770075af9946f3bbec1f3e76668817ed6b81fd4730 SHA512 584f05c943dd9bf11ad65da30dd756fbbb41b7b89c672b13328dca40de9e8c3053443180f4f60dbf70915d4c44eb94b620f2d5aee8f987bbcb7f19e271c623c1
+DIST github.com-Azure-go-autorest-bca49d5b51a50dc5bb17bbf6204c711c6dbded06.tar.gz 119019 BLAKE2B 3333f2b5ce83b3200d85d5b3979e3331c19cf6f2b1b7a03fef69021cac1918f63114e0a281af17f9c6f704309e8c215e79b02f6391a1cb306cb3ecfeebc1e08f SHA512 060f98cf8bd680db5384c3981052c0397e35fab83412c19305944c589c2ed94a50ad9f272adf96cb4dfab151c4927bafef3ac2b04ee8746f2afc6c520d69498e
 DIST github.com-Azure-go-autorest-d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab.tar.gz 105565 BLAKE2B a6db0d05102de0ff49470de5c8936d6f327ccd65c92bea6e7e7ddc0b4f15fc8b2baccc0aa929ccd8b4ec0b07e42f15ffbcd49e22e88eb2e334c193daf78e2256 SHA512 2e6992dbdf57f9d87d3e0525b29b0423e0678caeb699cc3b332b0942d8efb9ad79140b1b72ffcf649ed5d40d44210314e70dbf65484f456933bd12dc0e07ec52
+DIST github.com-BurntSushi-toml-3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005.tar.gz 42084 BLAKE2B 09e4447d28ddb0824547d9aaa84c3c16acdc309faaf44434119e1851c40b3d3f67d0cb745691bf47a560084c93a9ce492c715833405061e5fc6114cd674b37a5 SHA512 bd14b162d4d33f62dac4abfe3bec908ea45dce88b9a0e5dd173e9f0576e29344c5136bc48e5c6602add41ddb71523e831c53107b47c4b36832c97e7b0a3d18f9
 DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
 DIST github.com-GoogleCloudPlatform-gcloud-golang-3b1ae45394a234c385be014e9a488f2bb6eef821.tar.gz 709308 BLAKE2B 89cfa383556809ed58de8ab3db951ddc74250c1bcf2d8ff751c935d4be69c39d287fa4a2bff52799e368a22fadd791b8a2903264496a996d4ae756701af97454 SHA512 d13d22a4407aff047d4711d5d6f862a01e22373583f15ab513155e57a4f05968d20c4421c989a015a02f2e39b833b7d880cc301aea959416e44ed37586c3c14b
 DIST github.com-MakeNowJust-heredoc-bb23615498cded5e105af4ce27de75b089cbe851.tar.gz 3384 BLAKE2B 5eb9bb3c88a3bee70cd64f30afcc039f2f43b68be23f39c72f9091765388229a8f5bdbfba8d11d1916d18e9c785e15959c000337461e44940df0ea40ecce40db SHA512 b877b8b0e67f300ed9773b32593a1edec2fb6df3b0d5026cc7b67490ec9a4cb0d9630fb30dc3dee6b7081f81c3fbf1399809c4bb171a5afab665ff93a9f3a034
@@ -21,9 +25,11 @@ DIST github.com-davecgh-go-spew-782f4967f2dc4564575ca782fe2d04090b5faca8.tar.gz
 DIST github.com-dgrijalva-jwt-go-01aeca54ebda6e0fbfafd0a524d234159c05ec20.tar.gz 33510 BLAKE2B 71d08f6e4c6b3684c5f3aaef503f326c63b1b68f7ea9668ca252ded573b337fcdfe972ae22d63ec9068a78eed6ca9f069f3b9c619bfbcec4fd1b3317796d7191 SHA512 dcfa6d84c6be331e6f22e9ef304c54a97b4227b1474fcc4f7dcb533a78d43649c0e82e24c9860154fbe48c676af9ca20a84622487113bc68ca44360d7c8311aa
 DIST github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz 1769777 BLAKE2B 235216295ebfcf61e6fe3cd8f81ac66a0bfd9a67da6b8c6ead4c778e0fcd7ecb519bbb67711d502f5f253a4e98604fba3b055458931ab7a03b4d61fb380c8169 SHA512 05caa27ac0c8e16c7a7c1d0de0f3c0f560be51d0bf5f487f370a0b99971f88e3134448a2fd34af694f124f60515ce38923686ca4fedc8141c5bf4d74f85b0141
 DIST github.com-docker-docker-4f3616fb1c112e206b88cb7a9922bf49067a7756.tar.gz 6364312 BLAKE2B bd4cd06f9a98bf83285f3047e899d175b61bf5c33b272b3f592f4e4811b99f977b64eed5551a318b6449ce85fa3365a8ba425655efbcd496b02eb29ef8c9d322 SHA512 6eef641e3ca214686521c50ba0eafb6d4424b076db1048f995a3bf4d597247e52a74e0f2d866b6eaa67287d5dc01a6df9baa7cab9705b76afbeaf8d0a867484e
+DIST github.com-docker-docker-a9fbbdc8dd8794b20af358382ab780559bca589d.tar.gz 7654023 BLAKE2B 36781404e6b3705cce95773c8d5b468e0fb0df81993b001f055eb5babeb8e2b6c6c771d0f2d2f36ffb4a6be99e2408e8343501a98f581b8c30addccf8c0a22fc SHA512 2bdd240782e123a5b87adb92d435a4fb3864c28a0a4899d9e6fac6a93926565ff1efae228c35ca81d72f048fd0bc5a5d9eeaea99ed6a911cfdd3ef20bfe67637
 DIST github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz 29802 BLAKE2B 60514b59195e988e236db3bac4e3a75991ee24d2e4fc404f60d6dbc332479d91564e30d7f3e8080bc251aaf532be47f242b2ee06c6c44668d14f52db9985d96d SHA512 67e1b3bdda441127e2aa72a3d7552e9a9477324db35d706c0ea84fa37953ad50b4770eb49c6cb56b9765ff57f9a47e8313941d29527224cbf587a6856d0762ca
 DIST github.com-docker-go-units-9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1.tar.gz 11094 BLAKE2B efc28ea5f3db552cacd9c48d7ec4de65a4f50a9463ac964d98782d62ae8c6103c119bf443d3219a39e0ed4658228a04b4a388c29ee38a05ffc3c78c25456abf0 SHA512 baf231424d453bf889e8614c54cf28f0f37f8b8e06e841c2b42ef82729afc4036018b1ca0116da33a8452a2d2345bebef5e8c66be489896db813abaac79d668b
 DIST github.com-docker-spdystream-449fdfce4d962303d702fec724ef0ad181c92528.tar.gz 35378 BLAKE2B dab00cf2ff22077187532a66abdd609a9101a0ca4b0fb6bcd31647e72dc491ba6ad2c2f82d3780d687dc8a95c3f499bd457abc7ca4b98cc0d08c726f13d58593 SHA512 754efd869559f96eb244a603bf575e1b439d8aa4ad34485121c76c4900150ac8a81f7fcdde4b2af49bcd317eba2212ed60a16a10cff973c9f87516bf50ad0d2f
+DIST github.com-evanphx-json-patch-36442dbdb585210f8d5a1b45e67aa323c197d5c4.tar.gz 13289 BLAKE2B 4085dcd289abae0130a053349c1d0165858f7407fc3a93dcd5875c45a8fb1dd1b182a266735a02041492fb905d273fc84a9e36bfa41132bb7445158c98f7dce1 SHA512 c2006b4b5f7fb97da69b6a7144dcc5256e2987c0d58da7e62f59b0defe9c8aa3b4a3bd83a3bd9d960c1434f910480d87c45be0b0f1af323159d2de7ccc9d10e7
 DIST github.com-evanphx-json-patch-944e07253867aacae43c04b2e6a239005443f33a.tar.gz 10453 BLAKE2B 9aa008b347c27a66bd6fb84c4ee219bddb71dc8063975beb7e8d2d01b41589e9f9caebf81c878ae1122ebda9afffcc0d242ae29c69b25e33e0b1a773f764da7d SHA512 34b0aba157e3b51ff88bfecf55dcf1119a4da86a5dfa3e4ffd802d693691dfaa02c238a34e4fd32f668aca801af60d50eea13b95724946b4f66f29de4b9dad6c
 DIST github.com-evanphx-json-patch-94e38aa1586e8a6c8a75770bddf5ff84c48a106b.tar.gz 13162 BLAKE2B 6367f3dee190d32d6f8d7a86f5928d738aec24aec85f41c896fa1bc896a62e9ed68700db7b23fd5285bc85254e0c5b9c9b675debfe47513650b9e1cc748797fa SHA512 481945473f954c9e2a618bfd95687121d28ea33e46c360adcf2c9315e42f0b655da65d544740bf38a14a2e02dfc799036da210b9925cf25a622ecdc1c9ec8948
 DIST github.com-exponent-io-jsonpath-d6023ce2651d8eafb5c75bb0c7167536102ec9f5.tar.gz 8224 BLAKE2B 8997719d55e4c051d7addc41bffbb11092df5dbfbcb35de6cbbd464c8232661c714bcf83eb652143b6cdf5e868b1df233d23c17c0341399410bc4f18d3188158 SHA512 1db86023b693c41a2bb80ac3e3a26f54aeb741b417ae2af81f5d4ca44772ba45a02cdb2c928cfcaca425212717ac3501b627a39fa5794b41d93976ba65c24602
@@ -42,12 +48,14 @@ DIST github.com-gogo-protobuf-c0656edd0d9eab7c66d1eb0c568f9039345796f7.tar.gz 24
 DIST github.com-golang-appengine-12d5545dc1cfa6047a286d5e853841b6471f4c19.tar.gz 213923 BLAKE2B a53b177f8b31b8927b923c5bcfc4ee4a1f48725e6652f38e20bcf1147a646411771bde259ed7917ad12913734375f880e7c4cc9b49b370e738928286b432a877 SHA512 903ded0a887db7a6b6783bea7d6af82087449ff05ac34367f3472f23c80965a4f6b4883e6983e57560a80a6b81eecbf285729d4c38b505cf1e99274d1d87c1a7
 DIST github.com-golang-crypto-49796115aa4b964c318aad4f3084fdb41e9aa067.tar.gz 1451379 BLAKE2B cec68f14af4d7b1c37941c3dceb70f7267f318a57e2d8f38d515c9a398803a242fcc074098f4c490612a0edc25e23704dcf05e5b8ee4480f0000bb6f781db644 SHA512 1b6bc00add4c897858108ace4c8c134250a08758347cd9ae30bab42988be0d0e870fdc9c83114c72410933bb46c93cb662da2e00787eecd7def6703d3077f749
 DIST github.com-golang-crypto-81e90905daefcd6fd217b62423c0908922eadb30.tar.gz 1431151 BLAKE2B 09738718227b69635d6cab53397f3ba09295a683e7b8175829259381b232a8e56f4035710a2882c7edfbae61d94f673aa3e7301a343d1b1938413023b3c9f823 SHA512 ff5eaf61e7dc133a56a90d100c4b48fd2775145b457febdd1eb9ec39c15ce6bc73665873bbe658d6b4bb94a008d7246317d751a41b5a62b43d2055ed3cb01e02
+DIST github.com-golang-crypto-de0752318171da717af4ce24d0a2e8626afaeb11.tar.gz 1636269 BLAKE2B 85529e4607b4efc684dd5a7aa726294a21f3cacc4c6331d91afa95e0e14756b8ccb7d461c6c4ac9f3e0d6b864e63afd763a41c8e7df23a2b8afe0a1264d635f2 SHA512 c1c5380ab03ef5fc8aee6d5937a90286bddc32d8b9488b38b890654657ecdf5f878d74eef2d32d6789053dade619e4aff006ecb003cdafd56b8730768660de80
 DIST github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz 19648 BLAKE2B ed700e613f8a9e6a06b12295c0b7117baeda2c0ccd97f269850d0053c0dc27ba643ac207eea8890e4705d8624a404861d2bf0e00c242e49b1a550b069420f97e SHA512 feacbe0efdf1ea45f7b5581505424a674bb23ea79784985844c40028ed27eda23f2d693caa81a6d4981c3de09ee498c5f664d77b25db7d7a14c93aad1223f4d9
 DIST github.com-golang-groupcache-02826c3e79038b59d737d3b1c0a1d937f71a4433.tar.gz 25244 BLAKE2B bbfd67b7c9d34fe1cddab77a372fc53c899424122c46dd637186bb571e1a12dda7f0d6991bb5ad85cd0162803832e5843af6b184f861fa5dd1ac0a5cd8c7ed86 SHA512 e7ecb5c64bbb9e1fd2555ed496abb1e65f836b8017f21010dc853f8c527826eb6c315744ce991725d85e3500a6c877b3f25ba22090584c4c75dec6e6cbdc938d
 DIST github.com-golang-net-1c05540f6879653db88113bc4a2b70aec4bd491f.tar.gz 916090 BLAKE2B d6e9cd2d0a0cdb59fc38f3ecbefddd289b3d78cc88c4b558c90ac27f75db7e59004d277e4194e5c9a0d56b5daa98e6e85d291f59ac79df314a53d803aa5a296b SHA512 40c070ab27ba31bbf0f0555e2b90b12100246caef36d7bf48d543e432272b0eca6e0deaf49e1e31ff6974b06d6476924818862a9243a8646d0f38b344a09633c
 DIST github.com-golang-oauth2-a6bd8cefa1811bd24b86f8902872e4e8225f74c4.tar.gz 38085 BLAKE2B e17a21040499b173ba84271a65ebb24d726ab8e91f872eec5b87a57dee979af2062b5998a01f6770eb642d0a5c1099acd8342459840a0b826206f167b84d9571 SHA512 15708883c7d824a5c9939532bf64d0aa09697038830a8d7b310936db98351acb853698d69cea860ffed6b4eba90bf98b54f2e4d6f7149d6bce1e824f28bb473a
 DIST github.com-golang-protobuf-1643683e1b54a9e88ad26d98f81400c8c9d9f4f9.tar.gz 268489 BLAKE2B 76035d1202d11428885d94937f1616e62441f83a3af46de0c0b8a17227b9e6a04fa8161269ffd1894992e6b5a914848dda66f1b7f9f91d5f1a4a8b45ecd08fb7 SHA512 adb706f73ce1a0a9d369a556258494913f1760c2ffb509797330768d112fb4f70b55d80db59d41c933b27aa862a6c044a9d6d2c5de95f540b86a46a0eec99901
 DIST github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz 771129 BLAKE2B 592e1af8d74e77807a65901b576bebacfca5b2331c6943031720a873bc7782ef35cf3300e5307c79164ded89394df97e7342f73168f4e2354b13cca9260785a8 SHA512 96d1b7254d16c107a5496766ddfc2e56b56a31fe9c4bd34c23ee814911036145d8327203302fbdcb6bcb9af1022073608ea123c6df661132392ecb611e427c96
+DIST github.com-golang-sys-95c6576299259db960f6c5b9b69ea52422860fce.tar.gz 777992 BLAKE2B 2faba466538ebf86ffe9eaa2d400de6714e25d30ae9f257c2af9de541b98b529f74a511d94d523486828236572ddca9fe46c4a53e15a44eed1960922ccb0111d SHA512 dcc307e214024d4231f6f0e1dae57a9b65d43a0497daa6f9e36f2ee9f345726b189fd0ede9e3e181cc1b47c32346c1d659162e7e37a41d1a5bcdbdc833e71c0a
 DIST github.com-golang-text-b19bf474d317b857955b12035d2c5acb57ce8b01.tar.gz 4604452 BLAKE2B db401ddda5fe4ad1504a520707fb19053b36d99a3c47101e682ce9be8aaf7e216af586816cde01a3328f09d02e9d3c8adec35ea1f74299106b47853102de9206 SHA512 c613d40866803ea36cc43507fdd33dec8581bc6bf0bccdc53efac2fbb1f5903c94ffeea6deb18928fadb09aee673648d322bb7b8db34a7f630500248cc9fc87d
 DIST github.com-golang-time-f51c12702a4d776e4c1fa9b0fabab841babae631.tar.gz 9005 BLAKE2B 5ad1988c9bd3a632ea4b248e32f6223a79d54b68b1c95bddcace042c22c20d3aee6192bf3d72def729292ed50e4d423935c3ec7004398e03037f91b7f401fd77 SHA512 65a69bfc6044de4ecacfad1c9c8add6312745bd2ba3dc46f522f1e7a424aac49b5e18aca60f8daabc340d50d73675cd5c06de9441060d86009a092feb4f5c9f7
 DIST github.com-google-btree-7d79101e329e5a3adf994758c578dab82b90c017.tar.gz 11748 BLAKE2B 997de087a8e0a8a97668e954f1f8ab5ac5aefb32a8fd303b13fb2e062594febe1326716e91e6433fba5e88e22fd9e30ff6168296b1d563c3d49a43b054552c77 SHA512 9cba507c12bb1a7434411290b44457b9ad9421c2a6c0b78670e0f1bc641b7c302c7bb0a92af747954e5caf3d8c15dbf820522fb468a7e40088eda764477493b9
@@ -65,31 +73,42 @@ DIST github.com-hashicorp-golang-lru-a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4.ta
 DIST github.com-howeyc-gopass-bf9dde6d0d2c004a008c27aaee91170c786f6db8.tar.gz 11295 BLAKE2B b8d611a2f5410ecda182de54c21c57317ce5191e35d744a87eb5a546b0e8ab7f329a561537df620cb17ff92826a30699e6358e31f2c2dbbb19dc6407e2893a2f SHA512 d502e33fd19784f76d04e3ff7218a055b6b0f16ac9f53bd526ec15ff3f94ba2729aea534313d18ae62aa586993fa8ff2fdfafbea7be84a002f8d7e19ae7f951c
 DIST github.com-huandu-xstrings-3959339b333561bf62a38b424fd41517c2c90f40.tar.gz 16077 BLAKE2B 876bad301ff0e8074442a7f375533113c93d5f58d61969f7455a3aa653d2083fd9abccc0410a8c46325328c4616d1beed2cddccd379ce21fbf4a8bfe8c322cac SHA512 3100ead162c3339b07786ae40a27c880ec9309b4dd45af94d686cacaa85f0cd41d87e3509103789122fdea787e501235ff5f9c770fb1d3df50f1dedc80629359
 DIST github.com-imdario-mergo-6633656539c1639d9d78127b7d47c622b5d7b6dc.tar.gz 7200 BLAKE2B 226a8c6db75ba6d0ca2dc5ebee3537d4329d95f1841916007a74691993dae4c6495ee63ab6b2589983ad58170d70a957dfa85133b4cc0564408b6ed213980246 SHA512 0c4fe4c2a30b9f0baba1c23b10f8281eab85523f34f8bf27688b52f7baea907e33d37a6fcbe2e27e6d1bc25669e6ba04511822743aff3706351f707283c1642c
+DIST github.com-imdario-mergo-9316a62528ac99aaecb4e47eadd6dc8aa6533d58.tar.gz 15928 BLAKE2B 1a6f95308897829160a1a61d76fb17fe6da2159ec68a9def1294eee0f7c5acfa0de9581a7afe05353a79088374ebbe8ca1299844666ee52a3074b8a2ed04d02c SHA512 34bdc7ed182a4290862c4c21fd9442e6b3bc03a16aa04a54aede48f16c0baec62478dff97433c6d3370b110abf4a712b304064826589ef922d1bf8cfb80fd446
 DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
 DIST github.com-json-iterator-go-13f86432b882000a51c6e610c620974462691a97.tar.gz 101395 BLAKE2B 336dd30f7906023e87f835df12becacd8e3e4c0a57b4897b277b4bb04272440257ad150268d5cfb4ed69665f1a168d919d7a746b1da00691afe9e7669f6f3a45 SHA512 8497d6578a78ef575834350c2eba15d11ef6273c472cda9016181c044e034ea002d4039b99852a9837425c791f199d121b19edd701b9a9c47c19a155a19baa81
 DIST github.com-json-iterator-go-f2b4162afba35581b6d4a50d3b8f34e33c144682.tar.gz 75576 BLAKE2B 0fdbeb288b06b3fef3d282ad45e52e91a2371f56583aa90b9ff2c353e3ca50867cdedce1dff64ddc044c15d66735f842ceafd94108f34216da3c7c55551440c7 SHA512 60389686a74ed58ef961656bf2a15dcb6e0526f6c79849ef9037314a5fe00f188cf33e9b382246e52001724964119dfde88da02c6b5cf34085b75dec16a3cf22
 DIST github.com-kubernetes-api-2d6f90ab1293a1fb871cf149423ebb72aa7423aa.tar.gz 690029 BLAKE2B efc3977b0e15c4a30682e544227e9f796e032c78ed559b01882616e2c5d01714c3c2280a6c80c0fc79a04f11ac84284f6210031d2c32e3468f3977e93481ba03 SHA512 1c0a67a23e0e557c6a735e769875b807069154bbf894bbb77ae5eee320161bfb6d6b304c04244a064bae201d6b5b9ab6e0e3d47011a6f86c3a00773eae4bf5d4
 DIST github.com-kubernetes-api-8b7507fac302640dd5f1efbf9643199952cc58db.tar.gz 681931 BLAKE2B 3c26af4d821fd63157d522a63371c168769c3bccb5ae02ea484554fc416f405932e8d534f109cc6b6ac233393ab99a06456abf65b4896a44f635f033a12d0b32 SHA512 006b8b4be9611550efbf258d3960060bbdcf12cad1b35104274f92fab94aa7f568dd88a901d50020c9ba63662318c1cd63d04e7b5dbabfb23dfe72d0153f55d7
 DIST github.com-kubernetes-api-c699ec51538f0cfd4afa8bfcfe1e0779cafbe666.tar.gz 681854 BLAKE2B 036aec7004f00fa62b9e330d52a427b945b9455a55049f6c6620110374e1928aee66d31d82dee97d264d231f8c83b52e91f6ed5ed9953e57ab86f31d586b85e8 SHA512 66dd666c5cd0eef845eb1c31ee051cacb7b260f68804b5b58482bc5565693b4072dba7aae6fea9e58ba3729428eae2d03bf89b8a8b6b624f67ecd43f561d045b
+DIST github.com-kubernetes-api-fd83cbc87e7632ccd8bbab63d2b673d4e0c631cc.tar.gz 721707 BLAKE2B 1b2d72e175c801805cc52f9357abd62f46c95fb2e12db462a5b2d79f03efc81dc1126ac58a9209e6b1e5cf829015307ddf2706d5aa6949d87317cc5f6f62c721 SHA512 791f0378a6b6d5e9bccd8cc1faee32135e9b7027b8ebb91cfa8e977cf0ca8facd7c2c34c3b65993ef95e773c1ad638a0ff3b9c4d720a4263e13f3a1706818c76
+DIST github.com-kubernetes-apiextensions-apiserver-05e89e265cc594459a3d33a63e779d94e6614c63.tar.gz 6534973 BLAKE2B 65462410cf5da591a26ff5b622991eee124edc84302dcbad8ceb2e6034715e4cf3a53f6dcbd336d716a867d8563c5896c4b2c57a60560ecc3666bc223b1f4b49 SHA512 0003fc02728f1593c661fb6c5b88340dabec903a1850d938e9f14c1837151f69d33283c0d3cba85c7fa904abe6f4fc95054ee9bea90893e86f75fa96d31ef434
 DIST github.com-kubernetes-apiextensions-apiserver-898b0eda132e1aeac43a459785144ee4bf9b0a2e.tar.gz 6322992 BLAKE2B 18d636098012e2fac47bbed778d4b1e2c6b6c996044aa46d429e9297a8cf6504ddf6126098dd879bead50dfc22cdb3a46af062234b486a4574f10b841ed04f59 SHA512 a8a0ec14df38cb25c09b2800da1ed6cec66ebf38e42cd883e2c0852181a7ad7fe5ac4b8e618fc5a6adb168f2fb822db80e0fbd14ba008e041182394599c41ff0
 DIST github.com-kubernetes-apimachinery-103fd098999dc9c0c88536f5c9ad2e5da39373ae.tar.gz 445992 BLAKE2B 6eeebdb18a53e92b090bfc5bfbd294732f0fb950349bec2d0451cdbed489db8771f99df55a784da225c947f20a6dec655bb4dc921da5d0904eb087dd50ae3eb2 SHA512 58a22adcc0d88f0ddcba8f6dec82edb9a72026caec724437c30d05dd3624041f6fff4e77a11409945d0b8855e6a5fc04a4f1ddd6fa27bbc1e5e9df0dc382628a
 DIST github.com-kubernetes-apimachinery-54101a56dda9a0962bc48751c058eb4c546dcbb9.tar.gz 446533 BLAKE2B 709ecdba91821a3533d85ab73a6392ebaaa549e4fe78b9d0510bb987e275a174e621ec92c4ec38cd137f60922b8f2a81fc093e18cab9fe050bffdf5d9deb576f SHA512 97ba85121dcf5b7effce14d2c5e2d67597afeb1d438ed450396ca94d46dfcd5be772af300d37d339e5ef39408fead8b8f77731a0823a270d0ee44dfb7b88e671
+DIST github.com-kubernetes-apimachinery-6dd46049f39503a1fc8d65de4bd566829e95faff.tar.gz 454385 BLAKE2B 471286e60b0049311a90dbb5e4e9c32cedf998670941b3d317a49773df4afd675380f28a5cc2367bdf9dbbc7a27acbbb3e031c22f4c596331b454b4bb6a020ed SHA512 76f8cc5ddf0e41c650620032abc08a6ab014699d91df498379f5bb61549d79bbb5e674dffff195e000eeffe8692aab16c254907ae81f87842120b9bf318822e1
 DIST github.com-kubernetes-apimachinery-f6313580a4d36c7c74a3d845dda6e116642c4f90.tar.gz 446523 BLAKE2B 5d24d4dab4999714d1fd205b34358661eed4a3c0bbf83b08118fbe11d3024cc1ff5e9f0470acc80050a7f809dc8cf21cba0264e5a1ee011a6ad4768514cd4df8 SHA512 0f97dbd621fe197f2f640b1692ccebe687347585b5885f1f366aaccd92f6c2fc08ed7bbdf84ff13c3c597cb60f3b062dccc81e659684d5352394f97ecc025846
 DIST github.com-kubernetes-apiserver-8b122ec9e3bbab91a262d17a39325e69349dc44d.tar.gz 1144217 BLAKE2B c8120be10cb63933a7bd13becbd2cca06572f3a456cfbfebdb310f65e7fc31fa6bc1237ae923a478032556510b94716fab9260ee0d1e7b82e17561b82cfe9d79 SHA512 974e2d580462e75207f6865acc179eda584a3fc25cb59efc8aefed53927c3bd7cffda5913a4294ecd9f3df4ef2b30160272c0cded1ac7daaf61e2ccf80658024
+DIST github.com-kubernetes-apiserver-e85ad7b666fef0476185731329f4cff1536efff8.tar.gz 1181224 BLAKE2B b7213362d7d26c73853e7565e9bcf78b042310b98e91ef98e783bd6e3a5161c1183d03090b0ce4adb294ae552fa13440f04b49b6cd2aef50532424200c1aaad9 SHA512 34331561a1618621b265d5121c83dfbd73545c961d3295268540279c24a7379f1139e3b16bee3e93b8a2397b0c7bce8d7123d1621155a51fabdc41cc4d53b84b
 DIST github.com-kubernetes-apiserver-ea53f8588c655568158b4ff53f5ec6fa4ebfc332.tar.gz 1128422 BLAKE2B 21897cc3baa81ff35fe04fe8e13a652e9f308d04043d49756e2a144bafc61063758fff7c51dbd795f8c395824df51656d5e58626aa52d3c7bb1c66ec18287139 SHA512 6ba081a066ec9e31623345a91df4dc85216576b9c945f4e514790a944451d082d72ce5c5599beb6a3bdb55114cdc118f283a35276de85e78190698dbb560be98
 DIST github.com-kubernetes-apiserver-f7914ed3085badf66a1b6f3a5218ada28f7bd084.tar.gz 1133144 BLAKE2B 0660bf2ac97d14c5eb99161d466821c5466ab143e9aa3da076239ddabd4e0d48ad0aa410ebae4b777719dca93e7073e9a228697e758df1eac9288ee2bc022226 SHA512 737047222f6a10c0437957cc63a97ee1f7b6d5406eac5ca8e012b49bae1ef23c9ffb69c8e39674d7fb3a47b70740e01ee992bd60a10531436c3b2d2f82164515
+DIST github.com-kubernetes-cli-runtime-79bf4e0b64544d8c490247abae089bea572ddae6.tar.gz 61380 BLAKE2B 059892b94b686f63da24cb34a63492ad9202d2eace11d9184be6ccaab2f77a35e3d79de0e942769b52948225b4339e8c43f14e8daec0b42a1d2c3798dd53bd83 SHA512 448e4c6fc2f04fa2f9d2d81a6afc79285f0087d9a9eb4ce0ff22b2a9c644a3f68cd02faff3939bfe207bcc9043c2240576f4f445c66786a324fb652b6561e780
+DIST github.com-kubernetes-client-go-1638f8970cefaa404ff3a62950f88b08292b2696.tar.gz 503028 BLAKE2B c420f9eba15842e807c1997a59adbec288d207b85ed31b42c1bc10e0c4f464697276e183632bfff46d15fb4b717fae056294b35c836b8ff2f6e95e5c3129dc60 SHA512 2bea2efc06422651460f9a6c30c9973b24cf2eea275bb0449a0fde020d6e69508af921d07360d7e94c324a5f0a822b13d36f15885b809fdec9da12c4cdd43a20
 DIST github.com-kubernetes-client-go-23781f4d6632d88e869066eaebb743857aa1ef9b.tar.gz 487299 BLAKE2B 3f40b7173a62414dddb7ada2d21b9cbc541e4bdeff9ad8cb501cde47af49859540a1c2af1992ff2dea2bea7fd93f02f9e932b7f6ca5a2078d68807cb46496040 SHA512 b1482dee5a512aca81c901a031db9d7e26875560ebacfd8b5a70ab78ae7b7941bd39e7b0cdbdff2d759e5c8f15909ed16f8bf993d2623d849198e271d27ea139
 DIST github.com-kubernetes-client-go-59698c7d9724b0f95f9dc9e7f7dfdcc3dfeceb82.tar.gz 483956 BLAKE2B ae123e66497c3391f0a38ff8d3bf77313b6ce4978971a7ddb1d93ac674a1ce78ad4e464e0348be844e9a93874e1d5caee386688c6606bf9029916bc3511c3845 SHA512 062d32925e6cdc2357c3c4c170a96fc4a6f6e4577914abaf6f12034c6d90aeb6ac4c0c6d3632198d16d90c4623f9ccd79fa92f09a30033573185700633ba91e0
+DIST github.com-kubernetes-kube-openapi-0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803.tar.gz 152390 BLAKE2B 698257243a783c64f8f77ae75689f229da583f9250454c1ee8493b09855ea4ee3fa454eaf66721f07e4043cd2d69aa45ded6446aab5a05e84403f7c81c5b5f1d SHA512 c3b94136a2010163d073dd1799738711a0c86502766ec22bad8d595373db38ee955fd9ddffb9aede50866e9656fbfb5c5d8ceb87f6fc7b26b38b679854db0ec6
 DIST github.com-kubernetes-kube-openapi-39cb288412c48cb533ba4be5d6c28620b9a0c1b4.tar.gz 88363 BLAKE2B 32330bc4a8c31e21662ebff637eb3f9594db2f22e824c7b90437b6bb54708227b3c9b25deb077972b18f0d63014fd5feda609f790cd578a5cc4b53fb30109412 SHA512 b28d72a7ce8229da2bca4a4d35d951fb383035e54ef7c1ad1669ccde546040f39f9b1024d9bc9eed9f56517e91c3c8b8c6b61fa49f938c13169ddabfe9862ff8
 DIST github.com-kubernetes-kube-openapi-50ae88d24ede7b8bad68e23c805b5d3da5c8abaf.tar.gz 88141 BLAKE2B e96d61f9c784e4428723d1dc28315f2400cdc2102b10178c8a93cbb4fa56e1b07f5a34671bc75e17d5d028ecb0b0661abec6edb86ab33e385b72388ba593cd24 SHA512 37aa7397a8ff203ba53931f19b676c996e3712145f1729ba8a1b7981295049783912d49ce83bb932ccd0ffadd4d1ebe727a1b7118f4d411b44148ef649d26ad6
 DIST github.com-kubernetes-kube-openapi-91cfa479c814065e420cee7ed227db0f63a5854e.tar.gz 146098 BLAKE2B 8ff2408c61978a3e0770cc63a4c5980e617c46c054337fe6faaf969598bf9fdb7680f0e45bbb0fc097287fe0b511a43eabcca8dc095db590887f4a6ab8ddb247 SHA512 28937579b01666c5bd00fe09a360b414e8cfce0a3355043e164cd349bc0c86c8112ef3c2ab9b7aae359b9ac690b08cc9a815e0371aae72be9d4ed0691d252ac1
 DIST github.com-kubernetes-kubernetes-2e809eed16445fff9dcbfc56e9936cf76ccbdadc.tar.gz 24794071 BLAKE2B bd7d4382708f8ae0da7469a22959c43f317dca62bf4035b8f2e1ca86913989f3455f9623789c89d660ea2bf31d90f2f5ae3358ccc32c337b51c13759d2b8f691 SHA512 5a713ea0c3059f6cd66d918dd5d9f90805dbc5e1f54a4b40a58d2ee5c2794cc1328df72f6a3e2aa198ff526e3d7df58b376b2c139c444f36be46d168e7b1bade
 DIST github.com-kubernetes-kubernetes-32ac1c9073b132b8ba18aa830f46b77dcceb0723.tar.gz 25047883 BLAKE2B efbd9c495139f9711167491b16339edfba653ae84c6c5957bb6e8070f60b7029be6aacceffe202f44dc4519676fe34e0d191bf8a15794db31d43fe067cb48955 SHA512 061eaf34bfc6d9af8bc129b8a8736f3c66b3826307d334ddfc221dcba453ff92a18c0e79ade7b2c5112caabe3bdaf4c473b3b5ba831ee5860ecbb20959ee7f3f
+DIST github.com-kubernetes-kubernetes-54a352dda957bce0f88e49b65a6ee8bba8c0ba74.tar.gz 28028095 BLAKE2B 4b7bc8ff29f61b63e99f8dde77fe0f3230adb6bca9baaec62a170ad0d0ab5afc49a004d2538d1b1f6d6bf81987631eadd686e39d287b488a20661f390e03351c SHA512 6930c85ada9e1499ce194755c7f35b92f9b081cbd1af0ee0bbc35367f2f9e5f92f53bf49c808f3156b4144b646b3feab8dad6860d28ef704efe6f743470239ce
 DIST github.com-kubernetes-kubernetes-a22f9fd34871d9dc9e5db2c02c713821d18ab2cd.tar.gz 24697736 BLAKE2B 8d735570cdb30bb3d833fabb6a6f5c7d5d458ddbfc5d3b5b6f40748129aca13878ad3cfccc70d6e601f62233b88be2f5b040ac535e0971e1c2a3ba1b87f69f4f SHA512 06d05f214c5d6a839f04eef655f66b225af8fb32d514e7b81d75d5f7656de418e8ce3d91a3acb860f1aaa6b64570843f516be9f59d0a5cd4ed955b340debe6af
 DIST github.com-kubernetes-utils-258e2a2fa64568210fbd6267cf1d8fd87c3cb86e.tar.gz 13868 BLAKE2B 7ea71fd390a6b800e5a9e37ef36e5037ed5a68b0da8a4e50d280d12c2ba5a612ea257784dd70f5cf37a2903e086c6e7a197d31426d8be2e7f5f1caeec1558b16 SHA512 f354db283ae2190116afab2d4e13182f232e881ea43f50d2a1fa3e4e950e29b065db760a01e0f9a19e74753f3b12c619fbcd21e3a766a553612b4a1418f292c9
+DIST github.com-kubernetes-utils-66066c83e385e385ccc3c964b44fd7dcd413d0ed.tar.gz 15766 BLAKE2B 0f38b77113a1a8cf963cf5e44d1594d4b08b8c71519b41c86ebc2d3b7f234785493510a8cb678775e5a9ca2ee0ed248efba5774eb10750d18ee939cc64c7f074 SHA512 2bd4e85b36949070f8a8d2d73a43ae8a91617fd395de57ac7b40bc20b7cb4b35185ce3a3d1b333152ee0f3415a5d8e2eb806b168f5d07b934e20cbf6d9fc5c12
 DIST github.com-kubernetes-utils-aedf551cdb8b0119df3a19c65fde413a13b34997.tar.gz 13650 BLAKE2B 7ef52334585300d4faf98a02324380ba5dcdaf708b8027ca9fdae43d0b0a43c5d495162f1e69d4f9f9b8dbc2e22dfaefd66eb479bace78bbbfcf84145613c174 SHA512 91f525cc68ec01f394da926eb3fcd7bd95b62609721c86f22c02d852b42913eba659a97bb9ceb19f4b6aab5a967e5f385d732b81284871c82c740fb102a09368
 DIST github.com-mailru-easyjson-2f5df55504ebc322e4d52d34df6a1f5b503bf26d.tar.gz 70478 BLAKE2B 19c135401f34f8a8285c8bc315e6197c156de85fe9f4e65de7b71fbb73e37d57031915c2632930d5e76bf01e9038ba380150bdc78ec2cdac959e2cdb9571bc11 SHA512 319a7bd61ae490353a939a412dd00ffed9b6acd55bb739e8c259caed7904ec3407493888798addf89a15474053e125abe8818618240a55402b4351270cebfbdb
 DIST github.com-mattn-go-runewidth-d6bea18f789704b5f83375793155289da36a3c7f.tar.gz 5884 BLAKE2B 62f6d7217043f77a41e038c3f69c4fd20f71a9b203b29946b7dea5b9ddbcbb08b83ee40533c73cea681700c04ce2f15361eb43f6c9e86bff85318792e12f0968 SHA512 15e7ccac112c78e4fc8fc06f32c6b5864a945b0cea885856f12ab694020adef0af92b0f6a0d5e873891c3f68dfa0dae4c1f2de1ac7946ce570b155e6c5286d84
+DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 BLAKE2B b3b007f925a4a1c1862c8cbe34c5cd225dfa610ad8c56b5328e6920a44b507680daeea97209370bd6b259654d0ca5791f4bcc54b8bd8970b9aaf994eada16d4f SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d
 DIST github.com-matttproud-golang_protobuf_extensions-fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a.tar.gz 10642 BLAKE2B 696045c7d91f5804c22d8c0872969e91d5a32117ea9b237647ce42402c1a8d224122f638ad938a5ba34225e622e3d391214c51d9ba4f4e5b5e915fed2ef0ff59 SHA512 05d0db955a67565d1bc986ef4ba0f403704e8a1aab01648ac2fead1f01153691c6583644c95c596172e36a7d3546cb9461e0d3c2791df4aba208f1fae2d71fec
 DIST github.com-mitchellh-go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8.tar.gz 2740 BLAKE2B 10127381356aff4d25d3b5da3d2db5f4565c8e5c4e16ffae18e481fcedc0616039cf3907fdb3c204d5f743bb5163bf437d549dea9fd46cc9141d8ef88cb36e21 SHA512 39cd6786782e3a29ad448db3ec815a6da029bc22fbe543fb04e0e869d8b4a698f20434bb24c09bd18b5d2cdb992fc28e21b7ae16b3e585412cede7b4eed2b26c
 DIST github.com-modern-go-concurrent-bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94.tar.gz 7527 BLAKE2B fe191bd398bbd1beac3de9a69b54b04e01436347f0f8933b8eb189dcafaf3d68bb76d6d738f5532e5e9d8e1631ef4d3785a110b69856c4e11d811b80dc31f19c SHA512 bca1593dea7cd004a0191420ccad56cffb91bc5523434f50920ce25c2ee82dc6a756e2eefdcee94ae0bb403fea881e42bf403d6218d6169f30dc9288e72d1c36
@@ -108,15 +127,23 @@ DIST github.com-shurcooL-sanitized_anchor_name-10ef21a441db47d8b13ebcc5fd2310f63
 DIST github.com-sirupsen-logrus-89742aefa4b206dcf400792f3bd35b542998eb3b.tar.gz 28245 BLAKE2B 2f37d14ee529db80301ffcc2c9c88e18cb21b0398333e5528494d143006ec9adc1ceac31d0de3ad30c30c442354220393fccf13fec251ff2cb27994435242f87 SHA512 85023d0442b05ac280d67f43443cbbd40cd4e21da10a6fc9f6f9395fc53e730c73591c9f5a74b910f4190fd8f52843836049ab62fc388bfd8e60338cdb1297a5
 DIST github.com-spf13-cobra-c439c4fa093711d42e1b01acb1235b52004753c1.tar.gz 100898 BLAKE2B cedfc2121e6bc7d42c16cddf48979bad9b5a6910249a0daa274b2e00227f236c1ba42d93d7892418c91afbb0e83469e938669c96074bbb4e3e7f76c9e85e914c SHA512 3bec9d9895efb6d4a39a3aa1893b450f93336540d974514255def8e6c5aa847ebb5ffb05d744235706ba4deebd101243eeec30c8b009991dca77e3684ba5880f
 DIST github.com-spf13-cobra-f62e98d28ab7ad31d707ba837a966378465c7b57.tar.gz 71311 BLAKE2B f908877fb77bbc63a213647f068966f771cc2d299fad21da2b7b096b3253102c9f334f8709960a33841a2b441fee2b9ddb23bccd1fb745268fa41303b25b50f2 SHA512 69ed1d5202af46c685821b914f8ca8bc77b9bfbcfb68a2f388f141d35fc2e673f27bf99d5f9dff285f974a363aa0f3fed1eaacb19910dca080c6e1fa388dcb38
+DIST github.com-spf13-cobra-fe5e611709b0c57fa4a89136deaa8e1d4004d053.tar.gz 102553 BLAKE2B f95eb665a52c1819bce2ba8ae05d9b5a3f0e27941af8ced5245d088840f605924abd17547fe51a0c0ed07ca2e28267be600c6e1fc95abe507dc53b7f7ce41e65 SHA512 c7adb5e8fe32aa0b8ebe85449e14bd57f00c60170f41167bf80710d32e83cc4fe37635a3c2b4ff49b2275050b749365c2aabf105ccdbf37bdb4bd251f14f1925
+DIST github.com-spf13-pflag-298182f68c66c05229eb03ac171abe6e309ee79a.tar.gz 46092 BLAKE2B b1e4bbebcdfd2bed394e0b1e93f47951c29a8b6c4b9e5435c73b34f18648ca8ac6d51e6c664dc41310f0b953c4f4d2cded88f43a27312f42d394e7e699cfb8ff SHA512 1e1ca10d2d42aacbf0da8d62dd786c024c86054212e1531ea7bbebe7ead1aa9e47646ec19d8895b6d3914da8b98dffad17fdb207bb917a9e19c9d777b9de6c96
 DIST github.com-spf13-pflag-583c0c0531f06d5278b7d917446061adc344b5cd.tar.gz 43327 BLAKE2B cc00d2852d895265eb0b60454877da841fe123535009025c761761c61b4d937d6293f3bef765d2a8919d63d8324dcb6addf774837df26fb864cb72d88add2d03 SHA512 061b9895e3936e356f707385ed7d7e5172f94167a1fabc84e9a0a69df4f03e0eaf435a4ac0cb00f5077855987ab1d2c3b051846c0466485a7bc329a547dc3d3a
 DIST github.com-spf13-pflag-9ff6c6923cfffbcd502984b8e0c80539a94968b7.tar.gz 38921 BLAKE2B d09e3cfc1d9f7fd97e806633ecab4089d16529b74d90a968b46a70ac70b3a1e8a47adf3a891510f7b14d46fad1ae92e4912fa86042e808c7a31022e3e4be928c SHA512 38b1c4b1526953db9e4f674a7d9eef68864c4feb7bf8a2b816e3ea9908200770650552fc9b15a5ab436904818c4893e13761a942164ccb650ce56e86c432d5b7
+DIST github.com-square-go-jose-89060dee6a84df9a4dae49f676f0c755037834f1.tar.gz 289746 BLAKE2B cff786ac7a6c39829ffd4d7b7f0fac3893b7c469ca35f008558ca3a7dbfc376fd0166c8ed7becc73d0f8d67b456ca00104f08c8841ff156a9c1f9a6d68d3b25f SHA512 fac5e8d32f93f252b2e64d60f2e4da65a11e9408ac4db0afdb3f2357a814cb3992ade307bc8bec8799703c0cb63d05f7d4eaa19e13bab6402b50c1cd246bc50e
 DIST github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz 278276 BLAKE2B dfb467b318f0a6661c5ae910f32bc5337d9677ff60b55dea4706193b4acb815f7e087debc92cf9347ae54db13f512c4a2dc1cc05ea031201bf119caaffa6c6e7 SHA512 4230ba34fe8f45ed7e4a0f7ffc60781b1b4fbaa6877212a8d5ab5a8b088d0d3151f76868929e270c5ca71769ae366976a25de65716e8c0e6289a4f720055f02f
 DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613
 DIST github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz 7897 BLAKE2B a2b6f62fea8cb724ebbc9658e37985ed27fd1c395a838b6f8f89bc3e05106cd3e89b86753223bccc50de210461c89b01d8e3095ae1c6dcb6bc9a655c462981f0 SHA512 460b1cbef7d5236b099a67b27e902f9077fd42d6aa3772c13c1c3ab20fca87719a770478a068bf150e1224612fe4e1eadb1ec7cdfa60ca9cc81e3f6de62ee9c4
 DIST helm-2.10.0.tar.gz 1158857 BLAKE2B 942474eacea109559baaa9d83d023b746ba0ec8943c3dd0a6ce6a338b2859bd585431ce5521c47f39b43dda7d8edefa84d8365abbc2463a6b69290881fb5f20a SHA512 a1fe5db8f7de634a06de6410227bc1387709e0401997afeba0d36f003dcc26df24020e420cb766fe81be40bddeda8ef4ba103345ddfc191f5e43a40016055cfb
 DIST helm-2.11.0.tar.gz 1169696 BLAKE2B b4736e5d4cf7d16406c7b1544b0f1960295d90651b1028968c98f03fc515c13cd0151a495b5ccdc2b251585b71faad32432b1aeda4b68304e01363ae2a0005a2 SHA512 1b769f969010ee8df5d0ab0f169ead3ba8c3dc6838fbc608122ce133bdf9b978fbef0e698f594c2ad6e39e5e8a5c1f8d24ecc7e5d58495e2b9a6bf179fd73669
+DIST helm-2.12.0.tar.gz 1177781 BLAKE2B 2fba13bbd813c356ca94b8a89b2eabd1e61bc3c7f80a5fd1cd8bd9c62f5ad8a3fb8b5516221736534900c91f20442938d4f9d22ad2276bd1f3709a1a779c86e9 SHA512 773d9a95c305a832f63745dc3a5ffde0db5727b24bf9118768c7ecc8bb0ffcaced4016243e74bcca12ce0ec38aabcb4db78d7ef9af1205f014e524c090bdf98f
+DIST helm-2.12.1.tar.gz 1177575 BLAKE2B 804a908659ab5b3f1cdbe116251743281f9e441aed6dfcb45786672023d9cee0200141a59f02c22090f6466f6fbf611db6120e63981d784d3207f5507cf9e216 SHA512 1396bddb5ede097ec11e6e175de91f8d65304beb161d6cbf3c16b341ab22b851c79c9e599248379f771777a728ac2b930c995862f7232bb6f9c753f092d9b0b6
 DIST helm-2.9.1.tar.gz 1136941 BLAKE2B 57e319df56d60b1285df99ee6c0213e9700b80aa4117f11ab3e37493d552481875a42acd200d2183c2e587dc13130b9c47cbacee7dd7bfeaaf4dc9bb0a17dcc5 SHA512 c9830ae3de76e219dc4effad749fa6f80d24f47f034bd7150afc5817700947b678db64a0889fe1e3c3c69ed0932933ebf9bb893c065d7d77c2953190ab15b033
 EBUILD helm-2.10.0.ebuild 8581 BLAKE2B c105833befb257b27c705a686dde12efddf42124029483f55e12ae9834c73b62a5e5cf349f97a784eb386afba8a7626e506b5528f84654a7939e50165c838a9c SHA512 94f49188dc838f1daff6bab1df8671403d63776e8d593d973494dbd48acd7bbd2be36b39425cc3f50b0e4c43316fa5f52dca19e67c0723824c52834c367844a9
-EBUILD helm-2.11.0.ebuild 8665 BLAKE2B d65c89eece40baf665243cea60d8a6fb69fdea07edcad5921abd5392b98c314c1b0945bee7ca500026d6074f83e83eab006a5362a45d66283f44dbd18d623a40 SHA512 09c6bfe5f33ddb90d1404028abdfec667167fb03093e1dbc9ef82f759136fa9c22e191ca0a5d36e4399a42c6cb73cbe240a847e0111699ee2b836de85f797386
+EBUILD helm-2.11.0.ebuild 8664 BLAKE2B 1f96b30970ae755a77bcccd9537cbca09f5feaa425ee467e174a60af316fdce1fab83ba0804f44777800a57e31e21b7f293324a55f3ee802700eefc017d25adc SHA512 9c1175849fb4018be2801ee45375cd763f05de4786ad0854ba60fbca4eea8d85fd00c350ef979e97a4da1e11d02f2ad3768b92e072c206b0b533cbc159f068bf
+EBUILD helm-2.12.0-r1.ebuild 8836 BLAKE2B 34d955411afc03034bc47a82b91ec6f1db514ff5a778bd3245b317dcf35657b277a5f11a0982714c582d3d6a6f4ebf53b061b41dfa4f55c8dad4834664104c11 SHA512 745110a9a9f537cd58ad9b47bfc5cfb61a59a4889235a597940d9189bbb31317d68fae5247a167e81e0471502c5a267cb94e82f9786a4bbc8291f467781027ea
+EBUILD helm-2.12.0.ebuild 8761 BLAKE2B 3c79c0c4e2acc4579aba7f71aef356bdd19184f269024200a5ea7f27aa1fb959041e90801c972f1109182d60da9a839c27ef486a4defbbdf09135c8a278e3c04 SHA512 2c07389e4877dd4ad14effe8eb2d7498dee8de7ddc6d22829b66d135c58044b4f83485ca1d1293c87ea97209de21b01f4cf55577c2115b5d3d9435965740bfed
+EBUILD helm-2.12.1.ebuild 8844 BLAKE2B 42d281c3027c1f534cf75448e268b7b7ddebe5b5d358015d647b523d7f559b4882f19a380c6e0525755a9a9615242b1f4ded87ff64ab263c50cef580b376e32a SHA512 20ae8c99e0e7ee2e2b81ec2191b445703c1130bb91bfc588c325ce6c9668a366ebe5a73a3673d97ad73089362f80576f2b09677e60987eaa4a576626cd46023f
 EBUILD helm-2.9.1.ebuild 8410 BLAKE2B 266d13ec9488fbc344e29c577238d5980d10a8c6094cb6f41c6127065ff7b899bc609b530bc0cd87816d71424492c87634848ce26002954a09fe60aa99578e42 SHA512 b21df5a0c6f9a1d13404a128c1466301848216386c74e143a04f1567bac648efaf727d22ac7cdb1a943c8edcdaa3ed3b5cc440c8cd664ddaab803514b4ba44c8
 MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
diff --git a/app-admin/helm/files/helm-2.12.0-sorting.patch b/app-admin/helm/files/helm-2.12.0-sorting.patch
new file mode 100644
index 000000000000..560768049fde
--- /dev/null
+++ b/app-admin/helm/files/helm-2.12.0-sorting.patch
@@ -0,0 +1,90 @@
+From c9a5b0bb49b91a463c0021dd5dbe9626e2d3bb11 Mon Sep 17 00:00:00 2001
+From: Filinto Duran <duranto@gmail.com>
+Date: Fri, 14 Dec 2018 10:20:57 -0600
+Subject: [PATCH] fixes #4728 problem that arise because of the zero value of
+ unknown and the loging of kind_sorter this messes helm template when having
+ unknown (ie NOTES) or other files and the sorter catches namespace
+
+Signed-off-by: Filinto Duran <duranto@gmail.com>
+---
+ pkg/tiller/kind_sorter.go      | 13 ++++++++----
+ pkg/tiller/kind_sorter_test.go | 36 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 45 insertions(+), 4 deletions(-)
+
+diff --git a/pkg/tiller/kind_sorter.go b/pkg/tiller/kind_sorter.go
+index 8aff4e6c11..7df63c6ac4 100644
+--- a/pkg/tiller/kind_sorter.go
++++ b/pkg/tiller/kind_sorter.go
+@@ -124,12 +124,13 @@ func (k *kindSorter) Less(i, j int) bool {
+ 	b := k.manifests[j]
+ 	first, aok := k.ordering[a.Head.Kind]
+ 	second, bok := k.ordering[b.Head.Kind]
+-	// if same kind (including unknown) sub sort alphanumeric
+-	if first == second {
+-		// if both are unknown and of different kind sort by kind alphabetically
+-		if !aok && !bok && a.Head.Kind != b.Head.Kind {
++	// if both are unknown
++	if !aok && !bok {
++		// and of different kind sort by kind alphabetically
++		if a.Head.Kind != b.Head.Kind {
+ 			return a.Head.Kind < b.Head.Kind
+ 		}
++		// and of same kind sort by name alphabetically
+ 		return a.Name < b.Name
+ 	}
+ 	// unknown kind is last
+@@ -139,6 +140,10 @@ func (k *kindSorter) Less(i, j int) bool {
+ 	if !bok {
+ 		return true
+ 	}
++	// if same kind sort alphanumeric
++	if first == second {
++		return a.Name < b.Name
++	}
+ 	// sort different kinds
+ 	return first < second
+ }
+diff --git a/pkg/tiller/kind_sorter_test.go b/pkg/tiller/kind_sorter_test.go
+index 1c187e90d5..823d9674ee 100644
+--- a/pkg/tiller/kind_sorter_test.go
++++ b/pkg/tiller/kind_sorter_test.go
+@@ -223,3 +223,39 @@ func TestKindSorterSubSort(t *testing.T) {
+ 		})
+ 	}
+ }
++
++func TestKindSorterUnknownsWithNamespace(t *testing.T) {
++	// a.Kind=Namespace should win over b.Kind=Unknown even if the a.Name > b.Name
++	manifests := []Manifest{
++		{
++			Name: "a",
++			Head: &util.SimpleHead{Kind: "Namespace"},
++		},
++		{
++			Name: "N",
++			Head: &util.SimpleHead{Kind: "Unknown"},
++		},
++	}
++	for _, test := range []struct {
++		description string
++		order       SortOrder
++		expected    string
++	}{
++		// expectation is sorted by kind (unknown is last) and then sub sorted alphabetically within each group
++		{"Namespace,Unknown", InstallOrder, "aN"},
++	} {
++		var buf bytes.Buffer
++		t.Run(test.description, func(t *testing.T) {
++
++			defer buf.Reset()
++			m := make([]Manifest, len(manifests))
++			copy(m, manifests)
++			for _, r := range sortByKind(m, test.order) {
++				buf.WriteString(r.Name)
++			}
++			if got := buf.String(); got != test.expected {
++				t.Errorf("Expected %q, got %q", test.expected, got)
++			}
++		})
++	}
++}
diff --git a/app-admin/helm/helm-2.11.0.ebuild b/app-admin/helm/helm-2.11.0.ebuild
index f20995dc61ff..1fc185c48625 100644
--- a/app-admin/helm/helm-2.11.0.ebuild
+++ b/app-admin/helm/helm-2.11.0.ebuild
@@ -106,7 +106,7 @@ GIT_COMMIT="2e55dbe1fdb5fdb96b75ff144a339489417b146b"
 
 ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Kubernetes Package Manager"
 HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
diff --git a/app-admin/helm/helm-2.12.0-r1.ebuild b/app-admin/helm/helm-2.12.0-r1.ebuild
new file mode 100644
index 000000000000..5b6f4c2c330a
--- /dev/null
+++ b/app-admin/helm/helm-2.12.0-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+MY_PV=${PV/_rc/-rc.}
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
+"github.com/Azure/go-autorest bca49d5b51a50dc5bb17bbf6204c711c6dbded06"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
+"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/docker/docker a9fbbdc8dd8794b20af358382ab780559bca589d"
+"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/evanphx/json-patch 36442dbdb585210f8d5a1b45e67aa323c197d5c4"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 1de3e0542de65ad8d75452a595886fdd0befb363"
+"github.com/go-openapi/swag f3f9494671f93fcff853e3c6e9e948b3eb71e590"
+"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d"
+"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
+"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/json-iterator/go f2b4162afba35581b6d4a50d3b8f34e33c144682"
+"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
+"github.com/Masterminds/sprig 15f9564e7e9cf0da02a48e0d25f12a7b83559aa6"
+"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
+"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
+"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+"github.com/modern-go/reflect2 05fbef0ca5da472bbf96c9322b84a53edc03c9fd"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
+"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
+"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
+"github.com/spf13/cobra fe5e611709b0c57fa4a89136deaa8e1d4004d053"
+"github.com/spf13/pflag 298182f68c66c05229eb03ac171abe6e309ee79a"
+"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
+"golang.org/x/crypto de0752318171da717af4ce24d0a2e8626afaeb11 github.com/golang/crypto"
+"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 95c6576299259db960f6c5b9b69ea52422860fce github.com/golang/sys"
+"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
+"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
+"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/square/go-jose.v2 89060dee6a84df9a4dae49f676f0c755037834f1 github.com/square/go-jose"
+"gopkg.in/yaml.v2 670d4cfef0544295bc27a114dbac37980d83185a github.com/go-yaml/yaml"
+"k8s.io/api fd83cbc87e7632ccd8bbab63d2b673d4e0c631cc github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver 05e89e265cc594459a3d33a63e779d94e6614c63 github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery 6dd46049f39503a1fc8d65de4bd566829e95faff github.com/kubernetes/apimachinery"
+"k8s.io/apiserver e85ad7b666fef0476185731329f4cff1536efff8 github.com/kubernetes/apiserver"
+"k8s.io/client-go 1638f8970cefaa404ff3a62950f88b08292b2696 github.com/kubernetes/client-go"
+"k8s.io/cli-runtime 79bf4e0b64544d8c490247abae089bea572ddae6 github.com/kubernetes/cli-runtime"
+"k8s.io/kube-openapi 0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803 github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes 54a352dda957bce0f88e49b65a6ee8bba8c0ba74 github.com/kubernetes/kubernetes"
+"k8s.io/utils 66066c83e385e385ccc3c964b44fd7dcd413d0ed github.com/kubernetes/utils"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="d325d2a9c179b33af1a024cdb5a4472b6288016a"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	pushd src/${EGO_PN} || die
+	eapply "${FILESDIR}"/${P}-sorting.patch
+	popd
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+	popd || die
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN} bin/tiller
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-admin/helm/helm-2.12.0.ebuild b/app-admin/helm/helm-2.12.0.ebuild
new file mode 100644
index 000000000000..4af765722dde
--- /dev/null
+++ b/app-admin/helm/helm-2.12.0.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+MY_PV=${PV/_rc/-rc.}
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
+"github.com/Azure/go-autorest bca49d5b51a50dc5bb17bbf6204c711c6dbded06"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
+"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/docker/docker a9fbbdc8dd8794b20af358382ab780559bca589d"
+"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/evanphx/json-patch 36442dbdb585210f8d5a1b45e67aa323c197d5c4"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 1de3e0542de65ad8d75452a595886fdd0befb363"
+"github.com/go-openapi/swag f3f9494671f93fcff853e3c6e9e948b3eb71e590"
+"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d"
+"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
+"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/json-iterator/go f2b4162afba35581b6d4a50d3b8f34e33c144682"
+"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
+"github.com/Masterminds/sprig 15f9564e7e9cf0da02a48e0d25f12a7b83559aa6"
+"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
+"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
+"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+"github.com/modern-go/reflect2 05fbef0ca5da472bbf96c9322b84a53edc03c9fd"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
+"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
+"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
+"github.com/spf13/cobra fe5e611709b0c57fa4a89136deaa8e1d4004d053"
+"github.com/spf13/pflag 298182f68c66c05229eb03ac171abe6e309ee79a"
+"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
+"golang.org/x/crypto de0752318171da717af4ce24d0a2e8626afaeb11 github.com/golang/crypto"
+"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 95c6576299259db960f6c5b9b69ea52422860fce github.com/golang/sys"
+"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
+"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
+"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/square/go-jose.v2 89060dee6a84df9a4dae49f676f0c755037834f1 github.com/square/go-jose"
+"gopkg.in/yaml.v2 670d4cfef0544295bc27a114dbac37980d83185a github.com/go-yaml/yaml"
+"k8s.io/api fd83cbc87e7632ccd8bbab63d2b673d4e0c631cc github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver 05e89e265cc594459a3d33a63e779d94e6614c63 github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery 6dd46049f39503a1fc8d65de4bd566829e95faff github.com/kubernetes/apimachinery"
+"k8s.io/apiserver e85ad7b666fef0476185731329f4cff1536efff8 github.com/kubernetes/apiserver"
+"k8s.io/client-go 1638f8970cefaa404ff3a62950f88b08292b2696 github.com/kubernetes/client-go"
+"k8s.io/cli-runtime 79bf4e0b64544d8c490247abae089bea572ddae6 github.com/kubernetes/cli-runtime"
+"k8s.io/kube-openapi 0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803 github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes 54a352dda957bce0f88e49b65a6ee8bba8c0ba74 github.com/kubernetes/kubernetes"
+"k8s.io/utils 66066c83e385e385ccc3c964b44fd7dcd413d0ed github.com/kubernetes/utils"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="d325d2a9c179b33af1a024cdb5a4472b6288016a"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+	popd || die
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN} bin/tiller
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-admin/helm/helm-2.12.1.ebuild b/app-admin/helm/helm-2.12.1.ebuild
new file mode 100644
index 000000000000..72263dddffc5
--- /dev/null
+++ b/app-admin/helm/helm-2.12.1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+MY_PV=${PV/_rc/-rc.}
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
+"github.com/Azure/go-autorest bca49d5b51a50dc5bb17bbf6204c711c6dbded06"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
+"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/docker/docker a9fbbdc8dd8794b20af358382ab780559bca589d"
+"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/evanphx/json-patch 36442dbdb585210f8d5a1b45e67aa323c197d5c4"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 1de3e0542de65ad8d75452a595886fdd0befb363"
+"github.com/go-openapi/swag f3f9494671f93fcff853e3c6e9e948b3eb71e590"
+"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 781450b3c4fcb4f5182bcc5133adb4b2e4a09d1d"
+"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
+"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/json-iterator/go f2b4162afba35581b6d4a50d3b8f34e33c144682"
+"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
+"github.com/Masterminds/sprig 15f9564e7e9cf0da02a48e0d25f12a7b83559aa6"
+"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
+"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
+"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
+"github.com/modern-go/reflect2 05fbef0ca5da472bbf96c9322b84a53edc03c9fd"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
+"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
+"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
+"github.com/spf13/cobra fe5e611709b0c57fa4a89136deaa8e1d4004d053"
+"github.com/spf13/pflag 298182f68c66c05229eb03ac171abe6e309ee79a"
+"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
+"golang.org/x/crypto de0752318171da717af4ce24d0a2e8626afaeb11 github.com/golang/crypto"
+"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 95c6576299259db960f6c5b9b69ea52422860fce github.com/golang/sys"
+"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
+"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
+"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/square/go-jose.v2 89060dee6a84df9a4dae49f676f0c755037834f1 github.com/square/go-jose"
+"gopkg.in/yaml.v2 670d4cfef0544295bc27a114dbac37980d83185a github.com/go-yaml/yaml"
+"k8s.io/api fd83cbc87e7632ccd8bbab63d2b673d4e0c631cc github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver 05e89e265cc594459a3d33a63e779d94e6614c63 github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery 6dd46049f39503a1fc8d65de4bd566829e95faff github.com/kubernetes/apimachinery"
+"k8s.io/apiserver e85ad7b666fef0476185731329f4cff1536efff8 github.com/kubernetes/apiserver"
+"k8s.io/client-go 1638f8970cefaa404ff3a62950f88b08292b2696 github.com/kubernetes/client-go"
+"k8s.io/cli-runtime 79bf4e0b64544d8c490247abae089bea572ddae6 github.com/kubernetes/cli-runtime"
+"k8s.io/kube-openapi 0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803 github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes 54a352dda957bce0f88e49b65a6ee8bba8c0ba74 github.com/kubernetes/kubernetes"
+"k8s.io/utils 66066c83e385e385ccc3c964b44fd7dcd413d0ed github.com/kubernetes/utils"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="02a47c7249b1fc6d8fd3b94e6b4babf9d818144e"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	pushd src/${EGO_PN} || die
+	eapply "${FILESDIR}"/${PN}-2.12.0-sorting.patch
+	popd
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+	popd || die
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN} bin/tiller
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index 9badeb4ccd09..5d9961228423 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,5 +1,5 @@
 DIST lib_users-0.11.tar.gz 25660 BLAKE2B 8f5a827840d4074a0e8abd77e43f60eb09f199f58a2bde0c2bce7613d6ba1d9b12dd46adffa528ff351f54933c304f274abef9c35550d7af3519101dcec69d0a SHA512 a54fc8f57cffcd08e77e86eaf50ec6e68e45e1e9458e25e035af90e14be13980a400c4d264f70ef67e141e1d54581b0487b2b70dd084dc5840424221b46f644a
-DIST lib_users-0.12.tar.gz 25688 BLAKE2B 415e3d387360c0e3a3d27ccab8e5a861ea41fceaefa756aa116266f5449856c51a4a7ec650a8665e73d3a74a9973662ea693308a0636fbd7fb8b5dd57dffea35 SHA512 cdd55fe971845be30fb83156c335bbb8d63815fe3b3f62b9689a7c68f402e89ad5b9c0ff805ed57766a5e5fcac598bc6fa1dc36cf65997ab495675d726304847
+DIST lib_users-0.13.tar.gz 25704 BLAKE2B 895f8b721216339fe4306158bf6282353d79584573091cc4e7c63c8096a9f9cfe380a8bce7229f168e44fe5d3641ceb8c91bd751316a6c6a467ace4ec0dce723 SHA512 588af7068728810832bcf4d1526f271e255d07c75d152fb41844c66f3598a71e9a96bee3426b31b58cd26af889bc42c0a7248731fdfe3623fd4567d2b6b7275e
 EBUILD lib_users-0.11-r1.ebuild 1121 BLAKE2B 3033063c5a98e867590ce0d4eac740ede458cb2ec5abb00ae8f55afa405e1d6e811ea1b0e71d9f80cbe91fad32128a0bc3cb6242d510f733e1c176fe1ce7b952 SHA512 6e14ee67829db95b0441ea159368aaba00174d7523fe8bac7f5c023191638325c93059c2b46ec7a866b000d9ab4210366ddad8e3dbed1a1159e83527afa03b08
-EBUILD lib_users-0.12.ebuild 1127 BLAKE2B 31a0e8bf4947d7b3a400db305ff513907b676a6b1be57ad1a69190db52ad944b94738866294d6cf679d5078e8df3e06685e2fb9cf617b192798ee10146a4408e SHA512 fc254dc1979cccd40f2ca494a7f8c7646299fade0889bb52b2a61f6b7b9880de076370db98f0b207152f6b72898ee97ad4099bcb753f4eb6a7b25ecc7ba20bef
+EBUILD lib_users-0.13.ebuild 1124 BLAKE2B 42403c90651b0a713e112e5999e36f1ae163204232b163bebb01f9db485125ae5d2a1cea4a423cad44c8da9bd309f577ea4bbb12a48da8737f9b0fc39c09e1bc SHA512 cac7c83c5e6e105566fc6dcced8a7f634a78a616ddf25e0245f68077e02047649f7996549b10d7e717a14effed644b4c1d3522f4898bd21bfbf0848c35e08e8b
 MISC metadata.xml 454 BLAKE2B c545fd1db330988ad139de08b1890cfd9d6aac98947b954fb761515d314d8ebb941829e7767fe4fad6beb41caf3409111505d1a6378c852f15907933678ddd48 SHA512 c897ea5b6bed9fcc8715380a1b2756f376a095925a2c99a78ce6729cc9839683f40ce53f5faf0fb784169db5ef9162f1659ea6f24304bcc7cd47f90d49ec97dd
diff --git a/app-admin/lib_users/lib_users-0.12.ebuild b/app-admin/lib_users/lib_users-0.13.ebuild
index b1a72eed7a53..1abf202a755e 100644
--- a/app-admin/lib_users/lib_users-0.12.ebuild
+++ b/app-admin/lib_users/lib_users-0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/localepurge/Manifest b/app-admin/localepurge/Manifest
deleted file mode 100644
index 7f54c93b3fa4..000000000000
--- a/app-admin/localepurge/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX localepurge-0.5.4-directorysum.patch 726 BLAKE2B ededf92eb7b11dce7b1b7a46ce879f180ccfef64d2b6e503391350d32af7e502f0ebf27341f3e4345e0d944184e291b8df12daf0d863af9c11126b30dda309a1 SHA512 2b7c2284d26ad2ab254faf9c976ee2d53e0b5e46bf3696164e21772304ae28a8de13662099f492146674e50a8dfc49b799a4be25a3e8e0c42a6e47a085dfd522
-AUX localepurge-0.5.4-evaltotal.patch 289 BLAKE2B 05029aebc3e5a808b42188f0759b45c5bff534dd962374986fb49e7713c70353e7607c91ef8e045f89185dbc6cd24b672824c53e3f7b9f8b096843e1f8c40390 SHA512 d3326631ada71ed930aae1b7e9338fdff2e216d9130a735b431d37f0da5691f087d57e8cb5851b27514a43bf5b00cf3881e1e02f5d8899da186baa2cb771cf4f
-AUX localepurge-0.5.4-parentdir.patch 657 BLAKE2B ace728b65f9e1ce6f8c449f75cdec0313c3ba6168e5baeb64adf7a76fe7cd92774e7a8d345492c4f4c633854672278f91a4c3eb0cab8d30817a3b4af3ed6dc2d SHA512 246d7865eb0645e71b607a523c49d9ae39a31b3371d7042045dadaf4939b6c5a7dd1bc13bc9eabef46ebdebabdb07669b3636a498e9e8059196206b32c38484e
-AUX localepurge-0.5.4-prefix.patch 2799 BLAKE2B 167d9fae44e9351526a103b6fe2d91b0a825a9aa096f02cbede29ddb72a1c42acf849b1a0f19afce0b303e2966668ecdfaa23b9a99a49ef3ca0971eb46723563 SHA512 cdff18f4387919f1ac1376f843b3ce65645cb6c4837401d00bbb3293108833ceded1a5f0e02b23f4024164ee10d2d03fe798d3ce591401a2816c8b61a9999c21
-DIST localepurge-0.5.4.tbz2 5038 BLAKE2B 32a2155761d3cc8d8c1b0ad62ef324b7c7c768d75395ba6d4d6100382e83becba1d69fa15ac2839dabeeae15f1d2bb3bb947c62d5cbcb3d496cf68b140ae2bc8 SHA512 246acb8ef497a2f607ee8545c4d46fd5a1957189eb0b705bf6bcd1cd35ba5b48c7e090db480519c8e3a7427b5ad5a2c020b40232a8fbd0840f9677a6c7af600e
-EBUILD localepurge-0.5.4-r2.ebuild 1003 BLAKE2B 3164a3039205f113ab9925b39252b58b105b6b44d90ce29f92008ba2e0e4f3453cd609724326baea9f6a9e3620660af4284b336857f05db1cee497793fb5073b SHA512 2e5e22bc926d6873281ffd219815d47b19b57b5ca14ccaac1c16d337748c701003b39e5aed03455e59b4d25def151a3c13b503c4c80fa712617684e20806371d
-MISC metadata.xml 295 BLAKE2B b7de6495b5128fc39975ccef8917e8b997649cfb1d96bce9c969b1cc99d1aa01de5ad9b3992594c3e26a4753f9cb83ba87e33c0d5ffbd2c3b341e993c2e6825d SHA512 1828b9bd1dc81e15ab98d4dd17aa1dd165739824cd3c56c32872cee9b42ea6a4d4a110be9dcc21df889341402d1b1bc74c71e84572aa7892f81321e8a74d9cf5
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch b/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
deleted file mode 100644
index ebca3b755aec..000000000000
--- a/app-admin/localepurge/files/localepurge-0.5.4-directorysum.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/localepurge
-+++ b/localepurge
-@@ -198,7 +198,7 @@
- 
-         if [ "$SHOWFREEDSPACE" = "enabled" ]; then
-            if test $SPACETMP -gt 0 ; then
--               LOCALETOTAL=$SPACETMP
-+               LOCALETOTAL=$(($LOCALETOTAL + $SPACETMP))
-                einfo "localepurge: Disk space freed in $LOCALEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
-            fi
-            SPACETMP=0
-@@ -230,7 +230,7 @@
- 
-         if [ "$SHOWFREEDSPACE" = "enabled" ]; then
-            if test $SPACETMP -gt 0 ; then
--               MANTOTAL=$SPACETMP
-+               MANTOTAL=$(($MANTOTAL + $SPACETMP))
-                einfo "localepurge: Disk space freed in $MANPAGEDIR: ${BOLD}"$SPACETMP"K${NORMAL}"
-            fi
-            SPACETMP=0
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch b/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch
deleted file mode 100644
index aed408283343..000000000000
--- a/app-admin/localepurge/files/localepurge-0.5.4-evaltotal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/localepurge
-+++ b/localepurge
-@@ -254,7 +254,7 @@
- 
- # Calculating and reporting total disk space freed:
- if [ "$SHOWFREEDSPACE" = "enabled" ]; then
--    let TOTAL=$LOCALETOTAL+$MANTOTAL
-+    TOTAL=$(($LOCALETOTAL+$MANTOTAL))
-     if test $TOTAL -lt 0; then
-         TOTAL=0
-     fi
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch b/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
deleted file mode 100644
index 2d8d6dac5720..000000000000
--- a/app-admin/localepurge/files/localepurge-0.5.4-parentdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/localepurge
-+++ b/localepurge
-@@ -165,7 +165,14 @@
-     ${ACTION} `find ${REMOVEPATH} -type f -o -type l`
- 
-     if [ "$SHOWFREEDSPACE" = "enabled" ]; then
--        SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
-+        # if symlink, REMOVEPATH could be removed
-+        # check from parentdir then
-+        if [ -d ${REMOVEPATH} ]; then
-+            SPACEAFTER=$(df -P ${REMOVEPATH} | awk '{if ( NR==2 ) { print $3 }}')
-+        else
-+            SPACEAFTER=$(df -P ${REMOVEPATH%/*} | awk '{if ( NR==2 ) { print $3 }}')
-+        fi
-+
-         SPACESUM=$(($SPACEBEFORE - $SPACEAFTER))
- 
-         if test $SPACESUM -gt 0 ; then
diff --git a/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch b/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch
deleted file mode 100644
index 488871381aed..000000000000
--- a/app-admin/localepurge/files/localepurge-0.5.4-prefix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/localepurge
-+++ b/localepurge
-@@ -1,14 +1,14 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- 
- # Deleting all locale files on system
- # *not* listed in /etc/locale.nopurge
- 
- set -e
- 
--LOCALEDIRS="/usr/share/locale /usr/local/share/locale /usr/kde/?.?/share/locale /opt/sun-jdk-*/jre/lib/locale /opt/sun-jre-bin-*/lib/locale /usr/lib/locale /usr/share/binutils-data/*/*/locale /usr/share/gcc-data/*/*/locale"
--MANPAGEDIRS="/usr/share/man /usr/man /usr/local/share/man /usr/kde/?.?/share/man /usr/kde/?.?/man /opt/sun-jdk-*/man /opt/sun-jre-bin-*/man"
--LOCALELIST="/var/cache/localepurge/localelist"
--CONFIGFILE="/etc/locale.nopurge"
-+LOCALEDIRS="@GENTOO_PORTAGE_EPREFIX@/usr/share/locale @GENTOO_PORTAGE_EPREFIX@/usr/local/share/locale @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/share/locale @GENTOO_PORTAGE_EPREFIX@/opt/sun-jdk-*/jre/lib/locale @GENTOO_PORTAGE_EPREFIX@/opt/sun-jre-bin-*/lib/locale @GENTOO_PORTAGE_EPREFIX@/usr/lib/locale @GENTOO_PORTAGE_EPREFIX@/usr/share/binutils-data/*/*/locale @GENTOO_PORTAGE_EPREFIX@/usr/share/gcc-data/*/*/locale"
-+MANPAGEDIRS="@GENTOO_PORTAGE_EPREFIX@/usr/share/man @GENTOO_PORTAGE_EPREFIX@/usr/man @GENTOO_PORTAGE_EPREFIX@/usr/local/share/man @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/share/man @GENTOO_PORTAGE_EPREFIX@/usr/kde/?.?/man @GENTOO_PORTAGE_EPREFIX@/opt/sun-jdk-*/man @GENTOO_PORTAGE_EPREFIX@/opt/sun-jre-bin-*/man"
-+LOCALELIST="@GENTOO_PORTAGE_EPREFIX@/var/cache/localepurge/localelist"
-+CONFIGFILE="@GENTOO_PORTAGE_EPREFIX@/etc/locale.nopurge"
- VERSION="0.5.4"
- 
- LOCALETOTAL=0
-@@ -23,7 +23,7 @@
- BRACKET=$'\e[34;01m'
- BOLD=$'\e[1m'
- 
--ACTION="/bin/rm -vf"
-+ACTION="@GENTOO_PORTAGE_EPREFIX@/bin/rm -vf"
- 
- eerror () {
-     echo -e " ${BAD}*${NORMAL} $*" 2> /dev/stderr
-@@ -43,7 +43,7 @@
- print() {
-     for x in $@; do
-         if [ "${x}" = "" ]; then return 0
--        else /bin/echo $x
-+        else @GENTOO_PORTAGE_EPREFIX@/bin/echo $x
-         fi
-     done
- }
-@@ -184,7 +184,7 @@
-             einfo "localepurge: processing locale files in ${LOCALEDIR} ..."
-         fi
- 
--        for LOCALE in `/bin/ls ${LOCALEDIR}`; do
-+        for LOCALE in `@GENTOO_PORTAGE_EPREFIX@/bin/ls ${LOCALEDIR}`; do
-             if echo "${PURGELIST}" | grep -xq ${LOCALE}; then
-                 if [ -d ${LOCALEDIR}/${LOCALE}/LC_MESSAGES ]; then
-                     if [ "${LIST}" = "enabled" ]; then 
-@@ -216,7 +216,7 @@
-             einfo "localepurge: processing man pages in ${MANPAGEDIR} ..."
-         fi
- 
--        for LOCALE in `/bin/ls ${MANPAGEDIR} | grep -v ^man[1-9]`; do
-+        for LOCALE in `@GENTOO_PORTAGE_EPREFIX@/bin/ls ${MANPAGEDIR} | grep -v ^man[1-9]`; do
-             if echo "${PURGELIST}" | grep -xq ${LOCALE}; then
-                 if [ -d ${MANPAGEDIR}/${LOCALE} ]; then
-                     if [ "${LIST}" = "enabled" ]; then
diff --git a/app-admin/localepurge/localepurge-0.5.4-r2.ebuild b/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
deleted file mode 100644
index 7e0fc8d34a9b..000000000000
--- a/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix
-
-DESCRIPTION="Script to recover diskspace on unneeded locale files & localized man pages"
-HOMEPAGE="https://gentoo.org
-https://cgit.gentoo.org/proj/localepurge.git"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-shells/bash"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.4-prefix.patch
-	"${FILESDIR}"/${PN}-0.5.4-directorysum.patch # 164544
-	"${FILESDIR}"/${PN}-0.5.4-parentdir.patch #445910
-	"${FILESDIR}"/${PN}-0.5.4-evaltotal.patch #452208
-)
-
-src_prepare() {
-	default
-	eprefixify ${PN}
-}
-
-src_install() {
-	insinto /var/cache/${PN}
-	doins defaultlist
-	dosym defaultlist /var/cache/${PN}/localelist
-	insinto /etc
-	doins locale.nopurge
-	dobin ${PN}
-	doman ${PN}.8
-}
diff --git a/app-admin/localepurge/metadata.xml b/app-admin/localepurge/metadata.xml
deleted file mode 100644
index 779ea9e0804e..000000000000
--- a/app-admin/localepurge/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>Just a simple tool to erase all uneeded locale and man files 
-usually generated for USE="nls"</longdescription>
-</pkgmetadata>
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 05ad501a6340..6ae98ee6c004 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,6 +1,7 @@
 AUX logrotate-3.13.0-fbsd.patch 855 BLAKE2B 48494caecc49d7b819f889bc7acf6bd29e71583625a0638b39c1f2d535396a88c205534353430d70fbb577093ab43bee4bec0325443cf3c233f5f28dcb20cb12 SHA512 5343814545554392f1ee1be5b35866ebce0d8f2f580cb7807940e3a5b2092025f1b9619fa0ff3bdf4b99aada4c46a602d6c34c6e3c1e42b15ce51cf9d879a3ed
 AUX logrotate-3.13.0-ignore-hidden.patch 542 BLAKE2B 01c6e92306eaa2356090e5539555711ff09c7bdc6042aad7f3c5d9faacf449f00bb3040132bd00774104f8c0a8cb40073cb7c26323978ef199847a88eee26e45 SHA512 88bd9dd906171d45877e4c21e40cfc9a729742825b4c5d583fd9364d3943aa604e037e4b58e053a1fc7c0b77bd5ed6171f741778716ef753ecbb02ebaf012589
 AUX logrotate-3.14.0-ignore-hidden.patch 548 BLAKE2B 29a8efd36b000cc670a8a2db46cac3ad12ca49c5900409c3e1b456da88acc869e66a479481fcb24731d44d7d1815fce54068542afaa4737093a65a35ea7cd79e SHA512 2f08e4b1b483d301e2c6f9a5440957f43d336d44b3393c4408a02b5491826f887d53c782a6c7472bdb1ede9baacf2d1608d7385a576da0a8441a4b5a48ee5113
+AUX logrotate-3.15.0-ignore-hidden.patch 566 BLAKE2B 1739e0d175311eb2a3692826830bb101dc65b3966eb6dcd96fcbdb6bb1376eac5c0d0c78a26ff2ee6cfad57396d05dd3cae9ff4621a94b80d9a8b5877a52195d SHA512 ed572f12617812b44f7b79e9f3c7fb7aada1fed8f80244ee9e5e7c7f536e493c69790c7c62e0dc1951f979bc5a2cff581f439a8e1fb1a47722e6c0f1dcb4e65d
 AUX logrotate-3.9.1-Werror.patch 344 BLAKE2B 6f132592ec2446943cb4f6426b7e25b432e9e44d82d080b3773ab7f5c34de019594ef77fa74cd74e026605e775ee2b119ab39c2eeb50a092dec1a1c502409b4a SHA512 6ae8b49d1f29ce1c32603716555085b7fa2d865177558abe92c84867c69ca84b8174563db07537801ad01572717670478b273acb34b5885b9170354d1cc02493
 AUX logrotate-3.9.1-atomic-create.patch 1253 BLAKE2B 2e3486f31991ea351300241fe2ea64ad8bea952c4faf7fbdf363b594a7823312c6c9497397abaf051c760e9fe93bb8b592ebb78ac85a23bba2f5db619de6c35f SHA512 92fa8e04522f9bf06840befcb019a498d465f2d8afa3475f97e953b4e8abf2cf63f2fa27d8c89c5620da59468f753d94720f5f3a604376d7e51b86c9eb156c99
 AUX logrotate-3.9.1-fbsd.patch 1393 BLAKE2B 27f82ffb51644ce117d53a0e484779692b0b8d547d14c944c87a41862127cf05c31477c73721bd2729dfc2c22264305ce60738063640dfef47c06bcdd9dd78e1 SHA512 dd8bc024eb280e5bcb2869682bedaf5c8db6d18976e412de3283f32bc5d9ad370fdda27194eae11fa3da53339d83ff20fe541e99eb8ed183997ecb85a606f822
@@ -10,8 +11,10 @@ AUX logrotate.conf 743 BLAKE2B d623d150d9959ae57e61af2c442434f81636521c133479aec
 AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe8d0bd1703e5075671dd1e13a030ec06fa269214bff9552670d3e0932e3dbde2e3673d59b7a50a2458b SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36
 DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a1623cf1aae2444e818339361c7b7762ce51fcbd124fefafbe47d529dd21ef346a6c9a267da20547914388db99dce003 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76
 DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
+DIST logrotate-3.15.0.tar.gz 219496 BLAKE2B b9f9cd0b22b79c3da1ea6092c5f3ebf9fca39da3a4bb7e1da39a8bf96f0bdb573864b77681671ad227cfc444bbc3e64a518805780580adb954bfacd564f00e2f SHA512 9520f15eaec54da426699f1f5ce31949d1372fa25c5c127dfbf29ff717a1c15a6fd14437c1d7b67b116b12c8a5c28f6012e39ad4b3ca2b053c874d02efe98d84
 DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
 EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054edecf4abeb8dbd0d5df7f8bbb27e1a17a384cf4d44042197eac0c8ac7d5e6e888ef689fe2794ae206d946661b6196a SHA512 2f6b6caef77088ff1aee15f8a289f1b3559180034b5f2bfa5520b2c3627bb0f92e0f5555cbe914f4877b50729f84e3ca3f0353c6e1b63442e156b530819294a4
 EBUILD logrotate-3.14.0.ebuild 2511 BLAKE2B c824de62f72544448b54948e5025b0bfee7be00b9355be4e5c64d51721efc064dacec319f9de4e93c61a7aec2bd70c4d0515a693be375d35c16c30cb1a2b927b SHA512 e088a56371b59e4d10f4ea5574ba12985b9b7fe81de11624cfb302fee0bc08581334230776aaca74d67d9ca160dad4301f06b14e5c608c26ecffccbf370a252e
+EBUILD logrotate-3.15.0.ebuild 2491 BLAKE2B 54d0c42640b5bc52d8a06515dc93a8fb3882e5bff1307ff83ba61c02022f5a798646e56eb3eac11edad9b1d4a347a792401a155e8782df4bfe78eb782d429043 SHA512 ca4f7eb1af6d0ade04ff4917b254bb63b733daac0bcffc758804c2f15478a8b8c2ea6715fd10ace0f09966557f3d6999fcfeddcd9fd22cae6594838507fa5f08
 EBUILD logrotate-3.9.1.ebuild 1767 BLAKE2B a59f23a8a0a24b416f23a087c60fe046260cc24521f68f2551bb2a2821d12e94307e2d620ec4b625cd1b6be21cafa3d2c0f044468dbc2760897e5bb7854ac7af SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03
 MISC metadata.xml 1119 BLAKE2B ddb2266925506c260c4b3f67e4dd906d9446a17a54b5a0ffce547d3c942750ead45dd1cfdcbae548a096d87ee1e247fcda9bcb81e83b829f0526d4bfd7b4a01d SHA512 99725d54d1cf68b257446ef8afc43d4bfe05cc789c818222d603012ae1e636624962c23a845f8858f4fc7aaf5a7e7f8085a7b173185ba66d7e390012dbceef79
diff --git a/app-admin/logrotate/files/logrotate-3.15.0-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.15.0-ignore-hidden.patch
new file mode 100644
index 000000000000..cb2fc073bc61
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.15.0-ignore-hidden.patch
@@ -0,0 +1,14 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2018-10-05 17:01:21.000000000 +0200
++++ b/config.c	2018-12-19 16:33:52.280129804 +0100
+@@ -417,7 +417,9 @@
+     int i;
+ 
+     /* Check if fname is '.' or '..'; if so, return false */
+-    if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
++    /* Don't include 'hidden' files either; this breaks Gentoo
++       portage config file management http://bugs.gentoo.org/87683 */
++    if (fname[0] == '.')
+         return 0;
+ 
+     /* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/logrotate-3.15.0.ebuild b/app-admin/logrotate/logrotate-3.15.0.ebuild
new file mode 100644
index 000000000000..34b327c5d757
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.15.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+	>=dev-libs/popt-1.5
+	selinux? ( sys-libs/libselinux )
+	acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+	>=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+	"${FILESDIR}/${P}-ignore-hidden.patch"
+)
+
+src_prepare() {
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+	default
+}
+
+src_configure() {
+	econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	insinto /usr
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+	move_old_state_file
+	elog "If you are running systemd you might need to run:"
+	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+	elog "in order to create the new location of the logrotate state file"
+	elog
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs. See man logrotate for details."
+	fi
+}
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index ae5f2a048ad5..5a9959eaa1c6 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -10,9 +10,12 @@ AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa88
 DIST logstash-5.6.13.tar.gz 104517136 BLAKE2B c4f0ba5f8e1624ef0493e553166a3c18aab9c4d73a661a5f91988627ec8470dc8a1b52461673e27169c8c10b33dfdeffeef96e70e1a8a04b7ee4a1e71a9afb68 SHA512 df12877b8d28ce9392f9d9ec9414205dd1f628a8e927c8b31f0ad3c3c7b11108509fe6b44119faa3f1bab393ea7be74a3a7c5b5b6b49d6ff5b54ce31fd024a04
 DIST logstash-6.3.2.tar.gz 144211416 BLAKE2B 8471fd0a920b4ef06cd775ceaafde33e16e5d1898c89339f4a039262a7a6472d6cb8dd2017db8811d6a827395a5b1e7040d9759c8734de2ccd1fc7e615345813 SHA512 11507b9177aa6cd4172eb825e395571de71bae8b0e39d7f700fe27c7219b22bc2b9a493e39016eead2d54407dc5e5cc20a0c6e4453140d628cadea076453308f
 DIST logstash-6.4.3.tar.gz 153936585 BLAKE2B efdcc4664587a3ab18e2e78136c92bc643e99989fa5ac1cd1daaeb48ca1f6fa57f122a5686ddcaab59d920a0ef0e59dc70f59c05a520b731347f37d8faa78c38 SHA512 39bab1b9b0c9f0006c2ad7aa152b3863179030352202ec0c4c4a887bdeb98d4c34127699655cfc7c5b9f44119b45de9629bfacc670d520dcf266b3298fdf2484
+DIST logstash-6.5.4.tar.gz 160286824 BLAKE2B 6f76edee968566539670b0ffc5462a0a417d39dc8f7d3fab35704ace23c27503f7051a064fca2820d52b100a19818621841356f8e1df20a80c95902f4c1c7f95 SHA512 8dff51b3944219b462002d0ced4ae7050d8ab8f9335de1132be11ab8e7277731f319c5794601881ee94350152725c599093316c5ef55ddc95279697ec794cc57
 DIST logstash-oss-6.3.2.tar.gz 144128583 BLAKE2B 99de9d375a06d132844ce63fa5d0e092bb05aedb93ff5e4a278ea75ca2fe68701afa3028af4f9c3e5b3b469e46faf4d6dc62d006e9dac3a9e9528ff94aa2dd47 SHA512 7fa97f0ca070677aaddc73ff900397ce4a45f4b02467917219acb3c414cf0cbf396b481f624d2ebc3f370b2e41120b3b103f6d080a9fafdce98b119eb8d27f5d
 DIST logstash-oss-6.4.3.tar.gz 153809786 BLAKE2B 774e67b7f3b89747299fda520456164186e843dedbea4b6727fa325dc8148ea1b25fcb2105e76b84330729a55390e597fac93cf2e2f258e83f2b6cc1c1091372 SHA512 c84e4fcdbf8e96e5d3005186bdf45f20939bb065f02370128b4e15273c4c0fe5609bab606fc7a6a2b71fcee90beb3f435ff42c9126efaed436bf5af1d784c56a
+DIST logstash-oss-6.5.4.tar.gz 160157672 BLAKE2B 47a6de33697ccc04ba08cb15086cb17ead20a38c9348619ddcd383e61c20265864451939f5be10ec9ebd0ba9b0667264af389130f87181734b942efa49c7e705 SHA512 0b8384e48bc584236fa7369339843c9aa1d08fb09a80e209beabf8e029f2fb5a4a5a1a5ef8b91f069cb35472d3b8147752749a4f6a84c6fc5a2cc801ac8d3c91
 EBUILD logstash-bin-5.6.13.ebuild 2195 BLAKE2B df43d04421b3463a427cb2d1c6a1efce021ad8064d08a004535463c6d58f8b41d5dce3fdfe81f556b949151392d373a0685e24a0c0c65d2ee405c6ed834760e5 SHA512 8acbfce31e3484fbd9d9de4337f981bb7d720eb7fda7c200efed822a645c7b81318a4f8642dee620ffd50fd365eb9d70d754cebf666fdeba8a405a2b4f5d5ada
 EBUILD logstash-bin-6.3.2.ebuild 2188 BLAKE2B 7256bfb5ecd30e4cc14ff6173e3faf9631c51e8d7f57edd8c415b661ffd9bdcc8e3f793c0acd3320fd7bc4589a992889d215ab16ad26a8ace452a54f0f50f517 SHA512 5390442582c1a9c7a05b0709376fdb8be89cda413f201a25c3e80c74ec72328b9aee554e875293d824349139188ad29585374bb9077fcf4634145d9e18d5bc9d
 EBUILD logstash-bin-6.4.3.ebuild 2185 BLAKE2B dfcaa0e47c218e234f46096cba58dd2db1fc629262eeae6e988e599fe827c99bdbeb956e5f2c89f230e0791caaece1a8ebba257d9aa33a13f98b6c2ebd042b90 SHA512 683341bd6666acc3fc1dc5308e5d178f006f338590c1be96e116aa2ebcda4d2b74563eface36359624d03eb1b4023d378f9357722855e83fca7edc6f66ffa665
+EBUILD logstash-bin-6.5.4.ebuild 2185 BLAKE2B dfcaa0e47c218e234f46096cba58dd2db1fc629262eeae6e988e599fe827c99bdbeb956e5f2c89f230e0791caaece1a8ebba257d9aa33a13f98b6c2ebd042b90 SHA512 683341bd6666acc3fc1dc5308e5d178f006f338590c1be96e116aa2ebcda4d2b74563eface36359624d03eb1b4023d378f9357722855e83fca7edc6f66ffa665
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-6.5.4.ebuild b/app-admin/logstash-bin/logstash-bin-6.5.4.ebuild
new file mode 100644
index 000000000000..7cc0ca6f38b2
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.5.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 user
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/lib/${MY_PN}"
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/{pipelines.yml,startup.options} || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	doins "${FILESDIR}/pipelines.yml"
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT%/}/usr/share/${MY_PN}"
+	elog
+	elog "The default pipeline configuration expects the configuration(s) to be found in:"
+	elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
+}
diff --git a/app-admin/lsyncd/Manifest b/app-admin/lsyncd/Manifest
index b77232e89d18..7693b05efda0 100644
--- a/app-admin/lsyncd/Manifest
+++ b/app-admin/lsyncd/Manifest
@@ -1,8 +1,11 @@
 AUX lsyncd-2.2.0-mandir.patch 284 BLAKE2B b133a436c6c1b3186fc1c4c8f01ec87423cd63620e54589913d35bbe1ff2867c807fb7ce3eabade31936c70c54e7b1c115e1ee20591c82073396f029068e36b9 SHA512 c46043b4938b42bc4bd8d0f9387dff4561ee103e9a7847825a57415aa2c91b7902059f3f103834958bcf1c0132785c44e729cfb0af82d63cf94d3782f1b6f501
+AUX lsyncd-2.3.3-mandir.patch 327 BLAKE2B a201734f5e93f33b39c175a98bba22c847761f667d0ffcf96c14c52e8fafe14718fb33ddf30f50bd5fb46af388283f23274e7ab6106885ffc0cec5cb5b9f8626 SHA512 a66a8d5469378917b9f6fce55ceb9b041d8973cb581a21c985eb39a682af5e04cfae30b8b1104a7664a3b918641eafbba38a4b323ecef7e6ca0e23a9506c8370
 DIST lsyncd-2.2.0.tar.gz 81034 BLAKE2B 26666d04729e31d60ec340c207d5c22b2f53571a146d3f548bf7a33061bcec59aabafae40242f79a971297780fb7de56b5ff1fbccdb4c2152878f1b318a058b9 SHA512 75a138c2e85c4c5a3d6b215cb8df1668e5ffb6c8099f79caf555369d12348e2bdff29c1b01d62613bddd5b5a67f2a44e2fe86412048bc622088912e3fa783e81
 DIST lsyncd-2.2.1.tar.gz 81005 BLAKE2B 797c225b484139df53d3d1173d0cc3b4ba632a076e937902799247e422643f0bcefe22570d311afb4c8fb98151467a1ab624a97f728c851c02bc0dbc601f2238 SHA512 c07c322fb802911a2bb78221ff20ac1c0658cea27a23d34a95de45902211784d3bdc79c246ce0809e6167ddd20a3573c1ca6a81cabc46a29622a200c8d3ddfa5
 DIST lsyncd-2.2.2.tar.gz 82231 BLAKE2B 44cb269e1b726595b4332471335dc2a600efa2ebd39d7857d9c0c4adebefed923f60b177511e9e06113a4ff3400e45a979315bcd61169a7a2b9945b1aa944a86 SHA512 489d4fc91787a53f1480749fce6a281406aedb7e3617cd5f383b30c47870b2a8a912317a3faee5ad5f6358c10a136a69e07ee854f753846be1e11023cea5fed0
+DIST lsyncd-2.2.3.tar.gz 85165 BLAKE2B 9b3ce9ad882f12a0cf800ca0418092807c5c30451fe273eae18486b2ab245fbdc77dee937983bf78f678e20448dda39771c4bca96d8efe010cc45d470a30eba3 SHA512 2193a342f8aa7d8cfb55378c9c59ca61d2d8e4026263fd6e6560c730c712cef1f189305a3f9bca58f5b9c9ffae5af12e1d75e5355d5bdae86a47ad9595b8169a
 EBUILD lsyncd-2.2.0.ebuild 638 BLAKE2B f6f8dd5cdc9ca629695b65d5a91ab31209b87595875566cfc77d0d344a4d9186a26ca14346eedef21c4a1fa35290a2e66ad86aaf69f1f6f4085056cb82c99798 SHA512 5eecd4fcc4dd9baed5b609e46be61a5ad0b6aa022d2da5d2522036bba712b97fa5ec3600ba96d21966d1354bac3d36e6ce2bf4fb71c12f82498c914074557067
 EBUILD lsyncd-2.2.1.ebuild 647 BLAKE2B f54878a524e42e948f4356be0d36e636ac26fad18bf0705f8df062d75c4b1c83178031566848a1b1be2847a76e55e4cef298a740f17e628f41b50ad1742485ed SHA512 2c415734bd2a6f6861217a23788708efa0c3e4fb7fc11243ff3a64041d48b09716488ac28a13d279e7513433cb50840fa261784c375648ad232921481c70a330
 EBUILD lsyncd-2.2.2.ebuild 647 BLAKE2B f54878a524e42e948f4356be0d36e636ac26fad18bf0705f8df062d75c4b1c83178031566848a1b1be2847a76e55e4cef298a740f17e628f41b50ad1742485ed SHA512 2c415734bd2a6f6861217a23788708efa0c3e4fb7fc11243ff3a64041d48b09716488ac28a13d279e7513433cb50840fa261784c375648ad232921481c70a330
+EBUILD lsyncd-2.2.3.ebuild 646 BLAKE2B 91484f129466a25b597c4c82019adae4a4f5a2c57bcd6a6306cc4c102f7cd0cc35995af90abd8260469e9c20e330a77d1ceb41ed86f6d10d6f1e020df7e78431 SHA512 6be302edb2b64c73527f8c6e19a07117fee8d652943250ea86c67fd453d78fea13ec62233d755eafae9039cb9766b7213b012291930f52c7686740416bfd7b8a
 MISC metadata.xml 376 BLAKE2B 17c9b5e1f29ac7b0ced5031f797ed2d85bdb25df6af44a1d257b75256325371a8290e0e1c20cb535c58326fcd67372a727cf170ca200803ca693670f2c729511 SHA512 1d7d76eea9ec7bb6d1e453675d56610abdcd78801b3d12eee37f082698cdb03aa7775d160b473ec4f67d8e95c6dded3319b74449f4aad97fbb6c91fab5bcd641
diff --git a/app-admin/lsyncd/files/lsyncd-2.3.3-mandir.patch b/app-admin/lsyncd/files/lsyncd-2.3.3-mandir.patch
new file mode 100644
index 000000000000..240ad6dce8fa
--- /dev/null
+++ b/app-admin/lsyncd/files/lsyncd-2.3.3-mandir.patch
@@ -0,0 +1,9 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,5 +107,5 @@ add_executable( lsyncd ${LSYNCD_SRC} )
+ target_link_libraries( lsyncd ${LUA_LIBRARIES} )
+ 
+ install( TARGETS lsyncd RUNTIME DESTINATION bin )
+-install( FILES doc/manpage/lsyncd.1 DESTINATION man )
++install( FILES doc/manpage/lsyncd.1 DESTINATION share/man/man1 )
+ 
diff --git a/app-admin/lsyncd/lsyncd-2.2.3.ebuild b/app-admin/lsyncd/lsyncd-2.2.3.ebuild
new file mode 100644
index 000000000000..67ccfb4ab94d
--- /dev/null
+++ b/app-admin/lsyncd/lsyncd-2.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CMAKE_IN_SOURCE_BUILD="YES_PLEASE_OMG"
+inherit cmake-utils
+
+DESCRIPTION="Live Syncing (Mirror) Daemon"
+HOMEPAGE="https://github.com/axkibe/lsyncd"
+SRC_URI="https://github.com/axkibe/lsyncd/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-lang/lua-5.2[deprecated]"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	net-misc/rsync"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.3-mandir.patch
+)
+
+S=${WORKDIR}/${PN}-release-${PV}
diff --git a/app-admin/makepasswd/Manifest b/app-admin/makepasswd/Manifest
index fa2fcf681d91..cf998311c196 100644
--- a/app-admin/makepasswd/Manifest
+++ b/app-admin/makepasswd/Manifest
@@ -1,3 +1,3 @@
 DIST makepasswd_1.10.orig.tar.gz 12382 BLAKE2B f38e181da077650af760123e86cdbc2f39259db82d06198280ac37f5391a7de00ca7009a69b491a150ec9e542c25b7538141941819ef540714e2a6cd75ddd4c2 SHA512 215b8c3941f395c02be43044aed972425db8fe8472ec9f4f39f7f574d9f36c5a1af5bba495dd10570363e923bfe42c26d7571741ae2ef350e660c9973ac0a5ac
 EBUILD makepasswd-1.10.ebuild 553 BLAKE2B 66f890ab98431b7c34119b72691d8be66a145a91f6f45382348bc5e646fa50872659e9df640bb7d9ce8cb53d240df21f607f3d06552a26b8248c510ed091212e SHA512 fd9ed23da2b80d71fd483076e6646f84f7522fe694529fe8af5148f29e5baff3bda4f1cc56d37423350a6150b2406b32da23f2b1601ac844465e660ec25cd488
-MISC metadata.xml 359 BLAKE2B fa76c590cdc7361bf05ff444616592b7da08379af98d0296aec906efa6a985b573aa738ef8bd8d0f33ff09aa9aa96008e31e1d0fd8d1d9ad52605e2adca71634 SHA512 e0770ad04371f82e5d005229b1c5f04a3d4e6343c380ea230d4f0bfaf8306aa04fc11fac75149da0f80410f72771c840fa4f8ecea1a40ec6273fdeb829207c71
+MISC metadata.xml 283 BLAKE2B 49849d3598308d8cb5e389f56e571eae96c5c1e2f161c1e396c0be681e14acde2121463a297024e1b956fa480e6825186c6d98aa22ffe1978917e12a71e04e7f SHA512 00ac43351b446120da24fd23fda3389d29313ed42918ecf508e3bb57bb7d3769e2fe2788b4be33eb2f4a48713355a55e37a7f9c610737aa1e052597221e27c17
diff --git a/app-admin/makepasswd/metadata.xml b/app-admin/makepasswd/metadata.xml
index 00668f1a86d9..0d035ad2e64c 100644
--- a/app-admin/makepasswd/metadata.xml
+++ b/app-admin/makepasswd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		A random password generator, for all your secure password needs.
 	</longdescription>
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 1d6608218d86..2c1a8414faf7 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -2,10 +2,6 @@ AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 BLAKE2B 5952e26c668fb71f712fc70b3
 AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de41215890cb4b6431ad694c2684f498d13287e385119304a816270f470ff26529967701c92bfc845a8aac698a0aa0f67271 SHA512 cda86c3e74f56fcd9d8771b26ca91c32ccc33e6bcd6dd0fcf856c14096daa619257d237e1e187e7820d6a0a0553ae6fd9ec160ea59e237b4e05ebca4e6656e20
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
 AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84e914a82cce16782b2c9dfdc83123d609cabd4e9e60eb38a9e43fe7a22a2afca8f53c3dc8e65ac87 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75
-DIST mcelog-154.tar.gz 297148 BLAKE2B 80b2b6b13222d0194d63516607b3132e2146894189e2c3c793c953dc43705a5b386ecb76ae3c8b7b345f8d440f547b3e566b16bf0802d17188cce978e1ad2fc1 SHA512 8a160aaa8a0ed736cb81082321e199e6a6e4f7f6528915752af545db28918e89dcb6bf321a92472d776c61914d08c613900273b3d265a375684e3212547abe38
-DIST mcelog-160.tar.gz 307762 BLAKE2B da2c4b7fd2a7e69ff75aa8df4f96616b180b94b0b2f82fdfd4bbcf11515e58585cd371a36c6aaa205c87f627893fa11f165c51ead58d01c89875e76325a56efa SHA512 b31d7bd97b45a11997cff9ce5af534ced56658557544d6c812b0b284fdf40efc6a6cc48f5a6bb80a396273c5b1c870005f7c6dea92445639b0e4642edcee9520
 DIST mcelog-161.tar.gz 308227 BLAKE2B cd208cce2685b779a2cac6d347b890d5bff5f07d2e7165c1d078f914aefcc26bef2ab968ec6baac4410134d8188dd73e4f3d77f13603307f8c6b592554146497 SHA512 af38fcc1cc9621d6cfbda2b9acc7698cddbe631690bf394398978bdafd0d98075539012827ca876cef3f64cc56a00d31d0bd0f4fe2ea9171eb41bf0163e35f0e
-EBUILD mcelog-154.ebuild 1370 BLAKE2B 3ba5600340047d02065bf402c29bdc96059865758b0d4cfc72c1251f85f7de20b37253bfc0d1f988d93f8dd9b7453e341f30e2e45c6f67401afea1463dbb8e8f SHA512 40cbe04aa5aba05eaedd1c1c9a3da4ea309be834864d405e532a20ba1190ec2aa44fc40cb968e43f37ddebb2698d380774b6601aaf4b0ad48559a929d4c526d7
-EBUILD mcelog-160.ebuild 1372 BLAKE2B 8f76fa2b653872ebf5362b7b3497732f02c2592f2356fdc417ce9b35f4a18b7f6ca12df960ffb2228d0bec5b8e4af5641f766c300d3d8ef99aea5c0b6c210840 SHA512 de8e5340fb345789fb4e5255e3a15997b387bab2b834db81f5682d8e043ae4f91bf034e4965bad82a963b055ffbe1294ab49dd7ab0598dbfbe43fbfced1a2db6
-EBUILD mcelog-161.ebuild 1369 BLAKE2B 7d11d60d89c301995dd67e3ebbb36ca20d24ec02326d502263c23759e6f515f86ed6a7f21d9396f0af5fce58bb9a1646fa4e7fea6195cd5d85fd38fc6d643970 SHA512 ca9732992cc498ee0ce1836d6b3f7acc0641bede4343866f298ac4e6b4d0a03172813da4f99b0f6ccda51064dde90115513b52db8dfe7972b14d946100c006e9
+EBUILD mcelog-161.ebuild 1367 BLAKE2B 36af6f137e53810836f18110ab2ac3aadd3be922a17746d77a82e8f43214733bcd3462740d2c3ff0384e04bdd739e6dea3d2673b5a11d20c92700eea867237c7 SHA512 d243573977569374a72ec19629d48bc735c94e7c49dfde00550128cdd8e3713c8eed966be26e11a1d7a46156f2b3db00bf342cb80eee80409d284c359bcc6909
 MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/mcelog-154.ebuild b/app-admin/mcelog/mcelog-154.ebuild
deleted file mode 100644
index 46cdf051cd4f..000000000000
--- a/app-admin/mcelog/mcelog-154.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~X86_MCE"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	insinto /etc/cron.daily
-	newins ${PN}.cron ${PN}
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodoc *.pdf
-}
-
-pkg_postinst() {
-	einfo "The default configuration set is now installed in /etc/${PN}"
-	einfo "you might want to edit those files."
-	einfo
-	einfo "A sample cronjob is installed into /etc/cron.daily"
-	einfo "without executable bit (system service is the preferred method now)"
-}
diff --git a/app-admin/mcelog/mcelog-160.ebuild b/app-admin/mcelog/mcelog-160.ebuild
deleted file mode 100644
index 22442f62abb9..000000000000
--- a/app-admin/mcelog/mcelog-160.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~X86_MCE"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	insinto /etc/cron.daily
-	newins ${PN}.cron ${PN}
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	dodoc *.pdf
-}
-
-pkg_postinst() {
-	einfo "The default configuration set is now installed in /etc/${PN}"
-	einfo "you might want to edit those files."
-	einfo
-	einfo "A sample cronjob is installed into /etc/cron.daily"
-	einfo "without executable bit (system service is the preferred method now)"
-}
diff --git a/app-admin/mcelog/mcelog-161.ebuild b/app-admin/mcelog/mcelog-161.ebuild
index 87b3afeab5c8..37a8e88bf731 100644
--- a/app-admin/mcelog/mcelog-161.ebuild
+++ b/app-admin/mcelog/mcelog-161.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
diff --git a/app-admin/mcollective/Manifest b/app-admin/mcollective/Manifest
index bdb04132868b..abbe5243253a 100644
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@@ -1,8 +1,6 @@
 AUX mcollectived.initd 497 BLAKE2B 1fe966f49117f9ea1b8c8ca4f5c92d5ddd7f8fb28658e4c3b016c193b69d1c42d35da85ace176279d09778c12fcc664748ea743c9b88219cb0fec2292ca867d4 SHA512 dc77a522e3ab6af3e23c559bfcb385033f2200b58b50db59000e7f56b2a789e8fbd83340f8ee494a1a9fdbdd1bd737a2b17ae4743823794264723fdc931ea6b0
-DIST mcollective-2.12.2.tar.gz 1517725 BLAKE2B e5f2b94843b95fa0749ed7e3e1ae52aeb485bf6644b64d971efd7d7a0e7bc806de0d2b00997c7e36d004fd78c479b9cf19b927e717ad0f3e4c13e820e5481637 SHA512 83be835499adf836797a67adda9be6d1bbf32524560ae51533875a1e2507599c7a0a1d2a76513669b919cf1eeceabdf13162eedb8972c74ecdeba5427b1701e4
 DIST mcollective-2.12.3.tar.gz 1516461 BLAKE2B f8fa65ffadb98ae3511416aaf8b0875486b75f20e4da4007ad70820f453a6ecd81b57d7aa30ae38b014b984330f6c4d525002a54edb2c00d629b6fd4b2250049 SHA512 55798d4579a6be8a7790b046f8b4e72607935c83ec874b6147258d827e0bf279f08dfa121d7cc4a8ed922986aa6bad9ebd62b7e3cbc1e7ef526cf58edce1bcdc
 DIST mcollective-2.12.4.tar.gz 1517723 BLAKE2B e49a43ae7b99a5f22fe33549b26f938941f4e007c164c3c8de77daf2b3410c7db21e5023a400c87a2e4927a5a986e3b66bc3363a0c697ea06f0dd112825ae368 SHA512 f357297253f1cb5815738c8899a543642ce721c60ba023b13a7b14a99049d909622f8500ed82fc68c142cc1ffc106aed5a9bf8b1604a47c19a04a5ef4006b9e5
-EBUILD mcollective-2.12.2.ebuild 1649 BLAKE2B b9fafb43c324d42bce01b95452bace880809ed327170098fb81c36fcc7c0505464624166ebcee596a9068742e1a6958e727052f553693db5e0275764180ca4aa SHA512 9ae9e1b5f0e5b31cd1dc44edc844253bfca1c80e8b626ec06a2e0a66eb08c0d935747a097f2f516d8e85f0ce79f28a675d1866b866789af47706048c92ad6c2f
 EBUILD mcollective-2.12.3.ebuild 1649 BLAKE2B b9fafb43c324d42bce01b95452bace880809ed327170098fb81c36fcc7c0505464624166ebcee596a9068742e1a6958e727052f553693db5e0275764180ca4aa SHA512 9ae9e1b5f0e5b31cd1dc44edc844253bfca1c80e8b626ec06a2e0a66eb08c0d935747a097f2f516d8e85f0ce79f28a675d1866b866789af47706048c92ad6c2f
-EBUILD mcollective-2.12.4.ebuild 1648 BLAKE2B c82c9683d230f1201a414859f848a31ef471f932e49d899a9cf6d6da7901bafe0912b114a45e8566c0b5b4c1bb73f40ea1aa2e258a544642367d71dba7531860 SHA512 009f4331fc6e7a664d1c35358660e7e8c04bc8024bcad8a04c3e0cc7a7d15b16fa54887264b828d0dbb099369742ae0438f81cf342d472a1078e9e7c7a9c3eef
+EBUILD mcollective-2.12.4.ebuild 1646 BLAKE2B 36932cbac263d9e0c2d6c0ff41a78d902eb9608d2bbf7a819f97a439feab2e7dfce45d3fd7b5a726a8ff61e87a4c1659efb25ca4a713eb1c4d2fd9313c0bf0aa SHA512 1382a7674f73b359669965fa7c591d4e1c60276b918bb028c36edfead8f9cf7efdb1fa0907d757df5210561602bb4a2345e3d15dca86482335289a71eec1d705
 MISC metadata.xml 534 BLAKE2B e8866ac769b65ccc61dfe79fe5883bee78ea4066187b7136b899a1a16fa74952f88fd2b81376033d36418dc670d5669d9b65fc3195720ad95adf30bfe49729b1 SHA512 e94dd85f11b4f8b838e928220cb887eeb70860e6d04f03e904ddd4332baddd3b01221305e7229fb575585235436d0d942c116f821ef37adae636a7d5c6193199
diff --git a/app-admin/mcollective/mcollective-2.12.2.ebuild b/app-admin/mcollective/mcollective-2.12.2.ebuild
deleted file mode 100644
index e5ded06a8259..000000000000
--- a/app-admin/mcollective/mcollective-2.12.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-inherit ruby-ng
-
-DESCRIPTION="Framework to build server orchestration or parallel job execution
-systems"
-HOMEPAGE="https://docs.puppet.com/mcollective/"
-SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/all/marionette-collective-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc +client"
-
-DEPEND=""
-RDEPEND=">=dev-ruby/stomp-1.4.4"
-
-src_compile() {
-	einfo "nothing to compile"
-}
-
-each_ruby_install() {
-	cd "marionette-collective-${PV}"
-	doruby -r lib/*
-	insinto /usr/share/mcollective
-	use client && dosbin bin/mco
-	dosbin bin/mcollectived
-	if use doc ; then
-		dohtml -r doc/*
-		insinto /usr/share/doc/${P}/ext
-		doins -r ext/*
-	fi
-	newinitd "${FILESDIR}"/mcollectived.initd mcollectived
-	insinto /etc/mcollective
-	cd etc
-	for cfg in *.dist ; do
-		newins "${cfg}" "${cfg%%.dist}"
-		sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
-			"${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
-	done
-	insinto /etc/mcollective/plugin.d
-}
-
-pkg_postinst() {
-	einfo "Mcollective requires a stomp server installed and functioning before"
-	einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
-	einfo "any other stomp compatible server should work."
-	einfo
-	einfo "It is recommended you read the \'getting started\' guide [2] if this"
-	einfo "is a new installation"
-	einfo
-	einfo "[1] https://activemq.apache.org/"
-	einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
-}
diff --git a/app-admin/mcollective/mcollective-2.12.4.ebuild b/app-admin/mcollective/mcollective-2.12.4.ebuild
index 866f8f6e1fb1..60b5f9e52243 100644
--- a/app-admin/mcollective/mcollective-2.12.4.ebuild
+++ b/app-admin/mcollective/mcollective-2.12.4.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/all/marionette-collective-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc +client"
 
 DEPEND=""
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index 8f18358e0cee..3bc598a2f58a 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -6,6 +6,6 @@ AUX metalog.initd-r1 651 BLAKE2B 7b7739ca48acd3ce646478b51639c14f7cf131a698570f7
 AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
 DIST metalog-20181125.tar.gz 39472 BLAKE2B 64d90835d50c7cb10ab2bf2708d00189b9f8cb56438c29d5c445c5527cce030f918ba74f83cdcd54017f04fe2a8ab30e5631bcdf6681e56c311f8069981a9b5c SHA512 4b187a29b9e25a0f762f929c6993fa6e49ead470916a43a0dfbf16720a1a633121357d2f152bf4cdcd71c016aa4fc8fd6cffb35249abd430fbbf66651986bc4b
 DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
-EBUILD metalog-20181125.ebuild 1552 BLAKE2B 311c2306e5917d38904a8bada992a5661d20ad0939cc9439bca8b9f814f9be80b174abd21be7817c1ae388b5375af81ba884509fd6f2e6f85cb230017af2ca05 SHA512 964fbb2e7f4aaa8b74074e4c0f57ba073208965b8e6d254e23aa4aba0730e1c6cdde6a1e0360e63407b422554ec5675e3ba5b4ed43388354f697675c5db1ba53
+EBUILD metalog-20181125.ebuild 1580 BLAKE2B 75114300165c5d3d8e11962d1db955b9f34d63ed358644fbce32351ff8b28fe8e88ba921f256455b86413e053cfd0c3251df0e0c9b97d42c9c704c1b268297d4 SHA512 893c0e67e663f7cfb6552e90ea03d5ac92762a83d6405d74a1ecc86edc884269be99d9bd896a3720d2ec66cee14b681158a023eb3c9e6ce89dbb2d5aebf57bcf
 EBUILD metalog-3-r2.ebuild 1471 BLAKE2B 5da0f4866c405bd0d7073a1d98a8ad9acef166ff67af57c3330aafd68aacc7bc6ae8c81d28e402554ee637d26f5ce3aa14adfcdcb5a4cad3422a44f849e5bdb9 SHA512 91abf5ae5b73cd63246672d6bffe3ecbef91c271556958f7d1488bece9445109030752d5c932050e0413541aa240b3f09afd881f0a7350b58bfcf8dafe76bf70
 MISC metadata.xml 334 BLAKE2B 2d9ae46fcede549cabba6654513afcb6bee8ea22ba48bdc910c7b136e4d27bf6e223db5b13501b275790ecbf4fcbcb4ebf5ac9b6b81c6fa098e2f2c402793b0b SHA512 14ef6878732ffc5d14d1d27cec55ec886e76969e016ce8a009cafffa0b8d4e470c1b0f2480da5aaf0ed885c101b20d5edd7ce333efb9bc6f0bf56462e7260b37
diff --git a/app-admin/metalog/metalog-20181125.ebuild b/app-admin/metalog/metalog-20181125.ebuild
index 25657e4a7521..a1ff860c0eaf 100644
--- a/app-admin/metalog/metalog-20181125.ebuild
+++ b/app-admin/metalog/metalog-20181125.ebuild
@@ -15,6 +15,7 @@ IUSE="unicode"
 
 RDEPEND=">=dev-libs/libpcre-3.4"
 DEPEND="${RDEPEND}
+	sys-devel/autoconf-archive
 	virtual/pkgconfig"
 
 S="${WORKDIR}/${PN}-${P}"
diff --git a/app-admin/mktwpol/Manifest b/app-admin/mktwpol/Manifest
index f25df5ddaff2..8e7213379c7f 100644
--- a/app-admin/mktwpol/Manifest
+++ b/app-admin/mktwpol/Manifest
@@ -1,5 +1,7 @@
 DIST mktwpol-0.2.6.tar.gz 55328 BLAKE2B a5998dcdd947288c0761fb4ef53cfca9de5b022a53f07fbfa7cb8023d0086471cd9a1ef822a3ff45931098acaedb2b94df2f882cc3bbadc18942293679d6816d SHA512 58d739bf789f7e25678adb19cc2d05bf98920d4f42a761f2c1fc45c72ac9080def9f2533f63c10dfea50f5d8428f7d4a19760a38dcc34bff9aaeb6fdd7e89434
 DIST mktwpol-1.0.0.tar.gz 59748 BLAKE2B 954d86774bf5e88612dc67f0ee29b637da188f64a8203b8aa84511e940db059afce0e993f4a703429688e29e964e5efc53a21b32f1ead3cee70bb7f056fc62a4 SHA512 f7a04bb3acdada6407e3e422e26ba2c0c454f10011a2848d0c8e962996e135a381c893f7fcdea67e1a3a23f503eb2071448beca05b7ca90e179d2a28173a973e
+DIST mktwpol-1.0.1.tar.gz 60491 BLAKE2B 66d7db396bbf7e5b2c4dd537ac9bcd387298ae733348b63c6d5cb6df79e9440ea751c27eccec66978371fa81a17929d25fcfbeca6787abf8b49f087b54a6468d SHA512 aa44af97533f130b89b83c6f2a8878d290770b677f6fb9fe654b033f57fcfb3d063a6a6ddf29599aa066452d75911cf8053d65b21c37e322851a10f4381cb33d
 EBUILD mktwpol-0.2.6.ebuild 1327 BLAKE2B e526b80f8c99b1d6f899f71d4284189ed3c6e5b5bd45a80ecc1fd735376c3d7f8b2607917e84bd3e93e87c04850f1db76aee721992fcf40708d9e5802b5ff966 SHA512 5af5b285e3cd9cf4197d7b30c485339dac7dcd0ecb7499e320e1df24514827995d2d951b53b669dee688bad0577aa004d9fed27dce7c0bc6b66a0b57a71179fc
 EBUILD mktwpol-1.0.0.ebuild 1327 BLAKE2B e526b80f8c99b1d6f899f71d4284189ed3c6e5b5bd45a80ecc1fd735376c3d7f8b2607917e84bd3e93e87c04850f1db76aee721992fcf40708d9e5802b5ff966 SHA512 5af5b285e3cd9cf4197d7b30c485339dac7dcd0ecb7499e320e1df24514827995d2d951b53b669dee688bad0577aa004d9fed27dce7c0bc6b66a0b57a71179fc
+EBUILD mktwpol-1.0.1.ebuild 2247 BLAKE2B f6ea333d2a4c69d9eb5095eed4aa2d0612cad2221c83db9b1aff97d0bddd7e06a9538274e58ec0297049984e8c6cbcfb194102fe8078da5238fbc72456179505 SHA512 83eb862e31aae103eb629789b25fff0df6b5d795621696c0dfd6fd749125458f1157bf26c72a43aae6145201ee28b3b0930a58e54ff23c8de2f9ff0e00074c4a
 MISC metadata.xml 1814 BLAKE2B 40c3405ca2533e816785d8fc2549895f42e2748d2826a5bde48cd9d7ec6370d5f306609e2032db287ed74ff7224711cc6a508d9afb4d80a85dffa02e1a3b4d58 SHA512 861a3e0c87dee0750caff734aa96708c72d6cb8a79b33a29b8aff5442b11e3e9855beb3d80428f3d6ab91542b3d1df033f55dc6942150d1eabc02fff46139e50
diff --git a/app-admin/mktwpol/mktwpol-1.0.1.ebuild b/app-admin/mktwpol/mktwpol-1.0.1.ebuild
new file mode 100644
index 000000000000..b494367e73b9
--- /dev/null
+++ b/app-admin/mktwpol/mktwpol-1.0.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Bash scripts to install tripwire and generate tripwire policy files"
+HOMEPAGE="https://sourceforge.net/projects/mktwpol"
+SRC_URI="mirror://sourceforge/mktwpol/${PF}.tar.gz"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="app-admin/tripwire"
+
+S=${WORKDIR}/${PF}
+
+src_prepare() {
+	default
+	sed -i -e 's:/usr/local:/usr:' Makefile || die
+}
+
+pkg_preinst() {
+	# one elog message for new/first installation
+	# different elog message when updating
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog
+		elog "To facilitate a new installation and setup of tripwire:"
+		elog " - Run: \`twsetup.sh\`"
+		elog
+		elog "To update tripwire database as packages are added or deleted:"
+		elog " - Run: \`mktwpol.sh -u\`"
+		elog
+		elog "Mktwpol is packaged with multiple policy-generating rules files."
+		elog "A default \"rules file\" is installed in /etc/tripwire"
+		elog "Alternatives are available in /usr/share/doc/${PF}"
+		elog
+		elog "mktwpol.sh uses the policy-generating rules file with the"
+		elog "most recent date.  To use an alternative \"rules file\","
+		elog "copy it from /usr/share/doc/${PF} to /etc/tripwire,"
+		elog " uncompress it, and \`touch\` it."
+		elog
+		elog "Read /usr/share/doc/${PF}/README for more tips."
+		elog
+	else
+		elog
+		elog "Version bump: mktwpol policy-generating rules have changed."
+		elog "Run \`mktwpol.sh -u\` to update tripwire policy and database."
+		elog
+		elog "Alternative policy-generating rules are in /usr/share/doc/${PF}"
+		elog "To use an alternative policy-generating rules file,"
+		elog "copy it to /etc/tripwire, uncompress and \`touch\` it."
+		elog
+	  fi
+	# ewarn message if a version change from 0.x.x
+	if [[ "${REPLACING_VERSIONS:0:1}" == "0" ]] ; then
+		ewarn
+		ewarn "Mktwpol default policy-generating rules no longer sort by package."
+		ewarn
+		ewarn "   This change does not reduce the scope of system inspection!"
+		ewarn "          It only affects the tripwire report format."
+		ewarn
+		ewarn "  The previous default reporting format is still available, at"
+		ewarn "  /usr/share/doc/${PF}/mktwpol-gentoo-packages.rules*"
+		ewarn
+	fi
+}
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 50498db3783a..76e7af96c425 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,9 +1,11 @@
 DIST mongo-tools-3.4.16.tar.gz 4697191 BLAKE2B 2e9a0e7dc8016d3e7d7c7f8d0cf80a97d3d199603c0b8b791df5a0d79d418ffaa232eee694047a7ca11fa7623023b4123becd437cfe3dec11e26cd525720bcad SHA512 b40c6dee75d860de1da73faf79f5f68c098ce7c80681486c66fff04a937474dcede91c7be907a8e36033b3898f7499e8f53271944c0df3360756c27361efb6f5
 DIST mongo-tools-3.6.8.tar.gz 4723878 BLAKE2B a1693024d60f69d25c268eaaa30a478b1e4c0042c5fb7a3fd6252ed00aef2fee3fba94516fe825165a1a57887ed38e4fbce488c48ddd4f45349f0b7a1b244020 SHA512 359e8ce2d847d005d48ff12bc2e8af73213d81cd1521d2b5b5ac94792468218248bebbe808e1bd8fd49234eab8480608f294c1b63f317aed58f456b84ef17dcf
+DIST mongo-tools-3.6.9.tar.gz 4723117 BLAKE2B 2cc88b9e8424abe082d68a8f7afa02bf2b21d027cabe04298fafbd065346350d57f6a48ece1a849e779cac6da315aa9d5469c5f63ca5aae6be7e8f73fae3fe4b SHA512 def8e2bb68898c540dfa9fbe742696d463c099e7d70fc2f0e114301d321e3983ef0b07588301340b0a3ffdf2280febc3fa37e77d2520f147e723d2ce147c7261
 DIST mongo-tools-4.0.3.tar.gz 10874727 BLAKE2B 3e5d07b8ae797d0876b68a3018806e91a30758415aaa236423648a77f5e0d475848060516ee0da91a8448813a12a685410b93bf219b8180beb91f448e329a532 SHA512 cbe74b3fdebd0d4f6be6e3acf7f55f5f1a551b0ad1a23d82782643d2a9eb9ea4b7e0133985485b8c5a88c1fea26595e3ed9c759f1f63b578b6472d850154d67b
 DIST mongo-tools-4.0.4.tar.gz 10878921 BLAKE2B 3960838f68333bf033be9b72191e221b449bde8157ecb6d2f595d84c862fadd9597a53be88e5b0ad691cb6163cf90294348145ecce4c796c88bf84a4d7d8ab86 SHA512 d7900dbbd1e1e63d5518494c85559a7eab34f53ffa38880628f3dda0a71ee1211f67cf7dfaac66498b0359eca32abb9c89410e5cc56415a1594acf38ebfa226b
 EBUILD mongo-tools-3.4.16.ebuild 1195 BLAKE2B 6e650a085da6e60e7f268e074ac45373a3a9948e4b69d88ece630697c48f8e85e856cbc324dc342097c9c5c7cd903c12dbee415c3fd8582b3acf205eb4301ed6 SHA512 fc8709a1d3ab755e61bbd01db2ade678082aca0c97715dd882ebb09a2ad8bfea8ec7f21ec0572863fec70d34346dfcc47ec8ab47725c910d92715ab74cf5cd62
 EBUILD mongo-tools-3.6.8.ebuild 1209 BLAKE2B b0001e50446b633ebc998662e3facf2b47417f8c2517ddd492dcba8def99c354a00a86b9e35a818202e75f42ee63761a3fc3623c61df60da1c4134261d9d9223 SHA512 93ce0059938aa8b052f9ccaa52573bd175e656bdb36f078838340b009b73dd96f3960eb468f295edda1e47c5e7fffe53933f98b2360b48a73137c97d70d51b5b
+EBUILD mongo-tools-3.6.9.ebuild 1303 BLAKE2B 58eb47ccc235810cf5051a5a60d0e50b6c79f0160cf9de5e7fc18f573bcb197634a4ac2b9ff4c76c2d32baa89b1492d98571d537ef2577dff65a5260065c138b SHA512 0154531d477e0f778876258f95a99c9dd340cbe6bf821df57267aadbec83fd8f56f16585d07a29d9ea52699e8d6f44f4b2e6f853f320222a93658d09ca1e0343
 EBUILD mongo-tools-4.0.3.ebuild 1303 BLAKE2B 58eb47ccc235810cf5051a5a60d0e50b6c79f0160cf9de5e7fc18f573bcb197634a4ac2b9ff4c76c2d32baa89b1492d98571d537ef2577dff65a5260065c138b SHA512 0154531d477e0f778876258f95a99c9dd340cbe6bf821df57267aadbec83fd8f56f16585d07a29d9ea52699e8d6f44f4b2e6f853f320222a93658d09ca1e0343
 EBUILD mongo-tools-4.0.4.ebuild 1303 BLAKE2B 58eb47ccc235810cf5051a5a60d0e50b6c79f0160cf9de5e7fc18f573bcb197634a4ac2b9ff4c76c2d32baa89b1492d98571d537ef2577dff65a5260065c138b SHA512 0154531d477e0f778876258f95a99c9dd340cbe6bf821df57267aadbec83fd8f56f16585d07a29d9ea52699e8d6f44f4b2e6f853f320222a93658d09ca1e0343
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.9.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.9.ebuild
new file mode 100644
index 000000000000..5cf7cbaadac3
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.6.9.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# 1) ensure we use bash wrt #582906
+	# 2) do not substitute version because it uses git
+	sed -e 's@/bin/sh@/bin/bash@g' \
+		-e '/^sed/,+3d' \
+		-e '/^stty/d' \
+		-e '/^mv/d' \
+		-i build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	./build.sh "${myconf[@]}" || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
index 13e1825ee2dd..04767fd6b1a8 100644
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@@ -1,5 +1,7 @@
-AUX packagekit-base-1.1.1-cache-qafix.patch 469 BLAKE2B fb0666e27d2908236a0adf31adcc9dbcaab94bdb1d4b253369b2bf92e18279e289ea8b486285ce9b19abfc79c81e308675019777f49b98ce6aca1e341695cfb6 SHA512 7efb79f5b25f4b1b3db22247c695e13d748908c6802667bd8dc322c247881bd133aa8787192598b384ce8080ac986031e5fee64201f17e4e8af7e15fc7d18424
-AUX packagekit-base-1.1.7-elogind-support.patch 5872 BLAKE2B a18f2e6016781b043d34cc82e76970a8fd18a4e08fb5516b2f332f6a3213e4fbb90311d6bd54a11b82b98e84d90598648562473aa497c8c4c69ad99a4cbd474e SHA512 26b6f163e44a1a837e8c9ac43b8f6ec9733962d746d0081e05d1691099c953e16055d530e7de5558aacd985b1690dcbea9c6087755d037d8029f34b158d74a45
-DIST PackageKit-1.1.7.tar.xz 1431648 BLAKE2B 0cc64e7ac38d6641a1fbd98ffad2e7920eb7b3c86ea36d3ad036541886191c38deeeb7241f81ec3d29f8268b1c84ec500511895312c29c706403607215117d5e SHA512 0d0277e24feb63e94aeb5fec2c4306ccdf5935c2f62d5eef3be8db9f534eb302eff09ea0e020db48b2dd0af9ba6b31f7960d661d1040774dccf650ebf04c4f83
-EBUILD packagekit-base-1.1.7-r2.ebuild 3658 BLAKE2B 1c762371380374854d5f5745c990dee34114952be04c1837cebf17f6db147f6aac80e6935c1984d765469cb70d23ed4e47e34a4728df334706ad42f8fca6aa5e SHA512 05be68bff165af27a2354e72f8a9102992530473dea1bdeb68507af493fce811bd338ff0d6b5ab7b2a17d4e91d1d258d151719a8742fa5e932126fd206292e6f
+AUX 1.1.12-add-missing-config.h.patch 713 BLAKE2B 490b87f64d6e21419a3832d2a3a8fb9a5c9b306cf63f7e5b956b8c585b1ccbe2bc8ce69f0a80f219dfff182789ace28a81cc81f4dd793ba98e1735295bd53fbd SHA512 a92c60f2c476f608021ecd9aa2b06169c9b690efcbf14c82afcc3313070a06965d35fff7b95873107f71d1f7d4557ee3e8de49c7d9544ce274c370ef7e9af09c
+AUX 1.1.12-cache-qafix.patch 1103 BLAKE2B ab5fe2d05729dbd449e14aae2533217207355475eaf6febffcf8395c6301fba7475ca7979187ae787e59209fc9d3178654a5edb7f2f744bddcc72d7ff5ed718f SHA512 dd35d569c5980ce3bb8ce508178dd7daaade553f380e91248186278b557c77a46486c52ed4ea25a808116e1579f3d51e9cb2ca09015fb1d03d6e0c31bd3b9403
+AUX 1.1.12-elogind-support.patch 6656 BLAKE2B 0bc942015430479fc1ae7c5cac080a8e68c53e4f5c45cea994bd44232f7dfe22e6623d31f9ed9a46bf31a851e888eea462785bc728db16951cf21c657fe1b575 SHA512 2126d57f2c0221cbad9f9796df0bfd817aaf26818f1287bf99c38a2396a7a0a140ff96c6369a18bfa008a91768d531fc4c0c5acd897fab3bbb35d755f39e946f
+AUX 1.1.12-use-autotool-python.patch 1072 BLAKE2B 8f96a404b3a80d13cb10488bf21a5710d9abf40e1725e47480a7451f7adcb9c4a0d834ac65f35d2013425b3c867d0126c23e999ff6077dd9735571fb9916432d SHA512 33e5d4364e32147de550204809fd86407607f102964986402379c8904f44f64db6ef7ac3a1b967fe6e70c8654f8a271b3f2934a370ec9422e58aaf54352d0320
+DIST PackageKit-1.1.12.tar.xz 1439024 BLAKE2B 458cb7a9a47941214ec58846fb840f852851555dbd94ed5113745f9e375cd28edaa8475db30fb889b1722ea01bce5200a5ea7a5f52e45b424703228bff59d689 SHA512 a7428416ae85df0c8e7dbe017396921e9214612c8eb7c91020523457d0feaff86ad50d595f702d255e4091364cb10b8d9506b603b9d0e449c39fced07180840b
+EBUILD packagekit-base-1.1.12.ebuild 3975 BLAKE2B b5bcec53f996e1ab5419959ec360e20dd0e3486ecbc205de1be4ba1a9e4e43f20b121a4d770b36dd7b48676ddf98b06c9950ea512954d297636a339c8f9da1eb SHA512 4a9249d43ba58abe4a7311a0bde7ace79c30d21dcb96a4477c0e26b7739dd9509bdc423f0fd565fe5db58bc6a5e1c18746ba31f60a4933997c66a1e1f4e2f6b5
 MISC metadata.xml 664 BLAKE2B 4dcdb79a089d9ec0734d9af4c2b6206ad1add7b17f8c8984b2e7763672fc334000749b4332e92224d11b0382fe22a2ca0f83ced4da218fbd1e85d8b101fd3e1f SHA512 9b80a98e97af44ab81b497b2c71c73db41da7f250734d6b032e80151719a0a82e2c1e295b068a5e3657a509dbd74d1f65f6e49fc211f77d0623eb7bdcd32b323
diff --git a/app-admin/packagekit-base/files/1.1.12-add-missing-config.h.patch b/app-admin/packagekit-base/files/1.1.12-add-missing-config.h.patch
new file mode 100644
index 000000000000..eb8c192e882c
--- /dev/null
+++ b/app-admin/packagekit-base/files/1.1.12-add-missing-config.h.patch
@@ -0,0 +1,25 @@
+From 3620f182745db77b5bf4552a9e8d8cb38fdc0268 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Tue, 4 Dec 2018 22:15:49 +0100
+Subject: [PATCH 2/2] trivial: Add missing config.h include
+
+---
+ lib/packagekit-glib2/pk-progress-bar.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/packagekit-glib2/pk-progress-bar.c b/lib/packagekit-glib2/pk-progress-bar.c
+index e75f319e4..28d8f5ac2 100644
+--- a/lib/packagekit-glib2/pk-progress-bar.c
++++ b/lib/packagekit-glib2/pk-progress-bar.c
+@@ -19,6 +19,8 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+  */
+ 
++#include "config.h"
++
+ #include <glib.h>
+ #include <string.h>
+ #include <unistd.h>
+-- 
+2.19.2
+
diff --git a/app-admin/packagekit-base/files/1.1.12-cache-qafix.patch b/app-admin/packagekit-base/files/1.1.12-cache-qafix.patch
new file mode 100644
index 000000000000..4e747616c06f
--- /dev/null
+++ b/app-admin/packagekit-base/files/1.1.12-cache-qafix.patch
@@ -0,0 +1,38 @@
+From d64070f1782ed06f83be7783e22cf86f4098f34e Mon Sep 17 00:00:00 2001
+From: Ettore Di Giacinto <mudler@gentoo.org>
+Date: Tue, 11 Dec 2018 16:54:42 +0100
+Subject: [PATCH 1/2] Drop $(localstatedir)/cache rules
+
+This directory can be flushed any moment and pre-existence of folders
+in it cannot be assumed.
+
+pk-transaction creates the downloads directory as needed. If backends
+need metadata folder they should create it if not found.
+
+Closes: https://github.com/gentoo/gentoo/pull/1760
+References: https://github.com/hughsie/PackageKit/issues/143
+---
+ src/Makefile.am | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 830aaf873..24c9a0b9a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -166,13 +166,6 @@ pk_self_test_CFLAGS =					\
+ 
+ TESTS = pk-self-test
+ 
+-install-data-hook:
+-	if test -w $(DESTDIR)$(prefix)/; then \
+-		mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/downloads; \
+-		mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/metadata; \
+-		mkdir -p $(DESTDIR)$(localstatedir)/log; \
+-	fi
+-
+ clean-local:
+ 	rm -f *~
+ 
+-- 
+2.19.2
+
diff --git a/app-admin/packagekit-base/files/packagekit-base-1.1.7-elogind-support.patch b/app-admin/packagekit-base/files/1.1.12-elogind-support.patch
index bb6b6103dde2..8be115bbc71d 100644
--- a/app-admin/packagekit-base/files/packagekit-base-1.1.7-elogind-support.patch
+++ b/app-admin/packagekit-base/files/1.1.12-elogind-support.patch
@@ -1,19 +1,22 @@
---- a/config.h.in	2017-06-07 16:38:45.046910693 +0200
-+++ b/config.h.in	2017-06-07 16:39:06.973911120 +0200
-@@ -78,8 +78,8 @@
- /* Define to 1 if you have the <string.h> header file. */
- #undef HAVE_STRING_H
- 
--/* Build systemd code */
--#undef HAVE_SYSTEMD
-+/* Build systemd-login code */
-+#undef HAVE_SYSTEMD_SD_LOGIN_H
- 
- /* Define to 1 if you have the <sys/stat.h> header file. */
- #undef HAVE_SYS_STAT_H
---- a/configure.ac	2017-06-06 09:03:57.171355965 +0200
-+++ b/configure.ac	2017-06-06 09:55:11.242384458 +0200
-@@ -254,7 +254,6 @@
+From ee8a65b3fd7636a60f8a2b2e509376cbbd8326cb Mon Sep 17 00:00:00 2001
+From: Sven Eden <yamakuzure@gmx.net>
+Date: Tue, 11 Dec 2018 16:59:28 +0100
+Subject: [PATCH 2/2] Add elogind support
+
+Closes: https://bugs.gentoo.org/620948
+Signed-off-by: Ettore Di Giacinto <mudler@gentoo.org>
+---
+ configure.ac    | 20 +++++++++++++++++++-
+ src/Makefile.am |  4 ++++
+ src/pk-dbus.c   |  8 ++++----
+ src/pk-engine.c | 12 ++++++------
+ 4 files changed, 33 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 737c1d4dc..0778c57d3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -216,7 +216,6 @@ if test x$enable_systemd = xyes; then
  		    AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
  		    [has_systemdsystemunitdir=$with_systemdsystemunitdir],
  		    [has_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
@@ -21,10 +24,11 @@
  	AC_SUBST([systemdsystemunitdir], [$has_systemdsystemunitdir])
  fi
  AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$has_systemdsystemunitdir"])
-@@ -267,6 +266,24 @@
+@@ -228,6 +227,24 @@ AC_ARG_ENABLE(offline-update, AS_HELP_STRING([--enable-offline-update],[enable o
+ 	      enable_offline_update=$enableval,enable_offline_update=yes)
  AM_CONDITIONAL(ENABLE_OFFLINE_UPDATE, [test x$enable_systemd = xyes -a x$enable_offline_update = xyes])
  
- dnl ---------------------------------------------------------------------------
++dnl ---------------------------------------------------------------------------
 +dnl - Use elogind instead of systemd-login
 +dnl ---------------------------------------------------------------------------
 +AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[enable elogind session tracker]),
@@ -42,18 +46,19 @@
 +		AC_DEFINE(HAVE_SYSTEMD_SD_LOGIN_H,1,[Build systemd-login code])
 +fi
 +
-+dnl ---------------------------------------------------------------------------
+ dnl ---------------------------------------------------------------------------
  dnl - Generate man pages ? (default enabled)
  dnl ---------------------------------------------------------------------------
- AC_ARG_ENABLE(man_pages, AS_HELP_STRING([--disable-man-pages],[Disable man pages generation]), enable_man_pages=$enableval)
-@@ -629,6 +644,7 @@
+@@ -590,6 +607,7 @@ echo "
          cflags:                    ${CFLAGS}
          cppflags:                  ${CPPFLAGS}
          Able to run locally:       ${enable_local}
 +        Use elogind:               ${enable_elogind}
          Use systemd:               ${enable_systemd}
          Enable offline update:     ${enable_offline_update}
-         Networking stacks:         ${networking_apis}
+         GStreamer plugin:          ${build_gstreamer_plugin}
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 24c9a0b9a..468f31d04 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -9,6 +9,7 @@ AM_CPPFLAGS =						\
@@ -88,9 +93,51 @@
  	$(SYSTEMD_LIBS)
  
  pk_self_test_CPPFLAGS =					\
---- a/src/pk-engine.c	2017-06-06 09:12:23.828371176 +0200
-+++ b/src/pk-engine.c	2017-06-06 09:55:47.426385545 +0200
-@@ -98,7 +98,7 @@
+diff --git a/src/pk-dbus.c b/src/pk-dbus.c
+index 0cf512f38..37cc1d83c 100644
+--- a/src/pk-dbus.c
++++ b/src/pk-dbus.c
+@@ -27,7 +27,7 @@
+ #include <glib.h>
+ #include <gio/gio.h>
+ 
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+  #include <systemd/sd-login.h>
+ #endif
+ 
+@@ -177,7 +177,7 @@ pk_dbus_get_cmdline (PkDbus *dbus, const gchar *sender)
+ 	return cmdline;
+ }
+ 
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ static gchar *
+ pk_dbus_make_logind_session_id (const gchar *session)
+ {
+@@ -218,7 +218,7 @@ gchar *
+ pk_dbus_get_session (PkDbus *dbus, const gchar *sender)
+ {
+ 	gchar *session = NULL;
+-#ifndef HAVE_SYSTEMD
++#ifndef HAVE_SYSTEMD_SD_LOGIN_H
+ 	g_autoptr(GError) error = NULL;
+ #endif
+ 	guint pid;
+@@ -248,7 +248,7 @@ pk_dbus_get_session (PkDbus *dbus, const gchar *sender)
+ 	}
+ 
+ 	/* get session from systemd or ConsoleKit */
+-#ifdef HAVE_SYSTEMD
++#ifdef HAVE_SYSTEMD_SD_LOGIN_H
+ 	session = pk_dbus_get_session_systemd (pid);
+ 	if (session == NULL)
+ 		g_warning ("failed to get session for pid %u", pid);
+diff --git a/src/pk-engine.c b/src/pk-engine.c
+index f63058fbc..7ea87a448 100644
+--- a/src/pk-engine.c
++++ b/src/pk-engine.c
+@@ -98,7 +98,7 @@ struct PkEnginePrivate
  	guint			 owner_id;
  	GDBusNodeInfo		*introspection;
  	GDBusConnection		*connection;
@@ -99,7 +146,7 @@
  	GDBusProxy		*logind_proxy;
  	gint			 logind_fd;
  #endif
-@@ -281,7 +281,7 @@
+@@ -256,7 +256,7 @@ pk_engine_emit_offline_property_changed (PkEngine *engine,
  static void
  pk_engine_inhibit (PkEngine *engine)
  {
@@ -108,7 +155,7 @@
  	g_autoptr(GError) error = NULL;
  	g_autoptr(GUnixFDList) out_fd_list = NULL;
  	g_autoptr(GVariant) res = NULL;
-@@ -331,7 +331,7 @@
+@@ -303,7 +303,7 @@ pk_engine_inhibit (PkEngine *engine)
  static void
  pk_engine_uninhibit (PkEngine *engine)
  {
@@ -117,16 +164,16 @@
  	if (engine->priv->logind_fd == 0)
  		return;
  	g_debug ("closed logind fd %i", engine->priv->logind_fd);
-@@ -1830,7 +1830,7 @@
+@@ -1701,7 +1701,7 @@ pk_engine_offline_method_call (GDBusConnection *connection_, const gchar *sender
  	}
  }
  
 -#ifdef HAVE_SYSTEMD
 +#ifdef HAVE_SYSTEMD_SD_LOGIN_H
- /**
-  * pk_engine_proxy_logind_cb:
-  **/
-@@ -1872,7 +1872,7 @@
+ static void
+ pk_engine_proxy_logind_cb (GObject *source_object,
+ 			   GAsyncResult *res,
+@@ -1737,7 +1737,7 @@ pk_engine_on_bus_acquired_cb (GDBusConnection *connection,
  	/* save copy for emitting signals */
  	engine->priv->connection = g_object_ref (connection);
  
@@ -135,7 +182,7 @@
  	/* connect to logind */
  	g_dbus_proxy_new (connection,
  			  G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-@@ -2031,7 +2031,7 @@
+@@ -1883,7 +1883,7 @@ pk_engine_finalize (GObject *object)
  	if (engine->priv->connection != NULL)
  		g_object_unref (engine->priv->connection);
  
@@ -144,41 +191,6 @@
  	/* uninhibit */
  	if (engine->priv->logind_fd != 0)
  		close (engine->priv->logind_fd);
---- a/src/pk-dbus.c	2017-06-06 09:12:13.254370858 +0200
-+++ b/src/pk-dbus.c	2017-06-06 10:09:17.249409857 +0200
-@@ -27,7 +27,7 @@
- #include <glib.h>
- #include <gio/gio.h>
- 
--#ifdef HAVE_SYSTEMD
-+#ifdef HAVE_SYSTEMD_SD_LOGIN_H
-  #include <systemd/sd-login.h>
- #endif
- 
-@@ -177,7 +177,7 @@
- 	return cmdline;
- }
- 
--#ifdef HAVE_SYSTEMD
-+#ifdef HAVE_SYSTEMD_SD_LOGIN_H
- /**
-  * pk_dbus_get_session_systemd:
-  **/
-@@ -220,7 +220,7 @@
- pk_dbus_get_session (PkDbus *dbus, const gchar *sender)
- {
- 	gchar *session = NULL;
--#ifndef HAVE_SYSTEMD
-+#ifndef HAVE_SYSTEMD_SD_LOGIN_H
- 	g_autoptr(GError) error = NULL;
- #endif
- 	guint pid;
-@@ -250,7 +250,7 @@
- 	}
- 
- 	/* get session from systemd or ConsoleKit */
--#ifdef HAVE_SYSTEMD
-+#ifdef HAVE_SYSTEMD_SD_LOGIN_H
- 	session = pk_dbus_get_session_systemd (pid);
- #else
- 	/* get session from ConsoleKit */
+-- 
+2.19.2
+
diff --git a/app-admin/packagekit-base/files/1.1.12-use-autotool-python.patch b/app-admin/packagekit-base/files/1.1.12-use-autotool-python.patch
new file mode 100644
index 000000000000..542abd5e566c
--- /dev/null
+++ b/app-admin/packagekit-base/files/1.1.12-use-autotool-python.patch
@@ -0,0 +1,28 @@
+From f664bbc43d12f4b30431dfe2ecee4c9ebfaf00e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 1 Dec 2018 18:55:37 +0000
+Subject: [PATCH 1/2] lib/python/packagekit/Makefile.am: Use the detected
+ PYTHON version
+
+This will fix compilation in system where only the "python3"
+executable exists
+---
+ lib/python/packagekit/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/python/packagekit/Makefile.am b/lib/python/packagekit/Makefile.am
+index 617006647..a589cde17 100644
+--- a/lib/python/packagekit/Makefile.am
++++ b/lib/python/packagekit/Makefile.am
+@@ -1,7 +1,7 @@
+ BUILT_SOURCES = enums.py
+ 
+ enums.py: $(top_srcdir)/lib/python/enum-convertor.py $(top_srcdir)/lib/packagekit-glib2/pk-enum.c
+-	python $(top_srcdir)/lib/python/enum-convertor.py $(top_srcdir)/lib/packagekit-glib2/pk-enum.c > enums.py
++	$(PYTHON) $(top_srcdir)/lib/python/enum-convertor.py $(top_srcdir)/lib/packagekit-glib2/pk-enum.c > enums.py
+ 
+ if HAVE_PYTHON_BACKEND
+ packagekitpythondir = ${PYTHON_PACKAGE_DIR}
+-- 
+2.19.2
+
diff --git a/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch b/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch
deleted file mode 100644
index d7ec4b268c84..000000000000
--- a/app-admin/packagekit-base/files/packagekit-base-1.1.1-cache-qafix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/~Makefile.am	2016-06-29 10:59:14.178918032 +0200
-+++ b/src/Makefile.am	2016-06-29 11:02:50.739929627 +0200
-@@ -175,11 +175,7 @@ pk_self_test_CFLAGS =					\
- TESTS = pk-self-test
- 
- install-data-hook:
--	if test -w $(DESTDIR)$(prefix)/; then \
--		mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/downloads; \
--		mkdir -p $(DESTDIR)$(localstatedir)/cache/PackageKit/metadata; \
--		mkdir -p $(DESTDIR)$(localstatedir)/log; \
--	fi
-+
- 
- clean-local:
- 	rm -f *~
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.7-r2.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
index cf2c12a7ae0e..e7bddc8c7ca6 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.7-r2.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 # PackageKit supports 3.2+, but entropy and portage backends are untested
-# Future note: use --enable-python3
 PYTHON_COMPAT=( python2_7 )
 VALA_USE_DEPEND="vapigen"
 
@@ -25,6 +24,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )
 	vala? ( introspection )
+	entropy? ( $(python_gen_useflags 'python2*' ) )
 "
 
 # While not strictly needed, consolekit is the alternative to systemd-login
@@ -33,21 +33,25 @@ COMMON_DEPEND="
 	>=app-shells/bash-completion-2
 	dev-db/sqlite:3
 	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.46.0:2
-	>=sys-auth/polkit-0.98
+	>=dev-libs/glib-2.54.0:2
+	>=sys-auth/polkit-0.114
 	>=sys-apps/dbus-1.3.0
 	${PYTHON_DEPS}
 	elogind? ( >=sys-auth/elogind-229.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.9:= )
-	systemd? ( >=sys-apps/systemd-204 )
+	systemd? ( >=sys-apps/systemd-213 )
 "
 # vala-common needed for eautoreconf
 DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
 	>=dev-cpp/glibmm-2.4
-	dev-libs/libxslt[${PYTHON_USEDEP}]
+	dev-libs/libxml2:2
+	dev-libs/libxslt
 	dev-libs/vala-common
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.11
 	>=dev-util/intltool-0.35.0
+	sys-devel/autoconf-archive
 	sys-devel/gettext
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
@@ -66,11 +70,16 @@ PATCHES=(
 	# Fixes QA Notices:
 	# - https://github.com/gentoo/gentoo/pull/1760
 	# - https://github.com/hughsie/PackageKit/issues/143
-	"${FILESDIR}"/${PN}-1.1.1-cache-qafix.patch
+	"${FILESDIR}"/${PV}-cache-qafix.patch
 
 	# Adds elogind support:
 	# - https://bugs.gentoo.org/show_bug.cgi?id=620948
-	"${FILESDIR}"/${P}-elogind-support.patch
+	# - https://github.com/hughsie/PackageKit/pull/299
+	"${FILESDIR}"/${PV}-elogind-support.patch
+
+	# From master
+	"${FILESDIR}"/${PV}-use-autotool-python.patch
+	"${FILESDIR}"/${PV}-add-missing-config.h.patch
 )
 
 S="${WORKDIR}/${MY_P}"
@@ -86,15 +95,15 @@ src_prepare() {
 		-e 's:^\(.*/packagekit-glib2/console\)://\1:' \
 		-i lib/packagekit-glib2/pk-test-daemon.c || die
 	sed -e 's:^\(.*/packagekit/spawn\)://\1:' \
-	    -e 's:^\(.*/packagekit/transaction-db\)://\1:' \
-	    -e 's:^\(.*/packagekit/backend\)://\1:' \
+		-e 's:^\(.*/packagekit/transaction-db\)://\1:' \
+		-e 's:^\(.*/packagekit/backend\)://\1:' \
 		-i src/pk-self-test.c || die
 
 	eapply_user
 	use vala && vala_src_prepare
 	xdg_src_prepare
 
-	# Needed by elogind patch:
+	# Needed by elogind patch
 	eautoreconf
 }
 
@@ -123,8 +132,10 @@ src_configure() {
 }
 
 src_install() {
+	python_fix_shebang backends/portage/portageBackend.py
+
 	emake DESTDIR="${D}" install
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 
 	dodoc AUTHORS ChangeLog MAINTAINERS NEWS README
 }
diff --git a/app-admin/packagekit-gtk/Manifest b/app-admin/packagekit-gtk/Manifest
index bd6e34b0d492..dc9d8e00c20a 100644
--- a/app-admin/packagekit-gtk/Manifest
+++ b/app-admin/packagekit-gtk/Manifest
@@ -1,3 +1,3 @@
-DIST PackageKit-1.1.7.tar.xz 1431648 BLAKE2B 0cc64e7ac38d6641a1fbd98ffad2e7920eb7b3c86ea36d3ad036541886191c38deeeb7241f81ec3d29f8268b1c84ec500511895312c29c706403607215117d5e SHA512 0d0277e24feb63e94aeb5fec2c4306ccdf5935c2f62d5eef3be8db9f534eb302eff09ea0e020db48b2dd0af9ba6b31f7960d661d1040774dccf650ebf04c4f83
-EBUILD packagekit-gtk-1.1.7.ebuild 1166 BLAKE2B 22ee861bbb6f346badbf1c053c43c02cdb532fdd25c1db4e4a2aba2c1933c21ffcb01b9882a1d98aff5ce8f083d4c1ad901d7a14cde5e1f15bcb3a79c4772ad8 SHA512 027a88ea2fefb7364acb76e2e7963d2e0dd3794f41da8419d4aebdcbf6e930a78d5e6e25cb4d924a68d7025c610e306ded4ba6321a6e9c01b35503e5ff3054a6
+DIST PackageKit-1.1.12.tar.xz 1439024 BLAKE2B 458cb7a9a47941214ec58846fb840f852851555dbd94ed5113745f9e375cd28edaa8475db30fb889b1722ea01bce5200a5ea7a5f52e45b424703228bff59d689 SHA512 a7428416ae85df0c8e7dbe017396921e9214612c8eb7c91020523457d0feaff86ad50d595f702d255e4091364cb10b8d9506b603b9d0e449c39fced07180840b
+EBUILD packagekit-gtk-1.1.12.ebuild 1174 BLAKE2B ae3a77b1b499bc90542cec9f3878da3c320ec39c5d56f026cf5219e1032a5578c7822f01d26efb2675dc225bfce35b1711a613e33c5b81c845de4888f12f26a9 SHA512 f4c50e10dbf602c1568ebf05f5d59b8b77241a4e5b2cbb6c49bf045ad057a4e716152e5d604dde49ff355c0ab9fa4ba3a9dea28d7d8b6864144ec3c22711e22b
 MISC metadata.xml 365 BLAKE2B 56b0b07f000f1e0960650c60d41063585322a4d4c6067db315c85ae2fb113b747c46e6f89f99183bc607007f9d625d9e45c12d4bb81f82f002eab046e16b3f48 SHA512 7efd2e5bf58f32e97348200e6a891143009398504480ec30a8ee4f71bef600065094a8cb451bf8d5a86342add5251c5b54cd522b9f8b458501dc21fb3190bb69
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-1.1.7.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.1.12.ebuild
index 9fd918b69635..30edc446954c 100644
--- a/app-admin/packagekit-gtk/packagekit-gtk-1.1.7.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-1.1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit eutils
+inherit xdg
 
 MY_PN="PackageKit"
 MY_P=${MY_PN}-${PV}
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
-	>=dev-libs/glib-2.46:2
+	>=dev-libs/glib-2.54:2
 	media-libs/fontconfig
 	>=x11-libs/gtk+-2:2
 	>=x11-libs/gtk+-3:3
@@ -55,5 +55,5 @@ src_compile() {
 
 src_install() {
 	emake -C contrib/gtk-module DESTDIR="${D}" install
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-admin/packagekit/Manifest b/app-admin/packagekit/Manifest
index 3ffb673de7cc..608f2636b276 100644
--- a/app-admin/packagekit/Manifest
+++ b/app-admin/packagekit/Manifest
@@ -1,2 +1,2 @@
-EBUILD packagekit-1.1.7.ebuild 443 BLAKE2B bfd8b839f250c3aa17f1eddf1d63c2de14add3da03a9d0215a6672fc417ba789f17568c8735e12bf53e1684c5e458aa320c42dff6c0b001b79c239ba9253eb15 SHA512 a4c9ed4b7efac6398ac6a77487e5ec74a5e612f461356d141fde90e3325ae98cfd31e9887942e8a737f18cbfcd5c2927493424b76a7e4b712c56239f9cf597e0
+EBUILD packagekit-1.1.12.ebuild 440 BLAKE2B 55e02b1bae8bec3fc5b1b97eb5be1e09bc7468ad1ee1824997af1bc1913fb0eb167727441887d42e7785fe687da6667f1528e8df9e7754cc367edbc8410cc148 SHA512 9f0648d194fe208879dcca04eff58b6e6127079cb85b2e808e86ed054a92be2f44dcd28c5ad8d77ffd1ac306b6260c3600f6d3d096028d7a2b1be8b8f95ece41
 MISC metadata.xml 365 BLAKE2B 56b0b07f000f1e0960650c60d41063585322a4d4c6067db315c85ae2fb113b747c46e6f89f99183bc607007f9d625d9e45c12d4bb81f82f002eab046e16b3f48 SHA512 7efd2e5bf58f32e97348200e6a891143009398504480ec30a8ee4f71bef600065094a8cb451bf8d5a86342add5251c5b54cd522b9f8b458501dc21fb3190bb69
diff --git a/app-admin/packagekit/packagekit-1.1.7.ebuild b/app-admin/packagekit/packagekit-1.1.12.ebuild
index 7b3d8c9972a8..c91143dec182 100644
--- a/app-admin/packagekit/packagekit-1.1.7.ebuild
+++ b/app-admin/packagekit/packagekit-1.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/pass-otp/Manifest b/app-admin/pass-otp/Manifest
index 8ee3c4b70c22..b834692f3070 100644
--- a/app-admin/pass-otp/Manifest
+++ b/app-admin/pass-otp/Manifest
@@ -1,5 +1,3 @@
-DIST pass-otp-1.1.0.tar.gz 32857 BLAKE2B 97ca197b251d9748c0ace5b40aca2547cd278e9eee9768b8882cdfbb23bd440792101ab82d2ade276cfc34de1364460a066adc8395336380b1ef6759f51804eb SHA512 3c880bcb7e7e984494796bc7a0c0fb5f70b052938f6ce5c0b1cbb745d0b30febab2ca51c264fac02f884699dc685400076f0065db0c3d08da436e93c27f075ce
-DIST pass-otp-1.1.1.tar.gz 46283 BLAKE2B d2448a82b67a685e9df366dbec29fd4a3cedea03b0218714b95d5bc2663ac86b3fa79a4bba5157b6948111aa7bf06d5d48e320d9fecf1b23e71ff73d3b65d861 SHA512 8dfaafac08aa17a4ee1ae34bb47d26ca337fe05b69be19a3bcb3521e033631fde9dd559481c1512500775186ca08e26a4589dfc76b4dac718f64a33819c9b5b6
-EBUILD pass-otp-1.1.0.ebuild 542 BLAKE2B 42879f88f90f48812df4a5f2222e359e4de7548fca66c2d5b73ea4cf38086567ff1bfdf2d71f139800ab41afd131cd66a98c43856150bd7271e8ad99c84e4740 SHA512 dd85fbb99da67602dbecd710843381204f08c781a418d3fb6225374c5188b283aa0182c8df9ff69754749f82e85b263cb203b22fc4ef3f045d935ad103f3bcdc
-EBUILD pass-otp-1.1.1.ebuild 542 BLAKE2B 33edcab8e1e08ff11f1f7d91d05d7e8a2d95d468e3baee38fd832a981059743577ae7ae98d3e93e932e92da330cd04150f56123064fabe22d678d499887145b9 SHA512 90ae31d50a5a4bbbe42bdef4898c98c59e7521a23616bd4205a921f3649c3779bc6bafb05d26023680f88ae0784be91312fffd6991d37bd8ddcddadd6d630a32
+DIST pass-otp-1.2.0.tar.gz 46789 BLAKE2B 373b1ddfb4cfae07e9e58bdad1c9c73ca6c6f53fc140ccda21527ad2ae237d3402bc52e95a180811263ef1a29f5c9da7db0063178b19a85b1dafc3d20e22996d SHA512 3d1417462998750ef1580169ed0e4b721b5f430cd86a678d1b6bc7b2ac123879902f7d22c28dc21e8a171ec80dfc51b6465d0dcc78cb009eb731651f2cb152f5
+EBUILD pass-otp-1.2.0.ebuild 644 BLAKE2B 654311acef1502d88773782670fb3217fb29fb1cadc6d88eb77a71e5157dff136cf94da3bd1854723aea203cd5c47829755c19f8ec94197755d13581b8b68402 SHA512 df41f91e005673a3e960af58a9d1d0128213aabb5b6577ff2cd34d0ab72ef232bc06b780e8c85c4a0d38c95e8ec8adb57e6eb3507cf70f3d38c911b024a3b9f8
 MISC metadata.xml 661 BLAKE2B 34d62c5a12f51ddde97f0cc24ae0d6633844e847e9cfa81ffd4191b489f6fed7fc42a6e9f8ca75119f31f02306fbe958c68f220466d222db498fb6cff0e74a8b SHA512 071e5ad337d3e41afe2c6d4feb26f02c5f1105e5f51899af2f5021782c9a836b52e0575d8343bc3532fa227d2b385f248d72be46cc395233d7c77325beefea6e
diff --git a/app-admin/pass-otp/pass-otp-1.1.0.ebuild b/app-admin/pass-otp/pass-otp-1.1.0.ebuild
deleted file mode 100644
index c314e589f5a0..000000000000
--- a/app-admin/pass-otp/pass-otp-1.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A pass extension for managing one-time-password (OTP) tokens."
-HOMEPAGE="https://github.com/tadfisher/pass-otp"
-SRC_URI="https://github.com/tadfisher/pass-otp/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="qrcode test"
-
-DEPEND="test? ( dev-tcltk/expect:* )"
-
-RDEPEND=">=app-admin/pass-1.7
-	sys-auth/oath-toolkit
-	qrcode? ( media-gfx/qrencode )"
-
-src_compile() {
-	:
-}
diff --git a/app-admin/pass-otp/pass-otp-1.1.1.ebuild b/app-admin/pass-otp/pass-otp-1.2.0.ebuild
index c4d4d19aa424..b93a38c51e23 100644
--- a/app-admin/pass-otp/pass-otp-1.1.1.ebuild
+++ b/app-admin/pass-otp/pass-otp-1.2.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit bash-completion-r1
+
 DESCRIPTION="A pass extension for managing one-time-password (OTP) tokens."
 HOMEPAGE="https://github.com/tadfisher/pass-otp"
 SRC_URI="https://github.com/tadfisher/pass-otp/releases/download/v${PV}/${P}.tar.gz"
@@ -21,3 +23,7 @@ RDEPEND=">=app-admin/pass-1.7
 src_compile() {
 	:
 }
+
+src_install() {
+	emake install DESTDIR="${D}" BASHCOMPDIR="$(get_bashcompdir)"
+}
diff --git a/app-admin/pdk/Manifest b/app-admin/pdk/Manifest
new file mode 100644
index 000000000000..90392e0e566b
--- /dev/null
+++ b/app-admin/pdk/Manifest
@@ -0,0 +1,3 @@
+DIST pdk_1.8.0.0-1stretch_amd64.deb 128361866 BLAKE2B 1d21de3e011d8f111ca9910193fb2ffd3360ec1bc7d1917b89c24d42dad8c1b521b12f37850cfc88a32cc79aab76000b2801568683e96ef9aedfbe7ab48bf6b3 SHA512 edae3add1d7a0e66361cc60c555f556355a07d80dc05b21cfa8c994b8a66442168d72b602258d984f9c19c15e561c9260d3ebbc82e6bfc22758f4327d78791c2
+EBUILD pdk-1.8.0.0.ebuild 1612 BLAKE2B 56d49807d13d85c8b43ec6eefc0fe7cf6df5b6a051b9b5c3ee91020b1b7e1b77b5820a9bf42f15f87d5f90817ff3719a6c680c5eb9111743e47973c82f514c1d SHA512 1bd46ddc1b081ca5571e5fdf40d11826e6724ceda15d3f0e890013336c2dbcad399a015326cde376edf06e201af7094f0c462f3d3012460937ff86171396d588
+MISC metadata.xml 506 BLAKE2B 60ddf5360dc7ec3445d32266ef29d6f7914ba39e57e103e841bb5d9369fa8ceecb60688324c9a35de17105a3431e8402618f2465eb355a37f6832a38d30601b3 SHA512 a8c114c397faaef7810a481d7cb15f2458d4cc8f6997975c480e21ce2601495f219d21d945f6299d2400d4a4da62618bc7a7dfaff63b930ca5f26b9844c88b20
diff --git a/app-admin/pdk/metadata.xml b/app-admin/pdk/metadata.xml
new file mode 100644
index 000000000000..33d86fd60981
--- /dev/null
+++ b/app-admin/pdk/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		PDK includes testing tools, a complete module skeleton, and command line
+		tools to help you create, validate, and run tests on Puppet modules. PDK
+		also includes all dependencies needed for its use.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-admin/pdk/pdk-1.8.0.0.ebuild b/app-admin/pdk/pdk-1.8.0.0.ebuild
new file mode 100644
index 000000000000..a456fa1d3975
--- /dev/null
+++ b/app-admin/pdk/pdk-1.8.0.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils unpacker
+
+DESCRIPTION="Puppet SDK - develop and test puppet modules"
+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 )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="strip"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+	/opt/puppetlabs/pdk
+	/opt/puppetlabs/pdk/lib/engines/*
+	/opt/puppetlabs/pdk/lib/*
+	/opt/puppetlabs/pdk/bin/*"
+
+src_install() {
+	# Drop the opt folder into place
+	insinto /opt
+	doins -r opt/*
+
+	# Add symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/pdk/bin/"
+	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/git/bin/"
+	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/ruby/2.1.9/bin/"
+	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/ruby/2.4.4/bin/"
+	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/ruby/2.5.1/bin/"
+	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/puppet/ruby/2.1.0/bin/"
+	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/puppet/ruby/2.4.0/bin/"
+	chmod 0755 -R "${D}/opt/puppetlabs/pdk/private/puppet/ruby/2.5.0/bin/"
+
+	# remove rwx a.out stuff
+	rm "${D}"/opt/puppetlabs/pdk/private/ruby/2.4.4/lib/ruby/gems/2.4.0/gems/ffi-1.9.25/ext/ffi_c/libffi-x86_64-linux/a.out
+	rm "${D}"/opt/puppetlabs/pdk/share/cache/ruby/2.1.0/gems/ffi-1.9.25/ext/ffi_c/libffi-x86_64-linux/a.out
+	rm "${D}"/opt/puppetlabs/pdk/share/cache/ruby/2.5.0/gems/ffi-1.9.25/ext/ffi_c/libffi-x86_64-linux/a.out
+
+	dosym ../../opt/puppetlabs/pdk/bin/pdk /usr/bin/pdk
+}
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index a803d9bae618..85ed01f73a9a 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -1,12 +1,8 @@
 AUX perl-cleaner-2.20-prefix.patch 4874 BLAKE2B cf598a2e1aa03959ac1f1a799daaf33ceb640e99652da386e4a15e58fd02a06d4462251a347431ca943dad2cd3945942d4a9d3e95bb9cd607bda61c1843018cc SHA512 217ab3c7958e791c7e71ede8763ff98db7479d7eaeaa5fc9b0eb8607ed4a28ee1e7bb648a8e6fbc05913755b6eb0555fb70cd81c9124ebf562119b24ce66cb6f
 DIST perl-cleaner-2.20.tar.bz2 6704 BLAKE2B f5a5e431382300d2fff474f15744d992da1cc55536168d476fe73837443d97a331c1c40d92e706559bc6bdbc69fff9ebbf0cf532a0b5533e4f11c5c0db660cba SHA512 29888b4ee19a186ddaa1209d893ac57bed683b551546f63aeb874f8cc1fcab4ea0b0401247968aed0fb3b9a7d7196a803d6713e85b44cb94bc6642a44fbc4cf1
-DIST perl-cleaner-2.23.tar.bz2 6495 BLAKE2B 4e0b4dcbe22c0642e753dc999ba3fec4daa40a90d7955dc4e10d2d9222d1a22b3b5ff3ed50552a820b07c7b3be572bda00de3a60b876cb8631aa0805b7e9c0bb SHA512 e0879f75737746479cd1032acfed50f20aad183d834e1e0e9b847edeb14577b32ac8fd4b0f5ff54c03937f181d8f5702c3bd009587a5930d40eee59a13fe6624
-DIST perl-cleaner-2.24.tar.bz2 7161 BLAKE2B 41f7b02a7de3f0b5dd1e6c28e9db51df6f4d5e3a36ecb924ffc93d8a3883a2133ece40eb3133faef6e5adf5b26f4cf3638741b586d874a193995e55704f78ed5 SHA512 c6e32aa3123064e9e2fb02823a8b228e3c77720f5c471e9be51f2a4b2765a6c83dcc2ac24fbffae077f4882c70054eb0a3ca0243677a5ac970cb7a64e8b9c265
 DIST perl-cleaner-2.25.tar.bz2 7435 BLAKE2B 348f5429874bf7b1db5c9ba5b1479c3d5fbce68fc9ef91aa44dad3325ab2287d4bfda9221063dd643ec3b6df465443bb9a024705ec46f15c50ccd618ef193ce6 SHA512 5ef5682872ce840c0df98de82a6cf622120435f542206a00bb8fe0f9d5e46fb9898a89ab576b08a74b0d69d57a90a930d9f8d7d0b527fa3a928a6e4ddbad6ee9
 DIST perl-cleaner-2.26.tar.bz2 7462 BLAKE2B 3e651503da847275b452d7eedcecc820b9572890d7ef1b3c421ac170a1daf8ae712a9b62f6c9fd4705d973566b59190638f980962f145741f5ae47eefed836f9 SHA512 5c3fa164a2b5e84e5520276e4f3ff4872298cf53aa973afd6c8755e71884f1591c7cd5cc99d399d343ca01cb9ece8ee3e8e3aaf1908d22afc31ae08fab1e5821
 EBUILD perl-cleaner-2.20.ebuild 1186 BLAKE2B 1a7b893bd93e0e277d1ae43e2a011a5cfdd9432e6e8061849d46eef445203071a4ff7f5f2f6bbf46f6d1b372f108c90cb03a9b343f570d66446e977401f56c87 SHA512 5d2577f74a842cfcba8a3edb60050f5a6ee9098c3e21a695457422967afda04d599c5b7c0b2bdf26408c49e618e5bc046cb161face449f12215cae2b66c31501
-EBUILD perl-cleaner-2.23.ebuild 1046 BLAKE2B 864a808ab097bcbec0ea38a55de0bfb39766fc4167d4129235769ed1a965fea84268b3f0d719cc762453dcfccae2784b50edf689b19231b8c001b4eeb22f104d SHA512 27f6a4098fbbfe3e0474cbf7f88562d9601d1cdc32cf619c9a8bcf6296932c3b48da43641902e22ab702d1648393f4e5d207ba782b76dcb5da38c0e8962187d3
-EBUILD perl-cleaner-2.24.ebuild 1046 BLAKE2B 864a808ab097bcbec0ea38a55de0bfb39766fc4167d4129235769ed1a965fea84268b3f0d719cc762453dcfccae2784b50edf689b19231b8c001b4eeb22f104d SHA512 27f6a4098fbbfe3e0474cbf7f88562d9601d1cdc32cf619c9a8bcf6296932c3b48da43641902e22ab702d1648393f4e5d207ba782b76dcb5da38c0e8962187d3
 EBUILD perl-cleaner-2.25.ebuild 1033 BLAKE2B cb2b0768286815689d8516f06b8fb78436b0fc3746768e25458af4d8843e65c20298496cb808c0b19c55f96d9c2eaeb121afc6aed52704b48ddc18bb6467175c SHA512 5d13694ae65fc83e1429c85a92b30dbc033a30ac31e93809eb63e54c7d22e1ec24479ddffdf01d3fb6fe2164b3373a96a0e0383ba5d2e4afa6d80036eac61e41
 EBUILD perl-cleaner-2.26-r1.ebuild 1102 BLAKE2B 901777e1ab63c96a03df5ed3e2fa8e8466040079353ad8030df316454c55b47c9bdf5b9a03831d393eae61d3273763dc9a8119f1f1c7a0762545598b715296b4 SHA512 5ca9ef465fd36420df8f61fe7381c8e6ca7f81b020420054bf6e94367caf6ba987da27fc3af3bae09ce4cc4b671da314937aeaeae6961bc69e8d9a964705653b
 EBUILD perl-cleaner-9999.ebuild 1102 BLAKE2B 901777e1ab63c96a03df5ed3e2fa8e8466040079353ad8030df316454c55b47c9bdf5b9a03831d393eae61d3273763dc9a8119f1f1c7a0762545598b715296b4 SHA512 5ca9ef465fd36420df8f61fe7381c8e6ca7f81b020420054bf6e94367caf6ba987da27fc3af3bae09ce4cc4b671da314937aeaeae6961bc69e8d9a964705653b
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
deleted file mode 100644
index 9d0429d247d4..000000000000
--- a/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix
-
-DESCRIPTION="User land tool for cleaning up old perl installs"
-HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
-
-RDEPEND="app-shells/bash
-	dev-lang/perl
-	|| (
-		( sys-apps/portage app-portage/portage-utils )
-		sys-apps/pkgcore
-	)
-"
-
-src_prepare() {
-	default
-	eprefixify ${PN}
-}
-
-src_install() {
-	dosbin perl-cleaner
-	doman perl-cleaner.1
-}
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild
deleted file mode 100644
index 9d0429d247d4..000000000000
--- a/app-admin/perl-cleaner/perl-cleaner-2.24.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit prefix
-
-DESCRIPTION="User land tool for cleaning up old perl installs"
-HOMEPAGE="https://www.gentoo.org/proj/en/perl/"
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/gentoo-perl/perl-cleaner.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
-
-RDEPEND="app-shells/bash
-	dev-lang/perl
-	|| (
-		( sys-apps/portage app-portage/portage-utils )
-		sys-apps/pkgcore
-	)
-"
-
-src_prepare() {
-	default
-	eprefixify ${PN}
-}
-
-src_install() {
-	dosbin perl-cleaner
-	doman perl-cleaner.1
-}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 1476b60de733..9afaaf6b48ea 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -3,19 +3,13 @@ AUX mcollective.service 390 BLAKE2B 3d032bfbcc0499af0beafae05c008b420f3b598c4906
 AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
 AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
-DIST puppet-agent_5.5.4-1stretch_amd64.deb 17273314 BLAKE2B e296cda8219deafe9b36039298823edb6007f42047e90e120fc16e941bb91c8d660e1a7f1341aa9463c67d4a5e05fbd8bf9c072a7768b0e885536efe5956115c SHA512 599aef07bb39b8d209e806ea1539157419de96376113ba88de6160525e96d6fa28f9865d7a89aff96698a0ff4e85ec474dd43ff4ea512b06a64c491c252cd973
-DIST puppet-agent_5.5.4-1stretch_i386.deb 18195740 BLAKE2B aa1e5b7030de4ec58a389a552c0d2c870875244f6a722c9b87d4aca28261f073b347476aaa313edd4f66fa07621a333c777a3a6b04228aa7d2f35391f4f84df8 SHA512 3e7346ccde7d3bc9e99bb38a2958c9ddda3dd4a5124ced21dc048df41566a0d9e6d9e5250f7c93433c02585fd83031292f8197a7c6537a1563dd6ebec464b979
-DIST puppet-agent_5.5.6-1stretch_amd64.deb 17279588 BLAKE2B d9614ee1cbec786303ac72fc9b704c90056771c9e3c23a93d6b7cff11f27394fbd277d5ae0d8eca20d9801d31019e7ca381af0cb60b72fc109ce6b2a99ee1124 SHA512 1172d72a1054cf04ab8033ab319313b7da6fd76684738bdb4aa1bc6bd9fa9dc0f2b00d765382023e0e854efbee6adba5b66bd62e2e04a9f153da79bccad427f7
-DIST puppet-agent_5.5.6-1stretch_i386.deb 18195950 BLAKE2B 602a8409a6f0b5695f389604f82b8d6401db5d8abdd7148418bab6f09d64b285ff1c43870b144e863f148993b2e02c1abe11827e3e29ad5cf1314d7030cd5988 SHA512 f96bd2f4cbb2cec2405fdf87bb61711f8a750462d15e65507d37cc6cf6fa8f3a5e3a3d66abc74cfc02a109cc17c413e7f32c8d5f179468c84f6a86452ae38c40
 DIST puppet-agent_5.5.7-1stretch_amd64.deb 17300432 BLAKE2B 4c3b13361b9a97734a7b63ad94d1e96d9bcad284372d0b63a085c4415fa7c0433e66546bd43c99a82839837ed5a8683c6d2739d47b629f5580b8007219f06010 SHA512 fa17413afc2f2872963e241b38c2d7abe06ed37b0f01f2ace3cc6c31e53451291fe98905957377940b16d1b6926991ef39b556a4697e9ba06f10f62583f72c9e
 DIST puppet-agent_5.5.7-1stretch_i386.deb 18222282 BLAKE2B b9ce9269cc59d79450cb66c9c3e545ad4267ad1a43905df4ca57b45ad1213dd11c9ddcffb77719a151f52eb60d6792a486823ea4a29b2f4e83a2d62960c9691a SHA512 b65ecaf27c2bcc6556d7d43a0b78e282a64c72eed3b672af5d2e23c34eefe8134b6d4c60505f9d7c6e5b40ed4a1ad391128933c27710819f5078ec7d8680b6d4
-DIST puppet-agent_6.0.2-1stretch_amd64.deb 17859762 BLAKE2B c787eb36bc1eacb544b669959d83539ba157702627a7cf925cd1be9e919604cd749f86a1635e9c0b53fe85f446e377fc61123ca259357f4a5781d0f8f406f365 SHA512 c0587cbf382258c73760837eab85985c2414ff59521bbed680b13b5d09ebb76a96cc52e553d68fb482f4b2d725b130fc3b747849637b4c73cb11b5f5cd266a44
-DIST puppet-agent_6.0.2-1stretch_i386.deb 18596344 BLAKE2B 9f1f99e0c1033f621b3c50674f18e296e65b9addf82e61163e995f69eedbca97174a3ede6324e9bec1b46c4819a2c68892a4bdb7db8e81aba975bb6293c018df SHA512 9f2fc097ea2ef7c4411227ba97fa3371b98b3b3b4fb5e9c70a71ae87215e3c7b9fb5ee2cd58324bb24fb2352e34d4509165ca8e2c9c1144e89237307683a7dfd
 DIST puppet-agent_6.0.3-1stretch_amd64.deb 17876404 BLAKE2B 06f4a951270b96e93ff72c5e0e1deb8c2e21588a424e06d9619397586d2c92367debab0d552df0c88bd2ccc53644c53b1117f2826d01e2feeab94934505e3700 SHA512 1dfbd1a9266f0d092d71071e9d6c271e2ca9ff6a8457699a9561a8f5ad2be05ef779f80d5dac3dbe3744dad30b66bd98dd593ca7e7f2696183eb30edb430bf4c
 DIST puppet-agent_6.0.3-1stretch_i386.deb 18615216 BLAKE2B 8fd3e6344fd9773dae7bc1bd94543cfbe7f71158423b00aac01be4c3e911c6576ea159fc5cbf88ff5342e8b7e13d14fa23524771b33688ac828b40df508bd613 SHA512 9aea3b90693a566fe9f285da60772f739c07d7cc40abaa6a98bc0e4d2d2eba1178c01a6e8d4b2a48b6f0009d3bef8434412b2eeb5876966249fd872ef8bda159
-EBUILD puppet-agent-5.5.4.ebuild 2481 BLAKE2B 763dc1a03051af2be4472342dcfad9304649f7fde6d83889c93cae0b7b7521d6c28cf17cf8227f553a0a409a705678070b8e83161871f5d116302803868c92d2 SHA512 b1811874ca9c554896a16c8f134a8b4b84217192924f999a5a0c9d72630776c50de5f0ef16be82559e6f97548332a23ca0e68618b64bdc623bc27745c70229a0
-EBUILD puppet-agent-5.5.6.ebuild 2481 BLAKE2B 763dc1a03051af2be4472342dcfad9304649f7fde6d83889c93cae0b7b7521d6c28cf17cf8227f553a0a409a705678070b8e83161871f5d116302803868c92d2 SHA512 b1811874ca9c554896a16c8f134a8b4b84217192924f999a5a0c9d72630776c50de5f0ef16be82559e6f97548332a23ca0e68618b64bdc623bc27745c70229a0
-EBUILD puppet-agent-5.5.7.ebuild 2480 BLAKE2B 13a42fc211f798038c50b59c904c649976949dd313ff2821e3cc8d5c5fa89ed89d134842900a4da71a15111dceb604402412cf01a49d1f0484a34d052c6cedb2 SHA512 9bc28b8a0b889f85ffba3ae7772d6b28a5e22f3ac10861559e2e578b751746b69613930eaa015905eab8bfd6eee26d2e1005eead7e7141ac1484bbfbb5833eba
-EBUILD puppet-agent-6.0.2.ebuild 2175 BLAKE2B 4f2b992887347552ff4160969e5bc0c08dceaf0a29c478b935457ea456a067392019d86df97a08dba4d252b8795c1045ccfeabe0df7fd89ee239e845bec6ee2b SHA512 1e21c9342239121e5381d611f44f81d808e06386e97a5d1c5ec9e1ec985b585cb4b7f956217c9178699303d8a9409a14c4dc69f26166d935b007b15a986dba08
-EBUILD puppet-agent-6.0.3.ebuild 2177 BLAKE2B c85e11a40efe10eb550bbd4a04e01e9ab90e11e350697124e8adf36ae7b955111f00071a2dad7645c76b44ffa8a9a7285fd2e41d6756e96aa2053b70540227ce SHA512 0def0f855b823e935dc5addf3dcb5351b9b570d9e2c6de216ac8e9394143df015da37fd11187747bc620312d690285d9f981a18a3485720b79ffe7a16b406ee7
+DIST puppet-agent_6.1.0-1stretch_amd64.deb 17902402 BLAKE2B 4fb8a0e85fc4dcee0ad08ca45b90ddafca3ae3f605bc9b461be2e2b31a35412c23229f8ea58a7c2ce97df2f3951598529df874911bc446d7f5f41a1f36b0cc0d SHA512 6f5ae6ee3479021ff455c7b9344cd54a3d0a7ecf57b2403343297b1d1d017e995eacf0fed210976db799b9e833b26557917ca4319ffd01dffeb92d2a9418b7c9
+DIST puppet-agent_6.1.0-1stretch_i386.deb 18652482 BLAKE2B 42c03e6c1c6c86d54875a6fd79c4a67b9b83daef42415cd9c7f1fc445912f051be3c2cd21f804318779169eeabd1ec15b9a2fb5389601416aea44c2533c7a879 SHA512 d78e2fb3ec28bb60a46ba1dae8d4e1292ac9346a7471aa29af6cea1a249496c4d96e7ff006700482b08338d3155dbba653d86be0d65dc31c522dd8fb4b5b4dfa
+EBUILD puppet-agent-5.5.7.ebuild 2478 BLAKE2B bc197abccc5e3ee2bf58c799e56437a818e56994309963561497e8eb70dce277e13d14c441b1cf4da0fc8f688af3163e87fa9044e4a3f48b71953666f65d7e40 SHA512 742a16a57da4578a0d4db4ebcf60487b6278070e3210c775d7c6b3bb0670d7cfae63c7cb661b327d3373f87bb8f348b81baefc872282e3a26717ba18485fee85
+EBUILD puppet-agent-6.0.3.ebuild 2175 BLAKE2B 4f2b992887347552ff4160969e5bc0c08dceaf0a29c478b935457ea456a067392019d86df97a08dba4d252b8795c1045ccfeabe0df7fd89ee239e845bec6ee2b SHA512 1e21c9342239121e5381d611f44f81d808e06386e97a5d1c5ec9e1ec985b585cb4b7f956217c9178699303d8a9409a14c4dc69f26166d935b007b15a986dba08
+EBUILD puppet-agent-6.1.0.ebuild 2177 BLAKE2B c85e11a40efe10eb550bbd4a04e01e9ab90e11e350697124e8adf36ae7b955111f00071a2dad7645c76b44ffa8a9a7285fd2e41d6756e96aa2053b70540227ce SHA512 0def0f855b823e935dc5addf3dcb5351b9b570d9e2c6de216ac8e9394143df015da37fd11187747bc620312d690285d9f981a18a3485720b79ffe7a16b406ee7
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.4.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.4.ebuild
deleted file mode 100644
index 784b06891e1d..000000000000
--- a/app-admin/puppet-agent/puppet-agent-5.5.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!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/mcollective
-	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
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/mcollective.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	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/mco /usr/bin/mco
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-}
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.6.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.6.ebuild
deleted file mode 100644
index 784b06891e1d..000000000000
--- a/app-admin/puppet-agent/puppet-agent-5.5.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!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/mcollective
-	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
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/mcollective.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	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/mco /usr/bin/mco
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-}
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.7.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.7.ebuild
index ba2c3193b7ef..0eb9bfb5321b 100644
--- a/app-admin/puppet-agent/puppet-agent-5.5.7.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-5.5.7.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.0.3.ebuild b/app-admin/puppet-agent/puppet-agent-6.0.3.ebuild
index 4ad0513947d9..54c238bc455e 100644
--- a/app-admin/puppet-agent/puppet-agent-6.0.3.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.0.3.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.0.2.ebuild b/app-admin/puppet-agent/puppet-agent-6.1.0.ebuild
index 54c238bc455e..4ad0513947d9 100644
--- a/app-admin/puppet-agent/puppet-agent-6.0.2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index f7f4eaa0ebd6..29e535237ac3 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -1,7 +1,3 @@
-DIST puppet-lint-2.3.3.gem 84992 BLAKE2B 57b6d6332b7d26daf193ba983ff1e5d560cf4f902f1b476de3b1f7254755851397685d7b435dd7365f81e1427d91ca47ffa889a9d87a14e1c4720e44aa2b7996 SHA512 9203e8d29cb4a5c5abf8279598599db4a9063d33d7b7d6c76f8ebf09c3ba539f6035083b5438bae2b0fda1d16880ffcb69a2776ebce7f54bc1a1430c2ceb0d68
-DIST puppet-lint-2.3.5.gem 86528 BLAKE2B 7455c729cb0512cb26838439c854c70d2581f2102594ac60d76a34f9839b0bb7dbab65beb87369419dc0e66583bfac1ad9f22d65ee3ee9bf35aa3c37e8f0d1b9 SHA512 5e1978c5438869c12c2151e76fe6cea12c447d9f59f1fbbc90fb80e61c7ff9c220be85f70cf95dec2380cd35205ffec0473cc7eda0db21b94a30b533d4214707
 DIST puppet-lint-2.3.6.gem 87552 BLAKE2B 0a2f4b9c2ef76c06bc4fb6eb0f737af406bf3949e7c9001685c6522714b550c0f2c5680d5d39f5d3994496a497664e912eadc44bdb7aa4c27635d23b36a90776 SHA512 d162307e66bb5f1dd923f2f9fab55de7b4c5fad6264d7a1bae8df20bd45c5a786b66d9f5b3bd235230fea959c67242462e711212f65807040048f4c0be7122b9
-EBUILD puppet-lint-2.3.3.ebuild 620 BLAKE2B 8f3a4952c092b4ed4bc1a0fdb400a170faf7aa5f3dcb6a94a38a36dfd3c493c6f8c5fc2bfbc2f15dedf84fab404bcfa70124b7cefb68c845aea2cf222153e180 SHA512 a4cb6b8dedfc02d929c7b78bbba4eab2099cf5b3d81628f994c1e5389c76ac52171e376aa9bd470facd5d26b82f4d41cbd7c04d81af0c393bd1fa543f07dc736
-EBUILD puppet-lint-2.3.5.ebuild 620 BLAKE2B 399b76cf047bc8fb99c005d1be3835ad189365d72da45d27bd8ebe47ee4022d7aa9b0f2ac31948214dedf1cf608971716bcf0425a593801a2538bc196fc5304b SHA512 57c3880b02b0febe9c94da09e7e7710730e75f4fb4b92e674c86dbcb5bd0b1864d7df79f032b634063b94fdf46a28d79d9b556c2605731cb91f0ca9571c078b2
 EBUILD puppet-lint-2.3.6.ebuild 620 BLAKE2B 399b76cf047bc8fb99c005d1be3835ad189365d72da45d27bd8ebe47ee4022d7aa9b0f2ac31948214dedf1cf608971716bcf0425a593801a2538bc196fc5304b SHA512 57c3880b02b0febe9c94da09e7e7710730e75f4fb4b92e674c86dbcb5bd0b1864d7df79f032b634063b94fdf46a28d79d9b556c2605731cb91f0ca9571c078b2
 MISC metadata.xml 453 BLAKE2B 4fb00983f98c8c178fa1dc667f966b0f1fd54861ef71e37211fb46edceb8f91c15d55add637a50eda53ccaff8a1d3a6dcbdd02afe2ae32cf0f69797427897d6a SHA512 bd9238c56ddcdcb124df5d7530343756b865d2f279b719fb0ce7bf4e37565709194cb7f564811be6376fd4d3b61403d76eb9542aac3a267c2eb08f1bade21524
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.3.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.3.ebuild
deleted file mode 100644
index e672004b0fd5..000000000000
--- a/app-admin/puppet-lint/puppet-lint-2.3.3.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
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit eutils ruby-fakegem
-
-DESCRIPTION="A linter for puppet DSL"
-HOMEPAGE="http://puppet-lint.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec-its:1
-	dev-ruby/rspec-collection_matchers:1
-	dev-ruby/rspec-json_expectations )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/app-admin/puppet-lint/puppet-lint-2.3.5.ebuild b/app-admin/puppet-lint/puppet-lint-2.3.5.ebuild
deleted file mode 100644
index c86bd234ccc4..000000000000
--- a/app-admin/puppet-lint/puppet-lint-2.3.5.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
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit eutils ruby-fakegem
-
-DESCRIPTION="A linter for puppet DSL"
-HOMEPAGE="http://puppet-lint.com/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec-its:1
-	dev-ruby/rspec-collection_matchers:1
-	dev-ruby/rspec-json_expectations )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index edc9db49f6a6..b05568c16876 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -9,20 +9,12 @@ AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76
 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.11.tar.gz 3022878 BLAKE2B d3eec840bb1c46e0dfbbc9dad598b362049a76c7ee60b4ff314e7ba2ce19613f834baced94afbbf499b513391107c4229be5f40c275d0724b200358722db0e96 SHA512 5eaac8bd973d0013e7774c9bda81524332f2b3b0177c04e78554bfb0815697b4b296d5dd11a04f7fad782ad975b350b149b1cd97fc5f06974952314f163f1b40
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
-DIST puppet-5.5.3.tar.gz 3040000 BLAKE2B d2534da5956806e5280c59e82332f1ffca79e72f73b1abb460f155aac936a5ba1719f18dc5742c85fca365ff6b03a602ca0ceaa04714091045ab2afac1b57823 SHA512 14a711002c64f0598930f64e9e2b81c03daddda750860acb349271c1cc9d04c0d149b14817b200dda26f0ca75c3f79593990ecf28a5cca83220a3f5a16eac34d
-DIST puppet-5.5.6.tar.gz 3026301 BLAKE2B eb05a0c4eed99ce1ce7a77be76da069be1e4b4f8917206b3811a3a7378c2e39b9c84b560bbcce0bee180ddb502251efb48362dd1c2494c79e6f441cde41a2707 SHA512 53bccc4cf3d4dde3079d96cd28b4cf380d004fdf67da8eaeaf70706ca5e1fe611910042f1aa03453fb29419bb9888a0eeef9a9d64e8f0cfe5d8d7a73e5bf5850
-DIST puppet-5.5.7.tar.gz 3058343 BLAKE2B b3a1ef97c3da94f82e872485047da165ad7f2d98240f6ff1d691e1d5c3864b1d00235f71a91fe5f0564ae565f3e665fa2fcf9597a57b0e8ab1ec0e2acc18d69a SHA512 ef1e8542280948cabf711354a397c22aaf8e7ae853c829f6363c1b8adb3534e76865fcdf03f4a6cc6dc156b166cb0d87cdb64204702e369c0169f05dcaa8e49e
 DIST puppet-5.5.8.tar.gz 3056987 BLAKE2B cfb0599f5a9a6f254b0e853ece390dcc4fb3e8cd40956955b81e9dd9ae3c3c39c18a0f5f010b269c8c21f1b288f50c354e4c40cd0cbd3ad3128dd95c3c7d0cca SHA512 2ed960c0fcd4f6b0a7eacfffd8bc3ca88387bade0ce5ac6cbb247752f18927959286b1238c146d3d2bda7f8bee171fc502b44b129c4778feafbda90d993ee816
-DIST puppet-6.0.2.tar.gz 2796833 BLAKE2B a3d09dfd7dd0cadb2f752b4836336abd98c8cf6350f4e8b503a7e6b3029e59ff235f3567033b20bc3724708a9504db9ee87ac4c8374f0488862a7205a8a65069 SHA512 f32298d2884927f02f5316dde1d3d9bf33b89f6d011e2eab7f935b730a16d39277b5c17b2986eab91c19aefd5071b5fcbba62550ddd60e3b964f33f4029ac25a
 DIST puppet-6.0.4.tar.gz 2804651 BLAKE2B d2e685938b57ec896446a658d6a115f999b2254064711ceb6a139da3c5ffe488ba2dbd2da39b3a6c889027d971f44ff4fc99f87ceec95cc8b79eefc86f43f614 SHA512 fcfc0a9e1a707945c89e3080c1795511fd28143576886552d8e3635d62f526d0b3f9ed2a400ecc0084b63906246cb86e176b288ac049d01d0f9cf47fc65fe332
-EBUILD puppet-4.10.11.ebuild 5633 BLAKE2B f75ee3a7cb27288448f341a560e20b3b1246c37a690846bfda63d0ee9ea41600606a986160bb1967ad7c279a4d2204b54af1e45204e43725b4c1438ceb81e7a4 SHA512 90e2636f668b3227ece18ff03a16c28e7791c6ec192a87ca89395a03bc9182abdabb43ac6fc5261da7c4afd68caefaabe81549d39e7fd018cc0b5f307baded2f
-EBUILD puppet-4.10.12.ebuild 5628 BLAKE2B bfca2da4591b9589a1b3e42e8a06d91d75a77ca05a57910544caad33b540fd1c8c0b7fa6be4b11ab67ee693daf7486fee9f63115679a513c09ef1e15b3727152 SHA512 e5fd6431a729d205ba1f6360cb2f46f877de7f27a7bc1cf299f1ec2a487a2d2a374d0c059294b1bf08d31b7187b420297b368d474fc0dcc243787b8cea19a431
-EBUILD puppet-5.5.3.ebuild 3833 BLAKE2B 8a69323f2c1edf94a9dd384a695e3c2d2ba20fff0956cdda51ed853ca9e730c2c051324d0867baea4f71672337e41ec6c42b504edcdaf3f459d120080b3bea5e SHA512 b66520e6d78a3fe5bc8ae5151074133340db60eb402ac4d6f92f4add28b28b3d8280befc0aa74bb4935c9347e35ec240a6afa1bd67db23b1f15a46ad81b2d8ad
-EBUILD puppet-5.5.6.ebuild 3833 BLAKE2B 8a69323f2c1edf94a9dd384a695e3c2d2ba20fff0956cdda51ed853ca9e730c2c051324d0867baea4f71672337e41ec6c42b504edcdaf3f459d120080b3bea5e SHA512 b66520e6d78a3fe5bc8ae5151074133340db60eb402ac4d6f92f4add28b28b3d8280befc0aa74bb4935c9347e35ec240a6afa1bd67db23b1f15a46ad81b2d8ad
-EBUILD puppet-5.5.7.ebuild 3832 BLAKE2B 69e71629050a60f9b1f3972e312ccc24256fdf90ea4e063b4f57c344a422058585817a60586f63d76f667e6dffe7353a553c466ef8d99693c2b700dcc4a6ee5d SHA512 e3b3d3685da5847f346575e6b5cdfa92ea2e45b988e012f817fd5fca2f4b1a75ad170774ccd3974178d4e5223246b5d348e6793eddac49ad3e48f87e31a29e2d
-EBUILD puppet-5.5.8.ebuild 3848 BLAKE2B af86d8c3a79e8e0cb949be7107f889825cb58c4379d1d18b75cff98b9d2c68890202b0e1e55f0f70fb8008d15f8e65fff2463152af08ea378c222005226290aa SHA512 3a3e352a6fe1830db3f2b72fb3577ec537dfa8012077ea427ed0d022ca86cf64886b5da3ddb4316452892cf3066b1ea4c44f581eb864daf35fbc31c028b5f1ba
-EBUILD puppet-6.0.2-r1.ebuild 3657 BLAKE2B fafc3fcda0cb1a0c5e8c590cdd7a0c62ff2f3e87a1ca0bc8c4d03f356c2af3ce6377a90e4d542b3ff0368c7c380d7799d2a1975ad3676c4fd78bbc0ab3f03f86 SHA512 d9e24831aaf88435fb6b0f5a4b2c693459cc3e2c17f871211fefe4945b14bb5a48d306a567b1d9a1636b425337bc2cfec2e81135f5849b7392f8286cbd40e895
-EBUILD puppet-6.0.4.ebuild 3657 BLAKE2B 4f8f3a4bbca258e814738d7120b420f6da6ddbd1e8710b759a9d1e108d5e9996363e11ff5fd995828b599b77287cbb704df1ffea1d590b83f4b0b0be692025a6 SHA512 82c527a707c9f08cce2ea2672e97b01f8111c0855e01e45b5db28ddac394c8f406bf872e7083a6f755e2cb2db8d072eff0edb9970c4b68be44693b63f891a60e
+DIST puppet-6.1.0.tar.gz 2818606 BLAKE2B 4fb6b26e5c3711262ff2210c9a4e9a9df0f47f4a989526a79cc36f56fa939fd4e54e41f3afef818aacd4630daf559f1ded7e2f6e3cc258a005a848b4d49b64ae SHA512 b82d5f5b045e23543a26949d9faa7ced78f1413e7699d124dd43a56b8558232d6f151a9fdbe52e1959900eb8fff7d7e873fa7ce986206419a27a7627a56f91f6
+EBUILD puppet-4.10.12.ebuild 5623 BLAKE2B 5653e7a7ff00a41e59acc42da38a47f78c25e2befdf034a7697d6cc37b1b0c7236a7f0fe6a8b0f224b08905d2fd74e20e8fb43e67e7dd1c3afc5ebaf3fe357f3 SHA512 4ea6f32bd809bb4e8ac90b2cb6205cc464dc9ea3cb97fbe3e14deb6890a04e9095f3d9896a99663ecd0d57a80df16b283ad8c55f8d0f11d1bc4eecc477a245be
+EBUILD puppet-5.5.8.ebuild 3824 BLAKE2B 907719041ed40a583a9edc42a0e8cef3a3e9d6853bf0c9199f488d86aa04aca729eb9fc23c7ec13ada04c0c9b834763b7f2f342a3820140af2b904bfb989f2dd SHA512 5ef99a7afc0c99be4df265be02f107705236824226c7a681e8ccf96a566364025c1407d78ec99a0ae9a2c6de4988d730d4b0721ac293caa02106f1ad962c1d90
+EBUILD puppet-6.0.4.ebuild 3655 BLAKE2B ff22ce68512cbccbc58d07d2331c96382f512f926fe5e7e98d410d30bb053f54ac5502588d7caa965d3e2377a63967d5ada26e74a4a312f3db6c70564dd63a2b SHA512 d48c942a3205aa72ddb6b44afb46b86bde21ead50d58c9c5ab33b8f7d4a4f62f8d57932d022a0baedc903c753b19e2ee75dbde68dd261f4ede034747e4784cc0
+EBUILD puppet-6.1.0.ebuild 3657 BLAKE2B 4f8f3a4bbca258e814738d7120b420f6da6ddbd1e8710b759a9d1e108d5e9996363e11ff5fd995828b599b77287cbb704df1ffea1d590b83f4b0b0be692025a6 SHA512 82c527a707c9f08cce2ea2672e97b01f8111c0855e01e45b5db28ddac394c8f406bf872e7083a6f755e2cb2db8d072eff0edb9970c4b68be44693b63f891a60e
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-4.10.11.ebuild b/app-admin/puppet/puppet-4.10.11.ebuild
deleted file mode 100644
index 81ed04a87ac6..000000000000
--- a/app-admin/puppet/puppet-4.10.11.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit xemacs-elisp-common eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs 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
-# 	)"
-
-DEPEND+=" ${DEPEND}
-	xemacs? ( app-editors/xemacs )"
-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() {
-	if use xemacs ; then
-		# Create a separate version for xemacs to be able to install
-		# emacs and xemacs in parallel.
-		mkdir ext/xemacs
-		cp ext/emacs/* ext/xemacs/
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el
-	fi
-}
-
-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 xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	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
-
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use xemacs && xemacs-elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-4.10.12.ebuild b/app-admin/puppet/puppet-4.10.12.ebuild
index 3fe620df7b36..ebad8ec4cc9a 100644
--- a/app-admin/puppet/puppet-4.10.12.ebuild
+++ b/app-admin/puppet/puppet-4.10.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,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 experimental ldap rrdtool selinux shadow sqlite vim-syntax xemacs"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-5.5.3.ebuild b/app-admin/puppet/puppet-5.5.3.ebuild
deleted file mode 100644
index 8aa23c0b2c8c..000000000000
--- a/app-admin/puppet/puppet-5.5.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-5.5.6.ebuild b/app-admin/puppet/puppet-5.5.6.ebuild
deleted file mode 100644
index 8aa23c0b2c8c..000000000000
--- a/app-admin/puppet/puppet-5.5.6.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-5.5.7.ebuild b/app-admin/puppet/puppet-5.5.7.ebuild
deleted file mode 100644
index bf7f4cace5d7..000000000000
--- a/app-admin/puppet/puppet-5.5.7.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 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 versionator
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(get_major_version $v)" = "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-5.5.8.ebuild b/app-admin/puppet/puppet-5.5.8.ebuild
index fb4ab3b1efc0..e49d432b2e3d 100644
--- a/app-admin/puppet/puppet-5.5.8.ebuild
+++ b/app-admin/puppet/puppet-5.5.8.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"
 
@@ -134,8 +134,7 @@ pkg_postinst() {
 	elog
 
 	for v in ${REPLACING_VERSIONS}; do
-		v=$(ver_cut "4.0.0" "$v")
-		if [ ver_test "$v" -eq "4" ]; then
+		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
 			elog
 			elog "Please see the following url for the release notes for puppet-5"
 			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
diff --git a/app-admin/puppet/puppet-6.0.4.ebuild b/app-admin/puppet/puppet-6.0.4.ebuild
index 863d46f28daa..2f3f37b0634b 100644
--- a/app-admin/puppet/puppet-6.0.4.ebuild
+++ b/app-admin/puppet/puppet-6.0.4.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.0.2-r1.ebuild b/app-admin/puppet/puppet-6.1.0.ebuild
index 3079ab5dd7e2..863d46f28daa 100644
--- a/app-admin/puppet/puppet-6.0.2-r1.ebuild
+++ b/app-admin/puppet/puppet-6.1.0.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_DOC="doc:all"
 
 RUBY_FAKEGEM_EXTRAINSTALL="locales"
 
-inherit eutils user ruby-fakegem versionator
+inherit eutils user ruby-fakegem eapi7-ver
 
 DESCRIPTION="A system automation and configuration management software."
 HOMEPAGE="http://puppetlabs.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"
 
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index de3dbaf4da89..42627e598167 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,6 +1,8 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 DIST puppetdb-5.2.4.tar.gz 25438658 BLAKE2B 4e548ed018b57f68c0cc81185579234e17086985733d56030802577ab5fb8106c7c47c603aa3da65ede3e5780c89df8b2dbece12c29aa1b171ceda1de7228f56 SHA512 6979ebccaa1136d19ffd0d67bdbff9c608c649d75b56b4b041d8795fdcedf24c831553c5361f8e144fa01bbac92af88e6548f917ca00eec707d8740a99689059
 DIST puppetdb-6.0.0.tar.gz 23168375 BLAKE2B 05b7738d1f1dfefac50ea54682b2c2f888d9227117fc676ef5d4754b8fddce449ee75a2ae9eac977426707654737c86499efa3692f4195547f997297c1b08f5a SHA512 f2be7049cf1615f7f235be16f32c599ad9679b9da59d43b30c63ca4fd9c9f24fbdb488def01372c516ac510105292ddb163bad403d1b06429bfc10310505501f
+DIST puppetdb-6.1.0.tar.gz 40448212 BLAKE2B fc12d7177eda99e755eddf33c7833b98a1567ac8675bd080720105709b44421b0293a3c8eb38c104104b0bade72f0dd8e2862a10d25f52c4ecbd0f914e66bd77 SHA512 185403b528099d6ef318cbbdd58228c31face25c540435e049585f68fabcc17f5850cc10eec342746c910ebfdcf2a1d99c7f9ca01b0baf2dd4585ccae1ede205
 EBUILD puppetdb-5.2.4.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
 EBUILD puppetdb-6.0.0.ebuild 2760 BLAKE2B 57ea7ff1a81c62ec1d42bd40eb33dd0743b4d2d513991425d4ec35d5be751a76e340debab8c753098bf6d20c19d1ad54f669b6612bf77f032e96ec3c8693f927 SHA512 4c245b096cb4a169c566a294c026dcde1dfea946c5ca5e3cbd7a13bc8cb34a4ba9b55d8165b4d81feaf8b03fe073c5477219cfe290c0ace903addffcacac9788
+EBUILD puppetdb-6.1.0.ebuild 2762 BLAKE2B 1ccc4176c10e2ddfa56493ead809e80cc202f3ad060f765d8739c5c40e524800ccfd12b771c63e52434150fcc87416265e65e98f18d9bb3b03957d1ab527ce61 SHA512 7cd2fa8b260cd47b68963579b163c451d6752a12ff04cf832df41a3f662a9a8aa6cd8e080b06c73ecf54f08893e2ea62ba792d30235117b5967b155eaf79af19
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.1.0.ebuild b/app-admin/puppetdb/puppetdb-6.1.0.ebuild
new file mode 100644
index 000000000000..480aee3abe2e
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-6.1.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd user
+
+DESCRIPTION="PuppetDB collects data generated by Puppet."
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+=">=virtual/jdk-1.8.0"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppetdb
+	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
+	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
+	sed -i 's/sysconfig/conf\.d/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	dodir /opt/puppetlabs/server/data/puppetdb
+	insinto /opt/puppetlabs/server/apps/puppetdb
+	insopts -m0744
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppetdb.jar
+	insinto /etc/puppetlabs/puppetdb
+	doins ext/config/logback.xml
+	doins ext/config/bootstrap.cfg
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetdb/conf.d
+	doins ext/config/conf.d/jetty.ini
+	doins ext/config/conf.d/repl.ini
+	doins ext/config/conf.d/database.ini
+	doins ext/config/conf.d/config.ini
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
+	doins ext/cli/foreground
+	doins ext/cli/ssl-setup
+	doins ext/cli/config-migration
+	doins ext/cli/foreground
+	doins ext/cli/anonymize
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetdb/bin
+	doins ext/bin/puppetdb
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
+	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
+	# init type tasks
+	newconfd ext/default puppetdb
+	systemd_dounit ext/redhat/puppetdb.service
+	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
+	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetdb.logrotate.conf puppetdb
+	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
+	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
+}
+
+pkg_postinst() {
+	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
+	elog
+	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
+}
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 6c712f2ad47b..d2a8cbeb71c1 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,8 +1,8 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
-DIST puppetserver-5.3.4.tar.gz 67238476 BLAKE2B a92bdf77ffefc7c65c5cfd39431aa6b485bd92c617c4e32a281bfa431fbb428209b8834ef464a521e00d07f3ce0a443fe8a187f3a235c3200531533a1efa242d SHA512 edfa121d64fdbca9a8eef201fe6744e2694141deb318bec64c942bb1ebe6ea61ba1aaa15aee4f4e59913f79247b1c833c6633d3ff121eee836a83ccbaaece900
 DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c
 DIST puppetserver-6.0.1.tar.gz 62362369 BLAKE2B 895eefe1f1d508a9a791fc30937bb778fe6d032fc0143caeafa695e73ee139cded8c6c839b90b4f168a641ab7952f4ba10a805e0a85112ca522e78df06838062 SHA512 485b24dbe74fe40c23b98693d02096052af23344a4c8d9bb5d29876cb4224ded482c5b741be1f2b8ff94d7e48041206acd4c301e9c188b3406b04b229fd51094
-EBUILD puppetserver-5.3.4.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
+DIST puppetserver-6.1.0.tar.gz 74953913 BLAKE2B 0a84e64209ad313bea375bbaa22197d0216138c3714551796df0cfe99e634ef3efb0cf5378fe0db4b329df21c57359a84f249cb7fe62d9369ec7e8702c5274a1 SHA512 b3f0f2ef86550879a2eeefaf187c5be0b9e7e9bd570e77669a3f20f8b6127aa8b04b8debb10ca66a60a1858285717bdfc27f3f31c8014de2e0af51746da2f1a8
 EBUILD puppetserver-5.3.5-r1.ebuild 4894 BLAKE2B 23e8e5a9b5d544c5107e8c56b5fffe727a06883dfcd13cf55f519e70a77798424a217970c4c38c1c703466a2ac16fe0032b9ccb7e377db5c40bdebba238caa53 SHA512 f43549918d1bfe8a9ffd444bd9816e91cde25b4939432949f28e4be5bf7081175bf524cbb66e9c9aa177b9da1844cb58155b1340b301c282a721db036cb83443
 EBUILD puppetserver-6.0.1.ebuild 5322 BLAKE2B 68792635942362d16d8c5c42b100fd33b6405164f8db431096204a46b2d26c3cfef6e77eb759f917f7ba00175395bedfb70bfcb6eafa7e5f0b44e4c7b6c412ae SHA512 23db9cb35d4284bec0e3323a996602dc86c471f81dc9636f2ae87eb41274e4f00736b653ba71fbdb48fa3a7bc4f8e91c50033c67ae140bd6911c18b6cc741131
+EBUILD puppetserver-6.1.0.ebuild 5324 BLAKE2B 3f8b7d7c250a90cdfae36bb127641a81c20940dfc16a24662151dc53c18f5504e18224a3ef5352c824be1ea44d11fc6ea0378f4614a60aaf39be59227ae83885 SHA512 cb0f6432ae4addf53f932e79c5bd8e216255f2b46d3edb604f05db5706c77859f9cf41a4421a26963d8ce52183bb0d9ef11e6b04a84e59aa705e6260d283303f
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-5.3.4.ebuild b/app-admin/puppetserver/puppetserver-6.1.0.ebuild
index 20133466d29d..d62a1297c2c2 100644
--- a/app-admin/puppetserver/puppetserver-5.3.4.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
@@ -46,8 +46,6 @@ src_install() {
 	insopts -m0644
 	doins ext/ezbake.manifest
 	doins puppet-server-release.jar
-	doins jruby-9k.jar
-	doins jruby-1_7.jar
 	insinto /etc/puppetlabs/puppetserver
 	doins ext/config/logback.xml
 	doins ext/config/request-logging.xml
@@ -65,6 +63,7 @@ src_install() {
 	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
 	doins install.sh
 	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/ca
 	doins ext/cli/irb
 	doins ext/cli/foreground
 	doins ext/cli/gem
@@ -107,7 +106,8 @@ src_install() {
 	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
 	fperms -R 700 /var/log/puppetlabs/puppetserver
 	insinto /opt/puppetlabs/server/data
-	newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt
+	doins ext/build-scripts/jruby-gem-list.txt
+	doins ext/build-scripts/mri-gem-list.txt
 	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
 }
 
@@ -122,9 +122,12 @@ pkg_postinst() {
 	elog
 	elog "# install puppetserver gems"
 	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
-	elog "while read LINE"
-	elog "do"
-	elog "	java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
+	elog "while read LINE do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
+	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
+	elog "while read LINE do"
+	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt"
 }
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 20509bf2c236..adf7ff308813 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -1,3 +1,10 @@
+AUX ras-mc-ctl.openrc 295 BLAKE2B 8f6da9d6d4e392e4255ac70a57ece6e665771fc0f91c64506af6fd2157a5a4c159921ac341e66d18176434c523b6060c0cb2cabee6f7ca003e1896c0b6b6a266 SHA512 be635afaf5182907b4ae085d8c15b7aa6ae07e19a277423fe180a5e0524fa33747ceba8fe991cc263341b6c15443d3aff8f6c6c0311a87194687e25fa8387f32
+AUX ras-mc-ctl.openrc-r1 419 BLAKE2B 50239d64b95c1759a2fb88107b78875b9f6227c256c2a59628b33dfaf720c649e714afe24424f34e865d1fc46145daa8deda4e8612ef6c0d11ef1bf67b2c2e88 SHA512 f12c82432086bfdd0ee24a767b2c6dae9a50cb65038189bfdc2aff9447e5e734e1277d809ed3c7a55ac31034773983e1f46f466adabdd4e727b491c260c5c53e
+AUX rasdaemon.openrc 369 BLAKE2B 81768b9a6cdf4696d8598dc61675b86f617ae543cdfda8166f961d9ab470ba107165b72be32370f71f52b07503f3ea948cf9d7ad10c2899e2e9b79f1e06e96de SHA512 eb91a3c54033a136e5b35aa769b5c01a0810970e77efa3f9efbcda5cf088e5268fd7bd9fff953bc47b9233a41e5321094b4d2ef85500dc0175f5be6a64c03105
+AUX rasdaemon.openrc-r1 484 BLAKE2B dd64b1b6164f74e887ebff43116bd23311b86a7bbdf7830beb4ba27ad3e2db33e2107c7083c23f14e50e781a339e49be8a69ee902cfbc98713de034daa5a82a1 SHA512 e27c08bc118edd95468dd466aea52764df5b400ce9acf2043bd035d2fadbaa3b953794869c1fdaa23320e9529960e97c9e47dd31e8d8f3f48a324090f784907d
 DIST rasdaemon-0.6.1.tar.bz2 363201 BLAKE2B bdc7ec3c2e7e4b2fee02dddc55b5afd82df64717f45da15dbfd5fee87721b80ac425af5806ee7462cad29c6ab2953a2e649c4b1e455983d8821a1f633d76c85d SHA512 a221a7ea0e4555befbf8acb9d4ce22d5cc7861a0da458111a24905fa06be0e8f3b18d8de5334310a423657febc0532d2705236de89cb1788302bf487ede29f60
+DIST rasdaemon-0.6.2.tar.bz2 375140 BLAKE2B fd22185172777865120fbd13b7bfb5db9b9b0348fe8575ca6b5f16fd662c1e847729e239342b1c9ece70a4e79ad00352bb69d9f80cfbc8da2c961e68874dd03b SHA512 d8c1ee2cc801124837b3a0739f3016a206165306e300ce51e6aac2cef56bb65479f96cdb019ba3a5cffeba94e7b67ca22686d4ac94bfa8a8a1145db6ba51096b
 EBUILD rasdaemon-0.6.1-r1.ebuild 931 BLAKE2B fe6abb4a500f9890dbdcb06a457d7a33ab8b138fa22af2d4046ff133a9205a8f75c6e07273e4fb7eeadf3bf8a974e8fcea39e29c4b6d080a627d6619a4c2e5fa SHA512 02871f282b1b7a4f4601293974d7fbccc41ee7c90a590e6d349db20040bd1cbebb562c56acf8c0cbad37dd6e4e04ac0140f2d34e70f208b611b1cb73873a0f67
+EBUILD rasdaemon-0.6.2-r1.ebuild 1033 BLAKE2B f3a939268a9b34f730424f8d7af85c96e0240fb8ed3d6dd8b181bdc720b84622e41f2b2bb541a055dff70bda6f2e5c4952bf53bf68a328a7907b91ea47292892 SHA512 5837d47d13166bed48f89cbd10682550f4c3abd9e4c00d1757d432e9ece382c323e8cdc44b938770517f93a801b1eb2bf91ae93e034a9113f1d123e1f74bc338
+EBUILD rasdaemon-0.6.2-r3.ebuild 1137 BLAKE2B a2402b26a92a0b9e6e6383c27d82e558bfe3f2737702ac3f0b2f57096f2eee6a6ca3ee9e8ab1fadab8366eca762a76d82ee02b783b39c35325b3a5af73f9f881 SHA512 490ed88bed969b3ab6a634bf3b04086b187a58deb39279911339f953f32da0618cb055b488b15996c011b4e681b338e640c162d2cf9a90c96fec47f409455e87
 MISC metadata.xml 871 BLAKE2B c9b484c2fd3019681f9c335fc046c7718c35bcafd9fa46f59328c68fb4404571818b861cb938bcb00fa08a164688a58735d7db27e73120597cd114a3a39acaba SHA512 1815bc3a92340071b40de8129441bbf55fee7edbec94f5337d6a9b42311cc3c1d898598d0756b60b56d804629700a2c0109362933acf5442a74097e752b24935
diff --git a/app-admin/rasdaemon/files/ras-mc-ctl.openrc b/app-admin/rasdaemon/files/ras-mc-ctl.openrc
new file mode 100644
index 000000000000..c428d78e64da
--- /dev/null
+++ b/app-admin/rasdaemon/files/ras-mc-ctl.openrc
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Starts ${SVCNAME} service for rasdaemon"
+
+command="/usr/sbin/${SVCNAME}"
+command_args="--register-labels"
+pidfile=/run/${SVCNAME}.pid
+command_background=true
diff --git a/app-admin/rasdaemon/files/ras-mc-ctl.openrc-r1 b/app-admin/rasdaemon/files/ras-mc-ctl.openrc-r1
new file mode 100644
index 000000000000..316b28ad7143
--- /dev/null
+++ b/app-admin/rasdaemon/files/ras-mc-ctl.openrc-r1
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Loads Motherboard DIMM labels into EDAC driver"
+
+depend() {
+	keyword -stop
+	need sysfs
+}
+
+command="/usr/sbin/ras-mc-ctl"
+command_args="--register-labels"
+
+start() {
+	ebegin "Loading Motherboard DIMM labels into EDAC driver"
+	"${command}" "${command_args}"
+	eend $?
+}
+
+stop() {
+	:
+}
diff --git a/app-admin/rasdaemon/files/rasdaemon.openrc b/app-admin/rasdaemon/files/rasdaemon.openrc
new file mode 100644
index 000000000000..08fc09e64165
--- /dev/null
+++ b/app-admin/rasdaemon/files/rasdaemon.openrc
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Starts ${SVCNAME} service"
+
+command="/usr/sbin/${SVCNAME}"
+command_args="--foreground --record"
+pidfile=/run/${SVCNAME}.pid
+command_background=true
+
+start_post() {
+  "${command}" --enable
+}
+
+stop_post() {
+  "${command}" --disable
+}
diff --git a/app-admin/rasdaemon/files/rasdaemon.openrc-r1 b/app-admin/rasdaemon/files/rasdaemon.openrc-r1
new file mode 100644
index 000000000000..6532826add50
--- /dev/null
+++ b/app-admin/rasdaemon/files/rasdaemon.openrc-r1
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="Starts Reliablity, Availability and Serviceability (RAS) service"
+
+depend() {
+	need localmount
+	use logger
+}
+
+command="/usr/sbin/rasdaemon"
+command_args="--foreground --record"
+command_background=true
+pidfile=/run/${RC_SVCNAME}.pid
+
+
+start_post() {
+	"${command}" --enable >/dev/null 2>&1
+}
+
+stop_post() {
+	"${command}" --disable >/dev/null 2>&1
+}
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.2-r1.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.2-r1.ebuild
new file mode 100644
index 000000000000..330e1815fc39
--- /dev/null
+++ b/app-admin/rasdaemon/rasdaemon-0.6.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd
+
+DESCRIPTION="Reliability, Availability and Serviceability logging tool"
+HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
+SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	sys-devel/gettext
+	dev-db/sqlite
+	sys-apps/dmidecode
+	dev-perl/DBD-SQLite
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	local CONFIG_CHECK="~FUNCTION_TRACER ~FUNCTION_GRAPH_TRACER ~STACK_TRACER ~DYNAMIC_FTRACE"
+	check_extra_config
+}
+
+src_configure() {
+	econf --enable-abrt-report \
+		--enable-aer \
+		--enable-arm \
+		--enable-extlog \
+		--enable-hisi-ns-decode \
+		--enable-mce \
+		--enable-non-standard \
+		--enable-sqlite3 \
+		--localstatedir=/var
+}
+
+src_install() {
+	default
+	systemd_dounit misc/*.service
+
+	newinitd "${FILESDIR}/rasdaemon.openrc" rasdaemon
+	newinitd "${FILESDIR}/ras-mc-ctl.openrc" ras-mc-ctl
+}
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.2-r3.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.2-r3.ebuild
new file mode 100644
index 000000000000..fca06e7b0f04
--- /dev/null
+++ b/app-admin/rasdaemon/rasdaemon-0.6.2-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd
+
+DESCRIPTION="Reliability, Availability and Serviceability logging tool"
+HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
+SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	sys-devel/gettext
+	dev-db/sqlite
+	sys-apps/dmidecode
+	dev-perl/DBD-SQLite
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	local CONFIG_CHECK="~ACPI_EXTLOG ~DYNAMIC_FTRACE ~FUNCTION_GRAPH_TRACER  ~FUNCTION_TRACER ~STACK_TRACER"
+	check_extra_config
+}
+
+src_configure() {
+	local myconf=(
+		--enable-abrt-report
+		--enable-aer
+		--enable-arm
+		--enable-extlog
+		--enable-hisi-ns-decode
+		--enable-mce
+		--enable-non-standard
+		--enable-sqlite3
+		--includedir="/usr/include/${PN}"
+		--localstatedir=/var
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir "/var/lib/${PN}"
+
+	systemd_dounit misc/*.service
+
+	newinitd "${FILESDIR}/rasdaemon.openrc-r1" rasdaemon
+	newinitd "${FILESDIR}/ras-mc-ctl.openrc-r1" ras-mc-ctl
+}
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
index 381332c254ea..0f78e5bbf41b 100644
--- a/app-admin/restart-services/Manifest
+++ b/app-admin/restart-services/Manifest
@@ -1,3 +1,5 @@
 DIST restart-services-0.14.1.tgz 20909 BLAKE2B 2f6b74fc6094be83e1872d2a6ca7abb02a49b5db65d81cd37f8161bac148e5fe0614502f1f06356ff9cd6c6ba03c416dae1eec3a86f48dc011bc6e28c1b076e3 SHA512 3434c4b6cdf9d02b035eba2cc67cebe8e06a2cf31c2d8627063b84224dcb6d44e276e1fcb82221ad77ab7ee7e16fa7ee58fb94b7849d40e6786d3fcfb6087866
+DIST restart-services-0.14.2.tgz 21227 BLAKE2B 9a3f03bbd1995df6f583f8c4228914f098922828b1407c0c8069908ebdbef67599a8a7421b0c404adf2d330632ae83646300a965c514f6746bbd95674ab102ea SHA512 487e8d0a448954be7b79d1c95bffd00d5f875ccb908b8004e18e45752e593fe57713f97c0749e28367bf7606c5cf46556f31de6b018a151f7cd384c88277ca7c
 EBUILD restart-services-0.14.1.ebuild 2285 BLAKE2B 7eb13e920790aae88e74b10cce100923aa490726011cdc33f96d0a38be957a0cbdc44e13a52b51a8b3c8d30e33464f72073f49888ffc4c573a65287ed49624c7 SHA512 841a1c6fa9d4c8b435f015c1785dd7c39929c808d771b7095f89a2d2832664a5b8915b3dfe56db5d9e4898a3d21b93e2c8ae01fa4502f33e5396ec6508c55a53
+EBUILD restart-services-0.14.2.ebuild 1769 BLAKE2B 8190b85be93b2c844bd832ace2bb962d09dfa4f8da8c930c2cc9bfe12516c62a0f3be0d403d74ac7471e635b92689a95b5dc46aa13cf99fcf49141a6faf3534e SHA512 18cdbd8f6f3b2c12df2e083fc86b927dea6e5ea1072c6ce716b9d7ef57973e8385bbac643ee66bd175f950dbc05109d8992b08ea04ced2367cff94948613b642
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/app-admin/restart-services/restart-services-0.14.2.ebuild b/app-admin/restart-services/restart-services-0.14.2.ebuild
new file mode 100644
index 000000000000..86a6e7c0ebc9
--- /dev/null
+++ b/app-admin/restart-services/restart-services-0.14.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tool to manage OpenRC services that need to be restarted"
+HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/"
+SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-admin/lib_users
+	sys-apps/openrc
+"
+
+src_install() {
+	dosbin restart-services
+	doman restart-services.1
+	keepdir /etc/restart-services.d
+	insinto /etc
+	doins restart-services.conf
+	dodoc README CHANGES
+
+	sed -i 's/^#include/include/' "${D}"/etc/restart-services.conf
+	cat>"${D}"/etc/restart-services.d/00-local.conf<<-EOF
+	# You may put your local changes here or in any other *.conf file
+	# in this directory so you can leave /etc/restart-services.conf as is.
+	# Example:
+	# *extend* SV_ALWAYS to match 'myservice'
+	# SV_ALWAYS+=( myservice )
+	EOF
+}
+
+pkg_postinst() {
+	local MAJOR MINOR
+	# migrate config data for versions < 0.13.2
+	if [[ $REPLACING_VERSIONS ]]; then
+		MAJOR=${REPLACING_VERSIONS%%.*}
+		MINOR=${REPLACING_VERSIONS%.*}
+		MINOR=${MINOR#*.}
+
+		if [[ $MAJOR -eq 0 && $MINOR -lt 14 ]]; then
+			einfo "Checking for old config"
+			if [[ -f /etc/restart_services.conf ]]; then
+				ewarn "Old config file found: /etc/restart_services.conf"
+				ewarn "It will be ignored so please migrate settings to a file in"
+				ewarn "/etc/restart-services.d/ and/or remove /etc/restart_services.conf"
+			fi
+			if [[ -d /etc/restart_services.d ]]; then
+				ewarn "Old config directory found: /etc/restart_services.d"
+				ewarn "It will be ignored so please migrate files to /etc/restart-services.d"
+				ewarn "and/or remove /etc/restart_services.d"
+			fi
+			einfo "done"
+		fi
+	fi
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 08fbaeef8745..2ac66fa9e46d 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,20 +1,19 @@
 AUX 50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3
 AUX README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
-AUX rsyslog-8.35.0-fix-issue2719.patch 7561 BLAKE2B 4adc0643dcb42bcc33ba3f8fc878ea4996d22e06865680fad6c9f0bff9da27d55293732e17678a36ce33d4ff1d76049d8b9b55bd0eb6b4987c893b48bf5daddc SHA512 54ad784c328a4def4c46777ba3b4ebe3d451d9a5a6883e3e6bd912070c52aaf2e85fefd938d64cbbd87ef9ae4ac0b4685ad1c0e74ad2bdf02bfa247ddcca939d
-AUX rsyslog-8.35.0-fix-issue2726.patch 1726 BLAKE2B 3b406319098637b81f85127494fb921529eb2704ae9ac6a90e89e4655412220748bba6584f010de1ca17c0a19fbd01b5c56314f43c7eec329b71884d24f3df93 SHA512 421a6b67372b1b4cac459f6fae7a6e839d96c363f8cb5fa4d38b7c64b53752a9a6ae2c050dd8cc18464475a0601d5451ac51719bd85df9ac40eaebb498a4c23c
 AUX rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch 3181 BLAKE2B 13b155367c6b7fed4f82505a884ed23e32223567e5086cb91f733d20c43aa101bbeb169f36f34ed0dff8815687cc5dfe942ec248024aa29a0a07c1eb3ca3e0f4 SHA512 dfc980492bdd3fb7fafedbbde4e79e61d7fb78665f8f0654a877de4f2f4fa93ce2d23051617f90d9712ef795d8164e1d610321b0dd27164d0cb425c8f1a77720
 AUX rsyslog-8.39.0-fix-liblogging_stdlog-linking.patch 12038 BLAKE2B 4fe26dc0d8e60e2b37272aa0743fadf8d3ceef6937028d8990b84c936efc289948f2c98312c14296c3b5d43966982edfee9bbc53b17df22487fd2711147e2a1a SHA512 580b65c1eb4d551d48203720e9621d7b1371145bdc3c6e8c0d638c686038cb43d436e42ccc5b4223e2b16db040eabcecbd71288f99c90698636d6b6be1517308
+AUX rsyslog-8.40.0-fix-omusrmsg.patch 455 BLAKE2B 6933dccfbd3eeed4ed00f08d9bc748428e705c3caad04e783664cc46103f0e4b40d96ac9e82f93e9083484c4bc58a683c52d46f6ce6ec74f0d12a58331f77920 SHA512 7164572c35fe28aab9767291456fb403b0e9d047c64df8c6a5a11c62a06269a4d2450d531dc0dfdc184f0ebda61ba4589c1d719d801633c2903a349bddae21da
 AUX rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10728a8d2b8acf2c08f613cea9c2a74d78ed7b75333147a6b1a553fe281956990e044a9db651c7486690dee SHA512 5ca68b4eec5bebaed48edb69c85f8338273db847ab1cc6999ce7cfe06644dc3854c3040e0ebd8a4900c213b267b2a081e7901ceb4e58f9dfdc7dc036aff02b6c
 AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
 AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
-DIST rsyslog-8.35.0.tar.gz 2590108 BLAKE2B e201c1366b8ab96c070829d51de079212e82216a793eb7622aa91c66e2330981de8be547b1ee7f102ed7d8c8de054d58ba151e95238146a61fba8fe908c5f929 SHA512 3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc
 DIST rsyslog-8.38.0.tar.gz 2721798 BLAKE2B 578bc9eefce4893a9c1eb54ee7360cd9fa51b3c87ffe07a0fd5b122987f991835f603417243084de0b59286e993ad1c84237e61c44bc18457b3660668421101b SHA512 9dc3bdc4ef01c2af433478e182704694cb50849d811d476a03e4ce03b3c5aecfb506e7f1c1e51fadcd63da60b067d8011b92b8c9354a688fe66f7b6ffd8f9254
 DIST rsyslog-8.39.0.tar.gz 2721560 BLAKE2B 0680cb31d0a07e5676a5c5626e46fa174b8df08ceec49b514624ff8ffeb750bbf199f73af1d89b9dfad121a292084d75b0a1218fb33138f1d7a149fd730cb3d9 SHA512 f46ead433f703df4af6ddc4bbb178ea145d7d2a35ee7749c32b9889f299ba20c83ed76c246530608198e84fef1f2bf10097344c31d5df38b9e0ae47cf4bee479
-DIST rsyslog-doc-8.35.0.tar.gz 7427270 BLAKE2B 5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1 SHA512 f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
+DIST rsyslog-8.40.0.tar.gz 2726022 BLAKE2B 33f7f2018200a20b01dbfabeeab592aa09d530edd313bb13f16c47cf3f67aebd9c465af3f1e468ca3d352cd83e4f4eee567c6fd54bbaee1723bee56f4631b440 SHA512 3d5d4f92e37ad9bf3767d5d7fc87fcb7956656f676a9495c78abd12fe9072ec8763b50543b198308a71d5d919721fb9b84b6725dd83a9d9b8a1639d81382c0dd
 DIST rsyslog-doc-8.38.0.tar.gz 7662314 BLAKE2B 57a121950a3f6630e4736a1ff998e93b543389107d146ddb148ecd2702bb208d21a7f4d77f2fd958f2a56e092341fc6a24ed1cc80a910cb1adb54c65b5b2da04 SHA512 e28a09ae2fcddc711d2cfd31207c9862192598e49964a47b41fc8fa3ae5b1e08b7e2589fb5af859d58d4bf028574eb56cac6514401aa56cb482fa1166863e6a5
 DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd17aa517c2fc875c46ac190428db6aa2a0f81f8aaed6e5b0b6991a5c13f45bc818be76c0fe4444c0eb45628ebf48b4956 SHA512 a6d09d384616a264fdf6e09fa0f61bd82a42340bac426d93119e11158f293dd58f894623aca30f2137e51bf701531f07938d014c9b8ec97d0a796447de3089de
-EBUILD rsyslog-8.35.0-r1.ebuild 11935 BLAKE2B 7676414e42d9bdb9ce830eb8a5ed9c1899ccdac7e02f3eebc07a577418d746444694708c54b60f8238675ff15759f9d3ddbfd955721f30c6376d4b598289f4db SHA512 59d1a05886ad9a11776018a10f6ffbabd34422f6d2b1818af8c0781bfa9a5d1576499ead1477840372f8d4e1e357bb5d48ad8696bc7994c29971e1547d58b0ba
-EBUILD rsyslog-8.38.0-r1.ebuild 12302 BLAKE2B 4075c44c01a73762edef1840d55de06ddb9a2b66be014f129ba1bbbfe57e8949420d2d337733ad66cf3b0e496c7c8eda1800eb930d0dd2561f5ba475e279f22f SHA512 cf553fee9df2725d694d07adab0781b48a7c25c6c775cfd79a148b8f72c31a97d56dd40d532160e92b8c82b1d09799023c2c08361f2e9ebeb959f72b33b85000
-EBUILD rsyslog-8.39.0.ebuild 12376 BLAKE2B 4ebe6f27923bbef93b9ce8350f233d752bd52bfa70b36160677be73d7afd88308cd7b5a25732f0f34a0c0de327fa99f0a6a6dfe076896f519de3eb4257a09e7d SHA512 dab6fd2e8f6ab9b4725b3d9a3068c3c450a7d40cfc52874b7218e8043d4f4edf6ca5261b1410926b311f5506d67d6ed58241410d68c739938968735f82d9ca8d
+DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f
+EBUILD rsyslog-8.38.0-r2.ebuild 12351 BLAKE2B 61f501e1ee0370308f0bda0ef8dacdf51ddedf38854fbe5ae20824f4880956e0fa953404134f251fba05edce3e13fc235a77f85696d567a5ebeccc133ae4a0e1 SHA512 ca3a5ba39f12a3e65c6b8b37bdebcaf8b816a2da1b4b59a2fe6aa7b4ecfb58b8d286ef371ee220209754a936ecb6fd8c9bc91762ebdb3aac9af2ada7c8edc4af
+EBUILD rsyslog-8.39.0-r1.ebuild 12427 BLAKE2B edb9228220f76b252fac4af418d45942b3bd632d9b70536c1c45ae5c85f9d6b9f93d4af534ed8e1ec9055d4d8d63e4e623e5a075409ffe7e03103c931233547e SHA512 ee07560398ee1c08e5c78910f1f12ada99da30dfa48d0bf4728987ec401dd2f0df6c251bb9e8bc0215471728f569175b180191c97b7d0f604ed1ece36e60d8bf
+EBUILD rsyslog-8.40.0-r1.ebuild 12365 BLAKE2B 42ed5ce3711c1c6a938b8e04c1bc268ace156558e80f622eb9fc9c422735d33f37e700c029df9b4ab3ac2225da2b648a82061fca6edcceae0f414733f64b8157 SHA512 1e54fbddaabe60b97f83239e3b19b25add36ee90b84ffe5c603cbd7a87e8df01c0ff010472250970179335f959f47bc01dc66ffef26ce3d25b608a1756c10276
 MISC metadata.xml 3863 BLAKE2B b6b20eda59279463db8ced1764012aad3197c67cdaee5993294181ac7cd956485f16e9e557664af35ac65adc725f028cb68225e5419af4fa289d2d363f1bd9ea SHA512 3a382d17acaf29b1787c2b351ee5fc2a830738ecf6dc7967462ee5ae15596058123f933c7380feafd956fef4c375fa50b26cf68a21d9cce60003dc9de1712138
diff --git a/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch b/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch
deleted file mode 100644
index 8996acd27e88..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-Add missing files for mmkubernetes tests
-
-Upstream bug: https://github.com/rsyslog/rsyslog/pull/2719
-
---- /dev/null
-+++ b/tests/mmkubernetes-basic.out.json
-@@ -0,0 +1,110 @@
-+[{
-+  "kubernetes": {
-+    "namespace_id": "namespace-name2-id",
-+    "namespace_labels": {
-+      "label_1_key": "label 1 value",
-+      "label_with_empty_value": "",
-+      "label_2_key": "label 2 value"
-+    },
-+    "creation_timestamp": "2018-04-09T21:56:39Z",
-+    "pod_id": "pod-name2-id",
-+    "labels": {
-+      "custom_label": "pod-name2-label-value",
-+      "deploymentconfig": "pod-name2-dc",
-+      "component": "pod-name2-component",
-+      "label_with_empty_value": "",
-+      "deployment": "pod-name2-deployment"
-+    },
-+    "pod_name": "pod-name2",
-+    "namespace_name": "namespace-name2",
-+    "container_name": "container-name2",
-+    "master_url": "http://localhost:18443"
-+  },
-+  "docker": {
-+    "container_id": "id2"
-+  }
-+},
-+{
-+  "message": "a message from container 4",
-+  "CONTAINER_NAME": "some-prefix_container-name4_pod-name4_namespace-name4_unused4_unused44",
-+  "CONTAINER_ID_FULL": "id4",
-+  "kubernetes": {
-+    "namespace_id": "namespace-name4-id",
-+    "namespace_labels": {
-+      "label_1_key": "label 1 value",
-+      "label_with_empty_value": "",
-+      "label_2_key": "label 2 value"
-+    },
-+    "creation_timestamp": "2018-04-09T21:56:39Z",
-+    "pod_id": "pod-name4-id",
-+    "labels": {
-+      "custom_label": "pod-name4-label-value",
-+      "deploymentconfig": "pod-name4-dc",
-+      "component": "pod-name4-component",
-+      "label_with_empty_value": "",
-+      "deployment": "pod-name4-deployment"
-+    },
-+    "pod_name": "pod-name4",
-+    "namespace_name": "namespace-name4",
-+    "container_name": "container-name4",
-+    "master_url": "http://localhost:18443"
-+  },
-+  "docker": {
-+    "container_id": "id4"
-+  }
-+},
-+{
-+  "kubernetes": {
-+    "namespace_id": "namespace-name1-id",
-+    "namespace_labels": {
-+      "label_1_key": "label 1 value",
-+      "label_with_empty_value": "",
-+      "label_2_key": "label 2 value"
-+    },
-+    "creation_timestamp": "2018-04-09T21:56:39Z",
-+    "pod_id": "pod-name1-id",
-+    "labels": {
-+      "custom_label": "pod-name1-label-value",
-+      "deploymentconfig": "pod-name1-dc",
-+      "component": "pod-name1-component",
-+      "label_with_empty_value": "",
-+      "deployment": "pod-name1-deployment"
-+    },
-+    "pod_name": "pod-name1",
-+    "namespace_name": "namespace-name1",
-+    "container_name": "container-name1",
-+    "master_url": "http://localhost:18443"
-+  },
-+  "docker": {
-+    "container_id": "id1"
-+  }
-+},
-+{
-+  "message": "a message from container 3",
-+  "CONTAINER_NAME": "some-prefix_container-name3.container-hash3_pod-name3_namespace-name3_unused3_unused33",
-+  "CONTAINER_ID_FULL": "id3",
-+  "kubernetes": {
-+    "namespace_id": "namespace-name3-id",
-+    "namespace_labels": {
-+      "label_1_key": "label 1 value",
-+      "label_with_empty_value": "",
-+      "label_2_key": "label 2 value"
-+    },
-+    "creation_timestamp": "2018-04-09T21:56:39Z",
-+    "pod_id": "pod-name3-id",
-+    "labels": {
-+      "custom_label": "pod-name3-label-value",
-+      "deploymentconfig": "pod-name3-dc",
-+      "component": "pod-name3-component",
-+      "label_with_empty_value": "",
-+      "deployment": "pod-name3-deployment"
-+    },
-+    "pod_name": "pod-name3",
-+    "namespace_name": "namespace-name3",
-+    "container_name": "container-name3",
-+    "master_url": "http://localhost:18443"
-+  },
-+  "docker": {
-+    "container_id": "id3"
-+  }
-+}]
---- /dev/null
-+++ b/tests/mmkubernetes_test_server.py
-@@ -0,0 +1,121 @@
-+# Used by the mmkubernetes tests
-+# This is a simple http server which responds to kubernetes api requests
-+# and responds with kubernetes api server responses
-+# added 2018-04-06 by richm, released under ASL 2.0
-+import os
-+import json
-+import sys
-+
-+try:
-+    from http.server import HTTPServer, BaseHTTPRequestHandler
-+except ImportError:
-+    from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
-+
-+ns_template = '''{{
-+  "kind": "Namespace",
-+  "apiVersion": "v1",
-+  "metadata": {{
-+    "name": "{namespace_name}",
-+    "selfLink": "/api/v1/namespaces/{namespace_name}",
-+    "uid": "{namespace_name}-id",
-+    "resourceVersion": "2988",
-+    "creationTimestamp": "2018-04-09T21:56:39Z",
-+    "labels": {{
-+      "label.1.key":"label 1 value",
-+      "label.2.key":"label 2 value",
-+      "label.with.empty.value":""
-+    }},
-+    "annotations": {{
-+      "k8s.io/description": "",
-+      "k8s.io/display-name": "",
-+      "k8s.io/node-selector": "",
-+      "k8s.io/sa.scc.mcs": "s0:c9,c4",
-+      "k8s.io/sa.scc.supplemental-groups": "1000080000/10000",
-+      "k8s.io/sa.scc.uid-range": "1000080000/10000",
-+      "quota.k8s.io/cluster-resource-override-enabled": "false"
-+    }}
-+  }},
-+  "spec": {{
-+    "finalizers": [
-+      "openshift.io/origin",
-+      "kubernetes"
-+    ]
-+  }},
-+  "status": {{
-+    "phase": "Active"
-+  }}
-+}}'''
-+
-+pod_template = '''{{
-+  "kind": "Pod",
-+  "apiVersion": "v1",
-+  "metadata": {{
-+    "name": "{pod_name}",
-+    "generateName": "{pod_name}-prefix",
-+    "namespace": "{namespace_name}",
-+    "selfLink": "/api/v1/namespaces/{namespace_name}/pods/{pod_name}",
-+    "uid": "{pod_name}-id",
-+    "resourceVersion": "3486",
-+    "creationTimestamp": "2018-04-09T21:56:39Z",
-+    "labels": {{
-+      "component": "{pod_name}-component",
-+      "deployment": "{pod_name}-deployment",
-+      "deploymentconfig": "{pod_name}-dc",
-+      "custom.label": "{pod_name}-label-value",
-+      "label.with.empty.value":""
-+    }},
-+    "annotations": {{
-+      "k8s.io/deployment-config.latest-version": "1",
-+      "k8s.io/deployment-config.name": "{pod_name}-dc",
-+      "k8s.io/deployment.name": "{pod_name}-deployment",
-+      "k8s.io/custom.name": "custom value",
-+      "annotation.with.empty.value":""
-+    }}
-+  }},
-+  "status": {{
-+    "phase": "Running",
-+    "hostIP": "172.18.4.32",
-+    "podIP": "10.128.0.14",
-+    "startTime": "2018-04-09T21:57:39Z"
-+  }}
-+}}'''
-+
-+class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
-+
-+    def do_GET(self):
-+        # "http://localhost:18443/api/v1/namespaces/namespace-name2"
-+        # parse url - either /api/v1/namespaces/$ns_name
-+        # or
-+        # /api/v1/namespaces/$ns_name/pods/$pod_name
-+        comps = self.path.split('/')
-+        status = 400
-+        if len(comps) >= 5 and comps[1] == 'api' and comps[2] == 'v1':
-+            if len(comps) == 5 and comps[3] == 'namespaces': # namespace
-+                resp = ns_template.format(namespace_name=comps[4])
-+                status = 200
-+            elif len(comps) == 7 and comps[3] == 'namespaces' and comps[5] == 'pods':
-+                resp = pod_template.format(namespace_name=comps[4], pod_name=comps[6])
-+                status = 200
-+            else:
-+                resp = '{{"error":"do not recognize {0}"}}'.format(self.path)
-+        else:
-+            resp = '{{"error":"do not recognize {0}"}}'.format(self.path)
-+        if not status == 200:
-+            self.log_error(resp)
-+        self.send_response(status)
-+        self.end_headers()
-+        self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')))
-+
-+port = int(sys.argv[1])
-+
-+httpd = HTTPServer(('localhost', port), SimpleHTTPRequestHandler)
-+
-+# write "started" to file named in argv[3]
-+with open(sys.argv[3], "w") as ff:
-+    ff.write("started\n")
-+
-+# write pid to file named in argv[2]
-+with open(sys.argv[2], "w") as ff:
-+    ff.write('{0}\n'.format(os.getpid()))
-+
-+httpd.serve_forever()
diff --git a/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch b/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch
deleted file mode 100644
index eaec239c3839..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From c1791ee90fdd8adf219ae3d2b849f5f041284b7c Mon Sep 17 00:00:00 2001
-From: Rich Megginson <rmeggins@redhat.com>
-Date: Thu, 17 May 2018 18:38:25 -0600
-Subject: [PATCH] mmkubernetes test python must encode response
-
-https://github.com/rsyslog/rsyslog/issues/2721
-Was not working on python3 - must use `encode()` to convert the
-string to a `bytes` object.
-Also run the server with python -u to make sure we get the log
-output from the kubernetes test server.
----
- tests/mmkubernetes-basic.sh       | 2 +-
- tests/mmkubernetes_test_server.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/mmkubernetes-basic.sh b/tests/mmkubernetes-basic.sh
-index 0bbfd08ca..d320c343f 100755
---- a/tests/mmkubernetes-basic.sh
-+++ b/tests/mmkubernetes-basic.sh
-@@ -4,7 +4,7 @@
- . $srcdir/diag.sh init
- 
- testsrv=mmk8s-test-server
--python ./mmkubernetes_test_server.py 18443 rsyslog${testsrv}.pid rsyslogd${testsrv}.started > mmk8s_srv.log 2>&1 &
-+python -u ./mmkubernetes_test_server.py 18443 rsyslog${testsrv}.pid rsyslogd${testsrv}.started > mmk8s_srv.log 2>&1 &
- BGPROCESS=$!
- . $srcdir/diag.sh wait-startup $testsrv
- echo background mmkubernetes_test_server.py process id is $BGPROCESS
-diff --git a/tests/mmkubernetes_test_server.py b/tests/mmkubernetes_test_server.py
-index 0de215603..24f4e1b0e 100644
---- a/tests/mmkubernetes_test_server.py
-+++ b/tests/mmkubernetes_test_server.py
-@@ -104,7 +104,7 @@ def do_GET(self):
-             self.log_error(resp)
-         self.send_response(status)
-         self.end_headers()
--        self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')))
-+        self.wfile.write(json.dumps(json.loads(resp), separators=(',',':')).encode())
- 
- port = int(sys.argv[1])
- 
diff --git a/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch b/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch
new file mode 100644
index 000000000000..9247d0b067f4
--- /dev/null
+++ b/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch
@@ -0,0 +1,13 @@
+https://github.com/rsyslog/rsyslog/issues/3346
+
+--- a/tools/omusrmsg.c
++++ b/tools/omusrmsg.c
+@@ -261,7 +261,7 @@ static rsRetVal wallmsg(uchar* pMsg, instanceData *pData)
+ 
+ 		/* compute the device name */
+ 		strcpy(p, _PATH_DEV);
+-		memcpy(p, ut.ut_line, UNAMESZ);
++		strncat(p, ut.ut_line, UNAMESZ);
+ 
+ 		/* we must be careful when writing to the terminal. A terminal may block
+ 		 * (for example, a user has pressed <ctl>-s). In that case, we can not
diff --git a/app-admin/rsyslog/rsyslog-8.38.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild
index bd4d4f30836f..0433b628342d 100644
--- a/app-admin/rsyslog/rsyslog-8.38.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild
@@ -16,14 +16,17 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
+	KEYWORDS="amd64 arm ~arm64 hppa x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
 		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
 	"
 
-	PATCHES=( "${FILESDIR}"/${P}-fix-omprog-output-capture-mt-test.patch )
+	PATCHES=(
+		"${FILESDIR}"/${P}-fix-omprog-output-capture-mt-test.patch
+		"${FILESDIR}"/${PN}-8.40.0-fix-omusrmsg.patch
+	)
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
diff --git a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild
index 71ff1a671915..1f68aea21c3b 100644
--- a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="amd64 arm ~arm64 hppa x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
@@ -24,20 +24,21 @@ else
 	"
 
 	PATCHES=(
-		"${FILESDIR}"/${PN}-8.35.0-fix-issue2719.patch
-		"${FILESDIR}"/${PN}-8.35.0-fix-issue2726.patch
+		"${FILESDIR}"/${P}-fix-liblogging_stdlog-linking.patch
+		"${FILESDIR}"/${PN}-8.40.0-fix-omusrmsg.patch
 	)
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
 SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql"
-IUSE+=" normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac"
+IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/libfastjson-0.99.8:=
 	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
 	>=sys-libs/zlib-1.2.5
 	curl? ( >=net-misc/curl-7.35.0 )
 	dbi? ( >=dev-db/libdbi-0.8.3 )
@@ -60,16 +61,23 @@ RDEPEND="
 	postgres? ( >=dev-db/postgresql-8.4.20:= )
 	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
 	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.14:= )
+	relp? ( >=dev-libs/librelp-1.2.17:= )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
 	rfc5424hmac? (
 		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? ( >=net-libs/gnutls-2.12.23:0= )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
 	systemd? ( >=sys-apps/systemd-234 )
 	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
 	zeromq? (
 		>=net-libs/czmq-3.0.2
 	)"
@@ -77,12 +85,16 @@ DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-archive-2015.02.24
 	virtual/pkgconfig
 	test? (
+		>=dev-libs/liblogging-1.0.1[stdlog]
 		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
 		!jemalloc? ( sys-libs/libfaketime )
 		${PYTHON_DEPS}
 	)"
 
-REQUIRED_USE="kubernetes? ( normalize )"
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
 
 if [[ ${PV} == "9999" ]]; then
 	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
@@ -157,7 +169,10 @@ src_configure() {
 		--disable-debug-symbols
 		--disable-generate-man-pages
 		--without-valgrind-testbench
+		--disable-liblogging-stdlog
 		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
 		# Input Plugins without depedencies
 		--enable-imdiag
 		--enable-imfile
@@ -180,10 +195,15 @@ src_configure() {
 		--enable-omstdout
 		--enable-omuxsock
 		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
 		--enable-pmaixforwardedfrom
 		--enable-pmciscoios
 		--enable-pmcisconames
 		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
 		--enable-pmsnare
 		# DB
 		$(use_enable dbi libdbi)
@@ -194,7 +214,6 @@ src_configure() {
 		# Debug
 		$(use_enable debug)
 		$(use_enable debug diagtools)
-		$(use_enable debug memcheck)
 		$(use_enable debug valgrind)
 		# Misc
 		$(use_enable curl fmhttp)
@@ -208,6 +227,7 @@ src_configure() {
 		$(use_enable normalize mmnormalize)
 		$(use_enable mdblookup mmdblookup)
 		$(use_enable grok mmgrok)
+		$(use_enable omhttp)
 		$(use_enable omhttpfs)
 		$(use_enable omudpspoof)
 		$(use_enable rabbitmq omrabbitmq)
@@ -216,7 +236,8 @@ src_configure() {
 		$(use_enable rfc5424hmac mmrfc5424addhmac)
 		$(use_enable snmp)
 		$(use_enable snmp mmsnmptrapd)
-		$(use_enable ssl gnutls)
+		$(use_enable gnutls)
+		$(use_enable openssl)
 		$(use_enable systemd imjournal)
 		$(use_enable systemd omjournal)
 		$(use_enable usertools)
diff --git a/app-admin/rsyslog/rsyslog-8.39.0.ebuild b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
index 941114204018..b471841628fc 100644
--- a/app-admin/rsyslog/rsyslog-8.39.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
@@ -16,14 +16,14 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
 		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
 	"
 
-	PATCHES=( "${FILESDIR}"/${P}-fix-liblogging_stdlog-linking.patch )
+	PATCHES=( "${FILESDIR}"/${PN}-8.40.0-fix-omusrmsg.patch )
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index e346981f2c0b..1eab94668d46 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -4,7 +4,9 @@ AUX sshguard.initd 572 BLAKE2B d92f03b4da940a47ae27281c1075914e7e4157d459096a196
 AUX sshguard.initd-r1 400 BLAKE2B 4d97e26fdacc5477936c899b69a8ac5d6507b8336228f425823bfaab1119d5862654babdce2e33ab530d41943f4e62f983e0d48ff38d319a85382e3c680e5e22 SHA512 1d73ee8e244f8318a4488aa9cf404d619da893828201215de741cea20cbb99dbce44caaefae6ab407146ca05d1ced61a03228fe60b9fa0beb152bcd8098ea86b
 DIST sshguard-2.1.0.tar.gz 1117466 BLAKE2B 1a105f346aa9b774fb0314161d779eadaab299d3b74181a449ab86534e11375e4c017c142bc621733593369bcebada9511dd40c64cb4a49cd124eb7537ae0717 SHA512 0a75e9d1a8c9c010c767a49e96e88db4a92aae8d428deebcff1ce8befa36b77cb1937f2fcb2a4e2a3e86d47896a8405265eb30ee7a603fc18a3ee117d646b119
 DIST sshguard-2.2.0.tar.gz 737612 BLAKE2B 8c51a265d5bddc6d4da75e2c6aa84de4c84fd85466f1cb06000c01cf8552d3d3e291532e2a1bce5c6367a93044a63839b9aa584f65dd02838c4959d86220b386 SHA512 4f7bfcd0fe7237609cd393bd6ca235882de252eced03014d9fe713c7cf66a2ecb365c35c24ab62d034abad970fb3e9a07bc854e7e5d194f6c374fac74cdc7e2f
+DIST sshguard-2.3.0.tar.gz 755702 BLAKE2B 3b2e9bea3cf65c4e9a3ab82b6f5013c167033310d6f9ffe27d1d7dc9380be2214fdfdab4892ab9f6dfaa51b1131698d729257695ddef9debbc0ad06a9f49acfd SHA512 b3df479a752e0263fc444c582dd6c89dfdd4154ab011d23d0973f16f3b3e60f21f01b53e6ed0c4b138f134cd7e3dea5e67b44901f812f3da0d1aac760eeee279
 EBUILD sshguard-2.1.0-r1.ebuild 763 BLAKE2B 2af47f5332bb6ab2cc39e8da7b4b61d91f663f93958c56474d4f813d0e32a9e6ff895bd15b3f740153b0643d2bbde8f2d1588d2636cdf89daff5826d63d395ba SHA512 281964bf882b40da1d5de715d93c12df1910c550304871c4ba5cf7570ac86821547299fd831025290182f8207027de8c053aa814a615b25656b982027fa457bd
 EBUILD sshguard-2.1.0-r2.ebuild 768 BLAKE2B 2ca5bfe103a6aee4cd013540cc9292eb3e9631f6863ac83a26496d5de083605e8515c5797173fedaf3590702e379584aa84031f960a70daaadb35ee019be5134 SHA512 a6324574621132921a9f9c7c9cfe3abc503e3b0d508ff6ef7bf9ad82db3476c169d7e88aa68e3d4c6dd268b51f38f06a1210e7489f5cbeb270345057efc34582
 EBUILD sshguard-2.2.0.ebuild 768 BLAKE2B 2ca5bfe103a6aee4cd013540cc9292eb3e9631f6863ac83a26496d5de083605e8515c5797173fedaf3590702e379584aa84031f960a70daaadb35ee019be5134 SHA512 a6324574621132921a9f9c7c9cfe3abc503e3b0d508ff6ef7bf9ad82db3476c169d7e88aa68e3d4c6dd268b51f38f06a1210e7489f5cbeb270345057efc34582
+EBUILD sshguard-2.3.0.ebuild 758 BLAKE2B dfd1fa524cd39050914e515e324540a78b90e2cd430af7df36c272b0a600410cabb763572d766857b3271f7812697f8f16b1f16b00cb5af4ce5ecff7b164e1d3 SHA512 6009a78a97a2252ed3ba06f276e10b70c9fe99e3acf343081aef63bbd021a9406c2dba6961178f05889f8dc72767bc09eb9c499b59959b15a0f40239bca3fbf4
 MISC metadata.xml 348 BLAKE2B 9dd6c721b71bc5c73a367a9a7e4ef55ee0f0805c917968e66788716241db4c4aa4479ceffdb881d26c7da8b53fd2a5db921c7ef4138e9ff5401e621124d0bc19 SHA512 b93ba2b6eb5371962e1565ef4a333b50ba0dc44ae4365486fd55b04bdac546c8ff68fedebbb7a01d3cb4810f48148bfb870bef952b631fca931cf149ea8429ec
diff --git a/app-admin/sshguard/sshguard-2.3.0.ebuild b/app-admin/sshguard/sshguard-2.3.0.ebuild
new file mode 100644
index 000000000000..578e515dab02
--- /dev/null
+++ b/app-admin/sshguard/sshguard-2.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="https://www.sshguard.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
+
+DEPEND="
+	sys-devel/flex
+"
+RDEPEND="
+	virtual/logger
+"
+DOCS=(
+	CHANGELOG.rst
+	CONTRIBUTING.rst
+	README.rst
+	examples/net.sshguard.plist
+	examples/sshguard.service
+	examples/whitelistfile.example
+)
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-conf.patch
+)
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	insinto /etc
+	newins examples/sshguard.conf.sample sshguard.conf
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 4054593a312a..4a8fd17fee29 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -2,7 +2,7 @@ DIST sudo-1.8.23.tar.gz 3150674 BLAKE2B 11b1c7bfa372005cda8baf651c4662f6fd15e94c
 DIST sudo-1.8.25p1.tar.gz 3189951 BLAKE2B ebfedaad62e60f625db8c46a5c8f19977a5ec0a86bab3b34d91096c08e8b8ece056ba312f9fecd4cdd704fc17d49a36681b41cd40269df7c67cd66d80c0d8efb SHA512 b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72
 DIST sudo-1.8.26.tar.gz 3286368 BLAKE2B 8df947f3dfa32081020b8a19921ea5daf6f9250c1ae34aa29900e85e80669223f28573217cd7e0a28393c6f30aa2117347014aa0cb554f2b85632e335ae790be SHA512 f5596cdf753ffa54f651bb30126e690640125b2ee54e8022f3740bfbe2e5a23e1bee86ce52879e863b9386babbbcf33d3e2882c573995a7d4612e9eea14d8791
 EBUILD sudo-1.8.23-r2.ebuild 6366 BLAKE2B 54ac988d6be3e7e93dc13a45ada40a627e3ffeff4515d181a18ea9b2ad411d4c2a9e107fe718217668033bedec23e57216d4295d0df12c40ff5871c3ae9f9ec0 SHA512 3e7b3f21c550724a6ed048b0639d2630015c401dbe8c51d31310a26394b1a371ab18e438dc13357ff82b05715443f24f6cb42b1daac7ec5cc9d3776d6cbc96d7
-EBUILD sudo-1.8.25_p1-r1.ebuild 6422 BLAKE2B 48cf05b022cff399cb77d53b38661afe9d706b86df385be7d5703915a0f3eb3b3d9dc628a920346794017fb768fa80aa0b741dbbd8f8a884972836855a3e7a8e SHA512 67d0029e63a76e93d73f2989711af404011ce9755fd0f02bdf40157d9c9e4f14c1b5b4247af2d252dac40286a689bd50f7f887757f672f4771d90a76b1e48ad0
+EBUILD sudo-1.8.25_p1-r1.ebuild 6419 BLAKE2B bca34e2c44cb05413e944fbd404a9eea11437f0bbdd2d19277ce944549139249f35e9035e2e26db166284bfc119c72f0a49e360860b6a97e3436b1f975199dec SHA512 20194f0df5182f0d38d5ce2b021abd1688abb5b7fc86fe1f62c1301880922f4afcea10b5afb83e1a3a116075a311964c81a8b14de72a83e4927ba3d34117062e
 EBUILD sudo-1.8.26.ebuild 6431 BLAKE2B 7fc4cf65f44a71e5d7af3592b594a1453ac35b36d9d78ac34be974331b181ae4819a52fdc5616f501a28c2e14c6b0db999314ed8711fa97984b9eaa73b70aa3a SHA512 f5086673217867bd68ba1af5feacffee0f0c8232502d289fb187f0768ad4044a013b077e647202a1a7e3128e79df1a4d664293663c64afb4ab5a7fd1bb420ddc
 EBUILD sudo-9999.ebuild 6379 BLAKE2B 9300c549acd5a013d3cfcbc0ce2fb0ae4375cf9858928dbc92f2fa7d1cb2979f19a7ec43026dcfab87a51bd87ce0f886030426a431c7acbe3bec3715b6778523 SHA512 f1c124e5658fd55d7bbb84b9d06d0cf123479cf96b1d95fae610d36fa583069d7ceab30b59116da18a71f3dc822aeef75bd099f93ac0f2e0fac92f0bd491ae8a
 MISC metadata.xml 1060 BLAKE2B 9d18c75cd15621433e2391bceaff27f7bafcf9fe39691b62ee040e894055193eb1d68acef48b467244978dcac79bc1bfb20af11952f641eab75104b2350b3d7c SHA512 e229a2df28f8bb87efb05a2980860fc37f8e324633444e26d9eb303397e16ca12e9e17ed6939e8e8044f03ab45eda4cb0401e38fdb9409229fc99a64c6da007e
diff --git a/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild b/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild
index b9509e46154c..c01bd25c66f9 100644
--- a/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.25_p1-r1.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} != "9999" ]] ; then
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+		KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 	fi
 fi
 
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index e0c6fb3619ae..e48501d1b8ba 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -6,9 +6,9 @@ AUX init.d-r2 553 BLAKE2B 270ff81ca5bac99f22b49bf47ec64d73b4328804ea264e99301de3
 AUX supervisord.conf 2525 BLAKE2B d36d6ef6b952a99ccfd61976c21eb54922555db4802288d9364f02331da5e693bce3862869248f7c0b81285576ca633e679a26acf75f03b2e620e16eea963909 SHA512 1ce55ef1f9a4cd7592645007af5e0f18147e8dca1c324ac2e48bf58aa2191ec657cfa68d7e6bdc9ba8e0747b32f4e6a44009e8c55a7bd77b265ac8593f51eeb7
 AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c45da2bb7017631bf4af4b858bc4d7964f1d64937e331728884bc21e62e9d01b11cca46aaea389372c6bad SHA512 0fe777d1f0bf70dc9b49132102ac90083261321850f80e9e323459c894c55f722ab8470eba3ba7bb35a9d69ad411a3247546066d6cba5801c9b289350ea4bed5
 DIST supervisor-3.1.4.tar.gz 392321 BLAKE2B 316789fae200f02242a90d3a22a3c6486576f74dbab81b95efc72768a89c54999a370625f9589afe1edff08351840fbe27a7ef8674e6f1e3bbdd4237f3227df6 SHA512 7182db4169d37aa8f7a2a4e1d57ce40f6dea21759ed73fb49286dd5ffb2bdede0fccdc71344e93c8f8c067a2cbc4e3cb0a9a50b22bacdb1b8bc1378581ed5f07
-DIST supervisor-3.3.3.tar.gz 418354 BLAKE2B 50ce29cdad6c4d8c1a041de74d970ef57031c8b3b77180f8b837e402773ac912d384397e650b94eaeaf1db2d9a6bbb21f19247454262e96ea0f1b733226701a2 SHA512 8285445da8a0ed790fbdf75d988304ab8fcefd9c36975ae6526ec58f511c73cd8707f22b7cff40c3aed5e63f3665d096ed4b5dbc2cc456fe0c5b4547149dbb4a
 DIST supervisor-3.3.4.tar.gz 419794 BLAKE2B b916c22f3ec1cc180d495f08dac1a66cfd5a93c060906c015a85b2bf64733b4ed298b67050db1332639902a1c6601118a5c05e01c54ed4fc32910d1c24431131 SHA512 fab141b52a548a3efd26f175798b1b8fbb46ce465aa48c3281cb80584b829ecef90ae1355e4106632d13c84363ae03f081d69fb4148303ff387ab7d4e778d21a
+DIST supervisor-3.3.5.tar.gz 421220 BLAKE2B 63e9db005596921c4a4426de361fc20992a27b67b67ee1256cd64fe6d385909682a5055e4797512410f36f6855592f53c9c5720c54a2dae967578691d05ff3fc SHA512 66c43d40c216e5c3120e083407c848295fa1e59d6d9da916a4bae5c37d4d13208c3bf7c0c8b8a5d570270eb44fac0b1bbcceddb2e84e4f3fc1b6241b43116af7
 EBUILD supervisor-3.1.4.ebuild 1190 BLAKE2B 914c69c7e7d8146273fa3b2dc9445a5fee5f7d52692884a208d1b4cd3b3ac11d902823ebf1f33e2d82aaa0bdf316de85b12d04917cd115d800516733b20fc445 SHA512 be9e9ece37f97cc515679f06ca358e3af4b06039ee9009be02e28c6acecbd157fde107622201e6cea2a5c00221a6ffb078a98611662ab002edc08e3ade26c983
-EBUILD supervisor-3.3.3.ebuild 1075 BLAKE2B 53cf037167e7706893bf8dc22eab6f32d70573576745b71da1913958d169ddb936f4ef46abf0095c327c9174254124414d200449792e6aa208881d9d16ee8960 SHA512 920938eebe8368c84a564cb556c137caddd0342f2eb2c293e7a1d64e8283add801530c605d61391b11af9ada569a7a5a55170285837fee70d1497487e09b41f4
 EBUILD supervisor-3.3.4.ebuild 1962 BLAKE2B b9d1166a42facd65d57fe1eb72e261d394d51de3a1df394a877197165357959282f4094ea21255729f15d8438aeca4123e126e76ca0aa3bd75c0ab7e1068165f SHA512 1a808d9979563f2ea818ab577c43a7ed39489cc33403d6ad2650299b78224269c03245e7ebf05d9b0cd54b32efa56edc39a4af017b2798a4cae362abb796023f
+EBUILD supervisor-3.3.5.ebuild 1959 BLAKE2B 168867deedc11199bff5b9d25d44056219809f35c3627a720469d755b3312f704d6568ef9331d46b4b177154707b10721c7058ead18af690b57c98f5ce912262 SHA512 9a35ea4c5381762644e00c2de4ae3272537e12357fdf17f2daa7b8c9a9187075f4625c38c555a3d6f32c4690fd8940deebaf3a27d4de9ca08fc8aa1797ebc30e
 MISC metadata.xml 623 BLAKE2B dc7acae3a83fce87bdaf98f65ba4ac2434e0344faeb8ad302dcba5be3a59f2b6ffa9d85338ad432100d5e1017e40bbeb606724a214097e14bcc7082eb331986a SHA512 f05e62f68c51fe2bab054d03b3a902682eaaa133de08ac558a92736868dcc8049d1f27828e3ecae8f5f64b038bb8a322e58c90401e6fe01d215941e1507076e8
diff --git a/app-admin/supervisor/supervisor-3.3.3.ebuild b/app-admin/supervisor/supervisor-3.3.3.ebuild
deleted file mode 100644
index 7dba0e2b7cd7..000000000000
--- a/app-admin/supervisor/supervisor-3.3.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )	# py2 only
-# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/meld3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	newinitd "${FILESDIR}/init.d-r1" supervisord
-	newconfd "${FILESDIR}/conf.d" supervisord
-	use doc && local HTML_DOCS=( docs/.build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-admin/supervisor/supervisor-3.3.5.ebuild b/app-admin/supervisor/supervisor-3.3.5.ebuild
new file mode 100644
index 000000000000..4aa769a63805
--- /dev/null
+++ b/app-admin/supervisor/supervisor-3.3.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )	# py2 only
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1 systemd user
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/meld3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+python_prepare_all() {
+	# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
+	sed -i '/namespace_packages=/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/.build/html/. )
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newinitd "${FILESDIR}/init.d-r2" supervisord
+	newconfd "${FILESDIR}/conf.d-r1" supervisord
+	dodoc supervisor/skel/sample.conf
+	keepdir /etc/supervisord.d
+	insinto /etc
+	doins "${FILESDIR}/supervisord.conf"
+	keepdir /var/log/supervisor
+	systemd_dounit "${FILESDIR}/supervisord.service"
+}
+
+pkg_preinst() {
+	enewgroup supervisor
+	fowners :supervisor /var/log/supervisor
+	fperms 750 /var/log/supervisor
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "You may install your configuration files in ${EROOT%/}/etc/supervisord.d"
+		elog "For config examples, see ${EROOT%/}/usr/share/doc/${PF}/sample.conf.bz2"
+		elog ""
+		elog "By default, only members of the supervisor group can run supervisorctl."
+	fi
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 36506cfc2cf3..7db9a53475f1 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -27,17 +27,13 @@ AUX syslog-ng.logrotate.hardened.in 1518 BLAKE2B c13fd2707266edef0e74476aaf8446c
 AUX syslog-ng.logrotate.in 219 BLAKE2B acfde709749d11790b451e3f9a0d9bc33f129e86e3f68bdd36cf2d2c9c5561c5308805aea36378e8d79995e1bf173e4471845805681be2c409b52479333c35d8 SHA512 7a838006ce61c9702d6ea77672affa8cb1dc2ec2c6a1a268a4ae4f5a59dcac1ccfe835d25144ef8376a60a11227fa64e38dc16f8d0eaff182f14a6644a3a5ceb
 AUX syslog-ng.rc 1894 BLAKE2B 589c512657b46c19a3c407249382bfac951725aa2a389390f8ee911ceca363768618fd5cb6010f9294c6b977ce40e08ad0f4c085b293e6eac7bc094e95befda5 SHA512 4af1a8352c11280e17206ec60f12d85a882d11adcc60c88c86fbf45b786e71a1a3004b657a69c5f17692679a161d79e02197dc03a41f1e79b080a9a419f5b2cc
 DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
-DIST syslog-ng-3.14.1.tar.gz 9039910 BLAKE2B 688eb52557c41a2556835978809b74ef4cc6b78e54580c4f349a8b9ebc07a6cf5ab99d8cda2a0212cb0186fe9e0a276d46ab9846c5ed1c391d734596ccc2d0a9 SHA512 86e5b59f76de3f585781accc9e426b2f74a73a560a6b49364e3f2b71b6fdd382b8473b468ac396e09c1dd0e00aa525a25874af67ce6c81978df2995c9b920aa7
-DIST syslog-ng-3.15.1.tar.gz 9147238 BLAKE2B 86c51a51569efed2c2127a6102a10224a0599d40af0d34f28b5b52e314687851753f979a8d9edabdba02d347407b1b2856bce11991eeda53cbe10ad135934534 SHA512 79b4f2eff92bcbfe8a875bc72eb98bb43d86ef3c63deaf4acefcdad4f3a98df9de4e7935fc2ebbe017fd5eb22aa0743f1ff428d0ccf3790a1767f4e25c6a7b13
-DIST syslog-ng-3.16.1.tar.gz 8899693 BLAKE2B 850d83ff6f7e2db4aaf0737cc97403084bfa97855df28ccc8134c7d744cc0539e5d9efcd72f7eaa5407504897bc274419963843afa4c81964732dc5d6f0337cd SHA512 6b47e570ac19154f6158d8de0898c0a49e87d4ed51cae67224501e9460063efc53c4b2ad518d7def811d320f88cbefbf5d645de31f300498921652d7be305999
 DIST syslog-ng-3.17.2.tar.gz 9119227 BLAKE2B 3268a51c587e66579b30ee8d27397eeeb3ab52c7e1939ad26ad976be2670565a389fda9dbc3a25f80710f855788c85f58d47f6a3c297b8ff6efa01e0dca386fe SHA512 2b82ea047bab125d35ab0a90e933b8a282852c6b4a9a8adc3f2a0ddf392f24210ce1296d0cfb389f98e54e50090a3ded5a64c5a9529d2a90cbecbfafd620edd7
 DIST syslog-ng-3.18.1.tar.gz 4259746 BLAKE2B 3878a87bd195aadb0f9d024e1336e50268d69c00b438b5e3471f21bc4592ebd97980004c3624d9b92232b38068ebefa0c3317cb0d9b5dfeba37c479aeadc32e4 SHA512 2e6ea690f8762f3f37885118f023048c4cba59f58002c87fa1c469cb991b2ba707015b3e54c50f17c3d6e6251d798557406925a9159f4fa914331f281dc39e48
+DIST syslog-ng-3.19.1.tar.gz 4224779 BLAKE2B e938c91101c18951a5c921bea51631400bf579ebc840300c6d8411da9b8db69935d104bfe00525512ab0173b932a8e24e2fb102e17bc4ecf58b268e52ef5b41a SHA512 f625073bafa9378109d5be34591247766a62cb5a76e814f42bfbf03472e96ebe2833f19779812abfdd950a3498115f57b97c1427c280ee0dab21d3e2eb92ca57
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
 EBUILD syslog-ng-3.13.2.ebuild 4701 BLAKE2B 4bc557a7545796a5c0c883ac3cee067396636e2292261db4f4c98c330e58b1d20e796f7214fd856d885f99fdc9f3db59ab59d3e1e0febda23ff97fdf9fedfc9c SHA512 f9ff35932c0e1af04ed237e9ded764ec1dc38d0cf952aeb1335d67b73f73262f8975cdb2f3908ee77252eef9d4ad3f6228025219bba9df263cd2b380c1c5df81
-EBUILD syslog-ng-3.14.1.ebuild 4807 BLAKE2B fda2a0d6d3c0c23e867b4162d062557b49949216e56831316b41475c0da1f0f4d41f3880e28a6558b17baa8f3a35310d389e778c88a7f5daeb58065b9b198119 SHA512 314185268f92097b76f1055c8a98b502f2e7e40d9f00e6dc18584c5433841cfe1656750f7a5ad30c96a08834dbab00153c151e3d5fc438353541d053da04065e
-EBUILD syslog-ng-3.15.1.ebuild 4774 BLAKE2B 1110e1c8b94f2085fcdc600fed136283ca74c9541b6ab20c237c49296a41f4e78babe79d1681fb3f58f691979a408362b69f17a441c61f454a1c93b987e04cf2 SHA512 083d58fbecdd5ef717468053f106ab9d2ed0a7064b1e8725341a447c8b40c4af138752f8e1216d16abac311c7ccbae857a43d4e68ee8d54efa852e45615c8112
-EBUILD syslog-ng-3.16.1.ebuild 4857 BLAKE2B 02ca3e2f022170afdc56ca066e1ad070b5d6bfa8242b4283eb1c967b82055b57612a585333f5e10ffcb25cdcdd4a4d5fe618c5f4896f9d4697d55c93d3d8a665 SHA512 c9c0b6dcf1a4007df67656d3277ddaa1906c275f14d7aca5490d008643103e35948cba77747f55e2a3df402de452eca3e44b0ff28f68165c24eaf0040f2f200d
-EBUILD syslog-ng-3.17.2.ebuild 4919 BLAKE2B b1c54f6059d4af745ccf6acc8c878b249ee1425f180347db66c5fb87907284ed94f4ba066dc28075067e9e0d9b1a79a24c6a81dfb198ef7e1bd3415aae97b9e5 SHA512 79064fa02d38c13f5870cc9fbd6b31ad9421a5fd8c3bae3209c9729073ec49347c4b908c427cffc150ce7bf1e918b57945027760302cfaab33a87a29c0f3b168
+EBUILD syslog-ng-3.17.2.ebuild 4912 BLAKE2B 0b0c7f94e90c62e6109b9015bc49b63e9b1819935f01d0be709163289261c037b6082344c86a0b4043b5a9141d348107241724def91b3cd158a2169003ecde02 SHA512 c1cffac81d810cd5e2b56bb96a1e0031994bda99fdf67e053a2fd178f01db92116deea62a06c583fac3770f04535468f3b29f1a57f157f806d52cdb2157f4d00
 EBUILD syslog-ng-3.18.1.ebuild 4888 BLAKE2B 7c5354362dace4443e1a7137765cdce2a4c15891319370d4b0ee7edadda3a5438b546addedd85dfdd78255333b4231fde2beadbc6a1c60e588089b098e884eca SHA512 515d7bc671aa54c71da0910a75600d5c9a2f1a422699c86bc48a77c34172f55b39b7937879b88cf5faaf57459d5c68083276983ad8674432ac5605ece6dc9850
+EBUILD syslog-ng-3.19.1.ebuild 4905 BLAKE2B a09fd525ed80acd69e4a4ae6cbc4dc73d0588eaa18a2602c6ee7c0f75846cfa4db77356772cca43fa0782c5e1486e0f0f4459f7d1a99097750aad5f04422dc51 SHA512 153e9cf0044a6ddabf92aa58ed3d3a7a2f7746b6232cd85de6555056c21d7989d6a235847835ccf1d0324a2239646d6e3c018f8ace1b6469536f485a798dec26
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1186 BLAKE2B 8fc7edd7e310b01dc6080332a62ed4ffc5d690d4082f800d8306232c138fac46f07ab7cebcbd40e91c2c41467880bbf61b4bbec0907e84f26cde51d24277f47c SHA512 5d8a62c83706e3bcb01b67e6873f7052c941518d566667e5b50aacdc8fcaf07a02c76ca3705369181795c2c62b5ea990cdb93501e1719d0693d597b5e6f8bee2
diff --git a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
deleted file mode 100644
index dab014aa5adb..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit autotools python-single-r1 eutils multilib systemd versionator
-
-MY_PV=${PV/_/}
-MY_PV_MM=$(get_version_component_range 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test"
-
-RDEPEND="
-	amqp? ( >=net-libs/rabbitmq-c-0.8.0 )
-	caps? ( sys-libs/libcap )
-	dbi? ( >=dev-db/libdbi-0.9.0 )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
-	http? ( net-misc/curl )
-	json? ( >=dev-libs/json-c-0.9:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( >=dev-libs/hiredis-0.11.0 )
-	smtp? ( net-libs/libesmtp )
-	spoof-source? ( net-libs/libnet:1.1 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=dev-libs/ivykis-0.36.1
-	>=dev-libs/libpcre-6.1
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	!dev-libs/eventlog
-	>=dev-libs/glib-2.10.1:2"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/patches/${PN}-3.14.1-fix-tls-client.patch"
-	"${FILESDIR}/patches/${PN}-3.14.1-fix-automake-1.16-build.patch"
-)
-
-DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
-	contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened"
-	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local f
-
-	use python && python_fix_shebang .
-
-	# remove bundled libs
-	rm -r lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
-
-	# drop scl modules requiring json
-	if use !json; then
-		sed -i -r '/cim|ewmm|graylog2/d' scl/Makefile.am || die
-	fi
-
-	# use gentoo default path
-	if use systemd; then
-		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
-			-i contrib/systemd/syslog-ng@default || die
-	fi
-
-	for f in "${FILESDIR}"/*logrotate*.in ; do
-		local bn=$(basename "${f}")
-
-		sed \
-			-e "$(usex systemd \
-				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng@default/' \
-				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
-			"${f}" > "${T}/${bn/.in/}" || die
-	done
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		--disable-java \
-		--disable-java-modules \
-		--disable-riemann \
-		--enable-manpages \
-		--localstatedir=/var/lib/syslog-ng \
-		--sysconfdir=/etc/syslog-ng \
-		--with-embedded-crypto \
-		--with-ivykis=system \
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
-		--with-pidfile-dir=/var/run \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(use_enable amqp) \
-		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) \
-		$(use_enable caps linux-caps) \
-		$(use_enable dbi sql) \
-		$(use_enable geoip) \
-		$(use_enable http) \
-		$(use_enable ipv6) \
-		$(use_enable json) \
-		$(use_enable mongodb) \
-		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") \
-		$(use_enable pacct) \
-		$(use_enable python) \
-		$(use_enable redis) \
-		$(use_enable smtp) \
-		$(use_enable spoof-source) \
-		$(use_enable systemd) \
-		$(use_enable tcpd tcp-wrapper)
-}
-
-src_install() {
-	default
-
-	# Install default configuration
-	insinto /etc/default
-	doins contrib/systemd/syslog-ng@default
-
-	insinto /etc/syslog-ng
-	if use userland_BSD ; then
-		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${T}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc" syslog-ng
-	newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
-	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
-	prune_libtool_files --modules
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	# bug #355257
-	if ! has_version app-admin/logrotate ; then
-		echo
-		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-		elog "for logrotate to use."
-		echo
-	fi
-
-	if use systemd; then
-		echo
-		ewarn "The service file for systemd has changed to support multiple instances."
-		ewarn "To start the default instance issue:"
-		ewarn "# systemctl start syslog-ng@default"
-		echo
-	fi
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild
deleted file mode 100644
index 330bc184b760..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.15.1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit autotools eapi7-ver python-single-r1 systemd
-
-MY_PV_MM=$(ver_cut 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# unit tests require https://github.com/Snaipe/Criterion with additional deps
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.10.1:2
-	>=dev-libs/ivykis-0.36.1
-	>=dev-libs/libpcre-6.1:=
-	!dev-libs/eventlog
-	amqp? ( >=net-libs/rabbitmq-c-0.8.0:= )
-	caps? ( sys-libs/libcap )
-	dbi? ( >=dev-db/libdbi-0.9.0 )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
-	http? ( net-misc/curl )
-	json? ( >=dev-libs/json-c-0.9:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	smtp? ( net-libs/libesmtp )
-	spoof-source? ( net-libs/libnet:1.1= )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
-	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
-	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local f
-
-	use python && python_fix_shebang .
-
-	# remove bundled libs
-	rm -r lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
-
-	# drop scl modules requiring json
-	if use !json; then
-		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic/d' scl/Makefile.am || die
-	fi
-
-	# use gentoo default path
-	if use systemd; then
-		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
-			-i contrib/systemd/syslog-ng@default || die
-	fi
-
-	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
-		sed \
-			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
-				"/etc/init.d/syslog-ng reload")#g" \
-			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	for f in syslog-ng.conf.gentoo.fbsd.in \
-			syslog-ng.conf.gentoo.hardened.in \
-			syslog-ng.conf.gentoo.in; do
-		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-docs
-		--disable-java
-		--disable-java-modules
-		--disable-riemann
-		--enable-manpages
-		--localstatedir=/var/lib/syslog-ng
-		--sysconfdir=/etc/syslog-ng
-		--with-embedded-crypto
-		--with-ivykis=system
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng
-		--with-pidfile-dir=/var/run
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_enable amqp)
-		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
-		$(use_enable caps linux-caps)
-		$(use_enable dbi sql)
-		$(use_enable geoip)
-		$(use_enable http)
-		$(use_enable ipv6)
-		$(use_enable json)
-		$(use_enable mongodb)
-		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
-		$(use_enable pacct)
-		$(use_enable python)
-		$(use_enable redis)
-		$(use_enable smtp)
-		$(use_enable spoof-source)
-		$(use_enable systemd)
-		$(use_enable tcpd tcp-wrapper)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	# Install default configuration
-	insinto /etc/default
-	doins contrib/systemd/syslog-ng@default
-
-	insinto /etc/syslog-ng
-	if use userland_BSD ; then
-		newins "${T}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${T}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
-	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
-	find "${D}" -name '*.la' -delete || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	# bug #355257
-	if ! has_version app-admin/logrotate ; then
-		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-		elog "for logrotate to use."
-	fi
-
-	if use systemd; then
-		ewarn "The service file for systemd has changed to support multiple instances."
-		ewarn "To start the default instance issue:"
-		ewarn "# systemctl start syslog-ng@default"
-	fi
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
index 6cb3c4e94b8f..a8095fba3df8 100644
--- a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/syslog-ng/syslog-ng-3.16.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
index f046b4bfc7ca..118e0c6c63ff 100644
--- a/app-admin/syslog-ng/syslog-ng-3.16.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+EAPI=7
 
-inherit autotools eapi7-ver python-single-r1 systemd
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
 DESCRIPTION="syslog replacement with advanced filtering features"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
 RESTRICT="test"
@@ -28,6 +28,7 @@ RDEPEND="
 	caps? ( sys-libs/libcap )
 	dbi? ( >=dev-db/libdbi-0.9.0 )
 	geoip? ( >=dev-libs/geoip-1.5.0 )
+	geoip2? ( dev-libs/libmaxminddb:= )
 	http? ( net-misc/curl )
 	json? ( >=dev-libs/json-c-0.9:= )
 	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
@@ -57,16 +58,16 @@ src_prepare() {
 	use python && python_fix_shebang .
 
 	# remove bundled libs
-	rm -r lib/ivykis modules/afmongodb/mongo-c-driver || die
+	rm -r lib/ivykis || die
 
 	# drop scl modules requiring json
 	if use !json; then
-		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic/d' scl/Makefile.am || die
+		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|nodejs|osquery|slack/d' scl/Makefile.am || die
 	fi
 
 	# drop scl modules requiring http
 	if use !http; then
-		sed -i -r '/telegram/d' scl/Makefile.am || die
+		sed -i -r '/slack|telegram/d' scl/Makefile.am || die
 	fi
 
 	# use gentoo default path
@@ -111,6 +112,7 @@ src_configure() {
 		$(use_enable caps linux-caps)
 		$(use_enable dbi sql)
 		$(use_enable geoip)
+		$(use_enable geoip2)
 		$(use_enable http)
 		$(use_enable ipv6)
 		$(use_enable json)
diff --git a/app-admin/syslogread/Manifest b/app-admin/syslogread/Manifest
deleted file mode 100644
index 492633d2b246..000000000000
--- a/app-admin/syslogread/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 0.92/klogd.run 84 BLAKE2B 55ab3af85c0d2c4d2a64a13a06121dda81aa1d8e46b9dcbe35e0cca7547e083c9e01932ca46744f18e756ce9112855605586822cef1f27a1ea6de021f758fd37 SHA512 6451fc04a4005e5bf0e8c7852da8fa46c6e87ae32cff18554996acdb06a9d4c1323f54439de6c7c9274fbd09aed38c9c3af982700aa3ca1f122434ba9b75fc6e
-AUX 0.92/syslogread-log.run 129 BLAKE2B f19209cf028c423169843fe9c522b26778a87a9d23bf48763b206f2cf9f19de16cfab78390f24aabb043a66d5878eda305ef300ef78179035c3cafcd29cd9b99 SHA512 3ef1cd5a49a8a360c1417ff646ecb1c42ec15a2ebe1fdf83e949e7fb7a80265c3e76229316a1f98107b9739a4edf5ea62c446aa4af3cb254ea2c180c36ed0aab
-AUX 0.92/syslogread.run 56 BLAKE2B 80da0e8fee9548fb94adfbc11d273b6ab14b27797921e37e08b08196c3ec06145cf4ffdc3784b48296bf712e264823d3ef6b9bd5f9fcc0ce33ba33c36aee4ae6 SHA512 f1ba637765145a51279c29e1c9c345a5426e606c7f483129d6675b1998c8a578c591f16aaf9887907ecf3053c75ada1190c52ab09a49e938f566068c191096ac
-AUX syslogread-0.92-fix-parallel-build.patch 516 BLAKE2B 14371b7491b60133fff8544916529eb7c797ecb31d5dcf41d238d5cb802a1af77e2bba20780d39d29ff423304878353abb14ff0ffe523385cd0f2a316788e271 SHA512 da661b502f21c82284acbc057e53531dd5ae596c8a7fcc85e6f112687ddc7756bb4c908c7d5f30e935023576fccbb625c5d5cebcbc17c09164cf34353d501635
-DIST syslogread-0.92.tar.gz 21807 BLAKE2B 02ca376af331f7ea8ba75c00b1a805aa3ab2405d1a19492cfd210bba15b7f6fac695c84d37eb4685306567a19e1d5c6f111ad57a650b0f32f9576e652425ece8 SHA512 8e00d169955e2c659233df1746f0e50f33f50cf9eb7d4b6d2926eadd6e6a7183b7beec485b7422befc399cc48da83462a709304715083d2c5ec8359b6f3728c0
-EBUILD syslogread-0.92-r1.ebuild 2174 BLAKE2B fb9801241bdb0822c1f7078e1052cd8cee150a4ac4a94dc2714ac43d4f9eaba75349f5ad88d4777b56ea43e7740ba1c559878ed44c57e1aa7e419f91f289983a SHA512 5e9ffff6904fe1b2a67081256e1c483db3b65355acc4c9e76d8cd578ea29384ec858ac314f740c5db20e1fd17afc7949af82d3b1aecaf44c36c3119594ffeb51
-MISC metadata.xml 320 BLAKE2B 48648831757dd6f6654988baab3bf2ed4b1e2f007099db5626f52a73b0dcf9346762bd6cc2df7e5050354805124bd36cee46ad9dde8351c6085d848542222954 SHA512 ed2785769c5264f45b4712ec699ce6b01ae6dafc0ebd3de566b0c7d1189fca026f249e8e9f60b24dc69ca24cc8c86f45dca94161c80fdca8242494132305b408
diff --git a/app-admin/syslogread/files/0.92/klogd.run b/app-admin/syslogread/files/0.92/klogd.run
deleted file mode 100644
index b6d0fb27795e..000000000000
--- a/app-admin/syslogread/files/0.92/klogd.run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh 
-exec 2>&1
-exec < /proc/kmsg 
-exec /usr/bin/multilog t n64 /var/log/klogd
diff --git a/app-admin/syslogread/files/0.92/syslogread-log.run b/app-admin/syslogread/files/0.92/syslogread-log.run
deleted file mode 100644
index f53cd0199571..000000000000
--- a/app-admin/syslogread/files/0.92/syslogread-log.run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-#exec setuidgid syslog syslogxlate '*.*' | multilog t /var/log/syslog
-exec setuidgid syslog multilog t /var/log/syslog
diff --git a/app-admin/syslogread/files/0.92/syslogread.run b/app-admin/syslogread/files/0.92/syslogread.run
deleted file mode 100644
index fdcb018c3066..000000000000
--- a/app-admin/syslogread/files/0.92/syslogread.run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec envuidgid syslog sysloglread -U /dev/log
diff --git a/app-admin/syslogread/files/syslogread-0.92-fix-parallel-build.patch b/app-admin/syslogread/files/syslogread-0.92-fix-parallel-build.patch
deleted file mode 100644
index 98e810fc70a9..000000000000
--- a/app-admin/syslogread/files/syslogread-0.92-fix-parallel-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig	2010-01-14 13:47:59.000000000 +0100
-+++ Makefile	2010-01-14 13:49:00.000000000 +0100
-@@ -45,14 +45,14 @@
- 	./load insthier -lbg-installer
- 	mv insthier installer
- 
--instcheck: load insthier.o
-+instcheck: load insthier.o installer instshow
- 	./load insthier -lbg-instcheck
- 	mv insthier instcheck
- 
- insthier.o: compile insthier.c conf_bin.c conf_man.c
- 	./compile insthier.c
- 
--instshow: load insthier.o
-+instshow: load insthier.o installer
- 	./load insthier -lbg-instshow
- 	mv insthier instshow
- 
diff --git a/app-admin/syslogread/metadata.xml b/app-admin/syslogread/metadata.xml
deleted file mode 100644
index 2fbe00ebaa8e..000000000000
--- a/app-admin/syslogread/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-	This package is a set of tools that are useful in receiving, analyzing,
-	or producing syslog messages.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-admin/syslogread/syslogread-0.92-r1.ebuild b/app-admin/syslogread/syslogread-0.92-r1.ebuild
deleted file mode 100644
index f92cca746857..000000000000
--- a/app-admin/syslogread/syslogread-0.92-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs multilib user
-
-DESCRIPTION="Syslog message handling tools"
-HOMEPAGE="http://untroubled.org/syslogread/"
-SRC_URI="http://untroubled.org/syslogread/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/bglibs-1.106"
-RDEPEND="virtual/daemontools"
-
-pkg_setup() {
-	enewgroup syslog
-	enewuser syslog -1 -1 /nonexistent syslog
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/syslogread-0.92-fix-parallel-build.patch
-}
-
-src_configure() {
-	echo "/usr/include/bglibs/" > conf-bgincs
-	echo "/usr/$(get_libdir)/bglibs/" > conf-bglibs
-	echo "${D}/usr/bin" > conf-bin
-	echo "${D}/usr/share/man" > conf-man
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
-	echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man
-	./installer || die
-
-	dodoc ANNOUNCEMENT ChangeLog README
-
-	insinto /var/lib/supervise/klogd
-	newins "${FILESDIR}/${PV}/klogd.run" klogd.run
-
-	insinto /var/lib/supervise/syslogd
-	newins "${FILESDIR}/${PV}/syslogread.run" syslogread.run
-
-	insinto /var/lib/supervise/syslogd/log
-	newins "${FILESDIR}/${PV}/syslogread-log.run" syslogread-log.run
-
-	# See ChangeLog for why these are commented out:
-
-	#newinitd "${FILESDIR}/${PV}/syslogread.init" syslogread
-
-	#keepdir /var/log/klogd
-	#keepdir /var/log/syslog
-
-	#fowners syslog:syslog /var/log/syslog
-	#fperms o-rwx /var/log/syslog
-}
-
-pkg_postinst() {
-	echo
-	elog "Run "
-	elog "emerge --config =${PF}"
-	elog "to create or update your run files (backups are created) in"
-	elog "    /var/lib/supervise/klogd (kernel logger)"
-	elog "    /var/lib/supervise/syslog (system logger)"
-	echo
-}
-
-pkg_config() {
-	cd "${ROOT}"var/lib/supervise/klogd
-	[ -e run ] && cp run klogd.run.`date +%Y%m%d%H%M%S`
-	cp klogd.run run
-	chmod u+x run
-
-	cd "${ROOT}"var/lib/supervise/syslogd
-	[ -e run ] && cp run syslogread.run.`date +%Y%m%d%H%M%S`
-	cp syslogread.run run
-	chmod u+x run
-
-	cd "${ROOT}"var/lib/supervise/syslogd/log
-	[ -e run ] && cp run syslogread-log.run.`date +%Y%m%d%H%M%S`
-	cp syslogread-log.run run
-	chmod u+x run
-}
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index aae117612111..954cd435ef9f 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -3,11 +3,13 @@ AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d8
 AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f49718cc0fb3c70bc681e8cdda29394ea5a75d871c76f658305b26d44d1034d09079f3b6306a4dd466cd0775b5514b2 SHA512 80dd658b06f2e1072a3a58bbe84770170f1cb6c3e2ae0d660713a007b0e9e59c45b710cc1484c94ec466759455ae18a7fbae237b6674ee9ddb43a7a4502cb0d5
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
 DIST sysstat-11.4.0.tar.xz 343968 BLAKE2B e34da8cf0216f66fad3ade0ed40e8ec3b7641f7568ebcce5bc3122f888c90885ece346bf7f4f8e71e92435257ee5c6c0e5a89913c0e22a0ad28fa1018a73ea71 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604
-DIST sysstat-12.0.1.tar.xz 602484 BLAKE2B 68f6f54a931f1b502ab065f25cd49c9d631d40689b380b5d535c540416a3c05233dbf151b7d8bec7061fbc8eb6fb61860ed6f5ef0d611314191a2c36601437ca SHA512 d8940dc71592c041f59b2b0bcda7ae2748f0527832e6da7b4722dc91abb0139f1b5c528d50c97b4df0bcb5607b844bed3651183acea738b02f3a8e88809740f9
 DIST sysstat-12.0.2.tar.xz 602408 BLAKE2B a3c27bf4f7ec74feab9bcd797027429c266dcef7041175d7be185f2f49e57a57b443423116ac9b8b89a312afb796748de3a7af749681c7273a5331f171676665 SHA512 c55c3fb8210f006f70e56c8ef5fe013ad1a9247125e69302f920592288725f76ba268c142f1da6ef078a3cdf75e471921ff41aa8b59b8edff57d3bc5345d36e9
+DIST sysstat-12.0.3.tar.xz 603064 BLAKE2B 79666c16d7a18aa058f2b8c5e81a16e11a01ba94c809a924d4be6a37cdd67f8755a0112e7f227ceb35b1a4847348de0e6ec34ef3da62c2ea81fceb1590e292ea SHA512 b6f7d27981898faabf4349eb889a767e655ed797aa3f7fac3bdc99968bdb15ed2a7aa04acda610a014022bdc2aa7e603b1c413e0eb8d734db04675fcaa4561ca
 DIST sysstat-12.1.1.tar.xz 605396 BLAKE2B a75fc5c9d1ddea2817418629bc7929a58b22875b1af173558e97ca2c8eb431b3a489287dbae17072a327b36a762fc5193cc10787e2d4fa6340895b9647c1be11 SHA512 845adfb6e29bbf3a152496da1959d459b983ad50ad11f08a2887bf25339b988facbb7ca06693fc9df53c3d20d20662860176f589a8cfb70afcc8a825e0e5d122
-EBUILD sysstat-11.4.0.ebuild 1945 BLAKE2B 60e245699e621770f3f8aac3d622063b8e6bdad5135e3408dce587eae8d3b32c6884dc4db78a397b2a7ca0b58a7277fb652b21fad8a6e3c0e008f70eea0c8503 SHA512 25438d8e95dac4789c18215f83c09868ef7bb9886d5abe76f70b5461b65cfa42648c7593d861c0d075f1ec7bde52503d3235f3aea716e9fc9a39dfc5762e269c
-EBUILD sysstat-12.0.1.ebuild 1787 BLAKE2B d9235c61d19c41e58a65b61bd3188f085a3e08810cfbf2291067bca879f6465b27a115ed534d3d77c6bbf1e8d03286193a1f77a03e3065f62782e649ab49095a SHA512 2dc9618776ca53b7587094a337530e42e687fe83da4967bb8ed45e5a5da5e8ac6fb5980b4e2769d88e192b102e9f2a20a1fac25caf9dbafe2c71ecd716c14866
-EBUILD sysstat-12.0.2.ebuild 1784 BLAKE2B e54730998ee0c3402869d63f3bf755bda7e27d6050b512318a996ad5d6961c914c8124bbaf74cb302e9637c1750f43214cee940cea9db4a637c0f35dc1fdd125 SHA512 5dd30c3939f3bbcd5302303b63b9875d1aa0d5d52313cc54ac98d40f2e257388e5040c6f724c12b9525805ca23b3c5bd9ea0a4a653b2dfc4747b8c8ae9b93ea2
-EBUILD sysstat-12.1.1.ebuild 1784 BLAKE2B e54730998ee0c3402869d63f3bf755bda7e27d6050b512318a996ad5d6961c914c8124bbaf74cb302e9637c1750f43214cee940cea9db4a637c0f35dc1fdd125 SHA512 5dd30c3939f3bbcd5302303b63b9875d1aa0d5d52313cc54ac98d40f2e257388e5040c6f724c12b9525805ca23b3c5bd9ea0a4a653b2dfc4747b8c8ae9b93ea2
+DIST sysstat-12.1.2.tar.xz 608304 BLAKE2B 18c259f4aa43cfd30e9ba62ad39712fef1b3c80ce79ddd8a5afc939d3cc99d94b994f78cea68fd751f3c12311442256f439a2483a817cc7cd0dcf03c952feba9 SHA512 622f1ed1949a156e4cc2451d246dc449afcf3ffc2414363ef14f8da8e1a307e3a28e5b4fd50813c3f6d810bcf112ed13ecc91edbcd0a8c3c626303f333785b83
+EBUILD sysstat-11.4.0.ebuild 1944 BLAKE2B df7ad02ffc15d7a5e8861434a64f9ecb327f88f563a19e572655b88674c8971aeab7797c04382e6fe8e4e288aeea1bac50fc125415dc40fd953bffa76dbed42e SHA512 caaad246ebbee2a9f6bf9259034f3ccfcdadf7b201b2355645b626b1b2335a0d8d756a7b582d297bc32574c5be58111d59f9c3a9657fe519f093145764edf2c3
+EBUILD sysstat-12.0.2.ebuild 1786 BLAKE2B 155d89a10b9c4e4870c62f8229ca2e530413e688c61c5d9e0d1dfa68633040a7a01c6c7713d34c93d52c6f8e01c82cb98dd1511f8cd2815cfd1d06935f12d0ee SHA512 5b480ae929e82e454d69126e51f0d45f9103288a90568e34413c39aa591c8e823c6d9acee55a26e86f7e4dd8f165e11af321b0b5053354cb92bdd876e5b0b7d7
+EBUILD sysstat-12.0.3.ebuild 1786 BLAKE2B 155d89a10b9c4e4870c62f8229ca2e530413e688c61c5d9e0d1dfa68633040a7a01c6c7713d34c93d52c6f8e01c82cb98dd1511f8cd2815cfd1d06935f12d0ee SHA512 5b480ae929e82e454d69126e51f0d45f9103288a90568e34413c39aa591c8e823c6d9acee55a26e86f7e4dd8f165e11af321b0b5053354cb92bdd876e5b0b7d7
+EBUILD sysstat-12.1.1.ebuild 1786 BLAKE2B 155d89a10b9c4e4870c62f8229ca2e530413e688c61c5d9e0d1dfa68633040a7a01c6c7713d34c93d52c6f8e01c82cb98dd1511f8cd2815cfd1d06935f12d0ee SHA512 5b480ae929e82e454d69126e51f0d45f9103288a90568e34413c39aa591c8e823c6d9acee55a26e86f7e4dd8f165e11af321b0b5053354cb92bdd876e5b0b7d7
+EBUILD sysstat-12.1.2.ebuild 1786 BLAKE2B 155d89a10b9c4e4870c62f8229ca2e530413e688c61c5d9e0d1dfa68633040a7a01c6c7713d34c93d52c6f8e01c82cb98dd1511f8cd2815cfd1d06935f12d0ee SHA512 5b480ae929e82e454d69126e51f0d45f9103288a90568e34413c39aa591c8e823c6d9acee55a26e86f7e4dd8f165e11af321b0b5053354cb92bdd876e5b0b7d7
 MISC metadata.xml 336 BLAKE2B ba4225003301f291de8d348fcec269a2f7dc8f729a93e3c974a3eb9712f7fe08f59d799e4bf2e936a1224bfa5fa59d4b4b333aeacde9864313c20e1d3a7f4580 SHA512 63adb90aca54ec347aac7feaad3b2ee3c707fc536c0de0e0ee045d4fe2c08e231bdbd4473b9722a747ef1263cb98a067a43cbbbae28aabad71458c16df946bc6
diff --git a/app-admin/sysstat/sysstat-11.4.0.ebuild b/app-admin/sysstat/sysstat-11.4.0.ebuild
index 34da2f0d0764..424766014840 100644
--- a/app-admin/sysstat/sysstat-11.4.0.ebuild
+++ b/app-admin/sysstat/sysstat-11.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ CDEPEND="
 		sci-visualization/gnuplot
 	)
 	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
+	lm_sensors? ( sys-apps/lm_sensors:= )
 "
 DEPEND="
 	${CDEPEND}
diff --git a/app-admin/sysstat/sysstat-12.0.2.ebuild b/app-admin/sysstat/sysstat-12.0.2.ebuild
index 476a5d3a747f..d5b74497593a 100644
--- a/app-admin/sysstat/sysstat-12.0.2.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.2.ebuild
@@ -15,7 +15,7 @@ IUSE="debug nls lm_sensors selinux static"
 
 CDEPEND="
 	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
+	lm_sensors? ( sys-apps/lm_sensors:= )
 "
 DEPEND="
 	${CDEPEND}
diff --git a/app-admin/sysstat/sysstat-12.0.1.ebuild b/app-admin/sysstat/sysstat-12.0.3.ebuild
index 0a51edcf4022..d5b74497593a 100644
--- a/app-admin/sysstat/sysstat-12.0.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ IUSE="debug nls lm_sensors selinux static"
 
 CDEPEND="
 	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
+	lm_sensors? ( sys-apps/lm_sensors:= )
 "
 DEPEND="
 	${CDEPEND}
diff --git a/app-admin/sysstat/sysstat-12.1.1.ebuild b/app-admin/sysstat/sysstat-12.1.1.ebuild
index 476a5d3a747f..d5b74497593a 100644
--- a/app-admin/sysstat/sysstat-12.1.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.1.1.ebuild
@@ -15,7 +15,7 @@ IUSE="debug nls lm_sensors selinux static"
 
 CDEPEND="
 	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
+	lm_sensors? ( sys-apps/lm_sensors:= )
 "
 DEPEND="
 	${CDEPEND}
diff --git a/app-admin/sysstat/sysstat-12.1.2.ebuild b/app-admin/sysstat/sysstat-12.1.2.ebuild
new file mode 100644
index 000000000000..d5b74497593a
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.1.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors:= )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.4-cron.patch
+	"${FILESDIR}"/${PN}-11.7.3-flags.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	tc-export AR
+	use static && append-ldflags -static
+
+	sa_lib_dir=/usr/$(get_libdir)/sa \
+		conf_dir=/etc \
+		rcdir=${SYSSTAT_FAKE_RC_DIR} \
+		econf \
+			$(use_enable debug debuginfo) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls) \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 231b44a3752e..0a80c18c4dee 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,7 +1,4 @@
-DIST system-config-printer-1.4.8.tar.xz 904068 BLAKE2B dfadfd7f2ef8c37a588d2a4755c977a07c16d3779cf30652ca1056986d5de073fa334a912e4a8e865e88b323888f88b83c5ef8b086e4afafd7bf284c1b597f3d SHA512 9f832f11e0e6bca32a29201b9f78d7a3ea35a46f7484548e5e71e6939fd51065e07325e12bdb1bc577ee606299cfef54759def6564923904a79f27b654ec5304
 DIST system-config-printer-1.5.11-patchset-01.tar.xz 6948 BLAKE2B effe29c51cbe74fc72566df65f10ab845c9dc1f40ca2966c40be87e19f98046f34311c24b7bc77f471b840e35b0c8eb7754a7c5464d50335c8ab2e2ed0e79afd SHA512 2501bda0e75ea51cc8e14df6b3746a0ea51618919ef35ace849efeded0cddc49e6e3793142d1cd128ce3ce62c21661d5fdb85b19718df07b87a20f5fc641885b
 DIST system-config-printer-1.5.11.tar.xz 949816 BLAKE2B 96b41d64e0aa3494b7fc7ed15ac926d833a046ba2880b36b6f5dd4e7508e2bc1fac4cb52c9940c13cec6e34cb8972fbc11fcd5a7df510296444ca08a23f4cb2b SHA512 cc0a6faec0022092e64de3d7ab28669039c93853c6931d26c264f0035486e09ad0af784833e88ee8e3dc1b6f5be9dcf84144a2a6464dfa9711172966fa6a22b4
-EBUILD system-config-printer-1.4.8.ebuild 2305 BLAKE2B 594c35c24a8d0ed8c79ed6af9d73069022d3af1d8dd321898dd8b3a1773c38673e2ab26d4b4da065a03e5e54ae738f1d67bc9032a3933dbefc8c4889cae6ce23 SHA512 0e1d651a46c0cfec924aec183fdfbfe175e668d3e0c566838c72527d90a28ab194a92952cda5c9a46999b03487b7441cab4709521f2a5e1757b112d5ab09878f
-EBUILD system-config-printer-1.5.11-r1.ebuild 2389 BLAKE2B 1c909e6e20e099b59df776cfd075f32ef1b8cdf7839a9c3a8af4cbaf72e831fe91bb773e14a1f52d7f8943289bf3b9d3197ac2017fec804eb4b13ef82725b267 SHA512 7c957f1638550fd9f813a932794f9cea3f50dd7e9f31fe0fb8a873fb82b8614b2ecd34e04a54b4b3a5bf0b94339acb66928f95d9d96d3d02e8d4734f2cc38f56
-EBUILD system-config-printer-1.5.11.ebuild 2363 BLAKE2B 15afe46a1a6e953e99f227a09c086be95e852804381a915931afe2d622c081fa5d44c7316e6fe364474e0cb1abba82ddcef0ede6e7a18662303b452d93fa3d7e SHA512 612ba38005a37124927a04c8172ae90a519c78ef9aac0c778c4fde8b3fa3dc5d41d2e3a7deaf12a2c1c707ef12c1faabd589d987ef82d5f04bf3d59b4fcf301e
+EBUILD system-config-printer-1.5.11-r1.ebuild 2385 BLAKE2B 662c0baddb0b4118b4a54aff12dce7403f2a8a11856759fc322cbbe1be0869be81767a7791fbc6c12838b57bb0cb77b2f820b4dc57c546fbb9181f4fcf383844 SHA512 e2d9732510cd65a0814540ee1729ebd1bc876c94f30a16a08b4b2e9596e492a0228f8dc1b01cdb01758345206e03c61d3f7ac95b630d2fff2075592f8e530123
 MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild b/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
deleted file mode 100644
index 4dc7fcecc7ff..000000000000
--- a/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-single-r1 systemd versionator
-
-MY_V="$(get_version_component_range 1-2)"
-
-DESCRIPTION="GNOME frontend for a Red Hat's printer administration tool"
-HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
-SRC_URI="http://cyberelk.net/tim/data/system-config-printer/${MY_V}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sh ~sparc x86"
-SLOT="0"
-
-IUSE="doc gnome-keyring policykit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-# Additional unhandled dependencies
-# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
-# python samba client: smbc
-# selinux: needed for troubleshooting
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2:2
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pycups-1.9.60[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	net-print/cups[dbus]
-	virtual/libusb:1
-	>=virtual/udev-172
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	x11-libs/pango[introspection]
-	gnome-keyring? ( gnome-base/libgnome-keyring[introspection] )
-	policykit? ( >=sys-auth/polkit-0.104-r1 )
-	!app-admin/system-config-printer-common
-	!app-admin/system-config-printer-gnome
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/xmlto-0.0.22
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
-"
-
-# Bug 471472
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myconf
-
-	# Disable installation of translations when LINGUAS not chosen
-	if [[ -z "${LINGUAS}" ]]; then
-		myconf="${myconf} --disable-nls"
-	else
-		myconf="${myconf} --enable-nls"
-	fi
-
-	gnome2_src_configure \
-		--with-desktop-vendor=Gentoo \
-		--with-udev-rules \
-		$(systemd_with_unitdir) \
-		${myconf}
-}
-
-src_compile() {
-	gnome2_src_compile
-	use doc && emake html
-}
-
-src_install() {
-	gnome2_src_install
-	use doc && dohtml -r html/
-	python_fix_shebang "${ED}"
-}
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.11-r1.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.11-r1.ebuild
index 418b870b2678..ddb3f080a3c8 100644
--- a/app-admin/system-config-printer/system-config-printer-1.5.11-r1.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/zdohnal/${PN}/releases/download/${PV}/${P}.tar.xz
 	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-01.tar.xz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sh ~sparc x86"
 SLOT="0"
 
 IUSE="doc gnome-keyring policykit"
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.11.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.11.ebuild
deleted file mode 100644
index 0d78b3182a04..000000000000
--- a/app-admin/system-config-printer/system-config-printer-1.5.11.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="xml"
-inherit gnome2 python-single-r1 systemd
-
-DESCRIPTION="Graphical user interface for CUPS administration"
-HOMEPAGE="https://github.com/zdohnal/system-config-printer"
-SRC_URI="https://github.com/zdohnal/${PN}/releases/download/${PV}/${P}.tar.xz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-01.tar.xz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-SLOT="0"
-
-IUSE="doc gnome-keyring policykit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Needs cups running, bug 284005
-RESTRICT="test"
-
-# Additional unhandled dependencies
-# gnome-extra/gnome-packagekit[${PYTHON_USEDEP}] with pygobject:2 ?
-# python samba client: smbc
-# selinux: needed for troubleshooting
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pycups-1.9.60[${PYTHON_USEDEP}]
-	dev-python/pycurl[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	net-print/cups[dbus]
-	virtual/libusb:1
-	>=virtual/udev-172
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	x11-libs/pango[introspection]
-	gnome-keyring? ( app-crypt/libsecret[introspection] )
-	policykit? ( >=sys-auth/polkit-0.104-r1 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/xmlto-0.0.22
-	dev-util/desktop-file-utils
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( dev-python/epydoc )
-"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-auth-dialog.patch
-	"${WORKDIR}"/${P}-libsecret-optional-{1,2}.patch
-	"${WORKDIR}"/${P}-scp-dbus-service-{1,2}.patch
-	"${WORKDIR}"/${P}-typo.patch
-	"${WORKDIR}"/${P}-appdata.patch
-	"${WORKDIR}"/${P}-empty-LC_MESSAGES.patch
-	"${WORKDIR}"/${P}-fdopen-utf8.patch
-	"${WORKDIR}"/${P}-typeerror.patch
-	"${WORKDIR}"/${P}-debugprint-typo.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-nls \
-		--with-desktop-vendor=Gentoo \
-		--with-udev-rules \
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_compile() {
-	gnome2_src_compile
-	use doc && emake html
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( html/. )
-	gnome2_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 9645cd74daa4..ecd65e71f3f3 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,5 +1,5 @@
 DIST testdisk-6837474129968d7de13d91e5454bd824c9136e73.tar.gz 637265 BLAKE2B 7d7a2c875db9d34ad5be687ef0ccc8122759c645b30faf6eed7967747e69ac988078ab6c1909007c32c6bf5a879a5bfd00dff3d2d268e5b50e3b60a8b660c636 SHA512 b494e23ccd8f913a9b22f4b803b02af66e94f6971f45e6aea8a0e1dd8549996e7bdd3fafcf70078ebc242f262d064cdc5674d99cb7a367b810c45c0b1c40336d
 DIST testdisk-7.1_pre20180322.tar.gz 632598 BLAKE2B 741610622c9afa2c41d14e8eb391cbe629a5f7ac102cf4cbf446b0c0d7330cb8482a17c1ce8470aa9d1b0578aac254cf17aa061e21dd831a803152514fab5422 SHA512 fbe699ccfbe31be636d71eda5d1fccb8efb16788bf664e048ee16344c3d3689961aaa7ef4c9123690db695bb7ae3439440bd775ab8b8455500232b2fc6048ebc
 EBUILD testdisk-7.1_pre20180322-r1.ebuild 2512 BLAKE2B cb68ae32f495fb7ff57c9dbbd3cb63d9c826cfb34e58cd053c32d6797b3632227ad71caf62ea7899bb292c48849a0f6ac5da339cea1242b488ab8485226ac790 SHA512 bf6ccce7c91035b45dda4dcc5f651d783600de40a4df78e8ee39f0f0543e8049ec90ec875dd4ced6cb760faa1f8a9eb80da5b23b352f01d208d49c686f3fcd79
-EBUILD testdisk-7.1_pre20180922.ebuild 2510 BLAKE2B a97d78ddb4fab305cff0a51af1da64e64b0eac1e0811240a67931c0a1b6ffea5d9616f0a57d04495871f1a4d210bd056a363b85c0b91e17eb9f524f5f943ad71 SHA512 7f9f35932b002e410242d3cede3d8e129830c431784ee052a03de3c74ebf1d516c107d3483bf0a8c911f08cd79d2c15431e304cd15711bda67bcbc1791d26e15
+EBUILD testdisk-7.1_pre20180922.ebuild 2517 BLAKE2B 2335b1e92f1b9d90e0d3e0f4e0a4088fbd4e60b1a39c6eea0cb248a8f2c51e4b083a36404904ef24357002d2dafff914ee3014e1388db0154492f7be7ed9df85 SHA512 9b9f99e977056372bb89d49e35b44f06edbc6f18edff5e555b99cbc91183422ec965e8e0f396d4e03387c15c719a74c1774b8ef3a8ff2543664ed02349b92601
 MISC metadata.xml 555 BLAKE2B 4b56bad0ebd1af77d90c4fa650adba5ae59d06940dff5aa346cb0e9dc9ebfad5324f774cb1afa646e15731b41cb09d7020ee3b6a5a0d941452099b6b7884da75 SHA512 3c47ad35d151d92e4be40cd91c7f0ced271f7b61a00280f536cc70a700d25ae36426593fcb8aec76e9cf1c24ae76dc8290b00bbcb73fa4d95182210fa680562e
diff --git a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
index 9c65ee90ea01..91b33ce97ffd 100644
--- a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
+++ b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${EGIT_COMMIT}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
 
 REQUIRED_USE="static? ( !qt5 )"
diff --git a/app-admin/tmpreaper/Manifest b/app-admin/tmpreaper/Manifest
index 0ae900f62c83..3a6e52f8a3ff 100644
--- a/app-admin/tmpreaper/Manifest
+++ b/app-admin/tmpreaper/Manifest
@@ -1,5 +1,5 @@
 AUX tmpreaper-1.6.13-fix-protect.patch 1204 BLAKE2B 8c1b66d939ac8e997272265744873a22a5e5306d8fbec6e56ace78cf4162387c2cb2c2d7372ec62f0e7c99fa954d7e321482d0dbaa75ba6e3ff48a8785277e3c SHA512 7b7f386d8f685e6b38ff3a96030e69a5134016e0a0b30b6841ddc4ae02ae3f90c47388426be98ec35a920e40360aa0cd8662e29d03a765c6ae0209f9907c53c0
 AUX tmpreaper-1.6.13-gentoo.patch 1766 BLAKE2B a619096b159686dbcdaacdbd3bf979f74664f8abb2c58957dec7fcb17bee7c1b5b790f4e7283af9f82fb1f7eac2a76f73c5ec26804c6bd799643d553fb56be17 SHA512 0086ac04a352bd35ce9e95576816fc324011bfff78cfa089828bf3befb8b183ae2213be9759422ce1f9ddd1cb26dcdf292b429ffe2d0873a1f6f6577e34c5fc9
 DIST tmpreaper_1.6.13+nmu1.tar.gz 141080 BLAKE2B ad2895e0444e3c1a1ceabf71c34b560a817e7cc274482bde63a07499fac799ef127f5b64c953d43cd11a279819972b63b7e21a683f6250a77eeadc299a491a78 SHA512 c868d421a7757a47b81c8932743981ded2b415c83377f8781fdfd4dfda48c701991da17fa262dfa0680b2a315d6b46ee4c9035ba4c06f5a0c1bc32efa717f19f
-EBUILD tmpreaper-1.6.13-r1.ebuild 1115 BLAKE2B 819bfc595646ab0cbd96d40c47b4d5358cbe903d41883e10de9180bc63e7b8e7d682155a46b70788d59b79686b57c0721ecff00930fa71c53f3af828f66ce526 SHA512 0e6e094cdfbb941d08cdaa4f7302eb6dc61ac4c20d9dd0948e9f8c38ba4d0fda1b5d8b283c2736ed75cf170fa37ff8dfa6de2ef35ca120c6d2246e86ce56fe9a
-MISC metadata.xml 1159 BLAKE2B b0c934dea54b86c8eec6b21e212906473d59eca307c4130da36de3f0582a1e070fc4b3b242b92529981e33057e2d49606c48a5ca3a0c6f791bba39b78589a7dd SHA512 128a7b822d4a88be9bf4cf9b5a371ac8fc41e6922dc374d4859d046efe98fae0031783b43ccbe153239688a138506983e56694d16298c3ab04f2451692725ae1
+EBUILD tmpreaper-1.6.13-r1.ebuild 1113 BLAKE2B 34be61752588526b7e06cf50b816f049604af02125ac7b3e8b74c12d76afe5282d3f940e75f760b1f50e5be0ae9b4105f408529675957458fd7cc3ba546edc8f SHA512 1c40a66f0fdc5b6cf9406af6b985c8bb32eec4f3f2a21839fd1e87ff57eaff4a85151a1cfd21a5b0e1f61e67fae079b4c37c85b45129c58477fe1f2f2f187be3
+MISC metadata.xml 1167 BLAKE2B 7c6f25158d5a4e3e4586ef1824ccfa233ab52f6695324951ae6de2fbe4247ffd780f2806254066f34029b661c1313b01f0bb2f67ef5f335e95be97f6a9fc805e SHA512 64813b5adc37817c87f5eaa4bed0e725a3b24b2e3edadd27c92c811d13f30c09d6334b0ab18a37b4f028a335b75a5ac43be19073731ce58e35f8528335c6176a
diff --git a/app-admin/tmpreaper/metadata.xml b/app-admin/tmpreaper/metadata.xml
index 6f3fd9e0f558..06c5ac4a6cee 100644
--- a/app-admin/tmpreaper/metadata.xml
+++ b/app-admin/tmpreaper/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<longdescription lang="en">
 		tmpreaper is a program that can be used to clean out temporary-file
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild
index d13fc5593381..f325a9728446 100644
--- a/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild
+++ b/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ inherit eutils
 
 MY_P="${PN}_${PV}+nmu1"
 DESCRIPTION="A utility for removing files based on when they were last accessed"
-HOMEPAGE="http://packages.debian.org/sid/tmpreaper"
+HOMEPAGE="https://packages.debian.org/sid/tmpreaper"
 SRC_URI="mirror://debian/pool/main/t/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /app-admin
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)