gentoo resync : 18.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
commit: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree: 326613a08f25851c388715e205576a2e7d25dc4f /app-admin
parent: b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
92 files changed, 935 insertions, 5244 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 3c14ae3adebb..eef3c3ee02b3 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 3d7e03bf523e..a18d2632bdbe 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,12 +1,12 @@
-DIST ansible-2.7.11.tar.gz 11855636 BLAKE2B 3de8fa1287655f778b1d9036bf78a91387cf238209eb2bfd17ee79f7d77a2e03ae734901bdc04226d635b3d8543d122aaa251107befab8cc4a4fc63cfcd8deec SHA512 06f805a701f8284ac1a65251b9358cf6f27d420aabb1e29298f9e4d8aa73251bd4a8e8a3981f744b97b2f750fd3b594a9b505e5baa3ff2cb3aa7a37603ba48fa
 DIST ansible-2.7.12.tar.gz 11860944 BLAKE2B 52cc79a88bbff9dc009ead8ab9f9d299420ae060e211aab23fe3bbef8c8229cd9e526dc3df518a4285cc17c1448ab4892cc3059d70bfef2fd332a44c72b57019 SHA512 0ab68af8239f6d4d2a13bd38a09fe6f3c700231e7c83df0af77c70ea62faebd0d45e1ff316963c6c72931608d49a79b98e8d3ddc6f4c8b826aabe87dc71cc6f9
-DIST ansible-2.8.1.tar.gz 14299403 BLAKE2B defbe8fa8db7ab3325cf57df3bdfe901f53544b4c1b6460cefbfa9393acfe2a0e104f99468ad8e907d90d33842563bd7ab666d30f64572fd146c7ce46ff77048 SHA512 08be80584edfe28f11fe750735ade117deaf3a7c98fe15fb2fa0e3a5ed0c3f98cd126b60386e51d15ce275e8f1fc3eda0177bb56e0823b2f2b7702cc0e35be92
+DIST ansible-2.7.13.tar.gz 11861862 BLAKE2B 3123d84b9f45bb5e50a0d5db5d0b2ae10163e2818d30f29ad5a80c23979a347eb5e17806bd295df547b88a09191918443162cb25d7f339ae76df52e3960954b0 SHA512 8dc19e5c93a90d43ced6628699d2da42d522a020bb2cdd35ba73f6286998c605852c89250af8696e94aba0080b2fab12761a39c3e2eb86d39c212a198f970652
 DIST ansible-2.8.2.tar.gz 14328267 BLAKE2B 9548af73914b68374f71ab83e5a68e86e75b8ccf86066831699b147091d067a3f1e0b59d94b22b42151d90779f6d3bb39856a3d205862c933aec6bbe76824e22 SHA512 02cd8fd214f61041914abeebf2395f16acf370e110bdef0181689f604f06504902f9a05a2413877a31680528af539f078e2cd7b7f2eebe2389c9aa441b063305
 DIST ansible-2.8.3.tar.gz 14343746 BLAKE2B 3859d88d8462f7109ab23c169b4a91c7a03940b5a8aaff4bfc7ab430fb533898a44221dee18f481612abe1cce1270211a34c2bc1dc7603d89adeb11e50d2b242 SHA512 cee2c663577155269c4d762816590200224e87979411dc7486f5840783f23aaa688577a3f75e272c4875af30397bb383d11eaa7d122d5f304388d5b45ffb9b6f
-EBUILD ansible-2.7.11.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
-EBUILD ansible-2.7.12.ebuild 1637 BLAKE2B cafff348e72d7970fe6851e36c2cab55e18583dbd4ec2cf018a04ed2f7093e91c341c32458d334996f7779477409d47fce82477ab812e607ba1d9d624e6efc73 SHA512 b3760d5cefead4d7965b1d1dbbcf7fd41f2bbd2b8a4941fb02791832fd60c4b0c289ba34fbf945b8889a4b15b286e051634adb90296ff81e43a15f71cad66f47
-EBUILD ansible-2.8.1.ebuild 1661 BLAKE2B a9dfb3a4da7bd2f7519eff255ec9ec465ec68160724fe680426db756aaf5e3ffdffb6947faf200c83a4cab5e0ef5b11b71de530901273f2b382c062520fc9c02 SHA512 c564e5417b1181d49cae05eb7275133c1f5cb76a18b11fb679b6267186d5bd7bba62303481601aab47d4c2bc9cf6133311591a8933584033bb92f837483158c9
-EBUILD ansible-2.8.2.ebuild 1663 BLAKE2B 45885bbb6444622d27827ad2243ce05aa2062bdde7e545aea5617b1c3979c088ea4565e0ce07f9fda2e9bc14bb819aa89954d51bb3eb1a287acbec1da0792d54 SHA512 e679d5e32060071736fd555ef68d44d8ca28e44cdb8229f2c79019f5c05b36fc8d095b33ff5e651d89d9a07007401178024593b3f6e4ac055961a3eecdc36af6
-EBUILD ansible-2.8.3.ebuild 1663 BLAKE2B 45885bbb6444622d27827ad2243ce05aa2062bdde7e545aea5617b1c3979c088ea4565e0ce07f9fda2e9bc14bb819aa89954d51bb3eb1a287acbec1da0792d54 SHA512 e679d5e32060071736fd555ef68d44d8ca28e44cdb8229f2c79019f5c05b36fc8d095b33ff5e651d89d9a07007401178024593b3f6e4ac055961a3eecdc36af6
-EBUILD ansible-9999.ebuild 1654 BLAKE2B eb0aa61cfa0eab600a18d26cf8d7060be0f93cc0413a844ac5e6a9938010b52d77a0ef28a2b36b802e7e8deba33caf5c4f6659410c2d74b13a13f92d50c0106a SHA512 040e5403acec6a13ca5042a3840480c4993eff4beef319229bd761c3a46cb673473d9c0297be176a3806f4cc15b30586a8af5e7743778de36d19d16dc5512b79
+DIST ansible-2.8.4.tar.gz 14348300 BLAKE2B 8a9b5587411d2366a91643682c0ef82b0aa5b5cd5e6b882f3ffdfa100c4f3995472913bc12e1c2f7077efb69ec8ac3ad168a79fc3d8c127b34ce03c69588a4c7 SHA512 9efacbaf053acb8cf92ebe5bda982794ecbdbf55e33a4a292a68874b637eebe82406bfba129adf839354ee18aa809d45d77502f68b8e8d07358a48c9b5687b7e
+EBUILD ansible-2.7.12.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
+EBUILD ansible-2.7.13.ebuild 1637 BLAKE2B cafff348e72d7970fe6851e36c2cab55e18583dbd4ec2cf018a04ed2f7093e91c341c32458d334996f7779477409d47fce82477ab812e607ba1d9d624e6efc73 SHA512 b3760d5cefead4d7965b1d1dbbcf7fd41f2bbd2b8a4941fb02791832fd60c4b0c289ba34fbf945b8889a4b15b286e051634adb90296ff81e43a15f71cad66f47
+EBUILD ansible-2.8.2.ebuild 1661 BLAKE2B a9dfb3a4da7bd2f7519eff255ec9ec465ec68160724fe680426db756aaf5e3ffdffb6947faf200c83a4cab5e0ef5b11b71de530901273f2b382c062520fc9c02 SHA512 c564e5417b1181d49cae05eb7275133c1f5cb76a18b11fb679b6267186d5bd7bba62303481601aab47d4c2bc9cf6133311591a8933584033bb92f837483158c9
+EBUILD ansible-2.8.3.ebuild 1718 BLAKE2B 2172b4f68d252c34d587698dc6f53996e42c732c47d8feb0758c22f7ef53be4f32727a06a132b41aea49bad91eddf0e66a33601d8f012c1a20303bb5e4e4c60d SHA512 3ca93b366625caa875558aba79acc3849c9c73078720f2d22473f98ecb5407581443ea4fbb60491d05db2a8b42e1397283d8891fd779e77c8ee92c1712f31657
+EBUILD ansible-2.8.4.ebuild 1718 BLAKE2B 2172b4f68d252c34d587698dc6f53996e42c732c47d8feb0758c22f7ef53be4f32727a06a132b41aea49bad91eddf0e66a33601d8f012c1a20303bb5e4e4c60d SHA512 3ca93b366625caa875558aba79acc3849c9c73078720f2d22473f98ecb5407581443ea4fbb60491d05db2a8b42e1397283d8891fd779e77c8ee92c1712f31657
+EBUILD ansible-9999.ebuild 1757 BLAKE2B 647e72bcd7497648dbc96e5bab87e2a8fd5a2e2f47d407536c9a7785e534adef457a24106769dbe8a4cb121a95a63c2b5dc62ed5315ffca3c7f9b72594890611 SHA512 bc9414c6235bc3706ad95ec016b2632e4a3f46649fd066d981711b3a969d7fdcab303bd3bfbd33ac30e60889304ce032743ec0cad37897812f0e055a990d2c53
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.7.12.ebuild b/app-admin/ansible/ansible-2.7.12.ebuild
index 63e11740ae9c..028f77e10f7a 100644
--- a/app-admin/ansible/ansible-2.7.12.ebuild
+++ b/app-admin/ansible/ansible-2.7.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.7.11.ebuild b/app-admin/ansible/ansible-2.7.13.ebuild
index 028f77e10f7a..63e11740ae9c 100644
--- a/app-admin/ansible/ansible-2.7.11.ebuild
+++ b/app-admin/ansible/ansible-2.7.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.8.2.ebuild b/app-admin/ansible/ansible-2.8.2.ebuild
index e6b530db760c..7bb6843073cc 100644
--- a/app-admin/ansible/ansible-2.8.2.ebuild
+++ b/app-admin/ansible/ansible-2.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
diff --git a/app-admin/ansible/ansible-2.8.3.ebuild b/app-admin/ansible/ansible-2.8.3.ebuild
index e6b530db760c..851a6fa4e715 100644
--- a/app-admin/ansible/ansible-2.8.3.ebuild
+++ b/app-admin/ansible/ansible-2.8.3.ebuild
@@ -32,7 +32,10 @@ RDEPEND="
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+	)
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible/ansible-2.8.1.ebuild b/app-admin/ansible/ansible-2.8.4.ebuild
index 7bb6843073cc..851a6fa4e715 100644
--- a/app-admin/ansible/ansible-2.8.1.ebuild
+++ b/app-admin/ansible/ansible-2.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
 IUSE="doc test"
 RESTRICT="test"
 
@@ -32,7 +32,10 @@ RDEPEND="
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+	)
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 7d03f14a7d67..c35e90491f7c 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -33,7 +33,11 @@ RDEPEND="
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	)
 	test? (
 		${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index aa609f0acfd6..b29043c3a74a 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -2,6 +2,8 @@ AUX apache-tools-2.2.20-Makefile.patch 1573 BLAKE2B 56de28f38934b73740d68f6429f3
 AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
 DIST httpd-2.4.39.tar.bz2 7030539 BLAKE2B 1e378833efb9bbdd6fdc277a779620a08752d064524489f9ad747cf85350fbb6ad65f57b30c81d57273cd6693d8a2c4e988f5a2c42bd5c9c538b305b9b7719e8 SHA512 9742202040b3dc6344b301540f54b2d3f8e36898410d24206a7f8dcecb1bea7d7230fabc7256752724558af249facf64bffe2cf678b8f7cccb64076737abfda7
+DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
 EBUILD apache-tools-2.4.39.ebuild 2578 BLAKE2B 3567f7dc0cd337d498cfea3d950d8548fa515c7ae4f4fd03810e8ceec7e821f4673b119eadee5f568ef90a7aa5bb58e58b564ebef115e36bd7881dd2164d74ae SHA512 265e2abc71c36124c977bc79002b88d672e558f17537839d7de6bb158fc476c96fa5a615af2ce6a27b6dee6fbbb36a675840351525ec0f472bc0f87830326b1e
+EBUILD apache-tools-2.4.41.ebuild 2581 BLAKE2B ea1be0bc8b2fc27dbbf55bf5e710f3b0a77c9950b5a8a71e0041df1dfb8ddf1f820a88386bff9fa2ec71e0f24579380f0fed4b4a07cffbef27d9885ada7abf72 SHA512 2b8a3139d06a94815b9c637c3442ab9107ac7595131f92dbb597a66c4693d4de8d4e7ad9f92eddb8c76b64d291970ce4135702ee865cfd9881029b934fb37acc
 MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122
diff --git a/app-admin/apache-tools/apache-tools-2.4.41.ebuild b/app-admin/apache-tools/apache-tools-2.4.41.ebuild
new file mode 100644
index 000000000000..8efe334bf515
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.41.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic eutils multilib toolchain-funcs
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="https://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+IUSE="libressl ssl"
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/apr-1.5.0:1=
+	dev-libs/apr-util:1=
+	dev-libs/expat
+	dev-libs/libpcre
+	kernel_linux? ( sys-apps/util-linux )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
+)
+
+src_prepare() {
+	default
+
+	# This package really should upgrade to using pcre's .pc file.
+	cat <<-\EOF >"${T}"/pcre-config
+	#!/bin/bash
+	flags=()
+	for flag; do
+		if [[ ${flag} == "--version" ]]; then
+			flags+=( --modversion )
+		else
+			flags+=( "${flag}" )
+		fi
+	done
+	exec ${PKG_CONFIG} libpcre "${flags[@]}"
+	EOF
+	chmod a+x "${T}"/pcre-config || die
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	tc-export PKG_CONFIG
+
+	local myeconfargs=(
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
+		--sbindir="${EPREFIX}"/usr/sbin
+		--with-perl="${EPREFIX}"/usr/bin/perl
+		--with-expat="${EPREFIX}"/usr
+		--with-z="${EPREFIX}"/usr
+		--with-apr="${SYSROOT}${EPREFIX}"/usr
+		--with-apr-util="${SYSROOT}${EPREFIX}"/usr
+		--with-pcre="${T}"/pcre-config
+		$(use_enable ssl)
+		$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
+	)
+	# econf overwrites the stuff from config.layout.
+	ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+	econf "${myeconfargs[@]}"
+	sed -i \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk build/config_vars.mk || die
+}
+
+src_compile() {
+	emake -C support
+}
+
+src_install() {
+	emake -C support DESTDIR="${D}" install
+	dodoc CHANGES
+	doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${ED%/}"/usr/sbin >/dev/null || die
+	local i
+	for i in *; do
+		dosym ${i} /usr/sbin/${i}2
+	done
+	popd >/dev/null || die
+
+	# Provide a symlink for ab-ssl
+	if use ssl ; then
+		dosym ab /usr/bin/ab-ssl
+		dosym ab /usr/bin/ab2-ssl
+	fi
+}
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index cb9ca5c6ae34..f124f7f4390c 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,6 +1,4 @@
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
-DIST calamares-3.1.13.tar.gz 2279516 BLAKE2B ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df SHA512 451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a
-DIST calamares-3.2.2.tar.gz 2579462 BLAKE2B f477493451e084a287f43abfdd66d4a77ce839cad61f921801462bef73df74d42e616d63682d09d59309d6f98ffe560e6c8f9176c9fb290701dfb4e5aa263b29 SHA512 f060534941e0191defa65f024ec8dbbd275d16d40e491015997f12d3eb404a3117d1f113d4dcef3421ed0d15c1e24bdd8b31fc4554d313ebbd3959058c202e63
-EBUILD calamares-3.1.13.ebuild 1976 BLAKE2B ae7f3e5dad7c55e1cf9a1e558245614c48021d43a354d7cfbde9d7555eefdb66d617d4643f373315961c9451dcc6bfa4c04ac5e042300d6fe54827ab4616ce7d SHA512 34f996df1e4f2f7479eecca39cfbf3ee784f7e681bc8aaa6da904bb70d36eac088ec739eec6ba96570803d4f7d5d5587a556680fa964aadda6eaa776de02e480
-EBUILD calamares-3.2.2.ebuild 2188 BLAKE2B faf22c0f1f77779345778b693eea01edb5dfb28a3466b3393dda099e97c4e076924225c98bfa77a055cfeba312395f08b35eb21808161bf828c5bf658d378956 SHA512 9465e1540456e74042313b88a314757d7e6a0496ff6012818e601be11ad2f0c149c48870278c5ef8c06ac5218584e38798156061089189b20dfd1177becc1289
+DIST calamares-3.2.12.tar.gz 3008153 BLAKE2B 32b8a141346da528c2aef40a8fe480445cc8acbccc1190ca5ad1b5b0d03b59c709abd663e5ed33503955e3c0caa71476e7d737d46422992fc22e3acd96260857 SHA512 00dec40eb9c9e95933d3785a7b2ddc606530d8b94fde233d91071afbe11067d4e5b0a81298e66aaa0c65b55b6a86359466d8789f3ed886e76c2102b850f2bbc0
+EBUILD calamares-3.2.12.ebuild 2347 BLAKE2B 2408aa4e84a1e0b6b4d4b5b7ac97d9f59207094e89f1af14455df64c7c5c494519232f7f1d64d9ec4b4e62eb1bf26e7e4d8f44d570fa23bddc3aed5d89b5c55c SHA512 5d29dda4d3d44ec644695f986feb5bc39691ffcc64063c3bac9af4953cffb6e3547be688777d37ea62681b7da6c41242cc88659ca98375048f1c4c2defbbc461
 MISC metadata.xml 1055 BLAKE2B a6c7974103baa5a646cb1d594e3f224903df9ce5c618ad4ed46c0b3d4df5d3437be570eda0d55e3b0ca8f6df4af9627b088ace2a3f0efc802528aeb49fc7bce6 SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f
diff --git a/app-admin/calamares/calamares-3.1.13.ebuild b/app-admin/calamares/calamares-3.1.13.ebuild
deleted file mode 100644
index 9294153d0cc5..000000000000
--- a/app-admin/calamares/calamares-3.1.13.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io"
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	dev-cpp/yaml-cpp:=
-	>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-auth/polkit-qt[qt5(+)]
-	>=sys-libs/kpmcore-3.0.3:5=
-	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-	app-admin/sudo
-	dev-libs/libatasmart
-	net-misc/rsync
-	>=sys-block/parted-3.0
-	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
-	sys-boot/os-prober
-	sys-fs/squashfs-tools
-	virtual/udev
-	networkmanager? ( net-misc/networkmanager )
-	upower? ( sys-power/upower )
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_setup
-	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-	       PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-	       PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-	       PYTHON_LIBS="$(python_get_LIBS)"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWEBVIEW_FORCE_WEBKIT=OFF
-		-DWITH_PYTHONQT=$(usex pythonqt)
-	)
-
-	kde5_src_configure
-	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
-	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
-}
-
-src_install() {
-	kde5_src_install
-	dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git a/app-admin/calamares/calamares-3.2.2.ebuild b/app-admin/calamares/calamares-3.2.12.ebuild
index 39df940004c3..2b847131cb13 100644
--- a/app-admin/calamares/calamares-3.2.2.ebuild
+++ b/app-admin/calamares/calamares-3.2.12.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+KDE_TEST="true"
+PYTHON_COMPAT=( python3_{5,6} )
 inherit kde5 python-r1
 
 DESCRIPTION="Distribution-independent installer framework"
@@ -20,14 +21,17 @@ IUSE="+networkmanager pythonqt +upower"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${PYTHON_DEPS}
+BDEPEND="
+	$(add_qt_dep linguist-tools)
+"
+COMMON_DEPEND="${PYTHON_DEPS}
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep kpackage)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kservice)
-	$(add_qt_dep linguist-tools)
+	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
@@ -37,20 +41,21 @@ DEPEND="${PYTHON_DEPS}
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	dev-cpp/yaml-cpp:=
-	>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+	>=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
 	dev-libs/libpwquality[${PYTHON_USEDEP}]
 	sys-apps/dbus
 	sys-apps/dmidecode
 	sys-auth/polkit-qt[qt5(+)]
-	>=sys-libs/kpmcore-3.0.3:5=
+	>=sys-libs/kpmcore-4.0.0:5=
 	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
 "
-
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_qt_dep qttest) )
+"
+RDEPEND="${COMMON_DEPEND}
 	app-admin/sudo
 	dev-libs/libatasmart
 	net-misc/rsync
-	>=sys-block/parted-3.0
 	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
 	sys-boot/os-prober
 	sys-fs/squashfs-tools
@@ -67,17 +72,21 @@ src_prepare() {
 	       PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
 	       PYTHON_CFLAGS="$(python_get_CFLAGS)"\
 	       PYTHON_LIBS="$(python_get_LIBS)"
+
+	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
+		calamares.desktop || die
+	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
+		calamares.desktop || die
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DWEBVIEW_FORCE_WEBKIT=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
 		-DWITH_PYTHONQT=$(usex pythonqt)
 	)
 
 	kde5_src_configure
-	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
-	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
 }
 
 src_install() {
diff --git a/app-admin/cli53/Manifest b/app-admin/cli53/Manifest
index 7288e49c1d54..750144b04cfc 100644
--- a/app-admin/cli53/Manifest
+++ b/app-admin/cli53/Manifest
@@ -1,4 +1,4 @@
-DIST cli53-0.8.14.tar.gz 9263235 BLAKE2B 2df06c3de9372e5f3adb2fabdfa74525a880d41f9d28d356fda291baf576525b42ea3e42f354b9dd91b063485752d936710823d5a5c777cc1a4972dcdd382140 SHA512 b2e97ffea855ad1ac06ceb76b5cdffcd890d237a67abb0f3e9be035ca4438af0b0ccdfd86e7dc7e485ebd5ee12783c6e24c818757c29e80c8c4d6b67ed9f77cf
-EBUILD cli53-0.8.14.ebuild 670 BLAKE2B ed344931c1d9fe73415e9d20ba2ba7d5a305de1275bb4be8e12a4c1de822b134847381bca90ca4db115db7c38f057c42c65d4639191d076414e7059f14b7d8de SHA512 01ab31c86c3847fde8b04eaeec28e536edf6fd12deb21c4851438b3290ec21e148ad68e5748383e5723797f78dd79379578c64ff70add428f5f255996e80b9c9
+DIST cli53-0.8.15.tar.gz 9263514 BLAKE2B 9fd9342510146119e5b566f92a13d65fed3fec27017607e690c9fa14f7751e16cd2ee87e1d22f6c062257e6ed6e998d574a754af4ae5206bc128c24d72edb904 SHA512 849e7f1e868591e23b1a834b49afad08681ca367bce163bb2382c775eeb79a7db4d6212ad3140ba69b8d4a13fcf53a31f7d5f061e7f68cba1a933e35e7562e2d
+EBUILD cli53-0.8.15.ebuild 670 BLAKE2B ed344931c1d9fe73415e9d20ba2ba7d5a305de1275bb4be8e12a4c1de822b134847381bca90ca4db115db7c38f057c42c65d4639191d076414e7059f14b7d8de SHA512 01ab31c86c3847fde8b04eaeec28e536edf6fd12deb21c4851438b3290ec21e148ad68e5748383e5723797f78dd79379578c64ff70add428f5f255996e80b9c9
 EBUILD cli53-9999.ebuild 670 BLAKE2B ed344931c1d9fe73415e9d20ba2ba7d5a305de1275bb4be8e12a4c1de822b134847381bca90ca4db115db7c38f057c42c65d4639191d076414e7059f14b7d8de SHA512 01ab31c86c3847fde8b04eaeec28e536edf6fd12deb21c4851438b3290ec21e148ad68e5748383e5723797f78dd79379578c64ff70add428f5f255996e80b9c9
 MISC metadata.xml 325 BLAKE2B 30e300a3cb064a2eaf04123f7e2943924e91515325d5b30c2a7aa2cc58b69f73ffb92c7da37a87eaf4e0925374234c7d6e1ea56634702879a8286b295fe64b74 SHA512 febb62ce8c56413c541726fdf6c61942a075b7c21d52ca24bb519fea2a271abc9034cc283f300fbf0458f73c6e5a4729308a3676899d0e5d3915d45939e88ad6
diff --git a/app-admin/cli53/cli53-0.8.14.ebuild b/app-admin/cli53/cli53-0.8.15.ebuild
index 437a0b2c9da1..437a0b2c9da1 100644
--- a/app-admin/cli53/cli53-0.8.14.ebuild
+++ b/app-admin/cli53/cli53-0.8.15.ebuild
diff --git a/app-admin/clsync/Manifest b/app-admin/clsync/Manifest
index 5d7ba8acebe0..0aada9a56277 100644
--- a/app-admin/clsync/Manifest
+++ b/app-admin/clsync/Manifest
@@ -2,5 +2,5 @@ AUX clsync.conf 589 BLAKE2B fb7736b0972c91916770c6cfca693267bdf0cb3f6ad540388967
 AUX clsync.confd 645 BLAKE2B f2e2f70f5a88ea3a416f4151637d63f79cce483b499ee0c1b5005ef8e9d16558f0d1c23ddd182335f7e963172bafaf4b41a37c1288f7fe55e7a57e2868418ae1 SHA512 75dcc49d51f6da94d42eb501f1ad2868f163405dd7aa933f4c8078ec18f5b54eb6c66ff796ee744f7751699162627af843edbe5de5adf99c23712cedaebaddc5
 AUX clsync.initd 555 BLAKE2B 18b3f0e1e8e079eb306709d2b55b99100ce3efa852f285d7ac9acd4269fe41e0fe5d1b7c12fa966dc01f60a598d6178cf5c8b6a2cd21410bdcf0f66c1facf1d2 SHA512 a5ee987466dec0e8ca7ce2502bd71d000419e03f33e1585e47fa5d91fdb5321f949f3d3ca566e68a0aedcc50ab6a84a92210aa866520d1703805958a2bfa270a
 DIST clsync-0.4.2.tar.gz 256042 BLAKE2B 28474fc66341b93705a502fcff390e3affcd89a9e1eb272dce9b28be709562e09c03e9c300cfeb5371e2e618a2239468a58c46212a39d751fbbfddeaab12bcf6 SHA512 d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200
-EBUILD clsync-0.4.2.ebuild 2791 BLAKE2B 120160db12c85a65bc7e3dc646a4bc12d74ae9f596d57f749881d987c7626bb3d21aa9e789a6e920fef2d897570f8064601c629d30b673eec231ca95cc2d885e SHA512 fd60dc4d3828c76a68d330cd79dd96233b4915809d1f6a2d9ab5113f82e6a6cb17c4c18bfea86b51bcf8a534adb914a00c8fd2371148a610c16465e35b36ac8a
+EBUILD clsync-0.4.2.ebuild 2774 BLAKE2B c7e59a66c0228f9ecf94b442eb0f141849925e15827cda9a2e0946ae761dbfbddb2aa300524aab3a6fc85e9807378c6a207b648c2ef0377caa5ba398b3fedbf8 SHA512 c80cf6048dff40e50db099f1898a10451771015e2ba89cf8d5f0e16e3031c34e32095b9ca1a625d2b09991c8a937f7e283d7d207a463db52992e6a9c5989c913
 MISC metadata.xml 1757 BLAKE2B e907cb32524743bc5571eddc4d0c7a30b51b82f49f72405939110e3085a8561b55e5927950be83ae3a647418479183aeae8491092ba8e5432a7633365f769e2a SHA512 6f853983a4886bbacb2fe1e26b728ba5d86b05f348b6df2cf0779725ef11623f73274829605b88aacd4300b4cb28ff6fbeead916c8dd01f4a07c9780218f1bfa
diff --git a/app-admin/clsync/clsync-0.4.2.ebuild b/app-admin/clsync/clsync-0.4.2.ebuild
index dc27fddf71f5..ed88b00512a1 100644
--- a/app-admin/clsync/clsync-0.4.2.ebuild
+++ b/app-admin/clsync/clsync-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -84,9 +84,9 @@ src_install() {
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 
 	# filter rules and sync scripts are supposed to be here
-	keepdir "${EPREFIX}/etc/${PN}"
-	insinto "/etc/${PN}"
+	insinto /etc/${PN}
 	newins "${FILESDIR}/${PN}.conf" "${PN}.conf"
+	keepdir /etc/${PN}
 }
 
 pkg_postinst() {
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 5ac7ee865985..bc7ab071d9ea 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -3,7 +3,9 @@ AUX conky-1.10.8-portmon.patch 551 BLAKE2B 6b69ebb6c8ec194e51d616f487ab8d7360626
 AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
 DIST conky-1.11.4.tar.gz 2400814 BLAKE2B ad12ade96de5ed3575eba3d8a6e06cb8d30ed686e002f36c3a52a1d4351379546bcea2237792929de36d8c0c402eda977a8c0b5b36a0878fe001056d8d2c34b7 SHA512 191ffe4a50a8876a658163c83a45f722f07ca6a0b86ea3ebad369d58f4c2bb798e8afaef6c0643bcca90de546a7f3de4acf9d2e4b4a2b6366bf42de0ccaade3d
+DIST conky-1.11.5.tar.gz 2400965 BLAKE2B 06b6817ed3cb4bb638b5fa7f9a5f8544c9d274560dbef2bc8f8c10ed681b83d0ab27988f60bed70cd0c13cd4947a2bd9b70ad66c38dbb6f516f5d57165ef5765 SHA512 71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be
 EBUILD conky-1.10.8-r4.ebuild 4721 BLAKE2B d9c89dffa7d58e01261168329bf3ff262b0fea01d319b7e00da36d9a912198ca197e8895dd1e267fdd33e650cd52ac0857ccd7e0e30c79ebeb38fed05f181c1b SHA512 8d938d25188f1d16b088ec5b248ace639e52f23380a11ce725bb20ecf4417ab650f5699510d6229beb48c699763ab0ba9fc43cb9cfdb6c7b4081be3fa9ef6dbc
 EBUILD conky-1.10.8-r8.ebuild 4772 BLAKE2B b8b7eb6a6dc3e381890663337613fa334d301bbf5192ad4d42b6f6fcdcd80971f6453f444f70e6da354cb745567a78f92d320de5deb87745e1e2b0ed9087d5f7 SHA512 c7771bf49e134d9a50c94df85f136814aa96507117812c99b05effa86d28be800479c04f5f6a4659f73ec03b374de7bae0ed1a12c216b3c5fcf7841153d1b023
 EBUILD conky-1.11.4.ebuild 4648 BLAKE2B d4f51731070dfdb03e7d1ba3772e60140c1c47cb4cdaf5d74e52bfecf6f4a5f00dfd1a9f98696a06f36c5c8053789e3b7f043939374e1b0c15a083cd054aae63 SHA512 05e8520a2545c16291024397600abb550e83407191001aaacfbcec499db585b0cff4f0728e87cd6ae3020211331001ef896a5ed7bdd31042d0bc984c8083a9de
+EBUILD conky-1.11.5.ebuild 4648 BLAKE2B d4f51731070dfdb03e7d1ba3772e60140c1c47cb4cdaf5d74e52bfecf6f4a5f00dfd1a9f98696a06f36c5c8053789e3b7f043939374e1b0c15a083cd054aae63 SHA512 05e8520a2545c16291024397600abb550e83407191001aaacfbcec499db585b0cff4f0728e87cd6ae3020211331001ef896a5ed7bdd31042d0bc984c8083a9de
 MISC metadata.xml 2469 BLAKE2B 15947c03593a9d5215a9c1dd142458aeb84f61c77a669bbfa4abe256c94e28650516a0226350323f56bbc225c5edc5e9b9e3310d7957e072b6701e77e40623ce SHA512 75e2d5bd8f4848779c03fd983d995d8216f4bc35ca1d3af47cf004d1d43e36c2924523d286e13ea82c720a51a63d91e03af795e6c31471af71716b4c5ce46c4e
diff --git a/app-admin/conky/conky-1.11.5.ebuild b/app-admin/conky/conky-1.11.5.ebuild
new file mode 100644
index 000000000000..a52ce080d2f9
--- /dev/null
+++ b/app-admin/conky/conky-1.11.5.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils linux-info readme.gentoo-r1 xdg
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats
+	ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
+	ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
+	vim-syntax weather-metar webserver wifi X xmms2"
+
+COMMON_DEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+		x11-libs/libXfixes
+		x11-libs/libXext
+	)
+	cmus? ( media-sound/cmus )
+	curl? ( net-misc/curl )
+	ical? ( dev-libs/libical:= )
+	iconv? ( virtual/libiconv )
+	imlib? ( media-libs/imlib2[X] )
+	irc? ( net-libs/libircclient )
+	lua-cairo? ( x11-libs/cairo[X] )
+	lua-imlib? ( media-libs/imlib2[X] )
+	lua-rsvg? ( gnome-base/librsvg )
+	mysql? ( dev-db/mysql-connector-c )
+	ncurses? ( sys-libs/ncurses:= )
+	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	pulseaudio? ( media-sound/pulseaudio )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+	systemd? ( sys-apps/systemd )
+	truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+	wifi? ( net-wireless/wireless-tools )
+	weather-metar? ( net-misc/curl )
+	webserver? ( net-libs/libmicrohttpd )
+	xmms2? ( media-sound/xmms2 )
+	|| ( dev-lang/lua:5.3 dev-lang/lua:5.2 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	nano-syntax? ( app-editors/nano )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	doc? ( app-text/docbook2X dev-libs/libxslt )
+"
+
+REQUIRED_USE="
+	imlib? ( X )
+	nvidia? ( X )
+	truetype? ( X )
+	lua-cairo? ( X  bundled-toluapp )
+	lua-imlib? ( X  bundled-toluapp )
+	lua-rsvg? ( X  bundled-toluapp )
+"
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README.md AUTHORS )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
+To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf
+and edit it to your liking.
+
+There are pretty html docs available at the conky homepage
+or in ${ROOT}/usr/share/doc/${PF}/html when built with USE=doc.
+
+Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+
+pkg_setup() {
+	use ipv6 && linux-info_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	xdg_environment_reset
+
+	sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
+		cmake/ConkyPlatformChecks.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs
+
+	if use X; then
+		mycmakeargs=(
+			-DBUILD_ARGB=ON
+			-DBUILD_X11=ON
+			-DBUILD_XDAMAGE=ON
+			-DBUILD_XDBE=ON
+			-DBUILD_XINERAMA=ON
+			-DBUILD_XSHAPE=ON
+			-DOWN_WINDOW=ON
+		)
+	else
+		mycmakeargs=(
+			-DBUILD_X11=OFF
+		)
+	fi
+
+	mycmakeargs+=(
+		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_AUDACIOUS=OFF
+		-DBUILD_BUILTIN_CONFIG=ON
+		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_CURL=$(usex curl)
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_HDDTEMP=$(usex hddtemp)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_I18N=ON
+		-DBUILD_IBM=$(usex thinkpad)
+		-DBUILD_ICAL=$(usex ical)
+		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IMLIB2=$(usex imlib)
+		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_IPV6=$(usex ipv6)
+		-DBUILD_IRC=$(usex irc)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
+		-DBUILD_MATH=$(usex math)
+		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MPD=$(usex mpd)
+		-DBUILD_MYSQL=$(usex mysql)
+		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_NVIDIA=$(usex nvidia)
+		-DBUILD_OLD_CONFIG=ON
+		-DBUILD_PORT_MONITORS=$(usex portmon)
+		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_RSS=$(usex rss)
+		-DBUILD_WEATHER_METAR=$(usex weather-metar)
+		-DBUILD_WLAN=$(usex wifi)
+		-DBUILD_XFT=$(usex truetype)
+		-DBUILD_XMMS2=$(usex xmms2)
+		-DDOC_PATH=/usr/share/doc/${PF}
+		-DMAINTAINER_MODE=OFF
+		-DRELEASE=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/conkyrc.vim
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano/
+		doins "${S}"/extras/nano/conky.nanorc
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	xdg_pkg_postinst
+}
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 3abc16694e41..f89bc9a52a71 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -8,6 +8,7 @@ AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bd
 DIST gkrellm-2.3.10.tar.bz2 782794 BLAKE2B c0aac7df866d40c79667551ca4b25346da4267a0aad8853776425a08097dcfe3a24082e7e5d17db6d3936b59d10c29afa11e8a425319c19696141c02f7d95f25 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
 EBUILD gkrellm-2.3.10-r2.ebuild 3276 BLAKE2B 621c5b2210a1dae150216d1e2f75ba537ac9dea5e22db9fb2722e642f6f8c05b8611b4a572567b88d5e75e3446d270a367ba1b61d2c04d50624c109186c96e6f SHA512 2391488443ac81a5024e3bddb7097b5819c703545f3146519fd572be76f3bd161c5a83f7879cedc6ef3cdbc971db94d8ad2f693d4c69f5486321254973cf34d9
+EBUILD gkrellm-2.3.11-r1.ebuild 3350 BLAKE2B b74f6c06cc63015c7a0d13dae0b884fe863fad7643f08ec629696ef484c73a509cde929374b6c84c77d9733a80addc33191efda805ec8d72daf580e75b91a60c SHA512 ab55d3b94fa2a95911a43dd6d6bd66e148dd0e0e02f515b28e16f7f1dfedaa3c63d856d337993d4a5b7c1fa4b0300bf98f66b66f88f1bd75329f49a4e3dc5fa2
 EBUILD gkrellm-2.3.11.ebuild 3390 BLAKE2B bc12fdade844680c79dd3212081ee9bff5b6a8f270f6320dd1f96c939b97e9daeb4f955f66aa1f48f5f00d13ceef9a06c61685f64baca9bcee99dbf8a50ad0fa SHA512 65b89fadf2bc0ccc50f27fd70040096d14c460f90c8461198653ac37509977ed68155c48f19adc56249a47fd14ba27610b9b92b6d925ba5e9d18275a2a1699e3
-EBUILD gkrellm-9999.ebuild 3390 BLAKE2B bc12fdade844680c79dd3212081ee9bff5b6a8f270f6320dd1f96c939b97e9daeb4f955f66aa1f48f5f00d13ceef9a06c61685f64baca9bcee99dbf8a50ad0fa SHA512 65b89fadf2bc0ccc50f27fd70040096d14c460f90c8461198653ac37509977ed68155c48f19adc56249a47fd14ba27610b9b92b6d925ba5e9d18275a2a1699e3
+EBUILD gkrellm-9999.ebuild 3350 BLAKE2B b74f6c06cc63015c7a0d13dae0b884fe863fad7643f08ec629696ef484c73a509cde929374b6c84c77d9733a80addc33191efda805ec8d72daf580e75b91a60c SHA512 ab55d3b94fa2a95911a43dd6d6bd66e148dd0e0e02f515b28e16f7f1dfedaa3c63d856d337993d4a5b7c1fa4b0300bf98f66b66f88f1bd75329f49a4e3dc5fa2
 MISC metadata.xml 917 BLAKE2B 34cca38c9abfdd920abe9bf75e8569d652f3575e3c9f81e40f90255464021cb9f1768f742f30a8e6469a9e74342231380b9bc465a95ee1963e03d87238725e86 SHA512 8896a7f487c9089202c78589eb62c47f1705d41000a562b40a08eea660d0fe4fec422026329dedb4a33bd0dd63da5249e8dfd03590cadcf7088c0b31d55a34af
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
new file mode 100644
index 000000000000..c54518d26368
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multilib systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Single process stack of various system monitors"
+HOMEPAGE="http://www.gkrellm.net/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.srcbox.net/gkrellm"
+else
+	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-3"
+SLOT="2"
+IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+
+RDEPEND="
+	acct-group/gkrellmd
+	acct-user/gkrellmd
+	dev-libs/glib:2
+	hddtemp? ( app-admin/hddtemp )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	lm_sensors? ( sys-apps/lm_sensors:= )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	X? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/pango
+		)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.5-config.patch
+	"${FILESDIR}"/${PN}-2.3.5-width.patch
+	"${FILESDIR}"/${PN}-2.3.5-sansfont.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog CREDITS README )
+
+pkg_pretend() {
+	if use gnutls && ! use ssl ; then
+		ewarn "You have enabled the \"gnutls\" USE flag but not the \"ssl\" USE flag."
+		ewarn "No ssl backend will be built!"
+	fi
+}
+
+pkg_setup() {
+	TARGET=
+	use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+	sed -e 's:-O2 ::' \
+		-e 's:override CC:CFLAGS:' \
+		-e 's:-L/usr/X11R6/lib::' \
+		-i */Makefile || die "sed Makefile(s) failed"
+
+	sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+		-e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+		-i src/${PN}.h || die "sed ${PN}.h failed"
+
+	default
+}
+
+src_compile() {
+	if use X ; then
+		emake \
+			${TARGET} \
+			CC="$(tc-getCC)" \
+			STRIP="" \
+			INSTALLROOT="${EPREFIX}/usr" \
+			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+			LOCALEDIR="${EPREFIX}/usr/share/locale" \
+			$(usex nls "" "enable_nls=0") \
+			$(usex lm_sensors "" "without-libsensors=yes") \
+			$(usex ntlm "" "without-ntlm=yes") \
+			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
+	else
+		cd server || die
+		emake \
+			${TARGET} \
+			CC="$(tc-getCC)" \
+			LINK_FLAGS="$LDFLAGS -Wl,-E" \
+			STRIP="" \
+			$(usex nls "" "enable_nls=0") \
+			$(usex lm_sensors "" "without-libsensors=yes")
+	fi
+}
+
+src_install() {
+	if use X ; then
+		emake \
+			install${TARGET:+_}${TARGET} \
+			$(usex nls "" "enable_nls=0") \
+			STRIP="" \
+			INSTALLDIR="${ED}/usr/bin" \
+			INCLUDEDIR="${ED}/usr/include" \
+			LOCALEDIR="${ED}/usr/share/locale" \
+			PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+			MANDIR="${ED}/usr/share/man/man1"
+
+		docinto html
+		dodoc *.html
+
+		newicon src/icon.xpm ${PN}.xpm
+		make_desktop_entry ${PN} GKrellM ${PN}
+	else
+		dobin server/gkrellmd
+
+		insinto /usr/include/gkrellm2
+		doins server/gkrellmd.h
+		doins shared/log.h
+	fi
+
+	newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+	systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+	insinto /etc
+	doins server/gkrellmd.conf
+
+	einstalldocs
+}
diff --git a/app-admin/gkrellm/gkrellm-9999.ebuild b/app-admin/gkrellm/gkrellm-9999.ebuild
index d205ffcda8a5..c54518d26368 100644
--- a/app-admin/gkrellm/gkrellm-9999.ebuild
+++ b/app-admin/gkrellm/gkrellm-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop multilib user systemd toolchain-funcs
+inherit desktop multilib systemd toolchain-funcs
 
 MY_P="${P/_/-}"
 
@@ -21,6 +21,8 @@ SLOT="2"
 IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
+	acct-group/gkrellmd
+	acct-user/gkrellmd
 	dev-libs/glib:2
 	hddtemp? ( app-admin/hddtemp )
 	ssl? (
@@ -143,8 +145,3 @@ src_install() {
 
 	einstalldocs
 }
-
-pkg_preinst() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
-}
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index cfc81651e57a..c335ad1e20bd 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -98,10 +98,6 @@ DIST github.com-spf13-cobra-fe5e611709b0c57fa4a89136deaa8e1d4004d053.tar.gz 1025
 DIST github.com-spf13-pflag-298182f68c66c05229eb03ac171abe6e309ee79a.tar.gz 46092 BLAKE2B b1e4bbebcdfd2bed394e0b1e93f47951c29a8b6c4b9e5435c73b34f18648ca8ac6d51e6c664dc41310f0b953c4f4d2cded88f43a27312f42d394e7e699cfb8ff SHA512 1e1ca10d2d42aacbf0da8d62dd786c024c86054212e1531ea7bbebe7ead1aa9e47646ec19d8895b6d3914da8b98dffad17fdb207bb917a9e19c9d777b9de6c96
 DIST github.com-square-go-jose-89060dee6a84df9a4dae49f676f0c755037834f1.tar.gz 289746 BLAKE2B cff786ac7a6c39829ffd4d7b7f0fac3893b7c469ca35f008558ca3a7dbfc376fd0166c8ed7becc73d0f8d67b456ca00104f08c8841ff156a9c1f9a6d68d3b25f SHA512 fac5e8d32f93f252b2e64d60f2e4da65a11e9408ac4db0afdb3f2357a814cb3992ade307bc8bec8799703c0cb63d05f7d4eaa19e13bab6402b50c1cd246bc50e
 DIST github.com-technosophos-moniker-a5dbd03a2245d554160e3ae6bfdcf969fe58b431.tar.gz 7860 BLAKE2B 947a33bd0363cfa5333e4e41b59c8c758fab173bb9e0eef5560caca74f4321041ca69f6c2c5fe02ab36c8946038866033d8df9b7f9ed36be9f3fb1eff6dad182 SHA512 8b372ceba1a16acc8553c74d4872b042ca352d4128abc1e9f4aeb90f8489b7871d7fa7f97a6c4e8f472779d3a082f00e6d2ea30048a7b1bf4eb07fb544e45613
-DIST helm-2.14.1.tar.gz 1239597 BLAKE2B 349f57163c9e1cebc61e5a717c08d5bfc0fc549c98f47e9e942ae4db80e5f5d231e9a47e910dfbe126c3e65f63ac71de18ee9271bbe4ac6398efc4eaf49ad787 SHA512 4dd94c965ff5a28332fe68f397419e586253cd3e74131645566e1f4db0290906e4a49707d7cf53fd05d63953b23b6bc2eae86dc311a2758ebc4e60b54558cff4
-DIST helm-2.14.2.tar.gz 1241660 BLAKE2B 6c29bd606c8628b4ec581704ea5f6e062428886e19c5c3ad688364369a5085322bd3685375801d27ce1c087af0c318c25bcc49ba9d3b46d9757c8345dfd62537 SHA512 ef742407f1fedc95dccab17d2c7cee3e96eb309f782b65e4f74a221b0bd51e93eaaddf0ce6fa008d97bf90e1a91fbc2dc5a9a80ad49b03f731e9a624ab536169
 DIST helm-2.14.3.tar.gz 1242779 BLAKE2B 8c16da15b54974b837397784734fa8bcf53240d075261a7dceecc6fb6cd172d72ba0d060d55001a87b5910b1b715646729b10e689ee6a1602aa26a4bf56013a7 SHA512 80f6c437235ca0d0c8f330135d689d2d5a9414d166717f72d8c3e2952c35f33fe621579e221078e65e2c5cc648e44ef037356b7ac18bce985daf642493ec4297
-EBUILD helm-2.14.1.ebuild 9531 BLAKE2B d29b86b461e47b6edfdebd759eea24b117469d983b9b3cb82172948083cefe3cbaa681ac3cec80a0d88edf29de82d33b95a63ebc38ad5e19b8b5b5a0be07ea6d SHA512 8f6ffa09ee52edc13e17c5eab351cd487d843fd7136480eef82bec8708940009bdc8b529df0ce0418405448aacfc5efabc3afac9d3d193a1a2d6b6f32b2f74d7
-EBUILD helm-2.14.2.ebuild 9532 BLAKE2B b9d0f9eeb6c78f842f048bbf544e524393d0c46edb197d6d95414b706a548a13259b5d254be97d33968a7c342c677d661ad9ea0ffb4f7c24925ebb1663106a25 SHA512 e7ecbe436f5d0261bda7021a7cc3e7ce4761394c2d99bfc8e4a5bd523abb264e4bc74b03d32f20bf80142eaedfbcd967fdd7871ccdc9e01de0b33fae1cc87d9e
-EBUILD helm-2.14.3.ebuild 9532 BLAKE2B 7f5b9a35d5b48f5ea74862dfbec5dfcf02030d7a1eae45623bc6aa5f0c1d06a9a71435adacee7f29e5328a1d5ab8fe44a68be2a2c5688f9e13c5d14ce9b709c9 SHA512 c06ae015fba06aff3d0dc7517da0ed17ee0518a7e4f3ff37276e687c9e17f44110f2013dead95a86557793b97ab97a79d38fd0b7d4a0e6c541cfaffaed59a774
+EBUILD helm-2.14.3.ebuild 9531 BLAKE2B ed454f1b092dfee9a4f160f769bf909d67c03f68f997d544cd88ff8851f860c47a85635931b6a24420fbb73fd5209ca1755d4cf3f1110ae60e3a72525408e4d5 SHA512 aa53e762ebc4747d231e9fb5383a985b53182e98416a4a154dcd3ed98cb0d389e154fc93117d2e4d2ffb8a42025c94c4008675e13dc914d9e4c2d4c5bf19fe5f
 MISC metadata.xml 325 BLAKE2B 2c14b657183fbfb11e64b4e00d5fe758cc449191f675b9359c940f2098446a08310bae27d291e268e8ee22cf6a0435ae2065f1e50d961bbd16804890bcbab5c0 SHA512 7021bdc2264f99d038b05085afcb1de80bd03e705e4c286dc81e0aa486507ceeef102340d2c49b74c2b7aff87c7ae7bc96caf4ab0677f9dc22156b7faad0fce4
diff --git a/app-admin/helm/helm-2.14.1.ebuild b/app-admin/helm/helm-2.14.1.ebuild
deleted file mode 100644
index 094c689bda90..000000000000
--- a/app-admin/helm/helm-2.14.1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="k8s.io/helm"
-
-MY_PV=${PV/_rc/-rc.}
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
-"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
-"github.com/Azure/go-autorest ea233b6412b0421a65dc6160e16c893364664a95"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
-"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
-"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
-"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
-"github.com/docker/docker a9fbbdc8dd8794b20af358382ab780559bca589d"
-"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
-"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135"
-"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
-"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
-"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577"
-"github.com/go-openapi/jsonpointer ef5f0afec364d3b9396b7b77b43dbe26bf1f8004"
-"github.com/go-openapi/jsonreference 8483a886a90412cd6858df4ea3483dce9c8e35a3"
-"github.com/go-openapi/spec 5bae59e25b21498baea7f9d46e9c147ec106a42e"
-"github.com/go-openapi/swag 5899d5c5e619fda5fa86e14795a835f473ca284c"
-"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
-"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
-"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 24818f796faf91cd76ec7bddd72458fbced7a6c1"
-"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud c818fa66e4c88b30db28038fe3f18f2f4a0db9a8"
-"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
-"github.com/hashicorp/golang-lru 20f1fb78b0740ba8c3cb143a61e86ba5c8669768"
-"github.com/huandu/xstrings f02667b379e2fb5916c3cda2cf31e0eb885d79f8"
-"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
-"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-"github.com/jmoiron/sqlx d161d7a76b5661016ad0b085869f77fd410f3e6a"
-"github.com/json-iterator/go ab8a2e0c74be9d3be70b3184d9acc634935ded82"
-"github.com/liggitt/tabwriter 89fcab3d43de07060e4fd4c1547430ed57e87f24"
-"github.com/lib/pq 88edab0803230a3898347e77b474f8c1820a1f20"
-"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
-"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
-"github.com/Masterminds/goutils 41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"
-"github.com/Masterminds/semver c7af12943936e8c39859482e61f0574c2fd7fc75"
-"github.com/Masterminds/sprig 9f8fceff796fb9f4e992cd2bece016be0121ab74"
-"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
-"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
-"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
-"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
-"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
-"github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
-"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
-"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
-"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-"github.com/prometheus/common cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
-"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/rubenv/sql-migrate 1007f53448d75fe14190968f5de4d95ed63ebb83"
-"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
-"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
-"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
-"github.com/spf13/cobra fe5e611709b0c57fa4a89136deaa8e1d4004d053"
-"github.com/spf13/pflag 298182f68c66c05229eb03ac171abe6e309ee79a"
-"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
-"golang.org/x/crypto de0752318171da717af4ce24d0a2e8626afaeb11 github.com/golang/crypto"
-"golang.org/x/net 65e2d4e15006aab9813ff8769e768bbf4bb667a0 github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
-"golang.org/x/sys b90733256f2e882e81d52f9126de08df5615afd9 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 a02b0774206b209466313a0b525d2c738fe407eb github.com/grpc/grpc-go"
-"gopkg.in/gorp.v1 6a667da9c028871f98598d85413e3fc4c6daa52e github.com/go-gorp/gorp"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/square/go-jose.v2 89060dee6a84df9a4dae49f676f0c755037834f1 github.com/square/go-jose"
-"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml"
-"k8s.io/api 6e4e0e4f393bf5e8bbff570acd13217aa5a770cd github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver 727a075fdec8319bf095330e344b3ccc668abc73 github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery 6a84e37a896db9780c75367af8d2ed2bb944022e github.com/kubernetes/apimachinery"
-"k8s.io/apiserver 1ec86e4da56ce0573788fc12bb3a5530600c0e5d github.com/kubernetes/apiserver"
-"k8s.io/client-go 1a26190bd76a9017e289958b9fba936430aa3704 github.com/kubernetes/client-go"
-"k8s.io/cli-runtime d644b00f3b79346b7627329269bb25f2135f941c github.com/kubernetes/cli-runtime"
-"k8s.io/cloud-provider 9c9d72d1bf90eb62005f5112f3eea019b272c44b github.com/kubernetes/cloud-provider"
-"k8s.io/klog 8e90cee79f823779174776412c13478955131846 github.com/kubernetes/klog"
-"k8s.io/kube-openapi b3a7cee44a305be0a69e1b9ac03018307287e1b0 github.com/kubernetes/kube-openapi"
-"k8s.io/kubernetes b7394102d6ef778017f2ca4046abbaa23b88c290 github.com/kubernetes/kubernetes"
-"k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c github.com/kubernetes/utils"
-"sigs.k8s.io/kustomize a6f65144121d1955266b0cd836ce954c04122dc8 github.com/kubernetes-sigs/kustomize"
-"sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 github.com/kubernetes-sigs/yaml"
-"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-GIT_COMMIT="5270352a09c7e8b6e8c9593002a73535276507c0"
-
-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=""
-
-DEPEND=">=dev-lang/go-1.12"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
-		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
-		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
-		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
-
-	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
-	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
-	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
-	popd || die
-	bin/${PN} completion bash > ${PN}.bash || die
-	bin/${PN} completion zsh > ${PN}.zsh || die
-}
-
-src_install() {
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dobin bin/${PN} bin/tiller
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/app-admin/helm/helm-2.14.2.ebuild b/app-admin/helm/helm-2.14.2.ebuild
deleted file mode 100644
index c521271d6a86..000000000000
--- a/app-admin/helm/helm-2.14.2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="k8s.io/helm"
-
-MY_PV=${PV/_rc/-rc.}
-
-EGO_VENDOR=(
-"cloud.google.com/go 3b1ae45394a234c385be014e9a488f2bb6eef821 github.com/GoogleCloudPlatform/gcloud-golang"
-"github.com/asaskevich/govalidator 7664702784775e51966f0885f5cd27435916517b"
-"github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109"
-"github.com/Azure/go-autorest ea233b6412b0421a65dc6160e16c893364664a95"
-"github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4"
-"github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
-"github.com/chai2010/gettext-go c6fed771bfd517099caf0f7a961671fa8ed08723"
-"github.com/cpuguy83/go-md2man 71acacd42f85e5e82f70a55327789582a5200a90"
-"github.com/cyphar/filepath-securejoin a261ee33d7a517f054effbf451841abaafe3e0fd"
-"github.com/davecgh/go-spew 782f4967f2dc4564575ca782fe2d04090b5faca8"
-"github.com/dgrijalva/jwt-go 01aeca54ebda6e0fbfafd0a524d234159c05ec20"
-"github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
-"github.com/docker/docker a9fbbdc8dd8794b20af358382ab780559bca589d"
-"github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1"
-"github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528"
-"github.com/emicklei/go-restful ff4f55a206334ef123e4f79bbf348980da81ca46"
-"github.com/evanphx/json-patch 5858425f75500d40c52783dce87d085a483ce135"
-"github.com/exponent-io/jsonpath d6023ce2651d8eafb5c75bb0c7167536102ec9f5"
-"github.com/fatih/camelcase f6a740d52f961c60348ebb109adde9f4635d7540"
-"github.com/ghodss/yaml c7ce16629ff4cd059ed96ed06419dd3856fd3577"
-"github.com/go-openapi/jsonpointer ef5f0afec364d3b9396b7b77b43dbe26bf1f8004"
-"github.com/go-openapi/jsonreference 8483a886a90412cd6858df4ea3483dce9c8e35a3"
-"github.com/go-openapi/spec 5bae59e25b21498baea7f9d46e9c147ec106a42e"
-"github.com/go-openapi/swag 5899d5c5e619fda5fa86e14795a835f473ca284c"
-"github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438"
-"github.com/gogo/protobuf 342cbe0a04158f6dcb03ca0079991a51a4248c02"
-"github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
-"github.com/golang/groupcache 02826c3e79038b59d737d3b1c0a1d937f71a4433"
-"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
-"github.com/google/btree 7d79101e329e5a3adf994758c578dab82b90c017"
-"github.com/google/gofuzz 24818f796faf91cd76ec7bddd72458fbced7a6c1"
-"github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24"
-"github.com/googleapis/gnostic 0c5108395e2debce0d731cf0287ddf7242066aba"
-"github.com/gophercloud/gophercloud c818fa66e4c88b30db28038fe3f18f2f4a0db9a8"
-"github.com/gosuri/uitable 36ee7e946282a3fb1cfecd476ddc9b35d8847e42"
-"github.com/gregjones/httpcache 787624de3eb7bd915c329cba748687a3b22666a6"
-"github.com/grpc-ecosystem/go-grpc-prometheus 0c1b191dbfe51efdabe3c14b9f6f3b96429e0722"
-"github.com/hashicorp/golang-lru 20f1fb78b0740ba8c3cb143a61e86ba5c8669768"
-"github.com/huandu/xstrings f02667b379e2fb5916c3cda2cf31e0eb885d79f8"
-"github.com/imdario/mergo 9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
-"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-"github.com/jmoiron/sqlx d161d7a76b5661016ad0b085869f77fd410f3e6a"
-"github.com/json-iterator/go ab8a2e0c74be9d3be70b3184d9acc634935ded82"
-"github.com/liggitt/tabwriter 89fcab3d43de07060e4fd4c1547430ed57e87f24"
-"github.com/lib/pq 88edab0803230a3898347e77b474f8c1820a1f20"
-"github.com/mailru/easyjson 2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
-"github.com/MakeNowJust/heredoc bb23615498cded5e105af4ce27de75b089cbe851"
-"github.com/Masterminds/goutils 41ac8693c5c10a92ea1ff5ac3a7f95646f6123b0"
-"github.com/Masterminds/semver c7af12943936e8c39859482e61f0574c2fd7fc75"
-"github.com/Masterminds/sprig 9f8fceff796fb9f4e992cd2bece016be0121ab74"
-"github.com/Masterminds/vcs 3084677c2c188840777bff30054f2b553729d329"
-"github.com/mattn/go-runewidth d6bea18f789704b5f83375793155289da36a3c7f"
-"github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c"
-"github.com/mitchellh/go-wordwrap ad45545899c7b13c020ea92b2072220eefad42b8"
-"github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"
-"github.com/modern-go/reflect2 94122c33edd36123c84d5368cfb2b69df93a0ec8"
-"github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb"
-"github.com/peterbourgon/diskv 5f041e8faa004a95c88a202771f4cc3e991971e6"
-"github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d"
-"github.com/prometheus/client_golang 505eaef017263e299324067d40ca2c48f6a2cf50"
-"github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
-"github.com/prometheus/common cfeb6f9992ffa54aaa4f2170ade4067ee478b250"
-"github.com/prometheus/procfs 65c1f6f8f0fc1e2185eb9863a3bc751496404259"
-"github.com/PuerkitoBio/purell 8a290539e2e8629dbc4e6bad948158f790ec31f4"
-"github.com/PuerkitoBio/urlesc 5bd2802263f21d8788851d5305584c82a5c75d7e"
-"github.com/rubenv/sql-migrate 1007f53448d75fe14190968f5de4d95ed63ebb83"
-"github.com/russross/blackfriday 300106c228d52c8941d4b3de6054a6062a86dda3"
-"github.com/shurcooL/sanitized_anchor_name 10ef21a441db47d8b13ebcc5fd2310f636973c77"
-"github.com/sirupsen/logrus 89742aefa4b206dcf400792f3bd35b542998eb3b"
-"github.com/spf13/cobra fe5e611709b0c57fa4a89136deaa8e1d4004d053"
-"github.com/spf13/pflag 298182f68c66c05229eb03ac171abe6e309ee79a"
-"github.com/technosophos/moniker a5dbd03a2245d554160e3ae6bfdcf969fe58b431"
-"golang.org/x/crypto de0752318171da717af4ce24d0a2e8626afaeb11 github.com/golang/crypto"
-"golang.org/x/net 65e2d4e15006aab9813ff8769e768bbf4bb667a0 github.com/golang/net"
-"golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4 github.com/golang/oauth2"
-"golang.org/x/sync 1d60e4601c6fd243af51cc01ddf169918a5407ca github.com/golang/sync"
-"golang.org/x/sys b90733256f2e882e81d52f9126de08df5615afd9 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 a02b0774206b209466313a0b525d2c738fe407eb github.com/grpc/grpc-go"
-"gopkg.in/gorp.v1 6a667da9c028871f98598d85413e3fc4c6daa52e github.com/go-gorp/gorp"
-"gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 github.com/go-inf/inf"
-"gopkg.in/square/go-jose.v2 89060dee6a84df9a4dae49f676f0c755037834f1 github.com/square/go-jose"
-"gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml"
-"k8s.io/api 6e4e0e4f393bf5e8bbff570acd13217aa5a770cd github.com/kubernetes/api"
-"k8s.io/apiextensions-apiserver 727a075fdec8319bf095330e344b3ccc668abc73 github.com/kubernetes/apiextensions-apiserver"
-"k8s.io/apimachinery 6a84e37a896db9780c75367af8d2ed2bb944022e github.com/kubernetes/apimachinery"
-"k8s.io/apiserver 1ec86e4da56ce0573788fc12bb3a5530600c0e5d github.com/kubernetes/apiserver"
-"k8s.io/client-go 1a26190bd76a9017e289958b9fba936430aa3704 github.com/kubernetes/client-go"
-"k8s.io/cli-runtime d644b00f3b79346b7627329269bb25f2135f941c github.com/kubernetes/cli-runtime"
-"k8s.io/cloud-provider 9c9d72d1bf90eb62005f5112f3eea019b272c44b github.com/kubernetes/cloud-provider"
-"k8s.io/klog 8e90cee79f823779174776412c13478955131846 github.com/kubernetes/klog"
-"k8s.io/kube-openapi b3a7cee44a305be0a69e1b9ac03018307287e1b0 github.com/kubernetes/kube-openapi"
-"k8s.io/kubernetes b7394102d6ef778017f2ca4046abbaa23b88c290 github.com/kubernetes/kubernetes"
-"k8s.io/utils c2654d5206da6b7b6ace12841e8f359bb89b443c github.com/kubernetes/utils"
-"sigs.k8s.io/kustomize a6f65144121d1955266b0cd836ce954c04122dc8 github.com/kubernetes-sigs/kustomize"
-"sigs.k8s.io/yaml fd68e9863619f6ec2fdd8625fe1f02e7c877e480 github.com/kubernetes-sigs/yaml"
-"vbom.ml/util db5cfe13f5cc80a4990d98e2e1b0707a4d1a5394 github.com/fvbommel/util"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-GIT_COMMIT="a8b13cc5ab6a7dbef0a58f5061bcc7c0c61598e7"
-
-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=""
-
-DEPEND=">=dev-lang/go-1.12"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/git rev-parse HEAD/echo ${GIT_COMMIT}/"\
-		-e "s/git rev-parse --short HEAD/echo ${GIT_COMMIT:0:7}/"\
-		-e "s#git describe --tags --abbrev=0 --exact-match 2>/dev/null#echo v${PV}#"\
-		-e 's/test -n "`git status --porcelain`" && echo "dirty" ||//' src/${EGO_PN}/versioning.mk || die
-
-	rm -rf src/${EGO_PN}/vendor/*/*/vendor src/${EGO_PN}/vendor/*/*/*/vendor  || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go || die
-	GOBINDIR="$(pwd)/bin" GOPATH="${S}"\
-	go install -v -ldflags "-X k8s.io/helm/pkg/version.Version=v${PV} -X k8s.io/helm/pkg/version.BuildMetadata= -X k8s.io/helm/pkg/version.GitCommit=${GIT_COMMIT} -X k8s.io/helm/pkg/version.GitTreeState=clean" k8s.io/helm/cmd/... || die
-	popd || die
-	bin/${PN} completion bash > ${PN}.bash || die
-	bin/${PN} completion zsh > ${PN}.zsh || die
-}
-
-src_install() {
-	newbashcomp ${PN}.bash ${PN}
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	dobin bin/${PN} bin/tiller
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/app-admin/helm/helm-2.14.3.ebuild b/app-admin/helm/helm-2.14.3.ebuild
index 5d54fb819d86..7e9d9b482c47 100644
--- a/app-admin/helm/helm-2.14.3.ebuild
+++ b/app-admin/helm/helm-2.14.3.ebuild
@@ -116,7 +116,7 @@ GIT_COMMIT="0e7f3b6637f7af8fcfddb3d2941fcc7cbebb0085"
 
 ARCHIVE_URI="https://github.com/kubernetes/helm/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Kubernetes Package Manager"
 HOMEPAGE="https://github.com/kubernetes/helm https://helm.sh"
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 5398985802af..a0d23421b539 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,7 +1,5 @@
 AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45dadb5824f369a454a1126cb61293d55f86f9f01fb659932729dbc205a522aab32343dd87b74662927d60edc50750af602a959cc9 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae
 AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb
-DIST KeePass-2.41-Source.zip 5141195 BLAKE2B 7f61efa6d73fbfd5de283567a1673f5757619ebb81f3daa3fba82c887874f2cdb15f74221bf389013fe4cf19c83f00f87de2c596d22a22f5f38b5236dab01e44 SHA512 0d9398f529e004df6a4d3e0b8e34a1324b1806bf44987e9cb2d7535eaf02192662e72c89f1e41b7da01d23b0d686fbbca7a956ef7873fd8b1948847fbf5d27a5
 DIST KeePass-2.42.1-Source.zip 5163432 BLAKE2B c24a57da863c92d3f89663f33ed89c277e248c926067c14a6a7e3526e77c458e943e62c4b98a3d86595eea308d8744fd4a17da6d5456030a771e324a662abd9f SHA512 c87581afbaa516f637848db134a8d945db168bbbe97789a9a7424600d4188a21d2b1b3cf907a20577b2903ce8916b6b12355a3296ee1630a5b556c9170c4fa22
-EBUILD keepass-2.41.ebuild 3116 BLAKE2B d4b548f7e4143138f1eddbc3e69b3e532b63fb1970a539e7df647bb57dbb488f1c291df2bac8a1c6cbf2afec400d30a91b9f2eb32c92274993cd21db7239239c SHA512 4c7e2ab0fabafa2f715137131951fdeca008f67f695f43cac5cdf5bf407aeea5a175fc3e90c7267ba47d578aeab1243eb49b11135c4d045ecf2c9d26b1f2c534
-EBUILD keepass-2.42.1.ebuild 3118 BLAKE2B 664ed7bf32f87f04295defa3249241f51d259d5c63239f3d4a2ff41fe7d487257e397dd909898827c7328951895b5a6aca474d90ac498192fc97f430c2e0635c SHA512 9384d81ce0cbee3f5acbff9f706ccb5fb48133fdf1d201231036b139705e5ab1cd1361aeed52cfbc14999992c8ff5bad0e1b3b279eb319d0971b4d4b7102ac1a
+EBUILD keepass-2.42.1.ebuild 3116 BLAKE2B d4b548f7e4143138f1eddbc3e69b3e532b63fb1970a539e7df647bb57dbb488f1c291df2bac8a1c6cbf2afec400d30a91b9f2eb32c92274993cd21db7239239c SHA512 4c7e2ab0fabafa2f715137131951fdeca008f67f695f43cac5cdf5bf407aeea5a175fc3e90c7267ba47d578aeab1243eb49b11135c4d045ecf2c9d26b1f2c534
 MISC metadata.xml 651 BLAKE2B 058fa70fb6ce35fb52464a84cf506ad117343a1376a40b003c4f55bdf94369136276d8bbb67f30490eb73cba4df6b03d78e8c2a65cf8141dd6cf64654c9b6358 SHA512 6251f546e631decbc7692ab00900d722031ce638f3d878771a2bcfebedba8e1fee9b3e54dfd4c3ae3c711006099fc5a772555ea7cc018d012de164755ba8b52c
diff --git a/app-admin/keepass/keepass-2.41.ebuild b/app-admin/keepass/keepass-2.41.ebuild
deleted file mode 100644
index c5d1b4af3595..000000000000
--- a/app-admin/keepass/keepass-2.41.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils xdg-utils
-
-MY_PN="KeePass"
-DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="https://keepass.info/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aot"
-
-COMMON_DEPEND="dev-lang/mono"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-dotnet/libgdiplus[cairo]
-"
-
-S="${WORKDIR}"
-PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
-
-src_prepare() {
-	# KeePass looks for some XSL files in the same folder as the executable,
-	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
-	# This XSL file will not be upstreamed since the KeePass creator said that
-	# including this patch would break the Portable USB version of KeePass
-	# (which keeps/looks for xsl files in its own folder)
-	default
-
-	# Switch into build dir so the mono prepration script works correctly
-	pushd Build || die
-	source PrepMonoDev.sh || die
-	popd || die
-}
-
-src_compile() {
-	export MONO_REGISTRY_PATH=/dev/null # bug 659808
-
-	# Build with Release target
-	xbuild /target:KeePass /property:Configuration=Release || die
-
-	# Run Ahead Of Time compiler on the binary
-	if use aot; then
-		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
-		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
-	fi
-}
-
-src_install() {
-	# Wrapper script to launch mono
-	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
-
-	# Some XSL files
-	insinto "/usr/share/${PN}/XSL"
-	doins Ext/XSL/*
-
-	insinto "/usr/$(get_libdir)/${PN}"
-	exeinto "/usr/$(get_libdir)/${PN}"
-
-	doins Ext/KeePass.exe.config
-
-	# Default configuration, simply says to use user-specific configuration
-	doins Ext/KeePass.config.xml
-
-	# The actual executable
-	doexe Build/KeePass/Release/KeePass.exe
-
-	# Copy the AOT compilation result
-	if use aot; then
-		doexe Build/KeePass/Release/KeePass.exe.so
-	fi
-
-	# Prepare the icons
-	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
-	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
-
-	# Create a desktop entry and associate it with the KeePass mime type
-	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
-
-	# MIME descriptor for .kdbx files
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-
-	# sed, because patching this really sucks
-	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if ! has_version x11-misc/xdotool ; then
-		elog "Optional dependencies:"
-		elog "	x11-misc/xdotool (enables autotype/autofill)"
-	fi
-
-	elog "Some systems may experience issues with copy and paste operations."
-	elog "If you encounter this, please install x11-misc/xsel."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-admin/keepass/keepass-2.42.1.ebuild b/app-admin/keepass/keepass-2.42.1.ebuild
index 1dc244ea08cf..c5d1b4af3595 100644
--- a/app-admin/keepass/keepass-2.42.1.ebuild
+++ b/app-admin/keepass/keepass-2.42.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="aot"
 
 COMMON_DEPEND="dev-lang/mono"
diff --git a/app-admin/kpcli/Manifest b/app-admin/kpcli/Manifest
index 6292ff0c9a54..0e48922d590a 100644
--- a/app-admin/kpcli/Manifest
+++ b/app-admin/kpcli/Manifest
@@ -1,7 +1,5 @@
-DIST kpcli-3.0.pl 181841 BLAKE2B f55db76dc9036ccd2031a7f5f379e18aad8b52758fa7567547f79e0d1c0ae9f97b60d9a68f0587fe4d38d97dde2d89d9ea768ad14fbf4a398422befd00455c9d SHA512 fb1243ed81408507090ce6e7b06e958f923ac9c64e6994b104605bb85deb08e1b63b28fdb2c5a4eb24e128734b65ecb0209000f08ec9a7644f3d6a8fbb781587
-DIST kpcli-3.1.pl 193792 BLAKE2B 6574916b020885443e68d2daa111e376847c6e0c5d5f4273293cc591bb5e31b8b1a2a43f984e22d2b959f71ed952936a00ea7cbf17fb047929004bce193b3d9e SHA512 2bcfaa4535fd35d7bbf512e704392e207237efa669bf5d6845d1657e44511f04b80fddd4404f3a8d409f330f8bfbb5cf9f1e09fb8a425685b3d7309a8040df5e
 DIST kpcli-3.2.pl 197369 BLAKE2B 17a449c1727e8c9e79a5c45327debec1391e58012b2f94979a9431dfc45a0909b23f2e61717aaa2ea18153f420d8d8eba9fd4a5afa860b8478d58e044049322a SHA512 72374da627075a2a0a18932f0f4d48c77e23a8a3ac13599d7cebb6b3b685c2d1678bf8035651adeb471538b4da3825443a9e2a9a393e85be175637b0bfa611b9
-EBUILD kpcli-3.0.ebuild 881 BLAKE2B 6badb5ef50f5c3324aa13cc6f1a3fe858dcd85a6b6a7cfaa8a103de303c50c546ae69797872be7f326020f8e34f98323714d3895dd7ae3cf806e07e01e03c670 SHA512 db94cfba8b4ab9ea55a405d95cf2bec7836ee563c2ca1599850b422b20c81984c345798b20c94471466ed1c25dfd083309c89a1573621dfea8ba3e91018aee7c
-EBUILD kpcli-3.1.ebuild 933 BLAKE2B 948ea48b0e27fc2304b97b0de3ec5ffc96ce45f9780df71e3d8580c6f990faff3fd8d05466d9847c80d12275ae3f1d6e9e0dc7444913f392ef2091228bff945b SHA512 7aed92ec74ae4f429de373b0a2246c84fd1e31a08077890f08e5e6c7cbb199f15a985e64976aec26d5fc627b34031e8e48252d3304fcc97458d839735cb84743
+DIST kpcli-3.3.pl 199249 BLAKE2B 6db8dff530c709600ac90ca77c8171bedb98dc0ff3822963cdd177000a0b23c46387613639205b85dfdcb710b5a9804fc5b2e205c1937952e8439f5bebae4900 SHA512 5a837891a29dc65f0900015124fe3fdd1b7b9878ed2094d7c299c24590feee8e704212bcabf45c63064f97deca1dd2da96aa80c5be4305692f181db45b7e241a
 EBUILD kpcli-3.2.ebuild 933 BLAKE2B e9a6198c62dcbe4a4c26aa6ae2421dfae0b0b149bb2d8c0c6cd802d4d432df699e8dc64baa415be77a530f3e95df74fc5c967ced9ae014487f9756429d1af032 SHA512 b8d077b1369186be0fd3edd9120980e6169596a6d27ee2e92e9f256feb714e43eefb30133e82df525cda29acea81be86f26457f016cc81c44b16f6b1018a8edd
-MISC metadata.xml 336 BLAKE2B 5716721c6343ab66c74fb4c86e8d9e46d333d918dd3cd99e037221ad55a3b5ae6b3b1edff21775cc602eaa84a1c8246fcea23ca2cfacbd56243aa0a013707397 SHA512 0d14658777d24fe70a871694ef722f49bd02b138658316470f4a8d5bf83c068d7c9ace11c34423a3a73aefdf590e43f2b56d2578a08c67cbac179ef3b59ca42b
+EBUILD kpcli-3.3.ebuild 930 BLAKE2B cc613bf85aa23b3ef9fa0acc18a8c5ea374cc2fdd4ef79149d1052ca72d00a19a04c1ade328803acbca2dacf61aeee3225b3b769dc2e8f41c481507260fc8a2a SHA512 831bc7a99c57ef5e7987c7d21b00dc0c63f92e8c6a646618e751ee0afbc3ab0a7caa4ab2d5cd4a303c2c459f62283d511713041addf0317e003b8197c737048f
+MISC metadata.xml 451 BLAKE2B d9b725122049d496ec367292c1f84973f7ecbdc8034e12a7995efabea8fc0be5ac5877ac7111eb2dd124a4748c203f83e3926ba5faa936f94be01395020d663d SHA512 6601863c3d6754d7bb1eb59fa76d79c5c250a2bd67deb12cb67e12ea67b5a7a59802253f852d0dc887ad4ef4d143849069c026104939e110749f81572c532478
diff --git a/app-admin/kpcli/kpcli-3.0.ebuild b/app-admin/kpcli/kpcli-3.0.ebuild
deleted file mode 100644
index 22e49477c1e0..000000000000
--- a/app-admin/kpcli/kpcli-3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A command line interface to KeePass database files"
-HOMEPAGE="http://kpcli.sourceforge.net"
-SRC_URI="http://downloads.sourceforge.net/project/kpcli/${P}.pl"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND=""
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Clone
-	dev-perl/Crypt-Rijndael
-	dev-perl/TermReadKey
-	dev-perl/Sort-Naturally
-	dev-perl/Term-ShellUI
-	>=dev-perl/File-KeePass-0.30.0
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	virtual/perl-Digest-MD5
-	virtual/perl-Digest-SHA
-	virtual/perl-Data-Dumper
-	virtual/perl-Term-ANSIColor
-	virtual/perl-Carp
-	X? ( dev-perl/Clipboard )
-"
-
-src_unpack() {
-	mkdir "${S}" || die
-	cp "${DISTDIR}/${P}.pl" "${S}/${PN}" || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	dobin kpcli
-}
diff --git a/app-admin/kpcli/kpcli-3.1.ebuild b/app-admin/kpcli/kpcli-3.3.ebuild
index 8283bf2ccefa..1dda345988a2 100644
--- a/app-admin/kpcli/kpcli-3.1.ebuild
+++ b/app-admin/kpcli/kpcli-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/kpcli/metadata.xml b/app-admin/kpcli/metadata.xml
index ad8e967f1f82..e792667d95a6 100644
--- a/app-admin/kpcli/metadata.xml
+++ b/app-admin/kpcli/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
   <maintainer type="project">
     <email>perl@gentoo.org</email>
     <name>Gentoo Perl Project</name>
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index 0f2fb7f12dfe..4061abaa4725 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,5 +1,3 @@
-DIST lib_users-0.11.tar.gz 25660 BLAKE2B 8f5a827840d4074a0e8abd77e43f60eb09f199f58a2bde0c2bce7613d6ba1d9b12dd46adffa528ff351f54933c304f274abef9c35550d7af3519101dcec69d0a SHA512 a54fc8f57cffcd08e77e86eaf50ec6e68e45e1e9458e25e035af90e14be13980a400c4d264f70ef67e141e1d54581b0487b2b70dd084dc5840424221b46f644a
 DIST lib_users-0.13.tar.gz 25704 BLAKE2B 895f8b721216339fe4306158bf6282353d79584573091cc4e7c63c8096a9f9cfe380a8bce7229f168e44fe5d3641ceb8c91bd751316a6c6a467ace4ec0dce723 SHA512 588af7068728810832bcf4d1526f271e255d07c75d152fb41844c66f3598a71e9a96bee3426b31b58cd26af889bc42c0a7248731fdfe3623fd4567d2b6b7275e
-EBUILD lib_users-0.11-r1.ebuild 1114 BLAKE2B ab26338a370609b310c18385e49d9855947268cccbbb48697ff1c7f40cf4a70c262d94bfc604cf6dd6ecb7ebd4bed5b33efb439b3fc9cbc8710e22eee7d62b50 SHA512 c07b09c78a6533fc8a46ccac6faec4f8b0d5d3072e85b43ab4e3699f0f636ece5b8e12b70dcd1e033b7b11df305a68197e1ef9ee3761f304c48b8b932240d40f
 EBUILD lib_users-0.13.ebuild 1114 BLAKE2B ab26338a370609b310c18385e49d9855947268cccbbb48697ff1c7f40cf4a70c262d94bfc604cf6dd6ecb7ebd4bed5b33efb439b3fc9cbc8710e22eee7d62b50 SHA512 c07b09c78a6533fc8a46ccac6faec4f8b0d5d3072e85b43ab4e3699f0f636ece5b8e12b70dcd1e033b7b11df305a68197e1ef9ee3761f304c48b8b932240d40f
 MISC metadata.xml 454 BLAKE2B c545fd1db330988ad139de08b1890cfd9d6aac98947b954fb761515d314d8ebb941829e7767fe4fad6beb41caf3409111505d1a6378c852f15907933678ddd48 SHA512 c897ea5b6bed9fcc8715380a1b2756f376a095925a2c99a78ce6729cc9839683f40ce53f5faf0fb784169db5ef9162f1659ea6f24304bcc7cd47f90d49ec97dd
diff --git a/app-admin/lib_users/lib_users-0.11-r1.ebuild b/app-admin/lib_users/lib_users-0.11-r1.ebuild
deleted file mode 100644
index d4aca2e0ac61..000000000000
--- a/app-admin/lib_users/lib_users-0.11-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit python-r1
-
-DESCRIPTION="Check for mapped libs and open files that are marked as deleted"
-HOMEPAGE="https://github.com/klausman/lib_users"
-SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-	)"
-RDEPEND="${PYTHON_DEPS}"
-
-src_test() {
-	python_foreach_impl nosetests --verbosity=2
-}
-
-my_install() {
-	python_newscript lib_users.py lib_users
-	python_newscript fd_users.py fd_users
-	# lib_users_util/ contains a test script we don't want, so do things by hand
-	python_moduleinto lib_users_util
-	python_domodule lib_users_util/common.py
-	python_domodule lib_users_util/__init__.py
-}
-
-src_install() {
-	python_foreach_impl my_install
-	dodoc README.md TODO
-}
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 15858944192a..8858bc5ae101 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -9,7 +9,13 @@ AUX logstash.initd-r2 1989 BLAKE2B efa16227a2cf1a42f1f9e27e110dae64c7eb6547e22e8
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
 DIST logstash-5.6.15.tar.gz 110086992 BLAKE2B 3047259c4bc5d71b072fa004c44953f84860ec53e051641c4efc903e38243e85b8fdebeaf093c01f5410c1f05a78a8d8aa2282fc45cf5fd784a41ea66ff5b196 SHA512 405039ff988aee8878cbeca96ef0fcbadba762f877eaec36c8a75b010e56a943c2951a8f83f9279d7d9fea99c4f8a200c705f784813a2733289336c58c34ca1e
 DIST logstash-6.6.1.tar.gz 169642354 BLAKE2B 335fa036e9f120de5d6588ed18e927ddfb3a94dfcfbc9605fbda3e3eb4da3ba88561d466eb171c85a2deebb3328312ba903616704844e253a7599f75597efbae SHA512 a66f196f160af29492b64efb61b7e3253a4ef45764c5e6226f73c2a216151ff43f6d344c2e3340a1a9ddb8b00e61f14c65d5dd0c14d69421f4efa3542445fe4f
+DIST logstash-6.8.1.tar.gz 172031559 BLAKE2B dcb0d37ce0325affa86c3cba546dae262ae8436cc2234eb977a359498f923620cb1ce4bc79a5a5c5d7afe6b7b3b3e938791baf44ce25ba967f5738ea5cb15669 SHA512 3f3a90cbd185a5efaefbe2004f1265ea5d1fbd3371820897b19d8b9b8fcc6d5522bd97ef4150fd963a376ce7726d9ab4d62fa9e2bc718a2c8bb69dd7e964c378
+DIST logstash-7.2.0.tar.gz 171299740 BLAKE2B cfdbabc11d6e0d182ea7bdff1d30ca3a5bfbfe036f952c0d944c105f563dfa1b444c8dd1e9f023301abfbf9a86708d6bde2689b462b28f00a34d09f78fe3898c SHA512 955358d504b6626ba9ac88a2d65b161044180c3085f8dbaedfb8b85b092ecc65721bbda73b750f7d8b78a052828a54f7ed7ad16ee7ec72f3ed5e428ba291a173
 DIST logstash-oss-6.6.1.tar.gz 169512439 BLAKE2B 54a18deda80079c9bf2de39936737689d696a4ddc6f8a7ae375d48817ea127f1eb83f1ef50a18b573709446fc3deb858f53a5aff6411329b52ef0316859a7f03 SHA512 7fbe960e615c3c6b6715bd63debd3db869abe29bfdc94d4947290b822fe1d858e289548dbda266c8ad6d25745e63a788de0c83566121faa0d3027642b0f3d108
+DIST logstash-oss-6.8.1.tar.gz 171901409 BLAKE2B bff3b96bcf3f53450e1279f633788af7d7a1d18b18305741c87c6b2c7e9e24db0664798c7040116bfbf72c9714bad867a00a3f37fe8eb436ce1948bb84a2096f SHA512 d928f9eaa2278c76cbdec46349bf1b924d3f5a9f668c834c882158decf52d44f14dcc356a491cc935dd3717f4a76b8a23eac1173ab28f44cdb32a57ab298fbcd
+DIST logstash-oss-7.2.0.tar.gz 171128040 BLAKE2B f0f3d4f0d5228918d8435c521d10ff5070e23561c25ce28e8d58997d499a7c7697354c1fb1cb70bf2bd832ad50c04afb00cbde4b3053f9f24d2619f3fbfffbdf SHA512 24120740bc727b6da50b865bb85bf61f013a38b6679d679ecc75a73c69766a5133fd47ad99fa0220d5dc6cceb506fbde206787adcee31483288c68c228edd1fd
 EBUILD logstash-bin-5.6.15.ebuild 2195 BLAKE2B 1ef9e7d8a825109a85e850c2e9b971c3b16d435f1a0e3dce40e18b48f64c5b83a3cedd0d85a15d422a3accccb0ffcbe79b2a0812fda24c04fd0f07a0e37b9436 SHA512 6026cb3d76dbab56a4a495b1bc3abea2d0c4c731261047e76acf792840f3deb1fdd0fd181b5b6a599f2056f22b76920e7844f1e76516919c7404c1d10e1b7259
 EBUILD logstash-bin-6.6.1.ebuild 2185 BLAKE2B c0ca9f44ca02db43d7b6b414f866f5d7a1eed19c44f45874a1df6a9171c0327b971878bcf74bb4028903f23bd2521464bac662cecd89bbacfcc32d6e88d4b4b0 SHA512 0088d7e185bbf58af1c4880aaac299f3a4a93ee1ecd3092aa9548d60767faaa963bbcc422ff40e8b8905b843da25d73dbb0b75bfffa19261306668fd9e414c43
+EBUILD logstash-bin-6.8.1.ebuild 2110 BLAKE2B 960d4716062a128de41b79d891a836a77f88ef27f6d5b2efddeb01bdaaa03dc517e01bfc9fea3ccba1135274915839733a904ab38687d4e7c72ff48304d81df8 SHA512 3c5f628adc74640347f458e86a1f82ec485730fb484685b21d76a1411f971ce0021a95cc1c5982f1defd896bb9778cd006c947e9022bb01f10690fc07ea590e3
+EBUILD logstash-bin-7.2.0.ebuild 2106 BLAKE2B 7e872a2d5eef819528109b77bfe27f7d80702e3567eda0e4c107e3db388b7a373c9edeeaa5720252d6951bb0f317352bc339303ccc4963cfe215e5de3f20ae6a SHA512 a132cae1a40ef430208f2e2567d6208ca65db8fbb0f9453e4dcbc274ef12cf925cf9287f964416266ba5749d787809134a7c9764734c5ba87331c814c71a2b76
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild
new file mode 100644
index 000000000000..08373cbcbd51
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.8.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit java-pkg-2 user
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="acct-group/logstash
+	acct-user/logstash
+	virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/{pipelines.yml,startup.options} || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	doins "${FILESDIR}/pipelines.yml"
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT%/}/usr/share/${MY_PN}"
+	elog
+	elog "The default pipeline configuration expects the configuration(s) to be found in:"
+	elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
+}
diff --git a/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild
new file mode 100644
index 000000000000..8a0ac16580b6
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-7.2.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit java-pkg-2 user
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="acct-group/logstash
+	acct-user/logstash
+	virtual/jre"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/{pipelines.yml,startup.options} || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	doins "${FILESDIR}/pipelines.yml"
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT%/}/usr/share/${MY_PN}"
+	elog
+	elog "The default pipeline configuration expects the configuration(s) to be found in:"
+	elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
+}
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index cdf0d14d1f42..f4eed3777c5d 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -2,8 +2,8 @@ AUX mcelog-0.8_pre1-timestamp-mcelog.patch 425 BLAKE2B 5952e26c668fb71f712fc70b3
 AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de41215890cb4b6431ad694c2684f498d13287e385119304a816270f470ff26529967701c92bfc845a8aac698a0aa0f67271 SHA512 cda86c3e74f56fcd9d8771b26ca91c32ccc33e6bcd6dd0fcf856c14096daa619257d237e1e187e7820d6a0a0553ae6fd9ec160ea59e237b4e05ebca4e6656e20
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
 AUX mcelog.service 213 BLAKE2B 08da6eac0afe17a04948f5ff958aba5c64ff491f6842a0b84e914a82cce16782b2c9dfdc83123d609cabd4e9e60eb38a9e43fe7a22a2afca8f53c3dc8e65ac87 SHA512 8317d9310d58663bb28f2528e0872520e30475439b9ce69ebb2452d7dc3583d2aecab80d9f6ef895ac8a17f666c3229d7cd768026ea16cc5403fb05d8bdc5c75
-DIST mcelog-161.tar.gz 308227 BLAKE2B cd208cce2685b779a2cac6d347b890d5bff5f07d2e7165c1d078f914aefcc26bef2ab968ec6baac4410134d8188dd73e4f3d77f13603307f8c6b592554146497 SHA512 af38fcc1cc9621d6cfbda2b9acc7698cddbe631690bf394398978bdafd0d98075539012827ca876cef3f64cc56a00d31d0bd0f4fe2ea9171eb41bf0163e35f0e
 DIST mcelog-162.tar.gz 308347 BLAKE2B bd438e85ea793c6c5ce4d561f0400e91b101a010cce7f937751a11a0a974fec49db7e9d768fc50db68a91c973c90c8ab1b4ffa80964cb6fde860b9f2ac217435 SHA512 d61a0b7ad3974098963edde1e9e9acdf4dbd1a025577b7044bafc17302abd19080c8145a2700c691400af0768ff4b6833d47697e1478c5bef8831f7f8b61ae48
-EBUILD mcelog-161.ebuild 1367 BLAKE2B 36af6f137e53810836f18110ab2ac3aadd3be922a17746d77a82e8f43214733bcd3462740d2c3ff0384e04bdd739e6dea3d2673b5a11d20c92700eea867237c7 SHA512 d243573977569374a72ec19629d48bc735c94e7c49dfde00550128cdd8e3713c8eed966be26e11a1d7a46156f2b3db00bf342cb80eee80409d284c359bcc6909
-EBUILD mcelog-162.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
+DIST mcelog-164.tar.gz 308393 BLAKE2B da1f425faa88eb8377eb11c3e13aa6fd4c0b4f4d3b02afc2fba8e4137979bb5619b075b0d0ecd80ec6059c9eb912376291e56e667bf7b838bd2f641c4a6c175f SHA512 10c8c580b10caa6d40c2a4887cb9e9ec07eb81a353d24a4d1a89ad8ec5cc29f7976c26335f077393794b060e62b5cbbe348c64567a3cf3fabc3ec5c3fe59da5a
+EBUILD mcelog-162.ebuild 1367 BLAKE2B 7fb646e842316273c540c327b2bbdc1c7c7f77f8e4150406f56bf207b581f1e9c05eb19c93a00ca924707f4af4b263665e81ca0f771e635340dd6ebfb6e1c9e6 SHA512 8d1e0e8caa4a685c1323a52c02a81f8de194c69fda836a3f70bba95b7c95fc18914c01cd2c0b76a25c849df4011c422216944684d1c9dc09774590ae788a3707
+EBUILD mcelog-164.ebuild 1369 BLAKE2B e7be76b28b79b54b41c2d450991dd23f954eabdeda40f48e35d6a8d0ec6d40e7330df989cdfd5b9f34de73e4852ac57e38a27e5ef0b886e6e2f3742528b86dea SHA512 e754a01ebc332b56204efa51387cccee503dd0dbf9d050f44a4f7684153a3d6dccf27267b596dafab976e098cc4c040d1e49204ff04a76705329a78db8d71a7a
 MISC metadata.xml 644 BLAKE2B b5d4ef8c5541a2ead6cf23b47cf4adfcdd6607a1911411afef41f53e08db548e8606cb50d52e8c7caee29f574838157484e96878fc205467c53bfc6951eca3e6 SHA512 26990a9c8ef8333f6fe292e465cb8aaaafb6436af48cee7840d932fbde92e8396cdfa9d2718eca2a6284c8ba87a8c6a47506c57b0af8c9fe1894673b2e98a1a6
diff --git a/app-admin/mcelog/mcelog-162.ebuild b/app-admin/mcelog/mcelog-162.ebuild
index 557b542b3a9f..313753971790 100644
--- a/app-admin/mcelog/mcelog-162.ebuild
+++ b/app-admin/mcelog/mcelog-162.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
diff --git a/app-admin/mcelog/mcelog-161.ebuild b/app-admin/mcelog/mcelog-164.ebuild
index 37a8e88bf731..557b542b3a9f 100644
--- a/app-admin/mcelog/mcelog-161.ebuild
+++ b/app-admin/mcelog/mcelog-164.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 26833bc71c17..915a0018a8ec 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,17 +1,9 @@
-DIST mongo-tools-3.4.16.tar.gz 4697191 BLAKE2B 2e9a0e7dc8016d3e7d7c7f8d0cf80a97d3d199603c0b8b791df5a0d79d418ffaa232eee694047a7ca11fa7623023b4123becd437cfe3dec11e26cd525720bcad SHA512 b40c6dee75d860de1da73faf79f5f68c098ce7c80681486c66fff04a937474dcede91c7be907a8e36033b3898f7499e8f53271944c0df3360756c27361efb6f5
-DIST mongo-tools-3.6.11.tar.gz 4731680 BLAKE2B 88558a26d2552848121d984e4b963acafe9e56b37a3d393bacdcd8c0f71a29e2082845ad6d648c3c4800bd47514d339d1f1e984e339a48572ecb5f6f31d9166d SHA512 2291cb963965a59a89bac35a760ce49b4b835d1447065d558c4b254aae5fe38f7ebe4c9d7a67aa475e06be95c45f8529922c6fb0b78d41bc07d1a83f3a564192
-DIST mongo-tools-3.6.12.tar.gz 4990846 BLAKE2B a2b649df03ba17175d95b0fb7be94e446a0cda8dd45111a41f6f74ee5498b853d9fd361f683d4db558197a1951fc79056b516cff6fcd32cc32877744456b67e3 SHA512 948e49719c958e8b7cd1c27b9d413df6d032189801180540ee86b927d5dd53ab4b8906e5cc7880163ecc6abf11daebfc2fb96fcf8fcfd3e0b1f8c8fedaf54558
 DIST mongo-tools-3.6.13.tar.gz 4990848 BLAKE2B 022ddf214869c3a3e545aa9572f77f0adc21c0dbd6ea6ad9e083633c2e972b7ef77c0bda4354dbde9fd0e23c6dd02a7de8873d4b2c2a3e4423ea6f8e1c23ed52 SHA512 fac21c4841bfecba11a7765bb6c36d1fa19d4dd94f6f4168fa767fc11dc8b3caf04a5029becd09eba01dd694274e9cc22da8566ce878769e5c3c97016c162432
 DIST mongo-tools-3.6.8.tar.gz 4723878 BLAKE2B a1693024d60f69d25c268eaaa30a478b1e4c0042c5fb7a3fd6252ed00aef2fee3fba94516fe825165a1a57887ed38e4fbce488c48ddd4f45349f0b7a1b244020 SHA512 359e8ce2d847d005d48ff12bc2e8af73213d81cd1521d2b5b5ac94792468218248bebbe808e1bd8fd49234eab8480608f294c1b63f317aed58f456b84ef17dcf
 DIST mongo-tools-4.0.10.tar.gz 11134721 BLAKE2B f25e834622db8a2cea1658d9396b747666dee6a0e6471f5fcf351431f716735227b19f854c228ebb9ace8a7c27b8cdf83f8a5009107191aa6dd27c1a4c037505 SHA512 12764b2e2016ae3ab3f0ed1f5b9be9ce10e466c53b408ad2c01b26bdf39ca41a358acd07aea5847db2b40e3e89293f77efcd2b310e4e2bf3071873abf1b20f49
-DIST mongo-tools-4.0.6.tar.gz 10879606 BLAKE2B 9a7656ba1486df4b36ceb527735ad46864d7a04f2d0451fb4e04bbbdc09c3bb0ec922aa5daa584b93e123e1c3764c0ebef96a3566dd0d6b646a627d769645619 SHA512 d6185d7442a593d29db78889c55aba53e070bedd522d78d8c0bf52bb27f26c5fee6d010457f65774ea36a2e6d5280f38c95433ff76ed53ed9d74b1c811198cb7
-DIST mongo-tools-4.0.9.tar.gz 11134365 BLAKE2B ad27ad868b33a3c0802a0c79b5570a85c20106c71f38229e25a09a4ab8f0e6edbfe4338ce9862b2ba6b7836e4aa71fe5a3704a81a028a95d74168ac5107364d7 SHA512 55720766da5fdb9ee5a93d90be5ebe61ec4a5f5428097e9d6cb022472a2964c39b184531e1f59fb7780e834c3b03986e9edcc66e3f3933b3457b86260a6bbd8f
-EBUILD mongo-tools-3.4.16.ebuild 1192 BLAKE2B 8450719129b5555070d0e3f3192b3897a6fa11cc8af2774bfbf10e388c3e1c29fcc6a1ff60342d453f7163491022879826522a370714cf8223c9d2897252ac9c SHA512 71e06ae1e883ac8c7b0b5c569ca25fa35560bdbf24d5faac4c6fb3834b4aaea0b33e84747698a93b0d1fe090d45a13b527a31209cd6b5aa134bab9f3c7018936
-EBUILD mongo-tools-3.6.11.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
-EBUILD mongo-tools-3.6.12.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
-EBUILD mongo-tools-3.6.13.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
+DIST mongo-tools-4.0.12.tar.gz 11134652 BLAKE2B d3c9703046dc577b85cefe1185678e0029411ddd44d0648f9b09fc3ab41e3661891d18afd83bf1a148dc4c9208895f444c115948e515e09dfa3062e89d98fc24 SHA512 068d8c456386caddcce23fa8917ffecdc9b5c39fb6794c5cd1d9099be1f127ecf680b006055581dc3d90507072a87788b46be7410f0dbede42da64c664b77ced
+EBUILD mongo-tools-3.6.13.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-3.6.8.ebuild 1345 BLAKE2B 1baf6f2c407b2a4d1e81a6a04444b9c43ef74e6abd7e68c08c4ef1e0540b8dcb6c54c83a58b4687d2aa20f3fbbfd88b793e20058adaecb8e53b13e76a328ee54 SHA512 2286b4f40c01231648535b0f050e1ce36f5fdd654acd83389b35604d41e92bd584dec654b5368a7ee4e6ff7d420b19faeadc1c1c7f252093f365e23efb6604eb
-EBUILD mongo-tools-4.0.10.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
-EBUILD mongo-tools-4.0.6.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
-EBUILD mongo-tools-4.0.9.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
+EBUILD mongo-tools-4.0.10.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
+EBUILD mongo-tools-4.0.12.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 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
deleted file mode 100644
index d2a369f77e33..000000000000
--- a/app-admin/mongo-tools/mongo-tools-3.4.16.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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.12.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.12.ebuild
deleted file mode 100644
index 092d770686fb..000000000000
--- a/app-admin/mongo-tools/mongo-tools-3.6.12.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-DEPEND="dev-lang/go:=
-	net-libs/libpcap
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( dev-libs/openssl:0= )"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-EGO_PN="github.com/mongodb/mongo-tools"
-S="${WORKDIR}/src/${EGO_PN}"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv ${MY_P} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# allow building with go 1.12 #678924
-	sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
-}
-
-src_compile() {
-	local myconf=()
-
-	if use sasl; then
-		myconf+=(sasl)
-	fi
-
-	if use ssl; then
-		myconf+=(ssl)
-	fi
-
-	# build pie to avoid text relocations wrt #582854
-	local buildmode="pie"
-
-	# skip on ppc64 wrt #610984
-	if use ppc64; then
-		buildmode="default"
-	fi
-
-	mkdir -p bin || die
-	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
-		echo "Building $i"
-		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
-			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
-	done
-}
-
-src_install() {
-	dobin bin/*
-}
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.13.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.13.ebuild
index 092d770686fb..11f797e129c7 100644
--- a/app-admin/mongo-tools/mongo-tools-3.6.13.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.6.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.10.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.10.ebuild
index 092d770686fb..11f797e129c7 100644
--- a/app-admin/mongo-tools/mongo-tools-4.0.10.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.0.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="sasl ssl"
 
 DEPEND="dev-lang/go:=
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.11.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.12.ebuild
index 092d770686fb..092d770686fb 100644
--- a/app-admin/mongo-tools/mongo-tools-3.6.11.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-4.0.12.ebuild
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.6.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.6.ebuild
deleted file mode 100644
index 092d770686fb..000000000000
--- a/app-admin/mongo-tools/mongo-tools-4.0.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-DEPEND="dev-lang/go:=
-	net-libs/libpcap
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( dev-libs/openssl:0= )"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-EGO_PN="github.com/mongodb/mongo-tools"
-S="${WORKDIR}/src/${EGO_PN}"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv ${MY_P} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# allow building with go 1.12 #678924
-	sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
-}
-
-src_compile() {
-	local myconf=()
-
-	if use sasl; then
-		myconf+=(sasl)
-	fi
-
-	if use ssl; then
-		myconf+=(ssl)
-	fi
-
-	# build pie to avoid text relocations wrt #582854
-	local buildmode="pie"
-
-	# skip on ppc64 wrt #610984
-	if use ppc64; then
-		buildmode="default"
-	fi
-
-	mkdir -p bin || die
-	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
-		echo "Building $i"
-		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
-			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
-	done
-}
-
-src_install() {
-	dobin bin/*
-}
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.9.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.9.ebuild
deleted file mode 100644
index 092d770686fb..000000000000
--- a/app-admin/mongo-tools/mongo-tools-4.0.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-DEPEND="dev-lang/go:=
-	net-libs/libpcap
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( dev-libs/openssl:0= )"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-EGO_PN="github.com/mongodb/mongo-tools"
-S="${WORKDIR}/src/${EGO_PN}"
-
-src_unpack() {
-	mkdir -p "${S%/*}" || die
-	default
-	mv ${MY_P} "${S}" || die
-}
-
-src_prepare() {
-	default
-
-	# allow building with go 1.12 #678924
-	sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
-}
-
-src_compile() {
-	local myconf=()
-
-	if use sasl; then
-		myconf+=(sasl)
-	fi
-
-	if use ssl; then
-		myconf+=(ssl)
-	fi
-
-	# build pie to avoid text relocations wrt #582854
-	local buildmode="pie"
-
-	# skip on ppc64 wrt #610984
-	if use ppc64; then
-		buildmode="default"
-	fi
-
-	mkdir -p bin || die
-	for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
-		echo "Building $i"
-		GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
-			-ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
-	done
-}
-
-src_install() {
-	dobin bin/*
-}
diff --git a/app-admin/mtail/Manifest b/app-admin/mtail/Manifest
index 869e25e4d700..04e3024a5a15 100644
--- a/app-admin/mtail/Manifest
+++ b/app-admin/mtail/Manifest
@@ -1,4 +1,5 @@
 DIST github.com-apache-thrift-4c847372eb9af8ec0b21ace31840eaabfdf32660.tar.gz 3188272 BLAKE2B cd3f1c71b4e3845d609f85f06d309c79bcd261875a2bfdb9fc530869fbe3fc9027ce56af32a4d0cf83adcde72d5e8e17423e3f4dfcca17b852b77062fd98a161 SHA512 0e0fb5f5881cfe4a6ad35c1b02562dcf8cfafe31b95dd4ad9d7289dcf0778b4bd04003e3302cf848fe7f28f3886858aa98c29ff83985639dbeb56c09520abf21
+DIST github.com-apache-thrift-v0.12.0.tar.gz 2960476 BLAKE2B 243b1691c0c3e52c13839d8170f959058c2c7851f53ce619c623e20b4c0c5e842ec877ebca8a18a285918643883f49759685936bcb89154946e214353db72f0d SHA512 b4154bca6ba9562d2d0aa7835aabfccbe1f065cea8b254539659bf357cd0d2f1044037e78c4030fa625853b544c1e36ac6b3a02983bb2b355ce9f6eebcecf8f2
 DIST github.com-beorn7-perks-v1.0.0.tar.gz 10866 BLAKE2B bebb0b77adef45fd5c89302ba637e3b5e8e918276ff798dbeb11fbf9d490f3efa760cf4685b21c8a736469fbe7ebce3f20bbcc66092766e418a654d149caa401 SHA512 23a6660dd9e806efc841fe3acf702dc3471808770c86cbfa3353adfa9d9534eb6d20591bb60be2c798ebf8823907b2d5188339869f4b0f61bb2e9ecf74b4ea77
 DIST github.com-census-ecosystem-opencensus-go-exporter-jaeger-v0.1.0.tar.gz 26965 BLAKE2B 5f962ca14b0c046f01d13ca129b6018e2554f2dafe49c508c0a830cad20d0c8e641563d3b96c46542f4997c892bc398cf7e6cdc10562e07681f398914e165bfc SHA512 752e05698d1d2429008c4a0f17f4ee982f26cd2ac84180a9b3bed82813b5f268e22f8d31f92ab1c812fdb0733e0d43bfcd378a3532957b007e300f3d15d59e4b
 DIST github.com-census-instrumentation-opencensus-go-v0.22.0.tar.gz 162290 BLAKE2B 24c2d2700b21fff2189cff831c7d7aebedce740b087219650cc38257a6a9589d37b209812bc2da476b04a5eeafa79dd2dd185460c908f6479b9154ac5eaff970 SHA512 e8b69381ac64750d259fb21c35aa80364d692ed02a15d7ba6ad29f43101290f0e36fca2feef52c29b1d2d83201495f6b374cf4f9f8208222d1f9609ba861dec3
@@ -8,15 +9,18 @@ DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.g
 DIST github.com-fsnotify-fsnotify-v1.4.7.tar.gz 31139 BLAKE2B f2d0aaabfad525fb640beba78991a858ad23203a557a69fc15d2f017b2a693c64c244de435682b1cd9d59e89a97e4ba60c7f95fa99a6145a9dea73b0f334936e SHA512 840943043c49c837641f04b976f2ba610fc03bd31030ca6442744d51fa9241da1905730ea11466e249a5bd37437f1e2a433a012a64ce872a1562c941bd5bfcbf
 DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
 DIST github.com-golang-groupcache-5b532d6fd5efaf7fa130d4e859a2fde0fc3a9e1b.tar.gz 26034 BLAKE2B 0e1cb9cf0db885cffa8916ef423f6fae69af3f1d08f572c4282f0ae4e4f7ee4adf96365662d07fa1fd8731fc6902e3b5030de0e9f61b43c5e7eb4f31edd83021 SHA512 1cf71df178261074d409f66dde0741d9c2aafd6ddaf878fb0ffe5ee96d5b016da427978a698e74258d28d178854a11fa8905d12fc722dab471357a9b3545e924
+DIST github.com-golang-groupcache-869f871628b6baa9cfbc11732cdf6546b17c1298.tar.gz 26038 BLAKE2B 154828b6d5f8be97ee9b462a766834e36f8012e7e15a8d7d30f0a5a8a3d1773aeb9b103b3dd1470f7553fb5a5ddff52860565dc6d47f0c49af608309d1be67b2 SHA512 0245e645d9cdca84f8413d58f507a9bdcd8b047784aed2a9175cf31ecdd9de19a088afdd28a1079200fd13ad1ba6f647d29ba54bbeff10811af8cccdd0bc2837
 DIST github.com-golang-protobuf-v1.3.2.tar.gz 312285 BLAKE2B 381ae3c4bad3d3b3d489a3b66752e9e2405d17d9ed2c55aa1ec06ce6c18171b1c7625f6cc6e28490551a6410835f6e774a408de39f6e9ea9b3cddaf46e3b859a SHA512 ef9190f7773b18005760eb755a1dee25eff38c188687033362635e2431cf2c7372a59a3fec91acd6e4f63aa31d08391f7521a8dafef7895268b6a1a78735dd8a
 DIST github.com-golang-sync-112230192c580c3556b8cee6403af37a4fc5f28c.tar.gz 16835 BLAKE2B 51efe53ea7ab1f11f8ff078fbfa91526b97a1d918101bdbc755aa500424dda860d3a11195c1e44d033eaf7e0d09e7f327e404ad9af84f4b9747d8805b53dcf10 SHA512 bd90bb14e688fa7613d83dc8718bbb688a2f05cc8eb8c3dfbbf71daa7dc08e35044803c4bf8e5d5aab625a612e986e6f76c822c437f52132581ac37e0e2e92f9
 DIST github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz 796903 BLAKE2B 4e31f27784cdc5781628ac082d7994a5559be59268003366a3185eac6eb514495f6d82ba13c3046f1061c6abc68712ae8d0505ab7567c8e6057b90f3217c272e SHA512 580bd4cfd26d82aa8c6870eabbd289b76f2ba529ed8496428b29e482ec39bc617cdbcd2f2f2d476ee93526bd18550dcd239085b9f74fb4d24ccb87a3b357bff6
 DIST github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz 771129 BLAKE2B 592e1af8d74e77807a65901b576bebacfca5b2331c6943031720a873bc7782ef35cf3300e5307c79164ded89394df97e7342f73168f4e2354b13cca9260785a8 SHA512 96d1b7254d16c107a5496766ddfc2e56b56a31fe9c4bd34c23ee814911036145d8327203302fbdcb6bcb9af1022073608ea123c6df661132392ecb611e427c96
+DIST github.com-golang-sys-51ab0e2deafac1f46c46ad59cf0921be2f180c3d.tar.gz 1457421 BLAKE2B be5b47b3cdbf71b3ae7ce7df7408e1b7d84781c449194fabec4058fdcc6f27420b6ec9076e13e26d2afe39b87dca0b223dcc88c32d62886258c8367fe472ada1 SHA512 7c092e95ecba7bf546f919ffbca2fa6cbb4baa54489566a05e1bb82c022213426d9f8d48f733481cd61bf7d9fb7f665ee8f1c2f98548630f0d1c2b3256068966
 DIST github.com-golang-sys-fae7ac547cb717d141c433a2a173315e216b64c4.tar.gz 1457099 BLAKE2B be15e44efee86a88a411fb1e2c437e0a28a78e146f489e0bcdcadcf26a3b4554eb43324bfcec65ee76357b962c7fb32b20bcc737c26d37b75b57b231d67d4f45 SHA512 6a768bd9567b667015345ec668b8768240af0ab974629aa9b8ab86ed3fad5920b6f0f1ea434e614f477d1c07b6c5491d298efa54eefbfdffaaf4d46acfce647b
 DIST github.com-golang-text-4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz 6112758 BLAKE2B 88f0ece79f03800d6482430d569fa9b65d8ec4b15d42f65706ca665349346961ab273d3a7d2d0676d0c6c05a12d08f75c1465fd0ef632611b7b606593466e5ae SHA512 9fc536d4971e8861c5b905dec44fc7eddfaf8b0dafd5f904929bc2b63a65ce3fa28108d3f9f954a9db8d4ed24be532a519bad41e09e8076f9b75e6564f75f7ce
 DIST github.com-golang-text-825fc78a2fd6fa0a5447e300189e3219e05e1f25.tar.gz 4624908 BLAKE2B ca7357d28720c08199b206ac0b88ce28ce281767683503a1d09de002d9c97f10360e274d17405d23d565b1f62d42f2f7fa4387138fb5188052c110037cd16114 SHA512 6b2e721540b1f7ad8dc5c0a7ce45d7631721f223f484e58e561ed482bfefca7a8e4068c68abe33ba08e1db9293d7f99223859d8ba525c868798ecb61995c3f93
 DIST github.com-golang-tools-a4ae70923768403983fdab4e1d612d79c08ba465.tar.gz 2255154 BLAKE2B 45597a951f6c1c678a10fe3fb968cf5eca3b9328f78c57335ee9a45801138b8f169b953190fe293a271efa70c6f1419587cc5aa737f87b217c7b2bd6cabc7c9d SHA512 8a8ca4fab9a691bea505c2953974f29c95c488e81f794daba2edd7b9211b8a309db5ca93a008cbeacc0c967760a7b5182f10ac33da1902cd342461348fca56bc
 DIST github.com-golang-tools-d73e1c7e250b19f9948138e2df37cea712e8f06f.tar.gz 2132073 BLAKE2B 49f9c936f877ae74121a74c24d8e30e9ed1b6d61dd8148562a0e1eb218e1387d84e2df48df83f542d85091bf41d63b6e253668e1a4baf3e218583fa80dba5119 SHA512 e59d7d73fc8bf7b4c56cae8749916b8cc22f9973a9892f7deddd42c0272cc547b72254976b499b518e961329446fa7773ea235225810d28af0af0065720bee34
+DIST github.com-golang-tools-e713427fea3f98cb070e72a058c557a1a560cf22.tar.gz 2202687 BLAKE2B fb0d6f94112978c5e1fc77564df2476933003f6c08c5efb40623576d7fea71344b7795490eda34897e7a188e009c04e4c85085515094aaa706af11dfe5365569 SHA512 be3dea7cb99d8eaefc0fd821f87651f9c3e2a43519bc09d50c0cf58e062ed857f1e6f24bcd0d94e2b81dc08de82171798397d55495e1475a33b21fd7aeeec11b
 DIST github.com-golang-tools-f57adc18217d779aa42266ea71a545827755a77b.tar.gz 2246529 BLAKE2B c6a683b6e490b34c219d8210654d87623aae6f2f2fdb8c716daa54927cbf4250d8522dac00c42dde6c1178e5a843f1fcfe15b30e550c57ac7a5175a152e97353 SHA512 147c4541c56f31b030a45eacd6c87afeccd1b8039bcfbc8882b6a4466cf3fcaba504214938085861a9253c36dbb544bd41b3fb4b2be7f2de5712e823c375890e
 DIST github.com-google-go-cmp-v0.3.0.tar.gz 76127 BLAKE2B 8f9f20d328be91d5a2040fd0a27eaa98fcc533e0f600a8ecf9c21fbd023fe5428dc94055203fec6e4940e0ef7ef378ad8a0480ebc82b40e04beba1cdfbc86b04 SHA512 74c39cdf2b73cc9219082a20083ef2a104e77c539b34d697ad36d5e0a203fb77532fb5a9bac365c1d8957237a4d165dcb5ab31d32c96014e3090535f812ee1de
 DIST github.com-googleapis-go-genproto-c506a9f9061087022822e8da603a52fc387115a8.tar.gz 5250363 BLAKE2B d0f8bb5058d661f4addac86d56820b6260356689ebbf2b5488467a4e7e40f7873666ba1c9ec5d4d7c29500ebb0577992da13a6ba065eb2c8831cf49c4f0e8102 SHA512 6620b43a765ab1c6bd9508332eab94c6abb10f1d1bbe3d09d91e3298ccfd255ec19698ae043f4a4fa1143ac331a59e03ff72a70bdffef78db28786ab9398bcac
@@ -28,15 +32,19 @@ DIST github.com-pkg-errors-2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb.tar.gz 11481
 DIST github.com-pkg-errors-30136e27e2ac8d167177e8a583aa4c3fea5be833.tar.gz 10912 BLAKE2B 189f7fc6a465a4841f242f8222681f0a80bc251151407d14abd585c65f84204c0ce80c7f0bfd6ea5b03c8790021b7436bc180d3571440ef98a85dbffd5cfd60d SHA512 c38f35def5c4ddba089250f2fde423c53d1f0b33dbba4495bacf2fe772b1216672305ada0b353882a296e4b7fc49c72e99633ed7465b03c31854f762e2890277
 DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c22dc8a035491098d138d6254e8b833f58f4388a7bd172a15a22f3dbd6b0ce8909b6167f62561d32ec3d21566eef00005c1a025d SHA512 8f93cdae71789e417da11a45c667954169ec4adc04fb618f938ffc2e513cb021f140bc2b94f3e634fd4f19b73be7c9bc483d541bb7baea54c7c9700becc4d438
 DIST github.com-prometheus-client_golang-v0.9.4.tar.gz 142795 BLAKE2B dcf60337b5afe26825c58b88db415cefeeda1127d529eca1708a8b79594cb7cf677c32bd644408a1864258a47b28268d7b650416db2ca67c6298831ceb1e91a2 SHA512 45c07c0673c2db1c5a7a6bb47d26d0a33c71efac52ed38d6540bb81cfdc37f4160d112614a7d771ff70dbdf59b6837854c4c44674d63fd2df62e8d26606f1d4e
+DIST github.com-prometheus-client_golang-v1.0.0.tar.gz 138046 BLAKE2B 17eff94ed0d813201fe69386d4050b19630ad086ffb7566158dddaa33fbb2aef0a8bbf8c40d0edbcf76503109998ca10ba15d3e8e26817f8b861f0870f166193 SHA512 ffe60ed4a5f00f39639b5218bfdde61bcb40c597e5af977fdd1ae2b0e57e5ae0c84baca36e85b13c1f4eed297fdc2055606112472c3a7bdb58cf61d1daf15abd
 DIST github.com-prometheus-client_model-fd36f4220a901265f90734c3183c5f0c91daa0b8.tar.gz 57542 BLAKE2B 16f73bf9a1dfde0dd3152e11ab4d3a49271209b02541951471664a1226c9211f1b77ef4a32faf3e184888b080d0c76e3d02d03e21d688399d7e3c14629df738f SHA512 bee4b4ffdb56633ac763dd624d03db5b0dae433e2a2d1e4ff925e34444d62cbdb879d68574c7f8133f11d718cce3bdc1d686508acfb470e7dea0109c98266b1d
 DIST github.com-prometheus-common-v0.4.1.tar.gz 98631 BLAKE2B 1f2d4780c6e0bac957320ebdfb83c6ab9de28abe8b5ea6f75d76d8af76ecef37231da82a070da28c5e05886241c7db0f9538cf85e0b26d20aad610639310e9a4 SHA512 36860b02c9ed11fa02aea619e2e7bcb58f2ade54dae2210194d6b83200ea76e743b07e62d8ac8c20f31806bb0ec680c579da359d41d4400ce50ed6c902e9b534
+DIST github.com-prometheus-common-v0.6.0.tar.gz 99696 BLAKE2B 4d49d93ec732c963ce3784aa7a074e91f87ae58acea46a1e6b8b58b012332b6954f90df83041d097d86ed7bca992fb4214c1a05c11746d8f74f0001d4a822abb SHA512 9ed108c0e13d879921c9f9892713f1de1da5fccd03cd11bee2b4728fb09aa3eb8adfa98f2701a6d68fb35b8458c4d59027e48ec0e94e90a441cedb1d25c08945
 DIST github.com-prometheus-procfs-v0.0.3.tar.gz 91880 BLAKE2B 37c8cd63bd7cc6b00c591549a51352487166ce5c2e4fa0c2144288236f580598f48cfb6f83858b7ca5dbe00e550e3911b8dbba24405f6fa8efbd36050ea70d80 SHA512 4e74a7f5488b7d8c16de3311ea0db2d4e5612c30b90e7ea853afd3ff27ab76af4a40edc3c114d0a98f4b61f5ec730148e32c2fb0e7709cdadc8b87cc2b75895c
 DIST github.com-spf13-afero-bbf41cb36dffe15dff5bf7e18c447801e7ffe163.tar.gz 43576 BLAKE2B b3eb215e8ae38ded0c85405e63fab7876f23948dce8272e8a3fc4d710c8617982b62aca0f57c97953340f8eecd87eb7eafce63a1d860d2fdc19d3f433b519d3f SHA512 8e200be7a5b8816f5b6ebf7df4ad61a7e0bacad56fc9f269a16a32c83cd0d293530e71fccd671545c812b27e70eb5e947faddaf4d765b67ce8f2eecb9eebbd9c
 DIST github.com-spf13-afero-e67d870304c4bca21331b02f414f970df13aa694.tar.gz 43416 BLAKE2B 0cc5f646df68a0b2cb4625810b730ec49f984e050084933f2686d2d433ee7c9abdf2e37838c8b8e1970ffc630eca10dca142ec112686493664e32ef6ab39c965 SHA512 6b428a8599c132ddda18b6b6fd1ae6dfc8d11b39e4b3e3e0e9b763571339c2a5e0a2c95a54a6953b82c45b92775ed3ccc0b152e9d9a2fc649f10dd754b3fe2f7
 DIST mtail-3.0.0_rc32.tar.gz 515426 BLAKE2B 88bc77175952f77c18e4dacbd8ffddeded3fdf804b46e569674828f68666f4b7cbfe83832557d0dc57011e47cb2af24752524e5602d6a0fc086deb3cb1b15501 SHA512 0716d6d539b98681504922b1c52d0c49ec69399f11c0f2080163bfd94aa0c6be9220335624b1ed55134c3b38d7feb346346c02296262cacc4ed9cfec9b165409
+DIST mtail-3.0.0_rc33.tar.gz 517922 BLAKE2B 4fb9e395cfc50adb3f6d04e955879edcd40437e4c05f3668af15751f4cd159e9130138ad6602b29e6746f9dbaf661e46eaf2887a50005efaa0ab728358c6ff32 SHA512 8c7359cf75e9b80f6cb4af4f8e1237da5eee23034f1415a7b627ea7695b72027c9e94261de972dce6bf2d50fe7f82d7dd836f0bae27a7083cd98af272252d4ad
 DIST mtail-3.0.0_rc4.tar.gz 425781 BLAKE2B c957e8ae735395ce197d805f2e5228511074fda08427f180e7b6110a45b74af2fb6bff9670b3d452c0561b7fa4d93105804c631df03c5d73197a81e44a4a35f8 SHA512 6354d36303e37e440636f965ffe5685cc30a886ac348ad85f33e384e4cf0a3616328857362361fdf0f1759d361323d08f6052d481f76f6dd8454b1efe3a24e8a
 DIST mtail-3.0.0_rc5.tar.gz 432769 BLAKE2B 2098fca72a7ca1564885a6c4d7a0a1b30ceee74d3fc310b0b18542b5e7bdf14dd17d40d4f3cd1bf62d7613375a470fef632bb9b185cc082b5633481e126e0481 SHA512 74c8fe536bde628cb9874a36a4693eb55e2e490d5e6d80a60d7f1f17fea66f8cf7a95345da406b4d4eeca9e6a42d614086d92ed2f8fc9180019f49f8ddccb055
 EBUILD mtail-3.0.0_rc32.ebuild 2663 BLAKE2B bb5aca0cad0f4f28b8d0651461880e6ab450f269f0994d35a0341f6fe12958b750518c2a8c7bbafc186b7a0e19ace20fab96e35097e39db688160cb6332d5640 SHA512 596fe3f717a6fae41e7f1ad6d933241cd5c48833fc79d1db6ba9b31fcdcf5eb6e637cfc0e8bac25b3c6b4f14c49f77a642a7f23c49c4f5e6cdeacfa35249c153
+EBUILD mtail-3.0.0_rc33.ebuild 2564 BLAKE2B 90e26b0bf7476707fb3d18cff0f672489f2d9bee17e863f80d61c4d66ca57151a2f89f0f48f3be8c09debca9c6c51cdceefc496806109c01ae4e277f697665af SHA512 a5bcff92cfd843afba84aaa698724f95dee458ed90469b484c892817722b7abe044909752def91860c79dee85772543cc13433cb8d6cb6430f7475290a9b4a54
 EBUILD mtail-3.0.0_rc4.ebuild 1538 BLAKE2B e571750ebdfea77312619632ee2a9d1aaee6cee63f1889feed375a3c15ccbed122a01dbe5e3dc266ea4b1916327c638dff14605f657ae73220dfd3f40c15c693 SHA512 3ddae954b727c0023096633a0a98e31bf392a11d615c62a97412e2373b1b7dbb9f9cf6de5cbd97a443ef38ee1f6fe85f44bd3c874699ca68b339c2d0baf6595a
 EBUILD mtail-3.0.0_rc5.ebuild 1539 BLAKE2B c058b720caa435d2e257c7ded3f1c5c95347ed30a8339439450da5d01b17961151b8787e15c0cd01519ed13dbd1dc633cfaf5d7e1b81e2f3bcec9edfc60cad18 SHA512 0f5ac027289adc7f911990c24c3bb20ef58caa5116fabbc965dd646e6dae0b7576eed5ee5f6d3674e626bf014b8cdea7003aaf6a76ace1b8206df450acf4134d
 MISC metadata.xml 295 BLAKE2B 83cc868475f40ef5e6bd8fa8824e8959615d7589fe4985273026ed4ce02b5eee2c631cbdce4f69e67f9a019252385bf4e0bcbef0e2f5083770955ca351be5961 SHA512 ed1a9cc5e20a4063111ebae0942a1f23b30363c91e22099046c9628d8636b9500cd204a11b22744c3e881d04ebcef9515f47efe636bc6a8a7d992fed9e2c6f95
diff --git a/app-admin/mtail/mtail-3.0.0_rc33.ebuild b/app-admin/mtail/mtail-3.0.0_rc33.ebuild
new file mode 100644
index 000000000000..fa27f3eb0059
--- /dev/null
+++ b/app-admin/mtail/mtail-3.0.0_rc33.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_VENDOR=(
+	"contrib.go.opencensus.io/exporter/jaeger v0.1.0 github.com/census-ecosystem/opencensus-go-exporter-jaeger"
+	"github.com/apache/thrift v0.12.0"
+	"github.com/beorn7/perks v1.0.0"
+	"github.com/fsnotify/fsnotify v1.4.7"
+	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
+	"github.com/golang/groupcache 869f871628b6baa9cfbc11732cdf6546b17c1298"
+	"github.com/golang/protobuf v1.3.2"
+	"github.com/google/go-cmp v0.3.0"
+	"github.com/hashicorp/golang-lru v0.5.1"
+	"github.com/matttproud/golang_protobuf_extensions c182affec369e30f25d3eb8cd8a478dee585ae7d"
+	"github.com/pkg/errors v0.8.1"
+	"github.com/prometheus/client_golang v1.0.0"
+	"github.com/prometheus/client_model fd36f4220a901265f90734c3183c5f0c91daa0b8"
+	"github.com/prometheus/common v0.6.0"
+	"github.com/prometheus/procfs v0.0.3"
+	"golang.org/x/sync 112230192c580c3556b8cee6403af37a4fc5f28c github.com/golang/sync"
+	"golang.org/x/sys 51ab0e2deafac1f46c46ad59cf0921be2f180c3d github.com/golang/sys"
+	"golang.org/x/tools e713427fea3f98cb070e72a058c557a1a560cf22 github.com/golang/tools"
+	"google.golang.org/api v0.7.0 github.com/googleapis/google-api-go-client"
+	"google.golang.org/genproto c506a9f9061087022822e8da603a52fc387115a8 github.com/googleapis/go-genproto"
+	"google.golang.org/grpc v1.22.0 github.com/grpc/grpc-go"
+	"go.opencensus.io v0.22.0 github.com/census-instrumentation/opencensus-go"
+)
+
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGIT_COMMIT="aedde73f9c304e4d558a53ece22a5472c87a7fdb"
+EGO_PN="github.com/google/mtail"
+SRC_URI="https://${EGO_PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+DESCRIPTION="A tool for extracting metrics from application logs"
+HOMEPAGE="https://github.com/google/mtail"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+RDEPEND="!app-misc/mtail"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	sed -e 's|GO111MODULE=on go build|go build|' \
+		-e '/go get/d' \
+		-e 's|^branch :=.*|branch := master|' \
+		-e "s|^version :=.*|version := v${PV/_/-}|" \
+		-e "s|^revision :=.*|revision := ${EGIT_COMMIT}|" \
+		-e "s|^release :=.*|release := v${PV/_/-}|" \
+		-i "src/${EGO_PN}/Makefile" || die
+}
+
+src_compile() {
+	export GOPATH="${S}"
+	export -n GOCACHE XDG_CACHE_HOME
+	go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}/vendor/golang.org/x/tools/cmd/goyacc" || die
+	emake -C "src/${EGO_PN}"
+}
+
+src_install() {
+	dobin src/github.com/google/mtail/mtail
+	dodoc "src/${EGO_PN}/"{CONTRIBUTING.md,README.md,TODO}
+}
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index f6976f815bb5..bde5cd304d8f 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -1,6 +1,6 @@
 AUX ras-mc-ctl.openrc 295 BLAKE2B 8f6da9d6d4e392e4255ac70a57ece6e665771fc0f91c64506af6fd2157a5a4c159921ac341e66d18176434c523b6060c0cb2cabee6f7ca003e1896c0b6b6a266 SHA512 be635afaf5182907b4ae085d8c15b7aa6ae07e19a277423fe180a5e0524fa33747ceba8fe991cc263341b6c15443d3aff8f6c6c0311a87194687e25fa8387f32
 AUX ras-mc-ctl.openrc-r1 419 BLAKE2B 50239d64b95c1759a2fb88107b78875b9f6227c256c2a59628b33dfaf720c649e714afe24424f34e865d1fc46145daa8deda4e8612ef6c0d11ef1bf67b2c2e88 SHA512 f12c82432086bfdd0ee24a767b2c6dae9a50cb65038189bfdc2aff9447e5e734e1277d809ed3c7a55ac31034773983e1f46f466adabdd4e727b491c260c5c53e
-AUX rasdaemon.confd 107 BLAKE2B a3c0b7c09b1f3f76be0186208702858ca6ddcc9a9e912a88357e79e7f3aabe92b5a99f95c7bbe5ea1443e2ba2f8fcb83834b32a68774439165c7da0fff1d27ff SHA512 bc89a1fb03289bed3a34e84f593f5bc3506553ac64810ae360393cd33f6109e0a469990a79f2c56fc07905671c3e2fe9a70a65ba180df3855fdc4113ae5d4da3
+AUX rasdaemon.confd 109 BLAKE2B 20f78ff36701aa718e5dcb36b79949ea5f887ddc65219c335dddabc3440007d91bc5b53ffc499aa6ca018dd8108a2ea841b8ae111b10877be2005cc8c1aca299 SHA512 9e240c3a4c2dd741d2a77a0a9458e960da5480c40cd9b829546e5189d222b643b52c15252a6dc78aab8661d6e3c13b8d2288176c25cd8873b93b874b8d3c6c49
 AUX rasdaemon.openrc 369 BLAKE2B 81768b9a6cdf4696d8598dc61675b86f617ae543cdfda8166f961d9ab470ba107165b72be32370f71f52b07503f3ea948cf9d7ad10c2899e2e9b79f1e06e96de SHA512 eb91a3c54033a136e5b35aa769b5c01a0810970e77efa3f9efbcda5cf088e5268fd7bd9fff953bc47b9233a41e5321094b4d2ef85500dc0175f5be6a64c03105
 AUX rasdaemon.openrc-r1 484 BLAKE2B dd64b1b6164f74e887ebff43116bd23311b86a7bbdf7830beb4ba27ad3e2db33e2107c7083c23f14e50e781a339e49be8a69ee902cfbc98713de034daa5a82a1 SHA512 e27c08bc118edd95468dd466aea52764df5b400ce9acf2043bd035d2fadbaa3b953794869c1fdaa23320e9529960e97c9e47dd31e8d8f3f48a324090f784907d
 AUX rasdaemon.openrc-r2 424 BLAKE2B d3be2b06631ec3dc60e464b5fb38a4778e92a93fc284455f53f6b7c43a05d182b79f478362ed93a706b421ca99f6a21afdd2cbd53d125711bbf1d0f267304ace SHA512 2e30602222443e519cefc1f138dc537f5e22109fde2f8ebb0f8962abd926721389defc46cfa8db667db8618d4dc4257d36e9855367c3c8f2b7d28cb8684a4adf
diff --git a/app-admin/rasdaemon/files/rasdaemon.confd b/app-admin/rasdaemon/files/rasdaemon.confd
index 2b89db191cd7..3241ef438dab 100644
--- a/app-admin/rasdaemon/files/rasdaemon.confd
+++ b/app-admin/rasdaemon/files/rasdaemon.confd
@@ -1,2 +1,2 @@
-# pass the -record option if sqlite is enabled and you wish store events in sqlite
-#RASDAEMON_ARGS=-record
+# pass the --record option if sqlite is enabled and you wish store events in sqlite
+#RASDAEMON_ARGS=--record
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 6e68e6284d9f..a04968d5292c 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,37 +1,13 @@
 AUX 50-default-r1.conf 1952 BLAKE2B dca027ea6073384a2ec5867722028f70599c51fd8c46672ce647e84a7de4b3a0dc5bfaf43f7317eddb902c4987266ae67f88b43375a51e82a3ffefbb61c4d099 SHA512 1bc4d8059d83de57ff44d34265b0c3881bab7889f51c044728ba462c9105c89425187f95b6b01d6d6d103abde22a9dff063e5d6b90027ed87e9f851f9b1ad5b3
 AUX README.gentoo 1126 BLAKE2B b7e3881605c2bacda7f415b3f3195e1ef405a8e9fc7fd627fd35b0ab90966cbb29c9a85fcf2df6092062c5af353d44a02d3451e3caa072f4fa44d681702e9807 SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384
-AUX rsyslog-8.1903.0-add-missing-tests.patch 17584 BLAKE2B 7c2c67d50d10d228e7378a58e7a2df3fae2447202e11001f20d486aec576ac3b3079003ea8ad12078f90d4af1953ee4082e9e1f26ce8b7381a818bd4d31051ec SHA512 ff195e7447d565f9ef7cf8a8a2c731ab178639f4e15810e638c4a916417639cf054840d760967d91de068f23d9edf25cde38af21f27a0ba08e206f3395720e9f
-AUX rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch 3199 BLAKE2B e415e5fbbe62b8fc8ffd67bffe75402e472207559e9e4a58e4087f2844325cd6ff4ac07f00c7db99a2a1071342b89a936782484cfa4a98109a98d0498cb0a208 SHA512 874531950df2d754535f37f8b1c81fd584ceab9e80483011fd7aa3e04e04110b3f751ff534c425ef1017a78e72f2845bf8cae7da5cec204ad0df61462b272d42
-AUX rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch 677 BLAKE2B b90627a0d9affb8afe18ef9fb4377c791796c4f345fd8d5226544e3488661908d25651339377aaa5ff2c876e9090133ea7109d44772d9d6b0209861f0732a12e SHA512 dbd032c42edc5a1a9c67d806298ad3230dff9c13d209f014b45c78675f62cec613ca1989f3f73da40faf8a1990453a4b32433db14566f6b99048caf4dc2d6499
-AUX rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch 3181 BLAKE2B 13b155367c6b7fed4f82505a884ed23e32223567e5086cb91f733d20c43aa101bbeb169f36f34ed0dff8815687cc5dfe942ec248024aa29a0a07c1eb3ca3e0f4 SHA512 dfc980492bdd3fb7fafedbbde4e79e61d7fb78665f8f0654a877de4f2f4fa93ce2d23051617f90d9712ef795d8164e1d610321b0dd27164d0cb425c8f1a77720
-AUX rsyslog-8.39.0-fix-liblogging_stdlog-linking.patch 12038 BLAKE2B 4fe26dc0d8e60e2b37272aa0743fadf8d3ceef6937028d8990b84c936efc289948f2c98312c14296c3b5d43966982edfee9bbc53b17df22487fd2711147e2a1a SHA512 580b65c1eb4d551d48203720e9621d7b1371145bdc3c6e8c0d638c686038cb43d436e42ccc5b4223e2b16db040eabcecbd71288f99c90698636d6b6be1517308
-AUX rsyslog-8.40.0-fix-omusrmsg.patch 455 BLAKE2B 6933dccfbd3eeed4ed00f08d9bc748428e705c3caad04e783664cc46103f0e4b40d96ac9e82f93e9083484c4bc58a683c52d46f6ce6ec74f0d12a58331f77920 SHA512 7164572c35fe28aab9767291456fb403b0e9d047c64df8c6a5a11c62a06269a4d2450d531dc0dfdc184f0ebda61ba4589c1d719d801633c2903a349bddae21da
 AUX rsyslog-r1.logrotate 994 BLAKE2B 36dee881c2cb79ce69678c7cb12c71fb70d970e5e10728a8d2b8acf2c08f613cea9c2a74d78ed7b75333147a6b1a553fe281956990e044a9db651c7486690dee SHA512 5ca68b4eec5bebaed48edb69c85f8338273db847ab1cc6999ce7cfe06644dc3854c3040e0ebd8a4900c213b267b2a081e7901ceb4e58f9dfdc7dc036aff02b6c
 AUX rsyslog.conf 1562 BLAKE2B 3abbc4c13c8c1d3817ac9a7c7f048aa1a8d7f279bf638dc91d15a785ad42c1b34a61de0be33b4ffa218a655849aeceff3e8686384e1d77472417235ce453b546 SHA512 1720174fab020e2de590f3d6bbb03784aca1928fe05f7e75e02fb4597cb8b2ee755e6deb8e8f989060511044ae483f791f496f24e0eecaf27eb9e0b5e20a2c7a
 AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad11443a8502ad68221c3f8e8b0db02ba3ad2b7010483364d36a5b526a461d3465972b74d2cd36ff08747 SHA512 a7f8621bdd490596b09f9a7583dd0c992006c55335b2e6e687bef4141bb18cd4bb43e23f590a138e9c8d5a3cbac0cc46c3b01c7d3ff9f9dd3c53418b13b0dd4a
 AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
-DIST rsyslog-8.1901.0.tar.gz 2750872 BLAKE2B 8bc07bd0c73cf309b5fb853e3bc66e555dee4284d0c8ede5b73420db7b42758f5fcfbc7ca90b618cc27e7067795f2725f5ed96f59170f3d2690a0653f2b69847 SHA512 2b8b2d40d3df4c47dba765d70fc716dc127ce776b31f217f78a3e1c2bf820e41799a5069d7f41f04ce39baead286ecd42fb353492873e3795aff704d686d67cb
-DIST rsyslog-8.1903.0.tar.gz 2786605 BLAKE2B 2c60450b5f5a54f3d4fe4f9f51c81145cdebb1b0e1dd4b76f2ad23803c8bb417affbdcc9b4a0d8ccb65b0e98f5cb5cf187ce219be3e44e44c5bd253cae5f95dc SHA512 0f698c264a4afba56467b341c094be7357fba08a6ee7a24bb1b053c06da04e83eb1832ee46b68ea21f8f4de841cd97aaadc46e78bb4adfe23604c9fe95103fa9
 DIST rsyslog-8.1904.0.tar.gz 2902708 BLAKE2B 515d5e32c2dc6cdd8dd51fc595ad775503438603f28828e9f1a427b184a5a61de32af2ee90334b7d56a9404106d74da47386a18a370278d5a16422a6bb09f556 SHA512 cccb48f06508d7e7c2dd788903f4d7ddb3020cdf6079aea1d52387c56b920f10b08957a79b5d420ccdb54cae50d1da6e5eb80cde9498bceaeda4f6ce37f694fd
-DIST rsyslog-8.1905.0.tar.gz 2911703 BLAKE2B 5767ff2e5f1104522bde2178ecadfacac3d0754fd746754b7b29509aea45c40b17cb37d0323e6b1116fc95f2e7b1f43277ef9c96695bdf89805f9ba90944f608 SHA512 e014d48c213723317b8d07e3083e32a480e2b896eccc0dc7a491798cf56fcc1e341acba64ab44c1d935e964082c405f2f1135bd420d821e163c148e736332d0b
 DIST rsyslog-8.1907.0.tar.gz 2926855 BLAKE2B 65c674e53bfa960e3fe5c7f41a304cf8736fe72e2391895dde9fdc17fabeb2f92fccab48965d5e1689a5852136a43a3355f89c9fa9d1d1974335ce80204bb4ac SHA512 2aa3f6106e48fa63c6d4389f83e7a3212817c626d04881682236055792cf5c9d8a941638c9a508c470b6a24c934ef5cb0eda65ea25179d98831afbe2a27c1519
-DIST rsyslog-8.38.0.tar.gz 2721798 BLAKE2B 578bc9eefce4893a9c1eb54ee7360cd9fa51b3c87ffe07a0fd5b122987f991835f603417243084de0b59286e993ad1c84237e61c44bc18457b3660668421101b SHA512 9dc3bdc4ef01c2af433478e182704694cb50849d811d476a03e4ce03b3c5aecfb506e7f1c1e51fadcd63da60b067d8011b92b8c9354a688fe66f7b6ffd8f9254
-DIST rsyslog-8.39.0.tar.gz 2721560 BLAKE2B 0680cb31d0a07e5676a5c5626e46fa174b8df08ceec49b514624ff8ffeb750bbf199f73af1d89b9dfad121a292084d75b0a1218fb33138f1d7a149fd730cb3d9 SHA512 f46ead433f703df4af6ddc4bbb178ea145d7d2a35ee7749c32b9889f299ba20c83ed76c246530608198e84fef1f2bf10097344c31d5df38b9e0ae47cf4bee479
-DIST rsyslog-8.40.0.tar.gz 2726022 BLAKE2B 33f7f2018200a20b01dbfabeeab592aa09d530edd313bb13f16c47cf3f67aebd9c465af3f1e468ca3d352cd83e4f4eee567c6fd54bbaee1723bee56f4631b440 SHA512 3d5d4f92e37ad9bf3767d5d7fc87fcb7956656f676a9495c78abd12fe9072ec8763b50543b198308a71d5d919721fb9b84b6725dd83a9d9b8a1639d81382c0dd
-DIST rsyslog-doc-8.1901.0.tar.gz 7768575 BLAKE2B 40bc8b038fd0210d0cac01704624d87c2a73701a7494e5970423adf14948e46d1cff6df5894a82e6664d891d0c2760a5a0154bc42fb410ecf6dd25f3166e17b8 SHA512 afcc592ce4bf0dbe048786627d87b783f1c99e7711c44ffcc41cde67b2b2fef55c944b5c90e7272a84bbec95b78c0174df634b02baad2ac5819b3611efc1cb98
-DIST rsyslog-doc-8.1903.0.tar.gz 7816457 BLAKE2B 0628a5e7f0a2c8229470f6b05c22fa0d01de12eace4f895e17a47e7003bf078be5f3b2df15cd13a4cf53384d285b558b0936308cb58e7c7e71796ca99447da3e SHA512 b42f950499798fd2bbf9e2ac2da074781955cc552628edcd928f25943b6b80d5f2e1a2eab3b8fb0fa2f6278f2b4366f096c3e976a91223e545b4306479ca4f5d
 DIST rsyslog-doc-8.1904.0.tar.gz 8042650 BLAKE2B 585fe5c63eee1fb46f94dcd3d529045b3900e08c291e0e71ed9bf32a6200e6c7283820b262bd56e9aeb74cc227ecd518caafec5a8f87c1d8523d5d7fd95030aa SHA512 da0ff00fbe71756b3c27fd8b94e88611452c3ba611e583862556393faaaa596ca8f32f694ad40a3e1df67385d9f9ca80db6a58f5d2e336fe95639dd7cd0de828
-DIST rsyslog-doc-8.1905.0.tar.gz 8054440 BLAKE2B 76f832fcbb41d405240f7bce4796edf4a56da5ff809ed846edbbb1b780a35837a8d061519dbec2e7afbe46a71f617d5f92f431f45f6723c055bab2fdf0df28fb SHA512 7b468aaa79a2098746bc5592f2c03270aaacb07dd06fd3be7a8c62bfe531b266e27265d873290f9a6bfb26135a4a6c49be96177a3449ff7dba54f1193c452ad3
 DIST rsyslog-doc-8.1907.0.tar.gz 8071764 BLAKE2B 90c18a93bb2f2c9158a4696245c44c36ab4c40597d1eb8df8af257f57aa17e71436bd60792c4f982ebc15395abacd53281046e4ae6df65c306f815e6599fb8bc SHA512 72dcddef6e36a92d2bdcf54072fff7516b6c731f43a53ef8f5d4ebdbe46bc7aeb63bbc3e739a6e5897602ea7705c4bdd8f57aa10796955ed772a6c7cf552c5e5
-DIST rsyslog-doc-8.38.0.tar.gz 7662314 BLAKE2B 57a121950a3f6630e4736a1ff998e93b543389107d146ddb148ecd2702bb208d21a7f4d77f2fd958f2a56e092341fc6a24ed1cc80a910cb1adb54c65b5b2da04 SHA512 e28a09ae2fcddc711d2cfd31207c9862192598e49964a47b41fc8fa3ae5b1e08b7e2589fb5af859d58d4bf028574eb56cac6514401aa56cb482fa1166863e6a5
-DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd17aa517c2fc875c46ac190428db6aa2a0f81f8aaed6e5b0b6991a5c13f45bc818be76c0fe4444c0eb45628ebf48b4956 SHA512 a6d09d384616a264fdf6e09fa0f61bd82a42340bac426d93119e11158f293dd58f894623aca30f2137e51bf701531f07938d014c9b8ec97d0a796447de3089de
-DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f
-EBUILD rsyslog-8.1901.0.ebuild 12354 BLAKE2B a5907ced4f42a503ce63d19bdb2fdcca4db442cd64e053f9858d3809e7a40ccb879bc00ae2021daedf6463cb16767413c9b530476ae5f4c326779a808657f390 SHA512 961b98101d517510c3de600e1e2e74cc5d7533de2d6317b53cce49a8a6d704729cf4b10b6f502d65c0ae876257ce8d42a46319b718763b4cb59eef03ebbccff3
-EBUILD rsyslog-8.1903.0.ebuild 12531 BLAKE2B e8ad30c6ca996894be5a84be8a8b19ec2354aaf44aaf915c8471c0cc51156080a45fd2c422d2dbef50904f8a820693ef5e1f93267ce9fa12b37cb863028dd91b SHA512 5918af3232e7d2bd9b6e8511a9f29f276b081ffe2a4f6b3c0773b737b97d104b0722a64a3506360ae8794c2b1aa7c8c6327d63a3fcf9385db6324a409b940060
 EBUILD rsyslog-8.1904.0.ebuild 12567 BLAKE2B 191746200f4a5e059c45f94ebc401a14afb6cfa5d5fff0efbeb453f694d7051f3ce550a7eee329a9f32ef1cacda575b395d1b3f8ad978cb5579a9247a7dd68c0 SHA512 3943480907c10c61405cf134ecd4e9284bb66073741f6eb638e3e568a6e65f829990027904b0d02f93fb00f39529343dac94780981e4d182821087b92b06ecd2
-EBUILD rsyslog-8.1905.0.ebuild 12571 BLAKE2B 0d892e66f94d73b20c0addb444edd904d6961cd7918adcc024f813776d766775fad7c0a288df2656f1cee14387d33949bf1c85cb86f85158b1a700393aa3396e SHA512 2826e3eeff416a5673f8810673097a524ea34718af98d934a8eac7a3417167d167ea880bc3ec1ff0b984ab6d95bf3344566d557978c0cd04052d177ca55992f0
-EBUILD rsyslog-8.1907.0.ebuild 12546 BLAKE2B f4d18548e77429e8696925f7d3e16e9b3b16a9845ae3c118f6741d3f0d2b96243ef86436a5995f64591557e0e418647e4bbf53a2900278ac09a3c1a44569cc7f SHA512 703242178569e869bc3584486827c8a8401dd71532929da9d8f2ce56861774bc1fa0c04da4ebe9de48ff4060add22da35656c4d9f497409e3a76a742270db1c8
-EBUILD rsyslog-8.38.0-r2.ebuild 12281 BLAKE2B 8debd0ba1551ece2c24fbfb8893204e592ed40682eeab26ea2b32febfbf1442aeabf3f7215bd5371fc9c6abfe6923da887f71d12be1e7e57193b03d6b65c4a21 SHA512 7c95fc07a96854386a611878a53b625b0d95615058c9c2c97dd2ad2e563bca1cb14e81be747dab108e7304734d2c2f86a8d626626ee52178dd769fefd8339260
-EBUILD rsyslog-8.39.0-r1.ebuild 12357 BLAKE2B 0baadf35229801863b6f2dcbafed210d8d9503595bd9410969e52006cfc0d34c52b9c6dece38285d6674ae757b9c1d223405d02813fea4d0c2e0c15e50915c5d SHA512 b7568c5217593aa764645793a8d92c6c116f8108c0b7e55fe625c463cadb2ca0a2e71060686fb100cea87e870911862fb5770dea07e866b98763596be56ed3dd
-EBUILD rsyslog-8.40.0-r1.ebuild 12337 BLAKE2B f2c9a511505a4656c5d39fb81ff65687d062bd78338865d702248ce77cbc9e55fe9edb0139d8aade2d793b6ad725a2f3060249959eab8e7278ca56dfc936df76 SHA512 f26f3f622e2242e70185ef62ff995394fd6fff830d6c21392fa0ce4bb49986c1417e14f1befb5923e08f5a2a15396af417f0a1f63acd7256d3f577d31da814f0
+EBUILD rsyslog-8.1907.0.ebuild 12545 BLAKE2B d04b8b22478f7acb2daf4752c98932fea66d2e4462c4efcd9cf64c7ead00006494597789b1b271c5bb25b51d131bd3b646c544d16b1a48502950433ab44e7563 SHA512 0bfdb4335b956a203aba420a83cb2ed5ab6aabefaf79a24280e351688be4e87f8cbf06df89e257f0e9e1b361e52ebd611e2b9b4c247bd9689b7a28d8baccf3cb
 MISC metadata.xml 3875 BLAKE2B 4281901c6e209ace8f89bf7ec7f036cbabff009da2f080c5b5d77a0639099c8d87ed9925d70e7e3edb6cad8204ebee3a4b74a688b6a22810473a22d90c441347 SHA512 039cd323565bc8e96762bef5b7b34747fffc6d70176397d4be8fd83d1f9dd094e77c21f7005f0d3dc47813ddd97bdbad1ce47ef71a2742ffdbd4145142d2d0b5
diff --git a/app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch
deleted file mode 100644
index da9c79c68293..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch
+++ /dev/null
@@ -1,736 +0,0 @@
---- /dev/null
-+++ b/tests/omhttp-auth-vg.sh
-@@ -0,0 +1,3 @@
-+#!/bin/bash
-+export USE_VALGRIND="YES"
-+source ${srcdir:=.}/omhttp-auth.sh
---- /dev/null
-+++ b/tests/omhttp-auth.sh
-@@ -0,0 +1,45 @@
-+#!/bin/bash
-+# This file is part of the rsyslog project, released under ASL 2.0
-+
-+#  Starting actual testbench
-+. ${srcdir:=.}/diag.sh init
-+
-+export NUMMESSAGES=100
-+
-+port="$(get_free_port)"
-+omhttp_start_server $port --userpwd="bob:bobbackwards"
-+
-+generate_conf
-+add_conf '
-+template(name="tpl" type="string"
-+	 string="{\"msgnum\":\"%msg:F,58:2%\"}")
-+
-+module(load="../contrib/omhttp/.libs/omhttp")
-+
-+if $msg contains "msgnum:" then
-+	action(
-+		# Payload
-+		name="my_http_action"
-+		type="omhttp"
-+		errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
-+		template="tpl"
-+
-+		server="localhost"
-+		serverport="'$port'"
-+		restpath="my/endpoint"
-+		batch="off"
-+
-+		# Auth
-+		usehttps="off"
-+		uid="bob"
-+		pwd="bobbackwards"
-+    )
-+'
-+startup
-+injectmsg
-+shutdown_when_empty
-+wait_shutdown
-+omhttp_get_data $port my/endpoint
-+omhttp_stop_server
-+seq_check
-+exit_test
---- /dev/null
-+++ b/tests/omhttp-basic-vg.sh
-@@ -0,0 +1,3 @@
-+#!/bin/bash
-+export USE_VALGRIND="YES"
-+source ${srcdir:=.}/omhttp-basic.sh
---- /dev/null
-+++ b/tests/omhttp-basic.sh
-@@ -0,0 +1,43 @@
-+#!/bin/bash
-+# This file is part of the rsyslog project, released under ASL 2.0
-+
-+#  Starting actual testbench
-+. ${srcdir:=.}/diag.sh init
-+
-+export NUMMESSAGES=10000
-+
-+port="$(get_free_port)"
-+omhttp_start_server $port
-+
-+generate_conf
-+add_conf '
-+template(name="tpl" type="string"
-+	 string="{\"msgnum\":\"%msg:F,58:2%\"}")
-+
-+module(load="../contrib/omhttp/.libs/omhttp")
-+
-+if $msg contains "msgnum:" then
-+	action(
-+		# Payload
-+		name="my_http_action"
-+		type="omhttp"
-+		errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
-+		template="tpl"
-+
-+		server="localhost"
-+		serverport="'$port'"
-+		restpath="my/endpoint"
-+		batch="off"
-+
-+		# Auth
-+		usehttps="off"
-+    )
-+'
-+startup
-+injectmsg
-+shutdown_when_empty
-+wait_shutdown
-+omhttp_get_data $port my/endpoint
-+omhttp_stop_server
-+seq_check
-+exit_test
---- /dev/null
-+++ b/tests/omhttp-batch-fail-with-400.sh
-@@ -0,0 +1,52 @@
-+#!/bin/bash
-+# This file is part of the rsyslog project, released under ASL 2.0
-+
-+#  Starting actual testbench
-+. ${srcdir:=.}/diag.sh init
-+
-+port="$(get_free_port)"
-+omhttp_start_server $port --fail-with-400-after 1000
-+
-+generate_conf
-+add_conf '
-+module(load="../contrib/omhttp/.libs/omhttp")
-+
-+main_queue(queue.dequeueBatchSize="2048")
-+
-+template(name="tpl" type="string"
-+	 string="{\"msgnum\":\"%msg:F,58:2%\"}")
-+
-+# Wrap message as a single batch for retry
-+template(name="tpl_retry" type="string" string="[%msg%]")
-+
-+
-+ruleset(name="ruleset_omhttp") {
-+    action(
-+        name="action_omhttp"
-+        type="omhttp"
-+        errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
-+        template="tpl"
-+
-+        server="localhost"
-+        serverport="'$port'"
-+        restpath="my/endpoint"
-+        batch="off"
-+
-+        retry="on"
-+
-+        # Auth
-+        usehttps="off"
-+    ) & stop
-+}
-+
-+if $msg contains "msgnum:" then
-+    call ruleset_omhttp
-+'
-+startup
-+injectmsg  0 10000
-+shutdown_when_empty
-+wait_shutdown
-+omhttp_get_data $port my/endpoint
-+omhttp_stop_server
-+seq_check  0 999
-+exit_test
---- /dev/null
-+++ b/tests/omhttp-batch-jsonarray-compress-vg.sh
-@@ -0,0 +1,3 @@
-+#!/bin/bash
-+export USE_VALGRIND="YES"
-+source ${srcdir:=.}/omhttp-batch-jsonarray-compress.sh
---- /dev/null
-+++ b/tests/omhttp-batch-jsonarray-compress.sh
-@@ -0,0 +1,48 @@
-+#!/bin/bash
-+# This file is part of the rsyslog project, released under ASL 2.0
-+
-+#  Starting actual testbench
-+. ${srcdir:=.}/diag.sh init
-+
-+export NUMMESSAGES=50000
-+
-+port="$(get_free_port)"
-+omhttp_start_server $port --decompress
-+
-+generate_conf
-+add_conf '
-+template(name="tpl" type="string"
-+	 string="{\"msgnum\":\"%msg:F,58:2%\"}")
-+
-+module(load="../contrib/omhttp/.libs/omhttp")
-+
-+main_queue(queue.dequeueBatchSize="2048")
-+
-+if $msg contains "msgnum:" then
-+	action(
-+		# Payload
-+		name="my_http_action"
-+		type="omhttp"
-+		errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
-+		template="tpl"
-+
-+		server="localhost"
-+		serverport="'$port'"
-+		restpath="my/endpoint"
-+		batch="on"
-+		batch.format="jsonarray"
-+		batch.maxsize="1000"
-+		compress="on"
-+
-+		# Auth
-+		usehttps="off"
-+    )
-+'
-+startup
-+injectmsg
-+shutdown_when_empty
-+wait_shutdown
-+omhttp_get_data $port my/endpoint jsonarray
-+omhttp_stop_server
-+seq_check
-+exit_test
---- /dev/null
-+++ b/tests/omhttp-batch-jsonarray-retry-vg.sh
-@@ -0,0 +1,3 @@
-+#!/bin/bash
-+export USE_VALGRIND="YES"
-+source ${srcdir:=.}/omhttp-batch-jsonarray-retry.sh
---- /dev/null
-+++ b/tests/omhttp-batch-jsonarray-retry.sh
-@@ -0,0 +1,78 @@
-+#!/bin/bash
-+# This file is part of the rsyslog project, released under ASL 2.0
-+
-+#  Starting actual testbench
-+. ${srcdir:=.}/diag.sh init
-+
-+export NUMMESSAGES=50000
-+
-+port="$(get_free_port)"
-+omhttp_start_server $port --fail-every 100
-+
-+generate_conf
-+add_conf '
-+module(load="../contrib/omhttp/.libs/omhttp")
-+
-+main_queue(queue.dequeueBatchSize="2048")
-+
-+template(name="tpl" type="string"
-+	 string="{\"msgnum\":\"%msg:F,58:2%\"}")
-+
-+# Echo message as-is for retry
-+template(name="tpl_echo" type="string" string="%msg%")
-+
-+ruleset(name="ruleset_omhttp_retry") {
-+    action(
-+        name="action_omhttp"
-+        type="omhttp"
-+        errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
-+        template="tpl_echo"
-+
-+        server="localhost"
-+        serverport="'$port'"
-+        restpath="my/endpoint"
-+        batch="on"
-+        batch.maxsize="100"
-+        batch.format="jsonarray"
-+
-+        retry="on"
-+        retry.ruleset="ruleset_omhttp_retry"
-+
-+        # Auth
-+        usehttps="off"
-+    ) & stop
-+}
-+
-+ruleset(name="ruleset_omhttp") {
-+    action(
-+        name="action_omhttp"
-+        type="omhttp"
-+        errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
-+        template="tpl"
-+
-+        server="localhost"
-+        serverport="'$port'"
-+        restpath="my/endpoint"
-+        batch="on"
-+        batch.maxsize="100"
-+        batch.format="jsonarray"
-+
-+        retry="on"
-+        retry.ruleset="ruleset_omhttp_retry"
-+
-+        # Auth
-+        usehttps="off"
-+    ) & stop
-+}
-+
-+if $msg contains "msgnum:" then
-+    call ruleset_omhttp
-+'
-+startup
-+injectmsg
-+shutdown_when_empty
-+wait_shutdown
-+omhttp_get_data $port my/endpoint jsonarray
-+omhttp_stop_server
-+seq_check
-+exit_test
---- /dev/null
-+++ b/tests/omhttp-batch-jsonarray-vg.sh
-@@ -0,0 +1,3 @@
-+#!/bin/bash
-+export USE_VALGRIND="YES"
-+source ${srcdir:=.}/omhttp-batch-jsonarray.sh
---- /dev/null
-+++ b/tests/omhttp-batch-jsonarray.sh
-@@ -0,0 +1,47 @@
-+#!/bin/bash
-+# This file is part of the rsyslog project, released under ASL 2.0
-+
-+#  Starting actual testbench
-+. ${srcdir:=.}/diag.sh init
-+
-+export NUMMESSAGES=50000
-+
-+port="$(get_free_port)"
-+omhttp_start_server $port
-+
-+generate_conf
-+add_conf '
-+template(name="tpl" type="string"
-+	 string="{\"msgnum\":\"%msg:F,58:2%\"}")
-+
-+module(load="../contrib/omhttp/.libs/omhttp")
-+
-+main_queue(queue.dequeueBatchSize="2048")
-+
-+if $msg contains "msgnum:" then
-+	action(
-+		# Payload
-+		name="my_http_action"
-+		type="omhttp"
-+		errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
-+		template="tpl"
-+
-+		server="localhost"
-+		serverport="'$port'"
-+		restpath="my/endpoint"
-+		batch="on"
-+		batch.format="jsonarray"
-+		batch.maxsize="1000"
-+
-+		# Auth
-+		usehttps="off"
-+    )
-+'
-+startup
-+injectmsg
-+shutdown_when_empty
-+wait_shutdown
-+omhttp_get_data $port my/endpoint jsonarray
-+omhttp_stop_server
-+seq_check
-+exit_test
---- /dev/null
-+++ b/tests/omhttp-batch-kafkarest-retry-vg.sh
-@@ -0,0 +1,3 @@
-+#!/bin/bash
-+export USE_VALGRIND="YES"
-+source ${srcdir:=.}/omhttp-batch-kafkarest-retry.sh
---- /dev/null
-+++ b/tests/omhttp-batch-kafkarest-retry.sh
-@@ -0,0 +1,78 @@
-+#!/bin/bash
-+# This file is part of the rsyslog project, released under ASL 2.0
-+
-+#  Starting actual testbench
-+. ${srcdir:=.}/diag.sh init
-+
-+export NUMMESSAGES=50000
-+
-+port="$(get_free_port)"
-+omhttp_start_server $port --fail-every 100
-+
-+generate_conf
-+add_conf '
-+module(load="../contrib/omhttp/.libs/omhttp")
-+
-+main_queue(queue.dequeueBatchSize="2048")
-+
-+template(name="tpl" type="string"
-+	 string="{\"msgnum\":\"%msg:F,58:2%\"}")
-+
-+# Echo message as-is for retry
-+template(name="tpl_echo" type="string" string="%msg%")
-+
-+ruleset(name="ruleset_omhttp_retry") {
-+    action(
-+        name="action_omhttp"
-+        type="omhttp"
-+        errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
-+        template="tpl_echo"
-+
-+        server="localhost"
-+        serverport="'$port'"
-+        restpath="my/endpoint"
-+        batch="on"
-+        batch.maxsize="100"
-+        batch.format="kafkarest"
-+
-+        retry="on"
-+        retry.ruleset="ruleset_omhttp_retry"
-+
-+        # Auth
-+        usehttps="off"
-+    ) & stop
-+}
-+
-+ruleset(name="ruleset_omhttp") {
-+    action(
-+        name="action_omhttp"
-+        type="omhttp"
-+        errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
-+        template="tpl"
-+
-+        server="localhost"
-+        serverport="'$port'"
-+        restpath="my/endpoint"
-+        batch="on"
-+        batch.maxsize="100"
-+        batch.format="kafkarest"
-+
-+        retry="on"
-+        retry.ruleset="ruleset_omhttp_retry"
-+
-+        # Auth
-+        usehttps="off"
-+    ) & stop
-+}
-+
-+if $msg contains "msgnum:" then
-+    call ruleset_omhttp
-+'
-+startup
-+injectmsg
-+shutdown_when_empty
-+wait_shutdown
-+omhttp_get_data $port my/endpoint kafkarest
-+omhttp_stop_server
-+seq_check
-+exit_test
---- /dev/null
-+++ b/tests/omhttp-batch-kafkarest.sh
-@@ -0,0 +1,47 @@
-+#!/bin/bash
-+# This file is part of the rsyslog project, released under ASL 2.0
-+
-+#  Starting actual testbench
-+. ${srcdir:=.}/diag.sh init
-+
-+export NUMMESSAGES=50000
-+
-+port="$(get_free_port)"
-+omhttp_start_server $port
-+
-+generate_conf
-+add_conf '
-+template(name="tpl" type="string"
-+	 string="{\"msgnum\":\"%msg:F,58:2%\"}")
-+
-+module(load="../contrib/omhttp/.libs/omhttp")
-+
-+main_queue(queue.dequeueBatchSize="2048")
-+
-+if $msg contains "msgnum:" then
-+	action(
-+		# Payload
-+		name="my_http_action"
-+		type="omhttp"
-+		errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
-+		template="tpl"
-+
-+		server="localhost"
-+		serverport="'$port'"
-+		restpath="my/endpoint"
-+		batch="on"
-+		batch.format="kafkarest"
-+		batch.maxsize="100"
-+
-+		# Auth
-+		usehttps="off"
-+    )
-+'
-+startup
-+injectmsg
-+shutdown_when_empty
-+wait_shutdown
-+omhttp_get_data $port my/endpoint kafkarest
-+omhttp_stop_server
-+seq_check
-+exit_test
---- /dev/null
-+++ b/tests/omhttp-batch-newline.sh
-@@ -0,0 +1,47 @@
-+#!/bin/bash
-+# This file is part of the rsyslog project, released under ASL 2.0
-+
-+#  Starting actual testbench
-+. ${srcdir:=.}/diag.sh init
-+
-+export NUMMESSAGES=50000
-+
-+port="$(get_free_port)"
-+omhttp_start_server $port
-+
-+generate_conf
-+add_conf '
-+template(name="tpl" type="string"
-+	 string="{\"msgnum\":\"%msg:F,58:2%\"}")
-+
-+module(load="../contrib/omhttp/.libs/omhttp")
-+
-+main_queue(queue.dequeueBatchSize="2048")
-+
-+if $msg contains "msgnum:" then
-+	action(
-+		# Payload
-+		name="my_http_action"
-+		type="omhttp"
-+		errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
-+		template="tpl"
-+
-+		server="localhost"
-+		serverport="'$port'"
-+		restpath="my/endpoint"
-+		batch="on"
-+		batch.format="newline"
-+		batch.maxsize="100"
-+
-+		# Auth
-+		usehttps="off"
-+    )
-+'
-+startup
-+injectmsg
-+shutdown_when_empty
-+wait_shutdown
-+omhttp_get_data $port my/endpoint newline
-+omhttp_stop_server
-+seq_check
-+exit_test
---- /dev/null
-+++ b/tests/omhttp-retry-vg.sh
-@@ -0,0 +1,3 @@
-+#!/bin/bash
-+export USE_VALGRIND="YES"
-+source ${srcdir:=.}/omhttp-retry.sh
---- /dev/null
-+++ b/tests/omhttp-retry.sh
-@@ -0,0 +1,46 @@
-+#!/bin/bash
-+# This file is part of the rsyslog project, released under ASL 2.0
-+
-+#  Starting actual testbench
-+. ${srcdir:=.}/diag.sh init
-+
-+export NUMMESSAGES=10000
-+
-+port="$(get_free_port)"
-+omhttp_start_server $port --fail-every 1000
-+
-+generate_conf
-+add_conf '
-+module(load="../contrib/omhttp/.libs/omhttp")
-+
-+main_queue(queue.dequeueBatchSize="2048")
-+
-+template(name="tpl" type="string"
-+	 string="{\"msgnum\":\"%msg:F,58:2%\"}")
-+
-+if $msg contains "msgnum:" then
-+	action(
-+		# Payload
-+		action.resumeRetryCount="-1"
-+		name="my_http_action"
-+		type="omhttp"
-+		errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'"
-+		template="tpl"
-+
-+		server="localhost"
-+		serverport="'$port'"
-+		restpath="my/endpoint"
-+		batch="off"
-+
-+		# Auth
-+		usehttps="off"
-+  )
-+'
-+startup
-+injectmsg
-+shutdown_when_empty
-+wait_shutdown
-+omhttp_get_data $port my/endpoint
-+omhttp_stop_server
-+seq_check
-+exit_test
---- /dev/null
-+++ b/tests/omhttp_server.py
-@@ -0,0 +1,130 @@
-+#!/usr/bin/env python
-+
-+import argparse
-+import json
-+import os
-+import zlib
-+import base64
-+
-+try:
-+    from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer # Python 2
-+except ImportError:
-+    from http.server import BaseHTTPRequestHandler, HTTPServer # Python 3
-+
-+# Keep track of data received at each path
-+data = {}
-+
-+metadata = {'posts': 0, 'fail_after': 0, 'fail_every': -1, 'decompress': False, 'userpwd': ''}
-+
-+
-+class MyHandler(BaseHTTPRequestHandler):
-+    """
-+    POST'd data is kept in the data global dict.
-+    Keys are the path, values are the raw received data.
-+    Two post requests to <host>:<port>/post/endpoint means data looks like...
-+        {"/post/endpoint": ["{\"msgnum\":\"00001\"}", "{\"msgnum\":\"00001\"}"]}
-+
-+    GET requests return all data posted to that endpoint as a json list.
-+    Note that rsyslog usually sends escaped json data, so some parsing may be needed.
-+    A get request for <host>:<post>/post/endpoint responds with...
-+        ["{\"msgnum\":\"00001\"}", "{\"msgnum\":\"00001\"}"]
-+    """
-+
-+    def validate_auth(self):
-+        # header format for basic authentication
-+        # 'Authorization: Basic <base 64 encoded uid:pwd>'
-+        if 'Authorization' not in self.headers:
-+            self.send_response(401)
-+            self.end_headers()
-+            self.wfile.write('missing "Authorization" header')
-+            return False
-+
-+        auth_header = self.headers['Authorization']
-+        _, b64userpwd = auth_header.split()
-+        userpwd = base64.b64decode(b64userpwd)
-+        if userpwd != metadata['userpwd']:
-+            self.send_response(401)
-+            self.end_headers()
-+            self.wfile.write('invalid auth: {0}'.format(userpwd))
-+            return False
-+
-+        return True
-+
-+    def do_POST(self):
-+        metadata['posts'] += 1
-+
-+        if metadata['userpwd']:
-+            if not self.validate_auth():
-+                return
-+
-+        if metadata['fail_with_400_after'] != -1 and metadata['posts'] > metadata['fail_with_400_after']:
-+            self.send_response(400)
-+            self.end_headers()
-+            self.wfile.write('BAD REQUEST')
-+            return
-+
-+        if metadata['posts'] > 1 and metadata['fail_every'] != -1 and metadata['posts'] % metadata['fail_every'] == 0:
-+            self.send_response(500)
-+            self.end_headers()
-+            self.wfile.write('INTERNAL ERROR')
-+            return
-+
-+        content_length = int(self.headers['Content-Length'])
-+        raw_data = self.rfile.read(content_length)
-+
-+        if metadata['decompress']:
-+            post_data = zlib.decompress(raw_data, 31)
-+        else:
-+            post_data = raw_data
-+
-+        if self.path not in data:
-+            data[self.path] = []
-+        data[self.path].append(post_data)
-+
-+        res = json.dumps({'msg': 'ok'})
-+
-+        self.send_response(200)
-+        self.send_header('Content-Type', 'application/json')
-+        self.send_header('Content-Length', len(res))
-+        self.end_headers()
-+
-+        self.wfile.write(res)
-+        return
-+
-+    def do_GET(self):
-+        if self.path in data:
-+            result = data[self.path]
-+        else:
-+            result = []
-+
-+        res = json.dumps(result)
-+
-+        self.send_response(200)
-+        self.send_header('Content-Type', 'application/json')
-+        self.send_header('Content-Length', len(res))
-+        self.end_headers()
-+
-+        self.wfile.write(res)
-+        return
-+
-+
-+if __name__ == '__main__':
-+    parser = argparse.ArgumentParser(description='Archive and delete core app log files')
-+    parser.add_argument('-p', '--port', action='store', type=int, default=8080, help='port')
-+    parser.add_argument('-i', '--interface', action='store', type=str, default='localhost', help='port')
-+    parser.add_argument('--fail-after', action='store', type=int, default=0, help='start failing after n posts')
-+    parser.add_argument('--fail-every', action='store', type=int, default=-1, help='fail every n posts')
-+    parser.add_argument('--fail-with-400-after', action='store', type=int, default=-1, help='fail with 400 after n posts')
-+    parser.add_argument('--decompress', action='store_true', default=False, help='decompress posted data')
-+    parser.add_argument('--userpwd', action='store', default='', help='only accept this user:password combination')
-+    args = parser.parse_args()
-+    metadata['fail_after'] = args.fail_after
-+    metadata['fail_every'] = args.fail_every
-+    metadata['fail_with_400_after'] = args.fail_with_400_after
-+    metadata['decompress'] = args.decompress
-+    metadata['userpwd'] = args.userpwd
-+    server = HTTPServer((args.interface, args.port), MyHandler)
-+    pid = os.getpid()
-+    print('starting omhttp test server at {interface}:{port} with pid {pid}'
-+          .format(interface=args.interface, port=args.port, pid=pid))
-+    server.serve_forever()
diff --git a/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch
deleted file mode 100644
index 6600c61666e9..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.1903.0-add-py3-support-to-omhttp-test.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From c82b747eaf96cc77efa530ca5844ba01b91bfc88 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-Date: Sat, 6 Apr 2019 00:28:54 +0200
-Subject: [PATCH] tests: omhttp: add Python 3 compatibility
-
-Fixes: https://github.com/rsyslog/rsyslog/issues/3599
----
- tests/omhttp_server.py | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/tests/omhttp_server.py b/tests/omhttp_server.py
-index 6962138fa..d3fdb3a9a 100644
---- a/tests/omhttp_server.py
-+++ b/tests/omhttp_server.py
-@@ -36,16 +36,16 @@ def validate_auth(self):
-         if 'Authorization' not in self.headers:
-             self.send_response(401)
-             self.end_headers()
--            self.wfile.write('missing "Authorization" header')
-+            self.wfile.write(b'missing "Authorization" header')
-             return False
- 
-         auth_header = self.headers['Authorization']
-         _, b64userpwd = auth_header.split()
--        userpwd = base64.b64decode(b64userpwd)
-+        userpwd = base64.b64decode(b64userpwd).decode('utf-8')
-         if userpwd != metadata['userpwd']:
-             self.send_response(401)
-             self.end_headers()
--            self.wfile.write('invalid auth: {0}'.format(userpwd))
-+            self.wfile.write(b'invalid auth: {0}'.format(userpwd))
-             return False
- 
-         return True
-@@ -60,16 +60,16 @@ def do_POST(self):
-         if metadata['fail_with_400_after'] != -1 and metadata['posts'] > metadata['fail_with_400_after']:
-             self.send_response(400)
-             self.end_headers()
--            self.wfile.write('BAD REQUEST')
-+            self.wfile.write(b'BAD REQUEST')
-             return
- 
-         if metadata['posts'] > 1 and metadata['fail_every'] != -1 and metadata['posts'] % metadata['fail_every'] == 0:
-             self.send_response(500)
-             self.end_headers()
--            self.wfile.write('INTERNAL ERROR')
-+            self.wfile.write(b'INTERNAL ERROR')
-             return
- 
--        content_length = int(self.headers['Content-Length'])
-+        content_length = int(self.headers['Content-Length'] or 0)
-         raw_data = self.rfile.read(content_length)
- 
-         if metadata['decompress']:
-@@ -79,12 +79,12 @@ def do_POST(self):
- 
-         if self.path not in data:
-             data[self.path] = []
--        data[self.path].append(post_data)
-+        data[self.path].append(post_data.decode('utf-8'))
- 
--        res = json.dumps({'msg': 'ok'})
-+        res = json.dumps({'msg': 'ok'}).encode('utf8')
- 
-         self.send_response(200)
--        self.send_header('Content-Type', 'application/json')
-+        self.send_header('Content-Type', 'application/json; charset=utf-8')
-         self.send_header('Content-Length', len(res))
-         self.end_headers()
- 
-@@ -97,10 +97,10 @@ def do_GET(self):
-         else:
-             result = []
- 
--        res = json.dumps(result)
-+        res = json.dumps(result).encode('utf8')
- 
-         self.send_response(200)
--        self.send_header('Content-Type', 'application/json')
-+        self.send_header('Content-Type', 'application/json; charset=utf-8')
-         self.send_header('Content-Length', len(res))
-         self.end_headers()
- 
diff --git a/app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch b/app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch
deleted file mode 100644
index 615bb50bdb92..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.1903.0-fix-py3-compatibility-in-diag.sh.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f0847e46c148233b6ab5d6088ca4e1dc664e82a4 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-Date: Sat, 6 Apr 2019 02:07:51 +0200
-Subject: [PATCH] testbench: fix Python 3 compatibility
-
----
- tests/diag.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/diag.sh b/tests/diag.sh
-index 5b4b3df46..2926e6ac2 100755
---- a/tests/diag.sh
-+++ b/tests/diag.sh
-@@ -1334,7 +1334,7 @@ get_inode() {
- 		printf 'FAIL: file "%s" does not exist in get_inode\n' "$1"
- 		error_exit 100
- 	fi
--	python -c 'import os; import stat; print os.lstat("'$1'")[stat.ST_INO]'
-+	python -c 'import os; import stat; print(os.lstat("'$1'")[stat.ST_INO])'
- }
- 
- 
diff --git a/app-admin/rsyslog/files/rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch b/app-admin/rsyslog/files/rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch
deleted file mode 100644
index c78e0e502d46..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.38.0-fix-omprog-output-capture-mt-test.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 0b0a1262f2b401ea16b7d0b36d8254c500cb9d8e Mon Sep 17 00:00:00 2001
-From: Joan Sala <jsiwrk@gmail.com>
-Date: Thu, 20 Sep 2018 22:37:58 +0200
-Subject: [PATCH] testbench: fix incompatibility of one omprog test with
- Python3
-
-Python3 writes to stderr immediately, and this caused the
-captured output to differ with respect to Python2. Simplified
-the test to do a single write to stderr. Also a cast to int
-was needed when calculating 'numRepeats'.
-
-closes #3030
----
- tests/omprog-output-capture-mt.sh               |  2 +-
- .../testsuites/omprog-output-capture-mt-bin.py  | 17 +++++++----------
- 2 files changed, 8 insertions(+), 11 deletions(-)
-
-diff --git a/tests/omprog-output-capture-mt.sh b/tests/omprog-output-capture-mt.sh
-index 50f5c6354..080fabd2a 100755
---- a/tests/omprog-output-capture-mt.sh
-+++ b/tests/omprog-output-capture-mt.sh
-@@ -24,7 +24,7 @@ else
-     LINE_LENGTH=511   # 512 minus 1 byte (for the newline char)
- fi
- 
--export command_line="/usr/bin/stdbuf -oL -eL $srcdir/testsuites/omprog-output-capture-mt-bin.py $LINE_LENGTH"
-+export command_line="/usr/bin/stdbuf -oL $srcdir/testsuites/omprog-output-capture-mt-bin.py $LINE_LENGTH"
- 
- check_command_available stdbuf
- generate_conf
-diff --git a/tests/testsuites/omprog-output-capture-mt-bin.py b/tests/testsuites/omprog-output-capture-mt-bin.py
-index 6c81da24b..03097f37b 100755
---- a/tests/testsuites/omprog-output-capture-mt-bin.py
-+++ b/tests/testsuites/omprog-output-capture-mt-bin.py
-@@ -10,7 +10,7 @@
- logLine = sys.stdin.readline()
- while logLine:
-     logLine = logLine.strip()
--    numRepeats = lineLength / len(logLine)
-+    numRepeats = int(lineLength / len(logLine))
-     lineToStdout = (linePrefix + "[stdout] " + logLine*numRepeats)[:lineLength]
-     lineToStderr = (linePrefix + "[stderr] " + logLine*numRepeats)[:lineLength]
- 
-@@ -22,16 +22,13 @@
-     # size of the block buffer is generally greater than PIPE_BUF).
-     sys.stdout.write(lineToStdout + "\n")
- 
--    # Write to stderr using two writes. Since stderr is unbuffered, each write will be written
--    # immediately to the pipe, and this will cause intermingled lines in the output file.
--    # However, we avoid this by executing this script with 'stdbuf -eL', which forces line
--    # buffering for stderr. We could alternatively do a single write.
--    sys.stderr.write(lineToStderr)
--    sys.stderr.write("\n")
-+    # Write to stderr using a single write. Since stderr is unbuffered, each write will be
-+    # written immediately (and atomically) to the pipe.
-+    sys.stderr.write(lineToStderr + "\n")
- 
--    # Note: In future versions of Python3, stderr will possibly be line buffered (see
--    # https://bugs.python.org/issue13601).
--    # Note: When writing to stderr using the Python logging module, it seems that line
-+    # Note (FTR): In future versions of Python3, stderr will possibly be line buffered (see
-+    # https://bugs.python.org/issue13601). The previous write will also be atomic in this case.
-+    # Note (FTR): When writing to stderr using the Python logging module, it seems that line
-     # buffering is also used (although this could depend on the Python version).
- 
-     logLine = sys.stdin.readline()
diff --git a/app-admin/rsyslog/files/rsyslog-8.39.0-fix-liblogging_stdlog-linking.patch b/app-admin/rsyslog/files/rsyslog-8.39.0-fix-liblogging_stdlog-linking.patch
deleted file mode 100644
index 6ccf8f0252da..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.39.0-fix-liblogging_stdlog-linking.patch
+++ /dev/null
@@ -1,321 +0,0 @@
-https://github.com/rsyslog/rsyslog/pull/3240
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1436,6 +1436,12 @@ fi
- AM_CONDITIONAL(ENABLE_KSI_LS12, test x$enable_ksi_ls12 = xyes)
- 
- # liblogging-stdlog support
-+# we use liblogging-stdlog inside the testbench, which is why we need to check for it in any case
-+PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3,
-+	AC_DEFINE(HAVE_LIBLOGGING_STDLOG, 1, [Define to 1 if liblogging-stdlog is available.]),
-+	[AC_MSG_NOTICE([liblogging-stdlog not found, parts of the testbench will not run])]
-+)
-+
- AC_ARG_ENABLE(liblogging-stdlog,
-         [AS_HELP_STRING([--enable-liblogging-stdlog],[Enable liblogging-stdlog support @<:@default=no@:>@])],
-         [case "${enableval}" in
-@@ -1445,18 +1451,15 @@ AC_ARG_ENABLE(liblogging-stdlog,
-          esac],
-         [enable_liblogging_stdlog=no]
- )
-+if test "x$enable_liblogging_stdlog" = "xyes" -a "x$HAVE_LIBLOGGING_STDLOG" != "x1"; then
-+	AC_MSG_ERROR(--enable-liblogging-stdlog set but liblogging was not found)
-+fi
-+AM_CONDITIONAL(ENABLE_LIBLOGGING_STDLOG, [test "x$enable_liblogging_stdlog" = "xyes"])
- if test "x$enable_liblogging_stdlog" = "xyes"; then
--	PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3,
--		AC_DEFINE(HAVE_LIBLOGGING_STDLOG, 1, [Define to 1 if liblogging-stdlog is available.])
--	)
-+	AC_MSG_NOTICE(DEBUG: liblogging_stdlog enabled)
-+else
-+	AC_MSG_NOTICE(DEBUG: liblogging_stdlog disabled)
- fi
--AM_CONDITIONAL(ENABLE_LIBLOGGING_STDLOG, test x$enable_liblogging_stdlog = xyes)
--
--# we use liblogging-stdlog inside the testbench, which is why we need to check for it in any case
--PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3,
--	AC_DEFINE(HAVE_LIBLOGGING_STDLOG, 1, [Define to 1 if liblogging-stdlog is available.]),
--	[AC_MSG_NOTICE([liblogging-stdlog not found, parts of the testbench will not run])]
--)
- 
- # RFC 3195 support
- AC_ARG_ENABLE(rfc3195,
---- a/plugins/imklog/Makefile.am
-+++ b/plugins/imklog/Makefile.am
-@@ -10,6 +10,11 @@ if ENABLE_IMKLOG_LINUX
- imklog_la_SOURCES += bsd.c
- endif
- 
--imklog_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--imklog_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+imklog_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+imklog_la_LDFLAGS = -module -avoid-version
- imklog_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+imklog_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+imklog_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
---- a/plugins/immark/Makefile.am
-+++ b/plugins/immark/Makefile.am
-@@ -1,6 +1,11 @@
- pkglib_LTLIBRARIES = immark.la
- 
- immark_la_SOURCES = immark.c immark.h
--immark_la_CPPFLAGS = $(RSRT_CFLAGS) -I$(top_srcdir) $(PTHREADS_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--immark_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+immark_la_CPPFLAGS = $(RSRT_CFLAGS) -I$(top_srcdir) $(PTHREADS_CFLAGS)
-+immark_la_LDFLAGS = -module -avoid-version
- immark_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+immark_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+immark_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
---- a/plugins/imtcp/Makefile.am
-+++ b/plugins/imtcp/Makefile.am
-@@ -1,6 +1,11 @@
- pkglib_LTLIBRARIES = imtcp.la
- 
- imtcp_la_SOURCES = imtcp.c
--imtcp_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--imtcp_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+imtcp_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+imtcp_la_LDFLAGS = -module -avoid-version
- imtcp_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+imtcp_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+imtcp_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
---- a/plugins/imudp/Makefile.am
-+++ b/plugins/imudp/Makefile.am
-@@ -1,6 +1,11 @@
- pkglib_LTLIBRARIES = imudp.la
- 
- imudp_la_SOURCES = imudp.c
--imudp_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--imudp_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+imudp_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+imudp_la_LDFLAGS = -module -avoid-version
- imudp_la_LIBADD = $(IMUDP_LIBS)
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+imudp_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+imudp_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
---- a/plugins/imuxsock/Makefile.am
-+++ b/plugins/imuxsock/Makefile.am
-@@ -1,6 +1,11 @@
- pkglib_LTLIBRARIES = imuxsock.la
- 
- imuxsock_la_SOURCES = imuxsock.c
--imuxsock_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--imuxsock_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+imuxsock_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+imuxsock_la_LDFLAGS = -module -avoid-version
- imuxsock_la_LIBADD =
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+imuxsock_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+imuxsock_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
---- a/plugins/mmexternal/Makefile.am
-+++ b/plugins/mmexternal/Makefile.am
-@@ -1,8 +1,13 @@
- pkglib_LTLIBRARIES = mmexternal.la
- 
- mmexternal_la_SOURCES = mmexternal.c
--mmexternal_la_CPPFLAGS =  $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--mmexternal_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+mmexternal_la_CPPFLAGS =  $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
-+mmexternal_la_LDFLAGS = -module -avoid-version
- mmexternal_la_LIBADD = 
- 
-+if ENABLE_LIBLOGGING_STDLOG
-+mmexternal_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+mmexternal_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
-+
- EXTRA_DIST = 
---- a/plugins/omtesting/Makefile.am
-+++ b/plugins/omtesting/Makefile.am
-@@ -1,6 +1,11 @@
- pkglib_LTLIBRARIES = omtesting.la
- 
- omtesting_la_SOURCES = omtesting.c
--omtesting_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--omtesting_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+omtesting_la_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+omtesting_la_LDFLAGS = -module -avoid-version
- omtesting_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+omtesting_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+omtesting_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
---- a/runtime/Makefile.am
-+++ b/runtime/Makefile.am
-@@ -112,8 +112,15 @@ else
- librsyslog_la_CPPFLAGS = -DSD_EXPORT_SYMBOLS -D_PATH_MODDIR=\"$(pkglibdir)/\" -I\$(top_srcdir) -I\$(top_srcdir)/grammar
- endif
- #librsyslog_la_LDFLAGS = -module -avoid-version
--librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBUUID_CFLAGS) $(LIBFASTJSON_CFLAGS) ${LIBESTR_CFLAGS} ${LIBLOGGING_STDLOG_CFLAGS} -I\$(top_srcdir)/tools
--librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBUUID_LIBS) $(LIBFASTJSON_LIBS) ${LIBESTR_LIBS} ${LIBLOGGING_STDLOG_LIBS}
-+librsyslog_la_CPPFLAGS += $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBUUID_CFLAGS) $(LIBFASTJSON_CFLAGS) ${LIBESTR_CFLAGS}
-+librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBUUID_LIBS) $(LIBFASTJSON_LIBS) ${LIBESTR_LIBS}
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+librsyslog_la_CPPFLAGS += ${LIBLOGGING_STDLOG_CFLAGS}
-+librsyslog_la_LIBADD += $(LIBLOGGING_STDLOG_LIBS)
-+endif
-+
-+librsyslog_la_CPPFLAGS += -I\$(top_srcdir)/tools
- 
- #
- # regular expression support
-@@ -121,9 +128,15 @@ librsyslog_la_LIBADD =  $(DL_LIBS) $(RT_LIBS) $(LIBUUID_LIBS) $(LIBFASTJSON_LIBS
- if ENABLE_REGEXP
- pkglib_LTLIBRARIES += lmregexp.la
- lmregexp_la_SOURCES = regexp.c regexp.h
--lmregexp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--lmregexp_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
--lmregexp_la_LIBADD =
-+lmregexp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+lmregexp_la_LDFLAGS = -module -avoid-version
-+lmregexp_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+lmregexp_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+lmregexp_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
-+
- endif
- 
- #
-@@ -131,9 +144,14 @@ endif
- # 
- pkglib_LTLIBRARIES += lmzlibw.la
- lmzlibw_la_SOURCES = zlibw.c zlibw.h
--lmzlibw_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--lmzlibw_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
--lmzlibw_la_LIBADD =
-+lmzlibw_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+lmzlibw_la_LDFLAGS = -module -avoid-version
-+lmzlibw_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+lmzlibw_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+lmzlibw_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
- 
- 
- if ENABLE_INET
-@@ -142,18 +160,28 @@ pkglib_LTLIBRARIES += lmnet.la lmnetstrms.la
- # network support
- # 
- lmnet_la_SOURCES = net.c net.h
--lmnet_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--lmnet_la_LDFLAGS = -module -avoid-version ../compat/compat_la-getifaddrs.lo $(LIBLOGGING_STDLOG_LIBS)
--lmnet_la_LIBADD =
-+lmnet_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+lmnet_la_LDFLAGS = -module -avoid-version ../compat/compat_la-getifaddrs.lo
-+lmnet_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+lmnet_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+lmnet_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
- 
- # network stream master class and stream factory
- lmnetstrms_la_SOURCES = netstrms.c netstrms.h \
- 			netstrm.c netstrm.h \
- 			nssel.c nssel.h \
- 			nspoll.c nspoll.h
--lmnetstrms_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--lmnetstrms_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
--lmnetstrms_la_LIBADD =
-+lmnetstrms_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+lmnetstrms_la_LDFLAGS = -module -avoid-version
-+lmnetstrms_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+lmnetstrms_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+lmnetstrms_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
- 
- # netstream drivers
- 
-@@ -162,9 +190,15 @@ pkglib_LTLIBRARIES += lmnsd_ptcp.la
- lmnsd_ptcp_la_SOURCES = nsd_ptcp.c nsd_ptcp.h \
- 		  	nsdsel_ptcp.c nsdsel_ptcp.h \
- 			nsdpoll_ptcp.c nsdpoll_ptcp.h
--lmnsd_ptcp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--lmnsd_ptcp_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
--lmnsd_ptcp_la_LIBADD =
-+lmnsd_ptcp_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+lmnsd_ptcp_la_LDFLAGS = -module -avoid-version
-+lmnsd_ptcp_la_LIBADD = 
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+lmnsd_ptcp_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+lmnsd_ptcp_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
-+
- endif # if ENABLE_INET
- 
- #
-@@ -226,20 +260,30 @@ lmtcpsrv_la_SOURCES = \
- 	tcps_sess.h \
- 	tcpsrv.c \
- 	tcpsrv.h
--lmtcpsrv_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--lmtcpsrv_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+lmtcpsrv_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+lmtcpsrv_la_LDFLAGS = -module -avoid-version
- lmtcpsrv_la_LIBADD = 
- 
-+if ENABLE_LIBLOGGING_STDLOG
-+lmtcpsrv_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+lmtcpsrv_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
-+
- #
- # TCP (stream) client support
- #
- lmtcpclt_la_SOURCES = \
- 	tcpclt.c \
- 	tcpclt.h
--lmtcpclt_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS)
--lmtcpclt_la_LDFLAGS = -module -avoid-version $(LIBLOGGING_STDLOG_LIBS)
-+lmtcpclt_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+lmtcpclt_la_LDFLAGS = -module -avoid-version
- lmtcpclt_la_LIBADD = 
- 
-+if ENABLE_LIBLOGGING_STDLOG
-+lmtcpclt_la_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+lmtcpclt_la_LDFLAGS += $(LIBLOGGING_STDLOG_LIBS)
-+endif
-+
- 
- #
- # support library for Guardtime KSI-LS12
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -37,7 +37,14 @@ rsyslogd_SOURCES = \
- 	iminternal.h \
- 	\
- 	../dirty.h
--rsyslogd_CPPFLAGS =  $(PTHREADS_CFLAGS) $(RSRT_CFLAGS) $(LIBLOGGING_STDLOG_CFLAGS) -DSD_EXPORT_SYMBOLS
-+rsyslogd_CPPFLAGS =  $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-+
-+if ENABLE_LIBLOGGING_STDLOG
-+rsyslogd_CPPFLAGS += $(LIBLOGGING_STDLOG_CFLAGS)
-+endif
-+
-+rsyslogd_CPPFLAGS += -DSD_EXPORT_SYMBOLS
-+
- # note: it looks like librsyslog.la must be explicitely given on LDDADD,
- # otherwise dependencies are not properly calculated (resulting in a
- # potentially incomplete build, a problem we had several times...)
diff --git a/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch b/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch
deleted file mode 100644
index 9247d0b067f4..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.40.0-fix-omusrmsg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/rsyslog/rsyslog/issues/3346
-
---- a/tools/omusrmsg.c
-+++ b/tools/omusrmsg.c
-@@ -261,7 +261,7 @@ static rsRetVal wallmsg(uchar* pMsg, instanceData *pData)
- 
- 		/* compute the device name */
- 		strcpy(p, _PATH_DEV);
--		memcpy(p, ut.ut_line, UNAMESZ);
-+		strncat(p, ut.ut_line, UNAMESZ);
- 
- 		/* we must be careful when writing to the terminal. A terminal may block
- 		 * (for example, a user has pressed <ctl>-s). In that case, we can not
diff --git a/app-admin/rsyslog/rsyslog-8.1901.0.ebuild b/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
deleted file mode 100644
index e9efd66166d0..000000000000
--- a/app-admin/rsyslog/rsyslog-8.1901.0.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools eutils linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="amd64 arm ~arm64 hppa x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
-IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
-IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/libmysqlclient:= )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.1903.0.ebuild b/app-admin/rsyslog/rsyslog-8.1903.0.ebuild
deleted file mode 100644
index d1b23d297f7c..000000000000
--- a/app-admin/rsyslog/rsyslog-8.1903.0.ebuild
+++ /dev/null
@@ -1,463 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools eutils linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
-IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
-IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/libmysqlclient:= )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${P}-add-missing-tests.patch
-	"${FILESDIR}"/${P}-add-py3-support-to-omhttp-test.patch
-	"${FILESDIR}"/${P}-fix-py3-compatibility-in-diag.sh.patch
-)
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.1905.0.ebuild b/app-admin/rsyslog/rsyslog-8.1905.0.ebuild
deleted file mode 100644
index 1161ca1f6d61..000000000000
--- a/app-admin/rsyslog/rsyslog-8.1905.0.ebuild
+++ /dev/null
@@ -1,463 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools eutils linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
-IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
-IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( virtual/libmysqlclient:= )
-	normalize? (
-		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-2.0.3:=
-	)
-	clickhouse? ( >=net-misc/curl-7.35.0 )
-	omhttpfs? ( >=net-misc/curl-7.35.0 )
-	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	postgres? ( >=dev-db/postgresql-8.4.20:= )
-	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	relp? ( >=dev-libs/librelp-1.2.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	# https://github.com/rsyslog/rsyslog/issues/3626
-	sed -i \
-		-e '\|^#!/bin/bash$|a exit 77' \
-		tests/mmkubernetes-cache-expir*.sh \
-		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable clickhouse)
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.1907.0.ebuild b/app-admin/rsyslog/rsyslog-8.1907.0.ebuild
index fcb04c2146f0..ed1a985412e6 100644
--- a/app-admin/rsyslog/rsyslog-8.1907.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.1907.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
diff --git a/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild b/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild
deleted file mode 100644
index 320c0365205a..000000000000
--- a/app-admin/rsyslog/rsyslog-8.38.0-r2.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools eutils linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="amd64 arm ~arm64 hppa x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-
-	PATCHES=(
-		"${FILESDIR}"/${P}-fix-omprog-output-capture-mt-test.patch
-		"${FILESDIR}"/${PN}-8.40.0-fix-omusrmsg.patch
-	)
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
-IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac"
-IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=dev-libs/liblogging-1.0.1:=[stdlog]
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( 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.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? (
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild
deleted file mode 100644
index 822a2a4279c4..000000000000
--- a/app-admin/rsyslog/rsyslog-8.39.0-r1.ebuild
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools eutils linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-
-	PATCHES=(
-		"${FILESDIR}"/${P}-fix-liblogging_stdlog-linking.patch
-		"${FILESDIR}"/${PN}-8.40.0-fix-omusrmsg.patch
-	)
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
-IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac"
-IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( 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.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
deleted file mode 100644
index 1176e533e0f5..000000000000
--- a/app-admin/rsyslog/rsyslog-8.40.0-r1.ebuild
+++ /dev/null
@@ -1,457 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit autotools eutils linux-info python-any-r1 systemd
-
-DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
-HOMEPAGE="https://www.rsyslog.com/"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
-
-	inherit git-r3
-else
-	KEYWORDS="amd64 arm ~arm64 ~hppa x86"
-
-	SRC_URI="
-		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-	"
-
-	PATCHES=( "${FILESDIR}"/${PN}-8.40.0-fix-omusrmsg.patch )
-fi
-
-LICENSE="GPL-3 LGPL-3 Apache-2.0"
-SLOT="0"
-IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
-IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac"
-IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libfastjson-0.99.8:=
-	>=dev-libs/libestr-0.1.9
-	>=sys-libs/zlib-1.2.5
-	curl? ( >=net-misc/curl-7.35.0 )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	elasticsearch? ( >=net-misc/curl-7.35.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
-	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
-	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
-	kerberos? ( virtual/krb5 )
-	kubernetes? ( >=net-misc/curl-7.35.0 )
-	mdblookup? ( dev-libs/libmaxminddb:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
-	mysql? ( 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.17:= )
-	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? (
-		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	systemd? ( >=sys-apps/systemd-234 )
-	uuid? ( sys-apps/util-linux:0= )
-	xxhash? ( dev-libs/xxhash:= )
-	zeromq? (
-		>=net-libs/czmq-3.0.2
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.24
-	virtual/pkgconfig
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? (
-		>=dev-libs/liblogging-1.0.1[stdlog]
-		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
-		!jemalloc? ( sys-libs/libfaketime )
-		${PYTHON_DEPS}
-	)"
-
-REQUIRED_USE="
-	kubernetes? ( normalize )
-	ssl? ( || ( gnutls openssl ) )
-"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
-	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
-	DEPEND+=" >=sys-devel/bison-2.4.3"
-	DEPEND+=" >=dev-python/docutils-0.12"
-fi
-
-CONFIG_CHECK="~INOTIFY_USER"
-WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	if use doc; then
-		if [[ ${PV} == "9999" ]]; then
-			local _EGIT_BRANCH=
-			if [[ -n "${EGIT_BRANCH}" ]]; then
-				# Cannot use rsyslog commits/branches for documentation repository
-				_EGIT_BRANCH=${EGIT_BRANCH}
-				unset EGIT_BRANCH
-			fi
-
-			git-r3_fetch "${DOC_REPO_URI}"
-			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
-
-			if [[ -n "${_EGIT_BRANCH}" ]]; then
-				# Restore previous EGIT_BRANCH information
-				EGIT_BRANCH=${_EGIT_BRANCH}
-			fi
-		else
-			cd "${S}" || die "Cannot change dir into '${S}'"
-			mkdir docs || die "Failed to create docs directory"
-			cd docs || die "Failed to change dir into '${S}/docs'"
-			unpack ${PN}-doc-${PV}.tar.gz
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# Maintainer notes:
-	# * Guardtime support is missing because libgt isn't yet available
-	#   in portage.
-	# * Hadoop's HDFS file system output module is currently not
-	#   supported in Gentoo because nobody is able to test it
-	#   (JAVA dependency).
-	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
-	#   upstream PR 129 and 136) so we need to export HIREDIS_*
-	#   variables because rsyslog's build system depends on pkg-config.
-
-	if use redis; then
-		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
-		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
-	fi
-
-	local myeconfargs=(
-		--disable-debug-symbols
-		--disable-generate-man-pages
-		--without-valgrind-testbench
-		--disable-liblogging-stdlog
-		$(use_enable test testbench)
-		$(use_enable test libfaketime)
-		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
-		--enable-imdiag
-		--enable-imfile
-		--enable-impstats
-		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
-		--enable-mmanon
-		--enable-mmaudit
-		--enable-mmcount
-		--enable-mmfields
-		--enable-mmjsonparse
-		--enable-mmpstrucdata
-		--enable-mmrm1stspace
-		--enable-mmsequence
-		--enable-mmutf8fix
-		# Output Modification Plugins without dependencies
-		--enable-mail
-		--enable-omprog
-		--enable-omruleset
-		--enable-omstdout
-		--enable-omuxsock
-		# Misc
-		--enable-fmhash
-		$(use_enable xxhash fmhash-xxhash)
-		--enable-pmaixforwardedfrom
-		--enable-pmciscoios
-		--enable-pmcisconames
-		--enable-pmlastmsg
-		$(use_enable normalize pmnormalize)
-		--enable-pmnull
-		--enable-pmpanngfw
-		--enable-pmsnare
-		# DB
-		$(use_enable dbi libdbi)
-		$(use_enable mongodb ommongodb)
-		$(use_enable mysql)
-		$(use_enable postgres pgsql)
-		$(use_enable redis omhiredis)
-		# Debug
-		$(use_enable debug)
-		$(use_enable debug diagtools)
-		$(use_enable debug valgrind)
-		# Misc
-		$(use_enable curl fmhttp)
-		$(use_enable elasticsearch)
-		$(use_enable gcrypt libgcrypt)
-		$(use_enable jemalloc)
-		$(use_enable kafka imkafka)
-		$(use_enable kafka omkafka)
-		$(use_enable kerberos gssapi-krb5)
-		$(use_enable kubernetes mmkubernetes)
-		$(use_enable normalize mmnormalize)
-		$(use_enable mdblookup mmdblookup)
-		$(use_enable omhttp)
-		$(use_enable omhttpfs)
-		$(use_enable omudpspoof)
-		$(use_enable rabbitmq omrabbitmq)
-		$(use_enable relp)
-		$(use_enable rfc3195)
-		$(use_enable rfc5424hmac mmrfc5424addhmac)
-		$(use_enable snmp)
-		$(use_enable snmp mmsnmptrapd)
-		$(use_enable gnutls)
-		$(use_enable openssl)
-		$(use_enable systemd imjournal)
-		$(use_enable systemd omjournal)
-		$(use_enable usertools)
-		$(use_enable uuid)
-		$(use_enable zeromq imczmq)
-		$(use_enable zeromq omczmq)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc && [[ "${PV}" == "9999" ]]; then
-		einfo "Building documentation ..."
-		local doc_dir="${S}/docs"
-		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
-		sphinx-build -b html source build || die "Building documentation failed!"
-	fi
-}
-
-src_test() {
-	local _has_increased_ulimit=
-
-	# Sometimes tests aren't executable (i.e. when added via patch)
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	if ulimit -n 3072; then
-		_has_increased_ulimit="true"
-	fi
-
-	if ! emake --jobs 1 check; then
-		eerror "Test suite failed! :("
-
-		if [[ -z "${_has_increased_ulimit}" ]]; then
-			eerror "Probably because open file limit couldn't be set to 3072."
-		fi
-
-		if has userpriv ${FEATURES}; then
-			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
-				"before you submit a bug report."
-		fi
-
-	fi
-}
-
-src_install() {
-	local DOCS=(
-		AUTHORS
-		ChangeLog
-		"${FILESDIR}"/README.gentoo
-	)
-
-	use doc && local HTML_DOCS=( "${S}/docs/build/." )
-
-	default
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-
-	keepdir /var/empty/dev
-	keepdir /var/spool/${PN}
-	keepdir /etc/ssl/${PN}
-	keepdir /etc/${PN}.d
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
-
-	insinto /etc/rsyslog.d/
-	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
-
-	if use mysql; then
-		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/createDB.sql
-	fi
-
-	if use postgres; then
-		insinto /usr/share/doc/${PF}/scripts/pgsql
-		doins plugins/ompgsql/createDB.sql
-	fi
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	local advertise_readme=0
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-
-		advertise_readme=1
-
-		if use mysql || use postgres; then
-			echo
-			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
-			elog "  /usr/share/doc/${PF}/scripts"
-		fi
-
-		if use ssl; then
-			echo
-			elog "To create a default CA and certificates for your server and clients, run:"
-			elog "  emerge --config =${PF}"
-			elog "on your logging server. You can run it several times,"
-			elog "once for each logging client. The client certificates will be signed"
-			elog "using the CA certificate generated during the first run."
-		fi
-	fi
-
-	if [[ ${advertise_readme} -gt 0 ]]; then
-		# We need to show the README file location
-
-		echo ""
-		elog "Please read"
-		elog ""
-		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
-		elog ""
-		elog "for more details."
-	fi
-}
-
-pkg_config() {
-	if ! use ssl ; then
-		einfo "There is nothing to configure for rsyslog unless you"
-		einfo "used USE=ssl to build it."
-		return 0
-	fi
-
-	# Make sure the certificates directory exists
-	local CERTDIR="${EROOT}/etc/ssl/${PN}"
-	if [[ ! -d "${CERTDIR}" ]]; then
-		mkdir "${CERTDIR}" || die
-	fi
-	einfo "Your certificates will be stored in ${CERTDIR}"
-
-	# Create a default CA if needed
-	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
-		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = Portage automated CA
-		ca
-		cert_signing_key
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-self-signed \
-			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
-
-		# Create the server certificate
-		echo
-		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
-		read -r CN
-
-		einfo "Creating private key and certificate for server ${CN}..."
-		certtool --generate-privkey \
-			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-		cat > "${T}/${PF}.$$" <<- _EOF
-		cn = ${CN}
-		tls_www_server
-		dns_name = ${CN}
-		expiration_days = 3650
-		_EOF
-
-		certtool --generate-certificate \
-			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-			--template "${T}/${PF}.$$" &>/dev/null
-		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	else
-		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
-	fi
-
-	# Create a client certificate
-	echo
-	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
-	read -r CN
-
-	einfo "Creating private key and certificate for client ${CN}..."
-	certtool --generate-privkey \
-		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
-
-	cat > "${T}/${PF}.$$" <<- _EOF
-	cn = ${CN}
-	tls_www_client
-	dns_name = ${CN}
-	expiration_days = 3650
-	_EOF
-
-	certtool --generate-certificate \
-		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
-		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
-		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
-		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
-		--template "${T}/${PF}.$$" &>/dev/null
-	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
-
-	rm -f "${T}/${PF}.$$"
-
-	echo
-	einfo "Here is the documentation on how to encrypt your log traffic:"
-	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
-}
diff --git a/app-admin/setools/Manifest b/app-admin/setools/Manifest
index 6838e28e5930..85ef7ce3f76e 100644
--- a/app-admin/setools/Manifest
+++ b/app-admin/setools/Manifest
@@ -1,11 +1,10 @@
 AUX setools-4.1.1-remove-gui.patch 890 BLAKE2B 70c7a7fb4b6bb31d8735d4b938ff848000c3181e590e557413011ebd5db650f79dfad270f6506128ef9971975ec2b26323b18f793bb914759449679bc34f388c SHA512 c30d7fa3624164d3ec5574b1ae36cc896fb5132ed875f232e9e84cf080e7081dadce61f6d88b55aefa45e417a081622acf7aa2d9f10406d23be7646905dfb3e6
 AUX setools-4.2.0-remove-gui.patch 988 BLAKE2B 8ba64a764292e2309fc27bdd8595bbe10c644642bb59b66b4423f50a077aac372c63da31a231a27940eb624bfea7de2f5ca305f9cc9b162d56d40f9f4ff4bab9 SHA512 e1f2216b14523a7033ebf3293646909df3be2756280186c5d8e6b1c01c7246663732c0f27c949bdac218749bb9631b47bdd82b7457a051df2380254021df4b95
 DIST setools-4.1.1.tar.gz 461649 BLAKE2B a753718aa6a5de889ba7a2eea921340061edf1bcb0b572a365e858949a92d2f8a92a876be2e4bc539d85fa6029511ab6afabfbe8138cdb5a73b587a9b58551bb SHA512 2e55a3b07e2f94d7c84054f31d266567b9acc708fe2b0e16ac3ea24e8301c712bcf564ff915a6135a1a6ba6822682bb3a6530dae20161a832fb7048364acbd04
-DIST setools-4.2.0.tar.gz 363802 BLAKE2B a57a7d565bb6e91f67cba0516434d8a0d3635d0717e878d8ac43b6cf7de0884ea74152ec50e93554f7d1a75a4098db2241668e1765e7b069d23b6cc13d4b712e SHA512 b51f458f7f2d1b569f63478f53709268615f711104915cc2d5031b2049435e4f43a103ebe50c9797ebe4b2645bf1974c73c2f53e7f602ae03c47221edb89d680
 DIST setools-4.2.1.tar.gz 365096 BLAKE2B f415ec15ce7caade2a511896c6027720ecd8b4fae938d9dee1e0b677388966557b9615503df58dd6057f5c0ef81690f753f3e1af773ef5fd8095b29aca0ab249 SHA512 7d00295fe7ff16e96e15266807f8e0a67cc2978f9051cd85afb9ee71ca7fad16ccf7421a4a163bb793950bc20a44f3cbb8409b4e0642d0f96cf7a3df7bc59c31
-EBUILD setools-4.1.1-r1.ebuild 1447 BLAKE2B 4afdbfbf8493bed414e7c6837b613acdee5ff55e77eb72d126f1812e713afa2b13105e8028363f8b28309a2cf9aa9b5035cfb4be0b5c73edfa5fac2e005938fc SHA512 580e594974e00ef868bb9bc7d04411091e0868e06f2adb06f567c0fdd5dcfe759b4af79ed0da7490e7c02bb0064f9b9093ef014a45ea1e2cd9f64b2617f97a61
-EBUILD setools-4.1.1.ebuild 1475 BLAKE2B 119319b92fc985e8c45e54f47df650b62841fca3388da8d5317bafbee4b0b2ac5190ef075935ffde53ed16c9e90ea1a101d7ba2a797664628eb1ce120fc094be SHA512 1243b8706287fe83cc2f043e78d8554a9b22a543950a01de1d7e8cdd93be4fec69396a1b705afaa669c48f34a6941883adb921fc9869ccc4effd3db13cf39e6c
-EBUILD setools-4.2.0.ebuild 1201 BLAKE2B 36b9bab96ee7db94c4627a4d0579dc7b8ece8979515d15f83e002c8048d9da5577a0574777b9ecd13df62f112486c901d2312464437d64e42ce16ccc1c82c513 SHA512 fb723880d5473e437636774909cb5c98910aa3a3764f87c4ee8a4049377dad98f38163e314d5b08851ac75332d967c529329b291aba1e375806c39af4607739c
-EBUILD setools-4.2.1.ebuild 1201 BLAKE2B 2244435edf3e51f5727b6fe188462aedb64b68624a6d02ce32e48bd7c01e4a79db17d4f627d91a886c75803a92d005278ba8eda9bab777846718b3bd2a4c9049 SHA512 c5330e616e4d211754650994c65350137fc6cfd5f0be16e2f3cb295127c081f37946feb283713a7726462d0b367023b63f3051a807e2b24c78758009630613bb
+DIST setools-4.2.2.tar.bz2 237881 BLAKE2B 6c09223e36af4ccf1ab3c194df3a4dd2871887abf25c9bcd66ef3510357f2fb6efef65a8c773267eb951c05e8308b12d96bab8efb65eb07c2ae53be60f045e82 SHA512 03eb9dfa22da6d6cffd1732fbc7d50eb8276c235d29f76b774e190b3f04f3b00533131885c6d4bc3c8dc965526b1bf4d6aec4bb3af193b4eb76a15acaa9f743f
+EBUILD setools-4.1.1-r1.ebuild 1445 BLAKE2B 7f7549954ddd2b34d55960ac869f4cead17b6968bba0ca5634eaf5804ee31ffe08a232f93f6cc7aaaeb5f6485261f89ec27df6977195d734a8c0744e2aa91e60 SHA512 fd76c7f9e899f051388126b76c73490836ecc3937f8c31d8639d578e21c89487d5d2d90f6e68595fa660c5a49daff937ad050a12150b1d5863183664592c4ab2
+EBUILD setools-4.2.1.ebuild 1199 BLAKE2B 640a4f9149fc0e5e1754efe796a6dc30b9199f4315cd4623c139f9f332f8f6ff8ab23632482dc30bd6cf139642f025e49f6015b7e492b1272c4ca93a596ef097 SHA512 0636242795043a0de1bf661f60bb953b7f8d7420f065763df3f84f00491317a075856fd5f21730494603c7d3bccd826f661b13d0f3688b44119c9b8fd4143e25
+EBUILD setools-4.2.2.ebuild 1202 BLAKE2B 428b1a44ba0fd9dc2be2bf57eda2d43701fe446f34b757581fca697247866f58032791d0027af564f08b7271feae487c60c5d038d5464eeba8bfcaebcbe2a8ca SHA512 036f0e6f9767b288488973f5c0d54ea87cf78af977c00f71f39a3d2a5b976a387a8e84d6876e4ecfa235b0c453d4ee9339d890384981e1cd58be32a436369906
 EBUILD setools-9999.ebuild 1201 BLAKE2B 2244435edf3e51f5727b6fe188462aedb64b68624a6d02ce32e48bd7c01e4a79db17d4f627d91a886c75803a92d005278ba8eda9bab777846718b3bd2a4c9049 SHA512 c5330e616e4d211754650994c65350137fc6cfd5f0be16e2f3cb295127c081f37946feb283713a7726462d0b367023b63f3051a807e2b24c78758009630613bb
 MISC metadata.xml 401 BLAKE2B dc411a73d59193727d72889e4e5f3840aa9cf7b1b6ef55f28ab6a6beee533276954e27fe105a60c392c49ac761745304865c221ff9417464112eb866f35bf6e9 SHA512 354eb8fc14e5673dfd6ad2781a784cd6d77442bf879a96c206b758615c1612397c09c20161efb9e37bc56a588e97a74a20939773dec0b1f137eb6ac353234d2f
diff --git a/app-admin/setools/setools-4.1.1-r1.ebuild b/app-admin/setools/setools-4.1.1-r1.ebuild
index 3d68806cff77..5a0548877647 100644
--- a/app-admin/setools/setools-4.1.1-r1.ebuild
+++ b/app-admin/setools/setools-4.1.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
 else
 	SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/app-admin/setools/setools-4.1.1.ebuild b/app-admin/setools/setools-4.1.1.ebuild
deleted file mode 100644
index adcc2f5f92db..000000000000
--- a/app-admin/setools/setools-4.1.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Policy Analysis Tools for SELinux"
-HOMEPAGE="https://github.com/TresysTechnology/setools/wiki"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/TresysTechnology/setools.git"
-else
-	SRC_URI="https://github.com/TresysTechnology/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="X debug test"
-
-RDEPEND="${PYTHON_DEPS}
-	>=sys-libs/libsepol-2.7:=
-	>=sys-libs/libselinux-2.7:=[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.8[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	dev-libs/libpcre:=
-	X? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-2.0.12:0
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-libs/libsepol-2.5
-	test? (
-		python_targets_python2_7? ( dev-python/mock[${PYTHON_USEDEP}] )
-		dev-python/tox[${PYTHON_USEDEP}]
-		sys-apps/checkpolicy
-	)"
-
-python_prepare_all() {
-	sed -i "s/'-Werror', //" "${S}"/setup.py || die "failed to remove Werror"
-	sed -i "s@^base_lib_dirs = .*@base_lib_dirs = ['${ROOT:-/}usr/$(get_libdir)']@g" "${S}"/setup.py || \
-		die "failed to set base_lib_dirs"
-
-	use X || local PATCHES=( "${FILESDIR}"/setools-4.1.1-remove-gui.patch )
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-admin/setools/setools-4.2.1.ebuild b/app-admin/setools/setools-4.2.1.ebuild
index 8df9cb7cd407..b1bf0e666c9a 100644
--- a/app-admin/setools/setools-4.2.1.ebuild
+++ b/app-admin/setools/setools-4.2.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
 else
 	SRC_URI="https://github.com/SELinuxProject/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
diff --git a/app-admin/setools/setools-4.2.0.ebuild b/app-admin/setools/setools-4.2.2.ebuild
index 70e0fb4bed29..f186598f7c00 100644
--- a/app-admin/setools/setools-4.2.0.ebuild
+++ b/app-admin/setools/setools-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/SELinuxProject/setools.git"
 else
-	SRC_URI="https://github.com/SELinuxProject/setools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/SELinuxProject/setools/releases/download/${PV}/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index ec19cf4bdfbc..00686cb4f302 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1,12 +1,7 @@
 AUX sshguard-2.1.0-conf.patch 408 BLAKE2B bec9debaa542d7d2d7f21d5308cda162a75a639a85d712a1adfe253fed735a1b85d83b0b0297db96fada22e61e332f5847b2815280f8ddda105cbe6d9194bf6c SHA512 5edfbf3a6955d86233de10665bea527a2e8ebaaeb505d16073c861fa2883b32d0c655f5d4c99145af63df95612129dcd25ffae3710c8615709768bdcff9ef5bc
 AUX sshguard.confd 634 BLAKE2B f083e6d4f7df6cefae89ef382a82cd7c5863c6a2ded34aee61ab028f8320c35552b80d5d8222ed35adb13a70cf6096eb5d88749f5b5ff72ca483f27fd1c0de56 SHA512 72b2a9c995bcb604516525f8190eaf35fa57e18274f83a8d00fd5b223b598c0c4ffd8b7ce89b1139c89380e5a7181c8024a6041375c445edb29c8f8b49abee50
-AUX sshguard.initd 572 BLAKE2B d92f03b4da940a47ae27281c1075914e7e4157d459096a19615a05815f3507a11a41ec5290830f299e96fee8c7203831f6e91b11faa6a6f07eaec68f98e9bf0f SHA512 0a38cdc6121c6f981bccfd75648843f16b724d412648773f1838e8c67a6c7231df756da8ac1c3651a18b5a271337c07ab97a3314d3a81904bf3c2c68dd00f9f7
-AUX sshguard.initd-r1 400 BLAKE2B 4d97e26fdacc5477936c899b69a8ac5d6507b8336228f425823bfaab1119d5862654babdce2e33ab530d41943f4e62f983e0d48ff38d319a85382e3c680e5e22 SHA512 1d73ee8e244f8318a4488aa9cf404d619da893828201215de741cea20cbb99dbce44caaefae6ab407146ca05d1ced61a03228fe60b9fa0beb152bcd8098ea86b
-DIST sshguard-2.1.0.tar.gz 1117466 BLAKE2B 1a105f346aa9b774fb0314161d779eadaab299d3b74181a449ab86534e11375e4c017c142bc621733593369bcebada9511dd40c64cb4a49cd124eb7537ae0717 SHA512 0a75e9d1a8c9c010c767a49e96e88db4a92aae8d428deebcff1ce8befa36b77cb1937f2fcb2a4e2a3e86d47896a8405265eb30ee7a603fc18a3ee117d646b119
-DIST sshguard-2.3.1.tar.gz 765330 BLAKE2B d86fe596c788209cb35c699601ccb698365e0c6b497ef8184c64d879ebb821a57e5f366c3b518e6f0c6bf65952b2c675f87f029b7b8184466c7f90d6dfebaca3 SHA512 b24f5dba34bed9246665c432b379afa4f1edacb56fd41e0b254a698ded1280c33fd51fb36466ae70d44ef4a31a0a75b59fa4df97d0e8ed8d194bf8046a3ac84d
+AUX sshguard.initd-r2 389 BLAKE2B b4098e0baf82e1c1f1978d6b3916fe9f2e67891d02b7b842492558f9b44c1c0c23204d88c036f49e069c42b0fbbdba31d8292419a2d22e603f29926228a8a223 SHA512 951ea1479836d1b318c35be03c340e5101aa3663bf2581cd0d928de2fea36f0b7906e50d9abf1b6b11fa682427e8d72b45bc95bb8f40a85fb471bfe354108108
 DIST sshguard-2.4.0.tar.gz 771506 BLAKE2B 82e9caf70dc9a1ba9ef6ba1c0916424a74891c84069a4a879c9057f3baea32af68f35d8b31cacdd60d323f5ec7b02a6e12aff1ec72fc0291b74c4882cd441d93 SHA512 64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6
-EBUILD sshguard-2.1.0-r1.ebuild 763 BLAKE2B 2af47f5332bb6ab2cc39e8da7b4b61d91f663f93958c56474d4f813d0e32a9e6ff895bd15b3f740153b0643d2bbde8f2d1588d2636cdf89daff5826d63d395ba SHA512 281964bf882b40da1d5de715d93c12df1910c550304871c4ba5cf7570ac86821547299fd831025290182f8207027de8c053aa814a615b25656b982027fa457bd
-EBUILD sshguard-2.3.1.ebuild 758 BLAKE2B 9b5da614fa2e81cf10ed8a4d079c1283db3504262e42734f41fe990fdb633b84ea475d51adff2a4e0191387abc5708e92a88e57d8ac3f035a651123f443a1196 SHA512 0046cf0eef08cd0b75bfadc2608116c07291e20068419e3cb25832927405148f14c989bb3bb85ac6e9cf77edaef3df3206955e989ef9132a4f7a645f40ebf566
-EBUILD sshguard-2.4.0.ebuild 758 BLAKE2B 9b5da614fa2e81cf10ed8a4d079c1283db3504262e42734f41fe990fdb633b84ea475d51adff2a4e0191387abc5708e92a88e57d8ac3f035a651123f443a1196 SHA512 0046cf0eef08cd0b75bfadc2608116c07291e20068419e3cb25832927405148f14c989bb3bb85ac6e9cf77edaef3df3206955e989ef9132a4f7a645f40ebf566
-EBUILD sshguard-99999.ebuild 799 BLAKE2B c163d68663958a738d828b1c0da1c931036673dd2da7884312fa9152005e4349ef4004f2b272503ce9e27abdbd6de09b251e9fc4ea130d341ebc0db252af41ad SHA512 272c3c1cffa45a8b0ac24f303ccd69629f26c42de3ac3c064174ae5307bd33d72c775d0f8512a8de47eff59d1f4c0cdb46c60634f2a40ea2fb5875787bc9d114
+EBUILD sshguard-2.4.0.ebuild 756 BLAKE2B dc5b4e082dd6a45b95b7d8af451f36987ee690e280e533858a77aac2e27af831135f2b0006ec8b8cb59f08090f7b56abb443eff0409890e0b7d24196c8a511f5 SHA512 7b8ce693bca7d5757eab80679723f700d85274da12cc112bbaa316817222b5960e9c58681090f9d4ad4e13267c55e870b1fa9498f0585ec64bdf75e425c97a33
+EBUILD sshguard-99999.ebuild 799 BLAKE2B 38b307936f73e2926466241496fdf59a6cf7def5e60405674a1a07666cdbf0042310977e79078352e623244670e22a8cd41b2ff7969b2ca6577441beca55ca69 SHA512 a33dbdc779c7021aecfa9927eb7e41313ce8b82f3509f1a33e8beacae5597db7e8f5b1a1484edee7e03956fe07d9a39717673985bc8988dba0e20835cd722aea
 MISC metadata.xml 348 BLAKE2B 9dd6c721b71bc5c73a367a9a7e4ef55ee0f0805c917968e66788716241db4c4aa4479ceffdb881d26c7da8b53fd2a5db921c7ef4138e9ff5401e621124d0bc19 SHA512 b93ba2b6eb5371962e1565ef4a333b50ba0dc44ae4365486fd55b04bdac546c8ff68fedebbb7a01d3cb4810f48148bfb870bef952b631fca931cf149ea8429ec
diff --git a/app-admin/sshguard/files/sshguard.initd b/app-admin/sshguard/files/sshguard.initd
deleted file mode 100644
index f1360ce8610b..000000000000
--- a/app-admin/sshguard/files/sshguard.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	after iptables
-	use logger
-}
-
-SSHGUARD_PIDFILE=${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}
-
-start() {
-	ebegin "Starting sshguard"
-	[ -z "${SSHGUARD_WAIT}" ] && SSHGUARD_WAIT=999
-	start-stop-daemon --start --wait ${SSHGUARD_WAIT} --background --quiet --exec \
-		/usr/sbin/sshguard -- -i ${SSHGUARD_PIDFILE} ${SSHGUARD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping sshguard"
-	start-stop-daemon --stop -p ${SSHGUARD_PIDFILE}
-	eend $?
-}
diff --git a/app-admin/sshguard/files/sshguard.initd-r1 b/app-admin/sshguard/files/sshguard.initd-r2
index e7b5ca7428b3..4404566eb117 100644
--- a/app-admin/sshguard/files/sshguard.initd-r1
+++ b/app-admin/sshguard/files/sshguard.initd-r2
@@ -1,12 +1,11 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/sbin/sshguard"
 pidfile="${SSHGUARD_PIDFILE:-/var/run/${SVCNAME}.pid}"
 command_args="-i \"${pidfile}\" ${SSHGUARD_OPTS}"
-command_background=1
-start_stop_daemon_args="--wait ${SSHGUARD_WAIT:-999} --interpreted --quiet"
+start_stop_daemon_args="--background --wait ${SSHGUARD_WAIT:-999} --interpreted --quiet"
 
 depend() {
 	after iptables
diff --git a/app-admin/sshguard/sshguard-2.1.0-r1.ebuild b/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
deleted file mode 100644
index 5fc804a5f545..000000000000
--- a/app-admin/sshguard/sshguard-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="protects hosts from brute force attacks against ssh"
-HOMEPAGE="http://sshguard.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x86-fbsd"
-
-DEPEND="
-	sys-devel/flex
-"
-RDEPEND="
-	virtual/logger
-"
-DOCS=(
-	CHANGELOG.rst
-	CONTRIBUTING.rst
-	README.rst
-	examples/net.sshguard.plist
-	examples/sshguard.service
-	examples/whitelistfile.example
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-conf.patch
-)
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	insinto /etc
-	newins examples/sshguard.conf.sample sshguard.conf
-}
diff --git a/app-admin/sshguard/sshguard-2.3.1.ebuild b/app-admin/sshguard/sshguard-2.3.1.ebuild
deleted file mode 100644
index 3fac136a82f9..000000000000
--- a/app-admin/sshguard/sshguard-2.3.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="protects hosts from brute force attacks against ssh"
-HOMEPAGE="https://www.sshguard.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-
-DEPEND="
-	sys-devel/flex
-"
-RDEPEND="
-	virtual/logger
-"
-DOCS=(
-	CHANGELOG.rst
-	CONTRIBUTING.rst
-	README.rst
-	examples/net.sshguard.plist
-	examples/sshguard.service
-	examples/whitelistfile.example
-)
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-conf.patch
-)
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	insinto /etc
-	newins examples/sshguard.conf.sample sshguard.conf
-}
diff --git a/app-admin/sshguard/sshguard-2.4.0.ebuild b/app-admin/sshguard/sshguard-2.4.0.ebuild
index 3fac136a82f9..8926537ef84c 100644
--- a/app-admin/sshguard/sshguard-2.4.0.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm x86 ~x86-fbsd"
 
 DEPEND="
 	sys-devel/flex
@@ -32,7 +32,7 @@ PATCHES=(
 src_install() {
 	default
 
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 
 	insinto /etc
diff --git a/app-admin/sshguard/sshguard-99999.ebuild b/app-admin/sshguard/sshguard-99999.ebuild
index 407363556f81..0f9a63205b67 100644
--- a/app-admin/sshguard/sshguard-99999.ebuild
+++ b/app-admin/sshguard/sshguard-99999.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
 src_install() {
 	default
 
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 
 	insinto /etc
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 09a8f5a1346f..a618071a354e 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,8 @@
 DIST sudo-1.8.25p1.tar.gz 3189951 BLAKE2B ebfedaad62e60f625db8c46a5c8f19977a5ec0a86bab3b34d91096c08e8b8ece056ba312f9fecd4cdd704fc17d49a36681b41cd40269df7c67cd66d80c0d8efb SHA512 b1445be688d3c1dd7efbdfab68977a7a9b6fd6887191dc99ca717117eec0a550492642556cd55ca5873d054ddc5ccc2b87b2c34602e1ffc729ab6fbc4e523a72
-DIST sudo-1.8.26.tar.gz 3286368 BLAKE2B 8df947f3dfa32081020b8a19921ea5daf6f9250c1ae34aa29900e85e80669223f28573217cd7e0a28393c6f30aa2117347014aa0cb554f2b85632e335ae790be SHA512 f5596cdf753ffa54f651bb30126e690640125b2ee54e8022f3740bfbe2e5a23e1bee86ce52879e863b9386babbbcf33d3e2882c573995a7d4612e9eea14d8791
 DIST sudo-1.8.27.tar.gz 3293178 BLAKE2B 174d63ece5c24309dc0d237fadfc4131243aca333491ffa6dcdb3c44b53cb8149d3bf2f3aea2aa49529ea811d4727a11ac1909305e342b858a4c14f923f12956 SHA512 0480def650ab880ab9e6c51c606a06897fd638f0381e99c038f5aa47d064aaa2fb35b73eee7f86e73185e18d5dbb8b6ba49c616b1785a1edb2dd6d7b2fa4fcac
+DIST sudo-1.8.28b2.tar.gz 3301533 BLAKE2B 9805d01b87c497e8b169d48598753a1f274d00dbe8ac81b992cb08b0ac74400b4abbf1bcc5e4bb4e7c135556f0069f9db279c39e40460749801bbacd5a84caf3 SHA512 df7e352c14d586bf556cf63c6176f6f5ec8619b0f36089466abeb8a732bd190e763429d46552dc79efadc640369a82e213a9e14d9a596761cba005f52b0f0f8a
 EBUILD sudo-1.8.25_p1-r1.ebuild 6418 BLAKE2B 54b1649420ec20b8f34b4ceb51549d1d04382c42cb31a90c0b3b20fc9f50a8f7bd111eac0702e9d6229c8c908df3030d0fe040c80eab22e52e71574c1ecc011f SHA512 beb5ca170c8e149d550d6c2ee96326af2c63780c4e9ae69493af2e7612dd1458aef187c193acafac16d3b003775f9d2a53ad778254468bc0d68620149a918fe1
-EBUILD sudo-1.8.26-r1.ebuild 6497 BLAKE2B 0ba8ace2f8e5ea21652e3b4d2f935068090396fd094247f216a5ea689171157a6494a7fa250e85963953e98f44c08e0e398bb9009a1a29826407dc3c6c8f56e5 SHA512 1709e1cb5c272a8885c42fa9b3216ec0ab00a1a97ec330b7982db6d67e1627d6cf2f40dadab7eab53e261ed69d3a548b1063b4d9efc8a19e34fad863ebf4941a
-EBUILD sudo-1.8.27-r1.ebuild 6675 BLAKE2B 7a82b93effbb00aff99eb793120b3f512d74790f24737fd024669720a8da4843db0f65e2a746b9a61f6369aed4eec93d1e31b7eb5cff54ec47095751451ab344 SHA512 21b1835c6f39e46c79c740d00b87062cb17f7f5378e06047324eeccf977e310f74bf1a5d7185f1f4202d6e37ea6cc29a764a54dbe6713dd93c3c4dd72b0713be
-EBUILD sudo-9999.ebuild 6675 BLAKE2B 7a82b93effbb00aff99eb793120b3f512d74790f24737fd024669720a8da4843db0f65e2a746b9a61f6369aed4eec93d1e31b7eb5cff54ec47095751451ab344 SHA512 21b1835c6f39e46c79c740d00b87062cb17f7f5378e06047324eeccf977e310f74bf1a5d7185f1f4202d6e37ea6cc29a764a54dbe6713dd93c3c4dd72b0713be
+EBUILD sudo-1.8.27-r1.ebuild 6665 BLAKE2B a1f14a58d3ae68bba174ae1d5bdbf82d2408a036a6e22ae38393594f507390391e9ad7a0d10b6e0a4641e2037a37591d268fae02e28003418ef0a9f2fe228b0c SHA512 13b46e6da2f845b657b13ee302de36a38430c56ee4e45ec1a2c152ba077a838d7ad38e84250d902543d56f386a078706157493fb56fad65890f7e01d2e8d1f33
+EBUILD sudo-1.8.28_beta2.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd
+EBUILD sudo-9999.ebuild 6639 BLAKE2B 1d6eefb8aaef5caf0eba296eab4f486208b28fbfcd4c821e861474fd888bfb58c27bb2fef263b7e32606b2cec24e54dbecb417e7b3c4239a60efb98cfff2a13c SHA512 2be45175f30a8a65943104b2217c05eb73bcd6ecc31e647c9db7bbad05f07992755cbfb9f42621cb1f7589d1c16088d3dd84365c38adb59765bd75bb2ddc49bd
 MISC metadata.xml 1489 BLAKE2B 3739b522115082830f82f509804b6f6f5e3ad55633c20b51b1cfa48960af6189bd33dd71d1e9432d4adf7bb4ad7790d7eed62996ab5ad12aa55732eee85b50a0 SHA512 6fa51671c5fa3ca442da0982542a8290ed39c835106c40d2db278ae16ec45eed28e563e203c1d5519bbf637483d0779094bca2ec3505d6f466d0a2b62b5248f8
diff --git a/app-admin/sudo/sudo-1.8.27-r1.ebuild b/app-admin/sudo/sudo-1.8.27-r1.ebuild
index 7dded75d56c5..26ca23f617c5 100644
--- a/app-admin/sudo/sudo-1.8.27-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.27-r1.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} != "9999" ]] ; then
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+		KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
 	fi
 fi
 
diff --git a/app-admin/sudo/sudo-1.8.26-r1.ebuild b/app-admin/sudo/sudo-1.8.28_beta2.ebuild
index fd5b1a9c50b5..69778e4b8d41 100644
--- a/app-admin/sudo/sudo-1.8.26-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.28_beta2.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils pam multilib libtool tmpfiles
-if [[ ${PV} == "9999" ]] ; then
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-	inherit mercurial
-fi
+inherit pam multilib libtool tmpfiles
 
-MY_P=${P/_/}
-MY_P=${MY_P/beta/b}
-
-uri_prefix=
-case ${P} in
-	*_beta*|*_rc*) uri_prefix=beta/ ;;
-esac
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
 
 DESCRIPTION="Allows users or groups to run commands as other users"
 HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} != "9999" ]] ; then
+if [[ ${PV} == "9999" ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	uri_prefix=
+	case ${P} in
+		*_beta*|*_rc*) uri_prefix=beta/ ;;
+	esac
+
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
@@ -31,23 +30,28 @@ fi
 # 3-clause BSD license
 LICENSE="ISC BSD"
 SLOT="0"
-IUSE="gcrypt ldap nls offensive openssl pam sasl +secure-path selinux +sendmail skey sssd"
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest"
 
-CDEPEND="
+DEPEND="
 	sys-libs/zlib:=
-	gcrypt? ( dev-libs/libgcrypt:= )
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
 		dev-libs/cyrus-sasl
 	)
-	openssl? ( dev-libs/openssl:0= )
 	pam? ( virtual/pam )
 	sasl? ( dev-libs/cyrus-sasl )
 	skey? ( >=sys-auth/skey-1.1.5-r1 )
 	sssd? ( sys-auth/sssd[sudo] )
+	system-digest? (
+		gcrypt? ( dev-libs/libgcrypt:= )
+		!gcrypt? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
 "
 RDEPEND="
-	${CDEPEND}
+	${DEPEND}
 	>=app-misc/editor-wrapper-3
 	virtual/editor
 	ldap? ( dev-lang/perl )
@@ -55,8 +59,7 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-sudo )
 	sendmail? ( virtual/mta )
 "
-DEPEND="
-	${CDEPEND}
+BDEPEND="
 	sys-devel/bison
 "
 
@@ -65,7 +68,6 @@ S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="
 	pam? ( !skey )
 	skey? ( !pam )
-	?? ( gcrypt openssl )
 "
 
 MAKEOPTS+=" SAMPLES="
@@ -99,7 +101,7 @@ set_secure_path() {
 		local newpath thisp IFS=:
 		for thisp in $1 ; do
 			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:$thisp
+				newpath+=:${thisp}
 			else
 				einfo "   Duplicate entry ${thisp} removed..."
 			fi
@@ -112,8 +114,8 @@ set_secure_path() {
 	rmpath() {
 		local e newpath thisp IFS=:
 		for thisp in ${SECURE_PATH} ; do
-			for e ; do [[ $thisp == $e ]] && continue 2 ; done
-			newpath+=:$thisp
+			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
+			newpath+=:${thisp}
 		done
 		SECURE_PATH=${newpath#:}
 	}
@@ -145,7 +147,6 @@ src_configure() {
 		--without-opie
 		$(use_enable gcrypt)
 		$(use_enable nls)
-		$(use_enable openssl)
 		$(use_enable sasl)
 		$(use_with offensive insults)
 		$(use_with offensive all-insults)
@@ -157,6 +158,13 @@ src_configure() {
 		$(use_with selinux)
 		$(use_with sendmail)
 	)
+
+	if use system-digest && ! use gcrypt; then
+		myeconfargs+=("--enable-openssl")
+	else
+		myeconfargs+=("--disable-openssl")
+	fi
+
 	econf "${myeconfargs[@]}"
 }
 
@@ -191,7 +199,7 @@ src_install() {
 
 	# Don't install into /run as that is a tmpfs most of the time
 	# (bug #504854)
-	rm -rf "${ED%/}"/run
+	rm -rf "${ED}"/run
 }
 
 pkg_postinst() {
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 7dded75d56c5..69778e4b8d41 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils pam multilib libtool tmpfiles
-if [[ ${PV} == "9999" ]] ; then
-	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
-	inherit mercurial
-fi
-
-MY_P=${P/_/}
-MY_P=${MY_P/beta/b}
+inherit pam multilib libtool tmpfiles
 
-uri_prefix=
-case ${P} in
-	*_beta*|*_rc*) uri_prefix=beta/ ;;
-esac
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
 
 DESCRIPTION="Allows users or groups to run commands as other users"
 HOMEPAGE="https://www.sudo.ws/"
-if [[ ${PV} != "9999" ]] ; then
+if [[ ${PV} == "9999" ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	uri_prefix=
+	case ${P} in
+		*_beta*|*_rc*) uri_prefix=beta/ ;;
+	esac
+
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
@@ -33,7 +32,7 @@ LICENSE="ISC BSD"
 SLOT="0"
 IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey sssd system-digest"
 
-CDEPEND="
+DEPEND="
 	sys-libs/zlib:=
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
@@ -52,7 +51,7 @@ CDEPEND="
 	)
 "
 RDEPEND="
-	${CDEPEND}
+	${DEPEND}
 	>=app-misc/editor-wrapper-3
 	virtual/editor
 	ldap? ( dev-lang/perl )
@@ -60,8 +59,7 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-sudo )
 	sendmail? ( virtual/mta )
 "
-DEPEND="
-	${CDEPEND}
+BDEPEND="
 	sys-devel/bison
 "
 
@@ -103,7 +101,7 @@ set_secure_path() {
 		local newpath thisp IFS=:
 		for thisp in $1 ; do
 			if [[ :${newpath}: != *:${thisp}:* ]] ; then
-				newpath+=:$thisp
+				newpath+=:${thisp}
 			else
 				einfo "   Duplicate entry ${thisp} removed..."
 			fi
@@ -116,8 +114,8 @@ set_secure_path() {
 	rmpath() {
 		local e newpath thisp IFS=:
 		for thisp in ${SECURE_PATH} ; do
-			for e ; do [[ $thisp == $e ]] && continue 2 ; done
-			newpath+=:$thisp
+			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
+			newpath+=:${thisp}
 		done
 		SECURE_PATH=${newpath#:}
 	}
@@ -201,7 +199,7 @@ src_install() {
 
 	# Don't install into /run as that is a tmpfs most of the time
 	# (bug #504854)
-	rm -rf "${ED%/}"/run
+	rm -rf "${ED}"/run
 }
 
 pkg_postinst() {
diff --git a/app-admin/sxid/Manifest b/app-admin/sxid/Manifest
index 948d69f8362a..4540b6c10f20 100644
--- a/app-admin/sxid/Manifest
+++ b/app-admin/sxid/Manifest
@@ -1,3 +1,3 @@
 DIST sxid-4.2.tar.gz 41827 BLAKE2B c436ffd1b05306508c0ab0e4236cb3968d4456ae0686357a3a2c2a587fdbdaf8e760d5ff8198188c23854b080a91a35fc27a9717ab28f6907deb887a7b455cea SHA512 ed2832a0ffa89a41eba39e116122878b830c46ee7bfb906652606cff61fe16bc28ab6e6b4a802cc2436d9b3a7bdd734a827f007e6f1ce14ca84a9015d3a37a69
-EBUILD sxid-4.2-r2.ebuild 742 BLAKE2B c7614bb1724fca040f2977c4e6df40e15c97f48319128859081d1529bf1fcb70434feaf24b7a20396bd8937476fdb3ff2ee2e82863c818ca7fea54af397133bb SHA512 eef8fc9083ccee3ddf0264510a50803a36a66d50c0ba482ffe2e69407756963cf01314be2e32a432297cbefb22be4a4e4261fce2edb88e269320924dbdd4138e
-MISC metadata.xml 239 BLAKE2B 2c20ec7073e95bd9e1cc847b1e1fa0e79e8f22177834ae4ec3c9f4f6599ef0b626fe6eb76aa8684fe5e6493278a508f3c48552d8184a1da955078848df42a1c6 SHA512 78b96763365234c0639c1b756aad62686435ddb7c52aaa88b2afe19c978eb7cf1e0f5d16ea1f7f394d77491fa6b0d978e42d208f4fa1255d1e265432c4642323
+EBUILD sxid-4.2-r2.ebuild 762 BLAKE2B c03b7684ff4696fd83b0c5d5e2dd3599f24299795f47e54834458a5311a2af3d3fba1be6226d173214f8e8802a598b3dff428a2d0b76cb2fe0e631bf942c6882 SHA512 65356e2a6a8e875896bedd8338e5b2301b9dc3f38d5664cea56c18427fdd402243a7ca8e96967a6a20407617ee4fc492e6894d6dcf177f663cca9a9c3f4337ad
+MISC metadata.xml 241 BLAKE2B bf4d2c1f5e109a2acb05af2cf10fb5a51455c9f60f652c3e29f809c208aeaeb829bdc3ba082fa5515ca0320d7c24896c954b91aaa71a936052ce40a1bc145841 SHA512 dd6db72616f530462b8e609fb718b8a85ba2659644e333ad6ebb4c06b2c1a55ccf54ad119fb9da9bb05db7a7c313f76a355584cf4acc0a8b5b0d0afe6f710a34
diff --git a/app-admin/sxid/metadata.xml b/app-admin/sxid/metadata.xml
index 28ab88d96ca0..7dfac7c64f2c 100644
--- a/app-admin/sxid/metadata.xml
+++ b/app-admin/sxid/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<remote-id type="freshmeat">sxid</remote-id>
+		<remote-id type="github">taem/sxid</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/sxid/sxid-4.2-r2.ebuild b/app-admin/sxid/sxid-4.2-r2.ebuild
index 5351273bef83..8e2f23878d45 100644
--- a/app-admin/sxid/sxid-4.2-r2.ebuild
+++ b/app-admin/sxid/sxid-4.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools
 
 DESCRIPTION="suid, sgid file and directory checking"
-HOMEPAGE="http://freshmeat.net/projects/sxid"
+HOMEPAGE="http://linukz.org/sxid.shtml https://github.com/taem/sxid"
 SRC_URI="http://linukz.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index ffb6c0a27663..654df8777c6a 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -38,6 +38,6 @@ EBUILD syslog-ng-3.17.2.ebuild 4920 BLAKE2B 2ee995d29e470961d08a0ed8dfeba52eb3a0
 EBUILD syslog-ng-3.18.1.ebuild 4897 BLAKE2B e6159007fb47bbe44110bfdda23250761901deb7a071430bd7a37df197375d5f079f8d038b064961eb07cfb6e6bbd044e5bc96c94809af2078652418b07f6da7 SHA512 c1b00c4cc864f145097533d0a6708e1daf3d840c1aea660c149e970fff099b0d3fc83eb5cc4b480c37e5a0325c97a3cca14d1a869f3a14a3eb2055f9127b9421
 EBUILD syslog-ng-3.19.1.ebuild 4920 BLAKE2B ad9cb81bc112bdbb4ae9cf36e53cd11eaa7380e180d2f44f025f46291a8c41c11071ad275d77a063e03ce0472c88c2341d3400a312988ebecbbfa173ad6b76bd SHA512 c937db23ab18b175b5f622a95701531ee43d42b9ca480778608e05fa57bf91635a8517b4f1b86a967d93815b7d77e7f45bb800a6cdb04db9e734a1cf3b0700c2
 EBUILD syslog-ng-3.20.1.ebuild 4951 BLAKE2B 45ad3ab6ebacbc0b0d2da1ce090d53e1ffc97d2c18648bf6763e6b7e4c0c9f8fa7bf6e746f85553aeeee144e3bf8997d6e0534357ee900fa26408b94ff815a7e SHA512 1164b8784d1061af518017698e71ce7ff48ecbc1a964eba9babe8436af141a2be119a9bd3553d1d3b90026df27f051c3a70dff23a1c7614752627f8583d1b028
-EBUILD syslog-ng-3.22.1.ebuild 4958 BLAKE2B add0726a5e7e776d7f5361900ddad8850c394beb631ce2837ce12b50ae046c5afb2780831f812ea8dfd0ad2c55c8a250e56088f64122c3cb287877c77fad6384 SHA512 5d75b179d339b2fdcc6eb8977e86fec921150ea5e25f6f300d159894c0efb8dfe2125dff25e54b22cc0aac3a32aa1490336623577ba57c430b636fcdcef52ed9
+EBUILD syslog-ng-3.22.1.ebuild 4951 BLAKE2B 246f528243cadb3b07b48450df8b24f56edc73f481c0ed5fae0f2853c698f8e2690371e783d536a6279b7da2a5eecafd7332482493218c604622d892036b719c SHA512 fc497f0dd6e92f67d6d015e89ca6722dcb862ad40725abc3e1595e29af58432bf34ab606545219fb2eddb161acb0c649cc2de13f11d5c8f18dda159e3b094326
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
index 7d9070a2279d..585f6092c7df 100644
--- a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 inherit autotools python-single-r1 systemd
 
 MY_PV_MM=$(ver_cut 1-2)
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 IUSE="amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index b93d59beb7ff..a5c4e40e4459 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -2,10 +2,12 @@ AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d8
 AUX sysstat-11.7.3-flags.patch 274 BLAKE2B 67abbdad7a4cf9f20af1baf16e0c73c63f49718cc0fb3c70bc681e8cdda29394ea5a75d871c76f658305b26d44d1034d09079f3b6306a4dd466cd0775b5514b2 SHA512 80dd658b06f2e1072a3a58bbe84770170f1cb6c3e2ae0d660713a007b0e9e59c45b710cc1484c94ec466759455ae18a7fbae237b6674ee9ddb43a7a4502cb0d5
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
 DIST sysstat-12.0.5.tar.gz 711967 BLAKE2B 96aa49d82e71407dbd99d840ca5f71af83f54ba6315c858fae71f97290e8cf9c4f5358ad6389c7489366a62667c35835151e3187382a56c98153d3a04bcc2b8d SHA512 c1061f1af35430e81e488e4b2f18b8588ec4f3c419ade004c49ca24baf60b5b76a6a59eb25f3b17b51a9f60c5833a914a514872d0235b2ca405341a2f4a32cb3
-DIST sysstat-12.1.4.tar.gz 738031 BLAKE2B 6803a727bb67e5027400f684d9d93efa6ca22526a1363e04f8bce06a6cd300d4ebf7e02c8f9048fc25794974efa38117dacdf12831bee4bfd43fe40d0b34dbb6 SHA512 e60721408861045bcb1a52b170682df54631926bf4eef5a2709e25b1469c13377026bac3e51f5eeed11c7149b916c00bf5c06a2ff65d9c28063de1ae108b61c2
+DIST sysstat-12.0.6.tar.gz 712148 BLAKE2B 1118ce071e06c2853ffdec2be1b8b3bf060571caf988e17e04ff62cbf43e7111c5951a131d176b49ad35e1da75d2b8936e23f1a385e1c83a013b802a0fc36003 SHA512 e8f542b26c2b0b7b3aadbf34dce640879d27f8f1659447f15ffb5a210987c74840418046409403da85a9eb4c01484615d230ddc700611b7c0088d72165bffe86
 DIST sysstat-12.1.5.tar.gz 1032031 BLAKE2B 9fbc0c0d132983daa334345f1f83ac8a46092cf52f35bafd443febd8ce40e4ab11b5b9b05b92e4074ecf9feab682035b2e08094ce10f3287036821be57db0800 SHA512 9dbc44b0226efc2f219ff71d2f0b83c930263fe8d6d0b451ae8404b3056558de04c76c16f2e8ba62083cde3a37cabbcd466d9247bd61ba5921dbc2ab6a1f686b
+DIST sysstat-12.1.6.tar.gz 1089333 BLAKE2B 3a3c3867b6b78ca1da7d5ef5838f5aad490e6d454aff3e8db266136ce7666112bcd1ad05b727c2455c16e53f6c84e0e75e32e8f4cc9318300aa9076921f68c1c SHA512 9c03e911fd6843b1719e080fce429e0d33f73f01619251f425dd4bbcc9d2764cd9beb8f8ebb4406b9540634d36c83303c10abcf682b079d35045454b1541984d
 EBUILD sysstat-12.0.5.ebuild 1693 BLAKE2B 13fe90d234884fe0e164ac2e2e69643383b6e2dd6048d8886f2871d5fd5e77dd81bd4e9a2b83f0e2e2a604d71cbbf1cc44eb1f320ef7c4d7114da1b3359999f0 SHA512 b072840085d01d79dff0b65988f54425dc900f7c2d98c9e3ed20fc91ab3e886fc117ae6d0d3327d2fa3ec40c46ff1dd25bd6f9a9005e52c4b845dc1429d10d15
-EBUILD sysstat-12.1.4.ebuild 1838 BLAKE2B caa28ea7a3eff2d9eb22a805485b31923ea3071757cc37af64ab55e412047eef1f4062d0df9f5c6cea958262190f466d2bd290187faae021fe44f06fdda1c1ed SHA512 a21db0825e71acba0c9ff658b9530f8ef00593a6d95dd5ce0c4ef8212af5f54bccda5f9a6ff2fee444245521c4eb50120f80dec434fdbfcf74696bf82e6661cf
+EBUILD sysstat-12.0.6.ebuild 1694 BLAKE2B f17e881c4322bd2ac87ce15d19f3dab84dec949c7c5c6fb25d1760546a116ff7191dc6904f86fcb835fd92b08edac261ed8888eb37fb7519f6ba9f161dd6af44 SHA512 09e75c118e1557209e51191efa50af6269b50416d0f387d518a5a3916f3e0d1d522049dcd631ebcdc39a72861209b48e4715989d0b764bae9c9a630bcdc649ec
 EBUILD sysstat-12.1.5.ebuild 1708 BLAKE2B 3ba833b6ff81e4a5599367e15bac6370ef91069ee909a05c22b339faee931c8f6b84cef9795585b3b1f94f09bbf7f99624047fbcb814ba3581176d4db48ba0d0 SHA512 960934a753749b6a82368da345402c434810e1e8eb98575ef3363b95f9f99a918e70b1882fda51bb9bc349dbffcdf53e55553318c85eec97484a62bc03dcbf93
-EBUILD sysstat-999999.ebuild 1741 BLAKE2B 17d47e7c1a6f90d9930b1291d54f684889e7f617cd29030cdfecd4909c50c4008e5a35a860a2b1b165c432d7b444debf2fbd2f8aecafe51532ee3b35740f126e SHA512 450f00d7fdd18fff61eac06f2c4cb02aff1a540593812965aa8f29f3338da6c0950e89314eab5fe870a8d024e58126b7015f1b1c920b5a9012099c54a3394260
+EBUILD sysstat-12.1.6.ebuild 1701 BLAKE2B 8158defd39b0bee0414fbf72509c687cac2138f06d5db309b0d4b52d729a66bff4f9f59048150eb69dd93377aaef9deb78d263a87e0d7a9eeea1c882d8ca98c5 SHA512 8b63f4400cbfd2ff99a9e73aa377a5fe01a5fd9e730839e4b1b2bc469d5400e772bc27e89dbb3387c25e23c665f6a8f7441e87df27433b6764b490646fdce7be
+EBUILD sysstat-999999.ebuild 1597 BLAKE2B f7f0260cfa097d792c587b41148bc300c1ee20e0b2b91f3307e0bbae32f8eed00d2a3e925967b754d3e7f5492d56b604a7fe417d633252a573acd4c8244b720d SHA512 be8c3366fcb833b47dc82076616b6ea95e87592bb62377d0c07268ca0fe8651130eb843374c965f519bc1eddf3fe2a97c119c2a29c2de9e9e6384d3fc5765ba7
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/app-admin/sysstat/sysstat-12.1.4.ebuild b/app-admin/sysstat/sysstat-12.0.6.ebuild
index b9ca3b9892bd..db640d7d5f9e 100644
--- a/app-admin/sysstat/sysstat-12.1.4.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic multilib systemd toolchain-funcs
+EAPI=7
+inherit flag-o-matic systemd toolchain-funcs
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
@@ -30,8 +30,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-11.7.3-flags.patch
 )
 
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
 src_prepare() {
 	if use nls; then
 		strip-linguas -i nls/
@@ -52,9 +50,8 @@ src_configure() {
 	tc-export AR
 	use static && append-ldflags -static
 
-	sa_lib_dir=/usr/$(get_libdir)/sa \
+	sa_lib_dir=/usr/lib/sa \
 		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
 		econf \
 			$(use_enable debug debuginfo) \
 			$(use_enable lm_sensors sensors) \
@@ -77,9 +74,8 @@ src_install() {
 
 	dodoc -r contrib/
 
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
 	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
 	systemd_dounit ${PN}.service
 
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
+	rm "${D}"/usr/share/doc/${PF}/COPYING || die
 }
diff --git a/app-admin/sysstat/sysstat-12.1.6.ebuild b/app-admin/sysstat/sysstat-12.1.6.ebuild
new file mode 100644
index 000000000000..fd3a1dd527e7
--- /dev/null
+++ b/app-admin/sysstat/sysstat-12.1.6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors:= )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.4-cron.patch
+	"${FILESDIR}"/${PN}-11.7.3-flags.patch
+)
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	tc-export AR
+	use static && append-ldflags -static
+
+	sa_lib_dir=/usr/lib/sa \
+		conf_dir=/etc \
+		econf \
+			$(use_enable debug debuginfo) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls) \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm "${D}"/usr/share/doc/${PF}/COPYING || die
+}
diff --git a/app-admin/sysstat/sysstat-999999.ebuild b/app-admin/sysstat/sysstat-999999.ebuild
index b8e79ab247b8..62f6cc193b2b 100644
--- a/app-admin/sysstat/sysstat-999999.ebuild
+++ b/app-admin/sysstat/sysstat-999999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic git-r3 multilib systemd toolchain-funcs
+EAPI=7
+inherit flag-o-matic git-r3 systemd toolchain-funcs
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
@@ -30,8 +30,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-11.7.3-flags.patch
 )
 
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
 src_prepare() {
 	if use nls; then
 		strip-linguas -i nls/
@@ -52,9 +50,8 @@ src_configure() {
 	tc-export AR
 	use static && append-ldflags -static
 
-	sa_lib_dir=/usr/$(get_libdir)/sa \
+	sa_lib_dir=/usr/lib/sa \
 		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
 		econf \
 			$(use_enable debug debuginfo) \
 			$(use_enable lm_sensors sensors) \
@@ -77,9 +74,8 @@ src_install() {
 
 	dodoc -r contrib/
 
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
 	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
 	systemd_dounit ${PN}.service
 
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
+	rm "${D}"/usr/share/doc/${PF}/COPYING || die
 }
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
commit	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree	326613a08f25851c388715e205576a2e7d25dc4f /app-admin
parent	b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)