gentoo resync : 06.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-06 10:28:05 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-06 10:28:05 +0100
commit: f1af93971b7490792d8541bc790e0d8c6d787059 (patch)
tree: a38046712bbc3a3844d77452d16c84e716caa3d4 /app-admin
parent: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)
79 files changed, 1194 insertions, 1019 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index eef3c3ee02b3..f7ec8fe368b4 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index a18d2632bdbe..b3e01cb33398 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,12 +1,6 @@
-DIST ansible-2.7.12.tar.gz 11860944 BLAKE2B 52cc79a88bbff9dc009ead8ab9f9d299420ae060e211aab23fe3bbef8c8229cd9e526dc3df518a4285cc17c1448ab4892cc3059d70bfef2fd332a44c72b57019 SHA512 0ab68af8239f6d4d2a13bd38a09fe6f3c700231e7c83df0af77c70ea62faebd0d45e1ff316963c6c72931608d49a79b98e8d3ddc6f4c8b826aabe87dc71cc6f9
 DIST ansible-2.7.13.tar.gz 11861862 BLAKE2B 3123d84b9f45bb5e50a0d5db5d0b2ae10163e2818d30f29ad5a80c23979a347eb5e17806bd295df547b88a09191918443162cb25d7f339ae76df52e3960954b0 SHA512 8dc19e5c93a90d43ced6628699d2da42d522a020bb2cdd35ba73f6286998c605852c89250af8696e94aba0080b2fab12761a39c3e2eb86d39c212a198f970652
-DIST ansible-2.8.2.tar.gz 14328267 BLAKE2B 9548af73914b68374f71ab83e5a68e86e75b8ccf86066831699b147091d067a3f1e0b59d94b22b42151d90779f6d3bb39856a3d205862c933aec6bbe76824e22 SHA512 02cd8fd214f61041914abeebf2395f16acf370e110bdef0181689f604f06504902f9a05a2413877a31680528af539f078e2cd7b7f2eebe2389c9aa441b063305
-DIST ansible-2.8.3.tar.gz 14343746 BLAKE2B 3859d88d8462f7109ab23c169b4a91c7a03940b5a8aaff4bfc7ab430fb533898a44221dee18f481612abe1cce1270211a34c2bc1dc7603d89adeb11e50d2b242 SHA512 cee2c663577155269c4d762816590200224e87979411dc7486f5840783f23aaa688577a3f75e272c4875af30397bb383d11eaa7d122d5f304388d5b45ffb9b6f
 DIST ansible-2.8.4.tar.gz 14348300 BLAKE2B 8a9b5587411d2366a91643682c0ef82b0aa5b5cd5e6b882f3ffdfa100c4f3995472913bc12e1c2f7077efb69ec8ac3ad168a79fc3d8c127b34ce03c69588a4c7 SHA512 9efacbaf053acb8cf92ebe5bda982794ecbdbf55e33a4a292a68874b637eebe82406bfba129adf839354ee18aa809d45d77502f68b8e8d07358a48c9b5687b7e
-EBUILD ansible-2.7.12.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
-EBUILD ansible-2.7.13.ebuild 1637 BLAKE2B cafff348e72d7970fe6851e36c2cab55e18583dbd4ec2cf018a04ed2f7093e91c341c32458d334996f7779477409d47fce82477ab812e607ba1d9d624e6efc73 SHA512 b3760d5cefead4d7965b1d1dbbcf7fd41f2bbd2b8a4941fb02791832fd60c4b0c289ba34fbf945b8889a4b15b286e051634adb90296ff81e43a15f71cad66f47
-EBUILD ansible-2.8.2.ebuild 1661 BLAKE2B a9dfb3a4da7bd2f7519eff255ec9ec465ec68160724fe680426db756aaf5e3ffdffb6947faf200c83a4cab5e0ef5b11b71de530901273f2b382c062520fc9c02 SHA512 c564e5417b1181d49cae05eb7275133c1f5cb76a18b11fb679b6267186d5bd7bba62303481601aab47d4c2bc9cf6133311591a8933584033bb92f837483158c9
-EBUILD ansible-2.8.3.ebuild 1718 BLAKE2B 2172b4f68d252c34d587698dc6f53996e42c732c47d8feb0758c22f7ef53be4f32727a06a132b41aea49bad91eddf0e66a33601d8f012c1a20303bb5e4e4c60d SHA512 3ca93b366625caa875558aba79acc3849c9c73078720f2d22473f98ecb5407581443ea4fbb60491d05db2a8b42e1397283d8891fd779e77c8ee92c1712f31657
-EBUILD ansible-2.8.4.ebuild 1718 BLAKE2B 2172b4f68d252c34d587698dc6f53996e42c732c47d8feb0758c22f7ef53be4f32727a06a132b41aea49bad91eddf0e66a33601d8f012c1a20303bb5e4e4c60d SHA512 3ca93b366625caa875558aba79acc3849c9c73078720f2d22473f98ecb5407581443ea4fbb60491d05db2a8b42e1397283d8891fd779e77c8ee92c1712f31657
+EBUILD ansible-2.7.13.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
+EBUILD ansible-2.8.4.ebuild 1716 BLAKE2B 8ddd4c96e597576d970964d5e9daf4d5f965230f3c42fffedddbd6d20a56b22d98151c0f0f3637304385e02e97af466e18c5cacee258fd93ea7006db5ea14046 SHA512 f70424d820a489d02936f625822ddecab576241d59ab65f8552fa254e4376d2cc0d746af29f3331c6814a45c60cf32f8ac46537a9ae668ebb1dea2d7354a73b2
 EBUILD ansible-9999.ebuild 1757 BLAKE2B 647e72bcd7497648dbc96e5bab87e2a8fd5a2e2f47d407536c9a7785e534adef457a24106769dbe8a4cb121a95a63c2b5dc62ed5315ffca3c7f9b72594890611 SHA512 bc9414c6235bc3706ad95ec016b2632e4a3f46649fd066d981711b3a969d7fdcab303bd3bfbd33ac30e60889304ce032743ec0cad37897812f0e055a990d2c53
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.7.12.ebuild b/app-admin/ansible/ansible-2.7.12.ebuild
deleted file mode 100644
index 028f77e10f7a..000000000000
--- a/app-admin/ansible/ansible-2.7.12.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.7.13.ebuild b/app-admin/ansible/ansible-2.7.13.ebuild
index 63e11740ae9c..028f77e10f7a 100644
--- a/app-admin/ansible/ansible-2.7.13.ebuild
+++ b/app-admin/ansible/ansible-2.7.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.8.2.ebuild b/app-admin/ansible/ansible-2.8.2.ebuild
deleted file mode 100644
index 7bb6843073cc..000000000000
--- a/app-admin/ansible/ansible-2.8.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_prepare_all() {
-	rm -fv MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.8.3.ebuild b/app-admin/ansible/ansible-2.8.3.ebuild
deleted file mode 100644
index 851a6fa4e715..000000000000
--- a/app-admin/ansible/ansible-2.8.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="doc test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_prepare_all() {
-	rm -fv MANIFEST.in || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.8.4.ebuild b/app-admin/ansible/ansible-2.8.4.ebuild
index 851a6fa4e715..def82c47563a 100644
--- a/app-admin/ansible/ansible-2.8.4.ebuild
+++ b/app-admin/ansible/ansible-2.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index b29043c3a74a..052c8430ab60 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,9 +1,7 @@
 AUX apache-tools-2.2.20-Makefile.patch 1573 BLAKE2B 56de28f38934b73740d68f6429f3361bfd37f079f1f6de4e169741e7c97bceed86330744c1b69045f8ffee0baf927e35e0eca10036d2da461f14e45cd218e5cd SHA512 85120f1b57cd14baf3482dc21d4175447e135700a1f8e6455970c14e576cb0c510815681a9906de4c7eb68743de7e41bbb2d86e83dcb62cd57eb0c9f638f6892
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
-DIST httpd-2.4.39.tar.bz2 7030539 BLAKE2B 1e378833efb9bbdd6fdc277a779620a08752d064524489f9ad747cf85350fbb6ad65f57b30c81d57273cd6693d8a2c4e988f5a2c42bd5c9c538b305b9b7719e8 SHA512 9742202040b3dc6344b301540f54b2d3f8e36898410d24206a7f8dcecb1bea7d7230fabc7256752724558af249facf64bffe2cf678b8f7cccb64076737abfda7
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
-EBUILD apache-tools-2.4.39.ebuild 2578 BLAKE2B 3567f7dc0cd337d498cfea3d950d8548fa515c7ae4f4fd03810e8ceec7e821f4673b119eadee5f568ef90a7aa5bb58e58b564ebef115e36bd7881dd2164d74ae SHA512 265e2abc71c36124c977bc79002b88d672e558f17537839d7de6bb158fc476c96fa5a615af2ce6a27b6dee6fbbb36a675840351525ec0f472bc0f87830326b1e
-EBUILD apache-tools-2.4.41.ebuild 2581 BLAKE2B ea1be0bc8b2fc27dbbf55bf5e710f3b0a77c9950b5a8a71e0041df1dfb8ddf1f820a88386bff9fa2ec71e0f24579380f0fed4b4a07cffbef27d9885ada7abf72 SHA512 2b8a3139d06a94815b9c637c3442ab9107ac7595131f92dbb597a66c4693d4de8d4e7ad9f92eddb8c76b64d291970ce4135702ee865cfd9881029b934fb37acc
+EBUILD apache-tools-2.4.41.ebuild 2576 BLAKE2B 189881dc49c7e5066fe39bf63bdd99984ddb96e31aba5ff67c1c6c837367d4acd217d7ab6b7f305fc9cc6042426534840e09701dd9380f11545d916b0cce7fd1 SHA512 56b79c32eedd23bfa65bb4b75a063ef5b802f2bd45bd773e88edac2aa9b41ad10386493479c012c397f9c8cbc12c0e04d1a47409e3ef305539977102d970d474
 MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122
diff --git a/app-admin/apache-tools/apache-tools-2.4.39.ebuild b/app-admin/apache-tools/apache-tools-2.4.39.ebuild
deleted file mode 100644
index 6e1a527d5821..000000000000
--- a/app-admin/apache-tools/apache-tools-2.4.39.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic eutils multilib toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~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=
-	dev-libs/expat
-	dev-libs/libpcre
-	kernel_linux? ( sys-apps/util-linux )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
-	default
-
-	# This package really should upgrade to using pcre's .pc file.
-	cat <<-\EOF >"${T}"/pcre-config
-	#!/bin/bash
-	flags=()
-	for flag; do
-		if [[ ${flag} == "--version" ]]; then
-			flags+=( --modversion )
-		else
-			flags+=( "${flag}" )
-		fi
-	done
-	exec ${PKG_CONFIG} libpcre "${flags[@]}"
-	EOF
-	chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
-	# Brain dead check.
-	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
-	tc-export PKG_CONFIG
-
-	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 "${myeconfargs[@]}"
-	sed -i \
-		-e '/^LTFLAGS/s:--silent::' \
-		build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
-	emake -C support
-}
-
-src_install() {
-	emake -C support DESTDIR="${D}" install
-	dodoc CHANGES
-	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
-		docs/man/{htcacheclean,rotatelogs}.8
-
-	# Providing compatiblity symlinks for #177697 (which we'll stop to install
-	# at some point).
-	pushd "${ED%/}"/usr/sbin >/dev/null || die
-	local i
-	for i in *; do
-		dosym ${i} /usr/sbin/${i}2
-	done
-	popd >/dev/null || die
-
-	# Provide a symlink for ab-ssl
-	if use ssl ; then
-		dosym ab /usr/bin/ab-ssl
-		dosym ab /usr/bin/ab2-ssl
-	fi
-}
diff --git a/app-admin/apache-tools/apache-tools-2.4.41.ebuild b/app-admin/apache-tools/apache-tools-2.4.41.ebuild
index 8efe334bf515..03b9e8d46a7b 100644
--- a/app-admin/apache-tools/apache-tools-2.4.41.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.41.ebuild
@@ -10,7 +10,7 @@ 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"
 
@@ -90,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
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index ce8b024993f9..46ff9281208d 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -10,9 +10,11 @@ DIST consul-1.5.0.tar.gz 20830405 BLAKE2B e64fbc22ade0c737db4f2f1b0e3966dbe61745
 DIST consul-1.5.1.tar.gz 21123963 BLAKE2B 4fe6a45f442d849196a7b9961110cdcc6f92931626ab583859efabe62038f6b2c356b27b37ea41b27755cca138c567be5c81854794a1ba0ccae3f9e0dfd10749 SHA512 7486d24bf1fa9fe94175abf9e008dc4fe4277c509381a524a9ee20e17bc4959f621e39be29e33622cb672ef3a04f9161e575009197bcd35c78b45f1d2637a2ea
 DIST consul-1.5.2.tar.gz 21697719 BLAKE2B 782d6fe02cda097db9256a7e508cf19cf4d514d7936022d339fa62db705f6c60468cea907cd22338bb61c3287bfccb3a4d435a4f9222aa7558999553909e5d40 SHA512 e0820592abc5e119f74c8bf3d11a23726ee6dda7d193864a4486d64deef0bfd6ae4c9170b57d6f978e7ddfeb425229a019c45a8edcdea0938bce9315f2444fd6
 DIST consul-1.5.3.tar.gz 21743194 BLAKE2B c797b04457c5f0b12f06732a94038b25367b53a9e6088d725eea61786a0e18bd905ad680bc12c4bfa30b44292d2676689dd6f18e9e2143bf6e1b02c2c55f678f SHA512 3f275ec160b9e583b81ba8d463fdb05e9fc9058db2453d9393a56b67337ea04df98a89225323192230938e1abfb48fa60fe0a32b4d8980573b749217b69933e9
+DIST consul-1.6.0.tar.gz 22465984 BLAKE2B 3a030619786e8dabdf8b778012a80ff4b0e76ede6c313b688bf04bfd1a8488bff1bbd4a36c1dd11496bd1942f7bba2a9bb22ae3b364fee4335adfb741756dd67 SHA512 a122892693e3bee0fc0e0b5c0945e4a8dddb890228c091112e0db11a8afd33430611c20ff9bc13d2b3a2ac0d3b560be2d9c4e03a9cc425983fbd8f7edb699658
 EBUILD consul-1.4.4-r1.ebuild 1548 BLAKE2B 65d5c22f412b28abf5c7067b5744ca2fb627f6513eca10d91055276016487f0123e6636c080d4841be9d05f4e26fe332f1867e7d540c7810ae43a187b1485988 SHA512 9ce2e18e5177ed96d005b6967d68e8df138ff18e47b28b52ea4fb971323c5cced167bc26fc08a30d39cb243bcaa275697fe7e10c6cacb87c12d969a00bd154b1
 EBUILD consul-1.5.0-r1.ebuild 1548 BLAKE2B b70a82e758c23c2c34ecd0fa5d45e56d840966135c8d578b09d702bed31b5148bffa2eb68412a0555464018ad04e62922a4e75d5c8a2fdc779b8497a6a539159 SHA512 00c8ddee82cacfaa5092bf45a37bccf7475e8fb6402579ee95188a9334f12309ba9a70771fb49f1b43bebec1e37ae68eb7d260a34c3134009f0b4507447c8504
 EBUILD consul-1.5.1-r1.ebuild 1548 BLAKE2B d1d499907ec300d216e6884fb3c31d741911a799185f8220e0f4bb1f141105781368f9cb7c98bcd8ccd790e34b667f33b0dddc8eb5f1185318bf6c70917ead33 SHA512 6ab3f29b2416dd52250589d2ccae36f86161edea4a103d16a00e21e78c630fe8a6c7a61e8a50c08e3df546698e91f577e6ed94dcaeaf766b51f97ca93f894837
 EBUILD consul-1.5.2.ebuild 1548 BLAKE2B ef17177024301747b243ac1b77fd9061cd76a661af705ca1beee37709ee03b07c2a1738a5e2277b8db93d377c442ba3831511c6df73c6096639971236b819e76 SHA512 41dd870ec80824c66139d4e44d10ec22079fbca640213f3454dee789ef535ef13605742f2999448475e5107134f436e3d8f9cb9e3d3fe3de021e45fc7ed67421
-EBUILD consul-1.5.3.ebuild 1548 BLAKE2B f8cfe586cc76eb91db2369980ad8dd3b13f305baaca3aecd69eae820a6d2dfec0927dbae152cef61f7960d8eabd508089d2441319ea1ffb2423a97809826f71c SHA512 7f046114417edd0b55be2d1800076ce735305df2dccb188e0e4a5c228d63266ec74419b55d79645f77482a1e49bf23e237bf0ffe3dbd5b91a16b99e271f3fb6c
+EBUILD consul-1.5.3.ebuild 1793 BLAKE2B 54e7ecb7a0d7eba9bbfbc767fe14f437ba129b5cd5a113b4111bd323e96ab7817ec86a82f58b3db6e62d41411db0cd6911b7db6dcce30b1ebcf6b941a0159450 SHA512 bbbbc8a895aca5c35438a7fb40de9624919f2bf133885b1a137eeee09de70630e4e21872eecec2c41fcd615793782fd1fcc4665437ed3429dccc6b5f84bda85a
+EBUILD consul-1.6.0.ebuild 1793 BLAKE2B 82a0527541f3c03aab2c03586691a7d405a1cce98e951bc874badbeaa6fc478391fba937ea600e346e67d901dacca1ef3d4ba0311c2e469c212a86da166a5ac9 SHA512 2a197552640c848be3fb1003f2f3daa543a3ac530105714ec758cc43430f18d24a76fa80172d2218261544b3e60b01758dacebb4d8d2160da6703a128b95e88e
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.5.3.ebuild b/app-admin/consul/consul-1.5.3.ebuild
index 13ebbc13a381..913d62b917c2 100644
--- a/app-admin/consul/consul-1.5.3.ebuild
+++ b/app-admin/consul/consul-1.5.3.ebuild
@@ -30,6 +30,11 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	# avoid network-sandbox violations since go-1.13
+	rm src/${EGO_PN}/go.mod || die
+	grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \
+		xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die
+
 	sed -e 's:go get -u -v $(GOTOOLS)::' \
 		-e 's:vendorfmt dev-build:dev-build:' \
 		-i "src/${EGO_PN}/GNUmakefile" || die
diff --git a/app-admin/consul/consul-1.6.0.ebuild b/app-admin/consul/consul-1.6.0.ebuild
new file mode 100644
index 000000000000..b5b9eab35a17
--- /dev/null
+++ b/app-admin/consul/consul-1.6.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="944cc71"
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+	>=dev-lang/go-1.11:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+	default
+
+	# avoid network-sandbox violations since go-1.13
+	rm src/${EGO_PN}/go.mod || die
+	grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \
+		xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die
+
+	sed -e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:vendorfmt dev-build:dev-build:' \
+		-i "src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GOPATH="${S}" \
+	GOBIN="${S}/bin" \
+	GIT_DESCRIBE="v${PV}" \
+	GIT_DIRTY="" \
+	GIT_COMMIT="${GIT_COMMIT}" \
+	emake -C "src/${EGO_PN}" dev-build
+}
+
+src_install() {
+	local x
+
+	dobin bin/consul
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/emacs-updater/Manifest b/app-admin/emacs-updater/Manifest
index 15a4aef100ea..4631eabfc7c3 100644
--- a/app-admin/emacs-updater/Manifest
+++ b/app-admin/emacs-updater/Manifest
@@ -1,3 +1,5 @@
 DIST emacs-updater-1.15.tar.xz 7020 BLAKE2B bb35103b328a57dcaeb11c258bddbd3a08141d1e245ac4943c7a5a8b815440db0cd06eaac01ad2a00e6e2aa0d23311d774d190fd761be66514856077b3c4e296 SHA512 8cc7dd3e0e28ae71030c7c5f29d54f24e12adcbd0615f3c598ad262bd233f028c2424c277aac7dff7b4201a2ac24bfab0e05d1fdc07edcee2c184a733f699b8a
+DIST emacs-updater-1.16.tar.xz 7112 BLAKE2B 82160ef71b4c22a385a45765c1f60b7d428297cfb3b51f84bd44b176d1bd302165f9ccdde803aae628a2dab9e0520098082232c513b2006ae5facfa283f287ab SHA512 3de3126debc49ea47bd57802c1a3aa82a0769ab392741fb891c93ffb66141f05f58025fa0de746ec78795fc34c135536740e447e1f6a4ae59aa847d21bd6215b
 EBUILD emacs-updater-1.15.ebuild 969 BLAKE2B 9b77db09396e09d9c80f7f49a46bae2e202b0cfd1b43ff96f7cb762c6255565967265c6cafc24d5d6859195c77a6047eea70a5d437985fb5333a811f176148c9 SHA512 30e75f83c944a730a58ad8dbc36f640fe1e87d378db2ba4465678737f77e8f29156eb50b0ac6b07ba084f0b13d5ff216fb90d0db8a28301b81c4fdaaa03bf684
+EBUILD emacs-updater-1.16.ebuild 975 BLAKE2B 849e7e48c226fce94686eef0c3e219c9458e77c23f0c012ce13c88424a765bdab505e1397f22bb90e3209efcf80c0c9df56197c910be672588c1158b05dbdac3 SHA512 ab7eb7321d2a986073951ec206f2b5d3beffa8dd4d272c2c12a2149dd8057a80bee43a5f647aba0a2752ebf9875d7129d68bcb3fc559f77cefbc3b1966c3fa78
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-admin/emacs-updater/emacs-updater-1.16.ebuild b/app-admin/emacs-updater/emacs-updater-1.16.ebuild
new file mode 100644
index 000000000000..ef79c178430b
--- /dev/null
+++ b/app-admin/emacs-updater/emacs-updater-1.16.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Rebuild Emacs packages"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
+RDEPEND="${DEPEND}
+	>=app-portage/portage-utils-0.3
+	virtual/emacs"
+
+src_prepare() {
+	default
+
+	if ! has_version sys-apps/util-linux; then
+		# BSD ships a dumb getopt(1), so use getopt-long instead
+		sed -i -e '/^GETOPT=/s/getopt/&-long/' emacs-updater || die
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		sed -i -e "1s:/:${EPREFIX%/}/:" \
+			-e "s:^\([[:upper:]]*=\)/:\1${EPREFIX%/}/:" \
+			emacs-updater || die
+	fi
+}
+
+src_install() {
+	dosbin emacs-updater
+	doman emacs-updater.8
+}
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 2039460c09c1..5ccd745006ff 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,8 @@
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
 DIST eselect-1.4.14.tar.xz 177492 BLAKE2B 236ddb09231283a153c20be779d012979a25d42a7043c75af866e777731761406d92896bfef399c3bc63e529af4e36cf538801302dc4bb719f065d6bab8ad9e4 SHA512 b17fb63039577f20515056fae1b0f7e86fa2d96f38a5eec22e637cee0b25f4d68087ef8a5bd4043893db5be66ea201bc8ae6437bb049d208b81e76a57612d658
+DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
 EBUILD eselect-1.4.12.ebuild 1623 BLAKE2B 6d8d236b4b11ec808ab1f95c0a1c295fc4ffff17f85151dd176354a1a1bb7459eb9d64f59411b7a7e3905a563884865c5dc23973f5d6674f13ebafde00ef3d0b SHA512 398ca70365af9bb0aef6807b8d797fe55c10afabe25b2e7a4657aba39b70748f04a5f94b24569701042399e9c4ffea1c48b824f7b179608d080981ff1159f2da
 EBUILD eselect-1.4.14.ebuild 1627 BLAKE2B 681b9aa31b4e3e7cc0857c9ee13dabeeb78936f3c6a41f8ae43a44526086bf8e52ef047ba9543b0fd14280abf0025164dc6fd5b22da481b1009cdd7a9f65c4fd SHA512 8028a79b110b47c0b75ec0621729cad9be30a103ede0d0e6c3e07220fac775704df733da7b64304db2e882e3aacf310750338f9ee224baef602cf1100f96da06
+EBUILD eselect-1.4.15.ebuild 1640 BLAKE2B a2628b326ad57259ad0dc50fcce13403dda4505f5f83aa9982ad0f230c543ea3937414f5538eb635cfe8dcd9e3d3cb93d6a97cbb541dea582245fceed1fc8e5f SHA512 4437117d84c679538e30e85e77a8707c1639c28619e9161a15cf90b69edc856901fed81a8eab6dfb867d4f4ad294c804d5f19197a627d7d40ffefbf9a2296e19
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
 MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.15.ebuild b/app-admin/eselect/eselect-1.4.15.ebuild
new file mode 100644
index 000000000000..61a8c2e50a68
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.15.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs vim-syntax"
+
+RDEPEND="sys-apps/sed
+	|| (
+		sys-apps/coreutils
+		sys-freebsd/freebsd-bin
+		app-misc/realpath
+	)"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils )"
+RDEPEND="${RDEPEND}
+	sys-apps/file
+	sys-libs/ncurses:0"
+
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+	vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newbashcomp misc/${PN}.bashcomp ${PN}
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+	if use doc; then
+		docinto html
+		dodoc *.html doc/*.html doc/*.css
+	fi
+
+	# needed by news module
+	keepdir /var/lib/gentoo/news
+	if ! use prefix; then
+		fowners root:portage /var/lib/gentoo/news
+		fperms g+w /var/lib/gentoo/news
+	fi
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for the portage group:
+	# merging changes the group back to root
+	if ! use prefix; then
+		chgrp portage "${EROOT}/var/lib/gentoo/news" \
+			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
+	fi
+}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 12a1725cd202..7ee6f9d26223 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.4.1.tar.gz 3804821 BLAKE2B da865f1a19a24843ca90edc283fe2ab88119873e75934989690d0032953876ed08b8908db7f06932a934d72b8b2da8d6040c0922a08f645130dc39ebc94b1e5f SHA512 080256d78da7530f1d49f7a6451dc32d5cf64e373d8bb64f982b43c1bea25195a0a0f818c6fdf5627994f92077de1fe9cb954ef46ef9e9f4431d4b3d6076ae4e
-EBUILD exo-1.4.1.ebuild 545 BLAKE2B 1e55be70abe5f2e18f9db5058bbe72eda356212f9f698c7c9f5130d40a3da55e466412bf173952f0255370965f46b9b2af1faf8cea448c52bcef36fddcc57b1f SHA512 72e9a1fed8dc44277c4a29f71837cda8ae9a8e9ba591d78918e860122630fe6c800f4aa49d4dad62f97ee4d216212135ec9de61cc5acc8a2747a3cbf3bd00661
+DIST exo-1.5.0.tar.gz 3806818 BLAKE2B fe817962ebcebfbe37c0ec884b127144fca4d85bf985f3f6d98bf154a1bb17b49d8b7de7ece6fb71ae3b2793969fdae8bf0ad0f2031cc11943c714e27ef1a63d SHA512 3fab4c57d55d0058a4e1191d97ac04de45052e5f9c25bea0d4408df48c648e28804842d8989700daf36c6657023b99a63a4dd77a1991689abecdb11afa4e6a09
+EBUILD exo-1.5.0.ebuild 545 BLAKE2B 1e55be70abe5f2e18f9db5058bbe72eda356212f9f698c7c9f5130d40a3da55e466412bf173952f0255370965f46b9b2af1faf8cea448c52bcef36fddcc57b1f SHA512 72e9a1fed8dc44277c4a29f71837cda8ae9a8e9ba591d78918e860122630fe6c800f4aa49d4dad62f97ee4d216212135ec9de61cc5acc8a2747a3cbf3bd00661
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/exo/exo-1.4.1.ebuild b/app-admin/exo/exo-1.5.0.ebuild
index ebb329b957ff..ebb329b957ff 100644
--- a/app-admin/exo/exo-1.4.1.ebuild
+++ b/app-admin/exo/exo-1.5.0.ebuild
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 754246dd5b85..f2d0d27fbd25 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -8,7 +8,7 @@ DIST filebeat-6.5.4.tar.gz 25286147 BLAKE2B c3eca03c8e8e2b863918f3fe65bdea46b351
 DIST filebeat-6.6.1.tar.gz 29108620 BLAKE2B 21dbe189dcf91efe6170574e3cff858cca4094936fbda54a343f66e61a5f0cd7d29e71d547c34ddd78776283d13e48926dd84925eed58ca07cc7bedf216c9064 SHA512 9c7646efa8aa44c2ae1cbcf85204749bc57491aad075d3ca283cd75a1b3a93d922169603407b2ea111e7e3abe0a43ce26fabccfe93d56a4232bd63e2b2e8b24a
 DIST filebeat-6.8.1.tar.gz 35550017 BLAKE2B 0a1913adf2eda50884f33715a059fcc2028e31560afc5412e87d7fd3a6ed5cc504683ad3c5b28f18df24afd3e4c8d96c5b2a930411ae32d09d05c85cfdff0499 SHA512 5ff047e80099b09e25952ac7fc8ea0c6be25df2cd3b638c07c600e680fac32505c279a3a91ee2e61acf0f9535b4adb390a65f3a7dbc3599e74c6b02e0aa6ef71
 DIST filebeat-7.2.0.tar.gz 46415588 BLAKE2B a8940e9a4a85e6eac79dca3418d3dcd14c5a1062741dd895c561d1498c287bb974a5ac89d5b353dbb75e78e6c67cba97a08d41528042db4e4d76bb46016fac60 SHA512 67d251cabca10a1f6d392be8e6203e66d4cf5d63ceb2af88185ea4824259995dafd3aa8dd2da326d079cfcfedce5996f173cd6c50972db67cbe25f660683e5d1
-EBUILD filebeat-5.6.13.ebuild 1595 BLAKE2B ab657b0be80c86c637aa30fb32a2011aec931c43ce4a839f0040dd749321ff8bc0a67c249bc64356736cc8afc18dd9b25df2fca51bfdb6ba176c0af5cabea39f SHA512 801f38077f15698eafe43ed6138d014108ce0bb9178de2fd166874ed0f21e56da415f2f476e1b0b00929c359a286847742a732a2dc001700c4994cf9f92f91b8
+EBUILD filebeat-5.6.13.ebuild 1593 BLAKE2B eace0e8d7977b82028436e2c55c4a4bf19a7c0b57714cf6b7cc1e7176e9013edb889065f58740f8db51e38164f6e567cf809d9c4fb82de1d7e064580ef8cafaa SHA512 8eeb1e64ea6d8e06a79ef9b25103d523718f779e351ee5c1f0a00db67d1e28405ccdc371ae5c0177861276db40c848b78ee2d1eff16c14da3efca3c7576ae399
 EBUILD filebeat-6.3.2.ebuild 1477 BLAKE2B 9600502c104f8db4f8661a354bee5160b5780fb4ae3cf84a1353ae5b774ed01e61aebd66ad530550691a43ae62ebb0cf7607591c5b582564b69d81c8af64f68d SHA512 304cb456b2b56d2005b8dcdf56817005e7843c5073ef1aeedd75e69a73178eb184910027d94522e586e6492d80f86d8c49787a7d818292695304815fbecfa239
 EBUILD filebeat-6.4.3.ebuild 1478 BLAKE2B a8430ed2d2c0bc2411300514a35a72ae3c6765c54c6ec49c8deca06f02b7e2f543788e77cf48ddb08492dcadd4ae4ba0ad3b27ac6e3497ee4d29ea91f9e3482d SHA512 597ab402cd5a644892926595c65edf5853b5173e5b76d46f116dc02dbb995110a774181b7e9c3dc149ed4fdcf7b9d89d3a9c6ee36b158ab983e37d36467582bc
 EBUILD filebeat-6.5.4.ebuild 1478 BLAKE2B 4eea3c20260b9e8c32b0fe66108378fcda572d3d80bf435c341b6b0ac6e18f4a95eb4d430a13d2fbf775216d857f1877327c724d9abf9e8acf7efd33a2f57473 SHA512 3ae3570cbe614358eead82f36aa79008e317164c62f779eeee33e5ad067c58bdd42389db57f52ad4e909fff67f48043bfec3bcb4ed478b05fbbf75d43d39157c
diff --git a/app-admin/filebeat/filebeat-5.6.13.ebuild b/app-admin/filebeat/filebeat-5.6.13.ebuild
index 93f80027bc1c..0c9c4ee528fa 100644
--- a/app-admin/filebeat/filebeat-5.6.13.ebuild
+++ b/app-admin/filebeat/filebeat-5.6.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -56,7 +56,7 @@ pkg_postinst() {
 		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
 		elog ""
 		elog "The migration script:"
-		elog "${EROOT%/}/usr/share/filebeat/migrate_beat_config_1_x_to_5_0.py"
+		elog "${EROOT}/usr/share/filebeat/migrate_beat_config_1_x_to_5_0.py"
 		elog ""
 	fi
 
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index 4edd5990a189..f2b7b402313c 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -1,8 +1,6 @@
 AUX gopass-1.8.4-xc-tests.patch 923 BLAKE2B 67c00d9d0d983dbb0e3f8a7e78c895dc645d1ce0e4eed2e726871d5fa35086cba10872452b76fa0ffb65ff89f3ad25c9f726141221d1dd3f11086690697da0a1 SHA512 a80ce382b9e35af43a7ddeaa7a863e73d7960e37337b66d558dfc1840a7b113767eacbb6225bbbc2f3dd581b33c0f4a9a03105a08340a9abed4768baa4c32648
-DIST gopass-1.8.3.tar.gz 6374004 BLAKE2B 1f3b66e8a631d94fbbb33347009a4614f180d7bd30f3d73e98f476fc81a3f5f0aef15c80705b1b4e871f333a3366cc051eb41785082bb90420a5d34f38e35e16 SHA512 bcf8e4cdb37355ae43d0d6d21e3248d3547fb3f1892bb2e8d5d8ddc47a784f75f4f404429733ac824bd66d719fe63fef7a1d58facde65a6d1820ecf14e7bd77e
-DIST gopass-1.8.4.tar.gz 6436185 BLAKE2B ecb086717b09a4a5ea24bc4378fd54369628b0319bfe222b2ca11583eb304c84c05513b1d2ca97089152f41903d5dae24f3aa4acc5e2f6c7e948a8d918308d66 SHA512 53440ff95589f21e1ea1d8a03e3565ad6a3b35dd747ecd62f6496fbe9ba51e94e3081142dfcc094a5986828fcf4724280ee0fdebd9cdc05f0d8720aa4f1c89ae
 DIST gopass-1.8.5.tar.gz 6561060 BLAKE2B 99d5ba9d5aed396eb4747461b64285d37544e7deaeb7ee7ebd6e3298a8746cdacbae4aa573d87d324703751d5a78efad2735954d8e2a2a8b53549985a4a9952a SHA512 1f451b10aa87141de635650489bf7227c252e10e5139dad274c95d5625db74fec0b8892a468800d3d3c5dd8b3d64f1c93bd6c75a0ba54fe5f6e630c77b2c6c71
-EBUILD gopass-1.8.3.ebuild 1041 BLAKE2B 4fa9681eeb9b8c0b9be470cfc8fe3b3f2ef806e4b64238b412d67deb72bfff4cf9cc0bd4977028287ff6e5ce5fac26874925da6e181068c4c69555b3a7c4bfbc SHA512 1bbff9001cad0448f310a5db019117b13edc2c81a66025b10a0e491fc9f6d6f2bcc1837e5ffeae46705911aa7d8d4ba288efa92888fbfd3785805195733a7ed5
-EBUILD gopass-1.8.4.ebuild 1088 BLAKE2B bb31d0279bc124608f176d38e23ab630b85d5bf5ad9c53466e4e6f172576f64ba06721828af9dd9d8dde6570d395708184b8cc79ccff6a2c059236b2d03794ca SHA512 554f69abb959ec7d104bdf76bf28cc7bb8a0c269e601328926cea2af49f384ff366a228daa3f60a27ad53b481d359aeca9757786837e27ac959639f94fac3338
+DIST gopass-1.8.6.tar.gz 7072723 BLAKE2B 5ae883c54f8180f8b6da870bd99710f1c740afe9de193c127a3047fa1211641b94ab98e23148d83c6d5b2cd2e3275f644dc875d106c9267e7e0c6342bf0b9a46 SHA512 7acdb095cf8913954044c3206eab020f197542334798c6b94724709c3953b12f7e5b73ce8c1aa4bfd5df3acf1f424b64bfa94f9a8f68fa7116ed14c8a0f2e6f0
 EBUILD gopass-1.8.5.ebuild 1095 BLAKE2B ce53235ad3e59da78f578b2388372ce67131e66f5a55d444088cc41d261f9d311e04e1372accb5936d359a4871c1c54d0a90166d231b53665567dd99c9e4ee6b SHA512 f798a8efec8122f9dbbf1d3558123e13709dde9e33819ea0179ea2f407f0634e3c17fd6ffd7766c3cadcf36a9cea51ce2baccece160fba0302334d1a3b1d06db
+EBUILD gopass-1.8.6.ebuild 1041 BLAKE2B 04d26bf816ad93d9267177e12b3d86ef6f383a5c73ab9548d098b39b92ffa205e5a7924fb91bacd5f6510bb4475bec8a087ff095a5dcdb1578acdaa8c94914df SHA512 d73ae1d48ce585ae27abdec5ad52f1e95c6b9917fd5831c683765becf50565df5fe14380179f5f7027f9945d89e6fa60d6b7d9b2f562d09588885530705acd34
 MISC metadata.xml 326 BLAKE2B fbff56ecc7a4bd866c1220fc218f9233ed0660b04cde03047df5db992557bf5d20f518815dc15eba2a22f6b2b8cc4eb5ed1c0f2cc2753e18ce4cafd59b768637 SHA512 2d43a58c7997bd539d9aa5659fe7cfcd947c97c49d31dea4ee1230b06b0ae2c8cef4fb228b889968f65c36693d5befa76828da3644bea0852ead709bbf7d760c
diff --git a/app-admin/gopass/gopass-1.8.4.ebuild b/app-admin/gopass/gopass-1.8.4.ebuild
deleted file mode 100644
index 1733d9991751..000000000000
--- a/app-admin/gopass/gopass-1.8.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/gopasspw/gopass"
-
-inherit golang-vcs-snapshot golang-build bash-completion-r1
-
-DESCRIPTION="a simple but powerful password manager for the terminal"
-HOMEPAGE="https://www.gopass.pw/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.11"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
-
-PATCHES=( "${FILESDIR}"/${P}-xc-tests.patch )
-
-src_install() {
-	dobin gopass
-
-	local DOCS=( src/${EGO_PN}/{CHANGELOG,CONTRIBUTING}.md src/${EGO_PN}/docs/*.md )
-	einstalldocs
-
-	# install fish completion
-	./gopass completion fish > "${T}"/${PN}.fish || die
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${T}"/${PN}.fish
-
-	# install bash completion
-	./gopass completion bash > "${T}"/${PN} || die
-	dobashcomp "${T}"/${PN}
-
-	# install zsh completion
-	./gopass completion zsh > "${T}"/${PN}.zsh || die
-	insinto /usr/share/zsh/site-functions
-	newins "${T}"/${PN}.zsh _${PN}
-}
diff --git a/app-admin/gopass/gopass-1.8.3.ebuild b/app-admin/gopass/gopass-1.8.6.ebuild
index 1345581a840c..5ca88b63636f 100644
--- a/app-admin/gopass/gopass-1.8.3.ebuild
+++ b/app-admin/gopass/gopass-1.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/gtkdiskfree/Manifest b/app-admin/gtkdiskfree/Manifest
index 6b5048559500..13476c36f000 100644
--- a/app-admin/gtkdiskfree/Manifest
+++ b/app-admin/gtkdiskfree/Manifest
@@ -3,4 +3,4 @@ DIST gtkdiskfree-2.0.1.tar.gz 354661 BLAKE2B 39731b38eedf92554303fa8f6784c1cc9c6
 DIST gtkdiskfree-2.0.3.tar.bz2 216189 BLAKE2B 146dae89b0f66328840f22bd7b9e8ad751759dea3a67c332d71e513388be46122cb761fec6229258b63e85c726ee889e04a56d405437904f1eb8060ea31ee88a SHA512 c6f093ff023cb8c67090b3bd3660a998163e786b08386f346bdc1aa7b29e030a31cfb0ef54c55f109f211bf045f90afd20558b91849a4f82d041c99532f170fe
 EBUILD gtkdiskfree-2.0.1-r1.ebuild 920 BLAKE2B 7ec5ce54e5a949d75ba8836162d2361340d1c115d028fce633815ce19b4aa8f0e3283f2e3b03e8b8069d498f4d6fad454151dd4505e18acf17f8620d359b3e02 SHA512 23d755ed23fcebe32e44de66bbdf92048eb80ca0e7060130c74ebd6444d944e1f906bf4f2b013c35f2545dbe69db8bd7976c00af3b23bce5eaf82cd13dfa03b3
 EBUILD gtkdiskfree-2.0.3.ebuild 606 BLAKE2B 7e437ee97362a5b8152cc036b8f92854efb9eaa3871f3a694795603b4375fa1e52f2eb70c5cfd8ce18b25606185d45dc74164e8b0d178d5c6ad2d1673f4c06f7 SHA512 b40217538674ee82af7902d25144acdfb4a3940aed487c2030687271e2107103fba230e611d57c23f6998c7194047b0707e0b98a7701bd843491221930da4962
-MISC metadata.xml 587 BLAKE2B dd739127e2229dfa3136f32152b74dd6b001947195b57776ddc4fd41a892ae77ffdbc42d9b0078f20b45be2538b655e05f99e8a67ce0d43474217a6cb8e03ffb SHA512 1d4a058ba9e674c69dd5422af178c7067772532a963fea5d1ba85efe88cf4e576b4f434721f76cb7be6aa7d6873b506faaf8009adcea135e90d9c08beebf6ec6
+MISC metadata.xml 560 BLAKE2B 9a3b649e52b152467be22c57e24d32727cc75ea2259504c1acf516620665e72a2d8662124ca5bad55d1d04bbb36e3068494840b82b541ff45798120f2c56ecf7 SHA512 d7ad34b88b4224c4f03b00eb3ce3411b209c2a02a56b00cc4e5d662dd39cdfc76b9a65a8015392e127fecc3269a0142ec8b97c2b67eb6cf1e0ccc6fd7bc04cbe
diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
index 88053de1aaef..4dac4d61504d 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -2,14 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>BM-2cTVBXjxdVtEQCycBQjMxszLsgTNVujvM5@bitmessage.ch</email>
+		<email>samuel.bauer@yahoo.fr</email>
 		<name>Samuel Bauer</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>gtkdiskfree is a gtk extension to the cli tool df, does the same and more
+	<longdescription>
+		gtkdiskfree is a gtk extension to the cli tool df, does the same and more
 	</longdescription>
 	<use>
 		<flag name="gtk2">Support GTK+ 2.x instead of GTK+ 3.x</flag>
diff --git a/app-admin/installer/Manifest b/app-admin/installer/Manifest
index b80975dad236..2ad56e5eb0ff 100644
--- a/app-admin/installer/Manifest
+++ b/app-admin/installer/Manifest
@@ -1,3 +1,3 @@
 DIST installer-0.1.1_beta.tar.gz 49946 BLAKE2B 845df010036446e65479affc3d901fe114248130627ce76583c42adc9ecf9c0e2585600106c1559c8d3dac8c086553fed1d48d00002ede9e9be509fc98632662 SHA512 940272cefed17bd6c370fe26b2941da611cbd0aa8fb1c7f51bfaef483c7f9189f10754fb7e3d84dc099ac687f4644e24ae22e7ec09c41f39efba30d5743c9163
 EBUILD installer-0.1.1_beta.ebuild 505 BLAKE2B d11943b1fc6a5f56d58a34e218a95b969984035c47e30a0c0a9c5d690e2ca22c54cae88c112b2d6f3dbadd41d320c70e0d318dd3a39822b2dd38b40b013cd521 SHA512 89df436c45e13240224c149456e58d1aab14cc34e1be850e6c21059b3f4d5481c835171f1a04792f0cd956ad771f87962b67c34f58775cde8a2753d3276a1f3d
-MISC metadata.xml 650 BLAKE2B 85405d55a8203f929a0a11864b7df6ddb9763160da824a1a1f037c1ea3e52f3a1fd1540316142f47af0ed575f90deab90fc71a90085ac1ba3f571954d079f541 SHA512 d1c0b0a1fe0b4aa0fb00595d7c46c73254ee22bd801b81a9895e176a0577ae64174dd587bacd3ac5ca17fe6c56f771274d508f9249a990608e6b515bc8aabef2
+MISC metadata.xml 425 BLAKE2B a32b198aef69dfa01edc6e5e6ec8a19cc71edcd359f95866ab95df3f8cd8c2220c11e81fe7f58c44ecff5e80d89ef70bfda04fd110635674ddf90e957e3e32f8 SHA512 c4d27457c90f3374cb04b0fbb94b0b26da6ce0b88c79b4722f02014225703f37af825aafa221d6b76ad476a9ede7c81b9a9136f6b0fdfd621caaaba3a99e142b
diff --git a/app-admin/installer/metadata.xml b/app-admin/installer/metadata.xml
index b6fd5038e019..f846e48fd956 100644
--- a/app-admin/installer/metadata.xml
+++ b/app-admin/installer/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chrisadr@gentoo.org</email>
-		<name>Christopher Díaz Riveros</name>
-		<description>Primary maintainer</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		installer is designed to aid users during the installation
 		process of Gentoo Linux. It is capable of walk a beginner 
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index 0e6cbfb0a887..b7bca0190daf 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -1,14 +1,10 @@
-DIST github.com-fatih-color-570b54cabe6b8eb0bc2dfce68d964677d63b5260.tar.gz 588432 BLAKE2B 0ea1b91d459a9708896d8e6fda386924d0dd8aeb44cf58de4a1c7d51185e9ad106333029fc807f6221db0decf7e8da883d98ba390250dc5fa47474fa951836f7 SHA512 a24eb00104b7763d7b711a4e555f00464fd19d117fe7d5c6bf0c007167dcad1b893a7130abc46619f29136fef4ee080662d4622d5f15019d41c24ae55a804a3d
 DIST github.com-fatih-color-v1.5.0.tar.gz 586937 BLAKE2B f9ee26f45c49261ae2ed708b32f878ee5499c2365f86148af23a7bce33caadd8bc5c26a54357f416d2f8f718329cc2aae4ac7ff2c6ef2dbdadfc03801ae926b2 SHA512 f58e9cfdeae96807058468efb162bcbde8445031bcf98fa0b08dbd2f1100efd40bdd44bb0c800a0eb386685fb2b0d75f0b0d0ec7d3674b739ef205fa5f59a044
 DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 BLAKE2B ced6ca6f115eedc954f6b583b28e470ec5dcfe0c279d55a63c00ee942acde095e9eef8fb4c3fa289f34871f43a7562fb71142d070a54398bc5d91122e64b4ad0 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab
-DIST github.com-go-yaml-yaml-c95af922eae69f190717a0b7148960af8c55a072.tar.gz 64831 BLAKE2B 23c8a4141bcfb9c4b4e384a9ad372cc0761c006705384eef8a05c5491e62997df13aa19318f500d6dc39ae95e61298d1a9b491b7ea9a6f0ac51d9f28359d2c0f SHA512 3bf310558b53a724f93d228947cb5f1fe152313e90e78559d4b57b9b6db2e668ffe0358dcb74a40159dce9057e4872d905f8490bba4c19cd7a8e0301439df96b
 DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
 DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
 DIST github.com-golang-sys-e24f485414aeafb646f6fca458b0bf869c0880a1.tar.gz 670015 BLAKE2B b457c61f036bab4bb9ed035855607027552a6ddce89f0725cd6615362f12bcd478966e4e4b287c05bc6d055ebb21032f5993e00fb772dc18ef9804e3b0e9978a SHA512 f1c7aac5ddb1ebd9bfb91bae24c78840f2d31a5305c8d2cc4e2f3a1fded0c4432a340d92f753e3aee717f7e5643f5187eb16ac645eb6ef86df1beabcfb97d761
 DIST github.com-golang-text-17ff2d5776d2.tar.gz 6580833 BLAKE2B 85a9a26c6c5427cec821ce39fe3d01726271e2fedd24c280d63d57e426d8eff9aa355215cded6d2e8d754169f0ff5c8781b4a0cda481c6289b2016d9d1857bc5 SHA512 62318598606aab26b95cd62f8e30fd6519c2f2dfc2b5d6fc906ec70c0749745539ff983a6e084c3624d108231797d320b77b53a27aa18d9e83bf2af947dfdcd6
-DIST github.com-golang-text-e19ae1496984b1c655b8044a65c0300a3c878dd3.tar.gz 6112971 BLAKE2B 46e4358a177a6253797177a31d0509e63c2986645c61fb833c479498fcf3a8cb2304a81c47c562340087dc7eba5273690cfc86bdb978e72b1183715c8e9cc662 SHA512 555dfd99a41705b0e1aa7ee5a6465fbe53d1dedeeccc226a26edafb1f41d5f7a137cd4ed6ad02146d112055ca324569ccbe2863933dd363e5ed002cdbda6fa90
 DIST github.com-hashicorp-hcl-23c074d0eceb2b8a5bfdbb271ab780cde70f05a8.tar.gz 69787 BLAKE2B e1d034d5863ae8bca85736e971e613e6821665861e35954a067e5d659029a8680b6902387848a318aee374cd4f6b810ae160046979b5bc86e64df0e1ff5d08f6 SHA512 751ea2fcea04ab2a9b61a45443a71cdee9cd09c2576af048108ccb56027b34f46b00e14aa664b966165b7d8cbb994e49f128bf54e3469c627d73f7ee2809ebf8
-DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
 DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
 DIST github.com-jinzhu-gorm-5174cc5c242a728b435ea2be8a2f7f998e15429b.tar.gz 70487 BLAKE2B 28c780726bbd8589beccce79f5af4a71a1ecec8438fbe77af846f79a1f8879cb8d6920b52367ff5c63bf9100c19e3c5a48ce77aa1a13ed1f17eff84529259626 SHA512 04c6a2d2c32e9a020f47f88a5e58dec47b500f387d798b98ebaada905d85ad014f78fe8683d662c61fa0c6286da1c0bc733b03f7f7ad912640cf01a4a7e4de49
 DIST github.com-jinzhu-inflection-1c35d901db3da928c72a72d8458480cc9ade058f.tar.gz 4506 BLAKE2B bf66be135369acdef3c356310de015f9b0f3eeaaf9273e315d52ef21fad3d93d27a90535252a846e5f0c7d2680dccd1080c7f4c56d3d48ba38ef0cffba18129d SHA512 bf30d10b9e101c9fde9079b12b519e8bdeb5f40bc964109940b58a2bccdb2f9775c6bf25dfe47ae7b8bc7e34a0b9109a0d9f1f5b4e70cc4093264758bdce749d
@@ -20,20 +16,13 @@ DIST github.com-mattn-go-isatty-57fdcb988a5c543893cc61bce354a6e24ab70022.tar.gz
 DIST github.com-mitchellh-mapstructure-06020f85339e21b2478f756a78e295255ffa4d6a.tar.gz 15601 BLAKE2B c2212f4c34ae15eefa1a681b2beaa8cbf3f63fb2317a8fd95f21df54eb6a05b2d312d96848deb1afdd47aefdeecadd20920ae25a0d865f31c16b6a5da4ac6dbd SHA512 30b6f8f902ab7d4dad899c19687b6ec0e8c51655a04163c37ed1fa36cb420695631534097d4de0f342dbe649b412d38d0254b40bbb2970c3a70adc0244a6e800
 DIST github.com-pelletier-go-toml-0131db6d737cfbbfb678f8b7d92e55e27ce46224.tar.gz 56608 BLAKE2B fbe29d5ff5dabf6c6bc123c41fb341966c5d8b41582e3dbd241e26e6e1e6b2afe7f66927e84dd9233704b766d5f72acb451359e9034466de8700d30d09f50166 SHA512 5d1b21d5af4d148451ad040a80e8c9523c0553b3fda84bc3e079881bda06dde7cf00c2daaf790bbab12f2afd2bbe794b1b7982d8a3c84411f6af99c92ececeea
 DIST github.com-spf13-afero-57afd63c68602b63ed976de00dd066ccb3c319db.tar.gz 43598 BLAKE2B d7fe3fff67b37002696f6672a95bacd9a8cc30783162eb4fced93bd86e91e10cde84f94a53a3af488ec032e42e1ea21d7e3f4f215b3e2b50c7add042579b749e SHA512 8563490cbab569c9bd065ea4e530a1cb47f3159100af0ad21501f66f60316a12e8e5b497829250d4b64993baddbd542996ce073b68674172ab3fb7213106771b
-DIST github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz 9594 BLAKE2B 4979fd23b48a6bcd2538357d33b7670326b9129b5de309548492d9597eace1320875e1b242b594c98777192c1e0c6abb0bda4ba946a43530cc68ec762d1949c6 SHA512 2b97f56aa83dd1302e02603a8fcbc8f2642ceff8bdc19cf8a26120801023c4a8a3fed689de0ac392f6a4144450ac85d32b00fbde200b22e972c31cbabd996cad
 DIST github.com-spf13-cast-v1.1.0.tar.gz 9592 BLAKE2B 0591ad8a8540dfafccfa68eccdc9da028213032df0b51e0057421974e84de85a28bb76ffec798048603dd33fe134769f55ed92580f3ffeef6abf6cf36c0344fd SHA512 21b9c1e72fef53a2100004f9aa1d027e7e9e1f5796753a8c22cf3fde5204d0a61fc667656eebcf3791ffa967221aa61d359a81d0e6976b5741115ef8f3f861be
-DIST github.com-spf13-cobra-7b2c5ac9fc04fc5efafb60700713d4fa609b777b.tar.gz 101642 BLAKE2B 9d0ea2e12e915d79a3c8351357cc0ec564910dc145be7d0b8eced6422e4e841e66f28f211e369d5639fcacc201af553e70a740dab76354f9b3b256bf08c3d100 SHA512 5618be996d70382efa9a84d0d06fe866b0fc955ea79240f37132588d0f793988ed4ed1584e716d2644a774d5b4e0e80b77a04d8740cab313107929eb413e25c2
 DIST github.com-spf13-cobra-v0.0.1.tar.gz 101512 BLAKE2B 1f61e9a6ce820742d5a575901cfea6188d8bed5d3034930649c73ffcdc3e3fccd5e6c55cf017197566b21a8e141e82f9363d4531f3ca3ba08ae3f34cefdfbf1b SHA512 e2d3865f90f20c144694a70b4b7b74baf636c31d9a1efedaa90135b01ee7673a17cfc51d4fbf11f220f9035ca52294b7ae4a61c42101da059911e4bba5b1918d
 DIST github.com-spf13-jwalterweatherman-12bd96e66386c1960ab0f74ced1362f66f552f7b.tar.gz 6347 BLAKE2B a1e62d37f3f736086ba5b198ca33e243f4650571d42448c593ba7c0970883aea401e8ddfc90975686bb5c992e5133294662a05b245620ca52c254b2a7e866d29 SHA512 04522be3439a2c3a06f38f764e275d8d093b935d610386bb99364f105d7d805a6a7e7a928796682955549a88d43b21f385404c1401ee66374d324f954bd4769c
 DIST github.com-spf13-pflag-4c012f6dcd9546820e378d0bdda4d8fc772cdfea.tar.gz 40078 BLAKE2B 4a15afdf122a58dd006d57da88176fd2804d98706ac3d8c496dc14b084851288dd28bad95f7871d738f0487db46aa7969dffbdf005c14fc6f46bcd0ad7e0f673 SHA512 4f4d606bfe94ea51a6cde535f16078602f1d63bd2896aed52bb53b3d219510ab38ad4bdc692da2eb355c9361041d7322db6424f63783bcc367343a1666cdf297
-DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 30849 BLAKE2B 8e66dbb5c90c47e66ea72848d86602861791fe3198ce6cde5ea87330f15dd19cdd249788bebc31b2a66577c20edeef01c8beb59a4140d57167c4b13d33118a04 SHA512 4acd37411683d753d81d839e83c2257bc424c42b8e295868da84cb045db131be063b0e5a0fb88c587332582f356186659d5a181e65ae1838e868576543c1fecd
 DIST github.com-spf13-viper-v1.0.0.tar.gz 30804 BLAKE2B 9f88f872c1bcd0f3590f7b4bbc35e03b3d3fec5233eeff0ed1cc1cd68dff1b29a5170492683f864a8b66fddd57722cac2ecb06a0035f6b4dc40a636025e0ccac SHA512 a9264fb09dd9d069f3ec1543a32c55a1268e6b33c3715da9116fe6e23f7b6f179785331f07f13cc03db29eb38f017eb5e8569e144bcaafbd73801857e0387504
-DIST kube-bench-0.0.27.tar.gz 6208481 BLAKE2B 5d3efc972d0caee4db8ea80c6ec24008a9a47770cb1befce20795d6d7e8a3ae3a109b94239a0844bcc44b008f13051db72ca19b8395a9079bb424a3ac8660ebe SHA512 5c5bc90e24d805881b9949f86b852814c2e920b61616b91716a2705230a135e8d3475fa8ec2ed0add9fc2346a17e0538527eb8a7d4dce23dbc8d3b4e99b23a74
-DIST kube-bench-0.0.28.tar.gz 6210140 BLAKE2B 239f151918b8ae0646e24bdfa95b08896dfa3702391bc736e2816c78a9309f45203ffa8111f133f6f566919a02845ea2f4f85f61fbdeebde013da834296df771 SHA512 82a8671fe02f44f9b8309ce7eac36e11e4b3ecff5f7a6dbecc65a02425eea142a60db9d494f038b412954085eb10c131e8e4ec1fb2e95bde2f96c2b35e97082a
-DIST kube-bench-0.0.30.tar.gz 250893 BLAKE2B a52e465368b53671fcfe392d8c167a12d75405564333244212f743b57230f7b17edbe36e59a1262a17cf7d27b5b29d95204eaf600cd531a9f5d7dc25b4c2953d SHA512 7c0075429a446ba89d183867fef72c18f4d12765bb7f6faf65304fa8cf3a76e1552311907d66bbe0795cffccd7025d98b481b7f9a2f5fec82345acc4ea798efc
 DIST kube-bench-0.0.33.tar.gz 253236 BLAKE2B f441cbb4315d785084a51ac89ee3f02b79d569a38079384b82afc8a966e2b9fa948f93db5655abb8ddebf8df1a95afc53376992441889f53b009fd96dd809937 SHA512 f6b688126c2f09d1af3128e4888548eb943b07a336d378eeeb35ca8d84ba69d93d8672b114559f91dcab72000c9bcc996d415d01f1de9af6ce6810a399a6e631
-EBUILD kube-bench-0.0.27.ebuild 2378 BLAKE2B 7e6940c4b47382211bf747a32f68c03a9f68e1a14f7ad8e7b5073767562d7f22476edc7c2dd1bb2a68e103009e3c294f2d235cea055782fb5b616b5dc71e6a3e SHA512 17f77e0476ca8cdad7986e901810cc6af88b723367295438d6a5632b0f98aa032aa6ecbba9320256b26bd0aea17df1ab8a96e17b9be5f005ae8ec7a62215f88a
-EBUILD kube-bench-0.0.28.ebuild 2379 BLAKE2B 13c334651f415c1b45d77cea83a84bfd2db0b42b39b327d2f949d161e1ccbe5e8c82e2864af7033aeb4d284e7835a3c9507dd1a6749e31e10e35bc46b9347e6e SHA512 b75469ec2e6300fa2b294f2e4fc3887e228607c90511d9639bdc758c1cd76ada09609bc4e1a369e2e1805963c971bb9f6e8f0cdf413b892cf94afbf5cb0f1f26
-EBUILD kube-bench-0.0.30.ebuild 2286 BLAKE2B 1307c1868df0a78e5628a5b06ad32ca491e57d87c10eeb311ab2cfa6ee4f13da76f1a369dea2ff45130023bbc69ecb347ac32272361f3b42aeb060a0bf038e6b SHA512 fa680496be332ece42bc89f528fbb6f253e41bba1b40d9f653ce8d7fc4e696524b72516fe805bc26d5e64b40b254e1c3ab64f8d54c40eee757284fec942358d5
+DIST kube-bench-0.0.34.tar.gz 254837 BLAKE2B a7606ec52741bb0551a9073e1f58d23db6571c7d7ad6775ebe13ff32396530fd03b7845ede40baec6bea6cb437426454cef624b1c711bd5fef242a772e14e7e3 SHA512 4df1b88ae3d6425dff7473066bfa6561f32e5ef6f137984f7a90e713f3dd1e59f8551353cbc3e86fe35c6cd3793d2acc13b9db426bd7930d22d1a06e9c7f4156
 EBUILD kube-bench-0.0.33.ebuild 2286 BLAKE2B 1307c1868df0a78e5628a5b06ad32ca491e57d87c10eeb311ab2cfa6ee4f13da76f1a369dea2ff45130023bbc69ecb347ac32272361f3b42aeb060a0bf038e6b SHA512 fa680496be332ece42bc89f528fbb6f253e41bba1b40d9f653ce8d7fc4e696524b72516fe805bc26d5e64b40b254e1c3ab64f8d54c40eee757284fec942358d5
+EBUILD kube-bench-0.0.34.ebuild 2286 BLAKE2B 1307c1868df0a78e5628a5b06ad32ca491e57d87c10eeb311ab2cfa6ee4f13da76f1a369dea2ff45130023bbc69ecb347ac32272361f3b42aeb060a0bf038e6b SHA512 fa680496be332ece42bc89f528fbb6f253e41bba1b40d9f653ce8d7fc4e696524b72516fe805bc26d5e64b40b254e1c3ab64f8d54c40eee757284fec942358d5
 MISC metadata.xml 333 BLAKE2B c8437977b6a07e36929b13f767af0f09158bedd1ea7a0bee1da52dd1b83acb2929248c3c385a5fba14362721ab6871d399ddfba53d15bbe84a87af0ad771b73b SHA512 295cae435555436e9091195ac585fd30d022aba0b76244c85927f19f14b38dde95fb14192c832f00f52e3cf71aa3d95f7527b22a90690f85206178c49d620c8d
diff --git a/app-admin/kube-bench/kube-bench-0.0.27.ebuild b/app-admin/kube-bench/kube-bench-0.0.27.ebuild
deleted file mode 100644
index f2b116c490a0..000000000000
--- a/app-admin/kube-bench/kube-bench-0.0.27.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/aquasecurity/kube-bench"
-
-EGO_VENDOR=(
-	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
-	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
-	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
-	"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
-	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-	"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
-	"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
-	"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
-	"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
-	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
-	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
-	"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
-	"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
-	"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
-	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
-	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
-	"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
-	"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
-	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
-	"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
-	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
-	"gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
-HOMEPAGE="https://github.com/aquasecurity/kube-bench"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o ${PN} . || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/${PN}
-	insinto /etc/kube-bench
-	doins -r src/${EGO_PN}/cfg
-}
diff --git a/app-admin/kube-bench/kube-bench-0.0.28.ebuild b/app-admin/kube-bench/kube-bench-0.0.28.ebuild
deleted file mode 100644
index 456872daf1dd..000000000000
--- a/app-admin/kube-bench/kube-bench-0.0.28.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/aquasecurity/kube-bench"
-
-EGO_VENDOR=(
-	"github.com/fatih/color 570b54cabe6b8eb0bc2dfce68d964677d63b5260"
-	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
-	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
-	"github.com/hashicorp/hcl 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8"
-	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-	"github.com/jinzhu/gorm 5174cc5c242a728b435ea2be8a2f7f998e15429b"
-	"github.com/jinzhu/inflection 1c35d901db3da928c72a72d8458480cc9ade058f"
-	"github.com/lib/pq 83612a56d3dd153a94a629cd64925371c9adad78"
-	"github.com/magiconair/properties 49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934"
-	"github.com/mattn/go-colorable 5411d3eea5978e6cdc258b30de592b60df6aba96"
-	"github.com/mattn/go-isatty 57fdcb988a5c543893cc61bce354a6e24ab70022"
-	"github.com/mitchellh/mapstructure 06020f85339e21b2478f756a78e295255ffa4d6a"
-	"github.com/pelletier/go-toml 0131db6d737cfbbfb678f8b7d92e55e27ce46224"
-	"github.com/spf13/afero 57afd63c68602b63ed976de00dd066ccb3c319db"
-	"github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
-	"github.com/spf13/cobra 7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
-	"github.com/spf13/jwalterweatherman 12bd96e66386c1960ab0f74ced1362f66f552f7b"
-	"github.com/spf13/pflag 4c012f6dcd9546820e378d0bdda4d8fc772cdfea"
-	"github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
-	"golang.org/x/sys e24f485414aeafb646f6fca458b0bf869c0880a1 github.com/golang/sys"
-	"golang.org/x/text e19ae1496984b1c655b8044a65c0300a3c878dd3 github.com/golang/text"
-	"gopkg.in/yaml.v2 c95af922eae69f190717a0b7148960af8c55a072 github.com/go-yaml/yaml"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/aquasecurity/kube-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Kubernetes Bench for Security runs the CIS Kubernetes Benchmark"
-HOMEPAGE="https://github.com/aquasecurity/kube-bench"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o ${PN} . || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/${PN}
-	insinto /etc/kube-bench
-	doins -r src/${EGO_PN}/cfg
-}
diff --git a/app-admin/kube-bench/kube-bench-0.0.30.ebuild b/app-admin/kube-bench/kube-bench-0.0.34.ebuild
index 5efb03763d5c..5efb03763d5c 100644
--- a/app-admin/kube-bench/kube-bench-0.0.30.ebuild
+++ b/app-admin/kube-bench/kube-bench-0.0.34.ebuild
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index c770be83dfa5..506865132de1 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -2,19 +2,14 @@ AUX logrotate-3.13.0-fbsd.patch 855 BLAKE2B 48494caecc49d7b819f889bc7acf6bd29e71
 AUX logrotate-3.13.0-ignore-hidden.patch 542 BLAKE2B 01c6e92306eaa2356090e5539555711ff09c7bdc6042aad7f3c5d9faacf449f00bb3040132bd00774104f8c0a8cb40073cb7c26323978ef199847a88eee26e45 SHA512 88bd9dd906171d45877e4c21e40cfc9a729742825b4c5d583fd9364d3943aa604e037e4b58e053a1fc7c0b77bd5ed6171f741778716ef753ecbb02ebaf012589
 AUX logrotate-3.14.0-ignore-hidden.patch 548 BLAKE2B 29a8efd36b000cc670a8a2db46cac3ad12ca49c5900409c3e1b456da88acc869e66a479481fcb24731d44d7d1815fce54068542afaa4737093a65a35ea7cd79e SHA512 2f08e4b1b483d301e2c6f9a5440957f43d336d44b3393c4408a02b5491826f887d53c782a6c7472bdb1ede9baacf2d1608d7385a576da0a8441a4b5a48ee5113
 AUX logrotate-3.15.0-ignore-hidden.patch 566 BLAKE2B 1739e0d175311eb2a3692826830bb101dc65b3966eb6dcd96fcbdb6bb1376eac5c0d0c78a26ff2ee6cfad57396d05dd3cae9ff4621a94b80d9a8b5877a52195d SHA512 ed572f12617812b44f7b79e9f3c7fb7aada1fed8f80244ee9e5e7c7f536e493c69790c7c62e0dc1951f979bc5a2cff581f439a8e1fb1a47722e6c0f1dcb4e65d
-AUX logrotate-3.9.1-Werror.patch 344 BLAKE2B 6f132592ec2446943cb4f6426b7e25b432e9e44d82d080b3773ab7f5c34de019594ef77fa74cd74e026605e775ee2b119ab39c2eeb50a092dec1a1c502409b4a SHA512 6ae8b49d1f29ce1c32603716555085b7fa2d865177558abe92c84867c69ca84b8174563db07537801ad01572717670478b273acb34b5885b9170354d1cc02493
-AUX logrotate-3.9.1-atomic-create.patch 1253 BLAKE2B 2e3486f31991ea351300241fe2ea64ad8bea952c4faf7fbdf363b594a7823312c6c9497397abaf051c760e9fe93bb8b592ebb78ac85a23bba2f5db619de6c35f SHA512 92fa8e04522f9bf06840befcb019a498d465f2d8afa3475f97e953b4e8abf2cf63f2fa27d8c89c5620da59468f753d94720f5f3a604376d7e51b86c9eb156c99
-AUX logrotate-3.9.1-fbsd.patch 1393 BLAKE2B 27f82ffb51644ce117d53a0e484779692b0b8d547d14c944c87a41862127cf05c31477c73721bd2729dfc2c22264305ce60738063640dfef47c06bcdd9dd78e1 SHA512 dd8bc024eb280e5bcb2869682bedaf5c8db6d18976e412de3283f32bc5d9ad370fdda27194eae11fa3da53339d83ff20fe541e99eb8ed183997ecb85a606f822
-AUX logrotate-3.9.1-ignore-hidden.patch 551 BLAKE2B ed2a533ca01b99fa29b5a1fc4c51d5122e027f96d549dc2d453be963df990372b2b5a6ff994c62767657f49b46a950830ed43718f454f22283555ff1f7327486 SHA512 8a2060b4f3a92f7920090b4d02b4f66b7320c068936028f07dfefc0411b0f78b1477565cef627ce131d2cd5e98ead04b7d0289c4961e68da36a69a81d8b40acb
-AUX logrotate-3.9.1-noasprintf.patch 1263 BLAKE2B 5f145d46e3c372d3999d58bb8e01ea07d7c81559f576a783548588b823abe33142fddb0bfbed51ddb4986aad0655a6c2b6c5f092866612af80aa2ed4c24368a6 SHA512 c84be7ef011fe09a2fae67fa918080c1b0c098f0000e6cacdfcc34311f17c0131e68bc1e337559391ae7272fd326ac7ba6ba1cca20f99a9cc51367ac35a924e6
 AUX logrotate.conf 743 BLAKE2B d623d150d9959ae57e61af2c442434f81636521c133479aecbad8731662ee3743cb3db858ed8326ff87d61262d20893ab6141fe09d12979785e8c52c428f5964 SHA512 c0357a432a4619392895d8180db3c593239a96f62aba7cfd981c76e9d1dfd9d93d63860655025b1e9473374c2a51068028c3a3f316cb5cbb71562ca4a61d8d24
 AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe8d0bd1703e5075671dd1e13a030ec06fa269214bff9552670d3e0932e3dbde2e3673d59b7a50a2458b SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36
 DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a1623cf1aae2444e818339361c7b7762ce51fcbd124fefafbe47d529dd21ef346a6c9a267da20547914388db99dce003 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76
 DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
 DIST logrotate-3.15.0.tar.gz 219496 BLAKE2B b9f9cd0b22b79c3da1ea6092c5f3ebf9fca39da3a4bb7e1da39a8bf96f0bdb573864b77681671ad227cfc444bbc3e64a518805780580adb954bfacd564f00e2f SHA512 9520f15eaec54da426699f1f5ce31949d1372fa25c5c127dfbf29ff717a1c15a6fd14437c1d7b67b116b12c8a5c28f6012e39ad4b3ca2b053c874d02efe98d84
-DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
+DIST logrotate-3.15.1.tar.gz 220263 BLAKE2B c164c542a0770965f5193f5816509f566b9afeb82ce8388a184d16c2b3e79aa0ef93be10d477c85f62037f01b3e626ea56d3173ca8cf017b8aa315f2e23b1a2b SHA512 72294607762751fb1aaaca1d62ebd87d109d837d50606176159a5e74782a993123321967b7a6185df6ca9c87a54febb832ac7537ceaa580a895901a995570cd5
 EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054edecf4abeb8dbd0d5df7f8bbb27e1a17a384cf4d44042197eac0c8ac7d5e6e888ef689fe2794ae206d946661b6196a SHA512 2f6b6caef77088ff1aee15f8a289f1b3559180034b5f2bfa5520b2c3627bb0f92e0f5555cbe914f4877b50729f84e3ca3f0353c6e1b63442e156b530819294a4
 EBUILD logrotate-3.14.0.ebuild 2511 BLAKE2B c824de62f72544448b54948e5025b0bfee7be00b9355be4e5c64d51721efc064dacec319f9de4e93c61a7aec2bd70c4d0515a693be375d35c16c30cb1a2b927b SHA512 e088a56371b59e4d10f4ea5574ba12985b9b7fe81de11624cfb302fee0bc08581334230776aaca74d67d9ca160dad4301f06b14e5c608c26ecffccbf370a252e
 EBUILD logrotate-3.15.0.ebuild 2491 BLAKE2B 54d0c42640b5bc52d8a06515dc93a8fb3882e5bff1307ff83ba61c02022f5a798646e56eb3eac11edad9b1d4a347a792401a155e8782df4bfe78eb782d429043 SHA512 ca4f7eb1af6d0ade04ff4917b254bb63b733daac0bcffc758804c2f15478a8b8c2ea6715fd10ace0f09966557f3d6999fcfeddcd9fd22cae6594838507fa5f08
-EBUILD logrotate-3.9.1.ebuild 1767 BLAKE2B a59f23a8a0a24b416f23a087c60fe046260cc24521f68f2551bb2a2821d12e94307e2d620ec4b625cd1b6be21cafa3d2c0f044468dbc2760897e5bb7854ac7af SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03
+EBUILD logrotate-3.15.1.ebuild 2499 BLAKE2B c5642260f3cc83c3c2a9efc208b63d28db682dd25b38fdd03de9277818deba869fe0f809932c12a52f5a4bc9cebd2b3f00cf9d4df9f01b4333c1d3bdd9655a62 SHA512 264ff42deecdc6fcd787adb0fef729e0e96fba0705eceb49d5ff519b7fda2e149a59b1dcca022a55a1ae11c98f646e802dfa92a840a4bb78766b0e05ec206792
 MISC metadata.xml 1126 BLAKE2B 1655e4bbc549896f4faef7cab3c539a5dc2a9910c80eacc6ee5626d97f1b6a5df448a502f3899833afb1723ee42f0be01e025a5d23ea3af1bab2a0311f43760e SHA512 f895d0c5ed7b02c4b92af5596a160199b6d765564050dda45171ff6e81137c508da5a8ae5fece89f04b2355d0f1b41f839aac667e4a8d8119ff64f44f34c6084
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch b/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch
deleted file mode 100644
index b8cecc4ebfb2..000000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/Makefile.am b/Makefile.am
---- a/Makefile.am	2015-04-03 09:39:35.000000000 +0200
-+++ b/Makefile.am	2015-06-28 14:03:12.429999875 +0200
-@@ -1,7 +1,7 @@
- MAN = logrotate.8
- MAN5 = logrotate.conf.5
- 
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- sbin_PROGRAMS = logrotate
- logrotate_SOURCES = logrotate.c log.c config.c basenames.c
- 
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch
deleted file mode 100644
index fdad8b6ea002..000000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-atomic-create.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c	2015-06-28 13:57:18.449999884 +0200
-+++ b/logrotate.c	2015-06-28 14:02:20.799999876 +0200
-@@ -371,15 +371,18 @@
- int createOutputFile(char *fileName, int flags, struct stat *sb, acl_type acl, int force_mode)
- {
-     int fd;
--	struct stat sb_create;
--	int acl_set = 0;
--
--	fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW),
--		(S_IRUSR | S_IWUSR) & sb->st_mode);
-+    int acl_set = 0;
-+    struct stat sb_create;
-+    char template[PATH_MAX + 1];
-+    mode_t umask_value;
-+    snprintf(template, PATH_MAX, "%s/logrotate_temp.XXXXXX", ourDirName(fileName));
-+    umask_value = umask(0000);
-+    fd = mkostemp(template, (flags | O_EXCL | O_NOFOLLOW));
-+    umask(umask_value);
- 
-     if (fd < 0) {
--	message(MESS_ERROR, "error creating output file %s: %s\n",
--		fileName, strerror(errno));
-+	message(MESS_ERROR, "error creating unique temp file: %s\n",
-+		strerror(errno));
- 	return -1;
-     }
-     if (fchmod(fd, (S_IRUSR | S_IWUSR) & sb->st_mode)) {
-@@ -430,6 +433,13 @@
- 		}
- 	}
- 
-+    if (rename(template, fileName)) {
-+        message(MESS_ERROR, "error renaming temp file to %s: %s\n",
-+        fileName, strerror(errno));
-+        close(fd);
-+        return -1;
-+    }
-+
-     return fd;
- }
- 
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch b/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch
deleted file mode 100644
index 6e329d6149f3..000000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-fbsd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2015-06-28 13:54:18.309999889 +0200
-+++ b/config.c	2015-06-28 13:56:49.599999885 +0200
-@@ -1,6 +1,6 @@
- #include "queue.h"
- /* Alloca is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -24,6 +24,10 @@
- #include <fnmatch.h>
- #include <sys/mman.h>
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c	2015-04-03 09:39:35.000000000 +0200
-+++ b/logrotate.c	2015-06-28 13:57:18.449999884 +0200
-@@ -1,6 +1,6 @@
- #include "queue.h"
- /* alloca() is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -26,6 +26,10 @@
- #include <limits.h>
- #endif
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "basenames.h"
- #include "log.h"
- #include "logrotate.h"
-diff -Nuar a/Makefile b/Makefile
---- a/Makefile	2015-04-03 09:39:35.000000000 +0200
-+++ b/Makefile	2015-06-28 13:58:05.729999883 +0200
-@@ -22,7 +22,9 @@
- 
- ifeq ($(WITH_ACL),yes)
- CFLAGS += -DWITH_ACL
-+ifneq ($(OS_NAME),FreeBSD)
- LOADLIBES += -lacl
-+endif
- # See pretest
- TEST_ACL=1
- else
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch
deleted file mode 100644
index 31d9298779c2..000000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-ignore-hidden.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2015-04-03 09:39:35.000000000 +0200
-+++ b/config.c	2015-06-28 13:54:18.309999889 +0200
-@@ -359,7 +359,10 @@
- 	char *pattern;
- 
- 	/* Check if fname is '.' or '..'; if so, return false */
--	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
-+	/* Don't include 'hidden' files either; this breaks Gentoo 
-+	   portage config file management http://bugs.gentoo.org/87683 */
-+	if (fname[0] == '.')
-+
- 		return 0;
- 
- 	/* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch
deleted file mode 100644
index 7983943ca89b..000000000000
--- a/app-admin/logrotate/files/logrotate-3.9.1-noasprintf.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2015-06-28 13:56:49.599999885 +0200
-+++ b/config.c	2015-06-28 13:59:34.799999880 +0200
-@@ -49,39 +49,6 @@
- #include "asprintf.c"
- #endif
-
--#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
--#include <stdarg.h>
--
--int asprintf(char **string_ptr, const char *format, ...)
--{
--	va_list arg;
--	char *str;
--	int size;
--	int rv;
--
--	va_start(arg, format);
--	size = vsnprintf(NULL, 0, format, arg);
--	size++;
--	va_start(arg, format);
--	str = malloc(size);
--	if (str == NULL) {
--		va_end(arg);
--		/*
--		 * Strictly speaking, GNU asprintf doesn't do this,
--		 * but the caller isn't checking the return value.
--		 */
--		fprintf(stderr, "failed to allocate memory\\n");
--		exit(1);
--	}
--	rv = vsnprintf(str, size, format, arg);
--	va_end(arg);
--
--	*string_ptr = str;
--	return (rv);
--}
--
--#endif
--
- #if !defined(strndup)
- char *strndup(const char *s, size_t n)
- {
-diff -Nuar a/logrotate.h b/logrotate.h
---- a/logrotate.h	2015-04-03 09:39:35.000000000 +0200
-+++ b/logrotate.h	2015-06-28 13:59:47.429999880 +0200
-@@ -80,8 +80,5 @@
- extern int debug;
- 
- int readAllConfigPaths(const char **paths);
--#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
--int asprintf(char **string_ptr, const char *format, ...);
--#endif
- 
- #endif
diff --git a/app-admin/logrotate/logrotate-3.15.1.ebuild b/app-admin/logrotate/logrotate-3.15.1.ebuild
new file mode 100644
index 000000000000..2be55d79dadf
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.15.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+	>=dev-libs/popt-1.5
+	selinux? ( sys-libs/libselinux )
+	acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+	>=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch"
+)
+
+src_prepare() {
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+	default
+}
+
+src_configure() {
+	econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	insinto /usr
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+	move_old_state_file
+	elog "If you are running systemd you might need to run:"
+	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+	elog "in order to create the new location of the logrotate state file"
+	elog
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs. See man logrotate for details."
+	fi
+}
diff --git a/app-admin/logrotate/logrotate-3.9.1.ebuild b/app-admin/logrotate/logrotate-3.9.1.ebuild
deleted file mode 100644
index 060e11be388f..000000000000
--- a/app-admin/logrotate/logrotate-3.9.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Rotates, compresses, and mails system logs"
-HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl +cron selinux"
-
-CDEPEND="
-	>=dev-libs/popt-1.5
-	selinux? (
-		sys-libs/libselinux
-	)
-	acl? ( virtual/acl )"
-
-DEPEND="${CDEPEND}
-	>=sys-apps/sed-4"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-logrotate )
-	cron? ( virtual/cron )"
-
-install_cron_file() {
-	exeinto /etc/cron.daily
-	newexe "${S}"/examples/logrotate.cron "${PN}"
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-ignore-hidden.patch \
-		"${FILESDIR}"/${P}-fbsd.patch \
-		"${FILESDIR}"/${P}-noasprintf.patch \
-		"${FILESDIR}"/${P}-atomic-create.patch \
-		"${FILESDIR}"/${P}-Werror.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with acl) $(use_with selinux)
-}
-
-src_compile() {
-	emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	insinto /usr
-	dosbin logrotate
-	doman logrotate.8
-	dodoc CHANGES examples/logrotate*
-
-	insinto /etc
-	doins "${FILESDIR}"/logrotate.conf
-
-	use cron && install_cron_file
-
-	keepdir /etc/logrotate.d
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "If you wish to have logrotate e-mail you updates, please"
-		elog "emerge virtual/mailx and configure logrotate in"
-		elog "/etc/logrotate.conf appropriately"
-		elog
-		elog "Additionally, /etc/logrotate.conf may need to be modified"
-		elog "for your particular needs.  See man logrotate for details."
-	fi
-}
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 8858bc5ae101..3621005963cf 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -16,6 +16,6 @@ DIST logstash-oss-6.8.1.tar.gz 171901409 BLAKE2B bff3b96bcf3f53450e1279f633788af
 DIST logstash-oss-7.2.0.tar.gz 171128040 BLAKE2B f0f3d4f0d5228918d8435c521d10ff5070e23561c25ce28e8d58997d499a7c7697354c1fb1cb70bf2bd832ad50c04afb00cbde4b3053f9f24d2619f3fbfffbdf SHA512 24120740bc727b6da50b865bb85bf61f013a38b6679d679ecc75a73c69766a5133fd47ad99fa0220d5dc6cceb506fbde206787adcee31483288c68c228edd1fd
 EBUILD logstash-bin-5.6.15.ebuild 2195 BLAKE2B 1ef9e7d8a825109a85e850c2e9b971c3b16d435f1a0e3dce40e18b48f64c5b83a3cedd0d85a15d422a3accccb0ffcbe79b2a0812fda24c04fd0f07a0e37b9436 SHA512 6026cb3d76dbab56a4a495b1bc3abea2d0c4c731261047e76acf792840f3deb1fdd0fd181b5b6a599f2056f22b76920e7844f1e76516919c7404c1d10e1b7259
 EBUILD logstash-bin-6.6.1.ebuild 2185 BLAKE2B c0ca9f44ca02db43d7b6b414f866f5d7a1eed19c44f45874a1df6a9171c0327b971878bcf74bb4028903f23bd2521464bac662cecd89bbacfcc32d6e88d4b4b0 SHA512 0088d7e185bbf58af1c4880aaac299f3a4a93ee1ecd3092aa9548d60767faaa963bbcc422ff40e8b8905b843da25d73dbb0b75bfffa19261306668fd9e414c43
-EBUILD logstash-bin-6.8.1.ebuild 2110 BLAKE2B 960d4716062a128de41b79d891a836a77f88ef27f6d5b2efddeb01bdaaa03dc517e01bfc9fea3ccba1135274915839733a904ab38687d4e7c72ff48304d81df8 SHA512 3c5f628adc74640347f458e86a1f82ec485730fb484685b21d76a1411f971ce0021a95cc1c5982f1defd896bb9778cd006c947e9022bb01f10690fc07ea590e3
-EBUILD logstash-bin-7.2.0.ebuild 2106 BLAKE2B 7e872a2d5eef819528109b77bfe27f7d80702e3567eda0e4c107e3db388b7a373c9edeeaa5720252d6951bb0f317352bc339303ccc4963cfe215e5de3f20ae6a SHA512 a132cae1a40ef430208f2e2567d6208ca65db8fbb0f9453e4dcbc274ef12cf925cf9287f964416266ba5749d787809134a7c9764734c5ba87331c814c71a2b76
+EBUILD logstash-bin-6.8.1.ebuild 2106 BLAKE2B 8b04abf9b4395e60882de2d5c482bb3ee17f1ec2446a5d2c24feda677025c0662580c277334d2f7eeb0a5b61fe52bc1513a79b1a55f85d33ebbd75829307b86f SHA512 c56a7c1c3eb973cbaf895206270f80a3ed3c9ccec37c9102b5cee1f6477a1952b6a93310f41046e12d021580862dd96fb1b658798126f00535abddb4d738853f
+EBUILD logstash-bin-7.2.0.ebuild 2102 BLAKE2B 4859b52ecbe2d3cb0fa31768cbfcfe59ff4ab1ccfb70ed1b0b30edf33415a7107a246ab902fc3c42897804482dd91a25bd8da6af29374c424bc53e700ed1b797 SHA512 3e346deb2bccc47fa55d2de9afbc6bea15f28d235e93fae323620a24a70aa6671072ab90f778d3157ba74c860056a1f76d5ad0ac678b6d658bd49ffbb8fdc3dc
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild
index 08373cbcbd51..05b243d87853 100644
--- a/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild
@@ -66,8 +66,8 @@ pkg_postinst() {
 
 	elog
 	elog "Sample configuration:"
-	elog "${EROOT%/}/usr/share/${MY_PN}"
+	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"
+	elog "${EROOT}/etc/logstash/conf.d/*.conf"
 }
diff --git a/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild
index 8a0ac16580b6..16a1b994f632 100644
--- a/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild
@@ -66,8 +66,8 @@ pkg_postinst() {
 
 	elog
 	elog "Sample configuration:"
-	elog "${EROOT%/}/usr/share/${MY_PN}"
+	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"
+	elog "${EROOT}/etc/logstash/conf.d/*.conf"
 }
diff --git a/app-admin/pass-otp/Manifest b/app-admin/pass-otp/Manifest
index b834692f3070..43f553305be1 100644
--- a/app-admin/pass-otp/Manifest
+++ b/app-admin/pass-otp/Manifest
@@ -1,3 +1,3 @@
 DIST pass-otp-1.2.0.tar.gz 46789 BLAKE2B 373b1ddfb4cfae07e9e58bdad1c9c73ca6c6f53fc140ccda21527ad2ae237d3402bc52e95a180811263ef1a29f5c9da7db0063178b19a85b1dafc3d20e22996d SHA512 3d1417462998750ef1580169ed0e4b721b5f430cd86a678d1b6bc7b2ac123879902f7d22c28dc21e8a171ec80dfc51b6465d0dcc78cb009eb731651f2cb152f5
-EBUILD pass-otp-1.2.0.ebuild 644 BLAKE2B 654311acef1502d88773782670fb3217fb29fb1cadc6d88eb77a71e5157dff136cf94da3bd1854723aea203cd5c47829755c19f8ec94197755d13581b8b68402 SHA512 df41f91e005673a3e960af58a9d1d0128213aabb5b6577ff2cd34d0ab72ef232bc06b780e8c85c4a0d38c95e8ec8adb57e6eb3507cf70f3d38c911b024a3b9f8
+EBUILD pass-otp-1.2.0.ebuild 642 BLAKE2B 3b9f99c333dab4b9286d152ea4af3cf9fa0379f45f9622466db7eae6a19f405fd069e647b338e3db2ccc46d710efc57d9df813029fbce6e1b8ccd8d008fc934e SHA512 8234117cae26405b9d6354677e8f87828076210287f41f2a8364c2bc7293955d44f19fce2da0d934f1d5ad945274c75263b18f498d88388c33adea1bfc4401f7
 MISC metadata.xml 661 BLAKE2B 34d62c5a12f51ddde97f0cc24ae0d6633844e847e9cfa81ffd4191b489f6fed7fc42a6e9f8ca75119f31f02306fbe958c68f220466d222db498fb6cff0e74a8b SHA512 071e5ad337d3e41afe2c6d4feb26f02c5f1105e5f51899af2f5021782c9a836b52e0575d8343bc3532fa227d2b385f248d72be46cc395233d7c77325beefea6e
diff --git a/app-admin/pass-otp/pass-otp-1.2.0.ebuild b/app-admin/pass-otp/pass-otp-1.2.0.ebuild
index b93a38c51e23..07731fc77c09 100644
--- a/app-admin/pass-otp/pass-otp-1.2.0.ebuild
+++ b/app-admin/pass-otp/pass-otp-1.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tadfisher/pass-otp/releases/download/v${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="qrcode test"
 
 DEPEND="test? ( dev-tcltk/expect:* )"
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 20e454376ad3..34a30d23e995 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,13 +1,13 @@
 AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
 AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
-DIST puppet-agent_6.4.2-1stretch_amd64.deb 18776024 BLAKE2B d8fd52357abb9649d74c9b7e54eb0f599cc2b6b1cbe8a4bdd3bd21c69904379dcda2fdea4e642d3f86bef846d1bdfb14eb8c3daed50958ad3add46bde96fe5d2 SHA512 b1bdbcb1cb87bbf4391073b0596d759e1386bd5b93046d25be112f1ddad6a0d4da162116dc9f85908de67bfd3d956a1c418faf39a85c3ed0d02f9891d4d9906c
-DIST puppet-agent_6.4.2-1stretch_i386.deb 19250972 BLAKE2B 8424047586f7747daf24901f7ba134bfcd1fc4db094fd458f4298251880b0446221575cc463c511a32a6f7cf4c635c95b6132631640b5091e48b1e7cec67b844 SHA512 0041b1e3ff1401b21f7d9ab3b3aee66d76e30acd4748571ff3ff595d7006008e0d9d3f4c28db85cccece0cf08595cf4a3342353f5b18ea3e02ae02a094e42e41
 DIST puppet-agent_6.6.0-1stretch_amd64.deb 19177382 BLAKE2B c8034e4a943394da7fd97756b3dfb59897f3d787a8f49743a4c42ed47db4411f6d0e125cf6984728a108e5070cc8e42ca0a203d2afdcce99e08ae38a6ebb9293 SHA512 f0d129b357feb6e5d05c080437910e119bbce0e97e36927c2f97d3d7fb8f54a0eb1503a74ffec3cef7fd29785fe97ffd53f04a4be6a35b558ee278af8871289b
 DIST puppet-agent_6.6.0-1stretch_i386.deb 19443284 BLAKE2B c017abc3166b3cb04a98c511b5ab05dd7076906a38edd8ee919848c130ae5b1cb6c7542b6c6c3da267fa801e152ad963c84293083c709dd769185f943a4bebcb SHA512 adadc3201dae261f2000282b67b8c4735eeb588c4c6c5dcbcde2e655772bebb1c343611607d84ba1b019279480445dc44cd4e3cc3d64e89b70e93b85a37678d5
 DIST puppet-agent_6.7.2-1stretch_amd64.deb 19184682 BLAKE2B 6078c1b21f0e737881d949cfaf052571b40df450e53724696e2738141da30e59da7abf03ce00285ab77fd4ac52291ab6e42da373420807499f37b75c872fa83e SHA512 1c464448b1478397af7b806f8bfcaee0378af9d4b6bfa5a73e8245064329b1b49136107c5fcbaea0ef6cd4e1daf840d1ba331e798b2cd255ead54969520315c9
 DIST puppet-agent_6.7.2-1stretch_i386.deb 19452604 BLAKE2B 1915e7b7085db6cb87980a98a7cb85881331719e2af98b07f8461514a0296b3cf5181eb88f78893055a0fa09fc2ffce0e81e866db27abcecf9d8f745e329311c SHA512 8d89735601c9764e207eef77f5d42e836ee9d7c0c0f2856e0f293919cce52e7a42fc28fca42bd0e0bed760063aae527007ef7ce25503ce05fcfd495a44243ee3
-EBUILD puppet-agent-6.4.2.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
+DIST puppet-agent_6.8.0-1stretch_amd64.deb 19184708 BLAKE2B ac961857784eaaa55604285cf305dac437007628ea5baa3c3ae9a8a345fcb8cf2b20820bd80cc2c96afb77cb03c4d2779b17b1183c9bc9461b56860d2179f448 SHA512 707146f71b21df4b89244df7b786f481136cfe7b0cabf20aa0d4784aca547ba85c75d13309b77c853b9e034b8271f350b30bc5358010d90b7573e3fdb63c31b6
+DIST puppet-agent_6.8.0-1stretch_i386.deb 19478404 BLAKE2B 0b9d76bb3d745ca42e489e16a133d684aa0e485941d59c6773c447f5fc79be7a964f0a2ff9e4c334a47b7d2ffc0264bd49e4f7806cbc2e72e037da1c9e385d51 SHA512 f8bc962b32abbaf070b81245b7488b4fc131d5a9e3ec94ac97038f5e9c942c70a493e61e13190fe2837eb898518724bb5f360b37531003dab37606436d66219b
 EBUILD puppet-agent-6.6.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
-EBUILD puppet-agent-6.7.2.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
+EBUILD puppet-agent-6.7.2.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
+EBUILD puppet-agent-6.8.0.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild b/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild
index a72df734d6b1..c648209a4a7e 100644
--- a/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.7.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet-agent/puppet-agent-6.4.2.ebuild b/app-admin/puppet-agent/puppet-agent-6.8.0.ebuild
index c648209a4a7e..a72df734d6b1 100644
--- a/app-admin/puppet-agent/puppet-agent-6.4.2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 162d67502bf5..39b177cb8b76 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -13,13 +13,13 @@ AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
 DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397dd0a4aa26f5d0fa9ffa94477a5cc59b3724ab9ae3ee2e7e9230881676582c328c804ce9138dc484b9bd92e0ec3 SHA512 861100c02e0b8a5bb232d266bcd5e54b0e32cf26954ea37f276690aa3159ffdb28195ab8691df61ee0098300d226ea1d369dbdff8aae69101c2bbe6068ede8b1
 DIST puppet-5.5.16.tar.gz 3084466 BLAKE2B f3e2f12331b4794b90a81a4f80e626fcd3d5252b7cbdacc1d6243faa557540d3a68e5e23b7b5c3e4f4286774e9a9198e59fb15d7d7c41d7193754ed5c80dd624 SHA512 7d9e533e352a22e347ac6467094c4bdbde893c2503f47b4a2d175fd6e759e6662991efdd1a0a83d9495d22f28da4ae7a30cc771c5d90b8252c4618bd8837833a
-DIST puppet-6.4.2.tar.gz 2891159 BLAKE2B dfd8e5d9935d54272096fac66a037b8eab75dedc42caf18bafe29738e749a66869ad2e741753e8b38d872e21b1a261f2b4017c54faa57043754d619cf27652ed SHA512 7ec2746ef2a021d1cc3e3076840a9f1195fe51ba591cf2907e542b3f450cb1f4002fa3c958aee966c5976245073ba3cfacc9fd2a653d1d823720b33984aff911
 DIST puppet-6.6.0.tar.gz 2898687 BLAKE2B 67370b191985f75f783d795d7ef38df53fbf28efa8ab79ae309dba985f4ba296d2862fb366b68a46d03f526c3f27c51b1e1cefcccbaa96f6694dc888a7adcc2c SHA512 e7e7367565d12c208654bd353112542fb84b736f262dc86adb940e02a4e34d473e7bb5f084e0caa5fab01be4ef479ad2baa3e751d4d86ee447cf960f400413e5
 DIST puppet-6.7.2.tar.gz 2907345 BLAKE2B bbb0f789ae64b5039e5b1bd2ce985e89ba693d33352baee7a1d11df7f314663aa3606a73d42d6b20042f81ee405a72cd17b9cf8f3c3cb257869e982f84cfd552 SHA512 6ebcaff30bda27fc17870b991287d620d455db8cf9a41c59833efc2a7541d3622228a7278689eb0494d0f6328cd334764f21ffe8700a567696e05398a5c16b7d
+DIST puppet-6.8.0.tar.gz 2906582 BLAKE2B 2dd2f9eb203aa951e0ea9639efa20aac3edb063b4bd68dd0b05a07fc2a399c4b59b3b87a1cb573096c5042920080623b9afb9c4d863b6249664edcc291cd1787 SHA512 c8446529e706dab7fd156b5bbca638f1722b07a638f626df2002a4ad218ec5e448f533395a6eed613b31ebbacea56539e903c040998d4110c8a362f2ead7f43b
 EBUILD puppet-4.10.12.ebuild 5620 BLAKE2B 75fed43f7044fef014b1c9297066e07a5ef624fd187d141475e5fbaf69aab50494e783a16b212f3063cfaa059bec310b9771ccfa88d3f8ddcfc5458a75d2ba22 SHA512 8649b6811f330733ba25602e35e13bbd5be094c8f395d5f6c7a859662d831a579b9b3ad2a44b1ed9ea60882c32eb89a261f5e36977d79a2e9a88d5f12959a3cd
 EBUILD puppet-5.5.14.ebuild 3822 BLAKE2B b639a7bd6b1a2a0229271a2c00ae246e5cd219b91510f1fb1b5bcc4668d2f81c631233329628b78240354ae884ca9e4de02287896b326eef1220c81eb3d4e173 SHA512 1043b71e29082c1020a4c67814394dc70707c3f299afadb035bb2e15e4425a38dfa76b2323f4ad31b7142c1494cb05616ed28f0cf8f46b88760fcc53c3e734a5
 EBUILD puppet-5.5.16.ebuild 3824 BLAKE2B 0501c0a04cea8cd762732a7b6728833c99c828d79c39c18dc738e2c7cb063a8f14f997108a4d3863fc0abfbedf9546dd1541f01cbbb4ea3fdcb723a49fe6ec39 SHA512 baaadc5c82ea91dab0dbcf93a5b836248183777db978e0ec0621183b695191a19b6c7fdad892d0cec05c4426c64c949eadc4dce89f08cdea8b7b6f6913d01917
-EBUILD puppet-6.4.2.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
 EBUILD puppet-6.6.0.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
-EBUILD puppet-6.7.2.ebuild 3654 BLAKE2B f29afbb842ad182df92104a03d02770c607f54ba228a694659b09d83c512bf9d7f269da42257e3ff92e68cd77e98da9f1b1ab317e791b97d338a3e30cdb3998d SHA512 4a197ad3b8114a4e7c685ff7b0ca21411645f542f1f3a948382f2755db126b6ad0cb61dc37f938a5c38a0c1ef27c5df4c91ea043ff2a3813f61406e63da4a84d
+EBUILD puppet-6.7.2.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
+EBUILD puppet-6.8.0.ebuild 3654 BLAKE2B f29afbb842ad182df92104a03d02770c607f54ba228a694659b09d83c512bf9d7f269da42257e3ff92e68cd77e98da9f1b1ab317e791b97d338a3e30cdb3998d SHA512 4a197ad3b8114a4e7c685ff7b0ca21411645f542f1f3a948382f2755db126b6ad0cb61dc37f938a5c38a0c1ef27c5df4c91ea043ff2a3813f61406e63da4a84d
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-6.7.2.ebuild b/app-admin/puppet/puppet-6.7.2.ebuild
index 0038f1ebf433..eeefd4e8c63d 100644
--- a/app-admin/puppet/puppet-6.7.2.ebuild
+++ b/app-admin/puppet/puppet-6.7.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-6.4.2.ebuild b/app-admin/puppet/puppet-6.8.0.ebuild
index eeefd4e8c63d..0038f1ebf433 100644
--- a/app-admin/puppet/puppet-6.4.2.ebuild
+++ b/app-admin/puppet/puppet-6.8.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 218e68a84da7..d3cd3f84347f 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,9 +1,9 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-6.3.2.tar.gz 41707817 BLAKE2B 480737af3abc862e90a7075011327ce3821a5d9460c785602c105ec7accc82f2ea712ae488c585226126e88f817cbb1acda7fa09793b7508aa38cc47e1c76ab0 SHA512 e2a3ce73c976cbbfa6acc62612187478cf5ecc9d514ff4866a74e2c6364979f17c3daeba0f03a01e7fc3eeb1ca84a3c886fd5eed07d2a9fbaa5fd9f7c9d577af
 DIST puppetdb-6.3.4.tar.gz 41716289 BLAKE2B c2f0c074229340234e8ce146d6d711f0311f4a4d6c091ef497a376a5cca02f7bc5a85fc63555f7408f16dc60784266ba126149fb27a9e0bf0592d7ee314e4b4a SHA512 9da3707f0ecf1b7664dbf44dbc6dda79adce6928298aa8e263bb134bfccaf2403245ed0176f8929583f5631ba3927f99d6d06233eca07720d0fd174da33e4990
 DIST puppetdb-6.4.0.tar.gz 41720668 BLAKE2B a4637750c553eed8ee5bdd46212a7455fe1d59015aa78fe01f6fa9ee2b4a98ec50a2a8b551f65d4bc6965b2a969f559c53f5a6324a8e48983a1d027948387ce7 SHA512 c49afce1661ed284280e89ed9dbc2406a657e5f2cdbc501acf50900d431b58a341f1541789ea4ffe9109e8d30faf47eb85573a589426c40ad50597a7d81b5552
-EBUILD puppetdb-6.3.2.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
+DIST puppetdb-6.5.0.tar.gz 41768030 BLAKE2B 2a52239dabb5c026f4d00ee2942e3128ce50f1de23aa5ff5d53f2020237b54867b48727e774ecc27f5f18bd1617b43fcf30fbd3b03a730ca60d5bab7296e3f9c SHA512 8aee40101a17e22ef5b9b7b965ffe8d8a9b8dfaa787721b3e6a5e7363b98e0c52dc0583216a058540618a6a980cf80f138fa6b358a9daac518abd50981910cf5
 EBUILD puppetdb-6.3.4.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
-EBUILD puppetdb-6.4.0.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
+EBUILD puppetdb-6.4.0.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
+EBUILD puppetdb-6.5.0.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.4.0.ebuild b/app-admin/puppetdb/puppetdb-6.4.0.ebuild
index 616793cb4123..77d1c1ca9cc4 100644
--- a/app-admin/puppetdb/puppetdb-6.4.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.4.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+=""
diff --git a/app-admin/puppetdb/puppetdb-6.3.2.ebuild b/app-admin/puppetdb/puppetdb-6.5.0.ebuild
index 77d1c1ca9cc4..616793cb4123 100644
--- a/app-admin/puppetdb/puppetdb-6.3.2.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.5.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+=""
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 9e1d0952ffa8..42ce513d0f1f 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,8 +1,6 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
-DIST puppetserver-6.3.0.tar.gz 75698674 BLAKE2B 4eb88b15c936f8a66c5447e5761cc35772632420ca74de17f06453c9645f6f4d6483ec6a850810401efddf07f40710bd9563e78f5f870faaa85c0c6b2e450fa1 SHA512 a3c3e9c00e3dae274a2139a166c121d1d9b1dde8ad640e70d68433eee53a9bcf7ad8ba53d6e355ee1de93a522f8e0169eb80f52fc438ce6a76ebcd007398108b
 DIST puppetserver-6.4.0.tar.gz 75721867 BLAKE2B 299d73bab6f76464fc7b2e3b5a5b63e4b0d6f11752990d2926db247dc5d6aa475f5de571640ae38f22da75505153ce0f83e7a952bd0d037f4d3d12fd37c8f269 SHA512 cc9ac9a163b1ee7488b1afb95457cea4ae9da205d4cd91dd70c8cc995fad32829b5c4d9de8baa3ca325ac235bcaee2dca78ea9cd50bc9dfe11f2837f64587a11
 DIST puppetserver-6.5.0.tar.gz 76080713 BLAKE2B 0562128001a24eae6cec071a366e16ab3ce5b0babbe50330ecddd13ab3dbfd35d6cb23634770e4bd7904cd231752ce923d4af8dc42d783cc137f300efcb05fb2 SHA512 d871f3817c370ddd08e8d791deb1a30aa50ab0d801192ebfb5ef225d8dce21885175fe4e9911287437b687b2bcbf5a098d8b9511b24bd05fdf4854575a686cfe
-EBUILD puppetserver-6.3.0.ebuild 5354 BLAKE2B c75b4c97ebd41fadf589e7ef752291425935af7d1f1528401f7dd1b2b670cc865570b8a610f1901eba1037bdaebb2d8dd2998380e001c046bcf54fe35b02153a SHA512 613533ffbcc1925f2ff040880d82f2a20c231d66697a49d6fc5fbf5a17528d3b3d1285918b83bf8ef4b4ee729656be610bb30f0bbefa827376f57da1fbd34950
 EBUILD puppetserver-6.4.0.ebuild 5370 BLAKE2B b3b8bbba45305b658c94fcc43c9e2d11b854e80f536e5e3c3afc7c4182f954b9491f47eb83529dbd00a894b793c9a0cf660ed7b52051b840b24e7fedec97a6b2 SHA512 31b6e681af9dd22d9388a447237289e3e48d79d2e7e1ba79d10e70084b99a9d7cf99fdd19b58a210f990ed1b202af2367a0e0911f8579a876ff284413f6051ce
-EBUILD puppetserver-6.5.0.ebuild 5372 BLAKE2B a4a00a13309207dc0cfc8f584bab29add3a2dd21c83cc1ca165e55631002fdb645c036665f55f580c27776dd4ac67dc993749a01d9938189442020660ab70598 SHA512 cc4934c876b59eb4eed05e4bbde2c6973623236c5fe243a4b6245aff2816477cbe9f168c89dfb9530ef5a2cd1f67410c8c532e5c8b6b29426ac2c6f18b189c19
+EBUILD puppetserver-6.5.0.ebuild 5370 BLAKE2B b3b8bbba45305b658c94fcc43c9e2d11b854e80f536e5e3c3afc7c4182f954b9491f47eb83529dbd00a894b793c9a0cf660ed7b52051b840b24e7fedec97a6b2 SHA512 31b6e681af9dd22d9388a447237289e3e48d79d2e7e1ba79d10e70084b99a9d7cf99fdd19b58a210f990ed1b202af2367a0e0911f8579a876ff284413f6051ce
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.3.0.ebuild b/app-admin/puppetserver/puppetserver-6.3.0.ebuild
deleted file mode 100644
index 39165a39524b..000000000000
--- a/app-admin/puppetserver/puppetserver-6.3.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd user
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	dodir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list.txt
-	insopts -m 0644
-	insinto /usr/lib/tmpfiles.d
-	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-6.5.0.ebuild b/app-admin/puppetserver/puppetserver-6.5.0.ebuild
index e064d2554eb5..9200fa82fd3f 100644
--- a/app-admin/puppetserver/puppetserver-6.5.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.5.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index 7f5252a5eb99..2e50bdb376af 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -1,7 +1,4 @@
-AUX 2.06-special-char.patch 252 BLAKE2B d5ca276a37d144f09888d08fcdee22033fb005cc3c2d5535b0639bc40ec00422770fb1944cd8539b0645101b2f68dc5b61df47a1e610ec8fe215289ce4ae2db6 SHA512 67b2fe0d146b395445cc2cfd1c7721132f3986e964edab41582f0061fc3c9ff6eee8833628230a58a9a9f4a30ad95c7b685082982d62d0e240430072baaea2b9
 AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d
-DIST pwgen-2.07.tar.gz 53513 BLAKE2B c5d3a548ef1fab3b246b7ad9ffdc18d572136b3addd2a23e375e45d82af0f45f0e19e747d20d4e4cf7138f7121890460e82a85ffe17c451160c6c0f08bed4422 SHA512 9c56ff04ca2f6f60126608a25f395ddbc4a3ac59585a6f233c87d993b6388e30b1867d43a6bc5b0f9f1f4064b12ea450eac4f7c9ac2844707a99fad1bbd2664d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
-EBUILD pwgen-2.07.ebuild 699 BLAKE2B e85ba0d3f6f4f432a2df5de6d8193c63cdf3a13ca6502ffc3378a9cfbf95c0d5ae5f195169ca7360ef531630fe9f913a28a768703ceea3cd2ab2fae4061ed934 SHA512 076cc779fff3df62668cce9fcfd58a98ce0f30fb535f1452f96233c96420f3893bb61f92d370cfded1dc49e2e32d89ba059a071db93d67d78d2ec12a65c13bc3
 EBUILD pwgen-2.08.ebuild 616 BLAKE2B 6f71677b2e4942cd00b3675b10eaa73c22047642afea5034ad3dc3fbf73811188b274562011a94437863f448b426eff3907dcc1838fa6dd1dba66fcdffb800fc SHA512 20045fc69973fc91523c83ae724ec54b5089a533daf9eed62d8736ffde06c4f3fc1537998c5cb56f3031420df165662d404af4b6c8f5f0cb9461969c744a568a
 MISC metadata.xml 765 BLAKE2B 133e60da10e57e53ea3013d7615aae83d8d38bf18b8e92c1a081d43524551180e2654233e0a2b2207dd11f31114cd221f33fa5eb4c1486c87ea0bd031c613f2f SHA512 5a6e7e1b7e8fc44e9f39e5d0f349a27360d94778522131c749748690fd6db5278a5a9354242b2030bdfc8db7890e340621a1d939364bd40d3d96b018cc6e443f
diff --git a/app-admin/pwgen/files/2.06-special-char.patch b/app-admin/pwgen/files/2.06-special-char.patch
deleted file mode 100644
index 3d014fa4bf11..000000000000
--- a/app-admin/pwgen/files/2.06-special-char.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pwgen.c
-+++ b/pwgen.c
-@@ -138,7 +138,7 @@ int main(int argc, char **argv)
- 			break;
- 		case 's':
- 			pwgen = pw_rand;
--			pwgen_flags = PW_DIGITS | PW_UPPERS;
-+			pwgen_flags |= PW_DIGITS | PW_UPPERS;
- 			break;
- 		case 'C':
- 			do_columns = 1;
diff --git a/app-admin/pwgen/pwgen-2.07.ebuild b/app-admin/pwgen/pwgen-2.07.ebuild
deleted file mode 100644
index 9df81de14409..000000000000
--- a/app-admin/pwgen/pwgen-2.07.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Password Generator"
-HOMEPAGE="https://sourceforge.net/projects/pwgen/"
-SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="livecd"
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.06-special-char.patch
-}
-
-src_configure() {
-	econf --sysconfdir="${EPREFIX}"/etc/pwgen
-}
-
-src_install() {
-	default
-	use livecd && newinitd "${FILESDIR}"/pwgen.rc pwgen
-}
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 5646bca12714..6ea0d7557a37 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,5 +1,7 @@
 DIST r10k-3.2.0.gem 206336 BLAKE2B badc840ec7e6793daf205f1352899fa909e9a922a353a52841809dc80fd03758a865e0cb8210e58bb5c25968207d537b3f19c1903fbb519c50b6af2dd27eb5fb SHA512 7ea00ec28ba631877d33fa8b00b25e1c69346b787499ec7b26118c16acecf6bd39fcdc4618af016ebf5b62850b6d984510f7e9153dd4e99771def299b7d0703d
 DIST r10k-3.3.0.gem 206848 BLAKE2B 92fedb9871c6e22df3a3f8c4cf18feac1bf3ef51e2e67b3001c811bc81397eda71bc9da94ef860d6e39b989fd1c1a3b9dae402142496f17c4427ff2de62188fd SHA512 674c5c386885dd1476264d8bc047ddad0411b6344350662021ede8a5352e95fd50a72f62127b00bf6b2bc8e6b3835b017128788707610d510a64eee13b9f4d4f
+DIST r10k-3.3.1.gem 208384 BLAKE2B 81e7de3d2fabd038240478ab7ace4fba181a4370544f964b438a6b96de34a741f653aff018ece21453b119ae6b12f06934cc82be8a6b78cd5a72277195a5fe81 SHA512 20f9c92fbabed82521d452f339d9d2fd8cc438cac1cc11385a6e2874a5d55fe6425ddfcd281d8e63ee043adec5fbbfba0c37ef0c6e15d498c64ba550740ccd6e
 EBUILD r10k-3.2.0.ebuild 933 BLAKE2B 6e7df53cab2a25bb5bf6fa4218cd670b742a68aeeb5402dd09d1f34861d0596250b915965a06b4cc8c157009d671046c00758cb576223d108e6b8d40067a23a6 SHA512 66c0c7e12e9f934c9e5f3024021e31ef4dce674f3eb27763bdc60413c9ef79dd101ed5cdcbdeec6cab9332fcbb60454754aea7c05f251b23327fef6f227eb7c8
 EBUILD r10k-3.3.0.ebuild 941 BLAKE2B d66e537eb1478ad0acf777d35efde0ecdad4594c5032ce01cfcb873eecef8e9fe65f237a0465ecc2f2368fb3019e728f54c7eebcfd06f461362f65ebc9cceb4f SHA512 eee05605d5294656c76a5207b25ced88a7162cfc15308660bb51fd9d22d13ccea24c288d21d540b8da108bcfe18e6539c589f0f2d3dd420ec1050850d7f19365
+EBUILD r10k-3.3.1.ebuild 916 BLAKE2B db2bdfab6af08c85fafdc36a9cf45e340ca0a65a0d8917c793d020e23d5773d77e71b40926be7e03a7161e4b0c8cbf80452ed928bd198594cc26fa55616d5158 SHA512 18d544b67913d9f0cb8f5cd0ac906b7ca482cb9bfa926b8feb98bef68447ba7450bc52ad00a2ca60289ef93a45340e8d8f96771e5647004b816fbd871e69ad4d
 MISC metadata.xml 582 BLAKE2B e3b514385b7b851b3ce037de51024108005224c75fba470db28fe6e4d6b3632ace21a8e829198e0b22d1ba0e76b1a5c01df10426ea497ec3b00e20e578608d2d SHA512 fb8913a9f806ac0b2035dc788ee78536fff96ffb635454f668d7836d8ba849fea158e628da12743c1844b658961866b3d64e8faf700c7e373065045175785536
diff --git a/app-admin/r10k/r10k-3.3.1.ebuild b/app-admin/r10k/r10k-3.3.1.ebuild
new file mode 100644
index 000000000000..1826c94b4704
--- /dev/null
+++ b/app-admin/r10k/r10k-3.3.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git"
+
+ruby_add_rdepend "
+	~dev-ruby/colored-1.2
+	~dev-ruby/cri-2.15.6
+	>=dev-ruby/gettext-setup-0.24:0
+	~dev-ruby/log4r-1.1.10
+	>=dev-ruby/multi_json-1.10:0
+	=dev-ruby/puppet_forge-2.3*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/archive-tar-minitar
+)"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs for unpackaged rugget git provider
+	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
+}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index a04968d5292c..f0df7f53384f 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -6,8 +6,11 @@ AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad1
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
 DIST rsyslog-8.1904.0.tar.gz 2902708 BLAKE2B 515d5e32c2dc6cdd8dd51fc595ad775503438603f28828e9f1a427b184a5a61de32af2ee90334b7d56a9404106d74da47386a18a370278d5a16422a6bb09f556 SHA512 cccb48f06508d7e7c2dd788903f4d7ddb3020cdf6079aea1d52387c56b920f10b08957a79b5d420ccdb54cae50d1da6e5eb80cde9498bceaeda4f6ce37f694fd
 DIST rsyslog-8.1907.0.tar.gz 2926855 BLAKE2B 65c674e53bfa960e3fe5c7f41a304cf8736fe72e2391895dde9fdc17fabeb2f92fccab48965d5e1689a5852136a43a3355f89c9fa9d1d1974335ce80204bb4ac SHA512 2aa3f6106e48fa63c6d4389f83e7a3212817c626d04881682236055792cf5c9d8a941638c9a508c470b6a24c934ef5cb0eda65ea25179d98831afbe2a27c1519
+DIST rsyslog-8.1908.0.tar.gz 2952939 BLAKE2B c6784753262a71f30f32fc35ad3e3e75fa2af271bdb0a62c2d4796d3d0413c7f619052a5e33c52c5f3b22aa474d14b7bb06e9c502944f914e708265835fd90ff SHA512 66b6755e1f5a610ed8ec3f8fad1ee227f8ff34618a8f2660a801e6f9aa734980190fbffd8144ac30d63f8297a06e86ada65ba838242d8a006bca8e30f56dce80
 DIST rsyslog-doc-8.1904.0.tar.gz 8042650 BLAKE2B 585fe5c63eee1fb46f94dcd3d529045b3900e08c291e0e71ed9bf32a6200e6c7283820b262bd56e9aeb74cc227ecd518caafec5a8f87c1d8523d5d7fd95030aa SHA512 da0ff00fbe71756b3c27fd8b94e88611452c3ba611e583862556393faaaa596ca8f32f694ad40a3e1df67385d9f9ca80db6a58f5d2e336fe95639dd7cd0de828
 DIST rsyslog-doc-8.1907.0.tar.gz 8071764 BLAKE2B 90c18a93bb2f2c9158a4696245c44c36ab4c40597d1eb8df8af257f57aa17e71436bd60792c4f982ebc15395abacd53281046e4ae6df65c306f815e6599fb8bc SHA512 72dcddef6e36a92d2bdcf54072fff7516b6c731f43a53ef8f5d4ebdbe46bc7aeb63bbc3e739a6e5897602ea7705c4bdd8f57aa10796955ed772a6c7cf552c5e5
-EBUILD rsyslog-8.1904.0.ebuild 12567 BLAKE2B 191746200f4a5e059c45f94ebc401a14afb6cfa5d5fff0efbeb453f694d7051f3ce550a7eee329a9f32ef1cacda575b395d1b3f8ad978cb5579a9247a7dd68c0 SHA512 3943480907c10c61405cf134ecd4e9284bb66073741f6eb638e3e568a6e65f829990027904b0d02f93fb00f39529343dac94780981e4d182821087b92b06ecd2
-EBUILD rsyslog-8.1907.0.ebuild 12545 BLAKE2B d04b8b22478f7acb2daf4752c98932fea66d2e4462c4efcd9cf64c7ead00006494597789b1b271c5bb25b51d131bd3b646c544d16b1a48502950433ab44e7563 SHA512 0bfdb4335b956a203aba420a83cb2ed5ab6aabefaf79a24280e351688be4e87f8cbf06df89e257f0e9e1b361e52ebd611e2b9b4c247bd9689b7a28d8baccf3cb
+DIST rsyslog-doc-8.1908.0.tar.gz 8082984 BLAKE2B 7f102a215b0c51b961a4e44e97c8a3cd9966215dba44a194a5ff925b8a2b1ad3389461e2de3dae6dfb770bc36c9a31747298bdb7e975d6fa86ca209c9e314ac3 SHA512 d826013de671c895be7becd2a7c5ce1fb218149c6128d486116be6a01fc69099026f5a277b30fc57e626aeb4038e00b17abcad9a45ea3c9838e7041de9d991a5
+EBUILD rsyslog-8.1904.0-r1.ebuild 12569 BLAKE2B 119a617375da61a37962edddae9f20888fcac469325b77f07c15141d471a00e62f6647b94d9837990ad7bccc0e85fb071de8b63f411245f9759f2163677fa663 SHA512 2a6514fbe431f61c29a8f261f528458c05e82398a34b4cd810c36cadaf5d355f7678f530f52d9236269eab01c990703b2bdfe2c6b6b8d3ea0005f1f168587a54
+EBUILD rsyslog-8.1907.0-r1.ebuild 12546 BLAKE2B d562cb749a8632d6399613667f786dabf472b65b112a5775a9f2977b3a513b25f50454419fb62ff02648e4dc1acf5fb226b7d01d62e70bdbcd1de69f6c6cbb97 SHA512 9d683b5267a57653bbc7f8caff1b8e60e78b6e7dbfc6cb2ba7f63ac80776b75cc1d3ba84c27a9659cfd48e568c01af97423f5450af6173e94a9bb9ae38eda95c
+EBUILD rsyslog-8.1908.0.ebuild 12548 BLAKE2B b8fb662688270ee92cc4382bbc39a78e8bf4db46f48e4dcbb4cb3efb0194eb8dffad999cff631199909573590842dd56efc5fb38c05cb88e72ea0bfe5040aa64 SHA512 fabfdc53abf6aab98f7ec7a0ee4381d73155df3a3f1e3dec5b9f8705fa83d336005de173bcbcf34d3a136f5c4565416d35e289c0a827d6fdde63ee5784c656f8
 MISC metadata.xml 3875 BLAKE2B 4281901c6e209ace8f89bf7ec7f036cbabff009da2f080c5b5d77a0639099c8d87ed9925d70e7e3edb6cad8204ebee3a4b74a688b6a22810473a22d90c441347 SHA512 039cd323565bc8e96762bef5b7b34747fffc6d70176397d4be8fd83d1f9dd094e77c21f7005f0d3dc47813ddd97bdbad1ce47ef71a2742ffdbd4145142d2d0b5
diff --git a/app-admin/rsyslog/rsyslog-8.1904.0.ebuild b/app-admin/rsyslog/rsyslog-8.1904.0-r1.ebuild
index 599b21057acf..53c2faa29103 100644
--- a/app-admin/rsyslog/rsyslog-8.1904.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1904.0-r1.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
 	kubernetes? ( >=net-misc/curl-7.35.0 )
 	mdblookup? ( dev-libs/libmaxminddb:= )
 	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/libmysqlclient:= )
+	mysql? ( dev-db/mysql-connector-c:= )
 	normalize? (
 		>=dev-libs/libee-0.4.0
 		>=dev-libs/liblognorm-2.0.3:=
diff --git a/app-admin/rsyslog/rsyslog-8.1907.0.ebuild b/app-admin/rsyslog/rsyslog-8.1907.0-r1.ebuild
index ed1a985412e6..3ba9c5d75708 100644
--- a/app-admin/rsyslog/rsyslog-8.1907.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1907.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86"
+	KEYWORDS="~amd64 ~arm ~arm64 hppa x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
@@ -45,7 +45,7 @@ RDEPEND="
 	kubernetes? ( >=net-misc/curl-7.35.0 )
 	mdblookup? ( dev-libs/libmaxminddb:= )
 	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/libmysqlclient:= )
+	mysql? ( dev-db/mysql-connector-c:= )
 	normalize? (
 		>=dev-libs/liblognorm-2.0.3:=
 	)
diff --git a/app-admin/rsyslog/rsyslog-8.1908.0.ebuild b/app-admin/rsyslog/rsyslog-8.1908.0.ebuild
new file mode 100644
index 000000000000..09eed323e458
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.1908.0.ebuild
@@ -0,0 +1,462 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
+IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		>=dev-libs/liblogging-1.0.1[stdlog]
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 7484ceec85ad..54e485931c51 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -13,6 +13,8 @@ AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd2
 AUX salt-2017.7.8-tests.patch 3303 BLAKE2B 4bce0b82f939a997aca6da94977a261b636e410678c40a50a446813a1704608350ab6e330d3dd7dbf541b373320adcca035d3e2a70e9c626f3bd7f8216bbff6e SHA512 b5ccf399bb62325bb1cf252c9d72296138fded7dc4890695e44c2fb43c5f4f4eec852057ad427ffdfb80124be21d7b5cbe2f7497ff7d9746e09f5ed3a652aba6
 AUX salt-2018.3.2-skip-zeromq-test-that-hangs.patch 2820 BLAKE2B e531bddf576322f8417e7e362bfed7aa21ce8f1edc1702074f250efc9118c755664bd2976282399b725c1f56362e37fa07064b9e4ac2a72c413a56b13d325cdd SHA512 72cbc1e7c8d59883bcbe8130fdbae6e1ccecfabe74069a7389e63f797609930036c593204ab441cff92933d3d35a24feb7db0dc76804d76608190e93a8bc6ed4
 AUX salt-2018.3.4-tests.patch 2944 BLAKE2B f41c1e53297e1828c840d0ff22a49e2d47b40932615006f1fcebf6732faf0fb79a3149cc0c1be1d6daae60ce6f93e338e7eddd7cb80e076c1fdb68d560928050 SHA512 6ab26d0ae06adeb590b0b4a77fc3d0273f3624a1e8adacbaffe1ec3ae7d1066e7be5116dcde3c4118f7008a940995665777eedf15dd17c42825d08f22a33a741
+AUX salt-2019.2.0-newer-deps.patch 9260 BLAKE2B 02234367c4de7586b72502126fec7392dca96a284058b6c21733d21e5a61e12e81da054454aae20b290b9179fc7790e74ac111c7b1b638b36a935806e367902f SHA512 1e999b302323c4880103f8e68aa4c471c280484c91af0c4ac8ae85270553d178bb79a4a7d33fcc4b3a0ba2a6d95a8199d411b15e35b87f33004821dea4a07360
+AUX salt-2019.2.0-skip-tests-that-oom-machine.patch 739 BLAKE2B c0e1b18c528ddcdc19e93061112d2c42aeca96f9091218e7ad6b4eadf11255079cecd6b9b9def576c663b4ba794d151db8fc32336b1c29c3da8e9c18c09582f3 SHA512 0bd8fc2ab73be8ffc9fdda65a60c7306dbfa9f76d874994ba09db7ef71678fca80c8fde5963d22b5bbbe3b933140a56f2173f4c109b47dd9e9c3c9a70062b0e3
 AUX salt-2019.2.0-tests.patch 2793 BLAKE2B c609564673db7388a876902deb57f0aec70531ea26536954efdabdd8849eee314e840cc299f6e1fbd6a18740847a9ee8d217426adee38d36ae569f6e2e9c85ae SHA512 eb1d61f5410b36d0749cce5fc7dc08a8950061f7fb3497a122702eba7638ec3e635750b25ad5cacc4839d4828f13785ea122df43e8aff7635d79283be0392f02
 AUX salt-api.service 166 BLAKE2B 32d28ef4ef3c60942bed3fa3a01d70a9af387705844326cdf9339d7c887238a1e6817d78ffd1cb205a6397a2138c2389ea00bf53be84a17b23bea140279bf42c SHA512 bab6b8380c965bf16e23078ebe6f38d942300829d4c89ddf23b630bd57b4d371f80687d85dd9e0cc1b669f2ca882aecde1bc8d7d82382a02ed20e493d3f04702
 AUX salt-master.service 169 BLAKE2B 15e7a4f64cfa75eb8d8576a7d0b61ea0c9937c94fd2130fd6c123a82187f08b5ed533c168a7310fd94d9bd2cecf9d0ba94665c653a971ef61e5e18ffdf087a15 SHA512 87fe27fc0748f4191bd1c6883bb362c95cce8fe1f409e2679b229ddfd9de6c99438859dfa0a47b042977d659029ef56e406f1e8aa01761bff21af4784f9dd5f8
@@ -27,5 +29,5 @@ DIST salt-2019.2.0.tar.gz 14952746 BLAKE2B aa3bba4b7d9548a8d333c242fc0265a743f56
 EBUILD salt-2016.11.10.ebuild 4855 BLAKE2B 8d6321e45aca368c5919104752f3ab5f0ba0778b183a232cbbbcd19da126eaecc2d0c40c29e3745a27d7f1cff9dc620840d7cbd86de7a3d8c6454bc2ff9b900c SHA512 a4e7ae265c66a659eb70fccba97c2c52ba9fe06fe20e23d3643029fd68442aad4f82d94f8a9dd55a5f040644a50571dec645ab866b20ef05a70ad8a550553c92
 EBUILD salt-2017.7.8.ebuild 4614 BLAKE2B 8974a75658aa59bfc4cd98efa9d601ebc374f407ea33d51b98b02fbcd00f195455c867f824cf16092e3859fcbccfc4a0c7ae2933a1724180d34a9f616432095b SHA512 a9a09dc1939775f46687e4e25fae24a3b7bfa48c1358bfec00fcc70fcd271d947c4f2ea5e9c0a9b4a522b87c5d2ab334f0df3d487dc2799db0531cafe23e7a2d
 EBUILD salt-2018.3.4.ebuild 4905 BLAKE2B 882cbf2fc6fd4547a19bbd078a27b6deb5053702fac869af73bac8a7a664f0d368e66a1a3da3b9c30bc0a892f71c1f7d5135fd14240b80cbe24c7fd9438276c7 SHA512 217870e4aef470660089e0627674b8001a3047c783a1fe6fe95c20084ad00ec089d51e0d2783c9a6a69f407aa475091bed4b8fc9a35001e32883440f30f5c1f0
-EBUILD salt-2019.2.0.ebuild 4973 BLAKE2B c70bd776e088b3b148df8a38fdd72bae9cb06716a1536efaa90d221fbcd9461f758b7f99566e1d430efe904a844d3a0ce3ef31b6673bdfae9b5f56ce1fd551c4 SHA512 1eb634805f5e0ecf8fda2bf97bba0108062625edec62d3197d25c7bf863bd4a05a13e4b79fa5ca1d4f456dc040ef130eb27afc7d1670e0175963cf011e36502c
+EBUILD salt-2019.2.0-r1.ebuild 5079 BLAKE2B 09f9672a3ff9e8abb40e5233a600f91b0ffcacd8011ee0d28be53b394fc796c23cdaf11f3b75136f31a1e184a49b95e358940102f6e3c309993823dd18b8d9ba SHA512 ef245c5e1f8a1b4a5c7b187608643099929f8165028aa3fc7649a5bb347a21e7a976e9c8a0ebae39f601ab6ce8e291cbb25af4d5505b8ce3b330f3a8d0918eec
 MISC metadata.xml 2288 BLAKE2B dbe7f76af8cd8a97d852536684e914e3759bd1f17e4bdea3c8c16da7c6485eee08151a8d4e41919c1ae89ba4f786783f899e23147159a4bade0009c7a668f741 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969
diff --git a/app-admin/salt/files/salt-2019.2.0-newer-deps.patch b/app-admin/salt/files/salt-2019.2.0-newer-deps.patch
new file mode 100644
index 000000000000..bdf95e210897
--- /dev/null
+++ b/app-admin/salt/files/salt-2019.2.0-newer-deps.patch
@@ -0,0 +1,210 @@
+diff --git a/salt/modules/dockercompose.py b/salt/modules/dockercompose.py
+index 61e937536c..0f37e0d43a 100644
+--- a/salt/modules/dockercompose.py
++++ b/salt/modules/dockercompose.py
+@@ -241,7 +241,7 @@ def __load_docker_compose(path):
+                                     None, None)
+     try:
+         with salt.utils.files.fopen(file_path, 'r') as fl:
+-            loaded = yaml.load(fl)
++            loaded = yaml.safe_load(fl)
+     except EnvironmentError:
+         return None, __standardize_result(False,
+                                     'Could not read {0}'.format(file_path),
+@@ -371,7 +371,7 @@ def __load_compose_definitions(path, definition):
+                                               None, None)
+     else:
+         try:
+-            loaded_definition = yaml.load(definition)
++            loaded_definition = yaml.safe_load(definition)
+         except yaml.YAMLError as yerr:
+             msg = 'Could not parse {0} {1}'.format(definition, yerr)
+             return None, None, __standardize_result(False, msg,
+diff --git a/salt/serializers/yaml.py b/salt/serializers/yaml.py
+index c95b40e48f..2154e5dcab 100644
+--- a/salt/serializers/yaml.py
++++ b/salt/serializers/yaml.py
+@@ -72,6 +72,7 @@ def serialize(obj, **options):
+     '''
+ 
+     options.setdefault('Dumper', Dumper)
++    options.setdefault('default_flow_style', None)
+     try:
+         response = yaml.dump(obj, **options)
+         if response.endswith('\n...\n'):
+diff --git a/salt/serializers/yamlex.py b/salt/serializers/yamlex.py
+index 2e4ba6fb2b..e42634f580 100644
+--- a/salt/serializers/yamlex.py
++++ b/salt/serializers/yamlex.py
+@@ -182,6 +182,7 @@ def serialize(obj, **options):
+     '''
+ 
+     options.setdefault('Dumper', Dumper)
++    options.setdefault('default_flow_style', None)
+     try:
+         response = yaml.dump(obj, **options)
+         if response.endswith('\n...\n'):
+diff --git a/salt/utils/yamldumper.py b/salt/utils/yamldumper.py
+index 9892c87d23..3692ea324a 100644
+--- a/salt/utils/yamldumper.py
++++ b/salt/utils/yamldumper.py
+@@ -115,6 +115,7 @@ def dump(data, stream=None, **kwargs):
+     '''
+     if 'allow_unicode' not in kwargs:
+         kwargs['allow_unicode'] = True
++    kwargs.setdefault('default_flow_style', None)
+     return yaml.dump(data, stream, **kwargs)
+ 
+ 
+@@ -126,4 +127,5 @@ def safe_dump(data, stream=None, **kwargs):
+     '''
+     if 'allow_unicode' not in kwargs:
+         kwargs['allow_unicode'] = True
++    kwargs.setdefault('default_flow_style', None)
+     return yaml.dump(data, stream, Dumper=SafeOrderedDumper, **kwargs)
+diff --git a/tests/integration/utils/test_win_runas.py b/tests/integration/utils/test_win_runas.py
+index 3042a77991..d4057a4d03 100644
+--- a/tests/integration/utils/test_win_runas.py
++++ b/tests/integration/utils/test_win_runas.py
+@@ -539,7 +539,7 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 1, ret
+ 
+     @with_system_user('test-runas', on_existing='delete', delete=True,
+@@ -560,7 +560,7 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 1, ret
+ 
+     @with_system_user('test-runas-admin', on_existing='delete', delete=True,
+@@ -581,7 +581,7 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 0, ret
+ 
+     @with_system_user('test-runas-admin', on_existing='delete', delete=True,
+@@ -602,7 +602,7 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 0, ret
+ 
+     def test_runas_service_system_user(self):
+@@ -621,5 +621,5 @@ class RunAsTest(ModuleCase):
+         win32serviceutil.StartService('test service')
+         wait_for_service('test service')
+         with salt.utils.files.fopen(RUNAS_OUT, 'r') as fp:
+-            ret = yaml.load(fp)
++            ret = yaml.safe_load(fp)
+         assert ret['retcode'] == 0, ret
+diff --git a/tests/unit/serializers/test_serializers.py b/tests/unit/serializers/test_serializers.py
+index 3bf42b67d7..ea42d617d7 100644
+--- a/tests/unit/serializers/test_serializers.py
++++ b/tests/unit/serializers/test_serializers.py
+@@ -68,9 +68,24 @@ class TestSerializers(TestCase):
+         serialized = yamlex.serialize(data)
+         assert serialized == '{foo: bar}', serialized
+ 
++        serialized = yamlex.serialize(data, default_flow_style=False)
++        assert serialized == 'foo: bar', serialized
++
+         deserialized = yamlex.deserialize(serialized)
+         assert deserialized == data, deserialized
+ 
++        serialized = yaml.serialize(data)
++        assert serialized == '{foo: bar}', serialized
++
++        deserialized = yaml.deserialize(serialized)
++        assert deserialized == data, deserialized
++
++        serialized = yaml.serialize(data, default_flow_style=False)
++        assert serialized == 'foo: bar', serialized
++
++        deserialized = yaml.deserialize(serialized)
++        assert deserialized == data, deserialized
++
+     @skipIf(not yamlex.available, SKIP_MESSAGE % 'sls')
+     def test_serialize_complex_sls(self):
+         data = OrderedDict([
+@@ -84,6 +99,12 @@ class TestSerializers(TestCase):
+         deserialized = yamlex.deserialize(serialized)
+         assert deserialized == data, deserialized
+ 
++        serialized = yaml.serialize(data)
++        assert serialized == '{bar: 2, baz: true, foo: 1}', serialized
++
++        deserialized = yaml.deserialize(serialized)
++        assert deserialized == data, deserialized
++
+     @skipIf(not yaml.available, SKIP_MESSAGE % 'yaml')
+     @skipIf(not yamlex.available, SKIP_MESSAGE % 'sls')
+     def test_compare_sls_vs_yaml(self):
+diff --git a/tests/unit/utils/test_schema.py b/tests/unit/utils/test_schema.py
+index 677cd0778b..5c2f1fd8fd 100644
+--- a/tests/unit/utils/test_schema.py
++++ b/tests/unit/utils/test_schema.py
+@@ -5,6 +5,7 @@
+ 
+ # Import python libs
+ from __future__ import absolute_import, print_function, unicode_literals
++import sys
+ import copy
+ 
+ # Import Salt Testing Libs
+@@ -506,7 +507,7 @@ class ConfigTestCase(TestCase):
+                 {'personal_access_token': 'foo'},
+                 Requirements.serialize()
+             )
+-        self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
++        self.assertIn("'ssh_key_file' is a required property", excinfo.exception.message)
+ 
+     def test_boolean_config(self):
+         item = schema.BooleanItem(title='Hungry', description='Are you hungry?')
+@@ -1730,7 +1731,10 @@ class ConfigTestCase(TestCase):
+ 
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': {'sides': '4', 'color': 'blue'}}, TestConf.serialize())
+-        self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
++        if sys.hexversion >= 0x03000000:
++            self.assertIn("'4' is not of type 'boolean'", excinfo.exception.message)
++        else:
++            self.assertIn("u'4' is not of type u'boolean'", excinfo.exception.message)
+ 
+         class TestConf(schema.Schema):
+             item = schema.DictItem(
+@@ -1833,7 +1837,10 @@ class ConfigTestCase(TestCase):
+ 
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': ['maybe']}, TestConf.serialize())
+-        self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
++        if sys.hexversion >= 0x03000000:
++            self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message)
++        else:
++            self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message)
+ 
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': 2}, TestConf.serialize())
+@@ -1885,7 +1892,10 @@ class ConfigTestCase(TestCase):
+ 
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': ['maybe']}, TestConf.serialize())
+-        self.assertIn('is not valid under any of the given schemas', excinfo.exception.message)
++        if sys.hexversion >= 0x03000000:
++            self.assertIn("'maybe' is not one of ['yes']", excinfo.exception.message)
++        else:
++            self.assertIn("u'maybe' is not one of [u'yes']", excinfo.exception.message)
+ 
+         with self.assertRaises(jsonschema.exceptions.ValidationError) as excinfo:
+             jsonschema.validate({'item': 2}, TestConf.serialize())
diff --git a/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch b/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch
new file mode 100644
index 000000000000..d0172d739554
--- /dev/null
+++ b/app-admin/salt/files/salt-2019.2.0-skip-tests-that-oom-machine.patch
@@ -0,0 +1,20 @@
+diff --git a/tests/unit/modules/test_boto_apigateway.py b/tests/unit/modules/test_boto_apigateway.py
+index be26b3f093..ca971556d5 100644
+--- a/tests/unit/modules/test_boto_apigateway.py
++++ b/tests/unit/modules/test_boto_apigateway.py
+@@ -169,6 +169,7 @@ def _has_required_botocore():
+         return True
+ 
+ 
++@skipIf(True, "Causes machines to OOM")
+ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
+     conn = None
+ 
+@@ -207,6 +208,7 @@ class BotoApiGatewayTestCaseBase(TestCase, LoaderModuleMockMixin):
+         self.addCleanup(delattr, self, 'conn')
+ 
+ 
++@skipIf(True, "Causes machines to OOM")
+ class BotoApiGatewayTestCaseMixin(object):
+     def _diff_list_dicts(self, listdict1, listdict2, sortkey):
+         '''
diff --git a/app-admin/salt/salt-2019.2.0.ebuild b/app-admin/salt/salt-2019.2.0-r1.ebuild
index 16433de1b07d..eb02c39bf6f9 100644
--- a/app-admin/salt/salt-2019.2.0.ebuild
+++ b/app-admin/salt/salt-2019.2.0-r1.ebuild
@@ -92,9 +92,11 @@ REQUIRED_USE="|| ( raet zeromq )"
 RESTRICT="x86? ( test )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/${PN}-2019.2.0-tests.patch"
-	"${FILESDIR}/${PN}-2018.3.2-skip-zeromq-test-that-hangs.patch"
+	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/salt-2019.2.0-tests.patch"
+	"${FILESDIR}/salt-2018.3.2-skip-zeromq-test-that-hangs.patch"
+	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
+	"${FILESDIR}/salt-2019.2.0-newer-deps.patch"
 )
 
 python_prepare() {
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 85ef7ce3f76e..12512972b02a 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,10 +1,10 @@
 AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff848000c3181e590e557413011ebd5db650f79dfad270f6506128ef9971975ec2b26323b18f793bb914759449679bc34f388c SHA512 c30d7fa3624164d3ec5574b1ae36cc896fb5132ed875f232e9e84cf080e7081dadce61f6d88b55aefa45e417a081622acf7aa2d9f10406d23be7646905dfb3e6
-AUX setools-4.2.0-remove-gui.patch 988 BLAKE2B 8ba64a764292e2309fc27bdd8595bbe10c644642bb59b66b4423f50a077aac372c63da31a231a27940eb624bfea7de2f5ca305f9cc9b162d56d40f9f4ff4bab9 SHA512 e1f2216b14523a7033ebf3293646909df3be2756280186c5d8e6b1c01c7246663732c0f27c949bdac218749bb9631b47bdd82b7457a051df2380254021df4b95
+AUX setools-4.2.2-remove-gui.patch 970 BLAKE2B b3d701d0e9b4de0a3f66ca8696700e70becfa5de068e385d12ca61f76ca59f495a69fac65ee986fa548bfec2487f21b5b948da2d729cef8a3008d906c9f7e73d SHA512 088be5d53e4402fa91bec20b3d85b8c1a77b41ebde1bbb44909e740b140bd6f79b641b68f56d258ad5a4af40df3023745663acb305a810ee19f126a0e99f1e6b
 DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
 DIST setools-4.2.1.tar.gz 365096 BLAKE2B f415ec15ce7caade2a511896c6027720ecd8b4fae938d9dee1e0b677388966557b9615503df58dd6057f5c0ef81690f753f3e1af773ef5fd8095b29aca0ab249 SHA512 7d00295fe7ff16e96e15266807f8e0a67cc2978f9051cd85afb9ee71ca7fad16ccf7421a4a163bb793950bc20a44f3cbb8409b4e0642d0f96cf7a3df7bc59c31
 DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
 EBUILD setools-4.1.1-r1.ebuild 1445 BLAKE2B 7f7549954ddd2b34d55960ac869f4cead17b6968bba0ca5634eaf5804ee31ffe08a232f93f6cc7aaaeb5f6485261f89ec27df6977195d734a8c0744e2aa91e60 SHA512 fd76c7f9e899f051388126b76c73490836ecc3937f8c31d8639d578e21c89487d5d2d90f6e68595fa660c5a49daff937ad050a12150b1d5863183664592c4ab2
-EBUILD setools-4.2.1.ebuild 1199 BLAKE2B 640a4f9149fc0e5e1754efe796a6dc30b9199f4315cd4623c139f9f332f8f6ff8ab23632482dc30bd6cf139642f025e49f6015b7e492b1272c4ca93a596ef097 SHA512 0636242795043a0de1bf661f60bb953b7f8d7420f065763df3f84f00491317a075856fd5f21730494603c7d3bccd826f661b13d0f3688b44119c9b8fd4143e25
-EBUILD setools-4.2.2.ebuild 1202 BLAKE2B 428b1a44ba0fd9dc2be2bf57eda2d43701fe446f34b757581fca697247866f58032791d0027af564f08b7271feae487c60c5d038d5464eeba8bfcaebcbe2a8ca SHA512 036f0e6f9767b288488973f5c0d54ea87cf78af977c00f71f39a3d2a5b976a387a8e84d6876e4ecfa235b0c453d4ee9339d890384981e1cd58be32a436369906
+EBUILD setools-4.2.1.ebuild 1199 BLAKE2B cc0644c200c087907d0b4c29013b1e833976044de9b8e402ad9af2ceabde6f69a2dbdb1993ff8ec3aa2bb49f20347ef8cd4a179e3fd17ac3b8175d84eaf84971 SHA512 40712f5f7cae13f9f74a39dc58b2aca127b6901825bddab3bb045a7661c730659b28d0345719b50fd0f76d5144a84db4c640092cdb2110481cb7654b04970f37
+EBUILD setools-4.2.2.ebuild 1223 BLAKE2B 54d3f0e059ce452bae3dcc7829a411745a8382c2bd67f67b4c9e044b7a7bb424bfb25bc5ea382679651a3edce994d8bf37b77c27426f43ea07dddda552eb8bcd SHA512 be933b756cf01e925a74249f15b02bbc451182d5b795934352410a5ae5ea4f629d12f37dd823366e057928634db96d8ebeff7c816ae594fb1bb321e527bb2b95
 EBUILD setools-9999.ebuild 1201 BLAKE2B 2244435edf3e51f5727b6fe188462aedb64b68624a6d02ce32e48bd7c01e4a79db17d4f627d91a886c75803a92d005278ba8eda9bab777846718b3bd2a4c9049 SHA512 c5330e616e4d211754650994c65350137fc6cfd5f0be16e2f3cb295127c081f37946feb283713a7726462d0b367023b63f3051a807e2b24c78758009630613bb
 MISC metadata.xml 401 BLAKE2B dc411a73d59193727d72889e4e5f3840aa9cf7b1b6ef55f28ab6a6beee533276954e27fe105a60c392c49ac761745304865c221ff9417464112eb866f35bf6e9 SHA512 354eb8fc14e5673dfd6ad2781a784cd6d77442bf879a96c206b758615c1612397c09c20161efb9e37bc56a588e97a74a20939773dec0b1f137eb6ac353234d2f
diff --git a/app-admin/setools/files/setools-4.2.0-remove-gui.patch b/app-admin/setools/files/setools-4.2.2-remove-gui.patch
index 748b33c9a5d1..58579bf5a004 100644
--- a/app-admin/setools/files/setools-4.2.0-remove-gui.patch
+++ b/app-admin/setools/files/setools-4.2.2-remove-gui.patch
@@ -1,5 +1,5 @@
 diff --git a/setup.py b/setup.py
-index e075a00..3f8f959 100644
+index ac8a876..84001a8 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -134,10 +134,10 @@ setup(name='setools',
@@ -10,7 +10,7 @@ index e075a00..3f8f959 100644
 -      scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
 +      packages=['setools', 'setools.diff'],
 +      scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-       data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))],
+       data_files=[('share/man/man1', glob.glob("man/*.1"))],
 -      package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
 +      package_data={'setools': ['perm_map']},
        ext_modules=cythonize(ext_py_mods, include_path=['setools/policyrep'],
diff --git a/app-admin/setools/setools-4.2.1.ebuild b/app-admin/setools/setools-4.2.1.ebuild
index b1bf0e666c9a..3e80e5e19f6b 100644
--- a/app-admin/setools/setools-4.2.1.ebuild
+++ b/app-admin/setools/setools-4.2.1.ebuild
@@ -40,7 +40,7 @@ python_prepare_all() {
 	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
 		die "failed to set lib_dirs"
 
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch )
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-admin/setools/setools-4.2.2.ebuild b/app-admin/setools/setools-4.2.2.ebuild
index f186598f7c00..22da7166d078 100644
--- a/app-admin/setools/setools-4.2.2.ebuild
+++ b/app-admin/setools/setools-4.2.2.ebuild
@@ -20,6 +20,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 IUSE="X test"
+S="${WORKDIR}/${PN}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=dev-python/networkx-2.0[${PYTHON_USEDEP}]
@@ -40,7 +41,7 @@ python_prepare_all() {
 	sed -i "s@^lib_dirs = .*@lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@" "${S}"/setup.py || \
 		die "failed to set lib_dirs"
 
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.0-remove-gui.patch )
+	use X || local PATCHES=( "${FILESDIR}"/setools-4.2.2-remove-gui.patch )
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index a618071a354e..0a0842421083 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,8 @@
 DIST sudo-1.8.25p1.tar.gz 3189951 BLAKE2B ebfedaad62e60f625db8c46a5c8f19977a5ec0a86bab3b34d91096c08e8b8ece056ba312f9fecd4cdd704fc17d49a36681b41cd40269df7c67cd66d80c0d8efb SHA512 b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72
 DIST sudo-1.8.27.tar.gz 3293178 BLAKE2B 174d63ece5c24309dc0d237fadfc4131243aca333491ffa6dcdb3c44b53cb8149d3bf2f3aea2aa49529ea811d4727a11ac1909305e342b858a4c14f923f12956 SHA512 0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac
-DIST sudo-1.8.28b2.tar.gz 3301533 BLAKE2B 9805d01b87c497e8b169d48598753a1f274d00dbe8ac81b992cb08b0ac74400b4abbf1bcc5e4bb4e7c135556f0069f9db279c39e40460749801bbacd5a84caf3 SHA512 df7e352c14d586bf556cf63c6176f6f5ec8619b0f36089466abeb8a732bd190e763429d46552dc79efadc640369a82e213a9e14d9a596761cba005f52b0f0f8a
+DIST sudo-1.8.28b3.tar.gz 3305122 BLAKE2B b3b9a3fbf853cfb484516eae3398c09c897115e887a7693014c304ff4b4a477861dbdf5af85b954054abeed7afa8b77470a4bad5e3beaf278b70c0969b6c6471 SHA512 87c16bd44bfabddbf8e0b9899d02ae05fbc1ccae9a21eb8123162f4a3dd4ccd91d013db5a50a6c249d85a3e1b4ac790c7dc0aabfe155f125dc211159404816ca
 EBUILD sudo-1.8.25_p1-r1.ebuild 6418 BLAKE2B 54b1649420ec20b8f34b4ceb51549d1d04382c42cb31a90c0b3b20fc9f50a8f7bd111eac0702e9d6229c8c908df3030d0fe040c80eab22e52e71574c1ecc011f SHA512 beb5ca170c8e149d550d6c2ee96326af2c63780c4e9ae69493af2e7612dd1458aef187c193acafac16d3b003775f9d2a53ad778254468bc0d68620149a918fe1
-EBUILD sudo-1.8.27-r1.ebuild 6665 BLAKE2B a1f14a58d3ae68bba174ae1d5bdbf82d2408a036a6e22ae38393594f507390391e9ad7a0d10b6e0a4641e2037a37591d268fae02e28003418ef0a9f2fe228b0c SHA512 13b46e6da2f845b657b13ee302de36a38430c56ee4e45ec1a2c152ba077a838d7ad38e84250d902543d56f386a078706157493fb56fad65890f7e01d2e8d1f33
-EBUILD sudo-1.8.28_beta2.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd
+EBUILD sudo-1.8.27-r1.ebuild 6662 BLAKE2B 90eb9b9a0bd6de53d6bfb2ca9fd754225e50267c2e36038728dd9c7f716c0a16d9de67a3c44b5c1f719844967e2867c4b32a46d82db3a43ea5e2d8273b9466b9 SHA512 1c662e3e02c77f54001b3e59a1a68a4fc6726176e07aeec06d5b587e19550e288e36eb5b35033ef785af5ec881800e7c8ec98fb7e22cc96c25ad67ecb31b84fe
+EBUILD sudo-1.8.28_beta3.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd
 EBUILD sudo-9999.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd
 MISC metadata.xml 1489 BLAKE2B 3739b522115082830f82f509804b6f6f5e3ad55633c20b51b1cfa48960af6189bd33dd71d1e9432d4adf7bb4ad7790d7eed62996ab5ad12aa55732eee85b50a0 SHA512 6fa51671c5fa3ca442da0982542a8290ed39c835106c40d2db278ae16ec45eed28e563e203c1d5519bbf637483d0779094bca2ec3505d6f466d0a2b62b5248f8
diff --git a/app-admin/sudo/sudo-1.8.27-r1.ebuild b/app-admin/sudo/sudo-1.8.27-r1.ebuild
index 26ca23f617c5..6a259192f45d 100644
--- a/app-admin/sudo/sudo-1.8.27-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.27-r1.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} != "9999" ]] ; then
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+		KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 	fi
 fi
 
diff --git a/app-admin/sudo/sudo-1.8.28_beta2.ebuild b/app-admin/sudo/sudo-1.8.28_beta3.ebuild
index 69778e4b8d41..69778e4b8d41 100644
--- a/app-admin/sudo/sudo-1.8.28_beta2.ebuild
+++ b/app-admin/sudo/sudo-1.8.28_beta3.ebuild
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index ad96de4c550d..cdbfe7a15c35 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -12,9 +12,12 @@ DIST vault-1.1.2-webui.tar.xz 1281868 BLAKE2B 9c3662dabfd9403fda4a8acd8f9a86ff86
 DIST vault-1.1.2.tar.gz 26026601 BLAKE2B df208b15076007ab87c3c6683698dc4348f56d5a73ff2a52ce17c5a9858acf4d597f7c53f709a1415247cd4cdc65454cc1aa6c18504cbb10368d39df2974175d SHA512 bc645bc5efeaf5a185479ab2ea78589762d09a40e889845d8cceac94568fcfcfeac94ae602c548648aea800b791121fbb2b75c3af9a9651d08dd9e38c1219826
 DIST vault-1.1.3-webui.tar.xz 1284144 BLAKE2B b84260974ce0827ce8ae834827c331a9bf70f589984975152188615aa480172cf41f4a45abc96fa13bfb7837ae1679bcff519f6aa7ab0678048b2cffbbe11afe SHA512 36331457c50e2a5d42269a5f91cd3e982c3f7dbfd0a2cfa4f8f435c253af6f075da6401b59a92e1949c683b4c5e899ef2f28bbd8a5cbeabcca8ef30816d75e73
 DIST vault-1.1.3.tar.gz 26026249 BLAKE2B a8fb531caf43f675d604f58126a7e56f7bf86defa2309d5d81d92911457efe5595b5c3244be4d0f73806ca5b746bddc852f871c10841da0e7ec128e53c6c18a4 SHA512 bf757558b984711967fdc623393e71c74d5e73922de3b0574ecb229a5d52320ebc3f848b48eabf0ed7a8d6e9d9f6c12d69fb23309fb8c19492b135344c8c4be2
+DIST vault-1.2.2-webui.tar.xz 1920136 BLAKE2B 81b90a0d796727c7523712ae50f85a24fa98b8b78c304d3ee50654e7f0ea1b3d58005abcbe55a15c3b496f5fce5701306ac57f0c6decc7ab8ae24ab12f5dd81d SHA512 b454e02e664190903b11bf0e3e465463182f3b7060efeb2c858127306869d731193102ba58398c28441d2be1a3956b88b2591aab1460047647742ba9dab5a00c
+DIST vault-1.2.2.tar.gz 27588019 BLAKE2B 5d989d1750a134f0c68e25ced7406ec8e7ae1d2233a1ece634e1487e4879af2d4a3e938aea1016d6872754f31ef19c85d04cd65e63f6547d7a5cf3cfa93ec208 SHA512 ce9211b3deb1839759646f8488fe2b89fec379bafed472921a62cd507f842ed05647fe4da7cb9482d195b028a29eb576f947da24aecd8b19181c7282fd3a155d
 EBUILD vault-0.11.5.ebuild 1620 BLAKE2B 7130a0a55407c092d96c3e22b216bdfab9d2e0168176539745afda5563808efbec06051adaa66fbf644a530ae91ac6f21fa7d58f78f57aab3f8b19dc65812399 SHA512 5d22bb29b0a7bffe7410af9b9cb07ab6957ca78aa0d82016341327eb739011799f330bc1f2eacc8d3509eb52f445ccb1f04ecb5332fd8d2601bfb2ba8d36486c
 EBUILD vault-1.0.2.ebuild 2177 BLAKE2B b0eca28eea305d1959990faa564907ba489d896e11be44c31a70a56b70e66666d7006d00ce5e652d028d15157178c16e7c8fab0b1962dfbefcecee3c9e494e60 SHA512 54b48f145821acc8dff09e5ed22070fdf7c3303e186de1c1721ee654e76a51025d041a1f45c3b3fde3f55a23b2f91cdf4b8d2ac94024fe266860faf4f04162a4
 EBUILD vault-1.1.0.ebuild 2177 BLAKE2B 089d6b0dc8be55d3abbabab1193fdb5debac444d39e52fa2ccae2e695d746b93b05705ab6f743f37eea505eabed5cb774c78df4a39caa46d926653a409f755b5 SHA512 98a453127a49429823e79544cdec581707623106002e2c0d402a9af64d585e57735c10d083699d3911f2e4f1794e99b48dd666d026f7abaad55b61015321fdde
 EBUILD vault-1.1.2-r1.ebuild 2177 BLAKE2B 089d6b0dc8be55d3abbabab1193fdb5debac444d39e52fa2ccae2e695d746b93b05705ab6f743f37eea505eabed5cb774c78df4a39caa46d926653a409f755b5 SHA512 98a453127a49429823e79544cdec581707623106002e2c0d402a9af64d585e57735c10d083699d3911f2e4f1794e99b48dd666d026f7abaad55b61015321fdde
 EBUILD vault-1.1.3.ebuild 2177 BLAKE2B 089d6b0dc8be55d3abbabab1193fdb5debac444d39e52fa2ccae2e695d746b93b05705ab6f743f37eea505eabed5cb774c78df4a39caa46d926653a409f755b5 SHA512 98a453127a49429823e79544cdec581707623106002e2c0d402a9af64d585e57735c10d083699d3911f2e4f1794e99b48dd666d026f7abaad55b61015321fdde
+EBUILD vault-1.2.2.ebuild 2314 BLAKE2B 30a0dfe3dd22cbd5319977028014a28ccceffd6cfb4191963814608b875ee0c7f0137dc4427b081f54c82975a733ffef01a12e19b2c1b6ed11fb5395565f10dc SHA512 ee0ee2bd0026ec3743d785e7b841b3a1da443081fb1e7a9cff0a27347c3e8b339e178355b43de03582a2e41dc6bad07cac56d3afad0a4034f3985377c5ea3523
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.2.2.ebuild b/app-admin/vault/vault-1.2.2.ebuild
new file mode 100644
index 000000000000..851d2b1431fa
--- /dev/null
+++ b/app-admin/vault/vault-1.2.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	webui? (
+		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
+		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
+	)"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE="+webui"
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.11:=
+	dev-go/gox"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+	if use webui; then
+		# The webui assets build has numerous nodejs dependencies,
+		# see https://github.com/hashicorp/vault/blob/master/ui/README.md
+		pushd "${S}/src/${EGO_PN}" >/dev/null || die
+		unpack "${VAULT_WEBUI_ARCHIVE}"
+		popd >/dev/null
+	fi
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i src/${EGO_PN}/scripts/build.sh || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-i src/${EGO_PN}/Makefile || die
+
+	# Avoid network-sandbox violations since go-1.13
+	rm src/${EGO_PN}/go.mod || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	mkdir bin || die
+	export -n GOCACHE XDG_CACHE_HOME #678970
+	export GOBIN=${S}/bin GOPATH=${S}
+	cd src/${EGO_PN} || die
+	# The fmt target may need to be executed if it was previously
+	# executed by an older version of go (bug 665438).
+	emake fmt
+	BUILD_TAGS="$(usex webui ui '')" \
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	dobin bin/${PN}
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-06 10:28:05 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-06 10:28:05 +0100
commit	f1af93971b7490792d8541bc790e0d8c6d787059 (patch)
tree	a38046712bbc3a3844d77452d16c84e716caa3d4 /app-admin
parent	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)