gentoo resync : 04.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-04 08:53:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-04 08:53:53 +0100
commit: e3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree: 9cb29a544215119b5c5538e37211b994ce1c87ae /app-admin
parent: 480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)
82 files changed, 546 insertions, 3390 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 8c5c2b5ae4ed..585743a3fa68 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index 343be31cf5b3..f41850225777 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -6,9 +6,6 @@ AUX abrt-2.0.12-r1-init 1921 BLAKE2B dc8bbe3d4902ac65165f1e71eb6400810980f6b9001
 AUX abrt-2.0.6-format-security.patch 911 BLAKE2B e502ea10a65de1b0ebff3f7d954d42af365a8384be817ff0b891153877d2714f63b9edb8565df503b455824a03f94bc62ef596aa670516d212239922d23e0b62 SHA512 8e9f8bb37698834b998d1d4a9452e17f5484a2fa9fbc400b80f2154fb4f7ad35dcbc65112afa3fef2f1b2ccf78a01f745e436e61323c40d76f17da11a6229b71
 DIST abrt-2.0.12.tar.gz 1090121 BLAKE2B 272f486bd166a33fea3e340763b3443b5643a650fe16ad326e249309c355f214c67937456dd2d8f3e7cdac65cb85bd8030e6b89671f427085a05dca64b8f874d SHA512 5432205edb4483fb1883b9bcebab48784b16dd9e72c3a929ea0d50c48dab638d80f136b6b0d7648d8ec9fcb79d5ce8c1be37d36301d3b2b151868901be82a63a
 DIST abrt-2.10.10.tar.gz 6830586 BLAKE2B 5cd45144678e6355cb1362c3ebe5531104bb150ff95c42d10e3056f7619cdc7dc3da57e4025cab05234866a4634f29bc07fd78f574800d6b303385c6befa25bd SHA512 6daeea898c9328d31b952ef12202162e002f91b4115301e5d66a0e6991251f9a8322b87201128f7efd54b42b76cb94abc4cf01e5d5b563f254f6757ec7e2127d
-DIST abrt-2.10.9.tar.gz 6830234 BLAKE2B ec96b915103c8b8157eb64c98791d283225091d0f2aa7b78520bfae1bee22f43703715fabc43828c750aa7e84eea4a886878d411670b7b4ad31ca49b96d387f3 SHA512 1ff7e2edf29085fb03c569b67e8bf2bc83aaf4dd77730e5fc96184453224f83dd0632eaf85a7ad03351fdfaea3d4ed50e8a89eb28d82151f95bd34eb1850f93c
 EBUILD abrt-2.0.12-r2.ebuild 2643 BLAKE2B 2799f38b03a18400cdaa0d471a64aada8204cd837198b107f1217740d00c50bab937f98a46354811fe573d99d5e84b61730a60d39ea45cf5d1c1d31f57ce4de1 SHA512 f9fcd1f028b14744c7f9e930ee684bd6e010bd453d7d4b44b689cca103e7a5770a1b5a6a041193826a29229ab6acde442b8f91cc1714384a3312e0560beb4809
-EBUILD abrt-2.10.10-r1.ebuild 2702 BLAKE2B e337dc8fb42cdbf634ddea35674e8c841a4fca1b9bcf4c65b8e3fcd4553eb791d25ca4313dbda08834aec59c712f84845833d6025939ea8ba1bcce4f5d852c0b SHA512 10af342514fc3cb62942a3ea0b8580cdd1e05a91ec55548bf046a960ed4a38d95f0e362c89dd7f32bf39b080e7d5208dd021645e439130633708a1417b48f1b5
-EBUILD abrt-2.10.10.ebuild 2698 BLAKE2B c4020d0aceff14802ff9dee884cc8e15abfe8751f9167a3e99a983c3347e3091a5008259f4e2de46473532f614c633be30ab11b1b51664bf9759665cb4effcb1 SHA512 870aeb8a60428bdd21b311ee9114a3b4f5605ef7c3095d97c54bd280153555d1c8c3e2ea6175dad62d79a71f707ba9a7a91d939393067c5b678ff4fc4f5b769e
-EBUILD abrt-2.10.9.ebuild 2687 BLAKE2B 2554c809fdb24139c97f968fac129f0b408025033e8c6a4241295a94db18241ecae501299de57eb3fd1318df0e770db0e3ce4bb84d9fb99f478c41ee59c74cfa SHA512 59743039a3316da2c725e2ca3ca97e30d4c4242636523f02aa75baacfbb4191639d4c364ee3feffd5ccdfb004e93f1a390391fd1752918dec16035c430a40b21
+EBUILD abrt-2.10.10-r2.ebuild 2727 BLAKE2B 365cb1dcfb1e6df0a3512593c5fc448ef51e443d93c477691c1c0890ede105a8097a8c354a70ae43792223e856f5b1bd4dc32a09cf4a270fdc0866bd03037755 SHA512 712f39c2c79955ec3061503c0655e30fbbe07f402003ce5d870307c4517507d6380d63de9ed0958d5d5d1c0acfb88483e1e0736dba736a6960397b2062ec4a03
 MISC metadata.xml 327 BLAKE2B e5a24f189c128e35fd3b878143c5d99da897af8535258f7eece0153df8a5b2dfc8b4f19000c60a6fcb70bb4f0b9efad98d2deab9e36dd205615e4176a06c0c45 SHA512 687cee8b12e63a46b815a1d6099a2853ed72d3d19d118e4e0cdbe67f501475ed02949848a4537a7c5eef0ac4a398edab868f816bdff277e3c1b348e5ab73ee40
diff --git a/app-admin/abrt/abrt-2.10.10-r1.ebuild b/app-admin/abrt/abrt-2.10.10-r2.ebuild
index 12dd86750951..b1301efc7478 100644
--- a/app-admin/abrt/abrt-2.10.10-r1.ebuild
+++ b/app-admin/abrt/abrt-2.10.10-r2.ebuild
@@ -90,6 +90,7 @@ src_configure() {
 
 src_install() {
 	default
+	python_optimize #661706
 
 	keepdir /var/run/abrt
 	# /var/spool/abrt is created by dev-libs/libreport
diff --git a/app-admin/abrt/abrt-2.10.10.ebuild b/app-admin/abrt/abrt-2.10.10.ebuild
deleted file mode 100644
index 92a41f5008a3..000000000000
--- a/app-admin/abrt/abrt-2.10.10.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools gnome2-utils python-single-r1 systemd user
-
-DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.43:2
-	>=dev-libs/libreport-2.9.5[python]
-	dev-libs/libxml2
-	dev-libs/nss
-	>=gnome-base/gsettings-desktop-schemas-3.15.1
-	sys-apps/dbus
-	sys-apps/systemd
-	sys-auth/polkit
-	sys-fs/inotify-tools
-	x11-libs/gtk+:3
-	>=x11-libs/libnotify-0.7
-"
-RDEPEND="${COMMON_DEPEND}
-	app-arch/cpio
-	dev-libs/elfutils
-	dev-python/argcomplete[${PYTHON_USEDEP}]
-	dev-python/argh[${PYTHON_USEDEP}]
-	dev-python/humanize[${PYTHON_USEDEP}]
-	sys-apps/util-linux
-	>=sys-devel/gdb-7
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	dev-libs/satyr[${PYTHON_USEDEP}]
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17
-"
-
-RESTRICT="test" # tests *may* be broken due to all the RHEL crap.  explore later.
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	enewgroup abrt
-	enewuser abrt -1 -1 -1 abrt
-}
-
-src_prepare() {
-	default
-
-	# pyhook test is sensitive to the format of python's error messages, and
-	# fails with certain python versions
-	sed -e '/pyhook.at/ d' \
-		-i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
-	./gen-version || die # Needed to be run before autoreconf
-	eautoreconf
-}
-
-src_configure() {
-	myeconfargs=(
-		--libdir="${EPREFIX}/$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-bodhi
-		# package breaks due to not finding libreport-web with bodhi plugin enabled
-		--without-rpm
-		$(usex selinux "" "--without-selinux")
-		--without-python2
-		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
-		--with-python3
-		--without-pythondoc
-		# package breaks due to no sphinx-build-3
-		--without-pythontests
-		# kill tests for now until they can be explored.
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir /var/run/abrt
-	# /var/spool/abrt is created by dev-libs/libreport
-
-	diropts -m 700 -o abrt -g abrt
-	keepdir /var/spool/abrt-upload
-
-	diropts -m 775 -o abrt -g abrt
-	keepdir /var/cache/abrt-di
-
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
-	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-admin/abrt/abrt-2.10.9.ebuild b/app-admin/abrt/abrt-2.10.9.ebuild
deleted file mode 100644
index 313aab7271b3..000000000000
--- a/app-admin/abrt/abrt-2.10.9.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools gnome2-utils python-single-r1 systemd user
-
-DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.43:2
-	>=dev-libs/libreport-2.9.5[python]
-	dev-libs/libxml2
-	dev-libs/nss
-	>=gnome-base/gsettings-desktop-schemas-3.15.1
-	sys-apps/dbus
-	sys-apps/systemd
-	sys-auth/polkit
-	sys-fs/inotify-tools
-	x11-libs/gtk+:3
-	>=x11-libs/libnotify-0.7"
-RDEPEND="${COMMON_DEPEND}
-	app-arch/cpio
-	dev-libs/elfutils
-	dev-python/argcomplete
-	dev-python/argh
-	dev-python/humanize
-	sys-apps/util-linux
-	>=sys-devel/gdb-7"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	dev-libs/satyr[${PYTHON_USEDEP}]
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RESTRICT="test" # tests *may* be broken due to all the RHEL crap.  explore later.
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	enewgroup abrt
-	enewuser abrt -1 -1 -1 abrt
-}
-
-src_prepare() {
-	default
-
-	# pyhook test is sensitive to the format of python's error messages, and
-	# fails with certain python versions
-	sed -e '/pyhook.at/ d' \
-		-i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
-	./gen-version || die # Needed to be run before autoreconf
-	eautoreconf
-}
-
-src_configure() {
-
-	myeconfargs=(
-		--libdir="${EPREFIX}/$(get_libdir)"
-		--localstatedir="${EPREFIX}/var"
-		--without-bodhi
-		# package breaks due to not finding libreport-web with bodhi plugin enabled
-		--without-rpm
-		$(usex selinux "" "--without-selinux")
-		--without-python2
-		# Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
-		--with-python3
-		--without-pythondoc
-		# package breaks due to no sphinx-build-3
-		--without-pythontests
-		# kill tests for now until they can be explored.
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	keepdir /var/run/abrt
-	# /var/spool/abrt is created by dev-libs/libreport
-
-	diropts -m 700 -o abrt -g abrt
-	keepdir /var/spool/abrt-upload
-
-	diropts -m 775 -o abrt -g abrt
-	keepdir /var/cache/abrt-di
-
-	find "${D}" -name '*.la' -exec rm -f {} + || die
-
-	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
-	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 4af0a5111a21..b25d597f1402 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,10 +1,10 @@
-DIST ansible-2.4.6.0.tar.gz 6516642 BLAKE2B 27c94a9de0ba7e9aa3d519fd18eb7a27e77b6cf8de3b51a74131a96cbd85c625f43d55e7894483cf623b1e62bddfedf448b1051ad7b2bc7f81a338cfca410458 SHA512 3b4d4d8f3b1eb27861e7beac4557b608e3f9a77d4a24d33868c8d1be2b3fd9a57ef98e4685bbfd859d64a2f591487852fb5409ef00006036be4409eaf07d1b5b
-DIST ansible-2.5.5.tar.gz 10150862 BLAKE2B 51184d11418c0a534c0176fcc6fde6da3c962e00502b354317b311d20122b28bbafbb8dfdfb7700a0153116c70396a882b538524395af590af16eeac043d0655 SHA512 a3d50539d2a109dc0bbcdb440e0800b917f63141dce935e6426cb6bdc51e3a93e02f05c23714c24ab00b19842a86677b8d2f2455d20ca15410fa8d3c8ba379ca
 DIST ansible-2.5.6.tar.gz 10157989 BLAKE2B 07341ab7a087e3139442d5420b461ca332f3a9e550874a746f43904763660ef12c9a2041bb991eeb315abdc7f6e31e3615d9283f407003eddddf2b661331c59a SHA512 169badaa6a94d1ea2d16cb97c7e5eb0b8c225a455edfa95f3ad9e4ec968d5b9525dec4732b60e5ba5f92412f87d8aacc0b2299f2595f3bb820ad8604be8e76d6
+DIST ansible-2.5.7.tar.gz 10162406 BLAKE2B 1374b0fba39f0cb263a24425d9ebcd9087c0dbad869ddaa1491465db60a80a1a3b82858c80d2d4fc1d03db05d94840f2eeddd4c5a13632426fac178663b7baca SHA512 1be274b080dcc4aba40c884ba45b1403788aadb1f14bd00fd52283bc6e691ec7863f061cb4b7d70965d48cdb49c6b849e9b2e49dd7dd6dd5d8788f2d637960b1
 DIST ansible-2.6.1.tar.gz 10724749 BLAKE2B af4523ab904660fa3369bdae2839ab4b2f386235be5a004e1f9a9a5f7c555a2e6fe82319abe20ecbf7e74152f8e2ad5060fda2c2af0f5d62fdd9416901c9072c SHA512 1235e12a510317665956bfae9e0d03814083a24ba6e5c98072437e50b4a596437a173b32d9d5af37b4b9e168e35045fdb65e65276fdc830f473ab1f42dcba2d2
-EBUILD ansible-2.4.6.0.ebuild 1406 BLAKE2B f2c87ce03b3c4914087b0401485a07f7b3287ebf62a4d0b7acaa7b9c06bd670c0f91bf2288edbbd45ab577403a1b85de2733c0a3fced85c99720ae8f7848ed46 SHA512 b4d4d40758c6f638f07480af76ff2cdcebe787276c27c23b3e046841ecfaacac83845c14bca352ed603c15a3fff4eb19ae53c990e7fa2662d5b5822890091a1a
-EBUILD ansible-2.5.5.ebuild 1636 BLAKE2B 8c6498794147e6fc8c2cf50429a44f481f1244d532cb0205f6c0828bfceda1690264e78621fc74d75a03f3521600cc81f9f78afcba60a9e089b3472d9f4fa687 SHA512 5b90735e77ea2e0f47b6744f179ad555da406a6efa1a0137e590fe6e22cba1406aa925dd175a421fe7499ba2cdf9a8666673118700c046f9512d0572c6ec6fb6
-EBUILD ansible-2.5.6.ebuild 1638 BLAKE2B 867eaee65aba92146eab5a003bd77f2e8c07cd14bc757e52886b0934297f5a4af186f5f53012809606bc7e4972d6ec29e57f6e1cbc724eac3e74e2918b39def7 SHA512 60851978084f2d683d5bd4281c34817f643a03fff840de9a942aaa5652bde04e7ab2619334381e4eeccdc4b4e81a36f5ca4beadb9adf3dbbeba21df057280ae6
-EBUILD ansible-2.6.1.ebuild 1638 BLAKE2B 867eaee65aba92146eab5a003bd77f2e8c07cd14bc757e52886b0934297f5a4af186f5f53012809606bc7e4972d6ec29e57f6e1cbc724eac3e74e2918b39def7 SHA512 60851978084f2d683d5bd4281c34817f643a03fff840de9a942aaa5652bde04e7ab2619334381e4eeccdc4b4e81a36f5ca4beadb9adf3dbbeba21df057280ae6
-EBUILD ansible-9999.ebuild 1639 BLAKE2B 29b700db02b27d19e0f819c6e75a9b00a66d8f0f817360cb08a89c062c804459030e95d78f3af2f3d50b6b63cee95dedd3878b9f784bae203ecdbd8a357254c3 SHA512 f92f4a34290101837516157ecbaee968505d50f3d46afa0d03f607601443ff3c0c05fffc3c15da576f0114d800c9445f54b1e9a3f6a970634ee9628aab58e558
+DIST ansible-2.6.2.tar.gz 10738149 BLAKE2B ac46fe99da9aba55702c578c6d177b7cb1bcd17fb73f08f160afbbcb6a868de721202492e8198e8cb8c68a1ce771572ce0bb598cd310f2ce35d08b0aeeee3f8d SHA512 2283d69be267474e839af44e0e7a14a5532cadef7d65baa2af4045cb93d88b76890b735a78cce348916c04f5dc3c2ed78deb22bb8d94d0c0c0306180d79b1a9b
+EBUILD ansible-2.5.6.ebuild 1636 BLAKE2B 8c6498794147e6fc8c2cf50429a44f481f1244d532cb0205f6c0828bfceda1690264e78621fc74d75a03f3521600cc81f9f78afcba60a9e089b3472d9f4fa687 SHA512 5b90735e77ea2e0f47b6744f179ad555da406a6efa1a0137e590fe6e22cba1406aa925dd175a421fe7499ba2cdf9a8666673118700c046f9512d0572c6ec6fb6
+EBUILD ansible-2.5.7.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
+EBUILD ansible-2.6.1.ebuild 1636 BLAKE2B 8c6498794147e6fc8c2cf50429a44f481f1244d532cb0205f6c0828bfceda1690264e78621fc74d75a03f3521600cc81f9f78afcba60a9e089b3472d9f4fa687 SHA512 5b90735e77ea2e0f47b6744f179ad555da406a6efa1a0137e590fe6e22cba1406aa925dd175a421fe7499ba2cdf9a8666673118700c046f9512d0572c6ec6fb6
+EBUILD ansible-2.6.2.ebuild 1626 BLAKE2B 99e0d3c67631e1f0c5c2e5118728ba06ad2fb26f6b0b689ca8541ac5f03611b5ec516a23ac7f2dfe73a677f0047e51291e83d03e820420e430276f0f844305fd SHA512 9e1a627f40a7a87abb811eaeb37601836324db2d292f4fae990aea3d6b3a5d30f739b1f4a198c5542cf0fbc1f836e9d96a8e67938fb6c3d9709800138a47ca9c
+EBUILD ansible-9999.ebuild 1639 BLAKE2B 363a22df345822cd047685b7cdf7114e5e1a1276bf90463799712ee90f751deea4c487f9c96a807558428d3e5993f4fded0017fb5d37b75ff6e550a6ccc32b2b SHA512 10d18db06a345555299b342eb01c7f3355f9f71d70f0ac6b3f2fc3837859161821c8c5771bec3d943647cb1c5ba8abae8c4febdccbbc4f2d747aa0f848682b46
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.5.6.ebuild b/app-admin/ansible/ansible-2.5.6.ebuild
index 8f63e8546445..fb7e782721e5 100644
--- a/app-admin/ansible/ansible-2.5.6.ebuild
+++ b/app-admin/ansible/ansible-2.5.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.5.5.ebuild b/app-admin/ansible/ansible-2.5.7.ebuild
index fb7e782721e5..6ca07021a91a 100644
--- a/app-admin/ansible/ansible-2.5.5.ebuild
+++ b/app-admin/ansible/ansible-2.5.7.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
-inherit distutils-r1 eutils versionator
+inherit distutils-r1 eutils
 
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="https://ansible.com/"
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.6.1.ebuild b/app-admin/ansible/ansible-2.6.1.ebuild
index 8f63e8546445..fb7e782721e5 100644
--- a/app-admin/ansible/ansible-2.6.1.ebuild
+++ b/app-admin/ansible/ansible-2.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.4.6.0.ebuild b/app-admin/ansible/ansible-2.6.2.ebuild
index eeb696f6cfd4..6ca07021a91a 100644
--- a/app-admin/ansible/ansible-2.4.6.0.ebuild
+++ b/app-admin/ansible/ansible-2.6.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
-inherit distutils-r1 eutils versionator
+inherit distutils-r1 eutils
 
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="https://ansible.com/"
@@ -13,8 +13,8 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="test"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="doc test"
 
 RDEPEND="
 	dev-python/paramiko[${PYTHON_USEDEP}]
@@ -31,6 +31,7 @@ RDEPEND="
 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}]
@@ -44,11 +45,20 @@ DEPEND="
 # 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
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 91c2329b3164..7fa4fe6b36e9 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index 257d06cc672e..bda67fbb1809 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -2,6 +2,5 @@ AUX apg-2.3.0b-cracklib.patch 920 BLAKE2B d1b0decd8a35db02ee8132350a04f61ada715e
 AUX apg-2.3.0b-crypt_password.patch 844 BLAKE2B c87ccb6002eac2c363a5b35dc033badf3968562956a4f49697c98368293aa98f2420ff56ac742a7308a2373183c3883c5bce30cd1d8cb72f6f788df2891f8275 SHA512 bde5b1bbc4084cd4d2630ea92ed73c970cd217554638d17980c4d56b0da2f55cd7cafbc76b5073bd0415a7698b70df9d357f0c1731353dae46990e9407d7bb94
 AUX apg-glibc-2.4.patch 260 BLAKE2B b30c414ed89f22eb7dc2d0e3b115dbbc0845aba06f2a9dc0dea61fb36d9ccfa231d56959e7f02b3f1fb337654eec5cf2bd60c53ce24e112470c9fc9b9c225680 SHA512 27463b291aee051a4a149664cfd3dea524a34cd88d5cb90c5b4891fe0722aad9993cfd10df555455890ea631d8844d566d23cbb3812f8cb2859e131ea4c42114
 DIST apg-2.3.0b.tar.gz 109995 BLAKE2B 9b4a6141fb7f6e649fe06ed91bda636879a03d6e5e6071267bbb6cd27e63b4588c23ea7902c5b1a74dde8520843566a4f2857a34f4d66020142425e5faf53daf SHA512 3112d2267f2311f960a52fa268b55a5faf0250a4a8c5e7444f0c1326afa2844a476a54befcf79e5b8532d74c53f6f58ffc420591c8c36798dd82b43c14869e1a
-EBUILD apg-2.3.0b-r5.ebuild 1344 BLAKE2B cbdb7df15da6c6b6e08804bc5b9a94124a62c2d10c6873a697047d1ab1bbfd0c94bbfe1c992b3a958b141705c8c3749bd9c13a1b1a7646c8e8e28bf9ce56dbb0 SHA512 69f23df5f60996446721ec5ad11b201fa97cf4a1c2c12e28da17ff855debcb349e293fbba174066aa91fac5f773fe69c1b45b46530bc853dcc4c474699c60cd3
-EBUILD apg-2.3.0b-r6.ebuild 1221 BLAKE2B 3acc8161f0d45fc282dc79bdf6b44baedd682f9cc0e09ddbc422d0081f6545d0adaab73f7ee0beca50599cbe5ba1f13ed091a26058e2e887dcf9a64227485691 SHA512 8d46469a0a3448b4b8a3421d1e0674fe44c672f031d99405a8433f7a2569a73ad773611a1d176625aed7091fcf5e3a415095f6037fce830811e758199d9e9d6a
+EBUILD apg-2.3.0b-r6.ebuild 1217 BLAKE2B fd7b8b954a015f099f267a76166548894426c5a9c501a3b227c57cd3947d3f802cc02e1102335b7e2dac39c612b7f5460b6efc53eda09a4623a63e25840b6d24 SHA512 dc577d0c2e01ff658c0ad97f8d67219099b69eb83ed58b796f18d0fb2e1a1121d4bbfd35b753fff2c74cf74e1a963516cff49b1991b94c6e38ed00f126409d0a
 MISC metadata.xml 490 BLAKE2B 6daed6930e317bb6b39f21dccd9cc4f08ddc549528076d6948212c7f62fe5d1e981f57c52278ea0fbcfd3fa36b3ce79192d52bc6e91c64940c1285933166735c SHA512 b1c2173415979d73b36b5e1650f27eebb89698f65a75af8351f8f77e762b9e54798a7b2398d6146ec54e975e4dd8ce59efc3b3c803eec863784107b1ce588e9c
diff --git a/app-admin/apg/apg-2.3.0b-r5.ebuild b/app-admin/apg/apg-2.3.0b-r5.ebuild
deleted file mode 100644
index 818202c48ce4..000000000000
--- a/app-admin/apg/apg-2.3.0b-r5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Another Password Generator"
-HOMEPAGE="http://www.adel.nursat.kz/apg/"
-SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cracklib"
-
-DEPEND="cracklib? ( sys-libs/cracklib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	chmod -R 0700 "${S}"
-	if use cracklib; then
-		epatch "${FILESDIR}"/${P}-cracklib.patch
-		epatch "${FILESDIR}"/${PN}-glibc-2.4.patch
-	fi
-	epatch "${FILESDIR}"/${P}-crypt_password.patch
-}
-
-src_compile() {
-	sed -i 's,^#\(APG_CS_CLIBS += -lnsl\)$,\1,' Makefile \
-		|| die "Sed failed"
-	if [[ ${CHOST} == *-darwin* ]]; then
-		sed -i 's,^APG_CLIBS += -lcrypt,APG_CLIBS += ,' Makefile \
-		|| die "Sed failed"
-	fi
-
-	emake \
-		FLAGS="${CFLAGS} ${LDFLAGS}" CFLAGS="${CFLAGS} ${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		standalone || die "compile problem"
-	emake FLAGS="${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \
-		-C bfconvert || die "compile problem"
-}
-
-src_install() {
-	dobin apg apgbfm bfconvert/bfconvert || die
-	dodoc CHANGES INSTALL README THANKS TODO || die
-	cd doc
-	doman man/apg.1 man/apgbfm.1 || die
-	dodoc APG_TIPS pronun.txt rfc0972.txt rfc1750.txt || die
-}
diff --git a/app-admin/apg/apg-2.3.0b-r6.ebuild b/app-admin/apg/apg-2.3.0b-r6.ebuild
index 34ea033ebee5..00d3fa923a8d 100644
--- a/app-admin/apg/apg-2.3.0b-r6.ebuild
+++ b/app-admin/apg/apg-2.3.0b-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.adel.nursat.kz/apg/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cracklib"
 
 DEPEND="cracklib? ( sys-libs/cracklib )"
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 7c27ddd566b4..742ddf8687b6 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -5,10 +5,6 @@ AUX consul.logrotated 85 BLAKE2B 8f3212c58295d57e9265dec26b9bfe562c47ca168442180
 AUX consul.service 354 BLAKE2B 9996b9d6a1aab360a3b46518e2091e8f30794f3bd3d113a3e9cbff2f4ff8a4cd014475806bd75feb6948c12b60846a403e35630820b814032fadc9a664985b90 SHA512 537d35e5a79d40dc62f6eb04f4631251d1e6dd62f2bd7d5483274903996052705db5fb4026000ef6e768e3dafb02f155c5bc1fd15a32813ecca8b1348a95e92d
 AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
-DIST consul-1.0.6.tar.gz 8211299 BLAKE2B 7ea5df497f4796e572a86127e0854935f97439504aff82fb697f33700e9d138048772f32f171dbbe4f1fb4d1ceefa7ca96cf3dce2a22cdffd4e1906f6befa55b SHA512 c55f09272859b828816ddf548952769172331c22be8a70a7f73ab9362744fb1f4bc5fdf81955a0dbc4101584cf3660f182620dcdc56bcf94b42dce644be232a8
-DIST consul-1.2.0.tar.gz 17187054 BLAKE2B 5e8d1151efe1e8ad5932886367d0012774713081aa2725f10d45af1e05751e328d76471ff3cbd85031c252c65cde0137f96c3ef86eca7e3e7f6b28e2d20ed0d5 SHA512 1c018a5f35164a899a086ccdae94cb5e6e2a490e4c788d65b0026dbf448950d0c1038b2d61cb10f5e8c9ad22a1affad64dd4a7086b59dffd115d40aa7b3d0cce
-DIST consul-1.2.1.tar.gz 14819500 BLAKE2B debb7ee5b8016527de0ebc680b228a9749435db4364e8d6e0160b1a20e2896dd4109edc5930dad961ce18f79182dda0c00a52a567ea6ff2d267b17448df2129d SHA512 5b5d8b62056c305f7388db50b54427ed21c41fef6d1b5f67da845a66bece35454e9f538bb0df59bc86788826b6cd20cd6179552060482908fc5cbc4a048c14a8
-EBUILD consul-1.0.6.ebuild 1578 BLAKE2B c32a67c19567b1b601bb6f272f6e435f9600accb4a41a03e774c197bb8f743d67c8fb4cc9e97c4829fb1bfd21eceed9318cc3f8e31217f89d57fe20c78f71054 SHA512 c2abbe3e57e2939832f443b2df5a5c3fad3fae197a5e96f6ed116f2c235a9df882848153f1928be71b5845c38256d99e1cceaf76c88efe30470495f0ef765572
-EBUILD consul-1.2.0.ebuild 1531 BLAKE2B 0d3891c096bd5a7b33a0f7b7969c7b27ea8536a1f1b608e1d119c1096734cf232dedf4ec38a011a39676ace9fa44de6ae8a58ad594f3d3fdd3093ee580e8509c SHA512 9ba4ed9ebb5c77b7ebc8daddf4346b8d14fca664eed894ee61c3aab06918d07a6a5156bf9717006009e65ff72c9954fd653630b0a16ab3ade5cbd9a36ef5005e
-EBUILD consul-1.2.1.ebuild 1549 BLAKE2B bdc1cd6343ac29a314886b52ce3bf9258d2d64d6c7b777d015e5ff4088d9cbf66ce4f0f35d187407342e4fa7c0711864e62e2f061fb9ce46b83ce169ae45fab0 SHA512 d738514b3177a539e266b3eff06d167ec9ec9e79da23df8071592dc4d6bc37e1eeafc2297f171af404983630272eda3211eda76b10f3fd491fc3ee5f89f81032
+DIST consul-1.2.2.tar.gz 15789375 BLAKE2B 8a0af370568f6fcb90334b147bd84e479efb682ed6c58d63dd56f3554f9e6538d37963ac825bb8598eef8948492feec688b8266733223d1557dbce9704daef35 SHA512 715f69e7b36d0070ea4e602dc50f51aa2547dbbbbb07cce985da79d1e201c6e84dade8a7c810e3602f88cfbd30e063669076954d2541810a18a0c9e7c9ff8458
+EBUILD consul-1.2.2.ebuild 1550 BLAKE2B 83bbc84358ac1cd5854fd6325b62a517e6da51a0cb8d4cce6b5b94278ca4ffafaa74f3232d4d6556ebc6611b4d71608e028f931a72a10536698cec17a7322203 SHA512 bb60a8d056fe2dfbaff0eb0de014af536f9bdf8e5e8a76b17174acb19ca005530eb8811b8357097fb4a469acb0c6751337c8e81eb99fbbd156111aa1040fe4ee
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.0.6.ebuild b/app-admin/consul/consul-1.0.6.ebuild
deleted file mode 100644
index 05b4622df94f..000000000000
--- a/app-admin/consul/consul-1.0.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-
-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.9:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-src_prepare() {
-	default
-
-	sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
-		-e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e 's:go get -u -v $(GOTOOLS)::' \
-		-e 's:vendorfmt dev-build:dev-build:' \
-		-i "${S}/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" \
-		emake -C "${S}/src/${EGO_PN}" dev
-}
-
-src_install() {
-	local x
-
-	dobin "${S}/bin/${PN}"
-
-	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/consul/consul-1.2.0.ebuild b/app-admin/consul/consul-1.2.0.ebuild
deleted file mode 100644
index 1f9dd43d9356..000000000000
--- a/app-admin/consul/consul-1.2.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="2814197"
-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.9:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-src_prepare() {
-	default
-
-	sed -e 's:go get -u -v $(GOTOOLS)::' \
-		-e 's:vendorfmt dev-build:dev-build:' \
-		-i "src/${EGO_PN}/GNUmakefile" || die
-}
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake -C "src/${EGO_PN}" dev-build
-}
-
-src_install() {
-	local x
-
-	newbin 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/consul/consul-1.2.1.ebuild b/app-admin/consul/consul-1.2.2.ebuild
index 7bc86cc4fda3..e754310e4c6a 100644
--- a/app-admin/consul/consul-1.2.1.ebuild
+++ b/app-admin/consul/consul-1.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="39f3f0"
+GIT_COMMIT="e716d1b"
 KEYWORDS="~amd64"
 EGO_PN="github.com/hashicorp/consul"
 DESCRIPTION="A tool for service discovery, monitoring and configuration"
diff --git a/app-admin/dio/Manifest b/app-admin/dio/Manifest
index dc907a1ea49c..7fad798ca5ae 100644
--- a/app-admin/dio/Manifest
+++ b/app-admin/dio/Manifest
@@ -1,3 +1,3 @@
 DIST dio-1.5.2.tar.gz 44344 BLAKE2B 8e573cbf2ad1b717ffec09f20f8c7474841bc3e1635af35116d02b37af56ef3b4742e12725134d485f788e7abb595605640e19bd6f84bfd8f14289abf1695089 SHA512 366d2f2d25b8d16439c4a9aaa7cd775ddffb1022980675cdda8e2e4d4de3d3e5dcfa8d0c581b73fcfe4eff66ee8ef682f082c8788f514b7abdf1a2cb2159b9ba
 EBUILD dio-1.5.2.ebuild 549 BLAKE2B 3553d95a1b4f3b4c3b1ee239f063874149b1ddc46ad831908a32304f9a3c300d7eae3b0a793fbca25a9fc4c292e85435b95ae31f1930b3cc44b37b318c6e260d SHA512 4554efe518dc9a795a07751a85950bcc0b6edfa6cc35ce71cd0401ad84d63db832d9864a5f7144f9d28c320008ab06246b2dcaa7afbb37a29d213547e0399709
-MISC metadata.xml 474 BLAKE2B 927b087f58c120fe79c16595932d546ad071fe77968395877bb23f647fb0f996d790d795912f8a93d81c7063d5427af66987a59ca54c73ee5871ab0d7ddeb616 SHA512 259b13ae48c1e20d7d9a8d4c76cfcf375c69c2a55ffe78c231291bc745249cc9b51e3d6981ac52d7607b179d2f3b933434577eeaa1b06e602fdb1a65d7187d97
+MISC metadata.xml 255 BLAKE2B e8c22e505b32d30e59df38afab75c6a8bc0b4149e4f582eba4aa894352150792de4e054e8784a536c5249fdc0724e37b70860252e68d14fcac35ab7b56092c2a SHA512 f6ca4591922970e01ce40e4d88c39745f26dd2abf1c351b29f3d8d8b2c6a624fce4d0fcd18d6acfd1eabe6642cd1028033e61eabca4ce6d19aa58838cde828bf
diff --git a/app-admin/dio/metadata.xml b/app-admin/dio/metadata.xml
index 19a392ab5492..ebf597f23ef3 100644
--- a/app-admin/dio/metadata.xml
+++ b/app-admin/dio/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>donaldbmcintosh@yahoo.co.uk</email>
-    <name>Donald McIntosh</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">donaldmcintosh/dio</remote-id>
   </upstream>
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index 9b4a61243cfa..171dfeb7d834 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -1,3 +1,5 @@
 DIST dxf-7.3.0.tar.gz 298408 BLAKE2B a8ba078d1bea8fed58df35562af678f902513f4da18123a3eabb52a707b7973358a7690d309b3b7d86fadc4086856580792177525b4e7e217da4542249e83663 SHA512 2bb16a41990f572c3352f708438e67550cc089c078296c765fcffec4ada60f40f097bfcdf4def3c57a0e6c1db31d2ab9020407b2c165509f132e51cc93af8205
+DIST dxf-7.4.0.tar.gz 300099 BLAKE2B a3d17709efed3af5be82b1bf4ebd4201101e92867f714355467d72b84d560cddcf13a9ad2b4b71553decfc664f29c7ee13f74d551092d8a3a25dc48eea9a4214 SHA512 7aaa5827c6f02bb22b4d2dae9e24aa921ecebe72fe8278d3fc84f48448c1f903c0b70c22873d2772f3da5367ecc45770b8719c4d1aa95cac146a392bd9a923d2
 EBUILD dxf-7.3.0.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
+EBUILD dxf-7.4.0.ebuild 729 BLAKE2B da8cc137d2ac0988c2659f2ede4f49f9cf93ec12ad6bd2aa0b8a9c110cef85da4454dcd9ec5015c66744e72bc7fca5f80c2be52f4cda657f9aa696c262e93ef8 SHA512 9541da937b8f4c7e01c9d1e7b7cc95e344102f8c04ca2c3445f0406e7d7aef37ff0b01b768488a2079fc0ed6431e4028f649171cf1b06d1f4586ee5366f347e0
 MISC metadata.xml 373 BLAKE2B e00f8cf7bc138cba4b3a9db1da273f85a90612578a89a8943bad5fd2bfe5f36d233b6b26764a2fff0c261890cafe34243845d12f6e9ed952daeab86c2e3aa70a SHA512 85d9b0ab4896713d2e796fede5635fc4bb80e402b2a6a7404fa1b7ba52e139a0ef27876dae39081c58a5ea8a5a78749b7fcc13c038b85c90c4286721931cb63c
diff --git a/app-admin/dxf/dxf-7.4.0.ebuild b/app-admin/dxf/dxf-7.4.0.ebuild
new file mode 100644
index 000000000000..f6e0099fdfe3
--- /dev/null
+++ b/app-admin/dxf/dxf-7.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Docker registry v2 client in Python"
+HOMEPAGE="https://github.com/davedoesdev/dxf"
+SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
+	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+# Require dockerd running
+
+python_test() {
+	emake test
+}
diff --git a/app-admin/fifo-cronolog/Manifest b/app-admin/fifo-cronolog/Manifest
index 513c506169d8..8800b556d956 100644
--- a/app-admin/fifo-cronolog/Manifest
+++ b/app-admin/fifo-cronolog/Manifest
@@ -1,3 +1,3 @@
 DIST fifo-cronolog-1.1.1.tar.bz2 3124 BLAKE2B 6e9cb35e0ed1b54c3baed4451742840dc1144294fc675822c1260d4d7d885a52f8835e60dcbed57c714e40e94e6d51b3ba78af9b9892883f5f520a7c57d30df8 SHA512 3ac809d5cfc951764aaf31d50ee394b0dde9ced16f53daa91c81bdb218af2bab410ff945ebfdeb8307a55bda3292c0a55eb500c3cb73595e17228ef739455d90
 EBUILD fifo-cronolog-1.1.1-r1.ebuild 816 BLAKE2B ebb99339914cbde378d008b53a2da426faeb866b13e50cb06d03fbc75f42a5bb2c12aeb6161742bd22f9d0338c4e482b7fac69efa6314f203cef98c090736a72 SHA512 ace0fca2b8e11d99dc9b0ac51d10c9a06089c0aa6912804c0fa78ca51fc4786735eb6d6c8b0cd3f9887feff7112a1f6f9bba647b2585e72309bbb75a1ca943f3
-MISC metadata.xml 480 BLAKE2B f106319d18b4dd56223023bf22dd454222b4530ff3538baa005ec4d5c8a1cf33293a58eda300daa21ae7b72fcc2e2a601477832608e548308d4979e2ac546029 SHA512 5b40d5fec153d6883069f56d93397f9fdf664fb7c59a6c9ee8734d66aacc50be78ab7a76000292412e157ca79275e8b91bae7a133feef19f967c972b7f5ba793
+MISC metadata.xml 403 BLAKE2B 2d820c9995181b62ded8106b8f647805a3ad1691e38c2d71c4f802122462bb32f946d973ca7b12de4b859f2236a75793cfd6e1205d2997d52ef5f05251a7f05a SHA512 48a117b493a50867aede7b134bcb08cceddbbb209ae9792fa696e1a63d15340141f33db37626dd0f42934332ce7d17d61d958be155954c84120532b42a6ed889
diff --git a/app-admin/fifo-cronolog/metadata.xml b/app-admin/fifo-cronolog/metadata.xml
index 479c97a41559..e79f16b57700 100644
--- a/app-admin/fifo-cronolog/metadata.xml
+++ b/app-admin/fifo-cronolog/metadata.xml
@@ -6,9 +6,6 @@
 		instead of stdin. This package is used for the Gentoo infrastructure.
 	</longdescription>
 	<maintainer type="person">
-		<email>idl0r@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/graylog2/Manifest b/app-admin/graylog2/Manifest
index f8d77c8ec0ff..77b17ae7e6cd 100644
--- a/app-admin/graylog2/Manifest
+++ b/app-admin/graylog2/Manifest
@@ -1,15 +1,5 @@
-AUX confd 391 BLAKE2B 35b7806d977b6cde07d4b8b9d6b41771110c5bbbe7037003392238850fcd8c36b5e561ef4e8d94dcc063c51b684650a932e3eb9b786f076bc2ba1bbb2c0d9842 SHA512 5adfb7b72488bd25e26fd7ddee90f50a244d2a90b3dff63fc9791fb213cf14da09e0ead75eeb33e540218b343564d7b56552414c090b517e4abdd8bc7cd58f68
-AUX confd-r1 521 BLAKE2B 4fa7105f843a4e2df8d610ece2601caef641c6a29026e89c0e6180dd0a47444fb73f4d17f3b811c624f02749703bed260757999fab2cdf534c75472a70e6fc39 SHA512 a1fc50cbab0960cea36bf77b052284d52ec7bdd23e56d90fcb1712dcee608c4c0555557c4cfaa5fb0ce6165f0cf1a88888e705e9c64104af79a18be525ec9725
 AUX confd-r2 542 BLAKE2B 83a8b2a3bf1fc60a2a9475d823efe39febb961d0aaee12b7b18f1d2752427e401fe2f68c83f777fba1d2f585540f4d9b422befcc959aa082a26eeef2be093b2b SHA512 fde38b6813f40633db5d5cbcb3d93fd17e8705d6f2c5805fdc900858fe2b0cf0c0c219345dc741cc2573b1f80b42fdf5714e71fa31938329355556503492bbb8
-AUX initd 1418 BLAKE2B 5075e527e83fbe50dae812b07f5b80a09936062ce4d51f2c2e287018b89adc392ee8839903e1ee11899176d39d67b7b8d526b26438243d70b9f5a6622361c98a SHA512 69017bc9679e710a100fa71f651d619c485954515883116287135a52c05335fb6f868eeda2bac4ea877ed8464a7cc2ac34df355189986aba172495aecc9a5379
-AUX initd-r1 1580 BLAKE2B 23b234ddc3bb2ab1e0f23795ab79fb82abda2b695c1f6fd2f1977999df51a8e4b998ca8d0e1e954c68d4c057eadec3cbe0b0309ec8b8898d7b005499675a743c SHA512 871085b5b50ca473451c42a39181ba4a626475abfc7160f7308e6fae9fe78b6bcdef397c0f5a44d9949adcbaacdb0c50fe236b54e95e1602896f4339c71c3b10
 AUX initd-r2 872 BLAKE2B 500a428a0f479dc79b1d8b7d6a1acfafe9a205a65adfacd10aa6f5e89c105c30e095e69799acd8739d9ed2b7dee0ed6d053497a74495a986b6d9b24122c29a75 SHA512 43632bd345bb3772018ce1fe32a97c85a1ad812dca2ae229dccb65302e686597dad4b62ecbc0cc5358c34761f354d51de2c9fe81bd3db71af5fdc0a6cbc0e95e
-DIST graylog-2.1.2.tgz 94284738 BLAKE2B d4971bb6fb073f575d20204b49e7edf24773f42e4c9b84f0e1d2a5834bf8d95120ef1fa6391b22714923fa1f62e623f02a6788c82b1f48fc86f4953d484de36f SHA512 df636143ff90b0aedcb6db78e20125c10da2428b6e474e925d6fc011fdc3a0b88414ec914981a71a0e08c4916cb5cd18a8eeda28e01d9edf3b3ae4a8fb0a90dc
-DIST graylog-2.2.2.tgz 99956086 BLAKE2B 55499d11d9f9a81df8670521f62a45323941f7acac1b87a4df96dfbe0f14a63640cd536ab1c8affa69fe1c774d37b75ca8d0d4bc6194622267a6f5640cf05cc7 SHA512 341548b5d48e3a2008a1264128a604320b566b8f0e8da4d2fca54a69e1412a69839d09698e13d97dd399652611a3e24dd54dc81f56bc4ca00278afbd61ba9c2c
-DIST graylog-2.2.3.tgz 99971278 BLAKE2B 981568151fa22b3b180a451075c9c66c1e9148d737e4683fdbeb505fccb54729619fce554ee3efd423f971081005e73e481f69d9b81676e80f1276b4a982cd6e SHA512 19ad14bdee733b4ceed526af7f446fc74a4ac5bc6a0b4784618edd84a84aa00378c203d4051a3232c17caaf47f3ffe684cb8b17ce88c8d98e7b29bc22c0058e8
-DIST graylog-2.4.5.tgz 122974260 BLAKE2B 0f04713fcee112f1018a78bea7c39b456ae167ec46c29b1b3c60326563d405a92a4d4d341860b0341a3ce2c7ad105a8ebf5068cae5b29b312d01a4fd036f277f SHA512 bfcf879ab01142894ada2639f9d191aef640fa17e7c0a5935347291e99109fa677ae9caacada6cd3b94295a290eb710c20710621376c04222d6012492331b9af
-EBUILD graylog2-2.1.2.ebuild 1862 BLAKE2B a029af6558cb63476c97d6eebdc796145bdbc99dcbfbf428396bcb2d53a66cb04c01e890f47f7ee84c2ede0b5b04d77cdfb7cdda8e9f107baa0c6e5695381b99 SHA512 43efdd7b105a59ce897beda8d49c4797ccee133929df87903a47c4d22faea1e5bec8ba2e80519ea5d635afdd2f8933fc35dda022078ddc2c251c6db43f45f157
-EBUILD graylog2-2.2.2.ebuild 2199 BLAKE2B b923e54efdc27566bdb33115e97a924976022eb7c7d15420c599a0f2705cae5079dcaab64f339a6af3ced35a15bc3efe211b66da82a199ad1c067659c3211a49 SHA512 d8fc5fbd3a09adb4dc0904e501103e9e6da18f1ab80a19908190a91cf271fcf997f73fbfdecd6a28acafa763643335c76c653a2759fde581025e1af5ff77255f
-EBUILD graylog2-2.2.3.ebuild 2206 BLAKE2B 5cc4fd2c40d7f0548b47931e013d99650d2fdf33931c95e2132721bba7393f817f7f2ba0d58d1f5f9a752667ea2dcbcb632fa5d1309c3c3113b8d4ca2c75917f SHA512 a7e6ddf34c75c835cc85fc6b5b58aed0005f88b4e0488d35832930db11d57d7c7896ccf495e3b04dad9d9330f4c98da906916c0e0cdab96956b04f3b941a9016
-EBUILD graylog2-2.4.5-r1.ebuild 2289 BLAKE2B c1b21ab668e1c0877b3cfcadf63538de1a3eaf9a85b043b34d56774f73e436454e499f22f8d7cc3f2262a01866d8e55ef9ea3be9195fe48755ebfb015fbb992d SHA512 864b58319a8ff84bd6a94490eea9d89de800dcad678302df1ea4f834f27b5b18a5f8c0ac8ae57bd0c23d3c0904e99a90a0d363abfc39442bef5b55a70783ec1e
+DIST graylog-2.4.6.tgz 122985232 BLAKE2B 3a409a08f27c3abf1eadca57c4e8c9afc334655e050c0db9bad9d16e03acab6d92bfced708486ad8383987842d9b0a5ddc54e28d29fc426761fcb0ab8c65844c SHA512 e1941f4740f43c5b92b5faa7cde06fb15294acfed5f0f56cb21a7ceffb8616382b68b67d049a2982c68833d706e57b77f365665f12193d053a2ac0996801bcbe
+EBUILD graylog2-2.4.6.ebuild 2289 BLAKE2B c1b21ab668e1c0877b3cfcadf63538de1a3eaf9a85b043b34d56774f73e436454e499f22f8d7cc3f2262a01866d8e55ef9ea3be9195fe48755ebfb015fbb992d SHA512 864b58319a8ff84bd6a94490eea9d89de800dcad678302df1ea4f834f27b5b18a5f8c0ac8ae57bd0c23d3c0904e99a90a0d363abfc39442bef5b55a70783ec1e
 MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
diff --git a/app-admin/graylog2/files/confd b/app-admin/graylog2/files/confd
deleted file mode 100644
index 58291368f353..000000000000
--- a/app-admin/graylog2/files/confd
+++ /dev/null
@@ -1,7 +0,0 @@
-GRAYLOG_CONFIG_FILE="/etc/graylog2/graylog.conf"
-GRAYLOG_GROUP="graylog"
-GRAYLOG_LOG_DIR="/var/log/graylog2"
-GRAYLOG_USER="graylog"
-GRAYLOG_OPTIONS=""
-GRAYLOG_PID_FILE="/run/graylog2/graylog.pid"
-JAVA_OPTS="-Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseParNewGC -XX:-OmitStackTraceInFastThrow"
diff --git a/app-admin/graylog2/files/confd-r1 b/app-admin/graylog2/files/confd-r1
deleted file mode 100644
index 23b632ac4338..000000000000
--- a/app-admin/graylog2/files/confd-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-GRAYLOG_CONFIG_FILE="/etc/graylog2/graylog.conf"
-GRAYLOG_GROUP="graylog"
-GRAYLOG_LOG_DIR="/var/log/graylog2"
-GRAYLOG_INSTALL_DIR="/usr/share/graylog2"
-GRAYLOG_DATA_DIR="/var/lib/graylog2"
-GRAYLOG_USER="graylog"
-GRAYLOG_OPTIONS=""
-GRAYLOG_PID_FILE="/run/graylog2/graylog.pid"
-JAVA_OPTS="-Djava.library.path=$GRAYLOG_INSTALL_DIR/lib/sigar -Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseParNewGC -XX:-OmitStackTraceInFastThrow"
diff --git a/app-admin/graylog2/files/initd b/app-admin/graylog2/files/initd
deleted file mode 100644
index 20c2143e96c9..000000000000
--- a/app-admin/graylog2/files/initd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-export JAVA_HOME=`java-config --jre-home`
-
-checkconfig() {
-  if [ ! -r "${GRAYLOG_CONFIG_FILE}" ]; then
-    eerror "GRAYLOG_CONFIG_FILE doesn't point to a readable config file"
-  fi
-}
-
-depend() {
-  need net
-}
-
-start() {
-  checkconfig || return 1
-
-  [ -e `dirname "$GRAYLOG_PID_FILE"` ] || \
-    install -d -o${GRAYLOG_USER} -g${GRAYLOG_GROUP} -m750 `dirname "$GRAYLOG_PID_FILE"`
-
-  [ -e "$GRAYLOG_LOG_DIR" ] || \
-    install -d -o${GRAYLOG_USER} -g${GRAYLOG_GROUP} -m750 "$GRAYLOG_LOG_DIR"
-  
-  CLASSPATH="$(java-config -r)"
-  CLASSPATH="${CLASSPATH}:$(java-config -d --classpath sigar)"
-
-  ebegin "Starting Graylog"
-
-  start-stop-daemon \
-    --start \
-    --exec "${JAVA_HOME}/bin/java" \
-    --user ${GRAYLOG_USER} \
-    --group ${GRAYLOG_GROUP} \
-    --env CLASSPATH="${CLASSPATH}" \
-    --background \
-    --chdir /usr/share/graylog2 \
-    --stdout ${GRAYLOG_LOG_DIR}/graylog.stdout.log \
-    --stderr ${GRAYLOG_LOG_DIR}/graylog.stderr.log \
-    -- ${JAVA_OPTS} -Djava.library.path=`java-config --lib sigar` -classpath "${CLASSPATH}" -jar /usr/share/graylog2/graylog.jar server -f "${GRAYLOG_CONFIG_FILE}" -p "${GRAYLOG_PID_FILE}" ${GRAYLOG_OPTIONS}
-
-  eend $?
-}
-
-stop() {
-  ebegin "Stopping Graylog"
-
-  start-stop-daemon \
-    --stop \
-    --pidfile "${GRAYLOG_PID_FILE}"
-
-  eend $?
-}
diff --git a/app-admin/graylog2/files/initd-r1 b/app-admin/graylog2/files/initd-r1
deleted file mode 100644
index cc068808ebf3..000000000000
--- a/app-admin/graylog2/files/initd-r1
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-export JAVA_HOME=`java-config --jre-home`
-
-checkconfig() {
-  if [ ! -r "${GRAYLOG_CONFIG_FILE}" ]; then
-    eerror "GRAYLOG_CONFIG_FILE doesn't point to a readable config file"
-  fi
-}
-
-depend() {
-  need net
-}
-
-start() {
-  checkconfig || return 1
-
-  [ -e `dirname "$GRAYLOG_PID_FILE"` ] || \
-    install -d -o${GRAYLOG_USER} -g${GRAYLOG_GROUP} -m750 `dirname "$GRAYLOG_PID_FILE"`
-
-  [ -e "$GRAYLOG_LOG_DIR" ] || \
-    install -d -o${GRAYLOG_USER} -g${GRAYLOG_GROUP} -m750 "$GRAYLOG_LOG_DIR"
-
-  ebegin "Starting Graylog"
-
-  checkpath -d -o "${GRAYLOG_USER}:${GRAYLOG_GROUP}" -m750 "${GRAYLOG_DATA_DIR}"
-  checkpath -d -o "${GRAYLOG_USER}:${GRAYLOG_GROUP}" -m750 "${GRAYLOG_DATA_DIR}/data"
-  checkpath -d -o "${GRAYLOG_USER}:${GRAYLOG_GROUP}" -m750 "${GRAYLOG_DATA_DIR}/data/contentpacks"
-  checkpath -d -o "${GRAYLOG_USER}:${GRAYLOG_GROUP}" -m750 "${GRAYLOG_DATA_DIR}/data/journal"
-
-  start-stop-daemon \
-    --start \
-    --exec "${JAVA_HOME}/bin/java" \
-    --user ${GRAYLOG_USER} \
-    --group ${GRAYLOG_GROUP} \
-    --background \
-    --chdir ${GRAYLOG_INSTALL_DIR} \
-    --stdout ${GRAYLOG_LOG_DIR}/graylog.stdout.log \
-    --stderr ${GRAYLOG_LOG_DIR}/graylog.stderr.log \
-    -- ${JAVA_OPTS} -jar ${GRAYLOG_INSTALL_DIR}/graylog.jar server -f "${GRAYLOG_CONFIG_FILE}" -p "${GRAYLOG_PID_FILE}" ${GRAYLOG_OPTIONS}
-  
-  eend $?
-}
-
-stop() {
-  ebegin "Stopping Graylog"
-
-  start-stop-daemon \
-    --stop \
-    --pidfile "${GRAYLOG_PID_FILE}"
-
-  eend $?
-}
diff --git a/app-admin/graylog2/graylog2-2.1.2.ebuild b/app-admin/graylog2/graylog2-2.1.2.ebuild
deleted file mode 100644
index d6c214a10d01..000000000000
--- a/app-admin/graylog2/graylog2-2.1.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="Free and open source log management"
-HOMEPAGE="https://graylog.org"
-SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-MY_PN="graylog"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-QA_PREBUILT="/usr/share/graylog2/lib/sigar/libsigar*"
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="virtual/jdk:1.8"
-
-INSTALL_DIR="/usr/share/graylog2"
-
-pkg_setup() {
-	enewgroup graylog
-	enewuser graylog -1 -1 -1 graylog
-}
-
-src_prepare() {
-	default
-	# graylogctl is replaced by our own initd
-	rm -r bin
-	# Stick to architecture of build host
-	if ! use amd64; then
-		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
-	fi
-	if ! use ppc64; then
-		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
-	fi
-	if ! use x86; then
-		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
-	fi
-	# Currently unsupported platforms
-	# QA warning galore but testing/patches welcome
-	rm -r lib/sigar/libsigar-ia64-*.so || die "Failed in removing IA64 support libraries"
-	rm -r lib/sigar/libsigar-ppc-*.so || die "Failed in removing PPC support libraries"
-	rm -r lib/sigar/libsigar-*-freebsd-*.so || die "Failed in removing FreeBSD support libraries"
-	rm -r lib/sigar/libsigar-pa-*.sl || die "Failed in removing HPPA support libraries"
-	rm -r lib/sigar/libsigar-*-solaris.so || die "Failed in removing Solaris support libraries"
-}
-
-src_compile() {
-	einfo "Nothing to compile; upstream supplies JAR only"
-}
-
-src_install() {
-	insinto /etc/graylog2
-	doins graylog.conf.example
-	insinto "${INSTALL_DIR}"
-	doins *
-	newinitd "${FILESDIR}/initd" graylog2
-	newconfd "${FILESDIR}/confd" graylog2
-}
diff --git a/app-admin/graylog2/graylog2-2.2.2.ebuild b/app-admin/graylog2/graylog2-2.2.2.ebuild
deleted file mode 100644
index b61f58667285..000000000000
--- a/app-admin/graylog2/graylog2-2.2.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="Free and open source log management"
-HOMEPAGE="https://graylog.org"
-SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-MY_PN="graylog"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-INSTALL_DIR="/usr/share/graylog2"
-DATA_DIR="/var/lib/graylog2"
-
-QA_PREBUILT="${INSTALL_DIR}/lib/sigar/libsigar*"
-RESTRICT="strip"
-
-RDEPEND="virtual/jdk:1.8"
-
-pkg_setup() {
-	enewgroup graylog
-	enewuser graylog -1 -1 -1 graylog
-}
-
-src_prepare() {
-	default
-
-	# graylogctl is replaced by our own initd
-	rm -r bin
-
-	# Stick to architecture of build host
-	if ! use amd64; then
-		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
-	fi
-	if ! use ppc64; then
-		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
-	fi
-	if ! use x86; then
-		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
-	fi
-	# Currently unsupported platforms
-	# QA warning galore but testing/patches welcome
-	rm lib/sigar/libsigar-*freebsd*so \
-		lib/sigar/libsigar-*solaris*so \
-		lib/sigar/libsigar-*hpux*.sl \
-		lib/sigar/libsigar-*macosx*.dylib \
-		lib/sigar/libsigar-ia64-*.so \
-		lib/sigar/libsigar-ppc-*.so \
-		lib/sigar/libsigar-s390x*.so \
-		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
-
-	# remove plugins
-	rm plugin/graylog-plugin-anonymous-usage-statistics-${PV}.jar || die
-
-	# gentoo specific paths
-	sed -i "s@\(node_id_file = \).*@\1${DATA_DIR}/node-id@g; \
-		s@\(message_journal_dir = \).*@\1${DATA_DIR}/data/journal@g; \
-		s@#\(content_packs_dir = \).*@\1/${DATA_DIR}/data/contentpacks@g" \
-		graylog.conf.example || die
-}
-
-src_compile() {
-	einfo "Nothing to compile; upstream supplies JAR only"
-}
-
-src_install() {
-	insinto /etc/graylog2
-	doins graylog.conf.example
-
-	insinto ${DATA_DIR}/data/contentpacks
-	doins data/contentpacks/grok-patterns.json
-
-	insinto "${INSTALL_DIR}"
-	doins *
-
-	doins -r lib plugin
-
-	newinitd "${FILESDIR}/initd-r1" graylog2
-	newconfd "${FILESDIR}/confd-r1" graylog2
-}
diff --git a/app-admin/graylog2/graylog2-2.2.3.ebuild b/app-admin/graylog2/graylog2-2.2.3.ebuild
deleted file mode 100644
index a7b8cd7ab679..000000000000
--- a/app-admin/graylog2/graylog2-2.2.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="Free and open source log management"
-HOMEPAGE="https://graylog.org"
-SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-MY_PN="graylog"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-INSTALL_DIR="/usr/share/graylog2"
-DATA_DIR="/var/lib/graylog2"
-
-QA_PREBUILT="${INSTALL_DIR}/lib/sigar/libsigar*"
-RESTRICT="strip"
-
-RDEPEND="virtual/jdk:1.8"
-
-pkg_setup() {
-	enewgroup graylog
-	enewuser graylog -1 -1 -1 graylog
-}
-
-src_prepare() {
-	default
-
-	# graylogctl is replaced by our own initd
-	rm -r bin || die
-
-	# Stick to architecture of build host
-	if ! use amd64; then
-		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
-	fi
-	if ! use ppc64; then
-		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
-	fi
-	if ! use x86; then
-		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
-	fi
-	# Currently unsupported platforms
-	# QA warning galore but testing/patches welcome
-	rm lib/sigar/libsigar-*freebsd*so \
-		lib/sigar/libsigar-*solaris*so \
-		lib/sigar/libsigar-*hpux*.sl \
-		lib/sigar/libsigar-*macosx*.dylib \
-		lib/sigar/libsigar-ia64-*.so \
-		lib/sigar/libsigar-ppc-*.so \
-		lib/sigar/libsigar-s390x*.so \
-		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
-
-	# remove plugins
-	rm plugin/graylog-plugin-anonymous-usage-statistics-${PV}.jar || die
-
-	# gentoo specific paths
-	sed -i "s@\(node_id_file = \).*@\1${DATA_DIR}/node-id@g; \
-		s@\(message_journal_dir = \).*@\1${DATA_DIR}/data/journal@g; \
-		s@#\(content_packs_dir = \).*@\1/${DATA_DIR}/data/contentpacks@g" \
-		graylog.conf.example || die
-}
-
-src_compile() {
-	einfo "Nothing to compile; upstream supplies JAR only"
-}
-
-src_install() {
-	insinto /etc/graylog2
-	doins graylog.conf.example
-
-	insinto ${DATA_DIR}/data/contentpacks
-	doins data/contentpacks/grok-patterns.json
-
-	insinto "${INSTALL_DIR}"
-	doins *
-
-	doins -r lib plugin
-
-	newinitd "${FILESDIR}/initd-r1" graylog2
-	newconfd "${FILESDIR}/confd-r1" graylog2
-}
diff --git a/app-admin/graylog2/graylog2-2.4.5-r1.ebuild b/app-admin/graylog2/graylog2-2.4.6.ebuild
index 91ea75e61cb4..91ea75e61cb4 100644
--- a/app-admin/graylog2/graylog2-2.4.5-r1.ebuild
+++ b/app-admin/graylog2/graylog2-2.4.6.ebuild
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index 381b0fc647bd..cb1d14b3104d 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -96,7 +96,9 @@ DIST github.com-square-go-jose-f8f38de21b4dcd69d0413faf231983f5fd6634b1.tar.gz 2
 DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613
 DIST github.com-technosophos-moniker-ab470f5e105a44d0c87ea21bacd6a335c4816d83.tar.gz 7897 BLAKE2B a2b6f62fea8cb724ebbc9658e37985ed27fd1c395a838b6f8f89bc3e05106cd3e89b86753223bccc50de210461c89b01d8e3095ae1c6dcb6bc9a655c462981f0 SHA512 460b1cbef7d5236b099a67b27e902f9077fd42d6aa3772c13c1c3ab20fca87719a770478a068bf150e1224612fe4e1eadb1ec7cdfa60ca9cc81e3f6de62ee9c4
 DIST helm-2.10.0_rc1.tar.gz 1151238 BLAKE2B a33fa6c547824ae1497e04110e9f3d74b1ab4bb6e7e1b7a598e8756ed76993bf969ae3d066d5d006393ea095e75c06b3ea5d8ef360111a2804bd5ee63b8b1bff SHA512 05b40169c0c0920cdb339a17526f080db25bde095c89415d0229220c0e19fca05e60cbddc7d3f66f5e701c52417d76251266bceb7293327985912510bb03b2b7
+DIST helm-2.10.0_rc2.tar.gz 1158443 BLAKE2B 012d38a7f565a43ba852fbd5b4958d154e818f2acdbcf269894dfad6f097bff89bb847df5fa6624b2a93771058c543c958a8aa46c65f91468d803e48f774eca1 SHA512 ff51c29b048f7a0360f498724153e58406b1accbd01f1dc92d23ea706fe24757990b59e23e2988e7b1d8ce67f31672559a1f2ef1d0e002fedd0b831d9fe77831
 DIST helm-2.9.1.tar.gz 1136941 BLAKE2B 57e319df56d60b1285df99ee6c0213e9700b80aa4117f11ab3e37493d552481875a42acd200d2183c2e587dc13130b9c47cbacee7dd7bfeaaf4dc9bb0a17dcc5 SHA512 c9830ae3de76e219dc4effad749fa6f80d24f47f034bd7150afc5817700947b678db64a0889fe1e3c3c69ed0932933ebf9bb893c065d7d77c2953190ab15b033
 EBUILD helm-2.10.0_rc1.ebuild 8581 BLAKE2B 4398d05cd3dacee15e455549013f383b397b81147ad4e0ab1fe565b977bb3f3973b2aed098603ff7b33ef06efba225efb054178f8ac8e63922d4788da29a8118 SHA512 f9de15ae8b44f1b9ca941c0ed697e76b832c59d05f0a8b10f1c8f99266bd5e79e4253e4223b62fef466f86b040e90404160da7bbccbd37fc2ceeb4472557b3b5
+EBUILD helm-2.10.0_rc2.ebuild 8581 BLAKE2B 93b4f2decf133729f3068d9addfaeec2c361986ad630d702de6798dfd26bae0bb4c57a28e469a4bdd12acd11ab1244d7dbf77c2162cb8b4afeda5500f46602f7 SHA512 8d2e053ed91e35abb2864ab775061c4c5c2e43ad6ab06cdd83be5ba4c36b768a2ddca6f02439fa96624942a606e99489f0514661ce55174080b36c5d73bc39be
 EBUILD helm-2.9.1.ebuild 8410 BLAKE2B 266d13ec9488fbc344e29c577238d5980d10a8c6094cb6f41c6127065ff7b899bc609b530bc0cd87816d71424492c87634848ce26002954a09fe60aa99578e42 SHA512 b21df5a0c6f9a1d13404a128c1466301848216386c74e143a04f1567bac648efaf727d22ac7cdb1a943c8edcdaa3ed3b5cc440c8cd664ddaab803514b4ba44c8
 MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
diff --git a/app-admin/helm/helm-2.10.0_rc2.ebuild b/app-admin/helm/helm-2.10.0_rc2.ebuild
new file mode 100644
index 000000000000..0950240700fe
--- /dev/null
+++ b/app-admin/helm/helm-2.10.0_rc2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="k8s.io/helm"
+
+MY_PV=${PV/_rc/-rc.}
+
+EGO_VENDOR=(
+"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
+"github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64"
+"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
+"github.com/Azure/go-ansiterm 19f72df4d05d31cbe1c56bfc8045c96babff6c7e"
+"github.com/Azure/go-autorest d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab"
+"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
+"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
+"github.com/cyphar/filepath-securejoin 06bda8370f45268db985f7af15732444d94ed51c"
+"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
+"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
+"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
+"github.com/docker/docker 4f3616fb1c112e206b88cb7a9922bf49067a7756"
+"github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d"
+"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
+"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
+"github.com/evanphx/json-patch 94e38aa1586e8a6c8a75770bddf5ff84c48a106b"
+"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
+"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
+"github.com/ghodss/yaml 73d445a93680fa1a78ae23a5839bad48f32ba1ee"
+"github.com/go-openapi/jsonpointer 46af16f9f7b149af66e5d1bd010e3574dc06de98"
+"github.com/go-openapi/jsonreference 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+"github.com/go-openapi/spec 1de3e0542de65ad8d75452a595886fdd0befb363"
+"github.com/go-openapi/swag f3f9494671f93fcff853e3c6e9e948b3eb71e590"
+"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
+"github.com/gogo/protobuf c0656edd0d9eab7c66d1eb0c568f9039345796f7"
+"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
+"github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
+"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
+"github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c"
+"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
+"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
+"github.com/gophercloud/gophercloud 6da026c32e2d622cc242d32984259c77237aefe1"
+"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
+"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
+"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
+"github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"
+"github.com/howeyc/gopass bf9dde6d0d2c004a008c27aaee91170c786f6db8"
+"github.com/huandu/xstrings 3959339b333561bf62a38b424fd41517c2c90f40"
+"github.com/imdario/mergo 6633656539c1639d9d78127b7d47c622b5d7b6dc"
+"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+"github.com/json-iterator/go 13f86432b882000a51c6e610c620974462691a97"
+"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
+"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
+"github.com/Masterminds/semver 517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"
+"github.com/Masterminds/sprig 6b2a58267f6a8b1dc8e2eb5519b984008fa85e8c"
+"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
+"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
+"github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
+"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
+"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
+"github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13"
+"github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4"
+"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
+"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
+"github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317"
+"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
+"github.com/prometheus/common 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"
+"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
+"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
+"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
+"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
+"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
+"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
+"github.com/spf13/cobra f62e98d28ab7ad31d707ba837a966378465c7b57"
+"github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7"
+"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
+"golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30 github.com/golang/crypto"
+"golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f github.com/golang/net"
+"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
+"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys"
+"golang.org/x/text b19bf474d317b857955b12035d2c5acb57ce8b01 github.com/golang/text"
+"golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 github.com/golang/time"
+"google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 github.com/golang/appengine"
+"google.golang.org/genproto 09f6ed296fc66555a25fe4ce95173148778dfa85 github.com/google/go-genproto"
+"google.golang.org/grpc 5ffe3083946d5603a0578721101dc8165b1d5b5f github.com/grpc/grpc-go"
+"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
+"gopkg.in/square/go-jose.v2 f8f38de21b4dcd69d0413faf231983f5fd6634b1 github.com/square/go-jose"
+"gopkg.in/yaml.v2 670d4cfef0544295bc27a114dbac37980d83185a github.com/go-yaml/yaml"
+"k8s.io/api 8b7507fac302640dd5f1efbf9643199952cc58db github.com/kubernetes/api"
+"k8s.io/apiextensions-apiserver 898b0eda132e1aeac43a459785144ee4bf9b0a2e github.com/kubernetes/apiextensions-apiserver"
+"k8s.io/apimachinery f6313580a4d36c7c74a3d845dda6e116642c4f90 github.com/kubernetes/apimachinery"
+"k8s.io/apiserver f7914ed3085badf66a1b6f3a5218ada28f7bd084 github.com/kubernetes/apiserver"
+"k8s.io/client-go 23781f4d6632d88e869066eaebb743857aa1ef9b github.com/kubernetes/client-go"
+"k8s.io/kube-openapi 39cb288412c48cb533ba4be5d6c28620b9a0c1b4 github.com/kubernetes/kube-openapi"
+"k8s.io/kubernetes 32ac1c9073b132b8ba18aa830f46b77dcceb0723 github.com/kubernetes/kubernetes"
+"k8s.io/utils aedf551cdb8b0119df3a19c65fde413a13b34997 github.com/kubernetes/utils"
+"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
+)
+
+inherit golang-build golang-vcs-snapshot bash-completion-r1
+
+GIT_COMMIT="56154102a2f25ebf679c791907fd355bb0377f05"
+
+ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Package Manager"
+HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
+		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
+		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
+		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
+
+	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
+	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
+	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
+	popd || die
+	bin/${PN} completion bash > ${PN}.bash || die
+	bin/${PN} completion zsh > ${PN}.zsh || die
+}
+
+src_install() {
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dobin bin/${PN} bin/tiller
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-admin/kube-bench/Manifest b/app-admin/kube-bench/Manifest
index 37803a5a66cd..e6cbdc008b9e 100644
--- a/app-admin/kube-bench/Manifest
+++ b/app-admin/kube-bench/Manifest
@@ -23,7 +23,9 @@ DIST github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz 3084
 DIST kube-bench-0.0.16.tar.gz 196341 BLAKE2B c0cf32f99401729c8c064a6d48e41908c75904099a5f3bd500815502c1b9361a58546cb0751e554a0f89cddb9b25d7362b39b3a0b2000b4ab65ed2e52b98e496 SHA512 4cb0a1c5d6bd9991acbfe12d367db3d552e273cef472c11f81065be6fba93631d6c3859c247f6af7defc90e5aa716e1888a7501e5f5b024041ad81072a53c878
 DIST kube-bench-0.0.17.tar.gz 197158 BLAKE2B 458a7ee61cde654359002060ca05ef376c0f0cd43c48b6faa5faee307c367bce1ecbd827ab9634d07f805c706e1ed68968b1b73c3bb3952b52d15074c019acd8 SHA512 c07a7c58551ebe4633fb6a8cf08b8b81c63579a1406ac8b2cb889b2b6e06015fc22c205b873c79b40c228b7bd104fe427766271a1d3bd840386249c84f48e857
 DIST kube-bench-0.0.19.tar.gz 197836 BLAKE2B 86fd5d43d45fb2fa98e542a2a2385fecf2ec2a024bede34d5d9a9e33e04967b7dadab34651734361bb5f273eb8da824ca6d73fe46e8944b14ae0ba4c4e64341a SHA512 dfe82bcce482c88effffad772b17874bc2c80423d47f2dc7c02b5c9425b915ec2405d9f97b88b4aff2a54d33b7bfafd3f89c43ee4c32956d27cef4f11833a178
+DIST kube-bench-0.0.20.tar.gz 197875 BLAKE2B 8bca6040b62226d01d86edd020166538ee6072cf6ec1ec72d0db38b024ade39ba2378e9bd866b8b7e3878e11dd5ca9ce62ad3c3a36d7d99e124c664acf7961a9 SHA512 1a07d1b7b5a073915e8c161fedc901974889791a939fd58daae267dccbf80dc09bafe133f783c2eb02335535d27d143cfd7b657652ea5b517064b3cded31430d
 EBUILD kube-bench-0.0.16.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
 EBUILD kube-bench-0.0.17.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
 EBUILD kube-bench-0.0.19.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
+EBUILD kube-bench-0.0.20.ebuild 2382 BLAKE2B e07d33ac0bc2f6802742deb31bc1958e0ae86383fe73f64e03b409603cd0a23bacda46cd9ae3e2252142c5f69dff0e1fb3249fe0f26f789f46c95a9efa6fd3ab SHA512 f9e32a20fcc8612a3061457d309900726b91fcbfc2b80da549aeb6e5d8b2d2c0ee2cd7300fec27b3191f0cf35e7307f5f01bcecc1eda53a5a11300b5ace7f199
 MISC metadata.xml 333 BLAKE2B c8437977b6a07e36929b13f767af0f09158bedd1ea7a0bee1da52dd1b83acb2929248c3c385a5fba14362721ab6871d399ddfba53d15bbe84a87af0ad771b73b SHA512 295cae435555436e9091195ac585fd30d022aba0b76244c85927f19f14b38dde95fb14192c832f00f52e3cf71aa3d95f7527b22a90690f85206178c49d620c8d
diff --git a/app-admin/kube-bench/kube-bench-0.0.20.ebuild b/app-admin/kube-bench/kube-bench-0.0.20.ebuild
new file mode 100644
index 000000000000..01b95b2a0ede
--- /dev/null
+++ b/app-admin/kube-bench/kube-bench-0.0.20.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/logrotate/Manifest b/app-admin/logrotate/Manifest
index c682ad8e6823..05ad501a6340 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -12,6 +12,6 @@ DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a162
 DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
 DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
 EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054edecf4abeb8dbd0d5df7f8bbb27e1a17a384cf4d44042197eac0c8ac7d5e6e888ef689fe2794ae206d946661b6196a SHA512 2f6b6caef77088ff1aee15f8a289f1b3559180034b5f2bfa5520b2c3627bb0f92e0f5555cbe914f4877b50729f84e3ca3f0353c6e1b63442e156b530819294a4
-EBUILD logrotate-3.14.0.ebuild 2512 BLAKE2B e4dad0f671460525797eb9ebcecb1cbd7bd45a9b7bb3032060a27ac4721893e06202a1e2d4708e1d6634e1b04133a929681b932ea1b9e437aecca4155f5a24d5 SHA512 7bc2005fa2562cb5e1dc722ce8ffb3067c2eefc26992bd46f2466d894dc8e245da645e98fccae4998c1cc390df5677f7e4999c7652a0d2289f1e4a42b17299cc
+EBUILD logrotate-3.14.0.ebuild 2511 BLAKE2B c824de62f72544448b54948e5025b0bfee7be00b9355be4e5c64d51721efc064dacec319f9de4e93c61a7aec2bd70c4d0515a693be375d35c16c30cb1a2b927b SHA512 e088a56371b59e4d10f4ea5574ba12985b9b7fe81de11624cfb302fee0bc08581334230776aaca74d67d9ca160dad4301f06b14e5c608c26ecffccbf370a252e
 EBUILD logrotate-3.9.1.ebuild 1767 BLAKE2B a59f23a8a0a24b416f23a087c60fe046260cc24521f68f2551bb2a2821d12e94307e2d620ec4b625cd1b6be21cafa3d2c0f044468dbc2760897e5bb7854ac7af SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03
 MISC metadata.xml 1119 BLAKE2B ddb2266925506c260c4b3f67e4dd906d9446a17a54b5a0ffce547d3c942750ead45dd1cfdcbae548a096d87ee1e247fcda9bcb81e83b829f0526d4bfd7b4a01d SHA512 99725d54d1cf68b257446ef8afc43d4bfe05cc789c818222d603012ae1e636624962c23a845f8858f4fc7aaf5a7e7f8085a7b173185ba66d7e390012dbceef79
diff --git a/app-admin/logrotate/logrotate-3.14.0.ebuild b/app-admin/logrotate/logrotate-3.14.0.ebuild
index 2a41a2fa759d..7355adb85194 100644
--- a/app-admin/logrotate/logrotate-3.14.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 28c805fa096b..55bada10429d 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -6,10 +6,12 @@ DIST mongo-tools-3.4.10.tar.gz 4719399 BLAKE2B 8165248bf58f2ea2b02e365a3609c72b7
 DIST mongo-tools-3.4.13.tar.gz 4719488 BLAKE2B 27c7716b21f1a23408d0f31aee111c5877f5172121a987c234ff01eb2690bbc71bca4e00fc13b701ca6b91dce0c9aaae43c2239a60a52e130e1390bf5bafef60 SHA512 c233268328ef868ec06c9a9d83009141b39c84ba642e7de7dece3210717ba8de600f39896a30ed23d1577db9f4697c3a8d720cf35248bca2b00a17642b043237
 DIST mongo-tools-3.4.14.tar.gz 4719370 BLAKE2B 2add25ddf9b5b7d2ebecdd647dfb2c818643b16f623fd1faba36a8d6f5a181e80ad47de45fc56e462290f61f6c16c27a6b0587542315981537627256e69b4958 SHA512 a0d715fe36769740ba25e92b742b157dc264b141ddd56d64ca4c6f8ffea11df291ce871aaa723acdb8b7f5318ac1edb8c5fb9dd7bf2edfe08d4e7cef343abea7
 DIST mongo-tools-3.4.15.tar.gz 4697188 BLAKE2B 690ec3187cb781c9cae903a27eca9d1d504e2e52cc7f48790b5d5b5a1dfe18cff95dd52f8fa03854548a2e634d2aed56e626b8702f2fcd27a10952a37dff9120 SHA512 f7c8655f56a1f5fedad00fbadd26b150d6fea071edccaa7ac18e80c9051ed2324691e98e799e6a9ca09e944ebe340b63a2ac0b9caeffbcc8c8dee0744cba1af7
+DIST mongo-tools-3.4.16.tar.gz 4697191 BLAKE2B 2e9a0e7dc8016d3e7d7c7f8d0cf80a97d3d199603c0b8b791df5a0d79d418ffaa232eee694047a7ca11fa7623023b4123becd437cfe3dec11e26cd525720bcad SHA512 b40c6dee75d860de1da73faf79f5f68c098ce7c80681486c66fff04a937474dcede91c7be907a8e36033b3898f7499e8f53271944c0df3360756c27361efb6f5
 DIST mongo-tools-3.6.2.tar.gz 4693924 BLAKE2B 61c44d579f6eb4013ee6c0118ebe89a2d454ef8cf6ad933479885cb71d169185272b03d9c63fa738d67bbd1b9efd4bc964eb17adcc5002508589d198cdb17752 SHA512 5ac2b1d2b33271f63c406c69bd8a576a21f4dcaa6f75839e0f907ebc9968f0e121eb3800e88da050c120856e7ddda4f12d551bb731d4acac0f5cf09f66fc948a
 DIST mongo-tools-3.6.3.tar.gz 4693833 BLAKE2B fc7139984cf3dcb7b4ce6f6c2028296651aa59ac68d7068bdf748e28eeb65b1fd9b07580d0c93f3f41dbb01030a12433a07a04deadf28e0ff792387fa78ae4aa SHA512 7dba782c84a728aa9ceb28cbd9934f58b615dccfb238a9dbd63b18661ba4e74ddba21f93d9f12e6d80d293ebe42a82d31fa64448aacdba75bd07d964a5f631fc
 DIST mongo-tools-3.6.4.tar.gz 4693872 BLAKE2B 5d72b32fa8ad7bc106c6ea3c09a27a093b9a1ae2392b4fa534042c5461fdc2b958dcbbf32e0ed596be234921e2ee21cc8f6132d57ae870a234abfc7adbb3b2e9 SHA512 53d06fa4a1b58de8001d6bf6e85f7edc97ce2cfbbb69c1ab05219deaa05ad9dd77d93f98c5526b4f58644a766e1b0f123686358095f059c71a4277634603f23f
 DIST mongo-tools-3.6.5.tar.gz 4720814 BLAKE2B 5dd064f70557ec1ab979d08523f3dd305fb310c533b69bc99be3ad3d006036354f62b9f3d61c242e1481a254bed538a5e1cf5662f0e35705f1c50a76f31fddbb SHA512 dd2d7cc64043b42a70b5de0ea493f94722a4476248bfd77d6892861e4be6ab20175992367965dfd687bf8b7ebece6113b7f7a3e59256497e3ecd7e2678875965
+DIST mongo-tools-3.6.6.tar.gz 4723751 BLAKE2B 876d46c47190398d1218a760bdeb8167c9224ef000a96b5f6080d6dcd44fe8187fdfbc38b1a61dbf437132e16e053212cf122daec3915647448d114983e51fc3 SHA512 b8cc02626accb90d8dacf50ea851619885a01503e28b17ed6a12cc9ccec2680a8cd12a566b32187d472f74c9625bf013afcdebed1a42d78ff613c49d3fc838b2
 DIST mongo-tools-4.0.0.tar.gz 10872217 BLAKE2B 84e92178c0e4827926de525a70d6124635d59e270a3d37e23ec8653cc64d99bb7489fa6266917437ca45aa3ca5e00bc59b81e65c5b72e717db2701c6f7327bec SHA512 d67c4aca9b41266109adc39bb1a642206738fda393e1f9f05570c02a00a02e29ec71c71e67ad232c72d66543ae7e7bfe07fbcf26958d48ed0e631da452c1904d
 EBUILD mongo-tools-3.0.14.ebuild 1096 BLAKE2B c5cc1d28947e0453483d2429c1b1556e880c84e62d563505e420ba5ddf2b64ee1e54b9bdb609ae43091aec967d24cdd2c350c67f9b2f55347cbf334edd7c2004 SHA512 55b66e2872741425cccb75b367e37b4fca28404d63e77a39920246b6a946bf75335d55ea15c7878eb4382ade2cd95bedec4da9a647968a5e27e577073ff7e82f
 EBUILD mongo-tools-3.0.15.ebuild 1098 BLAKE2B ff13b5f35493bead934b47f56a302467346e50d3c6bbfe5958ece13d223da85aae0fa3dcaf991c79dd6694facd4a58657960260352ffa9ff395e4b0ec8dad6b4 SHA512 a36184581a7cff9543a4a63c13549e9096321c558a983a46bb4248541b777a5e4a2e1323f3c140b3fc2b8176a480042d2140e44b488ac69403524410b4115d8d
@@ -18,9 +20,11 @@ EBUILD mongo-tools-3.4.10.ebuild 1237 BLAKE2B 27690fa59a8165db8200ec332171396d23
 EBUILD mongo-tools-3.4.13.ebuild 1217 BLAKE2B b0a7490c786d39639f0b018887f5e9b111279bc80d440a6c49fe8d6444642c61d7700b5865a3e8b9ce28c5af187e47b57a0f79240ea8582a2663f02d01fa2d76 SHA512 f4f00020f3cc9250078770423d40dabfc8054b4205b946c9fc10d580ef5dfcc9a0fec86173c12f3942e332d5c5cac882fc9a23b0fa4944446402a87cd68e77a4
 EBUILD mongo-tools-3.4.14.ebuild 1217 BLAKE2B b0a7490c786d39639f0b018887f5e9b111279bc80d440a6c49fe8d6444642c61d7700b5865a3e8b9ce28c5af187e47b57a0f79240ea8582a2663f02d01fa2d76 SHA512 f4f00020f3cc9250078770423d40dabfc8054b4205b946c9fc10d580ef5dfcc9a0fec86173c12f3942e332d5c5cac882fc9a23b0fa4944446402a87cd68e77a4
 EBUILD mongo-tools-3.4.15.ebuild 1217 BLAKE2B 36dbc749a3052b6d3ac3c55205078f8c7fb9d60f6dc403850d7d32f36b64aeb69de12f1ee689e7b9611695e9ce5896d1b63bfc93abb2026f27aa7f52b007fe72 SHA512 e3d3376f48844f46178d7652df941faa7d8306c370b267478e2439d81ac94842d1682ec4dc7c9acaf1d90516b406b48d9300fa893b90b446c31b8ee2d1067e11
+EBUILD mongo-tools-3.4.16.ebuild 1195 BLAKE2B 6e650a085da6e60e7f268e074ac45373a3a9948e4b69d88ece630697c48f8e85e856cbc324dc342097c9c5c7cd903c12dbee415c3fd8582b3acf205eb4301ed6 SHA512 fc8709a1d3ab755e61bbd01db2ade678082aca0c97715dd882ebb09a2ad8bfea8ec7f21ec0572863fec70d34346dfcc47ec8ab47725c910d92715ab74cf5cd62
 EBUILD mongo-tools-3.6.2.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
 EBUILD mongo-tools-3.6.3.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
 EBUILD mongo-tools-3.6.4.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
 EBUILD mongo-tools-3.6.5.ebuild 1252 BLAKE2B af486064720907f298f0e22b075284696dd78c01a84fcf9e7a5a5767d11aeed929d57d2f6e6539934ad8083b271606aec522dde38cdb865cf917384e02646315 SHA512 94709a1740d7894b3143daf193c8f067d3e52ca4f7f3f4ae98aea4c63ea65c62178ff9db9f3a82cdd7ddea3e0cdb26162e5954a7b089434960eade7b39ae0b39
+EBUILD mongo-tools-3.6.6.ebuild 1213 BLAKE2B 32b017e79aade027f199eb34cf16f5852387c3dea2c1c1b57257c3634e7f39b0c31e939a00fe9985e5ed6c9629504ab76f5e38e7b14993cca235caaa1ae73563 SHA512 bdc2ce46cdf7dc56265ac5640b0ba69c17cbe37977828b2ab7167d35acae41a2fe0712b3eef65ba064b1166e6aee91c7c785e6a1adf54f780181890380356fc2
 EBUILD mongo-tools-4.0.0.ebuild 1252 BLAKE2B af486064720907f298f0e22b075284696dd78c01a84fcf9e7a5a5767d11aeed929d57d2f6e6539934ad8083b271606aec522dde38cdb865cf917384e02646315 SHA512 94709a1740d7894b3143daf193c8f067d3e52ca4f7f3f4ae98aea4c63ea65c62178ff9db9f3a82cdd7ddea3e0cdb26162e5954a7b089434960eade7b39ae0b39
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-3.4.16.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.16.ebuild
new file mode 100644
index 000000000000..5efc22cf1e80
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.4.16.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# 1) ensure we use bash wrt #582906
+	# 2) do not substitute version because it uses git
+	sed -e 's@/bin/sh@/bin/bash@g' \
+		-e '/^sed/,+3d' \
+		-e '/^mv/d' \
+		-i build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	./build.sh "${myconf[@]}" || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.6.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.6.ebuild
new file mode 100644
index 000000000000..47f22a423a83
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.6.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# 1) ensure we use bash wrt #582906
+	# 2) do not substitute version because it uses git
+	sed -e 's@/bin/sh@/bin/bash@g' \
+		-e '/^sed/,+3d' \
+		-e '/^stty/d' \
+		-e '/^mv/d' \
+		-i build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+		myconf+=(sasl)
+	fi
+
+	if use ssl; then
+		myconf+=(ssl)
+	fi
+
+	./build.sh "${myconf[@]}" || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/pass-otp/Manifest b/app-admin/pass-otp/Manifest
index 4ed702175ffe..8ee3c4b70c22 100644
--- a/app-admin/pass-otp/Manifest
+++ b/app-admin/pass-otp/Manifest
@@ -1,3 +1,5 @@
 DIST pass-otp-1.1.0.tar.gz 32857 BLAKE2B 97ca197b251d9748c0ace5b40aca2547cd278e9eee9768b8882cdfbb23bd440792101ab82d2ade276cfc34de1364460a066adc8395336380b1ef6759f51804eb SHA512 3c880bcb7e7e984494796bc7a0c0fb5f70b052938f6ce5c0b1cbb745d0b30febab2ca51c264fac02f884699dc685400076f0065db0c3d08da436e93c27f075ce
-EBUILD pass-otp-1.1.0.ebuild 543 BLAKE2B 818e82a2b19c22c304a42a16136a74c21b8b5e3d292c86dd4584e05805f43152d292889a561d1a7c085a23f7d3e667962438f699cfb6485c00db04cc9687d471 SHA512 164665c079243858e8332bf54741f5d4fd59522903cb239c6dac151cefd718aaaeb7c7fa1abe9cda0c43a677bfaf9c5eb3e9d2fadefdf6c4fc8de9cd6dd49b1b
-MISC metadata.xml 661 BLAKE2B 32c5c45b7d5d47f3c2b77ce0ec52f99008e1da1df5b30ae7b7085dd75fefff6327a6674de0325a14fd9bcebb35f4adb60d31e117374e43ddc7e26ac9f8290161 SHA512 7d1c902d9ea60b42a8497c7ce7ca4d5d56fc522e46e412d91c6e50205a1e5ba8b68e59bb14c997d6db9fbca88c24693ccf0fb31e81f8404771adcf4aa651eb62
+DIST pass-otp-1.1.1.tar.gz 46283 BLAKE2B d2448a82b67a685e9df366dbec29fd4a3cedea03b0218714b95d5bc2663ac86b3fa79a4bba5157b6948111aa7bf06d5d48e320d9fecf1b23e71ff73d3b65d861 SHA512 8dfaafac08aa17a4ee1ae34bb47d26ca337fe05b69be19a3bcb3521e033631fde9dd559481c1512500775186ca08e26a4589dfc76b4dac718f64a33819c9b5b6
+EBUILD pass-otp-1.1.0.ebuild 542 BLAKE2B 42879f88f90f48812df4a5f2222e359e4de7548fca66c2d5b73ea4cf38086567ff1bfdf2d71f139800ab41afd131cd66a98c43856150bd7271e8ad99c84e4740 SHA512 dd85fbb99da67602dbecd710843381204f08c781a418d3fb6225374c5188b283aa0182c8df9ff69754749f82e85b263cb203b22fc4ef3f045d935ad103f3bcdc
+EBUILD pass-otp-1.1.1.ebuild 542 BLAKE2B 33edcab8e1e08ff11f1f7d91d05d7e8a2d95d468e3baee38fd832a981059743577ae7ae98d3e93e932e92da330cd04150f56123064fabe22d678d499887145b9 SHA512 90ae31d50a5a4bbbe42bdef4898c98c59e7521a23616bd4205a921f3649c3779bc6bafb05d26023680f88ae0784be91312fffd6991d37bd8ddcddadd6d630a32
+MISC metadata.xml 661 BLAKE2B 34d62c5a12f51ddde97f0cc24ae0d6633844e847e9cfa81ffd4191b489f6fed7fc42a6e9f8ca75119f31f02306fbe958c68f220466d222db498fb6cff0e74a8b SHA512 071e5ad337d3e41afe2c6d4feb26f02c5f1105e5f51899af2f5021782c9a836b52e0575d8343bc3532fa227d2b385f248d72be46cc395233d7c77325beefea6e
diff --git a/app-admin/pass-otp/metadata.xml b/app-admin/pass-otp/metadata.xml
index d585cca5c34c..79d9aa05f774 100644
--- a/app-admin/pass-otp/metadata.xml
+++ b/app-admin/pass-otp/metadata.xml
@@ -13,7 +13,7 @@
 A pass extension for managing one-time-password (OTP) tokens.
 </longdescription>
 <use>
-	<flag name="qrcode">Add support for qtcodes using <pkg>media-gfx/qrencode</pkg></flag>
+	<flag name="qrcode">Add support for qrcodes using <pkg>media-gfx/qrencode</pkg></flag>
 </use>
 <upstream>
 	<remote-id type="github">tadfisher/pass-otp</remote-id>
diff --git a/app-admin/pass-otp/pass-otp-1.1.0.ebuild b/app-admin/pass-otp/pass-otp-1.1.0.ebuild
index 40e37ea67994..c314e589f5a0 100644
--- a/app-admin/pass-otp/pass-otp-1.1.0.ebuild
+++ b/app-admin/pass-otp/pass-otp-1.1.0.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A pass extension for managing one-time-password (OTP) tokens."
 HOMEPAGE="https://github.com/tadfisher/pass-otp"
 SRC_URI="https://github.com/tadfisher/pass-otp/releases/download/v${PV}/${P}.tar.gz"
 
-LICENSE="GPL-3+"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="qrcode test"
diff --git a/app-admin/pass-otp/pass-otp-1.1.1.ebuild b/app-admin/pass-otp/pass-otp-1.1.1.ebuild
new file mode 100644
index 000000000000..c4d4d19aa424
--- /dev/null
+++ b/app-admin/pass-otp/pass-otp-1.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A pass extension for managing one-time-password (OTP) tokens."
+HOMEPAGE="https://github.com/tadfisher/pass-otp"
+SRC_URI="https://github.com/tadfisher/pass-otp/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qrcode test"
+
+DEPEND="test? ( dev-tcltk/expect:* )"
+
+RDEPEND=">=app-admin/pass-1.7
+	sys-auth/oath-toolkit
+	qrcode? ( media-gfx/qrencode )"
+
+src_compile() {
+	:
+}
diff --git a/app-admin/pass/Manifest b/app-admin/pass/Manifest
index 348f26b5f767..c8439e9ce2cd 100644
--- a/app-admin/pass/Manifest
+++ b/app-admin/pass/Manifest
@@ -1,6 +1,5 @@
 AUX 50pass-gentoo.el 491 BLAKE2B 30c24a820e877e74d4308b42fab036c3c670353af6eb79454c18b471ab62134074765c313be5633e5fc8d1d9105a51d4dc648e3e08f200487ea62e3b9cd4e4a1 SHA512 eaba952f7b080bb44f1a415ee3fa1e71469177a993116b890a0788b177ec70948c1ea6923f17ddddf5f1c01af2fca03e98a71e06a5dff32ff6ebe0b73a79f659
-DIST password-store-1.7.2.tar.xz 63620 BLAKE2B a1fe0b7ee1fdb94d2b76773653462d14c07c8fb239ffbcae210cc3c9c829fc5c0bd0bf85d8d44343a0cec50aae953b13a70d67aa7c94abf6c02f84bfd0d7c4ff SHA512 e6719a7125af6ecd80fdbeb38b4e2e89e7358ff16e18739d68a04b72dfdf860294b54f7ec0ec9676a62d2e270db8f54784a357c82217a478694472f8136e3657
-EBUILD pass-1.7.2-r1.ebuild 2158 BLAKE2B 5b975d3e64603dc81e5e899497c6eeaa27e8094cc3ff99895c5134b583cfe676f2e580a4a084f38f83c12fb3f4b1ca7ea73f2f84208e0db281578eb10b1d60de SHA512 e3c0d625d055b28f29f8a95a863b0b35be85bf7c847e117a54ffd992eff7aa890bd4c25ba9ef24caec81e7c750051a5a792194ee970fb31bded317d2c2db6d9f
-EBUILD pass-1.7.2.ebuild 2056 BLAKE2B 45beac312a1acc149c67dac9801377f6722f5eff67a834e84e1a44fd5c7687a9f0c4f7e69fdca21b9cc070018ff2bf4e7dca1827222ce5261e5ed451c567b531 SHA512 27c994e62a3917be3ab836bff56e380cc3573a87ae62fabd8deba8c7e5b9b195812677799f378ff1290c39ef92e22922082761da59f7f24176fbcd811c73f918
+DIST password-store-1.7.3.tar.xz 63416 BLAKE2B 5931608e0208dfe6965b79f586c153a4930d1c3d3b74433d026ee0bc5889fcc29334c637ca4fb68308d0169bad7c8235b6632e9f80eda1e24f0f5721353f88e3 SHA512 89755a7b02f05d75055a9fc14fd3f456c0a49ec31bdffd097a027f91228c64a98b18c1e80017aeda811773ae3287ff1b9737532da8ded06799d8fe3979ca06f7
+EBUILD pass-1.7.3.ebuild 2179 BLAKE2B 7073c414ca7f9f03f50ab2c120660e61ba32162cc843ee8c3bafe374923f9aa921ad2986632cae5c02c23980da36222e540e1818d54c05206cd5ff80154f6122 SHA512 1037c2940f5359e2545a8b68374a934abf1af6e488a13b736ab83a89f24e1106af0cf414808f3c56c09999f580fe574f2c333c5fd0ba1548ca44b32f2167e807
 EBUILD pass-9999.ebuild 1960 BLAKE2B e06b86833158fb55e9656a1bbc2168bbdfb0cc1fa48924437e2a05b81dc79c0f110cc2edf664610b43b29cb67c4563db568bbbf3cb6edd7f135b5db0d027751f SHA512 b170aaa7a41a628684735cd24994f40a95abd8e7c1ffa9bd52d381f4d94be246c7465cb617404eb61bc6221fede56f43dc76f18517329b83d00c0ebff02e4580
 MISC metadata.xml 881 BLAKE2B 59fee6aeadb16d050eeaedc6d5081963e3ffa8316ddd00afb67661d721fa60b80483c16348e0c3d6c20fdb6513fd5840552c3a95724b619e07122d8755c4e7c1 SHA512 49df1e24751818d46a0c23fcdc9e41d965dca29f9964f7d142e4dba9b076b472c860d9b3eafc15b04a983f49d2cd78eb6b529742469549209c7e4160a15f1323
diff --git a/app-admin/pass/pass-1.7.2.ebuild b/app-admin/pass/pass-1.7.2.ebuild
deleted file mode 100644
index 477672132803..000000000000
--- a/app-admin/pass/pass-1.7.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 elisp-common
-
-DESCRIPTION="Stores, retrieves, generates, and synchronizes passwords securely"
-HOMEPAGE="https://www.passwordstore.org/"
-SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm x86 ~x86-macos"
-IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
-
-RDEPEND="
-	app-crypt/gnupg
-	media-gfx/qrencode
-	>=app-text/tree-1.7.0
-	git? ( dev-vcs/git )
-	X? ( x11-misc/xclip )
-	elibc_Darwin? ( app-misc/getopt )
-	zsh-completion? ( app-shells/gentoo-zsh-completions )
-	fish-completion? ( app-shells/fish )
-	dmenu? ( x11-misc/dmenu x11-misc/xdotool )
-	emacs? ( virtual/emacs )
-"
-
-S="${WORKDIR}/password-store-${PV}"
-
-src_prepare() {
-	default
-
-	use elibc_Darwin || return
-	# use coreutils'
-	sed -i -e 's/openssl base64/base64/g' src/platform/darwin.sh || die
-	# host getopt isn't cool, and we aren't brew (rip out brew reference)
-	sed -i -e '/^GETOPT=/s/=.*$/=getopt-long/' src/platform/darwin.sh || die
-	# make sure we can find "mount"
-	sed -i -e 's:mount -t:/sbin/mount -t:' src/platform/darwin.sh || die
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		BASHCOMPDIR="$(get_bashcompdir)" \
-		WITH_BASHCOMP=yes \
-		WITH_ZSHCOMP=$(usex zsh-completion) \
-		WITH_FISHCOMP=$(usex fish-completion)
-	use dmenu && dobin contrib/dmenu/passmenu
-	if use emacs; then
-		elisp-install ${PN} contrib/emacs/*.el
-		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
-	fi
-	if use importers; then
-		exeinto /usr/share/${PN}/importers
-		doexe contrib/importers/*
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use importers; then
-		einfo "To import passwords from other password managers, you may use the"
-		einfo "various importer scripts found in:"
-		einfo "    ${EROOT%/}/usr/share/${PN}/importers/"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-admin/pass/pass-1.7.2-r1.ebuild b/app-admin/pass/pass-1.7.3.ebuild
index 370114ac6312..38bc49676117 100644
--- a/app-admin/pass/pass-1.7.2-r1.ebuild
+++ b/app-admin/pass/pass-1.7.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.zx2c4.com/password-store/snapshot/password-store-${PV}.tar.
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-macos"
 IUSE="+git X zsh-completion fish-completion emacs dmenu importers elibc_Darwin"
 
 RDEPEND="
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 51193ce08206..fcfbfaeac147 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,32 +1,15 @@
-AUX 8-stable/50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3
-AUX 8-stable/50-default.conf 1701 BLAKE2B b14c89f70d405b206818d077190cf8fefd1a01db4cdd38f5012b09b4e3440e16b6a3ca7ff20cfa616622565b3477e7f4d44252d72d1c3cdf148a1b59f629442a SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9
-AUX 8-stable/README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
-AUX 8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch 509 BLAKE2B e50fd76f239be9fe15a0a7c8dd2b5984af69487c5ffe5a4f12e415f9c4040e600c5552dbe66c32879729c0f497bf74f1f63730b2f4c6a9a658fd385cb684cf05 SHA512 70bfe4f95b23e4e88e5b7535a1b86742a02438f2eadc6fd2e82c66ebdc9d59d983c1ded7d4902dd5d7ef9413847398c1318df82bace3b7e5b1ca8bd23ca9e8e4
-AUX 8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch 3878 BLAKE2B 9f1a030807a312801ce6c66bb5120029b935bf5ba2029b4d7297713f865f509fd1761595ba05c479a1aa860c8564fe38bdebe51c3c36ab278aa518de0f2285dd SHA512 19765cbd9aa13cce9590ab08c4a626eba06b94fd4345b3fc3b77149ed9401ea91c41f00b105a5b7f15bae611f5b718abdac23fff9ec205c3385686203e6aa701
-AUX 8-stable/rsyslog-8.34.0-fix-issue2612.patch 558 BLAKE2B ad05cd0a3b3570821465faf9f01541164eb18b1355363ad2208d9ee148971e1b86fb47fa2a81da2050a13c750342b3643e24dcb4db78149e6495353805180e10 SHA512 5249be1b70070ae30a41feacce83feea1a97f76eda0b5b60c29e4db6d50f4d27be8ab66de6187343d5b881eaf19414c2b8766fc99523c52e51f6a7c9b62e7d94
-AUX 8-stable/rsyslog-8.35.0-fix-issue2719.patch 7561 BLAKE2B 4adc0643dcb42bcc33ba3f8fc878ea4996d22e06865680fad6c9f0bff9da27d55293732e17678a36ce33d4ff1d76049d8b9b55bd0eb6b4987c893b48bf5daddc SHA512 54ad784c328a4def4c46777ba3b4ebe3d451d9a5a6883e3e6bd912070c52aaf2e85fefd938d64cbbd87ef9ae4ac0b4685ad1c0e74ad2bdf02bfa247ddcca939d
-AUX 8-stable/rsyslog-8.35.0-fix-issue2726.patch 1726 BLAKE2B 3b406319098637b81f85127494fb921529eb2704ae9ac6a90e89e4655412220748bba6584f010de1ca17c0a19fbd01b5c56314f43c7eec329b71884d24f3df93 SHA512 421a6b67372b1b4cac459f6fae7a6e839d96c363f8cb5fa4d38b7c64b53752a9a6ae2c050dd8cc18464475a0601d5451ac51719bd85df9ac40eaebb498a4c23c
-AUX 8-stable/rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10728a8d2b8acf2c08f613cea9c2a74d78ed7b75333147a6b1a553fe281956990e044a9db651c7486690dee SHA512 5ca68b4eec5bebaed48edb69c85f8338273db847ab1cc6999ce7cfe06644dc3854c3040e0ebd8a4900c213b267b2a081e7901ceb4e58f9dfdc7dc036aff02b6c
-AUX 8-stable/rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
-AUX 8-stable/rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
-AUX 8-stable/rsyslog.initd-r1 1758 BLAKE2B 1af0e2371067ac2c51bff7b9c4442abba8d8a14714b7604e2f49d244fb08bef7614e73cbad201e6f4902504abd78ab32fdd093acb5714d53238353c8a9bd977e SHA512 0ddd385e77759370344032f52f945b1e90d4961140db63e2562e4be78dfc2bae16ac9439d40fe078110593999b5c5efd7680b402fc0771b1261ff28b1725e265
-AUX 8-stable/rsyslog.logrotate 682 BLAKE2B cb6a4a00895c5801c15621e52fb16c4b046a46f27bd21c5e76c253e62421f07826f603ab529e8a95f260925d58948a78c89f41c9b9f61e142217403ab454c02f SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912
-DIST rsyslog-8.28.0.tar.gz 2471122 BLAKE2B 48ed55cbf02eca22591c3d1d59db8f956e4d852cbabb4ae8837767a2c843209a53becbe2a9f595290b44d79c8813414c20954ce1ccaa08bf0786423df79344e3 SHA512 e27ba0ff22e945393536abc5bc6e234d8849db291a5056429b59b47abe15fb060fc5c26efedcfe347b386d438b3f8a029ae4577a1d803666701431677f628cb1
-DIST rsyslog-8.32.0.tar.gz 2478990 BLAKE2B 21bfc93b55da107bec2eddb89cb42d76990ced2675caeb6e73183a109f9bc8293bde43f202bb56007f9ea4e49de385b004c158059cb13e8d3d376bf050ca445a SHA512 eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac
-DIST rsyslog-8.33.1.tar.gz 2494338 BLAKE2B 680ad2c062386e4e3e6c6e1a83cf0001d63da305edae9df527d1079a2fa13b8715e3cbfa211ca908e0005f1762becfd88369a7cd1488134564980137f0e98d86 SHA512 c4b426409e89463a8e8f7f9d0267f2fa1df1a84e947ce7bf91255db88b4cad5b7e607c476ba2db0543af069c44cdbb35330e0839696bf83668200e8ac009c6a0
-DIST rsyslog-8.34.0.tar.gz 2545544 BLAKE2B 66caf277a814563027183ecf267d76067c384adf8d6d7b8543203df9a7c37242722dd35445e4446aacf1e680f5f3957cea40ece8a284ef2a393b4a71e3a2b49c SHA512 69eaececa2f8b98799deac8e6cb2cf635a5117da7a21cbb0b880b7df1d83c6ccf16133dab099a6e5fb865f34c2dad164a1bf1952d16ca116af3b1dd35d15065e
+AUX 50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3
+AUX README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
+AUX rsyslog-8.35.0-fix-issue2719.patch 7561 BLAKE2B 4adc0643dcb42bcc33ba3f8fc878ea4996d22e06865680fad6c9f0bff9da27d55293732e17678a36ce33d4ff1d76049d8b9b55bd0eb6b4987c893b48bf5daddc SHA512 54ad784c328a4def4c46777ba3b4ebe3d451d9a5a6883e3e6bd912070c52aaf2e85fefd938d64cbbd87ef9ae4ac0b4685ad1c0e74ad2bdf02bfa247ddcca939d
+AUX rsyslog-8.35.0-fix-issue2726.patch 1726 BLAKE2B 3b406319098637b81f85127494fb921529eb2704ae9ac6a90e89e4655412220748bba6584f010de1ca17c0a19fbd01b5c56314f43c7eec329b71884d24f3df93 SHA512 421a6b67372b1b4cac459f6fae7a6e839d96c363f8cb5fa4d38b7c64b53752a9a6ae2c050dd8cc18464475a0601d5451ac51719bd85df9ac40eaebb498a4c23c
+AUX rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10728a8d2b8acf2c08f613cea9c2a74d78ed7b75333147a6b1a553fe281956990e044a9db651c7486690dee SHA512 5ca68b4eec5bebaed48edb69c85f8338273db847ab1cc6999ce7cfe06644dc3854c3040e0ebd8a4900c213b267b2a081e7901ceb4e58f9dfdc7dc036aff02b6c
+AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
+AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
+AUX rsyslog.initd-r1 1758 BLAKE2B ff5fb6f9d2d6a5702f5fdacfae8037bbc4015f29a1ce94dfc5f331f64dd43a860dbabc9e4118c9d0d1c8b5bcb4ee3c95cc949ddd7864eaebbeec705f6d5c97d8 SHA512 ecbfad8588796f1600fa7a43dc0ea1a1107c676851f5a8c6f43399308999e9a0559af47675ab529b18a63ccb472ab6e3b80b9d072444854b4618c27db5e79aec
 DIST rsyslog-8.35.0.tar.gz 2590108 BLAKE2B e201c1366b8ab96c070829d51de079212e82216a793eb7622aa91c66e2330981de8be547b1ee7f102ed7d8c8de054d58ba151e95238146a61fba8fe908c5f929 SHA512 3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc
 DIST rsyslog-8.36.0.tar.gz 2639477 BLAKE2B 9c7343d853f79e2955a8999e2871a2a9b008cb3ef75b94e2381a3a0ff3e49445593d852d7de3819851dc0d4c17a91d966ca2fbfd52e8215ebdbaf6b7ccd68bdf SHA512 b0c8689374b5b0fb5ad9675ad8983ce67bd04d34ad07d39cf8f91498fd2fd21a173f1077e5fa1b66a89a9d93ab011fc6345ac1a3be9961f4794fc9e152c32a50
-DIST rsyslog-docs-8.28.0.tar.gz 4424901 BLAKE2B 9753b1a48b9d3bb045f2d088de5df0bbe5bc9045a82a5cab98b27c2df7648ac312929a173ec34c81ced46cb0eba336d708204b73b57413686769afa882dceaa5 SHA512 c085e09149cfc27ce0cd22edf9ad3f81b111f491fbea79afbc3172882065bd8324e366e3b5d09c885c1a3aa63fe8fbbe154d66488319d4ffc0867f938e1ab07d
-DIST rsyslog-docs-8.32.0.tar.gz 5368254 BLAKE2B 6d1efb191698bb1cfb03660167e5dcf9eea8f2fd2e459c350cd55aa24afcc5fb44d2bc0ef5590c6951326fbd0215aecbd59a6122e88ff449f566b37d1ee00d56 SHA512 e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce
-DIST rsyslog-docs-8.33.1.tar.gz 6770438 BLAKE2B e076688d7559c16986241149c00f6df603e2c90771222f4f91dc944fbdeace3dbc6e47fc82602f852a7407e064fe31df0a1c2940d521ae6ae21f5663518bfeb7 SHA512 fcc8ffee372c0b0dc2ab1b76dcf68a66ce820996cf2d46a2b5c6fd40e6fad5ef3c33da97a2e88956751597c20cf0c4a9b6537c22db0b3b46d1a734a9d9f95df5
-DIST rsyslog-docs-8.34.0.tar.gz 7419160 BLAKE2B 928e6a4044d6d2161483f934e6c2cd5e489a3ec95b823419d7d57b98a7dd6c73f4d28d17c238471592fe1c692b626b57c7bf647e926c1c38ff5a774e5d2defd5 SHA512 edf9aa63c777624c3dc27dfd64b38893b9b4c9b56941df1d7a8c6bc3cb4cbbfb83e8c356cbefeab7c688ecb6017b66ed99931cb71b69b7c927b4743548dd40d4
-DIST rsyslog-docs-8.35.0.tar.gz 7427270 BLAKE2B 5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1 SHA512 f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
-DIST rsyslog-docs-8.36.0.tar.gz 7570338 BLAKE2B 031f94b88fb97e6c8b01d224279138c371a5f54ecc5d7a9298b4ec6351c5d380065877888ab1969386b76b9e715937b7335bee59c3d5b8ddd4910392a58d08cb SHA512 a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa
-EBUILD rsyslog-8.28.0-r1.ebuild 12496 BLAKE2B 6389d72e3018fc1df8c7fa1f2a511360f1cd708534eaa2969a8418abdc92cee03934a5e2f9865bfe0ae462a6f3b49e17acf0434403e402f5ed149ae05203a366 SHA512 54e9cdef851779a9b2f8034474fb5c17e66a27679f24c50c6cc74fbdd8ff92a06a30998a40c5264ac4123b9f8860487b6e2a87607d00f38591fe7ac251623bc0
-EBUILD rsyslog-8.32.0-r4.ebuild 12716 BLAKE2B 9bbfe2d1395a6b298dded2c36d0393e1b11f8b11b0b05c87d2fbe7d1d72d52956b46b2a1a65048daed2a21ba2ed897023dc419f7dca242febbc70b54f4dc0112 SHA512 b8b14edcc03b268699a2e727a942ba34706d95a953426c8a9e2fde33f2aab44a4588d8b8c21627b0b8bd2fa95c295d5e1d84f83ccb3de857c46a768a72093451
-EBUILD rsyslog-8.33.1-r1.ebuild 12634 BLAKE2B efd3e3c908e293ff50a3ff7102c42068627403b912393edfd970271e2974083280839a16bce4175ce4cc946f2d01ff2d516428c18c5f157b541d24c2b316e38e SHA512 ac770033e43c6f5d7d9f93c5586a29389436bc4b479ff1d2a81f7b63121ccd3bff3f9726b7395244a5384d4a3844968b9c8f0bd11ea1f56a381616d231b66fbf
-EBUILD rsyslog-8.34.0.ebuild 12867 BLAKE2B 87c372d138bda89e41a32e9732c733d03ea9a7da8e296e127a843568a9d6b58bc068dd5273a1d627b91b6062c8eab9a0dab2293cef950a3d4ac69eb59a3323d8 SHA512 14058cf62a65e191098e034c2e061112203b1dcb01658684dfbf178d2d26c2a390b4a3b40acfb01dd62363d8dfe87e86e040541341f3125c422a04e3bf464010
-EBUILD rsyslog-8.35.0-r1.ebuild 12933 BLAKE2B c1a1a25566fe6a0da7e4461cea3c2c004cad7ad3136d1b902f1d46e498b4efb86f267eaf9bc480ec91146d6dd2df7def6bc2dc01bdec3a76d22f155ae20d5602 SHA512 6a85e6b19d05b8f720d1625e2c74648d4c8c5901d2c9783cd4f6e229771c7f0ee2d628c82dde94965d870c4fb421324446c178112125b7b83cd623e91b1941d3
-EBUILD rsyslog-8.36.0-r1.ebuild 13028 BLAKE2B 35fc40fbdd8eae6f8868e70a42efc35f0f2393f533b13584180991fc4d567fce8af361eb30a91e2c49366392aefaa103035f4087b8b423a39f75488c26bf546d SHA512 d4d9a7c1fc4af8bedf6daec4ab7b0be21864e0a9924593bf13b5bb52fd06e22d31e076ee79c9cbdc5809232eee8a654d28741d92421e9b5fe2c7ba717d8c7f1f
+DIST rsyslog-doc-8.35.0.tar.gz 7427270 BLAKE2B 5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1 SHA512 f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
+DIST rsyslog-doc-8.36.0.tar.gz 7570338 BLAKE2B 031f94b88fb97e6c8b01d224279138c371a5f54ecc5d7a9298b4ec6351c5d380065877888ab1969386b76b9e715937b7335bee59c3d5b8ddd4910392a58d08cb SHA512 a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa
+EBUILD rsyslog-8.35.0-r1.ebuild 11938 BLAKE2B 9275bcf376d28607c381b049e2b152c9f7ed14b32834a9b90cd0c45dc5edfa584bc3f18f754140c30471dac1207dd85f01612ab47ee82dcc09dafb69ba3eab53 SHA512 1d9eb2ad4dd408a69a108dc47d805d677a0151f77dc5485bfdf35202340341188e9449f76112c910f29483542e506cc0871c1e5527ba31e6daf3cf021f830258
+EBUILD rsyslog-8.36.0-r1.ebuild 12113 BLAKE2B bc15f57f63da43c5b3a2d3121bcb8e2ce00c14d8173c53d0912b424c2b2ee3ce936fc4fe75885da4a520615a220625a543f7c3a2e6807fcdf2d118a6a3728a38 SHA512 6fe8a096cbbf06f0748d8545577f9752a92466a33a2785332ba057686ce9b489f78263de65b670e21b163dfb52928b1fdbe0e9a46d29622bf9f05012c154b31d
 MISC metadata.xml 3850 BLAKE2B 1de60aef00ce700d8d2c05d93d3237170399c65ddfbd37f86e95dd0ef89c7910335b6fdbfc0e806345bb3dbd52212f0bdab45b57acf31b2241ed7d3bf52a64d4 SHA512 c66217bd3a1dd613d49fca4d42267e276bb4f085b14a452da0484ec508cfd45eb36049006cdb6ad58c7c74d88dd6512e922c8bdf07ac01602fbbaf7606215b82
diff --git a/app-admin/rsyslog/files/8-stable/50-default-r1.conf b/app-admin/rsyslog/files/50-default-r1.conf
index 920c214ff6ca..920c214ff6ca 100644
--- a/app-admin/rsyslog/files/8-stable/50-default-r1.conf
+++ b/app-admin/rsyslog/files/50-default-r1.conf
diff --git a/app-admin/rsyslog/files/8-stable/50-default.conf b/app-admin/rsyslog/files/8-stable/50-default.conf
deleted file mode 100644
index 9ae8578215bb..000000000000
--- a/app-admin/rsyslog/files/8-stable/50-default.conf
+++ /dev/null
@@ -1,95 +0,0 @@
-#######################
-### DEFAULT ACTIONS ###
-#######################
-
-auth,authpriv.* action(
-	type="omfile"
-	File="/var/log/auth.log"
-	FileCreateMode="0600"
-	FileOwner="root"
-	FileGroup="adm"
-	Sync="off"
-)
-
-cron.* action(
-	type="omfile"
-	File="/var/log/cron.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-daemon.* action(
-	type="omfile"
-	File="/var/log/daemon.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-kern.* action(
-	type="omfile"
-	File="/var/log/kern.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-lpr.* action(
-	type="omfile"
-	File="/var/log/lpr.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-mail.* action(
-	type="omfile"
-	File="/var/log/mail.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-news.* action(
-	type="omfile"
-	File="/var/log/news.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-user.* action(
-	type="omfile"
-	File="/var/log/user.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-*.=debug;auth,authpriv,news,mail.none action(
-	type="omfile"
-	File="/var/log/debug.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
-	type="omfile"
-	File="/var/log/messages"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-# Uncomment the following directive to re-enable the
-# deprecated "/var/log/syslog" log file (don't forget to re-enable log
-# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
-#*.*;auth,authpriv.none action(
-#	type="omfile"
-#	File="/var/log/syslog"
-#	FileOwner="root"
-#	FileGroup="adm"
-#)
-
-*.emerg action(
-	type="omusrmsg"
-	Users="*"
-	action.execOnlyOnceEveryInterval="10"
-)
-
-# Create an additional socket for the default chroot location
-# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
-input(type="imuxsock" Socket="/var/empty/dev/log")
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch
deleted file mode 100644
index 6ef7e6426287..000000000000
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/rsyslog/rsyslog/pull/1791
----
- tests/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -498,7 +498,6 @@ TESTS += msgvar-concurrency-array.sh \
- 	mmnormalize_processing_test2.sh \
- 	mmnormalize_processing_test3.sh \
- 	mmnormalize_processing_test4.sh
--endif
- 
- if ENABLE_IMPTCP
- TESTS +=  \
-@@ -512,6 +511,7 @@ if LOGNORM_REGEX_SUPPORTED
- TESTS += \
- 	mmnormalize_regex.sh
- endif
-+endif
- 
- if ENABLE_MMJSONPARSE
- TESTS += \
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch
deleted file mode 100644
index 534183a8ca29..000000000000
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r3.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-https://github.com/rsyslog/rsyslog/commit/d9475f133e3c79875a7c4ccd92038b7123c1f155
-https://github.com/rsyslog/rsyslog/commit/468eeb79b8da91fb71dfef6bfb25476b2a37f446
-https://github.com/rsyslog/rsyslog/commit/50205ced0fc22e74f26f2a07b557b69c5d30e168
-
---- a/grammar/rainerscript.c
-+++ b/grammar/rainerscript.c
-@@ -1935,6 +1935,7 @@ num2ipv4(struct svar *__restrict__ const sourceVal) {
- 	return(estr);
- }
- 
-+#ifdef HAVE_LIBCURL
- /* curl callback for doFunc_http_request */
- static size_t
- curlResult(void *ptr, size_t size, size_t nmemb, void *userdata)
-@@ -2010,6 +2011,7 @@ doFunc_http_request(struct cnffunc *__restrict__ const func,
- 	}
- 	RETiRet;
- }
-+#endif
- 
- static int ATTR_NONNULL(1,3,4)
- doFunc_is_time(const char *__restrict__ const str,
-@@ -2513,11 +2515,16 @@ doFuncCall(struct cnffunc *__restrict__ const func, struct svar *__restrict__ co
- 		if(bMustFree2) free(str2);
- 		break;
- 	case CNFFUNC_HTTP_REQUEST:
-+#ifdef HAVE_LIBCURL
- 		cnfexprEval(func->expr[0], &r[0], usrptr, pWti);
- 		str = (char*) var2CString(&r[0], &bMustFree);
- 		doFunc_http_request(func, ret, str);
- 		if(bMustFree) free(str);
- 		varFreeMembers(&r[0]);
-+#else
-+		LogError(0, RS_RET_INTERNAL_ERROR,
-+			"rainerscript: internal error: HTTP_Fetch not supported, not built with libcurl support");
-+#endif
- 		break;
- 	default:
- 		if(Debug) {
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -454,6 +454,8 @@ if test "$enable_libcurl" = "yes"; then
- 	)
- fi
- 
-+AM_CONDITIONAL(ENABLE_LIBCURL, test "x${enable_libcurl}" = "xyes")
-+
- # klog
- AC_ARG_ENABLE(klog,
-         [AS_HELP_STRING([--enable-klog],[Integrated klog functionality @<:@default=yes@:>@])],
-
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -226,7 +226,6 @@ TESTS +=  \
- 	rscript_contains.sh \
- 	rscript_bare_var_root.sh \
- 	rscript_bare_var_root-empty.sh \
--	rscript_http_request.sh \
- 	rscript_ipv42num.sh \
- 	rscript_field.sh \
- 	rscript_stop.sh \
-@@ -305,7 +304,11 @@ TESTS +=  \
- 	lookup_table_rscript_reload.sh \
- 	lookup_table_rscript_reload_without_stub.sh \
- 	multiple_lookup_tables.sh
--endif
-+if ENABLE_LIBCURL
-+TESTS +=  \
-+	rscript_http_request.sh
-+endif # ENABLE_LIBCURL
-+endif # ENABLE_TESTBENCH2
- 
- if HAVE_VALGRIND
- TESTS +=  \
-@@ -313,7 +316,6 @@ TESTS +=  \
- 	mmexternal-InvldProg-vg.sh \
- 	internal-errmsg-memleak-vg.sh \
- 	rscript_set_memleak-vg.sh \
--	rscript_http_request-vg.sh \
- 	no-parser-vg.sh \
- 	discard-rptdmsg-vg.sh \
- 	discard-allmark-vg.sh \
-@@ -338,6 +340,10 @@ TESTS +=  \
- 	multiple_lookup_tables-vg.sh \
- 	fac_local0-vg.sh \
- 	rscript_trim-vg.sh
-+if ENABLE_LIBCURL
-+TESTS +=  \
-+	rscript_http_request-vg.sh
-+endif # ENABLE_LIBCURL
- endif # HAVE_VALGRIND
- 
- if ENABLE_ROOT_TESTS
-
---- a/grammar/Makefile.am
-+++ b/grammar/Makefile.am
-@@ -12,8 +12,11 @@ libgrammar_la_SOURCES = \
- 	parserif.h \
- 	grammar.h
- libgrammar_la_CPPFLAGS =  $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--#libgrammar_la_LIBADD = $(CURL_LIBS) $(RSRT_LIBS) $(SOL_LIBS)
--libgrammar_la_LIBADD = $(CURL_LIBS)
-+libgrammar_la_LIBADD =
-+if ENABLE_LIBCURL
-+libgrammar_la_CPPFLAGS += $(CURL_CFLAGS)
-+libgrammar_la_LIBADD += $(CURL_LIBS)
-+endif
- 
- #testdriver_SOURCES = testdriver.c libgrammar.la
- #testdriver_CPPFLAGS =  $(RSRT_CFLAGS)
-
---- a/plugins/omelasticsearch/Makefile.am
-+++ b/plugins/omelasticsearch/Makefile.am
-@@ -1,7 +1,7 @@
- pkglib_LTLIBRARIES = omelasticsearch.la
- 
- omelasticsearch_la_SOURCES = omelasticsearch.c
--omelasticsearch_la_CPPFLAGS =  $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
-+omelasticsearch_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(CURL_CFLAGS)
- omelasticsearch_la_LDFLAGS = -module -avoid-version
- omelasticsearch_la_LIBADD =  $(CURL_LIBS) $(LIBM)
- 
---- a/grammar/rainerscript.c
-+++ b/grammar/rainerscript.c
-@@ -36,7 +36,11 @@
- #include <sys/types.h>
- #include <libestr.h>
- #include <time.h>
-+
-+#ifdef HAVE_LIBCURL
- #include <curl/curl.h>
-+#endif
-+
- #include "rsyslog.h"
- #include "rainerscript.h"
- #include "conf.h"
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch
deleted file mode 100644
index 4e9e566e84c7..000000000000
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.34.0-fix-issue2612.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/rsyslog/rsyslog/issues/2612
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -254,7 +254,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(, return __builtin_expect(main != 0, 1))],
- # speeds up processig.
- # note that when automic operations are enabled but not available, they
- # will silently NOT be used!
--AC_ARG_ENABLE(regexp,
-+AC_ARG_ENABLE(atomic_operations,
-         [AS_HELP_STRING([--enable-atomic-operations],[Enable atomic operation support @<:@default=yes@:>@])],
-         [case "${enableval}" in
-          yes) enable_atomic_operations="yes" ;;
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.logrotate b/app-admin/rsyslog/files/8-stable/rsyslog.logrotate
deleted file mode 100644
index 1eae30e0d741..000000000000
--- a/app-admin/rsyslog/files/8-stable/rsyslog.logrotate
+++ /dev/null
@@ -1,37 +0,0 @@
-# Uncomment the following directive if you have re-enabled
-# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf"
-#/var/log/syslog
-#{
-#	rotate 7
-#	daily
-#	missingok
-#	notifempty
-#	delaycompress
-#	compress
-#	postrotate
-#		test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
-#	endscript
-#}
-
-/var/log/auth.log
-/var/log/cron.log
-/var/log/daemon.log
-/var/log/kern.log
-/var/log/lpr.log
-/var/log/mail.log
-/var/log/news.log
-/var/log/user.log
-/var/log/debug.log
-/var/log/messages
-{
-	rotate 4
-	weekly
-	missingok
-	notifempty
-	compress
-	delaycompress
-	sharedscripts
-	postrotate
-		test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
-	endscript
-}
diff --git a/app-admin/rsyslog/files/8-stable/README.gentoo b/app-admin/rsyslog/files/README.gentoo
index 9f0666c86b0a..9f0666c86b0a 100644
--- a/app-admin/rsyslog/files/8-stable/README.gentoo
+++ b/app-admin/rsyslog/files/README.gentoo
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2719.patch b/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch
index 8996acd27e88..8996acd27e88 100644
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2719.patch
+++ b/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2719.patch
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch b/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch
index eaec239c3839..eaec239c3839 100644
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.35.0-fix-issue2726.patch
+++ b/app-admin/rsyslog/files/rsyslog-8.35.0-fix-issue2726.patch
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-r1.logrotate b/app-admin/rsyslog/files/rsyslog-r1.logrotate
index 3a92ba37bdec..3a92ba37bdec 100644
--- a/app-admin/rsyslog/files/8-stable/rsyslog-r1.logrotate
+++ b/app-admin/rsyslog/files/rsyslog-r1.logrotate
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.conf b/app-admin/rsyslog/files/rsyslog.conf
index da484598a652..da484598a652 100644
--- a/app-admin/rsyslog/files/8-stable/rsyslog.conf
+++ b/app-admin/rsyslog/files/rsyslog.conf
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1 b/app-admin/rsyslog/files/rsyslog.confd-r1
index da48c01cd407..da48c01cd407 100644
--- a/app-admin/rsyslog/files/8-stable/rsyslog.confd-r1
+++ b/app-admin/rsyslog/files/rsyslog.confd-r1
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1 b/app-admin/rsyslog/files/rsyslog.initd-r1
index 7d7aa4bc9313..f34bacb7511b 100644
--- a/app-admin/rsyslog/files/8-stable/rsyslog.initd-r1
+++ b/app-admin/rsyslog/files/rsyslog.initd-r1
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 RSYSLOG_CONFIGFILE=${RSYSLOG_CONFIGFILE:-"/etc/rsyslog.conf"}
diff --git a/app-admin/rsyslog/rsyslog-8.28.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.28.0-r1.ebuild
deleted file mode 100644
index 7a47099a780b..000000000000
--- a/app-admin/rsyslog/rsyslog-8.28.0-r1.ebuild
+++ /dev/null
@@ -1,451 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils linux-info systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-BRANCH="8-stable"
-
-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
-	MY_PV=${PV%_rc*}
-	MY_FILENAME="${PN}-${PV}.tar.gz"
-	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	# Upstream URL schema:
-	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
-	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
-	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
-	MY_URL_PREFIX=
-	if [[ ${PV} = *_rc* ]]; then
-		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
-		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
-		if [[ ${_tmp_suffix} = *rc* ]]; then
-			MY_URL_PREFIX="${_tmp_suffix}/"
-		fi
-
-		# Cleaning up temporary variables
-		unset _tmp_last_index
-		unset _tmp_suffix
-	else
-		KEYWORDS="hppa"
-	fi
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
-	"
-
-	PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch )
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.3:=
-	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
-	>=sys-libs/zlib-1.2.5
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
-	mysql? ( virtual/libmysqlclient:= )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	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.14:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? ( >=net-libs/gnutls-2.12.23:0= )
-	systemd? ( >=sys-apps/systemd-208 )
-	uuid? ( sys-apps/util-linux:0= )
-	zeromq? (
-		>=net-libs/zeromq-4.1.1:=
-		>=net-libs/czmq-3.0.0
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? ( sys-libs/libfaketime )"
-
-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!"
-
-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 ${MY_FILENAME_DOCS}
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	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
-		$(use_enable test testbench)
-		# 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-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		--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 memcheck)
-		$(use_enable debug rtinst)
-		$(use_enable debug valgrind)
-		# Misc
-		$(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 normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable grok mmgrok)
-		$(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 ssl gnutls)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq imzmq3)
-		$(use_enable zeromq omczmq)
-		$(use_enable zeromq omzmq3)
-		--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}"/${BRANCH}/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	doins "${FILESDIR}/${BRANCH}/50-default.conf"
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.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 " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild b/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild
deleted file mode 100644
index 8174b04b23ed..000000000000
--- a/app-admin/rsyslog/rsyslog-8.32.0-r4.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-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/"
-
-BRANCH="8-stable"
-
-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
-	MY_PV=${PV%_rc*}
-	MY_FILENAME="${PN}-${PV}.tar.gz"
-	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	# Upstream URL schema:
-	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
-	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
-	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
-	MY_URL_PREFIX=
-	if [[ ${PV} = *_rc* ]]; then
-		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
-		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
-		if [[ ${_tmp_suffix} = *rc* ]]; then
-			MY_URL_PREFIX="${_tmp_suffix}/"
-		fi
-
-		# Cleaning up temporary variables
-		unset _tmp_last_index
-		unset _tmp_suffix
-	else
-		KEYWORDS="amd64 arm ~arm64 ~hppa x86"
-	fi
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
-	"
-
-	PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r3.patch )
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/libmysqlclient:= )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	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.14:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? ( >=net-libs/gnutls-2.12.23:0= )
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	zeromq? (
-		>=net-libs/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-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 ${MY_FILENAME_DOCS}
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	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
-		$(use_enable test testbench)
-		$(use_enable curl libcurl)
-		# 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-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		--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 memcheck)
-		$(use_enable debug rtinst)
-		$(use_enable debug valgrind)
-		# Misc
-		$(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 normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable grok mmgrok)
-		$(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 ssl gnutls)
-		$(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}"/${BRANCH}/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.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 " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild b/app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild
deleted file mode 100644
index c9aecb5b0713..000000000000
--- a/app-admin/rsyslog/rsyslog-8.33.1-r1.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-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/"
-
-BRANCH="8-stable"
-
-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
-	MY_PV=${PV%_rc*}
-	MY_FILENAME="${PN}-${PV}.tar.gz"
-	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	# Upstream URL schema:
-	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
-	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
-	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
-	MY_URL_PREFIX=
-	if [[ ${PV} = *_rc* ]]; then
-		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
-		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
-		if [[ ${_tmp_suffix} = *rc* ]]; then
-			MY_URL_PREFIX="${_tmp_suffix}/"
-		fi
-
-		# Cleaning up temporary variables
-		unset _tmp_last_index
-		unset _tmp_suffix
-	else
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-	fi
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
-IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/libmysqlclient:= )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	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.14:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? ( >=net-libs/gnutls-2.12.23:0= )
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	zeromq? (
-		>=net-libs/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-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 ${MY_FILENAME_DOCS}
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	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
-		$(use_enable test testbench)
-		$(use_enable curl libcurl)
-		# 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-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		--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 memcheck)
-		$(use_enable debug rtinst)
-		$(use_enable debug valgrind)
-		# Misc
-		$(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 normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable grok mmgrok)
-		$(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 ssl gnutls)
-		$(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}"/${BRANCH}/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.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 " http://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.34.0.ebuild b/app-admin/rsyslog/rsyslog-8.34.0.ebuild
deleted file mode 100644
index e13267969512..000000000000
--- a/app-admin/rsyslog/rsyslog-8.34.0.ebuild
+++ /dev/null
@@ -1,464 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-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/"
-
-BRANCH="8-stable"
-
-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
-	MY_PV=${PV%_rc*}
-	MY_FILENAME="${PN}-${PV}.tar.gz"
-	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	# Upstream URL schema:
-	# RC:      https://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
-	#          https://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
-	# Release: https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
-	MY_URL_PREFIX=
-	if [[ ${PV} = *_rc* ]]; then
-		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
-		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
-		if [[ ${_tmp_suffix} = *rc* ]]; then
-			MY_URL_PREFIX="${_tmp_suffix}/"
-		fi
-
-		# Cleaning up temporary variables
-		unset _tmp_last_index
-		unset _tmp_suffix
-	else
-		KEYWORDS="amd64 arm ~arm64 ~hppa x86"
-	fi
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
-	"
-
-	PATCHES=( "${FILESDIR}"/${BRANCH}/${PN}-8.34.0-fix-issue2612.patch )
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql"
-IUSE+=" normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	grok? ( >=dev-libs/grok-0.9.2 )
-	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? ( virtual/libmysqlclient:= )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	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.14:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? ( >=net-libs/gnutls-2.12.23:0= )
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	zeromq? (
-		>=net-libs/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="kubernetes? ( normalize )"
-
-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 ${MY_FILENAME_DOCS}
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	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
-		$(use_enable test testbench)
-		$(use_enable curl libcurl)
-		# 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-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		--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 memcheck)
-		$(use_enable debug rtinst)
-		$(use_enable debug valgrind)
-		# Misc
-		$(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 grok mmgrok)
-		$(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 ssl gnutls)
-		$(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}"/${BRANCH}/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}.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/rsyslog/rsyslog-8.35.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
index 88d35b15d840..750600f1c7eb 100644
--- a/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.35.0-r1.ebuild
@@ -2,15 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit autotools eutils linux-info python-any-r1 systemd
 
 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="https://www.rsyslog.com/"
 
-BRANCH="8-stable"
-
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
 
@@ -18,39 +16,16 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	MY_PV=${PV%_rc*}
-	MY_FILENAME="${PN}-${PV}.tar.gz"
-	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	# Upstream URL schema:
-	# RC:      https://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
-	#          https://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
-	# Release: https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
-	MY_URL_PREFIX=
-	if [[ ${PV} = *_rc* ]]; then
-		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
-		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
-		if [[ ${_tmp_suffix} = *rc* ]]; then
-			MY_URL_PREFIX="${_tmp_suffix}/"
-		fi
-
-		# Cleaning up temporary variables
-		unset _tmp_last_index
-		unset _tmp_suffix
-	else
-		KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
-	fi
+	KEYWORDS="amd64 arm ~arm64 hppa x86"
 
 	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
 	"
 
 	PATCHES=(
-		"${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2719.patch
-		"${FILESDIR}"/${BRANCH}/${PN}-8.35.0-fix-issue2726.patch
+		"${FILESDIR}"/${PN}-8.35.0-fix-issue2719.patch
+		"${FILESDIR}"/${PN}-8.35.0-fix-issue2726.patch
 	)
 fi
 
@@ -151,7 +126,7 @@ src_unpack() {
 			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 ${MY_FILENAME_DOCS}
+			unpack ${PN}-doc-${PV}.tar.gz
 		fi
 	fi
 }
@@ -183,7 +158,6 @@ src_configure() {
 		--disable-generate-man-pages
 		--without-valgrind-testbench
 		$(use_enable test testbench)
-		$(use_enable curl libcurl)
 		# Input Plugins without depedencies
 		--enable-imdiag
 		--enable-imfile
@@ -221,7 +195,6 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable debug diagtools)
 		$(use_enable debug memcheck)
-		$(use_enable debug rtinst)
 		$(use_enable debug valgrind)
 		# Misc
 		$(use_enable curl fmhttp)
@@ -298,15 +271,15 @@ src_install() {
 	local DOCS=(
 		AUTHORS
 		ChangeLog
-		"${FILESDIR}"/${BRANCH}/README.gentoo
+		"${FILESDIR}"/README.gentoo
 	)
 
 	use doc && local HTML_DOCS=( "${S}/docs/build/." )
 
 	default
 
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
 
 	keepdir /var/empty/dev
 	keepdir /var/spool/${PN}
@@ -314,13 +287,13 @@ src_install() {
 	keepdir /etc/${PN}.d
 
 	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
 
 	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
 
 	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}-r1.logrotate" ${PN}
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
 
 	if use mysql; then
 		insinto /usr/share/doc/${PF}/scripts/mysql
diff --git a/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
index 27d2078ef8fd..7d811f217bab 100644
--- a/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.36.0-r1.ebuild
@@ -2,15 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit autotools eutils linux-info python-any-r1 systemd
 
 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="https://www.rsyslog.com/"
 
-BRANCH="8-stable"
-
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
 
@@ -18,34 +16,11 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	MY_PV=${PV%_rc*}
-	MY_FILENAME="${PN}-${PV}.tar.gz"
-	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-
-	# Upstream URL schema:
-	# RC:      https://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
-	#          https://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
-	# Release: https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
-
-	MY_URL_PREFIX=
-	if [[ ${PV} = *_rc* ]]; then
-		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
-		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
-		if [[ ${_tmp_suffix} = *rc* ]]; then
-			MY_URL_PREFIX="${_tmp_suffix}/"
-		fi
-
-		# Cleaning up temporary variables
-		unset _tmp_last_index
-		unset _tmp_suffix
-	else
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-	fi
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 
 	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
 	"
 
 	PATCHES=()
@@ -158,7 +133,7 @@ src_unpack() {
 			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 ${MY_FILENAME_DOCS}
+			unpack ${PN}-doc-${PV}.tar.gz
 		fi
 	fi
 }
@@ -307,15 +282,15 @@ src_install() {
 	local DOCS=(
 		AUTHORS
 		ChangeLog
-		"${FILESDIR}"/${BRANCH}/README.gentoo
+		"${FILESDIR}"/README.gentoo
 	)
 
 	use doc && local HTML_DOCS=( "${S}/docs/build/." )
 
 	default
 
-	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
 
 	keepdir /var/empty/dev
 	keepdir /var/spool/${PN}
@@ -323,13 +298,13 @@ src_install() {
 	keepdir /etc/${PN}.d
 
 	insinto /etc
-	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
 
 	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
 
 	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${BRANCH}/${PN}-r1.logrotate" ${PN}
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
 
 	if use mysql; then
 		insinto /usr/share/doc/${PF}/scripts/mysql
diff --git a/app-admin/spectre-meltdown-checker/Manifest b/app-admin/spectre-meltdown-checker/Manifest
new file mode 100644
index 000000000000..419025880741
--- /dev/null
+++ b/app-admin/spectre-meltdown-checker/Manifest
@@ -0,0 +1,4 @@
+DIST spectre-meltdown-checker-0.37.tar.gz 40472 BLAKE2B 93d83605c2d410a176d944cbf7c83549cc70075dbd7ef1f90d4a9710d8fdafd0393c0ad6a9a46eba12f753a3b14d486ba093f9b7fb1dd6c08d17042a94f97b44 SHA512 f621e81a783e8e01caae25d76fae6ab7bd091990cd0a0f93de2e29e1964b6f0952c221c64e4e045f26231f800b0ba1b8152aac71a7348e8577ac6b9bd7e31cf2
+EBUILD spectre-meltdown-checker-0.37.ebuild 604 BLAKE2B ba0beb4835deaa3f5fcfb7bc077f0f56763e28b64276e85cb74620c6458c7210b5ad028079d922366afae4e481e931137c5634ca2598efba80a01c03a6ef8b25 SHA512 ec885585c8c9d4867b27448db21b121a01c2c0c8eec887a2911a1bfdb560404230e269dcad15d2873470d41ee8943142cb07bde132eebd94df054dd197051903
+EBUILD spectre-meltdown-checker-9999.ebuild 604 BLAKE2B ba0beb4835deaa3f5fcfb7bc077f0f56763e28b64276e85cb74620c6458c7210b5ad028079d922366afae4e481e931137c5634ca2598efba80a01c03a6ef8b25 SHA512 ec885585c8c9d4867b27448db21b121a01c2c0c8eec887a2911a1bfdb560404230e269dcad15d2873470d41ee8943142cb07bde132eebd94df054dd197051903
+MISC metadata.xml 461 BLAKE2B ffd3a0e87b161c95e73d98acfb9ce11068ff5698ad095703e48ff7a95bd9c65379bdfa87ed19f6a1c5e10458cb10042f33e986d58741f8667b49409c1d7083ad SHA512 9e59c70f06c412ef1a742d2edbf62ef5e69e3997e8ba713e61a91dfcdb4a399035e60d9ce6fad43a1568cec658f05d33bc3aaa5fd2efc1cf70eb0f5fd98e1dbc
diff --git a/app-admin/spectre-meltdown-checker/metadata.xml b/app-admin/spectre-meltdown-checker/metadata.xml
new file mode 100644
index 000000000000..5e8946a7b96c
--- /dev/null
+++ b/app-admin/spectre-meltdown-checker/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lucianposton@pm.me</email>
+		<name>Lucian Poston</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">speed47/spectre-meltdown-checker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.37.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.37.ebuild
new file mode 100644
index 000000000000..5deeeceb4a17
--- /dev/null
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.37.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
+else
+	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
+HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+src_install() {
+	default
+	newbin spectre-meltdown-checker.sh spectre-meltdown-checker
+}
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-9999.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-9999.ebuild
new file mode 100644
index 000000000000..5deeeceb4a17
--- /dev/null
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
+else
+	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
+HOMEPAGE="https://github.com/speed47/spectre-meltdown-checker"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+src_install() {
+	default
+	newbin spectre-meltdown-checker.sh spectre-meltdown-checker
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 59671bc89742..e46e41a588cc 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -31,7 +31,7 @@ DIST syslog-ng-3.14.1.tar.gz 9039910 BLAKE2B 688eb52557c41a2556835978809b74ef4cc
 DIST syslog-ng-3.15.1.tar.gz 9147238 BLAKE2B 86c51a51569efed2c2127a6102a10224a0599d40af0d34f28b5b52e314687851753f979a8d9edabdba02d347407b1b2856bce11991eeda53cbe10ad135934534 SHA512 79b4f2eff92bcbfe8a875bc72eb98bb43d86ef3c63deaf4acefcdad4f3a98df9de4e7935fc2ebbe017fd5eb22aa0743f1ff428d0ccf3790a1767f4e25c6a7b13
 DIST syslog-ng-3.16.1.tar.gz 8899693 BLAKE2B 850d83ff6f7e2db4aaf0737cc97403084bfa97855df28ccc8134c7d744cc0539e5d9efcd72f7eaa5407504897bc274419963843afa4c81964732dc5d6f0337cd SHA512 6b47e570ac19154f6158d8de0898c0a49e87d4ed51cae67224501e9460063efc53c4b2ad518d7def811d320f88cbefbf5d645de31f300498921652d7be305999
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
-EBUILD syslog-ng-3.13.2.ebuild 4695 BLAKE2B d026ac7e37138dd621abcd9138f63e3ea70a950af5dcfb8e2321def753c6d26f84c07c74341f919e79aded8803694d9b4a18bdf3acfe0e1ee473777201221df9 SHA512 61e87012b39fbccd4c08c19b6f4e5d92694831c6b8f8b795b180098ca02c2878461574d0f26be9b200a06f20995bd472908b8ac174fd455823ec0d2ccc724bb7
+EBUILD syslog-ng-3.13.2.ebuild 4701 BLAKE2B 4bc557a7545796a5c0c883ac3cee067396636e2292261db4f4c98c330e58b1d20e796f7214fd856d885f99fdc9f3db59ab59d3e1e0febda23ff97fdf9fedfc9c SHA512 f9ff35932c0e1af04ed237e9ded764ec1dc38d0cf952aeb1335d67b73f73262f8975cdb2f3908ee77252eef9d4ad3f6228025219bba9df263cd2b380c1c5df81
 EBUILD syslog-ng-3.14.1.ebuild 4800 BLAKE2B 827277cd46a8484ab39656177f1bdbe4ee1e4e8715257289aa4642835f6bf5030c006b4147d9faf07888526e5dfc724967dd95efbb102867e2c2d5d3db03029c SHA512 5e36a93088045183cb8c2dc55809cef3412c1872f3eea356dd96569553d12d3fc3df624870d9b5a66558087781efd0769a880c35253485fdf6697e2371092563
 EBUILD syslog-ng-3.15.1.ebuild 4767 BLAKE2B c15f68a8d083a878ce7b12cb53a4d6515c0ba90b313a465a5e01b32d730a17070a57dc9a8b93a29ef02119b5a25090e013f89c378daa89c1d22330971442eb4f SHA512 18f5ee084f6494103b3046cd1aabfdd9f0039933d689acc154ef032e551798fa2c8abb1cbb91663a4bf9627687930e2cb3ada9d0db0b60ce49048699a69f5e47
 EBUILD syslog-ng-3.16.1.ebuild 4850 BLAKE2B aab49b02f504139fbc8c09a310dc3e32d0f11adfa3784643af55c898f959dcfcf6c81d4b4eeabe8fbb4674c20463d8f854e227fc35276907eb16c2bfa95b0cda SHA512 f6c7a21e0bb4c5a8bce3a0c9b8c00a4af55dc66cfd3ad9bfafd6e7a753eb0d963229d7837253422d58ac99e05c799ead6fa14bc7a13087da75d8510e2e0bc8ba
diff --git a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
index b8f22a45ef86..49c6e17b35ba 100644
--- a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm64 hppa ia64 sparc x86"
+KEYWORDS="amd64 arm64 hppa ia64 ppc64 sparc x86"
 IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test"
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 2f3d1a40f856..62be52938cf8 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,8 +1,6 @@
 AUX ulogd.init 949 BLAKE2B bebbf58aab0957017980d46762743f366d9f2daeca35bbed53c1ae7ab2645a6de84eddf25e82a48c4185a6a9a991b4e3562e7d06579ba8a9b2fb36a9f5b0b7de SHA512 87331bc32592fc9153274a8716a5206392af99087f89d8ba51539c477805a1932706ad2fbb8f71947ef3534a368cb2559fd2f54ae0038ab49eccda85763e7a99
 AUX ulogd.logrotate 193 BLAKE2B 65e6d518260ad322539f05ea5a3177092db8cfa67bd8cd035cd714f8c3e6f90860ce47e27dccdf66feed68258f9bbbe2ef16fa103000f0166927a8cf9fc6969c SHA512 be62a8c63d567d90ab07d9a9e86fb85d868683c385de598b81fa369fd13581a144a0be1aedd2b899d653d94475679eee1fd4939ae72a35777d75208584b2f17a
 AUX ulogd.service 390 BLAKE2B e1395888ffe09cafd98a4384ab7b06e18c0e1b92fa80fb07a05415a3927bcd68a5d3d900ada141c684359bd37910801d40e069cba8cefc8a7c323584b9d8b993 SHA512 73923e6a851bf4f34f532c8b3fa17eb227f2fb2b4c485b89a488789f2d4af3605bd09538095a6acbee6d74300e98755bb03bacabe450104319938cfff62e4c89
-DIST ulogd-2.0.5_p20161017.tar.gz 137936 BLAKE2B 4cd252820920b0f872ddf97894c5917ed03fcab78b7fc215fa0ad00fbce2d2bd8cadc80120d452868e5292c97e595ea0ea861d685919fd18a8f040b683f2fe5d SHA512 b9a3f5323766856fc20d58a6c55f9bc955f50e9d7052df0828ca08bf9d573326e69920f6c90c9d3e877c4dc1a29a5a994cde070bd0834fbf4dee8eebbb251e98
 DIST ulogd-2.0.7.tar.bz2 394573 BLAKE2B bec028a3b35038a8cc0f3f8b81b3e19addb66fce09e4ea0f3b2cd29b20cdb28025a576badd0765d9bb15f9d097799b6f55ff45058f8a838daa836c3fe878eef0 SHA512 1ad12bcf91bebe8bf8580de38693318cdabd17146f1f65acf714334885cf13adf5f783abdf2dd67474ef12f82d2cfb84dd4859439bc7af10a0df58e4c7e48b09
-EBUILD ulogd-2.0.5_p20161017.ebuild 3283 BLAKE2B cca75edb07b6a0ed2189e49a7adfe01f3b484c08475bd2dab869b2f103e4b22888245b9a2d5f141a1fd67913e57bdfcbc48d6e6f4f8afe58c01c3ecc318b6036 SHA512 2a053311bf836f933fdb3ffa23f354bda4eaac186a36fbe50ccd4aeed719d8c172ab67f969339b0ef29a4698b0bd7b2fac9804eaa75d4b2c84b7808a096f9791
 EBUILD ulogd-2.0.7.ebuild 3186 BLAKE2B a70b5de31f86a873bfbd6163b8a9bdcec777bfcf5d12b86cf2d39b623147da2b1a4063518384f17e41697942040015eb1a5ab628a0f4a2b5454e9399d4add0ad SHA512 af9184754de193294703db3f5cd91b698df3c21547dc0e63bd8eb4990bed9642f4a06744a2dbcf19302cad40fdb8286faa22ef8cf2f0159d063e99b98a434164
 MISC metadata.xml 1106 BLAKE2B b3573379c3ff51e2547356bca45add6e891b5ab04784c8c926c52633551209c91ccf51103c289d4e45e16e7fb1f9775055131c400fdfa3627c158282ba0991ef SHA512 d97a125e3fcc6ed123c2da7520bd9f2fa615394d583ac5d984225286676ad3b01d0b5ccf01567d68cacffed6e12e5182bdbd618355e8bec2a05ade66369f9f1d
diff --git a/app-admin/ulogd/ulogd-2.0.5_p20161017.ebuild b/app-admin/ulogd/ulogd-2.0.5_p20161017.ebuild
deleted file mode 100644
index 192a002f058a..000000000000
--- a/app-admin/ulogd/ulogd-2.0.5_p20161017.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT_ID="62064f6a9e054739ecbdda010dbe9c3fd69bbaa2"
-
-inherit autotools eutils flag-o-matic linux-info readme.gentoo-r1 systemd user vcs-snapshot
-
-DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
-HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
-SRC_URI="http://git.netfilter.org/${PN}2/snapshot/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite ulog"
-
-RDEPEND="
-	|| ( net-firewall/iptables net-firewall/nftables )
-	>=net-libs/libnfnetlink-1.0.1
-	dbi? ( dev-db/libdbi )
-	json? ( dev-libs/jansson )
-	nfacct? (
-		>=net-libs/libmnl-1.0.3
-		>=net-libs/libnetfilter_acct-1.0.1
-	)
-	nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
-	nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
-	mysql? ( virtual/mysql )
-	pcap? ( net-libs/libpcap )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		app-text/linuxdoc-tools
-		app-text/texlive-core
-		dev-texlive/texlive-fontsrecommended
-		virtual/latex-base
-	)
-"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-You must have at least one logging stack enabled to make ulogd work.
-Please edit the example configuration located at '${EPREFIX}/etc/ulogd.conf'.
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 14; then
-		die "${PN} requires a kernel >= 2.6.14."
-	fi
-
-	if use nfacct && kernel_is lt 3 3 0; then
-		ewarn "NFACCT input plugin requires a kernel >= 3.3."
-	fi
-
-	if use ulog && kernel_is ge 3 17 0; then
-		ewarn "ULOG target has been removed in the 3.17 kernel release."
-		ewarn "Consider enabling NFACCT, NFCT, or NFLOG support instead."
-	fi
-
-	enewgroup ulogd
-	enewuser ulogd -1 -1 /var/log/ulogd ulogd
-}
-
-src_prepare() {
-	default_src_prepare
-
-	# Change default settings to:
-	# - keep log files in /var/log/ulogd instead of /var/log;
-	# - create sockets in /run instead of /tmp.
-	sed -i \
-		-e "s|var/log|var/log/${PN}|g" \
-		-e 's|tmp|run|g' \
-		ulogd.conf.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	append-lfs-flags
-	local myeconfargs=(
-		$(use_with dbi)
-		$(use_with json jansson)
-		$(use_enable nfacct)
-		$(use_enable nfct)
-		$(use_enable nflog)
-		$(use_with mysql)
-		$(use_with pcap)
-		$(use_with postgres pgsql)
-		$(use_with sqlite)
-		$(use_enable ulog)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default_src_compile
-
-	if use doc; then
-		# Prevent access violations from bitmap font files generation.
-		export VARTEXFONTS="${T}/fonts"
-		emake -C doc
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/${PN}.html )
-
-	default_src_install
-	prune_libtool_files --modules
-	readme.gentoo_create_doc
-
-	doman ${PN}.8
-
-	use doc && dodoc doc/${PN}.{dvi,ps,txt}
-	use mysql && dodoc doc/mysql-*.sql
-	use postgres && dodoc doc/pgsql-*.sql
-	use sqlite && dodoc doc/sqlite3.table
-
-	insinto /etc
-	doins ${PN}.conf
-	fowners root:ulogd /etc/${PN}.conf
-	fperms 640 /etc/${PN}.conf
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	diropts -o ulogd -g ulogd
-	keepdir /var/log/ulogd
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index d24a2b955e44..2537241cf679 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,10 +3,8 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 542 BLAKE2B 5e28a00356c010d34458c6f64d2bdb0736673ae552bec809cc5e23a1613e44cd847b4df99bee652a99cb6fb84443d5f9c5c1fba1c165d946f1c93cd8ca31ffa3 SHA512 ac13c688e006799b607c44e94fbdf922befc62131014b714a93ca4bb0205f5f012bb3e4814eeeb47b31034f5c35b187fc8ebaeca02bd02430c5842bc9821f29a
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 409 BLAKE2B 1e34e7bb4e5d52949b1b0afbe495aea00202ee599db1b1737bd81c5252a6d57efd2a5c98e4dfaa4d632bb664a467414e644ec751921ced20f5e4c40b27222eb6 SHA512 2c4c7c395ebcd06e70de57d93384442ea88346cc2815b509966bd9f12579758e5f43d9a2ca1158e3b25198ad0c82ed9cf5d453f3cd7b5873011b3b13ec60196c
-DIST vault-0.10.1.tar.gz 13001413 BLAKE2B d4dd663062062c55d110b165c1369a8a6f44c91002d564680ed008fcea2ce1e26ac24773deb951a46a7d9bcce2234e3b1dc250a957605f3ec82c781ac2e46b4a SHA512 dfa2d81e0e51cf41694ad40ad9bcc6847a9261ee06b2787d59915b941a63bfe58e649271e1ff5a963b892af5c13043057f29a1a8412efe51b3cf54157c54a060
-DIST vault-0.10.2.tar.gz 15861571 BLAKE2B c1129c6f87fcd00aaf8fecaf472e33c6872663cbac1e778e3d1af9ca7978501fe9ca400cc6d79224f9f0df5912909218dfc2ff1547144b3a94fa9f10aed89534 SHA512 ce24d0c3c126bd8f265542c97dea4f0a1c56c5003e74b0aeb16aa462c326aa360f169e0bd08a4187480dbfcf1a052249f4dcf5a5bf356c4c901676d1b55c67b0
 DIST vault-0.10.3.tar.gz 15902247 BLAKE2B f69ddbe1309800cfae756f8ca1dd0da3e92ce49a1ec70539dc30785344afb7fe39472dcb2fb5ee4f410c7b52b13b00996b08d89624ef8523adcf4f809601ad5c SHA512 baacf549f9b73d306154dad6cd6efb3fb0eca3280c885cd772dada524cd436c1d5f1f705118274aa7cea6002cd8e0b86f1dfb02c4f5787d08dc535112cb62096
-EBUILD vault-0.10.1.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
-EBUILD vault-0.10.2.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
+DIST vault-0.10.4.tar.gz 19207588 BLAKE2B 035e83c1d119b266817490afd4506fee5e5ceeff8a7c59188c59e28067f06e78f57e06d200026b288908f49a19ed22ebfd67e08c3c70026c7da22d05e33ec343 SHA512 7331e49c2bebbbbcebc74cfc1ce7d6984590fdd39b47f0bbf1b610cfe37b900a86b8ea63bc5d5e28ba34b68433944486979177aee6c10bf188095f5a50a4b61a
 EBUILD vault-0.10.3.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
+EBUILD vault-0.10.4.ebuild 1497 BLAKE2B 64f3a8547114277e0b30126447681868a2fda44bbe6351d161c3cea2e3b229864e807bff551ca3d4b98d3e450095b152067e171b28a123d72bab1b5e59dfbe24 SHA512 aeb5b5542b3f0138812059c5afaab24d322b68559c6b4bb75aec3241ef336bfbf82052d13f469712fdfb374350a742ede91aeb653ec231427559a10d9b5d7867
 MISC metadata.xml 306 BLAKE2B 882a83701d71a45cdc6fc00ba3da98ff7d7439c9f81ef0aa1655c49bd5e79b3e625858d33f4ac6d5157df6ef74c5dd00a2b8efb1fd5ee45f9a0ed785c90d8ebc SHA512 d1fc4040379fb33c7f193f37a1c044000408e47c9df8b17771ed7cb5194f9d8b8c062b8a6804e72fb5a666683a8d5b49ec5a6328394870d9bdc1b7f3e0e4e787
diff --git a/app-admin/vault/vault-0.10.2.ebuild b/app-admin/vault/vault-0.10.2.ebuild
deleted file mode 100644
index 2e6d92497501..000000000000
--- a/app-admin/vault/vault-0.10.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.10:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-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" -i src/${EGO_PN}/Makefile || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export GOPATH=${S}
-	cd src/${EGO_PN} || die
-	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}
-}
diff --git a/app-admin/vault/vault-0.10.1.ebuild b/app-admin/vault/vault-0.10.4.ebuild
index 2e6d92497501..2e6d92497501 100644
--- a/app-admin/vault/vault-0.10.1.ebuild
+++ b/app-admin/vault/vault-0.10.4.ebuild
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index 4d78a97fcc43..e044b9129cb1 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -11,4 +11,4 @@ EBUILD webapp-config-1.53-r2.ebuild 1690 BLAKE2B 07202fd26910ab49aeaeb12ccbacde1
 EBUILD webapp-config-1.54-r2.ebuild 1743 BLAKE2B 4fd352e2f29ba7289935662e424a9cbdc1e484b2021f027cb60c102aa790621535a8861e0a0f9dae07556ee303d1ffc109735c7e0db1beb2c7f0d0434ec04a55 SHA512 be5330d0ecd6d05d8a5a539baaffd1919079bbbf22eb508789ef306a0e9cdc513268a3ca19fde73ebc7182adff30b34813fe47d1226b8d66758fd6f2da8525d3
 EBUILD webapp-config-1.55-r1.ebuild 1749 BLAKE2B 858936e485482eae2d04f3baecc698aa4af9fa22027109e2cd930e16c0adea7621db2b0df21709b920b10a2207f53e8ff82276c05463bf65bc6075f1871f01ca SHA512 4bb2d185ac159bf870d32333d06cf31d5958c5692a983ae23b6fa6fcad2d358bf30ba4268942a9c5e04a9308b7ecb26b97df1d514a5fd6b10c229f8d4ac2aefb
 EBUILD webapp-config-9999.ebuild 1875 BLAKE2B 34626a203c536160711fdc2a90129c33d1223f1275dd5ab21564454c0ac50addb18a6688677936539f357a0fd56f1ec1f454090b43975c3d6b521d308e29bd31 SHA512 badc7e1f37c48da80e1550a8486fc537a644d06fdbaa5f598c2389c29383f096b109b7274827e1b99d23a4a0490761cbcea24e1d7fe2e170273676dc9cfa5b49
-MISC metadata.xml 661 BLAKE2B f82847c0e1fb4f92339258755eb15899b5f4ce6e0acbc8bfcc1dc428e9c76f335b40f8b878de5de009bf09dd7e4e7f119104b4fdac78179b8e2a5abe5d2f87f4 SHA512 bd5161502c6e93cef50b1206247f26920d011d87ca9b9d83217f30a2c29e67728262804d42b13eeb956b69432adbf27d9f42ca75b48a92b6335c9eac25a9976c
+MISC metadata.xml 549 BLAKE2B 44f2ec07f40387bd51440d500cacc4ff24cbb3d1ec2e1c9bec29119a589e4c4bb005723d861be2ab9c1929d74d209c10771de5500eedb56e44265969129201be SHA512 1c99c9b52ab10378a3716d3f6dd1d6f70f61ac6bcf0c8a934254b71376a429f601358ad1108292e03ab780bc6c53810fd8a484e42a4ad6f959fb1903ed591b7b
diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml
index bf2371089c83..67d2bc40c7e6 100644
--- a/app-admin/webapp-config/metadata.xml
+++ b/app-admin/webapp-config/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>twitch153@gentoo.org</email>
-		<name>Devan Franchini</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-04 08:53:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-04 08:53:53 +0100
commit	e3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree	9cb29a544215119b5c5538e37211b994ce1c87ae /app-admin
parent	480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)