gentoo resync : 21.07.2018

74 files changed, 973 insertions, 965 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index db104becfcc5..8c5c2b5ae4ed 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index e0ba8cc244cb..4af0a5111a21 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,18 +1,10 @@
-DIST ansible-2.4.3.0.tar.gz 6511115 BLAKE2B d43679c651f6aa5fd86c797a204645a8ee98efbcde9abaa25385aeb6f1d7c8b4ad74185434bfd159dbf673fe9339ef8f915f78238f8b8a5caf924b54cb9bdd52 SHA512 a7cda358c67c519c7e5ba248bf47070f21a27203fb29d70d9d75ecf027ba1275d71c0f96493e047281211d172a3be8273d7e08144446284695fb0bc8b94daa82
-DIST ansible-2.4.4.0.tar.gz 6512938 BLAKE2B 51e397d2242209271a8aef211c3bdeb34a15e2061a202415749ecb4232e0521aff304d5585d536b1805f14ff476b0733d559eeabe6e44de7b273b8606b11b805 SHA512 f0dcf92f2c69931fa06e6dd3845c11592d5a7e44f19a99c4d6c361022708560170f2b74ad20eded61fa5812c90eed281b78396aa92e0b33717970afb5966dd72
-DIST ansible-2.4.5.0.tar.gz 6515523 BLAKE2B b6d2eeae93ec8b61ca426682d702179d60674cdb95b2cc9fe413f32d429cdbcab804f34a6d0bcd51a6151dcc29297c6aef6025df52b859130b5ef4c552e85d68 SHA512 44d0e05730a9d7b5ee256c8c19a08c007d19d6523319e3c45b65206781d7384386bbde1a0f5b452b29c9b95a236140bf1c011b46f1c15592c47a15deccf8748e
 DIST ansible-2.4.6.0.tar.gz 6516642 BLAKE2B 27c94a9de0ba7e9aa3d519fd18eb7a27e77b6cf8de3b51a74131a96cbd85c625f43d55e7894483cf623b1e62bddfedf448b1051ad7b2bc7f81a338cfca410458 SHA512 3b4d4d8f3b1eb27861e7beac4557b608e3f9a77d4a24d33868c8d1be2b3fd9a57ef98e4685bbfd859d64a2f591487852fb5409ef00006036be4409eaf07d1b5b
 DIST ansible-2.5.5.tar.gz 10150862 BLAKE2B 51184d11418c0a534c0176fcc6fde6da3c962e00502b354317b311d20122b28bbafbb8dfdfb7700a0153116c70396a882b538524395af590af16eeac043d0655 SHA512 a3d50539d2a109dc0bbcdb440e0800b917f63141dce935e6426cb6bdc51e3a93e02f05c23714c24ab00b19842a86677b8d2f2455d20ca15410fa8d3c8ba379ca
 DIST ansible-2.5.6.tar.gz 10157989 BLAKE2B 07341ab7a087e3139442d5420b461ca332f3a9e550874a746f43904763660ef12c9a2041bb991eeb315abdc7f6e31e3615d9283f407003eddddf2b661331c59a SHA512 169badaa6a94d1ea2d16cb97c7e5eb0b8c225a455edfa95f3ad9e4ec968d5b9525dec4732b60e5ba5f92412f87d8aacc0b2299f2595f3bb820ad8604be8e76d6
-DIST ansible-2.6.0.tar.gz 10721104 BLAKE2B 894700762139339e43cde35d74bfcfda218a1325b45749d8ea94c1a19e210f98e2f0717ff39c54da97f9795380268da040158271f2e26986b5d2fe177e3dfe2e SHA512 0c7353eeb4a65b21439489ef8a101bb0455d24d88904011460548bfba218688b4a1fdc1d61d60d611c2bcce7f1c301c0d6bcb9f3e9db12eaf9c9ef2f96994af9
 DIST ansible-2.6.1.tar.gz 10724749 BLAKE2B af4523ab904660fa3369bdae2839ab4b2f386235be5a004e1f9a9a5f7c555a2e6fe82319abe20ecbf7e74152f8e2ad5060fda2c2af0f5d62fdd9416901c9072c SHA512 1235e12a510317665956bfae9e0d03814083a24ba6e5c98072437e50b4a596437a173b32d9d5af37b4b9e168e35045fdb65e65276fdc830f473ab1f42dcba2d2
-EBUILD ansible-2.4.3.0.ebuild 1406 BLAKE2B f2c87ce03b3c4914087b0401485a07f7b3287ebf62a4d0b7acaa7b9c06bd670c0f91bf2288edbbd45ab577403a1b85de2733c0a3fced85c99720ae8f7848ed46 SHA512 b4d4d40758c6f638f07480af76ff2cdcebe787276c27c23b3e046841ecfaacac83845c14bca352ed603c15a3fff4eb19ae53c990e7fa2662d5b5822890091a1a
-EBUILD ansible-2.4.4.0.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
-EBUILD ansible-2.4.5.0.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
-EBUILD ansible-2.4.6.0.ebuild 1408 BLAKE2B acca3919cf1cf8240b4d4cad16ad41b61cf7d6af7c4adefd81c404dc538d1bf75b97dc3e4a87ba38b1e4dd7e3cbf3b319144adad083b1e813492322cc179baae SHA512 cdf8791066fc9b72bf1c1dd3a3595c2901f71e69b24a163f2b6eb100a410d5bfc942a76cf92a5fc2d730eecd57028165eed3c4e3330ac06f1975c7022b6d904b
+EBUILD ansible-2.4.6.0.ebuild 1406 BLAKE2B f2c87ce03b3c4914087b0401485a07f7b3287ebf62a4d0b7acaa7b9c06bd670c0f91bf2288edbbd45ab577403a1b85de2733c0a3fced85c99720ae8f7848ed46 SHA512 b4d4d40758c6f638f07480af76ff2cdcebe787276c27c23b3e046841ecfaacac83845c14bca352ed603c15a3fff4eb19ae53c990e7fa2662d5b5822890091a1a
 EBUILD ansible-2.5.5.ebuild 1636 BLAKE2B 8c6498794147e6fc8c2cf50429a44f481f1244d532cb0205f6c0828bfceda1690264e78621fc74d75a03f3521600cc81f9f78afcba60a9e089b3472d9f4fa687 SHA512 5b90735e77ea2e0f47b6744f179ad555da406a6efa1a0137e590fe6e22cba1406aa925dd175a421fe7499ba2cdf9a8666673118700c046f9512d0572c6ec6fb6
 EBUILD ansible-2.5.6.ebuild 1638 BLAKE2B 867eaee65aba92146eab5a003bd77f2e8c07cd14bc757e52886b0934297f5a4af186f5f53012809606bc7e4972d6ec29e57f6e1cbc724eac3e74e2918b39def7 SHA512 60851978084f2d683d5bd4281c34817f643a03fff840de9a942aaa5652bde04e7ab2619334381e4eeccdc4b4e81a36f5ca4beadb9adf3dbbeba21df057280ae6
-EBUILD ansible-2.6.0.ebuild 1638 BLAKE2B 867eaee65aba92146eab5a003bd77f2e8c07cd14bc757e52886b0934297f5a4af186f5f53012809606bc7e4972d6ec29e57f6e1cbc724eac3e74e2918b39def7 SHA512 60851978084f2d683d5bd4281c34817f643a03fff840de9a942aaa5652bde04e7ab2619334381e4eeccdc4b4e81a36f5ca4beadb9adf3dbbeba21df057280ae6
 EBUILD ansible-2.6.1.ebuild 1638 BLAKE2B 867eaee65aba92146eab5a003bd77f2e8c07cd14bc757e52886b0934297f5a4af186f5f53012809606bc7e4972d6ec29e57f6e1cbc724eac3e74e2918b39def7 SHA512 60851978084f2d683d5bd4281c34817f643a03fff840de9a942aaa5652bde04e7ab2619334381e4eeccdc4b4e81a36f5ca4beadb9adf3dbbeba21df057280ae6
-EBUILD ansible-9999.ebuild 1664 BLAKE2B 8463e681f2153fab9d62b7f47bae487cb40927af74817f769ebc0c66cf75480de8ad985ea370041531c5c7c221ae3fabe0003d9bb3c4107139697597d1d2e937 SHA512 859021b4e84575812e732c38e6915e6524ca4f6a75b8800e85c77546f82af47760c779821526447264279cf93cede262838a4ccc7aa495d3b1340dc78402a0f8
+EBUILD ansible-9999.ebuild 1639 BLAKE2B 29b700db02b27d19e0f819c6e75a9b00a66d8f0f817360cb08a89c062c804459030e95d78f3af2f3d50b6b63cee95dedd3878b9f784bae203ecdbd8a357254c3 SHA512 f92f4a34290101837516157ecbaee968505d50f3d46afa0d03f607601443ff3c0c05fffc3c15da576f0114d800c9445f54b1e9a3f6a970634ee9628aab58e558
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.4.3.0.ebuild b/app-admin/ansible/ansible-2.4.3.0.ebuild
deleted file mode 100644
index eeb696f6cfd4..000000000000
--- a/app-admin/ansible/ansible-2.4.3.0.ebuild
+++ /dev/null
@@ -1,56 +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_{5,6} )
-
-inherit distutils-r1 eutils versionator
-
-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="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}]
-	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_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.4.4.0.ebuild b/app-admin/ansible/ansible-2.4.4.0.ebuild
deleted file mode 100644
index 573d04b35802..000000000000
--- a/app-admin/ansible/ansible-2.4.4.0.ebuild
+++ /dev/null
@@ -1,56 +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_{5,6} )
-
-inherit distutils-r1 eutils versionator
-
-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="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}]
-	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_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.4.5.0.ebuild b/app-admin/ansible/ansible-2.4.5.0.ebuild
deleted file mode 100644
index 573d04b35802..000000000000
--- a/app-admin/ansible/ansible-2.4.5.0.ebuild
+++ /dev/null
@@ -1,56 +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_{5,6} )
-
-inherit distutils-r1 eutils versionator
-
-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="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}]
-	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_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.4.6.0.ebuild b/app-admin/ansible/ansible-2.4.6.0.ebuild
index 573d04b35802..eeb696f6cfd4 100644
--- a/app-admin/ansible/ansible-2.4.6.0.ebuild
+++ b/app-admin/ansible/ansible-2.4.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.6.0.ebuild b/app-admin/ansible/ansible-2.6.0.ebuild
deleted file mode 100644
index 8f63e8546445..000000000000
--- a/app-admin/ansible/ansible-2.6.0.ebuild
+++ /dev/null
@@ -1,66 +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_{5,6} )
-
-inherit distutils-r1 eutils versionator
-
-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-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 0ca97a267cc6..91c2329b3164 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -64,6 +64,5 @@ 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/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 241cadfa3301..0c7d77c5ab53 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -2,10 +2,10 @@ AUX apache-tools-2.2.20-Makefile.patch 1573 BLAKE2B 56de28f38934b73740d68f6429f3
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
 DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c
-DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0ed8f975e76cb994247601f7c2f89a3f862e011638afb77988eda0ef2b543634fb6bc45b583e9bdba2c30e565731 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a
 DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269
+DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682001bdaa99410b7faad459c4581f8d0878b4840e38e570b1872d549d58743260cb3030c145ae93bef97fc692cc4 SHA512 2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3d663bb93fc5b2030b04a43fb12373d260cc291422b210b299725aaf3b5c8
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
 EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e40d05af2d819c92a5faff3ad2f60c566d0235cbf60ded1d5daa79cec7815534b96b53b8e8f00333d1a814058752dd011 SHA512 e23b494555f6685f482fcecc59b5e81147780bf399de740b91bc19de9197a3d6f9d32a701472ba6551a3039214adc2e0bfd4436e0b82edb388f26d4dc88bd110
-EBUILD apache-tools-2.4.29.ebuild 2655 BLAKE2B 4132c82619471dd8d7ea7da20e780bfe848a571934944c9b209f4e17b6c133d7930ddac23af68ddc60ec93f39abff6075141c214b724e84dd0052ec99303e1f7 SHA512 5a8a2605aa5b46d35dfc14e3c6f39cf6164d310f594bf31d7980d1e9d0a313d22478a7df119759059aa76d0e396801f57ebbbf977247efba4f833e853a1ecae5
 EBUILD apache-tools-2.4.33.ebuild 2577 BLAKE2B cb22dea646e2136f767d99f36d0f6fcd341f09ba8a38a278b33980e251b99dc8186d78287c47a698d3d5462089afdb1517191ab2bde3f8d93e1578a8bf7a798d SHA512 2e468db54aeb16e14b6bd65e13cf63ffb43b7428feaa83a6f13f66d6d2da710f40e30613a1a19102ea45ca7d270252196ae6cf98b20bee49ee78e5e55e0b3484
+EBUILD apache-tools-2.4.34.ebuild 2584 BLAKE2B 24044568e974bcf0b3c59adc7dce1e9ba0fa73e17e5b7fad84388730dc25ad6bea4a74de73da5e5e484e3ea8859ec934039583e99aaa04067060715901046b5c SHA512 aac903935e1c36edf0397f7bab0310f57b8eed167e8191d976453841f80eb95808ee40d1abb77aa8a53401135eb61c529b906e9a6555c72cdffdcfeb01769a0f
 MISC metadata.xml 466 BLAKE2B 06dbc2df528810dc0aa7335271c987c6310ceb7d8b0db3dc74c6727c27d280e499ddd9ee75580dba63e0f33e24ce63ecfa40059a46ebdec80005769608cae82c SHA512 2820a1f104fbdc752196f600def1e0c56eed6025fa3e66b297077be7a6eb735a2009f1a57cc320e2cf0c2d6cebf9db8c338cf2c6cc9c746766ab99a0b49c63fe
diff --git a/app-admin/apache-tools/apache-tools-2.4.29.ebuild b/app-admin/apache-tools/apache-tools-2.4.34.ebuild
index a863d1e02223..7a539a1169f8 100644
--- a/app-admin/apache-tools/apache-tools-2.4.29.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.34.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit flag-o-matic eutils multilib toolchain-funcs
 
 DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
@@ -10,12 +10,12 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
-RDEPEND=">=dev-libs/apr-1.5.0:1
-	dev-libs/apr-util:1
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+	dev-libs/apr-util:1=
 	dev-libs/expat
 	dev-libs/libpcre
 	kernel_linux? ( sys-apps/util-linux )
@@ -58,22 +58,21 @@ src_configure() {
 
 	tc-export PKG_CONFIG
 
-	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
-	#append-ldflags $(no-as-needed)
-
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+		--sbindir="${EPREFIX}"/usr/sbin
+		--with-perl="${EPREFIX}"/usr/bin/perl
+		--with-expat="${EPREFIX}"/usr
+		--with-z="${EPREFIX}"/usr
+		--with-apr="${SYSROOT}${EPREFIX}"/usr
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
+		--with-pcre="${T}"/pcre-config
+		$(use_enable ssl)
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	)
 	# econf overwrites the stuff from config.layout.
 	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
-	econf \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
-		--sbindir="${EPREFIX}"/usr/sbin \
-		--with-perl="${EPREFIX}"/usr/bin/perl \
-		--with-expat="${EPREFIX}"/usr \
-		--with-z="${EPREFIX}"/usr \
-		--with-apr="${SYSROOT}${EPREFIX}"/usr \
-		--with-apr-util="${SYSROOT}${EPREFIX}"/usr \
-		--with-pcre="${T}"/pcre-config \
-		$(use_enable ssl) \
-		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	econf "${myeconfargs[@]}"
 	sed -i \
 		-e '/^LTFLAGS/s:--silent::' \
 		build/rules.mk build/config_vars.mk || die
@@ -91,7 +90,7 @@ src_install() {
 
 	# Providing compatiblity symlinks for #177697 (which we'll stop to install
 	# at some point).
-	pushd "${ED}"/usr/sbin >/dev/null || die
+	pushd "${ED%/}"/usr/sbin >/dev/null || die
 	local i
 	for i in *; do
 		dosym ${i} /usr/sbin/${i}2
@@ -99,7 +98,7 @@ src_install() {
 	popd >/dev/null || die
 
 	# Provide a symlink for ab-ssl
-	if use ssl; then
+	if use ssl ; then
 		dosym ab /usr/bin/ab-ssl
 		dosym ab /usr/bin/ab2-ssl
 	fi
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index 3914e77cd8d7..257d06cc672e 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1,6 +1,7 @@
-AUX apg-2.3.0b-cracklib.patch 925 BLAKE2B bcc3579d24a69d6936fd14d78cd2d1a1b3f467eb892faa0e7e1ba170dce41e14e3f8c4ebddf44a28d27cb9825d789e54cfc2332ce48bdb582b8536317566d03f SHA512 19477c54c22d2fff712a8a5822bfa11fbf42a55a27a18eb9d6bdbe38e3c388342bc36f596d4c2e03cfbdb9c4a4c6a35b519b48e909602332e063e41c906889eb
-AUX apg-2.3.0b-crypt_password.patch 836 BLAKE2B 974a8a4d5936cc7b30535746011f34f659f46a7f168ca4b60927ac51d88e16dd7b56a3696f2242a53c871e5d0ecaa47135673b2f6a61d2315e44e2f68ec871fb SHA512 3696ea5cf3ebadd22daf589ee708e1472e6f0d7e569cc479b1ea4e59743a31aa484a254e4c02d908996faab624999db76e443f74dccd2117fdab44e1e7fb8580
-AUX apg-glibc-2.4.patch 261 BLAKE2B 10de29e4200591ab800f3c33a2d2936beb0c3c8812b37c9446ac178277d6a54128b675f61d96d607ff4ddc7f23598d61de69d9a6adc3ed20900cd9d944106989 SHA512 c7a3f388b5132d21caf6d45ad0c987bb9511a9fc4edd9e7f75739c270438d436159603b4eeb554bbc8cafce3329d01b66d11ab6e75f43b8bd2de57a31bd73bf5
+AUX apg-2.3.0b-cracklib.patch 920 BLAKE2B d1b0decd8a35db02ee8132350a04f61ada715e3316113ac0afa98b85602cf62594f392b14710c617426273acaf0d2d01a930b00809ba84d9ba3bf05b3ff9a327 SHA512 11fba45b144b28c613d6c9dc4cd2ed62d18ab306dfe2fb8e347e3d809d80f605096168b770fee70f9205f07f94aa87f8afe183551133431ad387d383a9b093a3
+AUX apg-2.3.0b-crypt_password.patch 844 BLAKE2B c87ccb6002eac2c363a5b35dc033badf3968562956a4f49697c98368293aa98f2420ff56ac742a7308a2373183c3883c5bce30cd1d8cb72f6f788df2891f8275 SHA512 bde5b1bbc4084cd4d2630ea92ed73c970cd217554638d17980c4d56b0da2f55cd7cafbc76b5073bd0415a7698b70df9d357f0c1731353dae46990e9407d7bb94
+AUX apg-glibc-2.4.patch 260 BLAKE2B b30c414ed89f22eb7dc2d0e3b115dbbc0845aba06f2a9dc0dea61fb36d9ccfa231d56959e7f02b3f1fb337654eec5cf2bd60c53ce24e112470c9fc9b9c225680 SHA512 27463b291aee051a4a149664cfd3dea524a34cd88d5cb90c5b4891fe0722aad9993cfd10df555455890ea631d8844d566d23cbb3812f8cb2859e131ea4c42114
 DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
 EBUILD apg-2.3.0b-r5.ebuild 1344 BLAKE2B cbdb7df15da6c6b6e08804bc5b9a94124a62c2d10c6873a697047d1ab1bbfd0c94bbfe1c992b3a958b141705c8c3749bd9c13a1b1a7646c8e8e28bf9ce56dbb0 SHA512 69f23df5f60996446721ec5ad11b201fa97cf4a1c2c12e28da17ff855debcb349e293fbba174066aa91fac5f773fe69c1b45b46530bc853dcc4c474699c60cd3
+EBUILD apg-2.3.0b-r6.ebuild 1221 BLAKE2B 3acc8161f0d45fc282dc79bdf6b44baedd682f9cc0e09ddbc422d0081f6545d0adaab73f7ee0beca50599cbe5ba1f13ed091a26058e2e887dcf9a64227485691 SHA512 8d46469a0a3448b4b8a3421d1e0674fe44c672f031d99405a8433f7a2569a73ad773611a1d176625aed7091fcf5e3a415095f6037fce830811e758199d9e9d6a
 MISC metadata.xml 490 BLAKE2B 6daed6930e317bb6b39f21dccd9cc4f08ddc549528076d6948212c7f62fe5d1e981f57c52278ea0fbcfd3fa36b3ce79192d52bc6e91c64940c1285933166735c SHA512 b1c2173415979d73b36b5e1650f27eebb89698f65a75af8351f8f77e762b9e54798a7b2398d6146ec54e975e4dd8ce59efc3b3c803eec863784107b1ce588e9c
diff --git a/app-admin/apg/apg-2.3.0b-r6.ebuild b/app-admin/apg/apg-2.3.0b-r6.ebuild
new file mode 100644
index 000000000000..34ea033ebee5
--- /dev/null
+++ b/app-admin/apg/apg-2.3.0b-r6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Another Password Generator"
+HOMEPAGE="http://www.adel.nursat.kz/apg/"
+SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cracklib"
+
+DEPEND="cracklib? ( sys-libs/cracklib )"
+
+src_prepare() {
+	default
+	if use cracklib; then
+		eapply "${FILESDIR}"/${P}-cracklib.patch
+	fi
+	eapply "${FILESDIR}"/${PN}-glibc-2.4.patch
+	eapply "${FILESDIR}"/${P}-crypt_password.patch
+
+	sed -i 's,^#\(APG_CS_CLIBS += -lnsl\)$,\1,' Makefile \
+		|| die "Sed failed"
+	if [[ ${CHOST} == *-darwin* ]]; then
+		sed -i 's,^APG_CLIBS += -lcrypt,APG_CLIBS += ,' Makefile \
+			|| die "Sed failed"
+	fi
+}
+
+src_compile() {
+	emake \
+		FLAGS="${CFLAGS} ${LDFLAGS}" CFLAGS="${CFLAGS} ${LDFLAGS}" \
+		CC="$(tc-getCC)" standalone
+	emake FLAGS="${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \
+		-C bfconvert
+}
+
+src_install() {
+	dobin apg apgbfm bfconvert/bfconvert
+	dodoc CHANGES INSTALL README THANKS TODO \
+		doc/{APG_TIPS,pronun.txt,rfc0972.txt,rfc1750.txt}
+	doman doc/man/{apg.1,apgbfm.1}
+}
diff --git a/app-admin/apg/files/apg-2.3.0b-cracklib.patch b/app-admin/apg/files/apg-2.3.0b-cracklib.patch
index a1c34a14f5a0..d297495b3211 100644
--- a/app-admin/apg/files/apg-2.3.0b-cracklib.patch
+++ b/app-admin/apg/files/apg-2.3.0b-cracklib.patch
@@ -1,5 +1,5 @@
---- Makefile	2003-08-07 09:40:39.000000000 -0600
-+++ Makefile.cracklib	2004-10-14 07:16:17.288530686 -0600
+--- a/Makefile	2003-08-07 09:40:39.000000000 -0600
++++ b/Makefile	2004-10-14 07:16:17.288530686 -0600
 @@ -44,10 +44,10 @@
  # If you want to use cracklib for password quality check then you
  # must uncomment the folowing 4 lines (you must not do this for WIN32)
diff --git a/app-admin/apg/files/apg-2.3.0b-crypt_password.patch b/app-admin/apg/files/apg-2.3.0b-crypt_password.patch
index 93f3f152a2b4..64a7fdcb37d3 100644
--- a/app-admin/apg/files/apg-2.3.0b-crypt_password.patch
+++ b/app-admin/apg/files/apg-2.3.0b-crypt_password.patch
@@ -1,5 +1,5 @@
---- restrict.c	2007-03-09 13:48:27.000000000 +0300
-+++ restrict.c	2007-03-09 13:49:31.000000000 +0300
+--- a/restrict.c	2007-03-09 13:48:27.000000000 +0300
++++ b/restrict.c	2007-03-09 13:49:31.000000000 +0300
 @@ -33,6 +33,9 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -10,8 +10,8 @@
  #include "restrict.h"
  extern struct sym smbl[94];
  /*
---- apg.c	2007-03-08 17:32:40.000000000 +0300
-+++ apg.c	2007-03-08 17:34:07.000000000 +0300
+--- a/apg.c	2007-03-08 17:32:40.000000000 +0300
++++ b/apg.c	2007-03-08 17:34:07.000000000 +0300
 @@ -100,6 +100,7 @@
  #else /* CLISERV */
  #if defined(APG_USE_CRACKLIB)
diff --git a/app-admin/apg/files/apg-glibc-2.4.patch b/app-admin/apg/files/apg-glibc-2.4.patch
index be90c6355e66..43b5874fa2b6 100644
--- a/app-admin/apg/files/apg-glibc-2.4.patch
+++ b/app-admin/apg/files/apg-glibc-2.4.patch
@@ -1,5 +1,5 @@
---- restrict.h.orig	2006-03-26 03:33:50.168661936 +0400
-+++ restrict.h	2006-03-26 03:34:10.427582112 +0400
+--- a/restrict.h	2006-03-26 03:33:50.168661936 +0400
++++ b/restrict.h	2006-03-26 03:34:10.427582112 +0400
 @@ -33,6 +33,8 @@
  #ifndef APG_RESTRICT_H
  #define APG_RESTRICT_H	1
diff --git a/app-admin/cgmanager/Manifest b/app-admin/cgmanager/Manifest
index 274db0735b75..170d6c0850d3 100644
--- a/app-admin/cgmanager/Manifest
+++ b/app-admin/cgmanager/Manifest
@@ -2,4 +2,4 @@ AUX cgmanager.initd-r1 331 BLAKE2B 725b5044fa567e7f7146bd62cc63a0674873d6fcb022e
 AUX cgproxy.initd-r1 661 BLAKE2B f84189b5fe16b6327cd1a6a2cd1805f1bbd75791d0f6f75a601ea58fa51d5a490d655371355205c499a51628b4e9cdf21f98431adcb3000397508cdacef2928b SHA512 7f43ea6369428d71d122a191c6a1718987ed09eafe2217ae326606ddf2a50f0500d0de0520fe21e5d2edefb8ddd4c3a85623d2aac1212e821ea922cb8256fffc
 DIST cgmanager-0.41.tar.gz 461805 BLAKE2B 22c779953d637012694c19490da9d3707b9e2a935f910d192fd1e6a44c27e933e93b6ae516399991924175a9e8e05fd650cf3117d3e7bde034a20bc083ebaa09 SHA512 e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd
 EBUILD cgmanager-0.41.ebuild 1234 BLAKE2B 3c69ccac261321f47b0064422a55541023efe27dcd902a94d0a9dc4e5c4c3f13a4d846b244903cbbec616196fb41a4294a4e4684bcf3ac9300b2138517439c9b SHA512 b5236eeb934b5a8679a965783ef187b4b3f603b69d37d1a572ea1c8a0f22bbd78c7339cad4aba8f4ffdf3970dc647cf46c1b132e18f19c4fd7057031fd06ba41
-MISC metadata.xml 370 BLAKE2B 663ce6f2f49c18a577d778210731960b1c750de6f4fb4c1d91d23ec2e409db04c94ea89a999e34be5d1520ef65c36c33085abf0011126e90584a1e9e2db3eb4b SHA512 eba74394c34246d7ca096cd81be0d41e4431cbb885331c9fdfde61e273a3f01bae0726dac514af8b96a4bf272961706a8845d84d802e216ce745793f930320dd
+MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/app-admin/cgmanager/metadata.xml b/app-admin/cgmanager/metadata.xml
index 734f29efb788..76f45cdee0f4 100644
--- a/app-admin/cgmanager/metadata.xml
+++ b/app-admin/cgmanager/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-		<maintainer type="person">
-				<email>perfinion@gentoo.org</email>
-				<name>Jason Zaman</name>
-		</maintainer>
-		<maintainer type="person">
-				<email>hwoarang@gentoo.org</email>
-				<name>Markos Chandras</name>
-		</maintainer>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index 4f5a18638f12..5d7ba8acebe0 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -1,9 +1,6 @@
 AUX clsync.conf 589 BLAKE2B fb7736b0972c91916770c6cfca693267bdf0cb3f6ad540388967c80fe609579fe458c40d71622fde0c2a3709530419536d1c358035637b2309ecde71892ee448 SHA512 46d8d786378eed0bfa46195e45f764015258ba55b35a5acf2685967e9fbd1fc7656c6aeba26b06889fa2f7c62cb11ecb84b10b856356ea3c0d463eaa4980c33d
 AUX clsync.confd 645 BLAKE2B f2e2f70f5a88ea3a416f4151637d63f79cce483b499ee0c1b5005ef8e9d16558f0d1c23ddd182335f7e963172bafaf4b41a37c1288f7fe55e7a57e2868418ae1 SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5
 AUX clsync.initd 555 BLAKE2B 18b3f0e1e8e079eb306709d2b55b99100ce3efa852f285d7ac9acd4269fe41e0fe5d1b7c12fa966dc01f60a598d6178cf5c8b6a2cd21410bdcf0f66c1facf1d2 SHA512 a5ee987466dec0e8ca7ce2502bd71d000419e03f33e1585e47fa5d91fdb5321f949f3d3ca566e68a0aedcc50ab6a84a92210aa866520d1703805958a2bfa270a
-DIST clsync-0.4.1-20150524-v2.patch.xz 13632 BLAKE2B 422ec7dc05c2f21aa96c397efa7ce1079b882d5ec4ce14beb8ce5e308e134142dcc557857ff8162b5fba84d8eaa078016794ed26433427d6a80e4e4f81fd90a8 SHA512 d39c3c4f116eff2365668374ef62f4dfd8e5926267cbbf36b430f97ad5306f92cf6be3164c0e1c3d959db55453f5ded00d98d48af62f9eacde39a9f9667cfbf9
-DIST clsync-0.4.1.tar.gz 253890 BLAKE2B c8aada690635f1cac355a1eaa51f4379688b0005869c5dcd6edccf5ae8e86abddf9ff99ccfcffeb165ccc80f407087a3f0863d1b78279894ff410daf25467740 SHA512 875280f706026d44806b92c22fa58d016136b2792f67a6b7e77f932465081da7a1ebaf22c25e538e4b58bfe04cd1cd5450ecab99c3df53ddd2a0fa966442d444
 DIST clsync-0.4.2.tar.gz 256042 BLAKE2B 28474fc66341b93705a502fcff390e3affcd89a9e1eb272dce9b28be709562e09c03e9c300cfeb5371e2e618a2239468a58c46212a39d751fbbfddeaab12bcf6 SHA512 d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200
-EBUILD clsync-0.4.1.ebuild 3051 BLAKE2B c70ff1c28fe6e5ad077d00e004894e20f9a683da431191484bb9b6c6671637940a76255f2bb64382aeb08b67364f8b203159b5f51b6f622e965ce12722129656 SHA512 db6893a5290741d7d42225875c145cc9b783fb722f7484b5393752c43e64f65b53287c3e4a3156f46013a3045514df997e3f49501f82795715f71601e2a49ca2
-EBUILD clsync-0.4.2.ebuild 2793 BLAKE2B 4b72e721e319ec0187a6ca38b3d90cdbec4385a654ad97bbf26a55ebfa433650ac212cc33ca41481b434ce9dcb20245ce58ca2d47faf7a03cb9ffb1372c77a2e SHA512 380171a754b0d590a14c4977f811198168dbd7f47d735692d3df5766ebabbcf746126a54cb7b0181628ef787777db250f909230d662ab3badaa672c49236e191
+EBUILD clsync-0.4.2.ebuild 2791 BLAKE2B 120160db12c85a65bc7e3dc646a4bc12d74ae9f596d57f749881d987c7626bb3d21aa9e789a6e920fef2d897570f8064601c629d30b673eec231ca95cc2d885e SHA512 fd60dc4d3828c76a68d330cd79dd96233b4915809d1f6a2d9ab5113f82e6a6cb17c4c18bfea86b51bcf8a534adb914a00c8fd2371148a610c16465e35b36ac8a
 MISC metadata.xml 1757 BLAKE2B e907cb32524743bc5571eddc4d0c7a30b51b82f49f72405939110e3085a8561b55e5927950be83ae3a647418479183aeae8491092ba8e5432a7633365f769e2a SHA512 6f853983a4886bbacb2fe1e26b728ba5d86b05f348b6df2cf0779725ef11623f73274829605b88aacd4300b4cb28ff6fbeead916c8dd01f4a07c9780218f1bfa
diff --git a/app-admin/clsync/clsync-0.4.1.ebuild b/app-admin/clsync/clsync-0.4.1.ebuild
deleted file mode 100644
index c037951819d2..000000000000
--- a/app-admin/clsync/clsync-0.4.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/xaionaro/${PN}.git"
-else
-	PVER="20150524-v2"
-	SRC_URI="
-		https://github.com/xaionaro/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~bircoph/patches/${P}-${PVER}.patch.xz
-	"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-inherit autotools eutils linux-info
-
-DESCRIPTION="Live sync tool based on inotify, written in GNU C"
-HOMEPAGE="https://github.com/xaionaro/clsync http://ut.mephi.ru/oss/clsync"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+caps cluster control-socket cgroups debug extra-debug
-extra-hardened gio hardened +highload-locks +inotify mhash
-namespaces seccomp"
-
-REQUIRED_USE="
-	|| ( gio inotify )
-	extra-debug? ( debug )
-	extra-hardened? ( hardened )
-	mhash? ( cluster )
-	seccomp? ( caps )
-"
-CDEPEND="
-	dev-libs/glib:2
-	cgroups? ( dev-libs/libcgroup )
-	mhash? ( app-crypt/mhash )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	~app-doc/clsync-docs-${PV}
-"
-
-pkg_pretend() {
-	use namespaces && CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
-	use seccomp && CONFIG_CHECK+=" ~SECCOMP"
-	check_extra_config
-}
-
-src_prepare() {
-	# upstream fixes for 0.4.1
-	epatch "${WORKDIR}/${P}-${PVER}.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local harden_level=0
-	use hardened && harden_level=1
-	use extra-hardened && harden_level=2
-
-	local debug_level=0
-	use debug && debug_level=1
-	use extra-debug && debug_level=2
-
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-socket-library \
-		--enable-clsync \
-		--enable-debug=${debug_level} \
-		--enable-paranoid=${harden_level} \
-		--without-bsm \
-		--without-kqueue \
-		$(use_enable caps capabilities) \
-		$(use_enable cluster) \
-		$(use_enable control-socket socket) \
-		$(use_enable highload-locks) \
-		$(use_enable namespaces unshare) \
-		$(use_enable seccomp) \
-		$(use_with cgroups libcgroup) \
-		$(use_with gio gio lib) \
-		$(use_with inotify inotify native) \
-		$(use_with mhash)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# docs go into clsync-docs
-	rm -rf "${ED}/usr/share/doc" || die
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	# filter rules and sync scripts are supposed to be here
-	keepdir "${EPREFIX}/etc/${PN}"
-	insinto "/etc/${PN}"
-	newins "${FILESDIR}/${PN}.conf" "${PN}.conf"
-}
-
-pkg_postinst() {
-	einfo "${PN} is just a convenient way to run synchronization tools on live data,"
-	einfo "it doesn't copy data itself, so you need to install software to do actual"
-	einfo "data transfer. Usually net-misc/rsync is a good choise, but ${PN} is"
-	einfo "is flexible enough to use any user tool, see manual page for details."
-	einfo
-	einfo "${PN} init script can be multiplexed, to use symlink init script to"
-	einfo "othername and use conf.d/othername to configure it."
-	einfo
-	einfo "If you're interested in improved security, enable"
-	einfo "USE=\"caps cgroups hardened namespaces seccomp\""
-}
diff --git a/app-admin/clsync/clsync-0.4.2.ebuild b/app-admin/clsync/clsync-0.4.2.ebuild
index d0e9c3ece979..dc27fddf71f5 100644
--- a/app-admin/clsync/clsync-0.4.2.ebuild
+++ b/app-admin/clsync/clsync-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/xaionaro/clsync http://ut.mephi.ru/oss/clsync"
 SRC_URI="https://github.com/xaionaro/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+caps cluster control-socket cgroups debug extra-debug
 extra-hardened gio hardened +highload-locks +inotify mhash
 namespaces seccomp"
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 3e724c483054..59eb76c6f56b 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -3,5 +3,5 @@ AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a645
 DIST conky-1.10.4.tar.gz 365145 BLAKE2B 60f6f53ef67a9958d4dd4c3f1ab53886235927ed457ad3e98d2f6f61568a14baa7cd2afa0d3ddde9ed5e16aae17891213d906f49c308269f678adf37ea627329 SHA512 665a3c2a9b150576d7c29964dafb7030f5aa5955530142cf0d00f0f49f4a3b320924d389b3a833ef6eb18468000f5c62d918e8f067c7b40cd9e205d0bf0d8e0c
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
 EBUILD conky-1.10.4.ebuild 4850 BLAKE2B 4d7e00ca639cfc5eed0b80f2ddb473e2979014e2564c684a07e0d4647612ee53c0cee16e6d2806e25a70c0725521678a04d5e43cc3544d4612fee749bbf50510 SHA512 612694ed4db70e8198f6a5b4110f972ab09dff8e3f8619367db3e2697dce97d22fae09b971b3c7800b150f744e86a3268c0999f4e1f3ed3f3041bb32dbbb7663
-EBUILD conky-1.10.8-r1.ebuild 5185 BLAKE2B f35554a27175e3b728281b781e1dbb654d4c9d8aa7d5c84825dbbc9ed4c097ffb290daa2e5a19d7650870de2e9aaaec80784454efb465765a66e4c12d0fdc8e1 SHA512 89a46bd70e5565cc03bed1fc9ff10f95d1479edf9e5ca65f5bd663912731c412ba97ea568e273cecaa7bf5cd3d5ae3c9a172618e9e37cd3e7c3cf7289fcdc348
+EBUILD conky-1.10.8-r1.ebuild 5184 BLAKE2B e42508f1ed4d950e287b9e8b5f5d0e7b88dbdbd8b7fb319ee2f4a05c13af28957c88994ffa626d41fdbc12ff895643344ab2f8b8e9272c71d3622c1646474ab5 SHA512 faf1d6431e6516d83a9ad7cae2f62255110fccfc19379bd13f4a41c6bc594a21298d0d5af48bfecd4cb6bc4e16f79cf650834c51d5c287a908f75a3c881022a8
 MISC metadata.xml 2525 BLAKE2B 805fd872d69f00911fa599d87f2c638b1126c438fd0c8ccdda84ff5cbddecbca882b74fa1828e703c32a4035a4223606a1da75bb27cc63ac19b8dd61f5f90b42 SHA512 ccfe5718005f521aa00e7a66429493ea1301f7691acf0cca2faa5372c5f1349ba62d5046b85059f395fe51b30130a06f6867e0736b80cf4b76f9388b05fa76bb
diff --git a/app-admin/conky/conky-1.10.8-r1.ebuild b/app-admin/conky/conky-1.10.8-r1.ebuild
index f9d5660cd0cd..efbd0cb3872c 100644
--- a/app-admin/conky/conky-1.10.8-r1.ebuild
+++ b/app-admin/conky/conky-1.10.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~ppc ppc64 sparc x86"
 IUSE="apcupsd audacious cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
 	lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
 	nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 0dd45ae7b8e6..7c27ddd566b4 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -10,5 +10,5 @@ DIST consul-1.2.0.tar.gz 17187054 BLAKE2B 5e8d1151efe1e8ad5932886367d00127747130
 DIST consul-1.2.1.tar.gz 14819500 BLAKE2B debb7ee5b8016527de0ebc680b228a9749435db4364e8d6e0160b1a20e2896dd4109edc5930dad961ce18f79182dda0c00a52a567ea6ff2d267b17448df2129d SHA512 5b5d8b62056c305f7388db50b54427ed21c41fef6d1b5f67da845a66bece35454e9f538bb0df59bc86788826b6cd20cd6179552060482908fc5cbc4a048c14a8
 EBUILD consul-1.0.6.ebuild 1578 BLAKE2B c32a67c19567b1b601bb6f272f6e435f9600accb4a41a03e774c197bb8f743d67c8fb4cc9e97c4829fb1bfd21eceed9318cc3f8e31217f89d57fe20c78f71054 SHA512 c2abbe3e57e2939832f443b2df5a5c3fad3fae197a5e96f6ed116f2c235a9df882848153f1928be71b5845c38256d99e1cceaf76c88efe30470495f0ef765572
 EBUILD consul-1.2.0.ebuild 1531 BLAKE2B 0d3891c096bd5a7b33a0f7b7969c7b27ea8536a1f1b608e1d119c1096734cf232dedf4ec38a011a39676ace9fa44de6ae8a58ad594f3d3fdd3093ee580e8509c SHA512 9ba4ed9ebb5c77b7ebc8daddf4346b8d14fca664eed894ee61c3aab06918d07a6a5156bf9717006009e65ff72c9954fd653630b0a16ab3ade5cbd9a36ef5005e
-EBUILD consul-1.2.1.ebuild 1529 BLAKE2B 5cfc78afbddfa423c8ffbe18e5ef532889de54bcb966dd51601297fc360dcf35e8ada41cfd3c725dbffb0ce52d95c79758a2b847cfe989ed48a4887c568c13ab SHA512 56c00a9377b39338c1735424b23b22b6b9cfcd6edf2d53d738ef57f951a9cce1307161f0a54e1be0b3afe9e792710f31a6dc540021d6684aee7837a8e4f9a032
+EBUILD consul-1.2.1.ebuild 1549 BLAKE2B bdc1cd6343ac29a314886b52ce3bf9258d2d64d6c7b777d015e5ff4088d9cbf66ce4f0f35d187407342e4fa7c0711864e62e2f061fb9ce46b83ce169ae45fab0 SHA512 d738514b3177a539e266b3eff06d167ec9ec9e79da23df8071592dc4d6bc37e1eeafc2297f171af404983630272eda3211eda76b10f3fd491fc3ee5f89f81032
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.2.1.ebuild b/app-admin/consul/consul-1.2.1.ebuild
index c23a7225e2cc..7bc86cc4fda3 100644
--- a/app-admin/consul/consul-1.2.1.ebuild
+++ b/app-admin/consul/consul-1.2.1.ebuild
@@ -40,6 +40,7 @@ src_compile() {
 	# and XC_ARCH, and skips generation of an unused zip file,
 	# avoiding a dependency on app-arch/zip.
 	GOPATH="${S}" \
+	GOBIN="${S}/bin" \
 	GIT_DESCRIBE="v${PV}" \
 	GIT_DIRTY="" \
 	GIT_COMMIT="${GIT_COMMIT}" \
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index 3052d24fb712..9b4a61243cfa 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -1,7 +1,3 @@
-DIST dxf-7.1.1.tar.gz 293629 BLAKE2B b6657e2b3b402e07a1f22dc5f8ece033fc8c7492e18a1654e7354420862c042ece359cdbb377dd9daefec606aaab865a22d26247d463097469c322d2877f4ea7 SHA512 9e9be7a69d885bfaf4f062ec601f33c7de2123c4c2910f046fc4b3f199608d08626e76ff47e2c9691149e6f3e0c6fb05e2264b83b3d74c06fe907f5bb7de5254
-DIST dxf-7.2.0.tar.gz 298396 BLAKE2B 2566f61ab4f621492b3f2c243a78bb02e25bc7278438c7698be4704724172605a5e1111a9f380e1de064c6d6ce35a95fee06ac4865e3c8f1318af4a6242ff1b9 SHA512 49f6a29d6d653f444d2f53b84a73b1282052c7ff7a87f65b59a87b5c2796ca37897b36b17d2252398d087377755ff9f474c6b271af80d955d79b6a971a2e124d
 DIST dxf-7.3.0.tar.gz 298408 BLAKE2B a8ba078d1bea8fed58df35562af678f902513f4da18123a3eabb52a707b7973358a7690d309b3b7d86fadc4086856580792177525b4e7e217da4542249e83663 SHA512 2bb16a41990f572c3352f708438e67550cc089c078296c765fcffec4ada60f40f097bfcdf4def3c57a0e6c1db31d2ab9020407b2c165509f132e51cc93af8205
-EBUILD dxf-7.1.1.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
-EBUILD dxf-7.2.0.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
 EBUILD dxf-7.3.0.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
 MISC metadata.xml 373 BLAKE2B e00f8cf7bc138cba4b3a9db1da273f85a90612578a89a8943bad5fd2bfe5f36d233b6b26764a2fff0c261890cafe34243845d12f6e9ed952daeab86c2e3aa70a SHA512 85d9b0ab4896713d2e796fede5635fc4bb80e402b2a6a7404fa1b7ba52e139a0ef27876dae39081c58a5ea8a5a78749b7fcc13c038b85c90c4286721931cb63c
diff --git a/app-admin/dxf/dxf-7.1.1.ebuild b/app-admin/dxf/dxf-7.1.1.ebuild
deleted file mode 100644
index f6e0099fdfe3..000000000000
--- a/app-admin/dxf/dxf-7.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Docker registry v2 client in Python"
-HOMEPAGE="https://github.com/davedoesdev/dxf"
-SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
-	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
-
-RESTRICT="test"
-# Require dockerd running
-
-python_test() {
-	emake test
-}
diff --git a/app-admin/dxf/dxf-7.2.0.ebuild b/app-admin/dxf/dxf-7.2.0.ebuild
deleted file mode 100644
index f6e0099fdfe3..000000000000
--- a/app-admin/dxf/dxf-7.2.0.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Docker registry v2 client in Python"
-HOMEPAGE="https://github.com/davedoesdev/dxf"
-SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
-	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
-
-RESTRICT="test"
-# Require dockerd running
-
-python_test() {
-	emake test
-}
diff --git a/app-admin/gam-server/Manifest b/app-admin/gam-server/Manifest
index 8e0dc68ac21d..00d2fb8abaa4 100644
--- a/app-admin/gam-server/Manifest
+++ b/app-admin/gam-server/Manifest
@@ -6,5 +6,5 @@ AUX gam-server-0.1.10-noinst-lib.patch 2207 BLAKE2B 28ebca731a16fb10c0f186c3eb75
 DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fbab69f2417cc089b050a7e245d89701b0703a0916d6dc08a706785ee509ee4feed0375107f777fdf4248ff5f93b SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b
 DIST pkg-config-0.26.tar.gz 396399 BLAKE2B 5a88cf825d6ad99d198418798b28c779cfd4c0bcfaa023e915a818c141a504c49a6281ea0b2d04a7a9ec89f9924c87f8b1ddaa5a088952715397081383b3528a SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4
-EBUILD gam-server-0.1.10-r2.ebuild 2652 BLAKE2B 766c90d107c0133a11d97054713229138e8e1e371da59147342bf1b58b6766e9f780f6ce407c9ddd887f54f859d04332ea25fc754314223b7fd519a2376b733f SHA512 3ab8af16cd39aba455f12216dbae2c40b79e89876a8a3945bbb8b6d237b232375ec5a5379e504495090507607dbe63b671bd94ecc91fba4721402c26d38e6fd3
+EBUILD gam-server-0.1.10-r2.ebuild 2651 BLAKE2B 4dcf004c90ca9aa6d6204b4a58b8b7253280088904e5cbab88987cc96e99c4206dd6f4d58cb6819ba5c04604bdd620c0b2f9a4e24d056c7abaa73245aa823533 SHA512 722546e4f96567a71cb6db8e5fe6935ccf7cceb9634010ae21aa5b5ffc8af532c6a43790d40de7e2eda61518d9cc767f67672a1e0ef289d139b01be5fb52e1d7
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
index 856dcad4185f..f82ee5263352 100644
--- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris"
 IUSE="debug kernel_linux"
 
 RDEPEND=">=dev-libs/glib-2:2
diff --git a/app-admin/gamin/Manifest b/app-admin/gamin/Manifest
index 33eab152fba7..b11ee4cc59f1 100644
--- a/app-admin/gamin/Manifest
+++ b/app-admin/gamin/Manifest
@@ -1,2 +1,2 @@
-EBUILD gamin-0.1.10-r1.ebuild 615 BLAKE2B 68247a3c711fb6c343d02d8c0bed5248a5c1eac05df2458cfa52a8025bf26cc9c5f7c17e887e18aa7554564e845a6a57866a9ee526ec191726bd6755e8540507 SHA512 4103ebc7f6a5a64ac7a1625ac7f468c61f4612ae82a5838a74c243c6abfe6dd761acc3ae7b80992f81c2405a3ecb644be6c218d96593bcd33e61db3a8277c45b
+EBUILD gamin-0.1.10-r1.ebuild 614 BLAKE2B f73759bb5ecec1d7d3bd0c4ab54c7400b3b9b22a3bd626743474b660ff4dde0dfcb64f34a4c50009091c1e195f62f656171638985b91e385980a6f7a097a28c8 SHA512 c99fe83583f6ed19ce3304cae523f0007ca9a18a252b3be98792eec0c6a11aaf3db8db0aa9f9a041490d2044034abdef2aa5dd8e740f4f36fd581b9d2bcbc94d
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/app-admin/gamin/gamin-0.1.10-r1.ebuild b/app-admin/gamin/gamin-0.1.10-r1.ebuild
index 141ea5442b52..5f08ea6d4748 100644
--- a/app-admin/gamin/gamin-0.1.10-r1.ebuild
+++ b/app-admin/gamin/gamin-0.1.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!app-admin/fam
diff --git a/app-admin/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
index 2049f6a0eb43..3d5078eb23bd 100644
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@@ -1,14 +1,4 @@
-DIST lastpass-cli-1.0.0.tar.gz 92311 BLAKE2B a5351fb203ce3532572ac52fad5f6a6312c3378918b5100011fe4947c1fe7ca09d41e327e85b7a9d5c9ddd58ac29d3b790494570dda0d970a3c1c18bcc0ca5db SHA512 4709b3e4d6064c8c5cb593344e6417355d7df570240dce8eb77a19f3377ea38585280a9602cf8ab926c55c6afd84b297f261b0c8a40d355734d5cc542d46f610
-DIST lastpass-cli-1.1.2.tar.gz 102796 BLAKE2B 7c6a19698616e9a3ab6286b2eaaaed1b4a810cb35464c70f3930ed0903d5f63cce6f0d5bcbb3b07fb5ad846b58581a93aaf8d6d63a7246b7bb51985362fb856e SHA512 8115cb07cfca15ef402bdbd8ce943352e1534ddb781274e21cb0fafa4bcd9ab7abe4ddba57c4ebbce326f09cc9249f244607d16cac5597e61cf21c73417e7d9c
-DIST lastpass-cli-1.2.1.tar.gz 108780 BLAKE2B 82ebae9a6a707bb75025cf98b53bccd2403eb0a3855d7f6ca7c5fdbf55465f929df529100da7933ce73ab7ece35275e0ffd96e6463eb1ecbd81dcccca3b80047 SHA512 c7c9f20dbc083873b815834320828a30a1c488571efbfc5aea47c3bd2073819d713810c785855d4c0c208e1b95aa0e5fc550a0b6b5c0f787eca1f54589e18e62
-DIST lastpass-cli-1.2.2.tar.gz 110045 BLAKE2B 96fcfd8f6e974edb5bd8701e18e73b46c0bcbcc14c38debd50be922a25ece9397bb6b641d4f2ce3057e57af0114a263eaab03e86b74e61d89a745411051bb172 SHA512 7d211c7669fe2de3e3f34cf00025376fd39a7f96c8573a0eaff64f322daab03de21e25d5875d3286a794580ac75d330c7bfe1005b377afc2b13e4ded9d78012c
-DIST lastpass-cli-1.3.0.tar.gz 113969 BLAKE2B 5570567b17f043200f6b4eca72735d26d153a91cb4f0551a856532101ac610d2505bc90677735a8bbafe68f1a1b7ac0a026ac642a9f3786cceb7638ea29394fb SHA512 7a147e08ac4b8e4e895744f80c484db9da895f4439bccbc141fe17e480285c76479753c2b879c60258d740af39775a3fae225ad193b5e6379a1cae8862c2a3ae
 DIST lastpass-cli-1.3.1.tar.gz 114843 BLAKE2B 7983d4090092ef3443d8c502d157934fa2384426f0be22c796795cdf664be3ba396f64daa81cdf896cb6901d4063f93e54b62cda4349b14fa4d312a21c5bb76d SHA512 092d28dc459719e662fbb2c5e92e8cc75be108aa9d7b62569ee44cb34dd9588e78151fdc5ad114c30e8de21c0b8803edc41db9295548c7cbfe6e537c9a52aad2
 DIST lastpass-cli-man-1.3.1.tar.xz 5700 BLAKE2B 736ab71ad55cfcb657c727f3dc9dc15775dab1a0232d1ffc51b8794e49911531c96a841b4a5ac0b31f0516cd7aa54027ac7d0eb096816730cdfd192c04d99449 SHA512 e60807683ecd681b3937ef447d3e6a487d25418fe99f51ba99e54bf643c5254dd18427a03e7f035198ef34ff578bbb6116baf04eb554f54d85e7d059b6bfed7e
-EBUILD lastpass-cli-1.0.0.ebuild 1012 BLAKE2B 9c0bc0d6b795f2c01838c09ca05b3a7e5fae9c09f60b65239e8d0fff49f2b244258781cd66c44eaa3795c978bf817b28dced02fe11ed4dd0d4de39d75ebe73d1 SHA512 d319bd79f9281f4ef9c6dce9ae68e58ac628addf7218b1bce38d983731a8e21cb9f4e112bb74fe2a0a598767c3381917c27191fc91834f5c1bd15fc22c92564f
-EBUILD lastpass-cli-1.1.2.ebuild 937 BLAKE2B e9b7f4264bec259d4abe5789114e0a4c64dbaba89d43a2ae0618719a7eb3ef6ecaea8f57b5eba8d477604a528c27f7cd3f7c64bf2322021c81311af079cd2a8d SHA512 f25a76711dbb73d592a3d2b325f3de0eae899ce2db7f21948624c7a846de88bfd5ee2b6bc46a4f973674df043eb0ab22817774c724145bec4975650d55f645be
-EBUILD lastpass-cli-1.2.1.ebuild 1273 BLAKE2B c60f42829455207808dabbc6304f99c02f13fb6bc01cdf378ca382d305740a8c66ebebeefc892d81325742d87f2c4ef2c2bfc55f7921bb0e59d5904271cea4c6 SHA512 7da1fb209fec0057d70cc2eff410cfcd410be6b6fba183bab5ccb8279e729df3a8acc3e1cfe2b339e6bbfd346c4d2eecee924a2c8fe15a6ebf5a502efc7fc16c
-EBUILD lastpass-cli-1.2.2.ebuild 1280 BLAKE2B b06a35c163f277bdbbc20f2366f93d4ad6ae20ebbd39317e91424db7a0828b6d664008f4e8bf8bf3dac39fb540439dae1ac5f92756dda2744918d024bee42d7b SHA512 a2455060f8ba03105c704217d23086c2f04380a63dfb6b02bdac1065cfc0559e83fd0eee2a6e3a1ea6ca9b64c9f477b4dd857b62058a49eb5fa0df997d825fd1
-EBUILD lastpass-cli-1.3.0.ebuild 1310 BLAKE2B 61bc2fb9f4b3d260f647b9265f7616bdb97dbe048d2d5699f66c8816691ff8e06653c81e28f4908eba7513814e9c619fe3b8f9e88b45c1701457efe592f0f521 SHA512 daf6a5a270b750b9f95e3b1a06c57cd7112982901d0d49c16bb4a51da92ac6db95996d427a6a8d6709ad1d2a4bbe57dd74e5261bdadfe479fa7f49b14c936bf1
-EBUILD lastpass-cli-1.3.1-r1.ebuild 1393 BLAKE2B 07a272e7f33dcfc0ce64b8b48c4ea6196880320af304554aa567f968290a591c02ddec799ea0239e0ac4e6176e4cf76ff791daaa4629272e085927a2b46d334f SHA512 bf226f2be2c70f61c631a655bcf3f1d9ef733a3b9989c1288019e84734660e183a8b5980c6d147c55e08c5c02dd4377b39d091933eeb1e15010de52ec8ff8338
+EBUILD lastpass-cli-1.3.1-r1.ebuild 1391 BLAKE2B b302f230665e0bb8dc206adac5f968674522531e4dec5042a6a6bb4d014aee1412bfed30c7ff48b788e16c8d1073f018292da1f3b896d6dcb6e6e84949ea97c8 SHA512 6d8d5009c546bcb7b7f2f5578dd5758b50773534246a76494bf3f16172a543392acecc3b825b3a10ba21262269ec46bce60e13d74026167c75704b85811eab9a
 MISC metadata.xml 643 BLAKE2B a5a01a1dbcc257692bd14369470d69eef33a00a9910ed5006c62f1f5fec2a9a261dd6ece42bcaa68345a21f6e26958f965f90459501324b0e7a168f3fcc4f7f9 SHA512 6b1a7f6566687384d328260576dad306dd07add06001b3746b4f37f05ff91b6ee72e1e2ecfd35463a5b78b4ba8dd1a7757503bdf992372dbd474967e4bf0e9f3
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild
deleted file mode 100644
index a33a27661666..000000000000
--- a/app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="Interfaces with LastPass.com from the command line."
-HOMEPAGE="https://github.com/lastpass/lastpass-cli"
-SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="libressl X +pinentry"
-
-RDEPEND="
-	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-misc/curl
-	dev-libs/libxml2
-	pinentry? ( app-crypt/pinentry )
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Do not include headers from /usr/local/include
-	sed -i -e 's:-I/usr/local/include::' Makefile || die
-	default
-	tc-export CC
-}
-
-src_compile() {
-	emake PREFIX="${EPREFIX}/usr" COMPDIR="$(get_bashcompdir)" all doc-man
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install install-doc
-}
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.1.2.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.1.2.ebuild
deleted file mode 100644
index d81e760b556d..000000000000
--- a/app-admin/lastpass-cli/lastpass-cli-1.1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1
-
-DESCRIPTION="Interfaces with LastPass.com from the command line."
-HOMEPAGE="https://github.com/lastpass/lastpass-cli"
-SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl X +pinentry"
-
-RDEPEND="
-	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-misc/curl
-	dev-libs/libxml2
-	pinentry? ( app-crypt/pinentry )
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all doc-man
-}
-
-src_install() {
-	cmake-utils_src_install install install-doc
-}
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.2.1.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.2.1.ebuild
deleted file mode 100644
index 4a4ee2d8677a..000000000000
--- a/app-admin/lastpass-cli/lastpass-cli-1.2.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1
-
-DESCRIPTION="Interfaces with LastPass.com from the command line."
-HOMEPAGE="https://github.com/lastpass/lastpass-cli"
-SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl X +pinentry test"
-
-RDEPEND="
-	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-misc/curl
-	dev-libs/libxml2
-	pinentry? ( app-crypt/pinentry )
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all doc-man $(usex test lpass-test '')
-}
-
-src_install() {
-	cmake-utils_src_install install install-doc
-}
-
-src_test() {
-	local myctestargs=(
-		-j1 # Parallel tests fail
-	)
-
-	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
-	# which is incorrect for our out-of-source build
-	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
-		-i "${S}"/test/include.sh
-
-	cmake-utils_src_test
-}
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.2.2.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.2.2.ebuild
deleted file mode 100644
index 2822408086a3..000000000000
--- a/app-admin/lastpass-cli/lastpass-cli-1.2.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1
-
-DESCRIPTION="Interfaces with LastPass.com from the command line."
-HOMEPAGE="https://github.com/lastpass/lastpass-cli"
-SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl X +pinentry test"
-
-RDEPEND="
-	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-misc/curl
-	dev-libs/libxml2
-	pinentry? ( app-crypt/pinentry )
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all doc-man $(usex test lpass-test '')
-}
-
-src_install() {
-	cmake-utils_src_install install install-doc
-}
-
-src_test() {
-	local myctestargs=(
-		-j1 # Parallel tests fail
-	)
-
-	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
-	# which is incorrect for our out-of-source build
-	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
-		-i "${S}"/test/include.sh || die
-
-	cmake-utils_src_test
-}
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.0.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.0.ebuild
deleted file mode 100644
index 2c34bdeb3291..000000000000
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1
-
-DESCRIPTION="Interfaces with LastPass.com from the command line."
-HOMEPAGE="https://github.com/lastpass/lastpass-cli"
-SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl X +pinentry test"
-
-RDEPEND="
-	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	net-misc/curl
-	dev-libs/libxml2
-	pinentry? ( app-crypt/pinentry )
-"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all doc-man $(usex test lpass-test '')
-}
-
-src_install() {
-	cmake-utils_src_install install install-doc
-}
-
-src_test() {
-	local myctestargs=(
-		-j1 # Parallel tests fail
-	)
-
-	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
-	# which is incorrect for our out-of-source build
-	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
-		-i "${S}"/test/include.sh || die
-
-	cmake-utils_src_test
-}
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
index 57454b36ac9e..baa5af0d25de 100644
--- a/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2+ GPL-2+-with-openssl-exception"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl X +pinentry test"
 
 RDEPEND="
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index a2ba079a443a..1efc2ff5d28d 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,5 +1,5 @@
 DIST lib_users-0.10.tar.gz 25636 BLAKE2B 6e660b80ef75f71d47f4783dc741e8b0c17f3cfe31296c5624adcfed5836a0b86964f042eafb5b34e259a824c79efb537558d625bc16d07fb388d61ece7c6329 SHA512 dee8203457570f686df69dc91d71614b462845c848a3445fd9b9f94047fdba8171cc2555fa4299bc4c361905d488c1f17cee4ab0e99899f37995377d6011805a
 DIST lib_users-0.11.tar.gz 25660 BLAKE2B 8f5a827840d4074a0e8abd77e43f60eb09f199f58a2bde0c2bce7613d6ba1d9b12dd46adffa528ff351f54933c304f274abef9c35550d7af3519101dcec69d0a SHA512 a54fc8f57cffcd08e77e86eaf50ec6e68e45e1e9458e25e035af90e14be13980a400c4d264f70ef67e141e1d54581b0487b2b70dd084dc5840424221b46f644a
 EBUILD lib_users-0.10.ebuild 1117 BLAKE2B 511c6cc9302552d0f0c70221ed81079f64b8a8fc9bf35541d03130769981f5d96a2243fccaf122b9d2875d5fbc794e094ebbdd3a56a33ccbdf1f8b0ccd844033 SHA512 d5e8f63944f2b7e6cc6bb34b170f59b534cc5c6c8346ade237110a621e27dc2253969ec969321d5567e6d0e70dc9a3d57219321d41cbe27462e109b590c2a605
-EBUILD lib_users-0.11.ebuild 1123 BLAKE2B a598c57cb898438aa386a80b9a9445ecae5372ee8617ef5c2447a3319bb4af87fe78ad361a9a0d2dfb8067811d3fde8f6f28b6de23a6ab9ef55044e19f96d6a2 SHA512 f1f0a4725a1897951f9f61099b810c846419689c00e6dccbac5efaeace57f31cfb03c042f53ccb652f7be75fdcab5308a9106094e04bc3802f4f6de96f145740
+EBUILD lib_users-0.11-r1.ebuild 1127 BLAKE2B 31a0e8bf4947d7b3a400db305ff513907b676a6b1be57ad1a69190db52ad944b94738866294d6cf679d5078e8df3e06685e2fb9cf617b192798ee10146a4408e SHA512 fc254dc1979cccd40f2ca494a7f8c7646299fade0889bb52b2a61f6b7b9880de076370db98f0b207152f6b72898ee97ad4099bcb753f4eb6a7b25ecc7ba20bef
 MISC metadata.xml 454 BLAKE2B c545fd1db330988ad139de08b1890cfd9d6aac98947b954fb761515d314d8ebb941829e7767fe4fad6beb41caf3409111505d1a6378c852f15907933678ddd48 SHA512 c897ea5b6bed9fcc8715380a1b2756f376a095925a2c99a78ce6729cc9839683f40ce53f5faf0fb784169db5ef9162f1659ea6f24304bcc7cd47f90d49ec97dd
diff --git a/app-admin/lib_users/lib_users-0.11.ebuild b/app-admin/lib_users/lib_users-0.11-r1.ebuild
index 32a7d7827f37..b1a72eed7a53 100644
--- a/app-admin/lib_users/lib_users-0.11.ebuild
+++ b/app-admin/lib_users/lib_users-0.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit python-r1
 
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 1e7f28bb8dc3..ce5934b1148d 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -2,10 +2,15 @@ AUX agent.conf.sample 409 BLAKE2B c97d35ccecedf47c234e2cb1b3bc20b5aea9254bed08f0
 AUX logstash-plugin.eselect 1768 BLAKE2B 539246fb1c6e00fa0928af146d3c32ef69f61e3d419ebba97e688ba151fc34b1cb4a77180c36cd02348616a5069d4c013302270c0127fbe7e836e3f866569d1d SHA512 c80c0f2942643dbdb56c21d2ae0679ac92fb5c84b4f51cb426108c1030434fb32bcadc7131bdaabfe34a458e2bf35965c4acccfb42b99c790a26c2b9ae2a24eb
 AUX logstash.confd 775 BLAKE2B fdcf55e1155c746764aa765350367c421f9ba84b6a1a1cdba94f482bbb3afc904af0995929d75326947e5fc0cfd51bc7608c19a04dd52018cb696d602c39094b SHA512 f0d9270f9158e39ee6b3f0a0e626c252e425246fa76098055161e97c9b4cbe14a9f4db2ea9c64636ef5adba7dd72ac3451af63cfcf4598517c29f8c5efcba14a
 AUX logstash.confd-r1 837 BLAKE2B dd8362a386c865b44e05dd4a244146c5b593e4497d876c23c64e2f2811155355fac51e1af7ec079a8dad7141c2ad3e0eecf3b58971efe3352d4e61d210b46400 SHA512 7a7dcbfe2a8f80804083099a942ca51b235440cd356c1e2310ed060c9260ca0ee7d970b0f5293c67290b17bab4e9c8e0669bdef98f51ed1a97f83ae444c7861e
+AUX logstash.confd-r2 767 BLAKE2B fa251570a13b2bc2d0779e0f00549f40bc957f211be0f4164829f7bf731221e5adabdb27341c703f1ea67b19455e8832f5d822fd41ffc64994007201690feff6 SHA512 83eecf30baa160041f33fd3dafce317c1692efaf676d0fdc9bee04965eafb15f1e01d07a09607d345665f6bebc4db90d17a0abd1c7fd4962d6926ac069f16768
 AUX logstash.initd 2091 BLAKE2B 980722c1c3cd0cc60cf440d5a06185c66ac4348c0e8990036812ad8f5cbd4e2561affab3ef1de2482990635169afdd10c0841167494d2bf024b28101a0df45fc SHA512 5592918e82182f638a02f6446f9103f70274fdf615573aa4463fde1dfcfa7955c715b0fdcb1f98de9c19ab86268b439d253a696b27f32e55d830cc3839231e30
 AUX logstash.initd-r1 2176 BLAKE2B 37c05148d3789c69805ae5151bed5e297d71b9d60d71ff98ed411ac59b73c4a2a9462e6223a2c960301c6228c84879460ae0f793a24806768fb727b01d982709 SHA512 392c8297c6429e0384dd75073773e1f8f51dd62fd155b2a524efd9e862df114b13cc63cf37237526aebe838b5ff26a8f26a3ad08058a56a723e25025df9a16af
-DIST logstash-5.6.9.zip 108563466 BLAKE2B 9225b823ac1f746481b34894c181aedabb0e69eb4242527271240448504f46aa68ba72f63e3752a6a13c3d567bca89df272a09cacc62739a526e3cb24ca90072 SHA512 f5506b2f2bb2da4b2a8d7b199cc328de6625f623b9498f4f2e5505aa8b4082efa207a06d1df8af7b7c21c400268e51d7ae8b9200afdaa191b8e8644e033a9b6b
+AUX logstash.initd-r2 1989 BLAKE2B efa16227a2cf1a42f1f9e27e110dae64c7eb6547e22e89a71b3394fe587e0f83468e361d335e28b15a1507959dc26c019ae8ac9bc110f1b8a6896ceb7f3ceecc SHA512 77c69600f22d31e7e08c2d953c99bea8a24ad83c7abdd578526b850ca37c963a91cfd245b70e4ddb8d405135230fbc641768de2dc4dad096a0db3d40313acb2f
+AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
+DIST logstash-5.6.10.tar.gz 104373711 BLAKE2B 759bf003e1799aeaef0a1279b3c7cf5732126ae65e9ca0a3e315cb6f7a1b4e4417fad1fd86328a58be99e04e8053264d873b04cf43cac2b49490bbdc82c8e8b7 SHA512 9ba887da982755efd21b363e9c084660c9b7e6c042e00a8c599f60d6bba5621af7ede43957f6c3d976888f4c13e6ae17cc69afd184f2dcdd41a311972f59a745
 DIST logstash-6.2.4.zip 153969993 BLAKE2B 989f631484be14014b8230e09fa049a0e470078fed938f2df55134a27d5f4f2d8670187126d32c4933b77b496a6ed96e12d180922c2c318c67fb3dbeec5a5a3b SHA512 65f6e5accc4441cb930e5c45723edeea54ba034a25680ca34114296af5a2c456d4152f9b38469475e600fce27a27b0d9c1d206039d12f2ec9cfeb02942a5c189
-EBUILD logstash-bin-5.6.9.ebuild 2219 BLAKE2B 7ddc549eabf27143b5951e0e92777609f5d14b76c80ee2b6f794679ef8af73d4a97e59ab106ee196b1df5ed1a1199427e9218db8efaf67d495c84594647e7aa2 SHA512 3fdf9156fe2d3baecf3a4599890a07e7aa572c08b72d173c79dc415ab7339d6e0c9050c73a4c74da0f6bcd412484f6534aea784bb9028ff661d1a700f0b4b18c
+DIST logstash-oss-6.3.1.tar.gz 143787612 BLAKE2B 2de3b991d27019b1c7df7cfa7152c009f2569e12562106babb56081be2a7ac7d94a967e7c52b58f721c2f70f1e8ec9c2730653ff094cf0dd3a9933486ac13be7 SHA512 959d9d5985e117d23ae12efe248a13ae33f8f3ede320fb3b6872e1c27738b601779f0e2402e7be4a2383cd0f220e50cdfd2d6b160d7f5805b2439cee4d8bd94c
+EBUILD logstash-bin-5.6.10.ebuild 2198 BLAKE2B d271b016d5b4318124314f0df5ea9481197ee18c7f20183f731d0026d34356e3df80123174e733b009417984d81ac9f9eccc8c4e53e929a12e28ae28d6b43c3c SHA512 70df6a19cf77a14a9b0f80025cc42d1feb6fe2545dabf70e864b47f34b971d4b6ad1d70e4600eb684e656c2fd5827f98fcd06f319e6a483aab0e49e865e239bb
 EBUILD logstash-bin-6.2.4.ebuild 2219 BLAKE2B 7ddc549eabf27143b5951e0e92777609f5d14b76c80ee2b6f794679ef8af73d4a97e59ab106ee196b1df5ed1a1199427e9218db8efaf67d495c84594647e7aa2 SHA512 3fdf9156fe2d3baecf3a4599890a07e7aa572c08b72d173c79dc415ab7339d6e0c9050c73a4c74da0f6bcd412484f6534aea784bb9028ff661d1a700f0b4b18c
+EBUILD logstash-bin-6.3.1.ebuild 2065 BLAKE2B a5965944d381c1a0dc51578c22010cdb1ac1a877dd8a13f05e82901b54d54f562a5f77f1073ee475e053f75b6005ec7c77d0ac0a239e5013c6a9dc0012ba2288 SHA512 f86afac9ed0982801f794f36696c90773d96a548c6b3b1e5732f02f155fbfd7260261c797c51ccf5b7a27919ef8cdcddb1e17516a5a867a7bf4cc5ea6a0b0583
 MISC metadata.xml 578 BLAKE2B 739149a851fd22460a5cf86deaa74732e44ef44c9edfcba880e7734a8660c92d18df33728939addff8e95241c0475cafed5b0df77d0b9acde609b163f8e7eb0f SHA512 ce9ff07c8fa8edf104692b2736dd7e1a4b2d456dfd2f2cebc2a3dec28d7c11020abf21dad583663266ed5ab26670959bd4650a411524581019e0b27504fba049
diff --git a/app-admin/logstash-bin/files/logstash.confd-r2 b/app-admin/logstash-bin/files/logstash.confd-r2
new file mode 100644
index 000000000000..d9ff0942bc61
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.confd-r2
@@ -0,0 +1,37 @@
+###############################
+# Default settings for logstash
+###############################
+
+# Set a home directory
+#LS_HOME=/var/lib/logstash
+
+# Set data directory
+#LS_DATA_DIR=${LS_HOME}/data
+
+# Arguments to pass to logstash agent
+#LS_OPTS=""
+
+# Arguments to pass to java
+#LS_HEAP_SIZE="500m"
+#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"
+
+# user id to be invoked as
+#LS_USER=logstash
+#LS_GROUP=logstash
+
+# logstash logging
+#LS_LOG_DIR=/var/log/logstash
+#LS_USE_GC_LOGGING="true"
+
+# logstash settings directory
+#LS_SETTINGS_DIR=/etc/logstash
+
+# Open file limit
+#LS_OPEN_FILES=16384
+
+# Nice level
+#LS_NICE=19
+
+# If this is set to 1, then when `stop` is called, if the process has
+# not exited within a reasonable time, SIGKILL will be sent next.
+KILL_ON_STOP_TIMEOUT=0
diff --git a/app-admin/logstash-bin/files/logstash.initd-r2 b/app-admin/logstash-bin/files/logstash.initd-r2
new file mode 100644
index 000000000000..e05c837ae709
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd-r2
@@ -0,0 +1,69 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LS_USER=${LS_USER:-logstash}
+LS_GROUP=${LS_GROUP:-$LS_USER}
+LS_LOG_DIR=${LS_LOG_DIR:-/var/log/logstash}
+LS_SETTINGS_DIR=${LS_SETTINGS_DIR:-/etc/logstash}
+LS_HOME=${LS_HOME:-/var/lib/logstash}
+LS_DATA_DIR=${LS_DATA_DIR:-$LS_HOME/data}
+LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
+LS_NICE=${LS_NICE:-19}
+LS_JAVA_OPTS=${LS_JAVA_OPTS:-"-Djava.io.tmpdir=${LS_HOME}"}
+LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
+LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
+KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
+
+LS_INSTALL_DIR="/opt/logstash"
+
+command="${LS_INSTALL_DIR}/bin/logstash"
+command_args="--path.data ${LS_DATA_DIR} --path.logs ${LS_LOG_DIR} --path.settings ${LS_SETTINGS_DIR} ${LS_OPTS}"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
+	--chdir ${LS_HOME}
+	--nicelevel ${LS_NICE}
+	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}
+	--env LS_JAVA_OPTS=${LS_JAVA_OPTS}
+	--env LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING}"
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+checkconfig() {
+	ebegin "Checking your configuration"
+	${command} ${command_args} --path.logs "${LS_LOG_DIR}/configcheck" --config.test_and_exit
+	eend $? "Configuration error. Please fix your configuration files."
+}
+
+reload() {
+	checkconfig || return 1
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	rc_ulimit="-n ${LS_OPEN_FILES}"
+
+	local d
+	for d in "${LS_HOME}" "${LS_DATA_DIR}" "${LS_DATA_DIR}/queue" "${LS_DATA_DIR}/dead_letter_queue" "${LS_LOG_DIR}"; do
+		checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
+	done
+}
+
+stop() {
+	ebegin "Stopping logstash"
+	if [ "${KILL_ON_STOP_TIMEOUT}" = "1" ]; then
+		start-stop-daemon --stop \
+			--pidfile=${pidfile} \
+			--retry=TERM/5/KILL/5
+	else
+		start-stop-daemon --stop \
+			--pidfile=${pidfile}
+	fi
+}
diff --git a/app-admin/logstash-bin/files/pipelines.yml b/app-admin/logstash-bin/files/pipelines.yml
new file mode 100644
index 000000000000..eae903aeb1c7
--- /dev/null
+++ b/app-admin/logstash-bin/files/pipelines.yml
@@ -0,0 +1,6 @@
+# This file is where you define your pipelines. You can define multiple.
+# For more information on multiple pipelines, see the documentation:
+#   https://www.elastic.co/guide/en/logstash/current/multiple-pipelines.html
+
+- pipeline.id: main
+  path.config: "/etc/logstash/conf.d/*.conf"
diff --git a/app-admin/logstash-bin/logstash-bin-5.6.9.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.10.ebuild
index d1ce6cfb92d7..b52e9f6f7bf8 100644
--- a/app-admin/logstash-bin/logstash-bin-5.6.9.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.6.10.ebuild
@@ -10,7 +10,7 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Tool for managing events and logs"
 HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz"
 
 # source: LICENSE.txt and NOTICE.txt
 LICENSE="Apache-2.0 MIT"
@@ -20,7 +20,6 @@ KEYWORDS="~amd64"
 RESTRICT="strip"
 QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
 
-DEPEND="app-arch/unzip"
 RDEPEND="virtual/jre:1.8"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-admin/logstash-bin/logstash-bin-6.3.1.ebuild b/app-admin/logstash-bin/logstash-bin-6.3.1.ebuild
new file mode 100644
index 000000000000..a5c02ab91f8b
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.3.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+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/packagekit-qt/Manifest b/app-admin/packagekit-qt/Manifest
index 2726c28b29f5..169b28835e60 100644
--- a/app-admin/packagekit-qt/Manifest
+++ b/app-admin/packagekit-qt/Manifest
@@ -1,5 +1,5 @@
 DIST packagekit-qt-1.0.0.tar.gz 53495 BLAKE2B a19ff095ec42bc16e498455323a4046365f6ae144fdfc998dee799df9f4ea022696ab30682316b6417c8a96e80e75db31704e36e43c1a5eddd0a7d86309adada SHA512 4109117a94c47180cff0f073c03820ac39a139b6b3ac88dec82758fffe01271f7a3dae85d94e86a4a1167f4660326adc1d58dc6eb0fd164bd0aefee2e412dad4
 DIST packagekit-qt-1.0.1.tar.gz 53503 BLAKE2B af96899e520f4139d6025746c2a2e7a65c67c2900cdf4fbdb410c12e33f494343d078ec24e7dcdb33749b1d5206b0bf622809827ed64beae162888e48d0aaec0 SHA512 e1291545b496571c00a6a24586c45b7173e85e3704d419af6a0ec47ea5ce256c8ec7e887721b1bf8038cb967ceb82726925800ab06aa784b2bdd560e49be724a
 EBUILD packagekit-qt-1.0.0.ebuild 593 BLAKE2B da4d9255ac6569cae36ba9527248fcef33970d0bbc4e210835aaff48fe65262dfd9da204d80ca9faf2833d3130fe5281eeea67d19e4dffa00a71f80239f9ca17 SHA512 b536a04eefaea32a7931851527c296220934718edb1788fe97df4bbe03179d87ba8a92c4808a658de1a1c92621fce670b9b189bc47aa53c4f2a0781091016688
-EBUILD packagekit-qt-1.0.1.ebuild 595 BLAKE2B b96b636dd409d4bc62570c71e5da02febdbb43288ac24e56f7967bb431079669e7710ea9d3c98822b2899c311829e10ff06293289ebac8ce152843a42a0060ca SHA512 2df4c524a82ca80ecedb5905d63925a70a56007bfeade0977ee4e85648d6897a2a061a8916e5efb6bbd8821c1c8c80784a093afca7f128e0df6245df0053a637
+EBUILD packagekit-qt-1.0.1.ebuild 593 BLAKE2B da4d9255ac6569cae36ba9527248fcef33970d0bbc4e210835aaff48fe65262dfd9da204d80ca9faf2833d3130fe5281eeea67d19e4dffa00a71f80239f9ca17 SHA512 b536a04eefaea32a7931851527c296220934718edb1788fe97df4bbe03179d87ba8a92c4808a658de1a1c92621fce670b9b189bc47aa53c4f2a0781091016688
 MISC metadata.xml 443 BLAKE2B 83c6d5495baf3a9909dbb0ea06f912b92f6faf6f48e6f1da7610a16cca3770c097516a748b44fc0aef99985929e16b7dc20de131bf5404bfd72895acca56f04b SHA512 f63f424329b0ffeac0dcfb50841e94644bd3a44852bebd0834fc36bedbbe4bbbb13bfdfd46e065ca3ddd9cffac1ba86590310267939c486f108913db84e1d093
diff --git a/app-admin/packagekit-qt/packagekit-qt-1.0.1.ebuild b/app-admin/packagekit-qt/packagekit-qt-1.0.1.ebuild
index 5306a1ae4e73..8e125d096722 100644
--- a/app-admin/packagekit-qt/packagekit-qt-1.0.1.ebuild
+++ b/app-admin/packagekit-qt/packagekit-qt-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index d77642cd8165..348f26b5f767 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,5 +1,6 @@
 AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb79454c18b471ab62134074765c313be5633e5fc8d1d9105a51d4dc648e3e08f200487ea62e3b9cd4e4a1 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659
 DIST password-store-1.7.2.tar.xz 63620 BLAKE2B a1fe0b7ee1fdb94d2b76773653462d14c07c8fb239ffbcae210cc3c9c829fc5c0bd0bf85d8d44343a0cec50aae953b13a70d67aa7c94abf6c02f84bfd0d7c4ff SHA512 e6719a7125af6ecd80fdbeb38b4e2e89e7358ff16e18739d68a04b72dfdf860294b54f7ec0ec9676a62d2e270db8f54784a357c82217a478694472f8136e3657
+EBUILD pass-1.7.2-r1.ebuild 2158 BLAKE2B 5b975d3e64603dc81e5e899497c6eeaa27e8094cc3ff99895c5134b583cfe676f2e580a4a084f38f83c12fb3f4b1ca7ea73f2f84208e0db281578eb10b1d60de SHA512 e3c0d625d055b28f29f8a95a863b0b35be85bf7c847e117a54ffd992eff7aa890bd4c25ba9ef24caec81e7c750051a5a792194ee970fb31bded317d2c2db6d9f
 EBUILD pass-1.7.2.ebuild 2056 BLAKE2B 45beac312a1acc149c67dac9801377f6722f5eff67a834e84e1a44fd5c7687a9f0c4f7e69fdca21b9cc070018ff2bf4e7dca1827222ce5261e5ed451c567b531 SHA512 27c994e62a3917be3ab836bff56e380cc3573a87ae62fabd8deba8c7e5b9b195812677799f378ff1290c39ef92e22922082761da59f7f24176fbcd811c73f918
 EBUILD pass-9999.ebuild 1960 BLAKE2B e06b86833158fb55e9656a1bbc2168bbdfb0cc1fa48924437e2a05b81dc79c0f110cc2edf664610b43b29cb67c4563db568bbbf3cb6edd7f135b5db0d027751f SHA512 b170aaa7a41a628684735cd24994f40a95abd8e7c1ffa9bd52d381f4d94be246c7465cb617404eb61bc6221fede56f43dc76f18517329b83d00c0ebff02e4580
 MISC metadata.xml 881 BLAKE2B 59fee6aeadb16d050eeaedc6d5081963e3ffa8316ddd00afb67661d721fa60b80483c16348e0c3d6c20fdb6513fd5840552c3a95724b619e07122d8755c4e7c1 SHA512 49df1e24751818d46a0c23fcdc9e41d965dca29f9964f7d142e4dba9b076b472c860d9b3eafc15b04a983f49d2cd78eb6b529742469549209c7e4160a15f1323
diff --git a/app-admin/pass/pass-1.7.2-r1.ebuild b/app-admin/pass/pass-1.7.2-r1.ebuild
new file mode 100644
index 000000000000..370114ac6312
--- /dev/null
+++ b/app-admin/pass/pass-1.7.2-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 elisp-common
+
+DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
+HOMEPAGE="https://www.passwordstore.org/"
+SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
+
+RDEPEND="
+	app-crypt/gnupg
+	media-gfx/qrencode
+	>=app-text/tree-1.7.0
+	git? ( dev-vcs/git )
+	X? ( x11-misc/xclip )
+	elibc_Darwin? ( app-misc/getopt )
+	zsh-completion? ( app-shells/gentoo-zsh-completions )
+	fish-completion? ( app-shells/fish )
+	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
+	emacs? ( virtual/emacs >=app-emacs/f-0.11.0 >=app-emacs/s-1.9.0 >=app-emacs/with-editor-2.5.11 )
+"
+
+S="${WORKDIR}/password-store-${PV}"
+
+src_prepare() {
+	default
+
+	use elibc_Darwin || return
+	# use coreutils'
+	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
+	# host getopt isn't cool, and we aren't brew (rip out brew reference)
+	sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
+	# make sure we can find "mount"
+	sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
+}
+
+src_compile() {
+	use emacs && elisp-compile contrib/emacs/*.el
+}
+
+src_install() {
+	emake install \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		BASHCOMPDIR="$(get_bashcompdir)" \
+		WITH_BASHCOMP=yes \
+		WITH_ZSHCOMP=$(usex zsh-completion) \
+		WITH_FISHCOMP=$(usex fish-completion)
+	use dmenu && dobin contrib/dmenu/passmenu
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.{el,elc}
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+	fi
+	if use importers; then
+		exeinto /usr/share/${PN}/importers
+		doexe contrib/importers/*
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use importers; then
+		einfo "To import passwords from other password managers, you may use the"
+		einfo "various importer scripts found in:"
+		einfo "    ${EROOT%/}/usr/share/${PN}/importers/"
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-admin/prelude-manager/Manifest b/app-admin/prelude-manager/Manifest
index dbb263404759..8f0acc669b26 100644
--- a/app-admin/prelude-manager/Manifest
+++ b/app-admin/prelude-manager/Manifest
@@ -8,7 +8,9 @@ AUX prelude-manager.service 398 BLAKE2B b409fd283baa3d85c0b25149e2912483e29f0903
 DIST prelude-manager-3.0.0.tar.gz 1286459 BLAKE2B 0909b0d7501909de51cd580b6ce22a66b1900a3b5b7376d3aeb4136bf41128ab766a025d69d33c414a9623dabb0de144e2f21190c3c3cccb9c067db359aab1bd SHA512 4c16a353495179265375686ce9592c8cd044b4255060b78286466bd25f9b38634233c95af058e1c0b81e1b574ec9ada5b2db92d6d1f5594dfcddce572fd0fd67
 DIST prelude-manager-3.1.0.tar.gz 1301799 BLAKE2B 938937d2752ad47630b36c3a546f2493a964fde01e3df694e4a9fbddfa1efc3ddc9d864f8c1169e8ae8f3b414c4cd1983bbbd015f192ee065e2531489a23ba8b SHA512 75df43f9db81d2b6bd87c649eda7bb30ee10510576473bea83cb5cce44f576e9d69d775b5d76dcea8841eee61730a97cdae51e6c8b3a426d2442c5183d0e0d10
 DIST prelude-manager-4.0.0.tar.gz 1353116 BLAKE2B 20aaa28797a67fd310807735bb08f0c21c3bd95950598a86c45144ee2474785aef0c7d569732c817509ae8ae52ffce5f43f3c071931f2960578681f91a8c9504 SHA512 793ed37c71eb4884cbbb49b11c7388ee291a35252255458ceadb4ce10d1392e8bad423f95e31bff4550a9cf1d04139e43729352554fd847048b6c8d14f813a8a
+DIST prelude-manager-4.1.1.tar.gz 1415847 BLAKE2B 7cea7209a680a38cf597a9678f3ac9a31b00187e4597e1aeed91bbe57a55981279e8399ee8c90a044e40873e595ca648736fa79090420d9bcd72b82588f7bb5e SHA512 4e9d09b56eb7ec55144caa06a04e458bf0462d8c0064a34aac5aa0fb96a30fbefe5a4956185b606ec58fc410e4cbcac8721e521b3396303b3bff88808042a966
 EBUILD prelude-manager-3.0.0.ebuild 1349 BLAKE2B 1e57326c02b41d39ed7cf9ef7372dffd8ed0357e1d390b73e2f143460c2d7dc907bd4d9086c351b5b69f4a9f5a7d18890a3de8774a427691e56d660bd5a21dac SHA512 404cd27a552a6eb9bc8ae005ddacd9734f26f52897f7d9a21568b7cb2ba1cfe82a5a9cda32f591043c65124faf5322d0dcff95b1b0cca5cb60c75331c3e8b322
 EBUILD prelude-manager-3.1.0.ebuild 1235 BLAKE2B 131b01c6315a1bf7fc411dde32dede5278a7d8da4e1dc62f9df106b94669df5d0e7ddcc1d367be3a5979e89c2aa71b2bc1b01eef9f9512a6b7d5654b3d965ea0 SHA512 280a181934c56049823297b749b4b0de5f1f819e1c057f910bd208cbb5ebb8928a17d70969e32768ac7e6be624e314607f1b11fdba8daa375a12df443dc1a28a
 EBUILD prelude-manager-4.0.0.ebuild 1253 BLAKE2B 8d9e17b92b16090bb437fe53389598128f249e2b4f16c8da6724f370df5bab1aea34c1824b024839bc0f3a573a56d19bc54c31cdf0744b54c581fcdefeb76d97 SHA512 3a0d79d24de4d97ba73be7cdf62f4d2d158225cdf35945e51de3854b7465a23eddc9315204a303c833e73a8965826ea18cf09951aa79697bfdc9523f0149025f
+EBUILD prelude-manager-4.1.1.ebuild 1278 BLAKE2B 3538573a5a36d1431f4c9c593422dcc9e9a594505021b8a1188c91a23a5de92e22185447b12aa7bdb33f55697ed2badc959837e5f6298ee9c0e51db8a49d16f7 SHA512 2bbe1ea323fde66ca5aee4ced72631cef58b345c852c09c5e9e21bda7d1cd8b71b460006ebc15b93e69c4128a7577b0abc4434248235ec4fff3e3b7f148ee8c8
 MISC metadata.xml 1037 BLAKE2B 2e4a2d969eac348834aa8f78859b7b4456585ab11985c6083640a6cc0d32269952a78063b5aa11c6228d9c67e04b50b58247b5c2787f7d484390721af0de4ef5 SHA512 d18f203c6feadc632fee701cc7563c60d10febf11873fd9a6498cdaa47c2fa44b1a7ca50d5f6af99f3cc678fb88442c8e71d7eb0185b9972585c2d52371d9c34
diff --git a/app-admin/prelude-manager/prelude-manager-4.1.1.ebuild b/app-admin/prelude-manager/prelude-manager-4.1.1.ebuild
new file mode 100644
index 000000000000..58cb583e19ac
--- /dev/null
+++ b/app-admin/prelude-manager/prelude-manager-4.1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd
+
+DESCRIPTION="Bus communication for all Prelude modules"
+HOMEPAGE="https://www.prelude-siem.org"
+SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbx geoip tcpwrapper xml"
+
+RDEPEND="net-libs/gnutls:=
+	~dev-libs/libprelude-4.1.0
+	dbx? ( ~dev-libs/libpreludedb-4.1.0 )
+	geoip? ( dev-libs/libmaxminddb )
+	tcpwrapper? ( sys-apps/tcp-wrappers )
+	xml? ( dev-libs/libxml2 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-run.patch"
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		$(use_with dbx libpreludedb-prefix)
+		$(use_enable geoip libmaxminddb)
+		$(use_with tcpwrapper libwrap)
+		$(usex xml '' '--without-xml-prefix')
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	rm -rv "${ED%/}/run" || die "rm failed"
+	keepdir /var/spool/prelude-manager{,/failover,/scheduler}
+
+	find "${D}" -name '*.la' -delete || die
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+}
diff --git a/app-admin/profile-cleaner/Manifest b/app-admin/profile-cleaner/Manifest
index ed36bbc1a72d..08aaa710aaa9 100644
--- a/app-admin/profile-cleaner/Manifest
+++ b/app-admin/profile-cleaner/Manifest
@@ -1,3 +1,3 @@
 DIST profile-cleaner-2.36.tar.gz 7757 BLAKE2B 32f7b690763f83771048b00dc102da1ca5cfc3d29c7bb3d36eff14db53bf7692b8ac4867d55e7313317635a09c59a959291835f4b614c042227e976b23043b78 SHA512 c56e92f816276d55e298dfac529e8195cf05f1a441aae40d25665d1db6d03b5ca741b99136e9f6fc93eabaa56dfcd8f2856a2dd5c37728c72befc756ff28ac75
 EBUILD profile-cleaner-2.36.ebuild 501 BLAKE2B afcfbe09e3dfbd7bb960b05cf57eb7194c742ffb01e41fc8eddfc1ff77e49919421e78793455b4953980fb818c7d57a76189fa4baf20fbf28a2d9a9a7a05d84e SHA512 de4e1b361be03eaa01f7b6512269d957f7e5789ad4ab3ce6ec957e886c8cd5614de4f2902a9bc41cf166e7294f44c141ee457490814429846b088afcf0980287
-MISC metadata.xml 518 BLAKE2B f74e9840fabe821487af53f3c3f0a9a502afb245fb40ee147758848dfbaede2bc5b18fbef8bcbf850f16b70599dac31e52b486c81b40509b0d780177625d4c74 SHA512 7d1f584b8e989fd94abaea851c83c7734eb654f1d98e950724a6f72b50b8a1c7e0167ba99067dcfdec32a9ca5036bbdde7c46256214bf395de70a4d6b79f974f
+MISC metadata.xml 406 BLAKE2B d06acad3521a202f84412f908877500bd52370f32d4071b988434db19b721b5af35ba8a2a18a8a99b0d1ce8432c2e9c6822c46b1a32d74bfd2b2d4707f3b617f SHA512 5d12781b75ec0ee0392e8668b5049ed28a85a40815477d6953d7e407ee98cb41969ffd917c0b12eab02ced6055927052b9224fa4b032d8c98d4fc04f67a9b6d7
diff --git a/app-admin/profile-cleaner/metadata.xml b/app-admin/profile-cleaner/metadata.xml
index 739dde6ad582..47ec1cf6d615 100644
--- a/app-admin/profile-cleaner/metadata.xml
+++ b/app-admin/profile-cleaner/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>fdsfgs@krutt.org</email>
-		<name>soredake</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
 	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/graysky2/profile-cleaner/issues</bugs-to>
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index b0c982f2fb85..941439876fdc 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -10,7 +10,10 @@ DIST puppet-agent_5.5.1-1stretch_amd64.deb 17325604 BLAKE2B 1fab815d5d238cb6a05d
 DIST puppet-agent_5.5.1-1stretch_i386.deb 18063690 BLAKE2B ea7c7068e57da1249c1b1c7232e1af673840b0c8c7e5795574ffcb1861c68683ac9f21f8f4216272130b12a61bb8b324e49d6bf7f0c3d314857fd2591a7ad6ff SHA512 1a64616191a5143b150fe1d145ea786233ab763e87d5fe86bd1b3306fa73bab60d2f3d5c0bb7fcb6fe7c700a47a4c94c72eef1509732b18a5caf0fcd7f060602
 DIST puppet-agent_5.5.3-1stretch_amd64.deb 17272112 BLAKE2B 5e052f837184b1d1dd5965ccb18e3a52dc88ea6ba85c0c3c5222ffe50e32e0a72a6f14274f5dd6c1bd63b3a160affa8a6b3399ac75e27d9cc2c267a1e1c0e89d SHA512 1629b3535b900081676647f64c17e3c0d23df38525d90d5f3993877d0749d18cf55f72fb20c47e20a63d18c2c7ad95cc0f179449c386ce3b8ec8a6d0f40243e7
 DIST puppet-agent_5.5.3-1stretch_i386.deb 18189670 BLAKE2B a8791926a5ce08edad363670ab5269fcef208c3137db4126f33295fd7fdd447620578445eb0a9396e263fed8612981581cef0c5f6d3e51634722c01c79e2c9dc SHA512 83a1f472c4af97a48703ca61a00740fc7806155732bd488d3f9d757f969dca0a19cec014dad0bb5e6d8b5384d32c2d906ad0e8438efeeae5fdd39524cc11f6f8
+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
 EBUILD puppet-agent-1.10.12.ebuild 3479 BLAKE2B 6db65113a8203216068167672257270fefdcad43a897c6b25400be1949beb573b335feca32c268223ab288e340ae2edf53e4fc39a445d1c9bfc5ad37f9c7340a SHA512 1be819f7fb14d2d3aa47d23919feba678445cd605fe31f43b090bfbe3ab9a3ee4db7868553f7cf3a5c85b49d5cca0caa2580e1347ec278df91fe8495df42873c
 EBUILD puppet-agent-5.5.1.ebuild 2481 BLAKE2B 763dc1a03051af2be4472342dcfad9304649f7fde6d83889c93cae0b7b7521d6c28cf17cf8227f553a0a409a705678070b8e83161871f5d116302803868c92d2 SHA512 b1811874ca9c554896a16c8f134a8b4b84217192924f999a5a0c9d72630776c50de5f0ef16be82559e6f97548332a23ca0e68618b64bdc623bc27745c70229a0
 EBUILD puppet-agent-5.5.3.ebuild 2481 BLAKE2B 763dc1a03051af2be4472342dcfad9304649f7fde6d83889c93cae0b7b7521d6c28cf17cf8227f553a0a409a705678070b8e83161871f5d116302803868c92d2 SHA512 b1811874ca9c554896a16c8f134a8b4b84217192924f999a5a0c9d72630776c50de5f0ef16be82559e6f97548332a23ca0e68618b64bdc623bc27745c70229a0
+EBUILD puppet-agent-5.5.4.ebuild 2483 BLAKE2B 4953d549f412de42e77074bff4e7cd33f2df77f30a70ac84987a4ef5a1c39ff0ca45355ec8c3dc90e203b65ac4c71714c7e5cff5caea96dc7766673ae1426c3f SHA512 23dae168a44f11d9aed9c5be09d08660803510979479f656464de4856dc76f50626298d9fcec8186d8413f21592d161bd8854cde0b8668612fb9300936aecc15
 MISC metadata.xml 502 BLAKE2B 9eaaec32ba54988999831d4d873dff6c525b42ede2da3cc9a5b67359299233f2ffdafa04a949df6aa58d764e36beaf8ce64c053a306f6e055a245b207e8f2aaa SHA512 aedf4322173910c202b105d904e4528c6b6bb949fc05ed95c4a8d9a74133f5c7391ae30d7675bfa36a3f85880c971aff6e4a57ffdcde57b3b63c02dbed083a95
diff --git a/app-admin/puppet-agent/puppet-agent-5.5.4.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.4.ebuild
new file mode 100644
index 000000000000..5570060df99a
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-5.5.4.ebuild
@@ -0,0 +1,85 @@
+# 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/Manifest b/app-admin/puppet/Manifest
index b71c56b88173..b29c4aa72f58 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -12,8 +12,10 @@ DIST puppet-4.10.11.tar.gz 3022878 BLAKE2B d3eec840bb1c46e0dfbbc9dad598b362049a7
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
 DIST puppet-5.5.1.tar.gz 3035639 BLAKE2B 2930ca9eb928d7c6a69ea76673fc4d002e230bf6dbcd28764e8d5bd504ae11326dc856ed64480e13c9eb1d683ad5e8ef64fc9e217942b59d90c6a0bc98e0197c SHA512 20bf7094193f30cfc7a91244275fc79eef0296036ffbc6bbe405e9ca75123b722be6855c746ef8cd35f80bd7a7308408a9205d064f0f910e11877e4db0ebdabc
 DIST puppet-5.5.2.tar.gz 3036714 BLAKE2B 8be2c2fa7b66a2fd8d413f01afad22f7e0724c31a0a92b777f1b61e2139f14f3284a11cfb52fea8833556208d8bb3e99f20b1ed4fa2816809eaa4b92fa730cd5 SHA512 4995b6b6d1b75d68dd4c8eba37585c0afa88f9c6b78857e837886ea72b373c884182adf8791e0c9f2a5079f22681a40073e512e6b727ecfcaff463c8024cf5db
+DIST puppet-5.5.3.tar.gz 3040000 BLAKE2B d2534da5956806e5280c59e82332f1ffca79e72f73b1abb460f155aac936a5ba1719f18dc5742c85fca365ff6b03a602ca0ceaa04714091045ab2afac1b57823 SHA512 14a711002c64f0598930f64e9e2b81c03daddda750860acb349271c1cc9d04c0d149b14817b200dda26f0ca75c3f79593990ecf28a5cca83220a3f5a16eac34d
 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.1.ebuild 3833 BLAKE2B 1fe39216139f93fc68ae0965596931a4d1ad1114d78353001a710d790a9fbdbe041f14ca3a04e7393c4355da33d3b2501e3e168d306aa0232bdc4fcd2547e134 SHA512 553ed1eea1b8acd1da19be01a7ff7f9d420c9c8b03b38bcdab125f1f02dde6b164caea44019fc3557f8d61ae3f22da925e30dd858402841714d6c17462cff98e
 EBUILD puppet-5.5.2.ebuild 3833 BLAKE2B 8a69323f2c1edf94a9dd384a695e3c2d2ba20fff0956cdda51ed853ca9e730c2c051324d0867baea4f71672337e41ec6c42b504edcdaf3f459d120080b3bea5e SHA512 b66520e6d78a3fe5bc8ae5151074133340db60eb402ac4d6f92f4add28b28b3d8280befc0aa74bb4935c9347e35ec240a6afa1bd67db23b1f15a46ad81b2d8ad
+EBUILD puppet-5.5.3.ebuild 3835 BLAKE2B 98dd8fb348747d1f47439359997cd37d715f3d8eea2e888e6ffa032a3c91c151f140d41827fc2963514d0a485ca3673787a379c7921092614014c9ceb5db6743 SHA512 a52d1c5b5fa1e3be0874495c69fd0b1897b5e6c2ece46410dbaad1c58b59b809db046698bb0e8b973dbe0f57610ce55698346cd29e079ed3ac1ecaab4312ebfe
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-5.5.3.ebuild b/app-admin/puppet/puppet-5.5.3.ebuild
new file mode 100644
index 000000000000..a5bdb1492503
--- /dev/null
+++ b/app-admin/puppet/puppet-5.5.3.ebuild
@@ -0,0 +1,144 @@
+# 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/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 59d7d32aff62..032378481f8b 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.1.tar.gz 25435195 BLAKE2B aed0e6175df0a603ea0aaf792c31b4933d408a4f7a037b557a8acb4b237e4c639a06f954232e049efe4b486d780a3af129c8a6a48833019168cd70f38e5bf403 SHA512 6d0b06f083093394f74e952112c6b388fd6c94452cf2954172dafc5dc42c7a0b45f6a9a7afcb6196f12316e15653943c3faed8a06ba7a7bd75a31db8515e0103
 DIST puppetdb-5.2.2.tar.gz 25436396 BLAKE2B e30d80b7da29c8cf3b00c9cda3d6e0a4c5635b3bb3a4e6d3e2bf284531509828df6d845a0d30b2a7a454ec35ab4879019fc4c68fc3aa8b6a72c3d0896b9e75f7 SHA512 cc598539801bedd4ef0052f50013320be5dc1eaf8098db8898a0759609d6d4e26aa094550bc1a45c041f9fe65ee99b0c00c00586d3cc93003836f1415bd92456
+DIST puppetdb-5.2.4.tar.gz 25438658 BLAKE2B 4e548ed018b57f68c0cc81185579234e17086985733d56030802577ab5fb8106c7c47c603aa3da65ede3e5780c89df8b2dbece12c29aa1b171ceda1de7228f56 SHA512 6979ebccaa1136d19ffd0d67bdbff9c608c649d75b56b4b041d8795fdcedf24c831553c5361f8e144fa01bbac92af88e6548f917ca00eec707d8740a99689059
 EBUILD puppetdb-5.2.1.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
 EBUILD puppetdb-5.2.2.ebuild 2763 BLAKE2B a3aece6216d2a180ea14cb90e7d306720c09ce617e430c1b78241a696153f6d33787ab3d89f466b8635f80889531923d2e7a6305ede45e7b2c83bfa5438eb72a SHA512 34767f94ee58a38a05f975fc3f28b6b851eae1f9e0dab5985d671139319cf3c5df70c1afc2aee34a77c0172b499918aee8d188c290220d4ce2cca2abe91039c2
+EBUILD puppetdb-5.2.4.ebuild 2765 BLAKE2B 9a316933c8e8d0e28eb674c4b5aaa6830a7f1db5aad515d6fd7ac1c649c067d482b367a9fff7e6de0c31bd06b35e915a165a50f9af192ae5440a5cd9cf3207f7 SHA512 19a3c9de354f5c9a88cfe8d6b350878a63b9c0bdc262cf66c9ca2655df3f88a269c78afef7cd89d6f28689989e593ada7221c842e6be1e041a329e37192b57cf
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-5.2.4.ebuild b/app-admin/puppetdb/puppetdb-5.2.4.ebuild
new file mode 100644
index 000000000000..5c45e1c342fd
--- /dev/null
+++ b/app-admin/puppetdb/puppetdb-5.2.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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.7.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 c8819401c43b..5f08f1b6f5b4 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -2,7 +2,9 @@ AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a
 DIST puppetserver-5.3.0.tar.gz 66913938 BLAKE2B ed24e0c5a8ad14c2c63f7a88deca6a020121fa53890a68b83f3608081c6480540056d483a00df5c1b0d5a008216f27b5d72efa54d885c55f09b1f40441469b39 SHA512 5f08f0adba257947ec61eae91b7a417e9055510e278e444ce7c88358163b9bb00f2bf02580ace6064e508c43f8b60ca21d12aa3d1525814754e6259791b34bc5
 DIST puppetserver-5.3.1.tar.gz 67239406 BLAKE2B 0aca973ad039d51877926459f935e48cb9ee6ed60792ca67af3a65800fc8fd9de8e6cadd3edc83ac83385f8dfba4f0cd83c9a6db665578f3d1d235ccc00e6547 SHA512 3d618c351299f4cc038682ab43eb4686bd1baf8f88390c8ac41eb3be9fdf8a7a3a501f0ab8713e45bee0ed02d7a9fd1ed1b7252ebb640ee52aa5da638f0b2ce2
 DIST puppetserver-5.3.3.tar.gz 67238194 BLAKE2B 0a0b235f26ab15c8f461f6663c26531d3ae469c4467ae33caa98f70d94a02fb89eb0399405be6b1f65f65b2fe4add7a24129f367ae1ab028189d250b087d0915 SHA512 dced3a7b7b3acb8966e4eb6f35aa82c84d0bba81487fa0cffc60fa0751b5d5c633be925471145a3e21b8f74bcffaa74f02310644ecc8bf8ebef0222d967fa86a
+DIST puppetserver-5.3.4.tar.gz 67238476 BLAKE2B a92bdf77ffefc7c65c5cfd39431aa6b485bd92c617c4e32a281bfa431fbb428209b8834ef464a521e00d07f3ce0a443fe8a187f3a235c3200531533a1efa242d SHA512 edfa121d64fdbca9a8eef201fe6744e2694141deb318bec64c942bb1ebe6ea61ba1aaa15aee4f4e59913f79247b1c833c6633d3ff121eee836a83ccbaaece900
 EBUILD puppetserver-5.3.0.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
 EBUILD puppetserver-5.3.1.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
 EBUILD puppetserver-5.3.3.ebuild 4888 BLAKE2B 24f004c85c5726d79a4d8ad3563b03560d59f4b36380d9ade3954860cc36eb2d3070d4a491d7f6a01e9a5c09ff4d77c5220117b8c9b5119192db3a657dabcdd7 SHA512 281a4673302b36b1073df542be68a8dccd6bf682a9cd68aecfe63d185d9c7eda17ec79d627fb1790ebf0d85a93d92132f6eb5a850aee28995ddaf7c851c81609
+EBUILD puppetserver-5.3.4.ebuild 4890 BLAKE2B 53593fd7c160edd1ec9d8802cdd93dcb00b050721071ab09e41c385f791a3f5a59652e6336d41ef58b0a2a63dada18cd7fa85389a3b7a662f87a7e8c7e3635c3 SHA512 8f6e778ab9e799dc7b1211b4639e32d95e1d693938446a203e1824132e3132788a5d60e884f7a3851cdeb062e3bd0de84f7e8c9ba1fb377bec682e214bffac2e
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-5.3.4.ebuild b/app-admin/puppetserver/puppetserver-5.3.4.ebuild
new file mode 100644
index 000000000000..2b6f7873b99e
--- /dev/null
+++ b/app-admin/puppetserver/puppetserver-5.3.4.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib systemd tmpfiles user
+
+DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
+HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="puppetdb"
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND+="
+		>=virtual/jdk-1.8.0
+		app-admin/puppet-agent[puppetdb?]"
+DEPEND+=""
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
+}
+
+src_prepare() {
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
+	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
+	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
+	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
+	sed -i 's/var\/run/run/g' install.sh || die
+	default
+}
+
+src_compile() {
+		einfo "not compiling"
+}
+
+src_install() {
+	insinto /opt/puppetlabs/server/apps/puppetserver
+	insopts -m0774
+	doins ext/ezbake-functions.sh
+	insopts -m0644
+	doins ext/ezbake.manifest
+	doins puppet-server-release.jar
+	doins jruby-9k.jar
+	doins jruby-1_7.jar
+	insinto /etc/puppetlabs/puppetserver
+	doins ext/config/logback.xml
+	doins ext/config/request-logging.xml
+	insinto /etc/puppetlabs/puppetserver/services.d
+	doins ext/system-config/services.d/bootstrap.cfg
+	doins ext/config/services.d/ca.cfg
+	insinto /etc/puppetlabs/puppetserver/conf.d
+	doins ext/config/conf.d/puppetserver.conf
+	doins ext/config/conf.d/auth.conf
+	doins ext/config/conf.d/global.conf
+	doins ext/config/conf.d/web-routes.conf
+	doins ext/config/conf.d/metrics.conf
+	doins ext/config/conf.d/webserver.conf
+	insopts -m0755
+	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
+	doins install.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
+	doins ext/cli/irb
+	doins ext/cli/foreground
+	doins ext/cli/gem
+	doins ext/cli/ruby
+	doins ext/cli/reload
+	doins ext/cli/start
+	doins ext/cli/stop
+	insinto /opt/puppetlabs/server/apps/puppetserver/cli
+	doins ext/cli_defaults/cli-defaults.sh
+	insinto /opt/puppetlabs/server/apps/puppetserver/bin
+	doins ext/bin/puppetserver
+	insopts -m0644
+	dodir /opt/puppetlabs/server/bin
+	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
+	dodir /opt/puppetlabs/bin
+	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
+	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
+	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
+	# other sys stuff
+	dodir /etc/puppetlabs/code
+	# needed for systemd
+	dodir /var/log/puppetlabs/puppetserver
+	dodir /etc/puppetlabs/puppet/ssl
+	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
+	fperms -R 771 /etc/puppetlabs/puppet/ssl
+	# systemd type things
+	insinto /etc/systemd/system/puppetserver.service.d/
+	systemd_dounit ext/redhat/puppetserver.service
+	insinto /etc/default
+	newins ext/default puppetserver
+	# normal init type tasks
+	dosym ../default/puppetserver /etc/conf.d/puppetserver
+	newinitd "${FILESDIR}/puppetserver.init" puppetserver
+	# misc
+	insinto /etc/logrotate.d
+	newins ext/puppetserver.logrotate.conf puppetserver
+	# cleanup
+	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
+	fowners -R puppet:puppet /opt/puppetlabs/server/data
+	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
+	fperms -R 700 /var/log/puppetlabs/puppetserver
+	insinto /opt/puppetlabs/server/data
+	newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt
+	newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
+}
+
+pkg_postinst() {
+	elog "to install you may want to run the following:"
+	elog
+	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
+	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
+	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
+	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
+	elog "puppet config set --section master codedir /etc/puppetlabs/code"
+	elog
+	elog "# install puppetserver gems"
+	elog "cd /opt/puppetlabs/server/apps/puppetserver"
+	elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
+	elog "while read LINE"
+	elog "do"
+	elog "	java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
+	elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
+}
diff --git a/app-admin/qtpass/Manifest b/app-admin/qtpass/Manifest
index 8a474ef73fdc..807f5a96d7b8 100644
--- a/app-admin/qtpass/Manifest
+++ b/app-admin/qtpass/Manifest
@@ -1,7 +1,3 @@
-DIST qtpass-1.2.1.tar.gz 361147 BLAKE2B f46ce4362d4d3e0c0b0a425e5a40cf013181b899d5b1a2efc03cc5c4a3eca2d3ce1cdca78fdb95e8fecae23ffe56c01dbe65c9d07e2fff48934e995a710aac40 SHA512 3621a46aab5db5a41e80aea10bc6baf662510bcb249a1f56d33492aa66c824d9f018164f2d6a70256a7b3d59a9b73c4c8459b5d3fbe19886a607f8f0dc7410c1
-DIST qtpass-1.2.2.tar.gz 366601 BLAKE2B 7b06926465e7d7cbb837cf87b47a89b114b9ae9c508aa558695744c84a00a58a8922155eda3f91a6350354668b381381be757db07f201798a2ee25685e034871 SHA512 cb480357b161573054b752af25f20757057de5c5b2e55619e3fa594c5d9b63c7036b72c0ae7735f8ec197ac8aa43b7fdfbc836b29fbe4c85de8dc5d93ce7bbd2
 DIST qtpass-1.2.3.tar.gz 369412 BLAKE2B 55e8f5e7967b264b20aa044979620631f319e2ff38edcc4e1390ab5d9f35e1e90ff8ff00c94cd35a9b5c05a5ccd8d8fdfc97214e9bd9f564bae1bd80efe0f224 SHA512 d6c3af5b92042a38afecb40689d41c08105dd2a39555f78ebc585a6db6dd65cd8fd6dc637542dd3b5b4ce18f1a852768ffa298b5a461a2d0e4ef4950c58d1649
-EBUILD qtpass-1.2.1.ebuild 1016 BLAKE2B 3ee5b9d94395092a92f71bf20f2392c8a4cbc36fbefd7a61ec8568913b1c52acf3bc7f4ba5ee1d347de187ae4e5dd8b031c58163987a2dd444ac59650e65f49c SHA512 2b12c48a02a6bd43fb3e105d26390cbb7fca23999634f04f4cf5f02a06aa7a583f9e120f1c9ee32f84982c99edb0bbb6832ccec6cede8c76a6536ea3ffcd2e26
-EBUILD qtpass-1.2.2.ebuild 1164 BLAKE2B 400440859cb33c5951b3a549e9261f256d89f83d6a214adb9565c7fbc234b44de93d8109ec410b5f1cc6ff92253efe4b5170ed4ad1c3f516f6fa11bcbc3f6d26 SHA512 cc500df9101cffe40fdfaa4f91a461c2ab699f4643e73692399add2d0b6a5bad1caeac8ba9f506caaee384cc1df2370c0f893b321e7c0a57898c9ed7dcae54d8
-EBUILD qtpass-1.2.3.ebuild 1201 BLAKE2B bfc8f9e4c0e83a656fc4cf94e4b6c759e50b1d88016459e46853f0dacbf7ac0d2af0e2f1e9c9b9ce38f9e5755535c664d13e3f4434e511bbf7536ee1a17e037d SHA512 695b4362cb5138c965e142c58f08f91f2e613bfb0dc0e9d63fb892f9376a60d094e5e34afae727d76b9a871ef9bd73a5829b33c4f6708acfb521894344316c7d
+EBUILD qtpass-1.2.3.ebuild 1169 BLAKE2B 28e24f3651ef3abebd613d7e464e3d2ce2ee0fc759cd133144158fa7659699925cec08713848d34df52e28529287ab76a8fdc3a08ed630ea004cf02b9cef498d SHA512 f738908611196d83ffdaea3ff2360a97d2e7d2be46a9a7cffb3025bffba2b9127a331400b58307806819ec1728a39fab57cae7671a2d5baf2a9fea126a899d6e
 MISC metadata.xml 571 BLAKE2B 1fec9b040ae2b49beec1b99abd0853f631275d3c7f22584a42b503d008ff9403edcd451194881d09224ab0d41ff0598dea2dc7a403aea0227adc4909d02deaad SHA512 937b219855427d7423067037b05ea3b7f19c01eca32fa38e3d6bad9354da039bf2be63a6450f0ebd71fcbd7b6b15b8ca1f993b89391597b1bfb7e3db3d3c04ae
diff --git a/app-admin/qtpass/qtpass-1.2.1.ebuild b/app-admin/qtpass/qtpass-1.2.1.ebuild
deleted file mode 100644
index dc949c150fc4..000000000000
--- a/app-admin/qtpass/qtpass-1.2.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="QtPass-${PV}"
-
-inherit qmake-utils desktop
-
-DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
-HOMEPAGE="https://qtpass.org/"
-SRC_URI="https://github.com/IJHack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DOCS=( FAQ.md README.md CONTRIBUTING.md )
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="app-admin/pass
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[xcb]
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	net-misc/x11-ssh-askpass"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-src_prepare() {
-	default
-
-	sed -i 's/SUBDIRS += src tests main/SUBDIRS += src main/' "${S}"/qtpass.pro || die
-	sed -i '/main\.depends = tests/d' "${S}"/qtpass.pro || die
-}
-src_configure() {
-	eqmake5 PREFIX="${D}"/usr
-}
-
-src_install() {
-	default
-
-	doman ${PN}.1
-
-	insinto /usr/share/applications
-	doins "${PN}.desktop"
-
-	newicon artwork/icon.svg "${PN}-icon.svg"
-}
diff --git a/app-admin/qtpass/qtpass-1.2.2.ebuild b/app-admin/qtpass/qtpass-1.2.2.ebuild
deleted file mode 100644
index 044673645d98..000000000000
--- a/app-admin/qtpass/qtpass-1.2.2.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
-
-MY_P="QtPass-${PV}"
-inherit desktop qmake-utils
-
-DESCRIPTION="multi-platform GUI for pass, the standard unix password manager"
-HOMEPAGE="https://qtpass.org/"
-SRC_URI="https://github.com/IJHack/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="app-admin/pass
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5[xcb]
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	net-misc/x11-ssh-askpass"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qtsvg:5
-	test? ( dev-qt/qttest:5 )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( {CHANGELOG,CONTRIBUTING,FAQ,README}.md )
-
-src_prepare() {
-	default
-
-	if ! use test ; then
-		sed -i '/SUBDIRS += src /s/tests //' \
-			qtpass.pro || die "sed for qtpass.pro failed"
-	fi
-}
-
-src_configure() {
-	eqmake5 PREFIX="${D}"/usr
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/"${PN}"/translations
-	doins localization/*.qm
-
-	doman "${PN}".1
-	insinto /usr/share/applications
-	doins "${PN}".desktop
-	newicon artwork/icon.png "${PN}"-icon.png
-	insinto /usr/share/appdata
-	doins qtpass.appdata.xml
-}
diff --git a/app-admin/qtpass/qtpass-1.2.3.ebuild b/app-admin/qtpass/qtpass-1.2.3.ebuild
index c51253b0847f..287f540e6f53 100644
--- a/app-admin/qtpass/qtpass-1.2.3.ebuild
+++ b/app-admin/qtpass/qtpass-1.2.3.ebuild
@@ -55,8 +55,7 @@ src_install() {
 	doins localization/*.qm
 
 	doman "${PN}".1
-	insinto /usr/share/applications
-	doins "${PN}".desktop
+	domenu "${PN}".desktop
 	newicon artwork/icon.png "${PN}"-icon.png
 	insinto /usr/share/appdata
 	doins qtpass.appdata.xml
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 065ec9818416..20509bf2c236 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -1,6 +1,3 @@
-DIST rasdaemon-0.6.0.tar.bz2 361721 BLAKE2B af992c810024df4f553727b4aff4f4f1d41cb3f7e458ac91916ccbac6815b6ade697f0c49bf1e072205c7f872cfc9c2f7223fe0d3f090064ffaa0bab002d4f67 SHA512 cb363ee9968dab10951077edea6558adc235c2ba1a57294ccf2d483c49af3366bcec0a5857fe2b475a5407de850f706c44bfe4d8a80bcfb53b1c7e2d101ba72f
 DIST rasdaemon-0.6.1.tar.bz2 363201 BLAKE2B bdc7ec3c2e7e4b2fee02dddc55b5afd82df64717f45da15dbfd5fee87721b80ac425af5806ee7462cad29c6ab2953a2e649c4b1e455983d8821a1f633d76c85d SHA512 a221a7ea0e4555befbf8acb9d4ce22d5cc7861a0da458111a24905fa06be0e8f3b18d8de5334310a423657febc0532d2705236de89cb1788302bf487ede29f60
-EBUILD rasdaemon-0.6.0-r1.ebuild 906 BLAKE2B 90cff87350e41d02fec42bcd123023d974e5cc08a79c5e1a8b87516c5b4d8f5b86f280d7891097dbc57d0d94aa227d95b8391b2d300321b902f13794a124c88e SHA512 975cd7e0555bcf6a9c685d3822a83e70b20bc0085a552556f0304470c6a1c5e78381182d45d9d50c4b59266aaff44719632f09e0ab1c264a90492c9ed837056f
-EBUILD rasdaemon-0.6.0.ebuild 723 BLAKE2B 03c921e0ef2eb1047410c4c15299a1141325fa00ed6f3145197189baa9b4461527718e14b258da0ad4ab5b0fc4abeec0ecaf50ebdfb83bcdb507e2afed59346c SHA512 492b51108bd5349a88e71b78c76125ed2ba1c020d8e96eef161d763ad798238bc8e03dd852ccb6c266acb5255c32599754c4c917f7a000e7d2257594b48128c4
-EBUILD rasdaemon-0.6.1.ebuild 910 BLAKE2B 0fc242674ee2d56ca5cc2aa99443c50fa04d28aac5ed2a07dba275b88b2aee63d26af63306ff799367e7ed24eb1fc682cdb2207b161cf08a8502bed1f5e7482a SHA512 a783ad0757afa54967ac51a94841f608a2b51e243f823c3be0afb87a08afc5188b5c3949da89ed2be8cd28a8b5ae2d28264c942711b02e82f9119b6ad723fdea
+EBUILD rasdaemon-0.6.1-r1.ebuild 931 BLAKE2B fe6abb4a500f9890dbdcb06a457d7a33ab8b138fa22af2d4046ff133a9205a8f75c6e07273e4fb7eeadf3bf8a974e8fcea39e29c4b6d080a627d6619a4c2e5fa SHA512 02871f282b1b7a4f4601293974d7fbccc41ee7c90a590e6d349db20040bd1cbebb562c56acf8c0cbad37dd6e4e04ac0140f2d34e70f208b611b1cb73873a0f67
 MISC metadata.xml 871 BLAKE2B c9b484c2fd3019681f9c335fc046c7718c35bcafd9fa46f59328c68fb4404571818b861cb938bcb00fa08a164688a58735d7db27e73120597cd114a3a39acaba SHA512 1815bc3a92340071b40de8129441bbf55fee7edbec94f5337d6a9b42311cc3c1d898598d0756b60b56d804629700a2c0109362933acf5442a74097e752b24935
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.0-r1.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.0-r1.ebuild
deleted file mode 100644
index aa124a97770d..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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
-"
-
-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
-}
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.0.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.0.ebuild
deleted file mode 100644
index 7bb3e34c6e73..000000000000
--- a/app-admin/rasdaemon/rasdaemon-0.6.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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
-"
-
-src_configure() {
-	econf --enable-mce \
-		--enable-aer \
-		--enable-sqlite3 \
-		--enable-extlog \
-		--enable-abrt-report \
-		--enable-non-standard \
-		--enable-hisi-ns-decode \
-		--enable-arm
-}
-
-src_install() {
-	default
-	systemd_dounit misc/*.service
-}
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.1.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.1-r1.ebuild
index fd97b294f4e1..18c68185be3b 100644
--- a/app-admin/rasdaemon/rasdaemon-0.6.1.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.6.1-r1.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	sys-devel/gettext
 	dev-db/sqlite
 	sys-apps/dmidecode
+	dev-perl/DBD-SQLite
 "
 
 pkg_setup() {
diff --git a/app-admin/rcm/Manifest b/app-admin/rcm/Manifest
index ee626fb860f0..a74762f4f6f2 100644
--- a/app-admin/rcm/Manifest
+++ b/app-admin/rcm/Manifest
@@ -1,3 +1,5 @@
 DIST rcm-1.3.1.tar.gz 89437 BLAKE2B d897b793158da3a5e3975e283bd209f43f98eeb085bfb235802e8f1e3249ce2e09de2d8c391f89f4684afb78adc6c0b2bd91267cc32dcfe87b6b22296b47f309 SHA512 1fd8ad6f8bee16177444469bddbef8d9b99f0b2bedc82c9833523370dfda4583c425f1ab8f2195f11236d1385553a2a49ead6d4c5f0803deeb56737b6836a0d9
+DIST rcm-1.3.3.tar.gz 92193 BLAKE2B 42634fad58bf75b622ddf593cf83749113ffd35cba6b91f370b98b1211f5cb61274acd6f23e0be2ba7a49e966bb14c767b636aecc6c9a90b5802f13a2b123b53 SHA512 aa00edd76ab494a65cf3e97103d3bfffa427af83e57391cbe8e07ad2516b910c85d2e99a24405390fd27feee20752bab4b4856eeb8bac48eeb6f5707875df99a
 EBUILD rcm-1.3.1.ebuild 392 BLAKE2B 4bf90269b4c48782b17c6e92028956440dd4124baacd40f6bf78bd33e6d8d13ddc4a740ce1019e475827397d8ee267e1ca8f1810c50bbf57286461300133c08e SHA512 3aff0141d76288a814629fac6cdaed172627a64d4dac09291cce8cc56930943e09502ff3c6b74d22f7ca654eb25952f4a765c7f97a153f8b7474c730c89f2eba
+EBUILD rcm-1.3.3.ebuild 392 BLAKE2B 4bf90269b4c48782b17c6e92028956440dd4124baacd40f6bf78bd33e6d8d13ddc4a740ce1019e475827397d8ee267e1ca8f1810c50bbf57286461300133c08e SHA512 3aff0141d76288a814629fac6cdaed172627a64d4dac09291cce8cc56930943e09502ff3c6b74d22f7ca654eb25952f4a765c7f97a153f8b7474c730c89f2eba
 MISC metadata.xml 531 BLAKE2B bb5ebe54ebd4d547828eaa5c57b814c9ce235b1b38fbc1397e89a92ae2b7614595737b24594baa33f6d9c574b2a95edae3698b349a8481ea3f71fd3248dae057 SHA512 e78508053a0554f9ff72a04a5fbc7adf0b3d9a8f1b060361f58b15ff39b7fc2c2a7b50b44396b1a76a58c8896529932a80492df50e16ff4043ed51a26a74dff9
diff --git a/app-admin/rcm/rcm-1.3.3.ebuild b/app-admin/rcm/rcm-1.3.3.ebuild
new file mode 100644
index 000000000000..e068009d9cee
--- /dev/null
+++ b/app-admin/rcm/rcm-1.3.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="rc file (dotfile) management"
+HOMEPAGE="https://github.com/thoughtbot/rcm"
+SRC_URI="https://thoughtbot.github.io/${PN}/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-util/cram )"
+
+src_test() {
+	emake -j1 check
+}
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 29ba7064a5ba..e346981f2c0b 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -3,6 +3,8 @@ AUX sshguard.confd 634 BLAKE2B f083e6d4f7df6cefae89ef382a82cd7c5863c6a2ded34aee6
 AUX sshguard.initd 572 BLAKE2B d92f03b4da940a47ae27281c1075914e7e4157d459096a19615a05815f3507a11a41ec5290830f299e96fee8c7203831f6e91b11faa6a6f07eaec68f98e9bf0f SHA512 0a38cdc6121c6f981bccfd75648843f16b724d412648773f1838e8c67a6c7231df756da8ac1c3651a18b5a271337c07ab97a3314d3a81904bf3c2c68dd00f9f7
 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
 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
 MISC metadata.xml 348 BLAKE2B 9dd6c721b71bc5c73a367a9a7e4ef55ee0f0805c917968e66788716241db4c4aa4479ceffdb881d26c7da8b53fd2a5db921c7ef4138e9ff5401e621124d0bc19 SHA512 b93ba2b6eb5371962e1565ef4a333b50ba0dc44ae4365486fd55b04bdac546c8ff68fedebbb7a01d3cb4810f48148bfb870bef952b631fca931cf149ea8429ec
diff --git a/app-admin/sshguard/sshguard-2.2.0.ebuild b/app-admin/sshguard/sshguard-2.2.0.ebuild
new file mode 100644
index 000000000000..7faed8b68c9c
--- /dev/null
+++ b/app-admin/sshguard/sshguard-2.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="http://sshguard.sourceforge.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
+}