gentoo resync : 25.09.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-09-25 19:33:39 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-09-25 19:33:39 +0100
commit: a5b65c81168c90928784a1e92cda84ed5d6b9eb3 (patch)
tree: 4aa7483cd0ad7de54338afc8e7971417abe1dd81 /app-admin
parent: e8f81810baa21f490d6910e8e2d424546b72a333 (diff)
117 files changed, 877 insertions, 4217 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index cf65bb84ae2d..bb64917acf90 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 1a68ce62a265..b9fc0327ffa1 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,3 +1,5 @@
 DIST cdist-4.10.6.tar.gz 676651 BLAKE2B 107b60c8890ede0bfa9f741375cc1705946b2d6be9caa4ae41c2ba155097b64e451474218ae9d5a8e2aa2511908869e8a5aa24fe15f0d41a50c8775d037a7eb3 SHA512 558fbe242a24fcd204a0b2519c9ad73405fe20466600af3635c6a5029641c4aec4315be99af0d5d9c1920aaadfe96942ffab94133c48675655ea8107fc8af90c
-EBUILD cdist-4.10.6.ebuild 593 BLAKE2B ce5fa56d967e7026a56a0eaffcd601bfdb40775cb7fa4a2078523d625be09aff694cb8b574330066bac1a5bcb2bf69d18028f768043a557dc23e8d3027129d55 SHA512 e1c557b71f4d1ee046117411edcc932c886b3e72f64adfc331a621ab4e279c91f954f6c68fdfa25d788ebf889085ad5122143068cb45584af34bfd5caef5f498
+DIST cdist-5.1.3.tar.gz 915245 BLAKE2B 5fce58f6fcbd48852e1c0c5568b72c360e74fd49b5321e2aedfdc8e48fd090cbdd7bab87a94e76d087f04f5a706bf2c7b1bebdc5a80867e26d8cc6e28afdeab3 SHA512 8330a5af80dfc07da722675ae1d402ebae4ba0aada451a02d782365d68d1d43a643609f3326f5ed793d2902838ee29071c0255c9d8a9d38c1e8a7c92a24cef46
+EBUILD cdist-4.10.6.ebuild 594 BLAKE2B b4eacbd2736994e8119709f83dc059ef2f5b14b08916c1f02f715db051ad3511e79bcad5666cb0b80b06eb70c13095e224716429c3c02c6a51bfc49f41ebbb42 SHA512 3b50d7c613d08f3502f055ce6d81338dd97610560375065eb65d8721a3a43bb6f6ee93971059c0920bbb02c82b40036b233fddad643c6ba7efb24d6f649fb27d
+EBUILD cdist-5.1.3.ebuild 594 BLAKE2B b4eacbd2736994e8119709f83dc059ef2f5b14b08916c1f02f715db051ad3511e79bcad5666cb0b80b06eb70c13095e224716429c3c02c6a51bfc49f41ebbb42 SHA512 3b50d7c613d08f3502f055ce6d81338dd97610560375065eb65d8721a3a43bb6f6ee93971059c0920bbb02c82b40036b233fddad643c6ba7efb24d6f649fb27d
 MISC metadata.xml 443 BLAKE2B 2742628c4f58fc21f1fca78752bce1e6275ec34ca7aa547a39d8a11cf3c7d9c149030078a55383f706053fa3cd70f071d5d5c571f3b009e941cbbc2c29b6c21a SHA512 5d1dbb6742101c7b89662f3edba9d3eb7da595611fbb613a1da1482e76cbf563fdf5fbf227471ca4c90e5a96d62c65433beaf9b90bbc716c7614ea5fe6b5063a
diff --git a/app-admin/cdist/cdist-4.10.6.ebuild b/app-admin/cdist/cdist-4.10.6.ebuild
index d9e2be9d9d92..5d7033af2783 100644
--- a/app-admin/cdist/cdist-4.10.6.ebuild
+++ b/app-admin/cdist/cdist-4.10.6.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A usable configuration management system"
 HOMEPAGE="https://www.nico.schottelius.org/software/cdist/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
diff --git a/app-admin/cdist/cdist-5.1.3.ebuild b/app-admin/cdist/cdist-5.1.3.ebuild
new file mode 100644
index 000000000000..5d7033af2783
--- /dev/null
+++ b/app-admin/cdist/cdist-5.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A usable configuration management system"
+HOMEPAGE="https://www.nico.schottelius.org/software/cdist/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
+	distutils-r1_python_install_all
+
+	doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
+}
diff --git a/app-admin/cli53/Manifest b/app-admin/cli53/Manifest
index 750144b04cfc..e07959bc06a7 100644
--- a/app-admin/cli53/Manifest
+++ b/app-admin/cli53/Manifest
@@ -1,4 +1,4 @@
 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
+EBUILD cli53-0.8.15.ebuild 686 BLAKE2B e46fa385a9cf28b4cbd4aec42595c613e0bb63de8ac5474c9a2979f554e2d7fcf309697ee669a913032633c88f29e919bbb99b25abab31bf80f134828c851467 SHA512 0dd2fdf1a07d2da59a357f158291174457b9894884330307bd2c32cdb2e567fc3016e607971642b6a26d61666287343a929da0477bc6b8b9865e44e80ed411fa
+EBUILD cli53-9999.ebuild 686 BLAKE2B e46fa385a9cf28b4cbd4aec42595c613e0bb63de8ac5474c9a2979f554e2d7fcf309697ee669a913032633c88f29e919bbb99b25abab31bf80f134828c851467 SHA512 0dd2fdf1a07d2da59a357f158291174457b9894884330307bd2c32cdb2e567fc3016e607971642b6a26d61666287343a929da0477bc6b8b9865e44e80ed411fa
 MISC metadata.xml 325 BLAKE2B 30e300a3cb064a2eaf04123f7e2943924e91515325d5b30c2a7aa2cc58b69f73ffb92c7da37a87eaf4e0925374234c7d6e1ea56634702879a8286b295fe64b74 SHA512 febb62ce8c56413c541726fdf6c61942a075b7c21d52ca24bb519fea2a271abc9034cc283f300fbf0458f73c6e5a4729308a3676899d0e5d3915d45939e88ad6
diff --git a/app-admin/cli53/cli53-0.8.15.ebuild b/app-admin/cli53/cli53-0.8.15.ebuild
index 437a0b2c9da1..aecaffe6fdb0 100644
--- a/app-admin/cli53/cli53-0.8.15.ebuild
+++ b/app-admin/cli53/cli53-0.8.15.ebuild
@@ -14,7 +14,8 @@ fi
 DESCRIPTION="Command line tool for Amazon Route 53"
 HOMEPAGE="https://github.com/barnybug/cli53"
 
-LICENSE="MIT"
+LICENSE="Apache-2.0 BSD MIT"
+
 SLOT="0"
 
 EGO_PN="github.com/barnybug/cli53"
diff --git a/app-admin/cli53/cli53-9999.ebuild b/app-admin/cli53/cli53-9999.ebuild
index 437a0b2c9da1..aecaffe6fdb0 100644
--- a/app-admin/cli53/cli53-9999.ebuild
+++ b/app-admin/cli53/cli53-9999.ebuild
@@ -14,7 +14,8 @@ fi
 DESCRIPTION="Command line tool for Amazon Route 53"
 HOMEPAGE="https://github.com/barnybug/cli53"
 
-LICENSE="MIT"
+LICENSE="Apache-2.0 BSD MIT"
+
 SLOT="0"
 
 EGO_PN="github.com/barnybug/cli53"
diff --git a/app-admin/consul-replicate/Manifest b/app-admin/consul-replicate/Manifest
index c94fecfeec1d..b29e076e3926 100644
--- a/app-admin/consul-replicate/Manifest
+++ b/app-admin/consul-replicate/Manifest
@@ -10,5 +10,5 @@ DIST logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz 7717 BLAKE2B 083cc
 DIST mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz 13977 BLAKE2B eb7d4e853621798b63ec9806e2fb0d609d33fc7b370276433f055bea4282ab938488272e5a7334a54cf351f4380bc36cb0a0e991d8856e7ed1dc26de76110055 SHA512 f495fe99c8ce752830b3d36db445cdc32baac6e266a0862d13e7e80e04f412ae7ee85e13ba794f1cfae3effb226007874c8ee819a4ef568ce2884077dfba4f9c
 DIST serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz 579000 BLAKE2B 1ae7805273210e02ed1779c29b24f7ea32233e860d3ea324af670547ae85f9ce66a9a98ad2105e59bec222d74ee385bf0051974a38503bff3fb464d68959e8f4 SHA512 eced133c2ba261e4e39d16f2252f555611e90f23f70a746a6f8d60b24e6747e73e619ec74f10a1c0646ec5edfd731cd79f6700d9bc5fb7b100723aac32203a5f
 DIST structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz 12276 BLAKE2B 1e28027d9dc21fafd181ba772ae79049584f803c19dbd9da01ef488a5c9f3998071bb87df0b0a8982b31823e1b4bead2386860ca5309fd4c32aa36941c784445 SHA512 ae2f0bc1f9e1ddbf1bd32d5e50a2ffbc4841c17d451739aee7cbbe359abac982e98a00caaff2aa433d10aad4dc414ce17e94a1d0893610ff53c52beddb21dd4f
-EBUILD consul-replicate-0.2.0.ebuild 3884 BLAKE2B af151a49d1ecf90b684675185088a0709c4ec6a7e8cb50d903dec19085591dce6c7a14604b937ca61b547c0550ffaa3682eeeecc1db689ad3ce9a782f7277da6 SHA512 7f7bad21192dbcc2601401d107b69dafa305af79d9dd3c2ac31878ab4cd61cbc01a58d81104a69fff82df4c5b9c7b7626106c3ec4dcf2179eff9cf8991ab70ff
+EBUILD consul-replicate-0.2.0.ebuild 3903 BLAKE2B d763ba115f4a0523078da13faf7de03e82f2fa0e02dce15a499b21573060b1bd52aeaf8dd0253cdf7b09a671b0c824f49ea367aad25575c57a49858119884c1d SHA512 671c09144dd830deee8d187a6bcc1ecc3dba51c1a03ec26b599918f04ac37e5433b1d50e625cf6e73f02ba50a18e85d0468bc96ebc6e0c7b36b6c3962b159ee5
 MISC metadata.xml 317 BLAKE2B 8e79b0f3b2b9099081cf94886f39e476e0bde6dd5eacffdfe48c70e1c2d2eb1d7902e8543e1bd3ae9427bd67cc699d6531be23d964cd72e993ebec7cb7cfdc0f SHA512 f99b2d57b72e37417fe17dfc9e71aa7be80fa554c6e75500953ad150a761e0f54634fc0c37787b8ac603d3d5e06e6980ffffdae87fe738dab6071620367bee3d
diff --git a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
index 6696574acddb..7ea2003bd5a4 100644
--- a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
+++ b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
@@ -9,7 +9,7 @@ KEYWORDS="~amd64"
 DESCRIPTION="Consul cross-DC KV replication daemon"
 EGO_PN="github.com/hashicorp/${PN}/..."
 HOMEPAGE="https://github.com/hashicorp/consul-replicate"
-LICENSE="MPL-2.0"
+LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
 SLOT="0"
 IUSE="test"
 
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index cbdb471d84a0..57e23738732c 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -2,8 +2,6 @@ AUX consul-template.confd 293 BLAKE2B 5c3ef27d72b4c98098b128f29c55f5e674c7d4427d
 AUX consul-template.initd 592 BLAKE2B 21d6ff6bee67a82c4305eba3765f8e9c49ee59357a553677fbf049a37dccad0d7645e681665db36e89263a5a73a1155e9b19446bdab7f58f04bb7173a727c711 SHA512 bbaa059f1b339f7f8c70babe90917fc1bbff36ca446452f6e4a744dd986392227342b865aa47be02ccec2d35c43814b8faadd66f9e5af5dab3abec9805b7e676
 AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed1e57c23fb3bb3df4066cfdc1ff70f2eae6a67c7816d8d38d41106f003fe2a98732a9180838c05d04a710d9bef09 SHA512 642b53e43fd7a4da00907600f26e3814893b61856a62083c804b0077043a4f8f6603f0ae4461e901105f8e1fe52c2f34f3e949e752441f5f510e9cc21890ca75
 AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1
-DIST consul-template-0.19.5.tar.gz 6054881 BLAKE2B 48d691f9d09531248310ec50c6c59d3c74db4c8ca5f0236ac8336df92c75da89677e64cb593518032f48f53b9f5aa914a7b6ac0a2dc6bf6d32ae7c1f6d1dc60d SHA512 bdba4e821e353a71f9f6287b8ff352e85a916201314229b998bfbebb066fec17c5d7f12e224bf2920b018a4f5fec9000f122f6c04cb2e455a195b945e35235a5
 DIST consul-template-0.20.0.tar.gz 46430965 BLAKE2B 025919b928e07cda618e05aab4488214459e6bc443524bbf8fa83331c3ad5708ebbeaf0cf20351ff70a325fb56aed9cede3010b43726fa32b5b1997d6f4f294a SHA512 a09ff31ddd7d11d78e8c2afcc9a63ab4458cc9feacc02fbf95a30c82b9ad58526c6e6575f5b3ddb21d0dd720687b9ee135bacdbe761f1b5f95592a3e3e74c170
-EBUILD consul-template-0.19.5.ebuild 1493 BLAKE2B 97b6e2745eff7a2387e972630c9518b374f81e65766875287e5ef97859421ab02df9224f84a5711013c6b59fc02f1e6e94a33f29255dedae44e7cae088ad3bdd SHA512 b62365114f34c528d591235cfd8fa9f7a9b40f9c6a0030a72588a141d3372e515bccbbcf72c13d434fae399ad20b2f3a03b71e1b61f29af3f5297f88d8eb8e9a
-EBUILD consul-template-0.20.0.ebuild 1497 BLAKE2B 84b85a577ddf7cdd29eeec7ba7c95874f0e50ed5ea03754f4536d4a8cf9becc52a06ba1e89778737df2d5561380878b32a3d86d6696a513f032e8fa5c12fef2f SHA512 ae28bd90cc5ab445c81968585e62877fc58bbac0e8060186c767bffbca5deba7056749b8aa307e7246389fa2be2c10b5aaad7ffa36af2e5f1afaf16801cae510
+EBUILD consul-template-0.20.0.ebuild 1534 BLAKE2B efb7e210dc8e15979c5a97b2c7578560027d0596c60409a2b1ce7a31da13f5eae8da03e2577177387e50507fb385ade659f78ba362bf6489824a1909c18d8aac SHA512 5554d0d5668989615abc120e1b321f70223ccc3c829428602fe3e5cb977606ef39ae4f6092492221199e3aad289acfa27a92c487e45f6b0b8b30039c987bb2c7
 MISC metadata.xml 316 BLAKE2B 857b3a0a26e35ac2f52f797b85a42f91c74a10b4d8d6a1f5394465e68f6ad57bd732286650966f99cc516ec68d00f31f0f880931e2041cb596d50e521ac3a599 SHA512 e66cfdeeab0bec39ed4149454fd1876ce963f7bd0012fc659abf92aefbad4e5fba90c9fe84019273d5f837f6bdf438146b433d9ea00cfe1cf4356e112522f1ad
diff --git a/app-admin/consul-template/consul-template-0.19.5.ebuild b/app-admin/consul-template/consul-template-0.19.5.ebuild
deleted file mode 100644
index ab75ab08e38d..000000000000
--- a/app-admin/consul-template/consul-template-0.19.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="Generic template rendering and notifications with Consul"
-GIT_COMMIT="f8c8205"
-EGO_PN="github.com/hashicorp/${PN}"
-HOMEPAGE="https://github.com/hashicorp/consul-template"
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="test"
-
-DEPEND="dev-lang/go
-	test? ( app-admin/consul )"
-RDEPEND=""
-
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e "s:git rev-parse --short HEAD:echo ${GIT_COMMIT}:" \
-		-e '/-s \\/d' \
-		-i src/${EGO_PN}/Makefile || die
-	# Printf format %q has arg r.config.PidFile of wrong type *string
-	sed -e 's|remove pid at %q: %s|remove pid at %v: %s|' \
-		-i src/${EGO_PN}/manager/runner.go || die
-}
-
-src_compile() {
-	export GOPATH=${S}
-	cd src/${EGO_PN} || die
-	#XC_ARCH=$(go env GOARCH) \
-	#XC_OS=$(go env GOOS) \
-	emake dev
-}
-
-src_test() {
-	cd src/${EGO_PN} || die
-	emake test
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc src/${EGO_PN}/{CHANGELOG.md,README.md}
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-}
diff --git a/app-admin/consul-template/consul-template-0.20.0.ebuild b/app-admin/consul-template/consul-template-0.20.0.ebuild
index e76748e495cc..0dc27765b37a 100644
--- a/app-admin/consul-template/consul-template-0.20.0.ebuild
+++ b/app-admin/consul-template/consul-template-0.20.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Generic template rendering and notifications with Consul"
 GIT_COMMIT="9a0f301"
 EGO_PN="github.com/hashicorp/${PN}"
 HOMEPAGE="https://github.com/hashicorp/consul-template"
-LICENSE="MPL-2.0"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
 SLOT="0"
 # TODO: debug test failures
 RESTRICT="test"
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 46ff9281208d..09a819531aed 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -6,15 +6,9 @@ AUX consul.service 359 BLAKE2B 04a42a1546d2e4dbf57b9d75b32feddd4d0f4f8b6f750b1b4
 AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
 DIST consul-1.4.4.tar.gz 22736827 BLAKE2B a1b973a303f77d84993e4879aa92072d4f2d36353683cf9a2c6cdeaded8587e8464f066168f190f7347f6038df28b3cba1d8b8a3ca0b700ee085019af5014966 SHA512 d3e5dd536726976b705fe4c78c67eaf345b8f47225919c0ca1609d75e74343d9a16d893ef4cd5140998f23b3149cfa60f5b432ed9a7251bb3b232be9b65e7241
-DIST consul-1.5.0.tar.gz 20830405 BLAKE2B e64fbc22ade0c737db4f2f1b0e3966dbe617456a35d18a7a3cfa1b0f6ce2e335542b3add06c8b8e49995135b5a1576c824840030ac8dd46019bee915689bc5e2 SHA512 8cefb77b56b27995bba38517144bf42585bd1d9ad9a10fc0c9b6bc1a87bfbd042e336ed5e945cfce1fb8eb4b8162dbc8246e2b4109dea5767b8745a7b2159ef8
-DIST consul-1.5.1.tar.gz 21123963 BLAKE2B 4fe6a45f442d849196a7b9961110cdcc6f92931626ab583859efabe62038f6b2c356b27b37ea41b27755cca138c567be5c81854794a1ba0ccae3f9e0dfd10749 SHA512 7486d24bf1fa9fe94175abf9e008dc4fe4277c509381a524a9ee20e17bc4959f621e39be29e33622cb672ef3a04f9161e575009197bcd35c78b45f1d2637a2ea
-DIST consul-1.5.2.tar.gz 21697719 BLAKE2B 782d6fe02cda097db9256a7e508cf19cf4d514d7936022d339fa62db705f6c60468cea907cd22338bb61c3287bfccb3a4d435a4f9222aa7558999553909e5d40 SHA512 e0820592abc5e119f74c8bf3d11a23726ee6dda7d193864a4486d64deef0bfd6ae4c9170b57d6f978e7ddfeb425229a019c45a8edcdea0938bce9315f2444fd6
 DIST consul-1.5.3.tar.gz 21743194 BLAKE2B c797b04457c5f0b12f06732a94038b25367b53a9e6088d725eea61786a0e18bd905ad680bc12c4bfa30b44292d2676689dd6f18e9e2143bf6e1b02c2c55f678f SHA512 3f275ec160b9e583b81ba8d463fdb05e9fc9058db2453d9393a56b67337ea04df98a89225323192230938e1abfb48fa60fe0a32b4d8980573b749217b69933e9
 DIST consul-1.6.0.tar.gz 22465984 BLAKE2B 3a030619786e8dabdf8b778012a80ff4b0e76ede6c313b688bf04bfd1a8488bff1bbd4a36c1dd11496bd1942f7bba2a9bb22ae3b364fee4335adfb741756dd67 SHA512 a122892693e3bee0fc0e0b5c0945e4a8dddb890228c091112e0db11a8afd33430611c20ff9bc13d2b3a2ac0d3b560be2d9c4e03a9cc425983fbd8f7edb699658
-EBUILD consul-1.4.4-r1.ebuild 1548 BLAKE2B 65d5c22f412b28abf5c7067b5744ca2fb627f6513eca10d91055276016487f0123e6636c080d4841be9d05f4e26fe332f1867e7d540c7810ae43a187b1485988 SHA512 9ce2e18e5177ed96d005b6967d68e8df138ff18e47b28b52ea4fb971323c5cced167bc26fc08a30d39cb243bcaa275697fe7e10c6cacb87c12d969a00bd154b1
-EBUILD consul-1.5.0-r1.ebuild 1548 BLAKE2B b70a82e758c23c2c34ecd0fa5d45e56d840966135c8d578b09d702bed31b5148bffa2eb68412a0555464018ad04e62922a4e75d5c8a2fdc779b8497a6a539159 SHA512 00c8ddee82cacfaa5092bf45a37bccf7475e8fb6402579ee95188a9334f12309ba9a70771fb49f1b43bebec1e37ae68eb7d260a34c3134009f0b4507447c8504
-EBUILD consul-1.5.1-r1.ebuild 1548 BLAKE2B d1d499907ec300d216e6884fb3c31d741911a799185f8220e0f4bb1f141105781368f9cb7c98bcd8ccd790e34b667f33b0dddc8eb5f1185318bf6c70917ead33 SHA512 6ab3f29b2416dd52250589d2ccae36f86161edea4a103d16a00e21e78c630fe8a6c7a61e8a50c08e3df546698e91f577e6ed94dcaeaf766b51f97ca93f894837
-EBUILD consul-1.5.2.ebuild 1548 BLAKE2B ef17177024301747b243ac1b77fd9061cd76a661af705ca1beee37709ee03b07c2a1738a5e2277b8db93d377c442ba3831511c6df73c6096639971236b819e76 SHA512 41dd870ec80824c66139d4e44d10ec22079fbca640213f3454dee789ef535ef13605742f2999448475e5107134f436e3d8f9cb9e3d3fe3de021e45fc7ed67421
-EBUILD consul-1.5.3.ebuild 1793 BLAKE2B 54e7ecb7a0d7eba9bbfbc767fe14f437ba129b5cd5a113b4111bd323e96ab7817ec86a82f58b3db6e62d41411db0cd6911b7db6dcce30b1ebcf6b941a0159450 SHA512 bbbbc8a895aca5c35438a7fb40de9624919f2bf133885b1a137eeee09de70630e4e21872eecec2c41fcd615793782fd1fcc4665437ed3429dccc6b5f84bda85a
-EBUILD consul-1.6.0.ebuild 1793 BLAKE2B 82a0527541f3c03aab2c03586691a7d405a1cce98e951bc874badbeaa6fc478391fba937ea600e346e67d901dacca1ef3d4ba0311c2e469c212a86da166a5ac9 SHA512 2a197552640c848be3fb1003f2f3daa543a3ac530105714ec758cc43430f18d24a76fa80172d2218261544b3e60b01758dacebb4d8d2160da6703a128b95e88e
+EBUILD consul-1.4.4-r1.ebuild 1585 BLAKE2B 1b776c067bfc59576f8c55a158fc39d3e661f51dec78c7551ad9eb3b8f11997f6a2240c7fdb9fdd15ab1e30199d23ed96b69510f9673ea036950cfc26ff82388 SHA512 1c49555ce01c0452d42c0d19f0d22438bc5f861584070d8d0d094c243d96e79a44530cb1a966d4684c3702140530614298ae4cd665fe87f392c2d92b057856a2
+EBUILD consul-1.5.3.ebuild 1830 BLAKE2B 5d0354957f3f52c00f7f63f02e2d0d05528e11a39a5ef32f1c3cb1fb98f18c93d06c49e97a3fa828bb106ce54a6eb1b3106ca9060b31f5a9cd8ae552f3a89104 SHA512 e5039260bdda283f5d7f577cf69e454fe10351ac211bf88bc6681258950bc212a7d3ec014a748f0fa9ac5d8d10b12ae693f015f0c72b6666b8eef4a83df23ea4
+EBUILD consul-1.6.0.ebuild 1830 BLAKE2B 1ee09c1896bebc44692a598e35deed9bc796b6c8a02190a98a6cb57a67e78eae2f487d23f39086459252747a537e49aace74275b011be48a374e512c404489db SHA512 a095c2487cf823c4f776d7b15610b819675a359ccabd3920b6a07715f1c0a2a61779f1488fbac55d171ac7581b397c0a09a9a7c257c7c591812742d79a68357b
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.4.4-r1.ebuild b/app-admin/consul/consul-1.4.4-r1.ebuild
index cd2aa631ab42..d2c2ea9df0ba 100644
--- a/app-admin/consul/consul-1.4.4-r1.ebuild
+++ b/app-admin/consul/consul-1.4.4-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.consul.io"
 SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-LICENSE="MPL-2.0"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
 IUSE=""
 
 RESTRICT="test"
diff --git a/app-admin/consul/consul-1.5.0-r1.ebuild b/app-admin/consul/consul-1.5.0-r1.ebuild
deleted file mode 100644
index 13e2f4eb6140..000000000000
--- a/app-admin/consul/consul-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="34eff65"
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/consul"
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="dev-go/gox
-	>=dev-lang/go-1.11:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-src_prepare() {
-	default
-
-	sed -e 's:go get -u -v $(GOTOOLS)::' \
-		-e 's:vendorfmt dev-build:dev-build:' \
-		-i "src/${EGO_PN}/GNUmakefile" || die
-}
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
-	GOBIN="${S}/bin" \
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake -C "src/${EGO_PN}" dev-build
-}
-
-src_install() {
-	local x
-
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.5.1-r1.ebuild b/app-admin/consul/consul-1.5.1-r1.ebuild
deleted file mode 100644
index 23474dcfc441..000000000000
--- a/app-admin/consul/consul-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="40cec98"
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/consul"
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="dev-go/gox
-	>=dev-lang/go-1.11:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-src_prepare() {
-	default
-
-	sed -e 's:go get -u -v $(GOTOOLS)::' \
-		-e 's:vendorfmt dev-build:dev-build:' \
-		-i "src/${EGO_PN}/GNUmakefile" || die
-}
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
-	GOBIN="${S}/bin" \
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake -C "src/${EGO_PN}" dev-build
-}
-
-src_install() {
-	local x
-
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.5.2.ebuild b/app-admin/consul/consul-1.5.2.ebuild
deleted file mode 100644
index 99191243cd38..000000000000
--- a/app-admin/consul/consul-1.5.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="a82e6a7"
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/consul"
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MPL-2.0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="dev-go/gox
-	>=dev-lang/go-1.11:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-src_prepare() {
-	default
-
-	sed -e 's:go get -u -v $(GOTOOLS)::' \
-		-e 's:vendorfmt dev-build:dev-build:' \
-		-i "src/${EGO_PN}/GNUmakefile" || die
-}
-
-src_compile() {
-	# The dev target sets causes build.sh to set appropriate XC_OS
-	# and XC_ARCH, and skips generation of an unused zip file,
-	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
-	GOBIN="${S}/bin" \
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake -C "src/${EGO_PN}" dev-build
-}
-
-src_install() {
-	local x
-
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-}
diff --git a/app-admin/consul/consul-1.5.3.ebuild b/app-admin/consul/consul-1.5.3.ebuild
index 913d62b917c2..89aa8a2c8845 100644
--- a/app-admin/consul/consul-1.5.3.ebuild
+++ b/app-admin/consul/consul-1.5.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.consul.io"
 SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-LICENSE="MPL-2.0"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
 IUSE=""
 
 RESTRICT="test"
diff --git a/app-admin/consul/consul-1.6.0.ebuild b/app-admin/consul/consul-1.6.0.ebuild
index b5b9eab35a17..91013647ce8f 100644
--- a/app-admin/consul/consul-1.6.0.ebuild
+++ b/app-admin/consul/consul-1.6.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.consul.io"
 SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-LICENSE="MPL-2.0"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
 IUSE=""
 
 RESTRICT="test"
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index 73fe2769ad9b..8c8ad33efafb 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -1,3 +1,5 @@
 DIST dxf-7.5.1.tar.gz 308004 BLAKE2B 6f8aaf39fbf3a9ef813d5af502361fac3827db17fa5279c3a53e8b87826cac15ef59cb41b2682c9eea065e0a30d98c2b22f72b4922869a012eab76274b1ff325 SHA512 f1a5082d70c115da9f01385e40ed7d2c1ce82af6fb9e55c8f3173e544a9ff3e98c8c565c9e6a2ca1e9a688665944ec0d9dd873f621914d5b746ef4a145f308a0
+DIST dxf-7.5.2.tar.gz 310576 BLAKE2B 0b9b79b4278c2e4137105952d070bb5ce8b7b905881fb10d38c2504467ccc4e6ac8061651b2e82cae1af3e7d26a58904dc1cafe5099519e0ad14b6760131ab82 SHA512 2fb8d175fbcb13dc9160b28d37e5d74886826764b2f5b2cc9a1aad0cff59f7bd5146c15b130cb760406a9bbd4abd650adb050db72bd81dcca9e9b05beccec769
 EBUILD dxf-7.5.1.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
+EBUILD dxf-7.5.2.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
 MISC metadata.xml 295 BLAKE2B b3270ada06f2998a84e5484b6b063cb5e1c397be2bb266ba10352e811f35e25576469488cb42eb49ac718c6e788861b706aba3e1cb673cbbf176c576fc5745a5 SHA512 99b0deb01ac0e00d6f958c41a9ad8a68bf606a178924c0f052a656d0bdc2638b711e4fe10ab49e1a943ce7a8c29fc77b94abd4a91f6f65a3debd892d8a099339
diff --git a/app-admin/dxf/dxf-7.5.2.ebuild b/app-admin/dxf/dxf-7.5.2.ebuild
new file mode 100644
index 000000000000..2b55ca80585a
--- /dev/null
+++ b/app-admin/dxf/dxf-7.5.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Docker registry v2 client in Python"
+HOMEPAGE="https://github.com/davedoesdev/dxf"
+SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
+	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+# Require dockerd running
+
+python_test() {
+	emake test
+}
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index 7ee6f9d26223..bfc7d31bfbbb 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,5 @@
 DIST exo-1.5.0.tar.gz 3806818 BLAKE2B fe817962ebcebfbe37c0ec884b127144fca4d85bf985f3f6d98bf154a1bb17b49d8b7de7ece6fb71ae3b2793969fdae8bf0ad0f2031cc11943c714e27ef1a63d SHA512 3fab4c57d55d0058a4e1191d97ac04de45052e5f9c25bea0d4408df48c648e28804842d8989700daf36c6657023b99a63a4dd77a1991689abecdb11afa4e6a09
+DIST exo-1.5.1.tar.gz 3806840 BLAKE2B 4a99fd15049ece0349ce427beb923e8ecf7ad47980412a9aced9f7ccbb340c2e95d08045fd553967f5c428d46505ff48e4eccca442cb796d845c6174a68a8b5b SHA512 2db42813446e79a4bd06048706f4a775c435c33fe7f9bf82c260623c0b09ad28e9090cf11b52b5d1c7b2a4ef693af6cede0a2470b3d8213fb655c27cc6d1f58d
 EBUILD exo-1.5.0.ebuild 545 BLAKE2B 1e55be70abe5f2e18f9db5058bbe72eda356212f9f698c7c9f5130d40a3da55e466412bf173952f0255370965f46b9b2af1faf8cea448c52bcef36fddcc57b1f SHA512 72e9a1fed8dc44277c4a29f71837cda8ae9a8e9ba591d78918e860122630fe6c800f4aa49d4dad62f97ee4d216212135ec9de61cc5acc8a2747a3cbf3bd00661
+EBUILD exo-1.5.1.ebuild 545 BLAKE2B 1e55be70abe5f2e18f9db5058bbe72eda356212f9f698c7c9f5130d40a3da55e466412bf173952f0255370965f46b9b2af1faf8cea448c52bcef36fddcc57b1f SHA512 72e9a1fed8dc44277c4a29f71837cda8ae9a8e9ba591d78918e860122630fe6c800f4aa49d4dad62f97ee4d216212135ec9de61cc5acc8a2747a3cbf3bd00661
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/exo/exo-1.5.1.ebuild b/app-admin/exo/exo-1.5.1.ebuild
new file mode 100644
index 000000000000..ebb329b957ff
--- /dev/null
+++ b/app-admin/exo/exo-1.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line tool for everything at Exoscale: compute, storage, dns."
+HOMEPAGE="https://exoscale.github.io/cli"
+SRC_URI="https://github.com/exoscale/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+
+S="${WORKDIR}/cli-${PV}"
+
+src_compile() {
+	go build -mod vendor -o ${PN} || die "build failed"
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index f2d0d27fbd25..1b8507759b70 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -7,12 +7,16 @@ DIST filebeat-6.4.3.tar.gz 22085261 BLAKE2B 466580ba371d02bd0b51bd80f0e8d9766f2a
 DIST filebeat-6.5.4.tar.gz 25286147 BLAKE2B c3eca03c8e8e2b863918f3fe65bdea46b351739569f5570daac3e321963e98190331c5bf99c2451db5faa615620e023d2fd9c73060d4d775392a86a2f5578d80 SHA512 a48b9ae267ec80c1b45e4e07644f8080f8ba280da5c3543022b73472eb70de9d836cfffd387e576298becf9313d2cfa67d835158442f163b1a1bd0e72df31297
 DIST filebeat-6.6.1.tar.gz 29108620 BLAKE2B 21dbe189dcf91efe6170574e3cff858cca4094936fbda54a343f66e61a5f0cd7d29e71d547c34ddd78776283d13e48926dd84925eed58ca07cc7bedf216c9064 SHA512 9c7646efa8aa44c2ae1cbcf85204749bc57491aad075d3ca283cd75a1b3a93d922169603407b2ea111e7e3abe0a43ce26fabccfe93d56a4232bd63e2b2e8b24a
 DIST filebeat-6.8.1.tar.gz 35550017 BLAKE2B 0a1913adf2eda50884f33715a059fcc2028e31560afc5412e87d7fd3a6ed5cc504683ad3c5b28f18df24afd3e4c8d96c5b2a930411ae32d09d05c85cfdff0499 SHA512 5ff047e80099b09e25952ac7fc8ea0c6be25df2cd3b638c07c600e680fac32505c279a3a91ee2e61acf0f9535b4adb390a65f3a7dbc3599e74c6b02e0aa6ef71
+DIST filebeat-6.8.3.tar.gz 35551301 BLAKE2B ec33f0a5812e355bf2a9212daff999dfed869cd07b20ed9a8fa7c94c76e6fda291a137c5c601d9317ce3e1a34e06be241c1ce7c148f7b6e181903f88c6b1a410 SHA512 49cea2f95429feb311a15b9f247a0c627409edb1badd09d629d37a28994301e69526d5156bce72c9ed65079815f58bca41202862321edc46315e649395293632
 DIST filebeat-7.2.0.tar.gz 46415588 BLAKE2B a8940e9a4a85e6eac79dca3418d3dcd14c5a1062741dd895c561d1498c287bb974a5ac89d5b353dbb75e78e6c67cba97a08d41528042db4e4d76bb46016fac60 SHA512 67d251cabca10a1f6d392be8e6203e66d4cf5d63ceb2af88185ea4824259995dafd3aa8dd2da326d079cfcfedce5996f173cd6c50972db67cbe25f660683e5d1
+DIST filebeat-7.3.2.tar.gz 49977990 BLAKE2B 6219a382b415572fdea2ff4b0aa3f02b3c1e500d77ed5200b6d5b4334a08b8e91d389ea41b3afe98355f8b20e7f8ecaccf5996f0bb7aad5f10e0f0d69400a0d6 SHA512 75943b251343d28f478f2f19665e4ba31f5bc6e4b26f6e6da8aa062322da4ab8e134c87a9557a97677ba3b22484c44ebaeaeeb87866e0f12e67f1647fe34131a
 EBUILD filebeat-5.6.13.ebuild 1593 BLAKE2B eace0e8d7977b82028436e2c55c4a4bf19a7c0b57714cf6b7cc1e7176e9013edb889065f58740f8db51e38164f6e567cf809d9c4fb82de1d7e064580ef8cafaa SHA512 8eeb1e64ea6d8e06a79ef9b25103d523718f779e351ee5c1f0a00db67d1e28405ccdc371ae5c0177861276db40c848b78ee2d1eff16c14da3efca3c7576ae399
 EBUILD filebeat-6.3.2.ebuild 1477 BLAKE2B 9600502c104f8db4f8661a354bee5160b5780fb4ae3cf84a1353ae5b774ed01e61aebd66ad530550691a43ae62ebb0cf7607591c5b582564b69d81c8af64f68d SHA512 304cb456b2b56d2005b8dcdf56817005e7843c5073ef1aeedd75e69a73178eb184910027d94522e586e6492d80f86d8c49787a7d818292695304815fbecfa239
 EBUILD filebeat-6.4.3.ebuild 1478 BLAKE2B a8430ed2d2c0bc2411300514a35a72ae3c6765c54c6ec49c8deca06f02b7e2f543788e77cf48ddb08492dcadd4ae4ba0ad3b27ac6e3497ee4d29ea91f9e3482d SHA512 597ab402cd5a644892926595c65edf5853b5173e5b76d46f116dc02dbb995110a774181b7e9c3dc149ed4fdcf7b9d89d3a9c6ee36b158ab983e37d36467582bc
 EBUILD filebeat-6.5.4.ebuild 1478 BLAKE2B 4eea3c20260b9e8c32b0fe66108378fcda572d3d80bf435c341b6b0ac6e18f4a95eb4d430a13d2fbf775216d857f1877327c724d9abf9e8acf7efd33a2f57473 SHA512 3ae3570cbe614358eead82f36aa79008e317164c62f779eeee33e5ad067c58bdd42389db57f52ad4e909fff67f48043bfec3bcb4ed478b05fbbf75d43d39157c
 EBUILD filebeat-6.6.1.ebuild 1477 BLAKE2B e77d50b39c421fcd161d066248e4af864f8c9e414ac36d9c043ee40372ee0c7e84f2e72d45d00a7252877f1910cf5db11dec88a5e0ed7008c7600ce9826c358f SHA512 ba38e1a89475555f7941a566b717ccf26d27694914615fd4c1d3b8916a1b6d20bf395412bd1a25d8a6f62d06a301a36325acbfb32b0b37dc0270b55e31bec284
 EBUILD filebeat-6.8.1.ebuild 1500 BLAKE2B c21cf6b0e97aeb03ed9975ab64e50cafaec0920767d839ddbbfdcd4cfc2751d2f6852d45e95ef8d3d4ed8852e0f3166467b5c8e89cf5e127bf7a03f346c189e0 SHA512 9e2c8832931b23958a18b7acda6edd91672c2f9c9e033196e4d83c57eb54fa73663006844739fa9d628ce81bcbcd307ce78f1ef3d243d5db3af361f7ae95444a
+EBUILD filebeat-6.8.3.ebuild 1498 BLAKE2B 6fc76ab316ddcd407c945664152b847421e2d1cbe1602d6e1002558f894ca00aa4f9ceea1885c9d58b1f5e6e847f9b88f75ef8ab57d99ec277ab66f984086ac8 SHA512 bc86fe2d7783d378350d6d98bd79421e286c129beec250eafd8df4857a2ba80df3a1a0646fd18a5bb53e91658c63e8f436c3e57f36e49a4d4d5b48457086b245
 EBUILD filebeat-7.2.0.ebuild 1500 BLAKE2B c21cf6b0e97aeb03ed9975ab64e50cafaec0920767d839ddbbfdcd4cfc2751d2f6852d45e95ef8d3d4ed8852e0f3166467b5c8e89cf5e127bf7a03f346c189e0 SHA512 9e2c8832931b23958a18b7acda6edd91672c2f9c9e033196e4d83c57eb54fa73663006844739fa9d628ce81bcbcd307ce78f1ef3d243d5db3af361f7ae95444a
+EBUILD filebeat-7.3.2.ebuild 1498 BLAKE2B 6fc76ab316ddcd407c945664152b847421e2d1cbe1602d6e1002558f894ca00aa4f9ceea1885c9d58b1f5e6e847f9b88f75ef8ab57d99ec277ab66f984086ac8 SHA512 bc86fe2d7783d378350d6d98bd79421e286c129beec250eafd8df4857a2ba80df3a1a0646fd18a5bb53e91658c63e8f436c3e57f36e49a4d4d5b48457086b245
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-6.8.3.ebuild b/app-admin/filebeat/filebeat-6.8.3.ebuild
new file mode 100644
index 000000000000..0c71f0e08435
--- /dev/null
+++ b/app-admin/filebeat/filebeat-6.8.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.12.9"
+RDEPEND="!app-admin/filebeat-bin"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+S="${WORKDIR}/src/github.com/elastic/beats"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# avoid Elastic license
+	rm -r x-pack || die
+
+	# use ${PV} instead of git commit id
+	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/filebeat/filebeat-7.3.2.ebuild b/app-admin/filebeat/filebeat-7.3.2.ebuild
new file mode 100644
index 000000000000..0c71f0e08435
--- /dev/null
+++ b/app-admin/filebeat/filebeat-7.3.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.12.9"
+RDEPEND="!app-admin/filebeat-bin"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+S="${WORKDIR}/src/github.com/elastic/beats"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# avoid Elastic license
+	rm -r x-pack || die
+
+	# use ${PV} instead of git commit id
+	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index 193ae145aba5..578359287e48 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -11,14 +11,7 @@ DIST github-backup-utils-2.15.0.tar.gz 84856 BLAKE2B cc31d45711d4b26d246e08565b4
 DIST github-backup-utils-2.15.1.tar.gz 84627 BLAKE2B 14f448a8c15b45cdf2a2868d70d90bd91228bbeb3d7534fd89ed1812fd1bcc52e9720d4063fc33f9463035eb34736c919c888c17b2602ebb772fdef4830592f5 SHA512 72a0c70ef629f17a2b3be12661379a94150181c0ac87803e4490a9b927e84760917e936e3346d2da6a0ec004ef8fa9b1297b41341bce115a2dd26bbcc62c1843
 DIST github-backup-utils-2.16.1.tar.gz 84847 BLAKE2B 5c6c0cbe8268ae176321739582783e920454efbebb62a0058ceeddb675a46050db3126897054c0120a74bcfa16bd28b4dd311cbd6a5e23dac262a49bc026c90d SHA512 bde17ed47ec0b89fd95e0a018cc0709045da6f27ffbf492d555219a09e3fcca612d67da1e0d5786fa8ea08a7eaa6d183dc1d40fd45d7bace5d05899ae0007fcb
 DIST github-backup-utils-2.17.0.tar.gz 89926 BLAKE2B 82e89d616f78d630a4c537ad110f1097fd4925f9d0b45ebd117a5f4dbce21ec84bddd1f7a2cfebc52464e8fff9117bd4b0cc5e862e666d4b3d05f11a9b88730d SHA512 aeae5d5f662a687e13ff0aed54801759480ba39e31f0ad49a9ecc4fabad5aa5e124e774c7b939a366a33135e81614d1cee6f1004481bbe94150b48a11f222a90
-DIST github-backup-utils-2.5.0.tar.gz 40850 BLAKE2B 34f16e290619a21edef11410a583357a15b57c9a6a0d20b188863f5c41a7a30bcc168a2337ff7203de6f5659c611178bed0e0cff3d802c1ec923d7c4d8e1ee3a SHA512 ecd5b85e0e2e300a9f40ecb8f545868554c7b48bdf800a21cf111ead80c185c96d475c67487c9b9e8af676f8c71a001730084abde79e05860b3e24004888292d
-DIST github-backup-utils-2.6.0.tar.gz 45970 BLAKE2B 855c7e93aa4db136629db8ba109328d51b9e9ca82aef1190a9703be2cc456ac006cd6bacaf1d3ffe9ccd8d43fb83c15c30c9b514abd37fb2104e62b2e1ed51fa SHA512 a795e439f9d28e27b457c5b6eb42f35d6aea1527c2a01a26b81d6e86829db14a0b27a366d9358214bbe1c16540fe524fb0010d5f509c78ba5398c6bdbf04182e
-DIST github-backup-utils-2.6.3.tar.gz 50884 BLAKE2B 43e8c398da11f891230a7910fc29d9fc702f5985c8bda5388f8415446e12a3408383ee5a76a26f2519625be3bf442600e4281a4e10e24b5a1143ac4ca1934442 SHA512 dff092325ad6f3502c8c0afbea90a53469af0ab4b98eaa39a950022c5b4e199cd3b48b5ec0585e3ea39b9bbd707dd037e8e0ed00ed8c6858276ba1a8e1075290
-DIST github-backup-utils-2.6.4.tar.gz 51270 BLAKE2B 84d880d71b92d1b92f52dc3b749cb984a6f2e2e98eee1ecb4efc48dabf54fbb48a8a936d0422f7391adf3ea27265f6ea266045cf4ed509fd675ba2ac908abda7 SHA512 be2ef9811e20fd9be03d1b57e75151089817bbdd87fa487462a8fe6186195581ad6b1c62b1b930bd64689e89dcf33c2228df7d77a12790404f09b679b1ecf377
-DIST github-backup-utils-2.7.0.tar.gz 51409 BLAKE2B 5e1c5d55376af6f053b634ffbef4b97bd8f5a5126e6180bc95e21d372e311f863f653b630f4ecf2cf0c589b3b059e0a60e63ebeaa79d55c6333f7d34632adb35 SHA512 16112e8d05001146a182e225c1bb5bdfbe210ddb3993d989a9fe88b88bbf222196a66f1f48b262b198675af8e4b3e3a10120e7dafa7b244137bf29cd879efaaf
-DIST github-backup-utils-2.7.1.tar.gz 68793 BLAKE2B e65ac6c4e0018947be34d27bcf428d81ebdd138137fdbd1d15b6d77a7f2bc4b95a5ef00e0db1462b61b3015e2d2a54e1cd4e610857b7a156cbac9f5f912ad2ed SHA512 950c24b3fef8775c2a90789c469a81256323c1ede67b3f6691920e78c1489533adf5616f2ac09f9b844382778b5b2b5106f8c467be7d65b47ee06bf732591880
-DIST github-backup-utils-2.8.2.tar.gz 71392 BLAKE2B b45939693f2b545562b77abc897b54c4d980638c7e2b605d84deb4b251f8d702543829fe7138222aa25f740a033a73d52fbde6f735e3d510ca61c00be99ec82d SHA512 d3801d37f18b41594bfee83b891ce1eb9f1a15972839bd9dfb6469d311484ef94f635da4319b0b9f2d6778d87b935ca5c0bd42ddbf009f292e05b6a654464bf4
-DIST github-backup-utils-2.9.0.tar.gz 72512 BLAKE2B 3bb97609284dca1b3682d17e1c60e24a2169574691eb8463141951e2d5f93558ffbda3c7bec7f22c7a63dabe6bdf410c347f7512a09303653e5f939197d4faef SHA512 81af0842c021c49be8acca775d1ab375e98c2b725893f45d65b670e671892d779408677dfe6ed415101bf88fe549d117957bffef0aa372a74bcd7c6f87c1d12b
+DIST github-backup-utils-2.18.0.tar.gz 90357 BLAKE2B e9f6c155246914a36d26ec8cddf4a1e9feca73b3450ceb8e6df11df7c077b86f18cfa23b51e77425ba4e28ce4a3664200c1ddb15e6eb856d6b8930379dd3e348 SHA512 1778bf4cf404444e567f9f6b98bcd01bf9880939b4645692d75dbf10e7b31b40678521b66fbdabfedef648561f34709492b7860ce16442757e161db2ffda45a2
 EBUILD github-backup-utils-2.10.0-r1.ebuild 1165 BLAKE2B 0789a905aabb2e370d35868f89223bcd9b0ccb0100f186410f72c026747cbef9ed68b4346f37c3349e2da5a34db21ff711db8d24230d8a58f2105c2dfc3009df SHA512 fe99dae0e4dc7e7c66c33ea61488f10c62ca656829f809b7d69dc83565183dbd7528f682df71c66e9f2ad2008e7a499abe3991cbfffa53d17bcb1cf4c3057c34
 EBUILD github-backup-utils-2.10.0.ebuild 893 BLAKE2B 70055ac1dc8372d877d4f0e4361b94d3ba60334b0bea5ce284a537f137641e09a6d14fbce96a62dd9a109d48b3b76b49810cb8a8554b9882d5915b8f159c1a26 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1
 EBUILD github-backup-utils-2.11.0-r1.ebuild 1165 BLAKE2B 0789a905aabb2e370d35868f89223bcd9b0ccb0100f186410f72c026747cbef9ed68b4346f37c3349e2da5a34db21ff711db8d24230d8a58f2105c2dfc3009df SHA512 fe99dae0e4dc7e7c66c33ea61488f10c62ca656829f809b7d69dc83565183dbd7528f682df71c66e9f2ad2008e7a499abe3991cbfffa53d17bcb1cf4c3057c34
@@ -34,14 +27,5 @@ EBUILD github-backup-utils-2.15.0.ebuild 927 BLAKE2B 80a84b7e2b39824b1ca6fb87294
 EBUILD github-backup-utils-2.15.1.ebuild 927 BLAKE2B 80a84b7e2b39824b1ca6fb87294670baa9ffd8d4b9d38a522e5084a51e57ca3faf05ddedee7f3102c62cf5f9a7c42a5be99554dad1163065ee26a55af5d8113c SHA512 e6796e02b950114b60a8c3a0ebfea255155eca9bca0307b9d2e385bf6e317936c35082b2ff10013d1e57e38298baf0b9d9adff56cc6b671be30be2dae9423960
 EBUILD github-backup-utils-2.16.1.ebuild 927 BLAKE2B d821f5560d803995f1fc0aaf64d089a1143ffeca24c80126a0abf880777b6bd4b10022ce46543cdcd8cfbf9495d39cd3ae2d0eca9706b20b799ee107c2961fc6 SHA512 bf76aa82dfb0321d3a3ac50135a6d4219ef448d87f19bd3667f23ebccfdb98058ebb8bdf2fff2f95fa1a36452367c4530c2bcd1ab0c31770c3bc29adafc56bb1
 EBUILD github-backup-utils-2.17.0.ebuild 927 BLAKE2B d821f5560d803995f1fc0aaf64d089a1143ffeca24c80126a0abf880777b6bd4b10022ce46543cdcd8cfbf9495d39cd3ae2d0eca9706b20b799ee107c2961fc6 SHA512 bf76aa82dfb0321d3a3ac50135a6d4219ef448d87f19bd3667f23ebccfdb98058ebb8bdf2fff2f95fa1a36452367c4530c2bcd1ab0c31770c3bc29adafc56bb1
-EBUILD github-backup-utils-2.5.0.ebuild 868 BLAKE2B 36bdc6369b2b535dac992641bcfa4c323325e5811d9a581742d5c06079a10c75220f7b11557b983e77ca83cdb9757f38a11ebb421d2fa9fdce5bc0e82c5a3f70 SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274
-EBUILD github-backup-utils-2.6.0.ebuild 868 BLAKE2B 36bdc6369b2b535dac992641bcfa4c323325e5811d9a581742d5c06079a10c75220f7b11557b983e77ca83cdb9757f38a11ebb421d2fa9fdce5bc0e82c5a3f70 SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274
-EBUILD github-backup-utils-2.6.3.ebuild 868 BLAKE2B 36bdc6369b2b535dac992641bcfa4c323325e5811d9a581742d5c06079a10c75220f7b11557b983e77ca83cdb9757f38a11ebb421d2fa9fdce5bc0e82c5a3f70 SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274
-EBUILD github-backup-utils-2.6.4.ebuild 868 BLAKE2B 36bdc6369b2b535dac992641bcfa4c323325e5811d9a581742d5c06079a10c75220f7b11557b983e77ca83cdb9757f38a11ebb421d2fa9fdce5bc0e82c5a3f70 SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274
-EBUILD github-backup-utils-2.7.0-r1.ebuild 893 BLAKE2B 7765fe74f2a68cec46e692b458639e3af4736844dc69e5023ee137ff0e3fec18211948edc96126cfcbf56a7fc8df25ee538b8ba62f0aeb4786c35125a8d7b54e SHA512 7ddc82153106396b2b450d062c735257aa961b4329f5d5337db5391d5ebc57835e56755d600ec9923a4ca66569a3c590e05a8571a9484e2b67692a5769da3cfb
-EBUILD github-backup-utils-2.7.0.ebuild 868 BLAKE2B 36bdc6369b2b535dac992641bcfa4c323325e5811d9a581742d5c06079a10c75220f7b11557b983e77ca83cdb9757f38a11ebb421d2fa9fdce5bc0e82c5a3f70 SHA512 023dd525af06cd12a7770185d0e0ae5adab996167984bc9c5e3466d0e9e7f69d5f205427b6723c4e16e02ca24732b5c4b4ed2895b5a53ef9bf96ebc2c0141274
-EBUILD github-backup-utils-2.7.1.ebuild 893 BLAKE2B 7765fe74f2a68cec46e692b458639e3af4736844dc69e5023ee137ff0e3fec18211948edc96126cfcbf56a7fc8df25ee538b8ba62f0aeb4786c35125a8d7b54e SHA512 7ddc82153106396b2b450d062c735257aa961b4329f5d5337db5391d5ebc57835e56755d600ec9923a4ca66569a3c590e05a8571a9484e2b67692a5769da3cfb
-EBUILD github-backup-utils-2.8.2.ebuild 893 BLAKE2B 7765fe74f2a68cec46e692b458639e3af4736844dc69e5023ee137ff0e3fec18211948edc96126cfcbf56a7fc8df25ee538b8ba62f0aeb4786c35125a8d7b54e SHA512 7ddc82153106396b2b450d062c735257aa961b4329f5d5337db5391d5ebc57835e56755d600ec9923a4ca66569a3c590e05a8571a9484e2b67692a5769da3cfb
-EBUILD github-backup-utils-2.9.0-r1.ebuild 1145 BLAKE2B 0b23e1a2d1505180be708b88f38b97a0c685490427555d68da01c786e44e5eb0772c69279906e4ff6111a68ac25af199f584b5809d62722f5fc7d95b657f7b03 SHA512 8b82f71361d6ad56ed36e733ad563ecbc736021de5cedeff77e5f9c574f3fa7ce2f99a81770372c55378dcf54bd1a542905ea1eee1dce6fc86ed064e262c6d94
-EBUILD github-backup-utils-2.9.0.ebuild 893 BLAKE2B 70055ac1dc8372d877d4f0e4361b94d3ba60334b0bea5ce284a537f137641e09a6d14fbce96a62dd9a109d48b3b76b49810cb8a8554b9882d5915b8f159c1a26 SHA512 2ade504c613988d9238786435f333572975c9e1f180cea52dac9394c8b380b3e33c33a23951f4add9961bef4dfe9cf1e8e96970fc85086d299841c29fb3716c1
+EBUILD github-backup-utils-2.18.0.ebuild 927 BLAKE2B 56e418957d079048accd33270485da74ed1ed4a22bc31e108ea7395c86a255ff56f626834c309775ff14ab128cff67d898226b197a02c52f5fdfe47e37333246 SHA512 f38d669f7e2c29e2df5a4e54503b3abf7d91a849d594078ac8b72356b740162f9d7ff84d83defe6309b7d3e3bf8c7b6b1c1f2a6a963884329f345927482e583f
 MISC metadata.xml 448 BLAKE2B 8f3322a1e551345100a70421c1fcd9d56b8750e425ab6e579ceab918858df09c6aec520898d1897066596df231f983b3384441e7edc9e8350ac19ebd3d69462c SHA512 ae28e31312c3dba5d71fd4bd6c7ed6adc171a250473d09a6646d13de2cdc0d78ff4b1ca389c04717b789d500e7c269d49aef32a785ab4bdbc073c30bffa5eba7
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.7.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild
index ae86106fc4c4..e88453feb7e0 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.7.0-r1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.18.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # See https://github.com/github/backup-utils/issues/135
 PYTHON_COMPAT=(python2_7)
@@ -18,6 +18,7 @@ IUSE="test"
 
 DEPEND="test? (
 	dev-util/checkbashisms
+	sys-apps/moreutils
 	${PYTHON_DEPS}
 )"
 
@@ -41,6 +42,8 @@ src_install() {
 
 	insinto etc/${PN}
 	newins backup.config-example backup.config
+
+dodoc -r docs/*
 }
 
 src_test() {
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild
deleted file mode 100644
index 6c89280fa665..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild
deleted file mode 100644
index 6c89280fa665..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.6.3.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.6.3.ebuild
deleted file mode 100644
index 6c89280fa665..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.6.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.6.4.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.6.4.ebuild
deleted file mode 100644
index 6c89280fa665..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.6.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.7.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.7.0.ebuild
deleted file mode 100644
index 6c89280fa665..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.7.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.7.1.ebuild
deleted file mode 100644
index ae86106fc4c4..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.7.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.8.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.8.2.ebuild
deleted file mode 100644
index ae86106fc4c4..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.8.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.9.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.9.0-r1.ebuild
deleted file mode 100644
index 4cf72e6606ef..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.9.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
-	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
-
-	# Fix for python3 systems
-	eapply "${FILESDIR}/github-backup-utils-python27.patch"
-}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.9.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.9.0.ebuild
deleted file mode 100644
index 586f3c415df5..000000000000
--- a/app-admin/github-backup-utils/github-backup-utils-2.9.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# See https://github.com/github/backup-utils/issues/135
-PYTHON_COMPAT=(python2_7)
-inherit python-any-r1
-
-DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
-HOMEPAGE="https://github.com/github/backup-utils"
-SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="test? (
-	dev-util/checkbashisms
-	${PYTHON_DEPS}
-)"
-
-RDEPEND="net-misc/rsync"
-
-MY_PN="${PN/#github-/}"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	dobin bin/*
-	insinto usr/share/${PN}
-	doins share/${PN}/version
-
-	exeinto usr/share/${PN}
-	doexe share/${PN}/bm.sh
-	doexe share/${PN}/ghe-*
-
-	insinto etc/${PN}
-	newins backup.config-example backup.config
-}
-
-src_test() {
-	emake test
-}
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index a0d23421b539..2467eae9cf45 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,5 +1,7 @@
 AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45dadb5824f369a454a1126cb61293d55f86f9f01fb659932729dbc205a522aab32343dd87b74662927d60edc50750af602a959cc9 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae
 AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb
 DIST KeePass-2.42.1-Source.zip 5163432 BLAKE2B c24a57da863c92d3f89663f33ed89c277e248c926067c14a6a7e3526e77c458e943e62c4b98a3d86595eea308d8744fd4a17da6d5456030a771e324a662abd9f SHA512 c87581afbaa516f637848db134a8d945db168bbbe97789a9a7424600d4188a21d2b1b3cf907a20577b2903ce8916b6b12355a3296ee1630a5b556c9170c4fa22
+DIST KeePass-2.43-Source.zip 5177684 BLAKE2B 72530afd37139d250fe7378ccfec9056e9f2210aa9dfc4cc082d977ccfc517697bc52dad3d487ebabc796977cdbb9679df32a79a6be807c21ceab5931d464df0 SHA512 c403ae5d7b2a997e1aadffd6a522c8292d01a5803371af8b30734414ca5d47871b53a15067251d4cb072215fd41396465b0b16351e76dad7a48044b7ed62a7e8
 EBUILD keepass-2.42.1.ebuild 3116 BLAKE2B d4b548f7e4143138f1eddbc3e69b3e532b63fb1970a539e7df647bb57dbb488f1c291df2bac8a1c6cbf2afec400d30a91b9f2eb32c92274993cd21db7239239c SHA512 4c7e2ab0fabafa2f715137131951fdeca008f67f695f43cac5cdf5bf407aeea5a175fc3e90c7267ba47d578aeab1243eb49b11135c4d045ecf2c9d26b1f2c534
+EBUILD keepass-2.43.ebuild 3118 BLAKE2B 664ed7bf32f87f04295defa3249241f51d259d5c63239f3d4a2ff41fe7d487257e397dd909898827c7328951895b5a6aca474d90ac498192fc97f430c2e0635c SHA512 9384d81ce0cbee3f5acbff9f706ccb5fb48133fdf1d201231036b139705e5ab1cd1361aeed52cfbc14999992c8ff5bad0e1b3b279eb319d0971b4d4b7102ac1a
 MISC metadata.xml 651 BLAKE2B 058fa70fb6ce35fb52464a84cf506ad117343a1376a40b003c4f55bdf94369136276d8bbb67f30490eb73cba4df6b03d78e8c2a65cf8141dd6cf64654c9b6358 SHA512 6251f546e631decbc7692ab00900d722031ce638f3d878771a2bcfebedba8e1fee9b3e54dfd4c3ae3c711006099fc5a772555ea7cc018d012de164755ba8b52c
diff --git a/app-admin/keepass/keepass-2.43.ebuild b/app-admin/keepass/keepass-2.43.ebuild
new file mode 100644
index 000000000000..1dc244ea08cf
--- /dev/null
+++ b/app-admin/keepass/keepass-2.43.ebuild
@@ -0,0 +1,113 @@
+# 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/lastpass-binary-component/Manifest b/app-admin/lastpass-binary-component/Manifest
index 37e14fa14939..811d4d50b89e 100644
--- a/app-admin/lastpass-binary-component/Manifest
+++ b/app-admin/lastpass-binary-component/Manifest
@@ -1,3 +1,3 @@
 DIST lastpass-binary-component-4.19.0.tar.bz2 1625255 BLAKE2B 714fb34708f9dda8dbacfce8e76adf004f1cc966d685c0efbaac7b25c45068bb5595e954e554092852d575f1fedc5f318d05b121bc2ce1aa4888e4bf374f7b96 SHA512 2535d72c5b545b364dd1e91503590cafa16d3de4f4745c4f1fa236135580e2af47094e364a7f0ebde5fcfd11282ab9329ef333866a985f02a873e092aabb9b22
-EBUILD lastpass-binary-component-4.19.0.ebuild 3645 BLAKE2B a80be528bb879334dac5f9e59bdefcdc5cb882c9651dd57f7c4ea0c9c87d8f4bc2bd2dd48d7ab96c36e999301d67514d10330dff99d2c178426e7bfadd3a98a4 SHA512 9252e5329fbc6083ae93cb29896a831cfe929d48df9250ab84f825eb6fe70d0b57c63157bb2a6d5ca0c39d4bf39ed0a0bf068fa73ad3b4873d50ceed36ad2b52
+EBUILD lastpass-binary-component-4.19.0.ebuild 3650 BLAKE2B 3961eb1a2547df5b362e99421c7a6d38ddb9bd6ca1d6856810b1b6ddabf39dc2826fef22d657d1a58cefc91335dc5022be807f4a62603748ca442c0e35a95fe6 SHA512 60696a2938092e0b3702cf051b256223b8ee68d20bbaad24ef840f89936b2afe35aeadfafcc47733d0756ca48e9e350f74c5572ad4b5235b1b021d8f99831f33
 MISC metadata.xml 816 BLAKE2B ea7163f64706263e360241192a07e1e12eabc6fb196e5029cec931c53dacad20a9a4d851402f8942120328aa551159e2ba340257d50a5fcc36f7a72145e13a18 SHA512 71eb5c8aa836f75a5bfed79d7398e30628a274586a019d094a114d582ae2011d148cae325eb79b67e64035822cd18f154b9626142a7b2cc4c57f1e40f2f15b6b
diff --git a/app-admin/lastpass-binary-component/lastpass-binary-component-4.19.0.ebuild b/app-admin/lastpass-binary-component/lastpass-binary-component-4.19.0.ebuild
index c0407fd6d94f..ac0969132cf4 100644
--- a/app-admin/lastpass-binary-component/lastpass-binary-component-4.19.0.ebuild
+++ b/app-admin/lastpass-binary-component/lastpass-binary-component-4.19.0.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://download.cloud.lastpass.com/linux/lplinux.tar.bz2 -> ${P}.tar.b
 LICENSE="LastPass"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip mirror" # We can't mirror it, but we can fetch it
+RESTRICT="bindist strip mirror" # We can't mirror it, but we can fetch it
 
 LASTPASS_EXEDIR=/opt/lastpass/
 
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 3621005963cf..117b57430aa7 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -10,12 +10,18 @@ AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa88
 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-6.8.3.tar.gz 172067513 BLAKE2B e91661009b1977879117c814f1b17a703848bbf09093ed0eb7c91007254299b2935f2cb36374ee0e9ebb71cc3f61521e96db51d4e4f7fa1612cc04cd08cf5201 SHA512 b441619570af6043c914744d32e5a7fef95ed24103693990c9ca6b45aca717678a7916e18a08d7903b907aabda4fab75ef3a4f8ab0e0ea4bea4fc4e167db4dcf
 DIST logstash-7.2.0.tar.gz 171299740 BLAKE2B cfdbabc11d6e0d182ea7bdff1d30ca3a5bfbfe036f952c0d944c105f563dfa1b444c8dd1e9f023301abfbf9a86708d6bde2689b462b28f00a34d09f78fe3898c SHA512 955358d504b6626ba9ac88a2d65b161044180c3085f8dbaedfb8b85b092ecc65721bbda73b750f7d8b78a052828a54f7ed7ad16ee7ec72f3ed5e428ba291a173
+DIST logstash-7.3.2.tar.gz 171783584 BLAKE2B 0a936edaa57ae5552b79bead754b75c8a8c7a920461b720c58dc8e32c2aae342f3639955b63264e8704093c0d30d5d801f468d1b391e9efb2c5d605dcb2ebf5e SHA512 311b849cb8e1f336908aefa1cb2f0e2d76b696410346dd3fa0560313f9cbd3f098c93aee68c9fead736a3edb39ca543161eb7de115597e034eb0a015904c7417
 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-6.8.3.tar.gz 171937304 BLAKE2B 25dc90c6223d2481ee7cb4fb5bc9019aff6aa6e01bd56e33758842898a273de5fbec1e939dde91ceb719b41ea0222ab9ce8548cece56fd7c07d398a30b329a1d SHA512 24efed274cf1adf5e538048d1d9c2c5d252fd8671c167f2bf28b1ecbbec353e4b41729e722b3aeadfa72835717bad7f4bd1638ddedf53827dd5d9826e234e8b1
 DIST logstash-oss-7.2.0.tar.gz 171128040 BLAKE2B f0f3d4f0d5228918d8435c521d10ff5070e23561c25ce28e8d58997d499a7c7697354c1fb1cb70bf2bd832ad50c04afb00cbde4b3053f9f24d2619f3fbfffbdf SHA512 24120740bc727b6da50b865bb85bf61f013a38b6679d679ecc75a73c69766a5133fd47ad99fa0220d5dc6cceb506fbde206787adcee31483288c68c228edd1fd
+DIST logstash-oss-7.3.2.tar.gz 171613705 BLAKE2B e1a0c512cadd5855e1a1524e1c44214aeb792361493406c5cacde1bd72243178d03113c08a1fe0d1c2212cec5a2947074911bf19eaaedc636db754081c3fe32c SHA512 3aac74966b27d0d551f49c78c457b18a1a76d0e5a7b2fa1dc9a7776927145b28a6c02f51e4dd7e9ca49dabe5f63effd4227fc6980e522ab7da4ef847da6bda12
 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 2106 BLAKE2B 8b04abf9b4395e60882de2d5c482bb3ee17f1ec2446a5d2c24feda677025c0662580c277334d2f7eeb0a5b61fe52bc1513a79b1a55f85d33ebbd75829307b86f SHA512 c56a7c1c3eb973cbaf895206270f80a3ed3c9ccec37c9102b5cee1f6477a1952b6a93310f41046e12d021580862dd96fb1b658798126f00535abddb4d738853f
+EBUILD logstash-bin-6.8.3.ebuild 2099 BLAKE2B e7cd6249e76d9e3629cc640542aef942ad893d4643c803a10c789a1070775996364aa0caff337bf2eb18cdd2bdd534941a5637f23e44d370a87bc017bc931fde SHA512 aadfd4248e27c0c0134a7c7705dc3c8cfb9b031a963214174664c8c2438ba8e1e466025337fc9a9a531ff5f6bc16b7e1f25d3362205b0ca2793bdb8482a9e202
 EBUILD logstash-bin-7.2.0.ebuild 2102 BLAKE2B 4859b52ecbe2d3cb0fa31768cbfcfe59ff4ab1ccfb70ed1b0b30edf33415a7107a246ab902fc3c42897804482dd91a25bd8da6af29374c424bc53e700ed1b797 SHA512 3e346deb2bccc47fa55d2de9afbc6bea15f28d235e93fae323620a24a70aa6671072ab90f778d3157ba74c860056a1f76d5ad0ac678b6d658bd49ffbb8fdc3dc
+EBUILD logstash-bin-7.3.2.ebuild 2095 BLAKE2B 80aa953c2657cc0218b18df01e67279384fcc57f8fb3931121c787caf0c198e9d87c138bc2c6d809d0766fd67e8e5046d10ca0d4826047f845d89931bf63e5b5 SHA512 4db211818a819557d904ced91163c2bdfeb3ed9a1ae5ecc9873c1973b5137aca526164fe04c35984b9f97a56564c3e2627d4b952775dd3b0ca220c2cca37fe54
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.3.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.3.ebuild
new file mode 100644
index 000000000000..bc5b7769f9ee
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.8.3.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
+
+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.3.2.ebuild b/app-admin/logstash-bin/logstash-bin-7.3.2.ebuild
new file mode 100644
index 000000000000..7b2c36e2a632
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-7.3.2.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
+
+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/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 915a0018a8ec..e4721812d400 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,9 +1,13 @@
 DIST mongo-tools-3.6.13.tar.gz 4990848 BLAKE2B 022ddf214869c3a3e545aa9572f77f0adc21c0dbd6ea6ad9e083633c2e972b7ef77c0bda4354dbde9fd0e23c6dd02a7de8873d4b2c2a3e4423ea6f8e1c23ed52 SHA512 fac21c4841bfecba11a7765bb6c36d1fa19d4dd94f6f4168fa767fc11dc8b3caf04a5029becd09eba01dd694274e9cc22da8566ce878769e5c3c97016c162432
+DIST mongo-tools-3.6.14.tar.gz 4990861 BLAKE2B 13394a7222e73c0912e7d9d04205b25e5d73d6c72b53521b0749e0998dc52bbe4c7733d460b189aff2401790f537d9aa369b969ed273ea0858520ecd75782b66 SHA512 3e7caaa1d568023d478c77d5e88127796b25d27c71e30af692983f4fd2160887662253ffc67e6e87aa3a7e1fd4ae231de9401b1628412a4561b9595b71df8834
 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.12.tar.gz 11134652 BLAKE2B d3c9703046dc577b85cefe1185678e0029411ddd44d0648f9b09fc3ab41e3661891d18afd83bf1a148dc4c9208895f444c115948e515e09dfa3062e89d98fc24 SHA512 068d8c456386caddcce23fa8917ffecdc9b5c39fb6794c5cd1d9099be1f127ecf680b006055581dc3d90507072a87788b46be7410f0dbede42da64c664b77ced
+DIST mongo-tools-4.2.0.tar.gz 14402906 BLAKE2B 535a9a0e49f4288e63c905f7bd98c1f1b8e38eef562cb5c40a0c09500a18eb7fd401f05df2261c92db3e8a126cc03902fa3c61177b50a3e18f2d33bee7590f52 SHA512 f937a9f2b4ccfe262ca1a09e7bd103ffbdd45eae7c6deed8c1453f4499935f526f513749422e3215071ef465291c3f0544bf1e9510bbaf8dd9fa1edcf22f887a
 EBUILD mongo-tools-3.6.13.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
+EBUILD mongo-tools-3.6.14.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 EBUILD mongo-tools-3.6.8.ebuild 1345 BLAKE2B 1baf6f2c407b2a4d1e81a6a04444b9c43ef74e6abd7e68c08c4ef1e0540b8dcb6c54c83a58b4687d2aa20f3fbbfd88b793e20058adaecb8e53b13e76a328ee54 SHA512 2286b4f40c01231648535b0f050e1ce36f5fdd654acd83389b35604d41e92bd584dec654b5368a7ee4e6ff7d420b19faeadc1c1c7f252093f365e23efb6604eb
 EBUILD mongo-tools-4.0.10.ebuild 1612 BLAKE2B fe5fff8fdf2295c6ef3927293da63b4f8da68c81104d554789720b6268f25b06ee42fc728da388617543a18dc3c139b27c1ac28cc8fbf3b2bd519d053a2c9fa1 SHA512 529a9d42003103e564d7b5147d582da78db2435ae3587ef6827fd640947fdd5bd559fcf86ec82f0882a5c04b79fda9d9af612a8fed12e9d256bd5e3fa1e267fb
 EBUILD mongo-tools-4.0.12.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
+EBUILD mongo-tools-4.2.0.ebuild 1613 BLAKE2B d8c1234826817987335aaa0aecae634e14b44b3813dabd375f27dc72971db6190cb570e530436f54edc3228f708954c703a1299533a585a842f1905c182c0cfa SHA512 cc6bfc311c50992880697090963b74f704c4f980c957cd92c88ef314bb1ea241901244ed3c9fc1f1f42ae0606fa281911f1121a5012745e6a121f293d685dd6a
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.14.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.14.ebuild
new file mode 100644
index 000000000000..092d770686fb
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.6.14.ebuild
@@ -0,0 +1,71 @@
+# 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.2.0.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.0.ebuild
new file mode 100644
index 000000000000..092d770686fb
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.2.0.ebuild
@@ -0,0 +1,71 @@
+# 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 04e3024a5a15..c68bb228c20d 100644
--- a/app-admin/mtail/Manifest
+++ b/app-admin/mtail/Manifest
@@ -1,50 +1,25 @@
-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
-DIST github.com-flazz-togo-babdbf21cff004ef3532451d562a2119ef0c54ee.tar.gz 57591 BLAKE2B e2d4574c45a0c0adee803fcacb61474645ca1da31b72c198bb2e568ea15a1ca51b890d3a584afa0a94f57533d6cb823809742bd035482c22529d91b25f3952e6 SHA512 6813e8377df63dc028ccbbcba178523b2cddaaed9f609da52bdbb41204eea94704ee03894857983d452b0058532769bbdd7710ae71847e71ee63040035894c13
-DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 BLAKE2B ced6ca6f115eedc954f6b583b28e470ec5dcfe0c279d55a63c00ee942acde095e9eef8fb4c3fa289f34871f43a7562fb71142d070a54398bc5d91122e64b4ad0 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab
-DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8
 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
 DIST github.com-googleapis-google-api-go-client-v0.7.0.tar.gz 12103399 BLAKE2B 4aeae2edb1985eecc1e2d8708810e1499bff83f134aa05b26cec2949ceaf3268a5d0a8c5535b11bdaf2ffae9f08e68c39c419a9cc7c381185fe00de9970d4156 SHA512 10b23be943958914229b109aa188cb37edbed187cd7c2cf9c02ffb37dd51589abf4e6da765467b313cad3755b73ff875524cbb96fbf005a0b4886e3ea713197f
 DIST github.com-grpc-grpc-go-v1.22.0.tar.gz 742470 BLAKE2B c1bb056420fc1ab6b9bf0fc26b9457cc96f58afc3257b0dc58b204c4f6b0da443cd087f885ebe34c6a73f4e38cd52f9b1eecfc8f199214ee5211904a73bc7e25 SHA512 660cd0390cf160410b0079657155f76da2dd8be65b37b7bf588eb9035f2040a13220cbff595c451399490abcb53de34fa911f07f1aafd3c3779c99993a440aea
 DIST github.com-hashicorp-golang-lru-v0.5.1.tar.gz 12982 BLAKE2B 99a1a79d86162e6c528e1c985a39bbaf0d6adf272c155697efa868f8a0fff3b7c206a45ded6ae4436113d1fab8daab97d4596e3f888056af8a757f9440e1b802 SHA512 c71c35fee10d34f2d075e589e9d4a770e8b48dd5b09946a3fab34337b3680f1fbc20de1cb8ce52aa205c79bbfb1194c44391d7fbe746e7c676969ba8930d827b
 DIST github.com-matttproud-golang_protobuf_extensions-c182affec369e30f25d3eb8cd8a478dee585ae7d.tar.gz 37541 BLAKE2B f78899afa1390aca6cb1b412271713c60107771d512ead83482e0bb1716d175b791b4b04bd24b7f469cc1a29176eadcf0545ac3bf166c5b350602420d3c05aec SHA512 141b1b781a4d1c59f5eb1af93c966343b80ed405a5f63774e6cda9f12c34536e892c7a84699d6cf2e9c775457a4c2ad5d5d0b4d302fc25a923ab81d46ad65580
-DIST github.com-pkg-errors-2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb.tar.gz 11481 BLAKE2B ee1048ff0b0bdbf77b0c6c2102c32b3691efd5bc75a69d327d6c1e7c19b2ebdd2da7cba383fc312a16122fc89d85ad56265f02847adae8b21674e1c200b364cb SHA512 6e8ce6cc7f3e3065fdb3f53da9be99771e7d3981fc091bad6e6f436c44f7891838a879fc6267bc5349fc73a8c896aa1eaf7cb1b17fafb5d7dee39962b6269c6a
-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
+EBUILD mtail-3.0.0_rc33.ebuild 2586 BLAKE2B 1ba2c422a6a144528cb03c2d66f054d8ba26868afba5c9fb41330c97cc6787e7c4348699bac749b39337a8fecd5f060ceb4d1c4c6c38dac44c7d389f8406ada8 SHA512 3b2d70e97541c5e0cac47eebca7366913935eaf7d127202b0de08d27c14720bee1bccb0d65d6556419e96c5e696a898985e83638865f49ab89bd69036803f263
 MISC metadata.xml 295 BLAKE2B 83cc868475f40ef5e6bd8fa8824e8959615d7589fe4985273026ed4ce02b5eee2c631cbdce4f69e67f9a019252385bf4e0bcbef0e2f5083770955ca351be5961 SHA512 ed1a9cc5e20a4063111ebae0942a1f23b30363c91e22099046c9628d8636b9500cd204a11b22744c3e881d04ebcef9515f47efe636bc6a8a7d992fed9e2c6f95
diff --git a/app-admin/mtail/mtail-3.0.0_rc32.ebuild b/app-admin/mtail/mtail-3.0.0_rc32.ebuild
deleted file mode 100644
index 6c0bf1939af5..000000000000
--- a/app-admin/mtail/mtail-3.0.0_rc32.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-	"contrib.go.opencensus.io/exporter/jaeger v0.1.0 github.com/census-ecosystem/opencensus-go-exporter-jaeger"
-	"github.com/apache/thrift 4c847372eb9af8ec0b21ace31840eaabfdf32660"
-	"github.com/beorn7/perks v1.0.0"
-	"github.com/flazz/togo babdbf21cff004ef3532451d562a2119ef0c54ee"
-	"github.com/fsnotify/fsnotify v1.4.7"
-	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
-	"github.com/golang/groupcache 5b532d6fd5efaf7fa130d4e859a2fde0fc3a9e1b"
-	"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 v0.9.4"
-	"github.com/prometheus/client_model fd36f4220a901265f90734c3183c5f0c91daa0b8"
-	"github.com/prometheus/common v0.4.1"
-	"github.com/prometheus/procfs v0.0.3"
-	"golang.org/x/sync 112230192c580c3556b8cee6403af37a4fc5f28c github.com/golang/sync"
-	"golang.org/x/sys fae7ac547cb717d141c433a2a173315e216b64c4 github.com/golang/sys"
-	"golang.org/x/tools d73e1c7e250b19f9948138e2df37cea712e8f06f 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="b5aa95d10fb3af7b843e3814bc65aedd983425d9"
-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/mtail/mtail-3.0.0_rc33.ebuild b/app-admin/mtail/mtail-3.0.0_rc33.ebuild
index fa27f3eb0059..761acb2d4838 100644
--- a/app-admin/mtail/mtail-3.0.0_rc33.ebuild
+++ b/app-admin/mtail/mtail-3.0.0_rc33.ebuild
@@ -37,7 +37,7 @@ 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"
+LICENSE="Apache-2.0 MPL-2.0 BSD BSD-2 MIT"
 SLOT="0"
 IUSE=""
 RDEPEND="!app-misc/mtail"
diff --git a/app-admin/mtail/mtail-3.0.0_rc4.ebuild b/app-admin/mtail/mtail-3.0.0_rc4.ebuild
deleted file mode 100644
index 673d711107a9..000000000000
--- a/app-admin/mtail/mtail-3.0.0_rc4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=( "golang.org/x/tools f57adc18217d779aa42266ea71a545827755a77b github.com/golang/tools"
-	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
-	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
-	"github.com/pkg/errors 2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb"
-	"github.com/spf13/afero e67d870304c4bca21331b02f414f970df13aa694"
-	"golang.org/x/sys 43eea11bc92608addb41b8a406b0407495c106f6 github.com/golang/sys"
-	"golang.org/x/text 825fc78a2fd6fa0a5447e300189e3219e05e1f25 github.com/golang/text"
-	)
-
-inherit golang-build golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGIT_COMMIT="d9f2afc03ae86e203892f25d66cce8c76df8c649"
-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 -i -e '/^[[:space:]]*go get .*/d'\
-		-e "s/git describe --tags/echo ${PV}/"\
-		-e "s/git rev-parse HEAD/echo ${EGIT_COMMIT}/"\
-		"src/${EGO_PN}/Makefile" || die
-}
-
-src_compile() {
-	export GOPATH="${S}"
-	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 bin/mtail
-	dodoc "src/${EGO_PN}/"{CONTRIBUTING.md,README.md,TODO}
-}
diff --git a/app-admin/mtail/mtail-3.0.0_rc5.ebuild b/app-admin/mtail/mtail-3.0.0_rc5.ebuild
deleted file mode 100644
index 8297bf1eec38..000000000000
--- a/app-admin/mtail/mtail-3.0.0_rc5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_VENDOR=(
-	"golang.org/x/tools a4ae70923768403983fdab4e1d612d79c08ba465 github.com/golang/tools"
-	"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
-	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
-	"github.com/pkg/errors 30136e27e2ac8d167177e8a583aa4c3fea5be833"
-	"github.com/spf13/afero bbf41cb36dffe15dff5bf7e18c447801e7ffe163"
-	"golang.org/x/sys 37707fdb30a5b38865cfb95e5aab41707daec7fd github.com/golang/sys"
-	"golang.org/x/text 4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1 github.com/golang/text"
-	)
-
-inherit golang-build golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGIT_COMMIT="04017b5a1241b4e78b0a2dab84e5a332228b54d2"
-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 -i -e '/^[[:space:]]*go get .*/d'\
-		-e "s/git describe --tags/echo ${PV}/"\
-		-e "s/git rev-parse HEAD/echo ${EGIT_COMMIT}/"\
-		"src/${EGO_PN}/Makefile" || die
-}
-
-src_compile() {
-	export GOPATH="${S}"
-	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 bin/mtail
-	dodoc "src/${EGO_PN}/"{CONTRIBUTING.md,README.md,TODO}
-}
diff --git a/app-admin/ps_mem/Manifest b/app-admin/ps_mem/Manifest
index 97f02f2d80fc..66230cc4173b 100644
--- a/app-admin/ps_mem/Manifest
+++ b/app-admin/ps_mem/Manifest
@@ -1,6 +1,3 @@
-DIST ps_mem-3.12.tar.gz 18074 BLAKE2B 98861120b09b3a25b29b5b461d50d8e6a8a684fe76685a7b032f769896dba4b8fa6cd1b1de2644488bf8b4568b960f2949eac2a72a6225cd19682a9c08803baa SHA512 aeba7573b651ffbe6bb263ecc257716cc91219aac232694a628b0e5b1e45235149d7dcf68f6b9ee669bd005adf68693cd09f32e378934690270b0b72c38abea4
 DIST ps_mem-3.13.tar.gz 18331 BLAKE2B a0689a98597e02a63cc83188e717421bf873b9202c0f524165ffc838fd438c539209c2f4e6561226bda8c6f85364707d29d13519d6d3e53a6d34cb39378d2de1 SHA512 bf5affaede5f052cc878d46ef81186511a1e8f5939cd7e8560ab2df9faf4dc31566cb4172d956cdcf1e6fc5586ba3458ba1011aee3720f6b7eeb3cf40b4f90dc
-EBUILD ps_mem-3.12-r1.ebuild 668 BLAKE2B f38a2dc6eec91a08bcbb6b7f662658c07518c766c43f6e77a129f5e2bbb3e689c44d7d025380335f9b74d0bd92d88e8c3396f2fe26dbada8b8a9d16f56b44727 SHA512 7d26aa36507731657c3bc3412e4710688e807da5cb8908f3b1d9f715effb24d9e9bc03462ab7f493afcc3c6dc318618aee2792ad59d088a3bfdb204271588a40
-EBUILD ps_mem-3.12.ebuild 661 BLAKE2B 7fbdba869bb25c68c0d6c02784a0d50a1ba18ed005a6ca5539d3d2444aaad0dc024af2f3a8167929c9420a4baaf2f479a6552c149761062fb9c22c0536f701d4 SHA512 09757dda1899056fe5ad0d8ec8919e6ea57b1b0ace6aa970d4f177a03ef5f738004bc368c0417101b579bf9a94f8e67935b6d8cb9c9dbde9b3f27786e70f0baa
-EBUILD ps_mem-3.13.ebuild 726 BLAKE2B 1b9d1a41ed69e573a842669cbee2e5f41fb0a4d9840006141d92825bac11f9733f07fc73c2b09a00c96a386cb3eeaa3115e05264aa2da754bd95c7b2e6ffc7a8 SHA512 5c5530c9648c9892deb3fb66ca19c6122107256f6b8e12eb3b5dd08d479314624b64581f5f01c796fddd95018143a63e45b01f159db8b2ac22c3af89a6d7c216
+EBUILD ps_mem-3.13.ebuild 733 BLAKE2B b4aeeead9afd7c68297d08ff20e5cf69fe5d7c93bb244ecda5599523be2e17922bd7a266250cccec98acbec6525d8859c26c4b6e41201689e90282edaede35f0 SHA512 98711b4da2a72bbdb229c9e638c3e83b2babd1395c6da0b1c7c176c0a9f4239cf020a5d2abb3b1fad7c7ad21955410ae4c7ae10752fb9fce8707f08045bc2ad1
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-admin/ps_mem/ps_mem-3.12-r1.ebuild b/app-admin/ps_mem/ps_mem-3.12-r1.ebuild
deleted file mode 100644
index 1a46a4d9b583..000000000000
--- a/app-admin/ps_mem/ps_mem-3.12-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1
-
-DESCRIPTION="A utility to report core memory usage per program"
-HOMEPAGE="https://github.com/pixelb/${PN}"
-SRC_URI="https://github.com/pixelb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install() {
-	distutils-r1_python_install --install-scripts="${EPREFIX}/usr/sbin"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman ${PN}.1
-}
diff --git a/app-admin/ps_mem/ps_mem-3.12.ebuild b/app-admin/ps_mem/ps_mem-3.12.ebuild
deleted file mode 100644
index 56d2145f42b6..000000000000
--- a/app-admin/ps_mem/ps_mem-3.12.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="A utility to report core memory usage per program"
-HOMEPAGE="https://github.com/pixelb/${PN}"
-SRC_URI="https://github.com/pixelb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${PYTHON_DEPS}"
-
-python_install() {
-	distutils-r1_python_install --install-scripts="/usr/sbin"
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman ${PN}.1
-}
diff --git a/app-admin/ps_mem/ps_mem-3.13.ebuild b/app-admin/ps_mem/ps_mem-3.13.ebuild
index b977cc31a563..b70d81dedb8c 100644
--- a/app-admin/ps_mem/ps_mem-3.13.ebuild
+++ b/app-admin/ps_mem/ps_mem-3.13.ebuild
@@ -11,7 +11,7 @@ COMMIT="9f54e1aa3a87ec176ce8b71f02673e0d8293b344"
 
 DESCRIPTION="A utility to report core memory usage per program"
 HOMEPAGE="https://github.com/pixelb/${PN}"
-SRC_URI="https://github.com/pixelb/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
+SRC_URI="https://github.com/pixelb/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 34a30d23e995..24a421c9bc1b 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,13 +1,13 @@
 AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04e585b47941dbddcf2aab14d83af741e41c6f9e2ab359d6f4004bcd4f9215b34a6ac556882de4c12bb92da8f89b4 SHA512 24a2d8a49ec805da87953be60b1fefbca7e5b441f7f2865f43306526c2715aa1704705029fe45bf981786ea13cffbfd1c9b9502db416fc21534f87b17e348ab5
 AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
-DIST puppet-agent_6.6.0-1stretch_amd64.deb 19177382 BLAKE2B c8034e4a943394da7fd97756b3dfb59897f3d787a8f49743a4c42ed47db4411f6d0e125cf6984728a108e5070cc8e42ca0a203d2afdcce99e08ae38a6ebb9293 SHA512 f0d129b357feb6e5d05c080437910e119bbce0e97e36927c2f97d3d7fb8f54a0eb1503a74ffec3cef7fd29785fe97ffd53f04a4be6a35b558ee278af8871289b
-DIST puppet-agent_6.6.0-1stretch_i386.deb 19443284 BLAKE2B c017abc3166b3cb04a98c511b5ab05dd7076906a38edd8ee919848c130ae5b1cb6c7542b6c6c3da267fa801e152ad963c84293083c709dd769185f943a4bebcb SHA512 adadc3201dae261f2000282b67b8c4735eeb588c4c6c5dcbcde2e655772bebb1c343611607d84ba1b019279480445dc44cd4e3cc3d64e89b70e93b85a37678d5
 DIST puppet-agent_6.7.2-1stretch_amd64.deb 19184682 BLAKE2B 6078c1b21f0e737881d949cfaf052571b40df450e53724696e2738141da30e59da7abf03ce00285ab77fd4ac52291ab6e42da373420807499f37b75c872fa83e SHA512 1c464448b1478397af7b806f8bfcaee0378af9d4b6bfa5a73e8245064329b1b49136107c5fcbaea0ef6cd4e1daf840d1ba331e798b2cd255ead54969520315c9
 DIST puppet-agent_6.7.2-1stretch_i386.deb 19452604 BLAKE2B 1915e7b7085db6cb87980a98a7cb85881331719e2af98b07f8461514a0296b3cf5181eb88f78893055a0fa09fc2ffce0e81e866db27abcecf9d8f745e329311c SHA512 8d89735601c9764e207eef77f5d42e836ee9d7c0c0f2856e0f293919cce52e7a42fc28fca42bd0e0bed760063aae527007ef7ce25503ce05fcfd495a44243ee3
 DIST puppet-agent_6.8.0-1stretch_amd64.deb 19184708 BLAKE2B ac961857784eaaa55604285cf305dac437007628ea5baa3c3ae9a8a345fcb8cf2b20820bd80cc2c96afb77cb03c4d2779b17b1183c9bc9461b56860d2179f448 SHA512 707146f71b21df4b89244df7b786f481136cfe7b0cabf20aa0d4784aca547ba85c75d13309b77c853b9e034b8271f350b30bc5358010d90b7573e3fdb63c31b6
 DIST puppet-agent_6.8.0-1stretch_i386.deb 19478404 BLAKE2B 0b9d76bb3d745ca42e489e16a133d684aa0e485941d59c6773c447f5fc79be7a964f0a2ff9e4c334a47b7d2ffc0264bd49e4f7806cbc2e72e037da1c9e385d51 SHA512 f8bc962b32abbaf070b81245b7488b4fc131d5a9e3ec94ac97038f5e9c942c70a493e61e13190fe2837eb898518724bb5f360b37531003dab37606436d66219b
-EBUILD puppet-agent-6.6.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
+DIST puppet-agent_6.9.0-1stretch_amd64.deb 19846122 BLAKE2B 7f9133d1f5cb85f45c96490c230ee0cfda707db390a3a39be218fcd730e2298099e6d70c4f44bb5c6af46736c2c8aa7906a16375088c0119045dc77b53343b91 SHA512 f96cb1a6108a21192493b7b9958243e537ab41ce3ab6a7dde4d12bcd5da25ec6a5b29632acb87c4e156256578e8348c6fdfe26043539292f98203cce69b04fff
+DIST puppet-agent_6.9.0-1stretch_i386.deb 20170516 BLAKE2B 391a61a847bc05f9f03885f2e2140ea42b4eeca247f3223f17a82d3ede2e1bbc88226f9794777f4b20e81943d94b11612f8d4ffd9f74c2f494bdc242fb05e1a1 SHA512 595dbe1591a8ee9d703a3efdf103a3095966b22cafd0fd63fb2a7b9274ea858b55d0b915ecc32e93c49bcbeba453654fc9126efe3855924fb5c5b6732e0af83d
 EBUILD puppet-agent-6.7.2.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
-EBUILD puppet-agent-6.8.0.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
+EBUILD puppet-agent-6.8.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
+EBUILD puppet-agent-6.9.0.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-6.8.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.8.0.ebuild
index a72df734d6b1..c648209a4a7e 100644
--- a/app-admin/puppet-agent/puppet-agent-6.8.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet-agent/puppet-agent-6.6.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.9.0.ebuild
index c648209a4a7e..a72df734d6b1 100644
--- a/app-admin/puppet-agent/puppet-agent-6.6.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 39b177cb8b76..54b33e76c744 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -13,13 +13,13 @@ AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
 DIST puppet-5.5.14.tar.gz 3075736 BLAKE2B bfea82d40f9671cdefab0b10c9481e4fbad397dd0a4aa26f5d0fa9ffa94477a5cc59b3724ab9ae3ee2e7e9230881676582c328c804ce9138dc484b9bd92e0ec3 SHA512 861100c02e0b8a5bb232d266bcd5e54b0e32cf26954ea37f276690aa3159ffdb28195ab8691df61ee0098300d226ea1d369dbdff8aae69101c2bbe6068ede8b1
 DIST puppet-5.5.16.tar.gz 3084466 BLAKE2B f3e2f12331b4794b90a81a4f80e626fcd3d5252b7cbdacc1d6243faa557540d3a68e5e23b7b5c3e4f4286774e9a9198e59fb15d7d7c41d7193754ed5c80dd624 SHA512 7d9e533e352a22e347ac6467094c4bdbde893c2503f47b4a2d175fd6e759e6662991efdd1a0a83d9495d22f28da4ae7a30cc771c5d90b8252c4618bd8837833a
-DIST puppet-6.6.0.tar.gz 2898687 BLAKE2B 67370b191985f75f783d795d7ef38df53fbf28efa8ab79ae309dba985f4ba296d2862fb366b68a46d03f526c3f27c51b1e1cefcccbaa96f6694dc888a7adcc2c SHA512 e7e7367565d12c208654bd353112542fb84b736f262dc86adb940e02a4e34d473e7bb5f084e0caa5fab01be4ef479ad2baa3e751d4d86ee447cf960f400413e5
 DIST puppet-6.7.2.tar.gz 2907345 BLAKE2B bbb0f789ae64b5039e5b1bd2ce985e89ba693d33352baee7a1d11df7f314663aa3606a73d42d6b20042f81ee405a72cd17b9cf8f3c3cb257869e982f84cfd552 SHA512 6ebcaff30bda27fc17870b991287d620d455db8cf9a41c59833efc2a7541d3622228a7278689eb0494d0f6328cd334764f21ffe8700a567696e05398a5c16b7d
 DIST puppet-6.8.0.tar.gz 2906582 BLAKE2B 2dd2f9eb203aa951e0ea9639efa20aac3edb063b4bd68dd0b05a07fc2a399c4b59b3b87a1cb573096c5042920080623b9afb9c4d863b6249664edcc291cd1787 SHA512 c8446529e706dab7fd156b5bbca638f1722b07a638f626df2002a4ad218ec5e448f533395a6eed613b31ebbacea56539e903c040998d4110c8a362f2ead7f43b
+DIST puppet-6.9.0.tar.gz 2911311 BLAKE2B 1d58d0e976430031732de4f63c3ec100088f1d93894cf52caff252befeabe1ea3cf51939063143bd7c9011bb56f2a6420ba38ae230edea19ac8f1f135ed6f56f SHA512 4d1bc1a398c1e75bf8e832d477a0fff4fa3613510f8d59d73594e6fc2f2bbbedf050b1e7729b71bb1428c230f42fcf7b98f7a7683fc3c52cb36a596e20e6540b
 EBUILD puppet-4.10.12.ebuild 5620 BLAKE2B 75fed43f7044fef014b1c9297066e07a5ef624fd187d141475e5fbaf69aab50494e783a16b212f3063cfaa059bec310b9771ccfa88d3f8ddcfc5458a75d2ba22 SHA512 8649b6811f330733ba25602e35e13bbd5be094c8f395d5f6c7a859662d831a579b9b3ad2a44b1ed9ea60882c32eb89a261f5e36977d79a2e9a88d5f12959a3cd
 EBUILD puppet-5.5.14.ebuild 3822 BLAKE2B b639a7bd6b1a2a0229271a2c00ae246e5cd219b91510f1fb1b5bcc4668d2f81c631233329628b78240354ae884ca9e4de02287896b326eef1220c81eb3d4e173 SHA512 1043b71e29082c1020a4c67814394dc70707c3f299afadb035bb2e15e4425a38dfa76b2323f4ad31b7142c1494cb05616ed28f0cf8f46b88760fcc53c3e734a5
 EBUILD puppet-5.5.16.ebuild 3824 BLAKE2B 0501c0a04cea8cd762732a7b6728833c99c828d79c39c18dc738e2c7cb063a8f14f997108a4d3863fc0abfbedf9546dd1541f01cbbb4ea3fdcb723a49fe6ec39 SHA512 baaadc5c82ea91dab0dbcf93a5b836248183777db978e0ec0621183b695191a19b6c7fdad892d0cec05c4426c64c949eadc4dce89f08cdea8b7b6f6913d01917
-EBUILD puppet-6.6.0.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
 EBUILD puppet-6.7.2.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
-EBUILD puppet-6.8.0.ebuild 3654 BLAKE2B f29afbb842ad182df92104a03d02770c607f54ba228a694659b09d83c512bf9d7f269da42257e3ff92e68cd77e98da9f1b1ab317e791b97d338a3e30cdb3998d SHA512 4a197ad3b8114a4e7c685ff7b0ca21411645f542f1f3a948382f2755db126b6ad0cb61dc37f938a5c38a0c1ef27c5df4c91ea043ff2a3813f61406e63da4a84d
+EBUILD puppet-6.8.0.ebuild 3652 BLAKE2B 432cd4204b9115e0ddf08878e78977ce7b5baf73713846fb5150fa80d1e001a498d40d8d14284ddf09768990f6b9b3723da368c8222c0780a6c1f94d9b5079a5 SHA512 3e6ce509903378c9d6241d29183da2e84c01ab4918b20e6eb65b2c57e801549cb710e288515392d2b691c1bbb47c8cf207efd06a6242fa5eec6bb8090835a0e7
+EBUILD puppet-6.9.0-r1.ebuild 3680 BLAKE2B 080661787edaa5fdfbb24a927cd1bd9f64ec30d3d928cfab512098a6a951dc42403625db7843ab9583ce3599484af0912065f3e759beedaa946332b27ccf4378 SHA512 420679b3193c53324c65a122a6633c329eb01d07bf4506a8ceeb3b7b4f7323af69fe3dc54b183934aee0ebbf691150946620fc2f134a8df64a8023669b0942cc
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-6.8.0.ebuild b/app-admin/puppet/puppet-6.8.0.ebuild
index 0038f1ebf433..eeefd4e8c63d 100644
--- a/app-admin/puppet/puppet-6.8.0.ebuild
+++ b/app-admin/puppet/puppet-6.8.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-6.6.0.ebuild b/app-admin/puppet/puppet-6.9.0-r1.ebuild
index eeefd4e8c63d..d633c6865a1a 100644
--- a/app-admin/puppet/puppet-6.6.0.ebuild
+++ b/app-admin/puppet/puppet-6.9.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
@@ -28,6 +28,7 @@ ruby_add_rdepend "
 	dev-ruby/json:=
 	dev-ruby/semantic_puppet
 	>=dev-ruby/facter-3.0.0
+	dev-ruby/concurrent-ruby
 	augeas? ( dev-ruby/ruby-augeas )
 	diff? ( dev-ruby/diff-lcs )
 	doc? ( dev-ruby/rdoc )
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index d3cd3f84347f..f7a013956a28 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,9 +1,9 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-6.3.4.tar.gz 41716289 BLAKE2B c2f0c074229340234e8ce146d6d711f0311f4a4d6c091ef497a376a5cca02f7bc5a85fc63555f7408f16dc60784266ba126149fb27a9e0bf0592d7ee314e4b4a SHA512 9da3707f0ecf1b7664dbf44dbc6dda79adce6928298aa8e263bb134bfccaf2403245ed0176f8929583f5631ba3927f99d6d06233eca07720d0fd174da33e4990
 DIST puppetdb-6.4.0.tar.gz 41720668 BLAKE2B a4637750c553eed8ee5bdd46212a7455fe1d59015aa78fe01f6fa9ee2b4a98ec50a2a8b551f65d4bc6965b2a969f559c53f5a6324a8e48983a1d027948387ce7 SHA512 c49afce1661ed284280e89ed9dbc2406a657e5f2cdbc501acf50900d431b58a341f1541789ea4ffe9109e8d30faf47eb85573a589426c40ad50597a7d81b5552
 DIST puppetdb-6.5.0.tar.gz 41768030 BLAKE2B 2a52239dabb5c026f4d00ee2942e3128ce50f1de23aa5ff5d53f2020237b54867b48727e774ecc27f5f18bd1617b43fcf30fbd3b03a730ca60d5bab7296e3f9c SHA512 8aee40101a17e22ef5b9b7b965ffe8d8a9b8dfaa787721b3e6a5e7363b98e0c52dc0583216a058540618a6a980cf80f138fa6b358a9daac518abd50981910cf5
-EBUILD puppetdb-6.3.4.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
+DIST puppetdb-6.6.0.tar.gz 43366185 BLAKE2B 224c13ff2583a7c8124f03845eca4756be6446e7470565c44d3fe1fcb756d5564ae2ded69d0bef1dda939efe082756c0e44afd3c6b0fc4268a744946860b5a02 SHA512 5076f52af51b7a3b43a0deb9cf1f10d77da98a5e531983d3661cda522c8d46f70882457934be6f70e77587b930077c0a4d2eaf7ed41eff9c6bcf4bc5ecbf2205
 EBUILD puppetdb-6.4.0.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
-EBUILD puppetdb-6.5.0.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
+EBUILD puppetdb-6.5.0.ebuild 2763 BLAKE2B 5a717db469771e4e5ca2a19c165c9e5afbb41e32a1e906ff530d883e8a391c8187327b73fcf00f5dd9abfe7f9e73c167cc238df150d8b599598962fa353233cd SHA512 53b05e2c0934a232ec65fa12549a448968f5fba4d520d8e3c047e4721552a005e0690b44bf975b2ad42a23ed10884f797a03d1e05ba608f3abf4a60512407a77
+EBUILD puppetdb-6.6.0.ebuild 2765 BLAKE2B c66521b63c4680a2819820dfed00f28f49adbb5cd8abb1b64e16d6eee6e9fbb81ac30a7353a9e5288afbffe5850103c6813ce02982cc3f2a23be52ac020ef5e2 SHA512 1cfe6e646f930e88780dfe3fa3cc935d4840c1bd9a83b8c2adc85a5989ad5dcd370a283b88e3d9481327ee77dcb6368d7613d0fcb5a9b38f7a158a894c841c37
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.5.0.ebuild b/app-admin/puppetdb/puppetdb-6.5.0.ebuild
index 616793cb4123..77d1c1ca9cc4 100644
--- a/app-admin/puppetdb/puppetdb-6.5.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.5.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+=""
diff --git a/app-admin/puppetdb/puppetdb-6.3.4.ebuild b/app-admin/puppetdb/puppetdb-6.6.0.ebuild
index 77d1c1ca9cc4..616793cb4123 100644
--- a/app-admin/puppetdb/puppetdb-6.3.4.ebuild
+++ b/app-admin/puppetdb/puppetdb-6.6.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+=""
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 42ce513d0f1f..0e654df4306d 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,6 +1,7 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
-DIST puppetserver-6.4.0.tar.gz 75721867 BLAKE2B 299d73bab6f76464fc7b2e3b5a5b63e4b0d6f11752990d2926db247dc5d6aa475f5de571640ae38f22da75505153ce0f83e7a952bd0d037f4d3d12fd37c8f269 SHA512 cc9ac9a163b1ee7488b1afb95457cea4ae9da205d4cd91dd70c8cc995fad32829b5c4d9de8baa3ca325ac235bcaee2dca78ea9cd50bc9dfe11f2837f64587a11
+AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
 DIST puppetserver-6.5.0.tar.gz 76080713 BLAKE2B 0562128001a24eae6cec071a366e16ab3ce5b0babbe50330ecddd13ab3dbfd35d6cb23634770e4bd7904cd231752ce923d4af8dc42d783cc137f300efcb05fb2 SHA512 d871f3817c370ddd08e8d791deb1a30aa50ab0d801192ebfb5ef225d8dce21885175fe4e9911287437b687b2bcbf5a098d8b9511b24bd05fdf4854575a686cfe
-EBUILD puppetserver-6.4.0.ebuild 5370 BLAKE2B b3b8bbba45305b658c94fcc43c9e2d11b854e80f536e5e3c3afc7c4182f954b9491f47eb83529dbd00a894b793c9a0cf660ed7b52051b840b24e7fedec97a6b2 SHA512 31b6e681af9dd22d9388a447237289e3e48d79d2e7e1ba79d10e70084b99a9d7cf99fdd19b58a210f990ed1b202af2367a0e0911f8579a876ff284413f6051ce
+DIST puppetserver-6.6.0.tar.gz 59095750 BLAKE2B adbc08a68a1382106c43d27604c2cef52bd1d9875c5f555320d97d31dcf9d248c88baa2d6dfd37a855010fda76ad4d273a7bd5eca77bb216aabf6a120e41cee0 SHA512 2b43092752e246027a437398d6d23a4085caa2956a1453cec2e62f1001fca1c98bddca0a9d90c178ce9c89a06c26edcaee49416c1b8a4941e2bc4b6b5bb1fe0e
 EBUILD puppetserver-6.5.0.ebuild 5370 BLAKE2B b3b8bbba45305b658c94fcc43c9e2d11b854e80f536e5e3c3afc7c4182f954b9491f47eb83529dbd00a894b793c9a0cf660ed7b52051b840b24e7fedec97a6b2 SHA512 31b6e681af9dd22d9388a447237289e3e48d79d2e7e1ba79d10e70084b99a9d7cf99fdd19b58a210f990ed1b202af2367a0e0911f8579a876ff284413f6051ce
+EBUILD puppetserver-6.6.0-r1.ebuild 5393 BLAKE2B 72168876f0d5ce90d779ddf60ed2069e284c3ef98a9e62a594e1b8614a3ac2f2681d25f7c3222ef0084d1d816d991d818d471f874bc8675d2a39fdaab260b288 SHA512 640a1e81775befe3a5a19ed8c8a19c53d11a30cbd9bf9613a5c19ee487bcc1d2e0948d91779a4c9bd7ccc1fb8e86f4c77fb0eaf1ddd5a13ad0158093729afed5
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/files/puppetserver.init-r1 b/app-admin/puppetserver/files/puppetserver.init-r1
new file mode 100644
index 000000000000..2b7665d901a1
--- /dev/null
+++ b/app-admin/puppetserver/files/puppetserver.init-r1
@@ -0,0 +1,72 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig reload"
+
+LOGDIR="/var/log/puppetlabs/puppetserver"
+RUNDIR="/run/puppetlabs/puppetserver"
+
+checkconfig() {
+    if [ ! -x $JAVA_BIN ]; then
+        eerror "Missing JAVA_BIN."
+        eend 1
+    fi
+    if [ ! -d $INSTALL_DIR ]; then
+        eerror "Missing INSTALL_DIR."
+        eend 1
+    fi
+    if [ ! -e $BOOTSTRAP_CONFIG ]; then
+        eerror "Missing BOOTSTRAP_CONFIG."
+        eend 1
+    fi
+    if [ ! -e $CONFIG ]; then
+        eerror "Missing CONFIG."
+        eend 1
+    fi
+    if [ ! -n $USER ]; then
+        eerror "Missing USER."
+        eend 1
+    fi
+    if [ ! -n $GROUP ]; then
+        eerror "Missing GROUP."
+        eend 1
+    fi
+
+    checkpath -d -m 0755 "${LOGDIR%/*}"
+    checkpath -d -m 0755 "${RUNDIR%/*}"
+    checkpath -d -m 0700 -o "${USER}:${GROUP}" "${LOGDIR}"
+    checkpath -d -m 0755 -o "${USER}:${GROUP}" "${RUNDIR}"
+
+    PUPPETSERVER_ARGS="-Djava.security.egd=/dev/urandom -XX:OnOutOfMemoryError=\"kill -9 %p\" -cp ${INSTALL_DIR}/puppet-server-release.jar:${INSTALL_DIR}/jruby-1_7.jar:/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/facter.jar clojure.main -m puppetlabs.trapperkeeper.main"
+    PUPPETSERVER_OPTS="--config /etc/puppetlabs/puppetserver/conf.d --bootstrap-config ${BOOTSTRAP_CONFIG} --restart-file /opt/puppetlabs/server/data/puppetserver/restartcounter"
+    EXEC="${JAVA_BIN} ${JAVA_ARGS} ${PUPPETSERVER_ARGS} ${PUPPETSERVER_OPTS}"
+}
+
+start() {
+    checkconfig || return 1
+
+    ebegin "Starting Puppet Server"
+    start-stop-daemon --start -u "${USER}" -g "${GROUP}" \
+        -m --pidfile "${RUNDIR}/puppetserver.pid" \
+        -b --exec "/bin/bash" \
+        -- -c "exec ${EXEC} >> ${LOGDIR}/daemon.log 2>&1"
+    local retval=$?
+    if [ $retval -ne 0 ]; then
+        ewarn "Error starting puppetserver."
+    fi
+    eend $retval
+}
+
+stop() {
+    ebegin "Stopping Puppet Server"
+    start-stop-daemon --stop --pidfile "${RUNDIR}/puppetserver.pid"
+    eend $?
+}
+
+reload() {
+    ebegin "Reloading Puppet Server"
+    start-stop-daemon --signal HUP --pidfile "${RUNDIR}/puppetserver.pid"
+    eend $?
+}
+
diff --git a/app-admin/puppetserver/puppetserver-6.4.0.ebuild b/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild
index 9200fa82fd3f..45ac7ad8e73d 100644
--- a/app-admin/puppetserver/puppetserver-6.4.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.6.0-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
@@ -96,7 +96,7 @@ src_install() {
 	newins ext/default puppetserver
 	# normal init type tasks
 	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init" puppetserver
+	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
 	# misc
 	insinto /etc/logrotate.d
 	newins ext/puppetserver.logrotate.conf puppetserver
@@ -125,11 +125,11 @@ pkg_postinst() {
 	elog "# install puppetserver gems"
 	elog "cd /opt/puppetlabs/server/apps/puppetserver"
 	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE do"
+	elog "while read LINE; do"
 	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
 	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
 	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE do"
+	elog "while read LINE; do"
 	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-ri --no-rdoc \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list.txt"
+	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
 }
diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest
index 57c1e967b311..46ec28a4d47b 100644
--- a/app-admin/serf/Manifest
+++ b/app-admin/serf/Manifest
@@ -5,5 +5,5 @@ AUX serf.service 286 BLAKE2B d0a7157101e18f80047688318a16995d24f0d06d444104ace3a
 DIST github.com-mitchellh-gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 BLAKE2B ce589f986762768fc22148963a35a152a48c17aa55b9db5d5cf41e4e349be63ed0cea2afe3f916479bfc82bc951e4d427d223122ec6c472e58de02e55290ca07 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d
 DIST github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 BLAKE2B fdb82b106446b0fe5d5c6c9cca2c8303fbef305ae1c45a82ca7ba5bbc9ce4db3708d7680bfe95099e73a5f5a3d687f25d77c7b535f3e1dc71e5fe8915eb9642e SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c
 DIST serf-0.8.1.tar.gz 1445011 BLAKE2B 5fcf1e3e87c777852656426529daab4ceb3e997d70ac54d81f48bbea37ebe2dab9c27d0b2fff3c4e031a7995eaaa25378ccbbd359ef0cc265cc58db4ddb25c21 SHA512 81a4bc2e1659324980fd59464af021ad5ec80431dc1b49b875bb0c97c8f92766dfee9b204bd8c9ab4e175a281bc23815f5e3008ecfb2848c7354c33603bb5514
-EBUILD serf-0.8.1-r1.ebuild 2087 BLAKE2B c47a6caed4484374dc31448990f81ecbbeb7ddb9c1605d001d95f10389f3b506c7af042b63d88ea98af76bd3a205ba0833175ffb91bb8043277ad2c54c02ccf9 SHA512 7fa41ac143f3532bfe612492ca084aa998c072f346e9897f441f31d55d41468615673ced32ef43c01a5e9962822a3b340997fbf167c34260f7083413faa81731
+EBUILD serf-0.8.1-r1.ebuild 2103 BLAKE2B 2da8b75a519b39ada23d07d65b481cfcbe5f09536edef531b177315529ceb001fd3e766f255008b55e636fb958e49780db16b14b129aae55f4d66fdc89e33d05 SHA512 234045563ab81168df44440cc4c496e8c5933ab4229d3d395d0dc1f8cbbf3b78783b60fd0c19e73ff7cb4b795540470552ef5bf11d399ac7946282cbeae2f131
 MISC metadata.xml 297 BLAKE2B 0d2ca75df2b4667d5b2cfcc0b17ef36c88d2996e661d3393eed3ea61c256a760c4844d9f99c4b280a8409e288392689ab17f46adc40188134307b7ea6060f9b9 SHA512 a4e75bdd3c86842ac3de4852d00f264e877c9784754eb9b2d4d38c39123115ded6beae61628b5315d7c19bfbefd1e0360491b37656e34a87b33498b246521e76
diff --git a/app-admin/serf/serf-0.8.1-r1.ebuild b/app-admin/serf/serf-0.8.1-r1.ebuild
index 963e9bcc99ef..ecfede899054 100644
--- a/app-admin/serf/serf-0.8.1-r1.ebuild
+++ b/app-admin/serf/serf-0.8.1-r1.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
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 
 SLOT="0"
-LICENSE="MPL-2.0"
+LICENSE="MPL-2.0 Apache-2.0 BSD MIT"
 IUSE=""
 RESTRICT="test"
 
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 05c03abf361a..eb149022ed76 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,43 +1,15 @@
-AUX 3.13/syslog-ng.conf.gentoo 1184 BLAKE2B 1a4b78d913c24f085efdbe36893f22e71295af5fcf6f085462ab6baf265aa9e26d796a1fd41d8bef6dd20b119a0920c1d07cf19e8d70640f88d70e333875d1fe SHA512 1dc14fc8ff4f16dac750436e4472e0f69e81f287981b31aa3864a8267beea19fd040b14b955c5011992c70092213a08b2a8350bac792c4d5c256f753b318ed6a
-AUX 3.13/syslog-ng.conf.gentoo.fbsd 577 BLAKE2B b8aa747638899024ea8b04fdf3cc623ee77ac2522eb68e6763943808735ab6ef85c29db9f076cc2c3768d377a43530ccd634a50a51a6face8d1b93239aee6839 SHA512 3a0cc8685be4af41690bbd4aaec87b0d44ed8dd3b1dec0bac32818288c4adac1f4673dd73ffdc4164feb4afe8b98728c66a51a323bf302958e422595130a5ee2
-AUX 3.13/syslog-ng.conf.gentoo.hardened 4498 BLAKE2B 42626430ef11c3db6b56bfa07f6514551191e6c0e6086eab7c7ffad61d48c4f7931c97ec53af7e26b7187481f3ff572e67e442478995e39e80ab2fcc912251cc SHA512 0501c56996b619c92ae7ea7d7bc2b3110ed099f7efe4708faafd4dab06092d2cec3c015dcc9a4db6b7c7cc94bea278146b840bdb151278eab9a68bf186703bf9
-AUX 3.13/syslog-ng.confd 1492 BLAKE2B 8df9e16ec0fd8de141d1624f7451fefe19c49b2ba91ebdd63b6cce730ab2997715d7d352629f8bc6f7c700fce7fa04f291d3507dc421e1382a104dc264395e83 SHA512 8a346864dd88ac393f7080c4a073b20f21dfd547c2517abdd963beb50b9ac49565487a9508b042eb5d00055b2a5bef8db245cfa94c36ba1a60922caaae8bc4e0
-AUX 3.13/syslog-ng.rc 1799 BLAKE2B cf9ee36cdf27600f5caa75453b746ced42cda3e3dc8909925b11604967216061f8b3103b6b9f1af499a8c1d986cd9fb82d616138577773ce35c353bea055c6ac SHA512 2a0996057d4dcd730c89af87845749d9ec28c04f99d4f72be809f0f70a213a89a190c86a717169927f292049b326136fd76c6e02413963f7cd554d8acb74d555
-AUX 3.14/syslog-ng.conf.gentoo 1184 BLAKE2B ad9a75f4b25518d44f8dc0fa48af5bd0df9d27742af3bc3a30ad9e11dd1f201fafe15436a84d4b608052b79cff87a21d27ab4b5556ff2a9fe08f93c415c0ed8b SHA512 8b12f9a13090613460f5985d25d9ec5628c768bb8ccbfd326de56ca8b3d6c36295fc4bdd9f290b4e3fe3407ce5270e18b6b301224f074a679d91838282bfd306
-AUX 3.14/syslog-ng.conf.gentoo.fbsd 577 BLAKE2B bf18a1b56899483c83d80a4e36e99a594977d3af7905ed025d532a028ee0737f0d24c8076139f42a8e3c70c2f10d1a679f070fed59d088769ed54c72e3b8cda2 SHA512 d60f491b80b8b388392776abf327dcea6f4e1f0822e8361d1ee5949a7d5bcdc52130cc941d3933724b3f2425a105122eee6b7df0fc67bde0ca9bbbed5d58ad24
-AUX 3.14/syslog-ng.conf.gentoo.hardened 4498 BLAKE2B 568cf2b335d52865910d3324579635e1630a927ac12dfc4243c57f0f33fe7ffe63598843462810d71cf043f4d4672b4a4e45fae7ad5fc5f61096b52bbd64f5fb SHA512 539bc6480b85a0ae789bc0063d1af6225aa3fc61bca2d57190ee8676ad21aefdc88a9c3f66287575547a84099f4b989cfcf297e1317d2ed34de8b25363377081
-AUX 3.14/syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530903659828565018dff71d62e56bfba28afa6c5e9fcb55aee2a41bcfff53c9ad006ee319124adbd66a SHA512 c945d27560afa310ac7f15e0cde3a564d5296892c747827d68df1b49c728998b056b596f93ac2564a5cb349f88db6585de58ec64cdaa13b92f20f5aac213ef44
-AUX 3.14/syslog-ng.rc 1892 BLAKE2B 6596679ca09eb9c74c4971d99cebb400f7de483adc23f723ed2e0c1541c4badd89a2ba2dba8845cb6457e64bd44e53024034b7c59e7c438018e240daa73333b6 SHA512 b350fbb9a6cf5fd44aeb2e778968b7d4a51b5447057721f36cf528c57753d83ee9b889ca1f1d54a3a25f3c5cff5dedd9dcac2d4591ad6e77246eb420f523f36e
-AUX 3.7/syslog-ng.conf.gentoo 1203 BLAKE2B 786a4315e11d2feb839aaad7af5fd3544c3c3319857009b716e732a34618a026f25e8f44b2f8c4ebb2fd74cd78eb676bb65c6573f3bb8f357cde71f728ef56a5 SHA512 44de47c9ba8927ab69cbd9479bc18f87a311fb7a7273912b236650385bbaddec28d3a706d822e53a4264fc8fd9895887243fb070252024b732bdb41a840d44be
-AUX 3.7/syslog-ng.conf.gentoo.fbsd 593 BLAKE2B 2b161a0aed035fdeba7dffdadcce28f29d2bd4077e391b8af98c031fa92366cf454349463f4ba457e08cf44f9b78a25b525bda9c55405102b079a89223a328d0 SHA512 947be1b330a98490da99d9e64d76732fe8eb54beb266ae1a546df7319cea998a89963ddf086e993025efbba1a8aefc2ecc4ff5bd440a50e565cfddbe35536d90
-AUX 3.7/syslog-ng.conf.gentoo.hardened 4520 BLAKE2B 968f77526cb027259acf507177f02b8d735a48aff78f809eb14e50795c26fee62b1e15602ed3ee16317ecb15f14d33135fa0dc54bea2ead002f96618991f87ec SHA512 2a0d31178e83ea9685ac1b5988652ef077b71d368d75eda46ebf0e1ef3dbb79e8c911bc6498d6a934912250ead902cfa4bb8ceff1f14a08e06f6152824e36128
-AUX 3.7/syslog-ng.confd 1492 BLAKE2B 8df9e16ec0fd8de141d1624f7451fefe19c49b2ba91ebdd63b6cce730ab2997715d7d352629f8bc6f7c700fce7fa04f291d3507dc421e1382a104dc264395e83 SHA512 8a346864dd88ac393f7080c4a073b20f21dfd547c2517abdd963beb50b9ac49565487a9508b042eb5d00055b2a5bef8db245cfa94c36ba1a60922caaae8bc4e0
-AUX 3.7/syslog-ng.rc6 1919 BLAKE2B 5769cd9f4464dbdde9a8af7b700292f59772132b3f32cf542b4cb4f596541c7f244c906d236650f09921c131e84722813578493b36e8d8281df401a1d127d3c9 SHA512 2681f6b1c4acd9fbb9e29b4b732c09b8384ffdb501aed15bbaac97409cc79269f2e5068dac5746bfcc52751c5943279c3cce5d3f869b4c6ec2cc5f23d2ad3b04
 AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f43d5bf06fb77b86959a75c7680df87e7ded7fd72073ad469a06bdec1e739784c82776d04a91bd3add SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e
-AUX patches/syslog-ng-3.12.1-json-c-0.13+.patch 862 BLAKE2B aeab5c994f0c9e5c3909300f5f8b56ed22194746f95b6cc2f6e600dbe04c9f4016b3f1d085c222f0d7d6922765f71c56d1bd3ac1757b1ca07d11c9d15a6fc1b4 SHA512 ded991eeee706e4d51f48e803db75d39e907f83aaf9cb9994eef146ba8d7cc784e5d3890eb18acdb4ff2702dcf8291686c6975ba3b0c4f0d3817a301ae81a641
-AUX patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch 929 BLAKE2B d3d0b94c30364e9663b2c7d672f24c03643a0fe0e5954df3a4b90f7108321858e529b22fc596ea85caf34ff5fd78b01cd6e4f2233fe282816e844b6194040948 SHA512 744c4b16df09ae14a09211d7e7a19e02723be2464a81d16586273e88973e7dbe0e2803326b7171a043889f127a8bb976fc0266d826e5632bd498f736e4d5acca
-AUX patches/syslog-ng-3.14.1-fix-tls-client.patch 6248 BLAKE2B 8671b724886a62bbd9e61987a6e7e95ed5773278b6fd8cb1c2ba3285ba4c6589190484386da9d8865326f3588937b825a738462e7a935363d103942982c68dd4 SHA512 1999cc1107d8b22a58f5919a8bc0f8930d0c60170bb9f23a20e25f49f84f8d10ceecd6903de9cd7cc738dbc8cdec690880be400f5dafc3b06ae88681d4848694
-AUX syslog-ng.conf.gentoo.fbsd.in 591 BLAKE2B 47cdf8975a0cb083d6f6633e812fcb872155cb126bceac2d17be3b9f4cf0ff692e32905ddbcc72d80168bda1fc9b3c3691cc416d7570cdf675b3b35d3824e98c SHA512 8e4cddbcf08b91f3ffef69c0766ee59191ecff33d9e6ad4810f7f383a83f0fed7e2975b82868b80ee4aafae2cc95ee3e4ee9b212ac701dc5b6f0dcecdd7ad088
-AUX syslog-ng.conf.gentoo.hardened.in 4512 BLAKE2B ed6b3fdfc8cdc68899bb9b89998c01190d0d0839726df0953e8a92e21d6311ecd1c53fa5854ce7dc542fe3660dce2879f2a93a22ac8b6114a1a9f1a6616b1be6 SHA512 3fd24e1483552c3c5c142dc87cacf3efc7a6286d71bd7d894b8587e15e7993cb88a9a08c0b67ecaa7f015fcbf96f9022946c5770ff2b653728e0f213dd08e284
+AUX patches/syslog-ng-3.23.1-fix-sigabrt.patch 2287 BLAKE2B 1937edf0bdf29f9737361134302ba0817bdc8ae029186e1aba712032b52fa2b9e6a5d7d634c521fd734d7d536eaa94c6a6ecaa3c7c55287ad7abcc09beeaa8ce SHA512 fc23bb8778d9889a24afb3cebc4de722f3d1a83f6d184cd2bdd279056a0eae2050beb4f8d4bcc5bf3cabb66ab698b3555d36b0568929f2186060d82c63519450
+AUX syslog-ng.conf.gentoo.hardened.in 4509 BLAKE2B 39f130c008df8d5e31c121246997f8f31d2d8e2a78f1a881f4ca07ade0b3a5386c6e8c3fd8518e2ae471751564263886b8e3b78e8651efe0eeccd1d06c23c2a5 SHA512 0670952e6f5d0405e90bb5cb1ea168832bb2293095250c01a9baaf9e4fcdf8578ecf5b60809bd9e5089096a4d97fa966fcc47324fbe70cfd14266a10eb0001c6
 AUX syslog-ng.conf.gentoo.in 1198 BLAKE2B a95b1fb9f46655502a41b0381c7388c9b54cfe9b8c3fd68dc68bd473175688e8ae72145a0ef718ef65220ecced7ecab00b39755cf41d4e21a6d375059cf6f309 SHA512 2830d1c5071a50c4aea6288b35c2880988111f29a11a641ee89f001a4ca4319943f87fdb1fd7079988888efa55401e2ed62f7a507c452de137f2e97a445d60e1
 AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530903659828565018dff71d62e56bfba28afa6c5e9fcb55aee2a41bcfff53c9ad006ee319124adbd66a SHA512 c945d27560afa310ac7f15e0cde3a564d5296892c747827d68df1b49c728998b056b596f93ac2564a5cb349f88db6585de58ec64cdaa13b92f20f5aac213ef44
 AUX syslog-ng.logrotate 231 BLAKE2B ede8c2e3bd6fa67b2740bca74fa45e799a88dcb9aac456df4fbad5db919f0ac8671b7e073efa1d7fdf1f2c119521d6fe8d5e6d4209b0fb09062e8499bd3377be SHA512 f8dfdbc4ea59c4cbb500b9ac0d4f8c7e33d0510049c7945ee1ae50039dc011b1ca2835c18ee145bf3d9ca306aca0d0de879735c3298b8a0f944db6ba4747ab1b
 AUX syslog-ng.logrotate.hardened 1614 BLAKE2B c9845bb43bd09a210f06912131dd2ba88164f0dc58f9d81455c13bba0ee923d1b9a6025f6b8e5fd066254bf6d0c81588b8d515aa055da157c29aaa0aa63fd700 SHA512 141b0ce95ca8ea6a9faf1f94ae1feffceffae19dbd4337c55d7dd4e554d41b7b8846680fab77f361ff4bf6093e3fe239fd3cec32dbb56ddc7b5e0f40bc054760
 AUX syslog-ng.logrotate.hardened.in 1518 BLAKE2B c13fd2707266edef0e74476aaf8446c8f77d2ffa8508cd7b8c32d13a22ff63bc883ac7a79f21287681b906430ecb05bae7665c064adbe161e4e1647e3ace9c29 SHA512 43ab59f037d6955844ba9a12675b745351fd3144dc1db8b81fe1c6ef48798452ac9a6d94caa68978dae396eceaa1a6d476fc99221989cb40265d6bb9dbbbf620
 AUX syslog-ng.logrotate.in 219 BLAKE2B acfde709749d11790b451e3f9a0d9bc33f129e86e3f68bdd36cf2d2c9c5561c5308805aea36378e8d79995e1bf173e4471845805681be2c409b52479333c35d8 SHA512 7a838006ce61c9702d6ea77672affa8cb1dc2ec2c6a1a268a4ae4f5a59dcac1ccfe835d25144ef8376a60a11227fa64e38dc16f8d0eaff182f14a6644a3a5ceb
-AUX syslog-ng.rc 1894 BLAKE2B 589c512657b46c19a3c407249382bfac951725aa2a389390f8ee911ceca363768618fd5cb6010f9294c6b977ce40e08ad0f4c085b293e6eac7bc094e95befda5 SHA512 4af1a8352c11280e17206ec60f12d85a882d11adcc60c88c86fbf45b786e71a1a3004b657a69c5f17692679a161d79e02197dc03a41f1e79b080a9a419f5b2cc
-DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
-DIST syslog-ng-3.17.2.tar.gz 9119227 BLAKE2B 3268a51c587e66579b30ee8d27397eeeb3ab52c7e1939ad26ad976be2670565a389fda9dbc3a25f80710f855788c85f58d47f6a3c297b8ff6efa01e0dca386fe SHA512 2b82ea047bab125d35ab0a90e933b8a282852c6b4a9a8adc3f2a0ddf392f24210ce1296d0cfb389f98e54e50090a3ded5a64c5a9529d2a90cbecbfafd620edd7
-DIST syslog-ng-3.18.1.tar.gz 4259746 BLAKE2B 3878a87bd195aadb0f9d024e1336e50268d69c00b438b5e3471f21bc4592ebd97980004c3624d9b92232b38068ebefa0c3317cb0d9b5dfeba37c479aeadc32e4 SHA512 2e6ea690f8762f3f37885118f023048c4cba59f58002c87fa1c469cb991b2ba707015b3e54c50f17c3d6e6251d798557406925a9159f4fa914331f281dc39e48
-DIST syslog-ng-3.19.1.tar.gz 4224779 BLAKE2B e938c91101c18951a5c921bea51631400bf579ebc840300c6d8411da9b8db69935d104bfe00525512ab0173b932a8e24e2fb102e17bc4ecf58b268e52ef5b41a SHA512 f625073bafa9378109d5be34591247766a62cb5a76e814f42bfbf03472e96ebe2833f19779812abfdd950a3498115f57b97c1427c280ee0dab21d3e2eb92ca57
-DIST syslog-ng-3.20.1.tar.gz 4312715 BLAKE2B df37ea15937d67823ddf25fb935be90fed2cb9b1a653d90bb447a3d674c250f6a7963a9bf4623685c5a19e11b928d02aec508d5f061135d67cd4b6d922795ed0 SHA512 19e3896a750ef68923950ca037846808f5d8bd24e64b41a024776a19654def83fce5d48b6e0805b1389494ad1435c5c7af9d79c1188454492f7228f5644ddc5c
+AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a007d8f4978e1bbd4ce1f1e8f9daefb60c586aa58756d7d98ca59a869ae8e3f4addac732b6086ba5 SHA512 9e21637b684a48093d00ad9b5d4dbb79178ea8cc280cb03dbce235193e916bf3bd10b091a901cf13842f1c080b707a36efe8833bbde9d2721245598a3fe038df
 DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B e4f7e47f1939fb07d204c4721ff558a606cf6c6ee072278ff7c9bc1db7406e6abf058ac8a96bd4df0b867272bdbc5401528d47c94e60d90ff5ebb1aaec49e223 SHA512 4f68c0b58c6b3df9a870fa0b627525b9599149374e805a665c5143be54f814a564a80cbe76c7d5aab093b58825a96411b13cd2ce0f1439298723bd008096807f
-DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
-EBUILD syslog-ng-3.13.2.ebuild 4701 BLAKE2B 4bc557a7545796a5c0c883ac3cee067396636e2292261db4f4c98c330e58b1d20e796f7214fd856d885f99fdc9f3db59ab59d3e1e0febda23ff97fdf9fedfc9c SHA512 f9ff35932c0e1af04ed237e9ded764ec1dc38d0cf952aeb1335d67b73f73262f8975cdb2f3908ee77252eef9d4ad3f6228025219bba9df263cd2b380c1c5df81
-EBUILD syslog-ng-3.17.2.ebuild 4920 BLAKE2B 2ee995d29e470961d08a0ed8dfeba52eb3a091b2fe17be737e504ec114566db57ac2b933fb1c3b851421e729990ab55c62d56dde80d923f2af67797ec1f53eeb SHA512 ba6e29ea457743897c950ba44785975134aeec9780b064bd1a935d398593a96618688f6b8a13cfabfc61bd5b38cc9640e0422bbc299dc7e190a2348877bdbc07
-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
+DIST syslog-ng-3.23.1.tar.gz 5008517 BLAKE2B a128707ed36ae3a236dbd3bffb080bd39187a77b3ed7fc0c8d6a2de65f6b761f3c7160a8fdc804c56e4ba673451779382a91c83c8d8cd15ec6fed2c799309adf SHA512 d1ded084a9141637da44cb9c7d8c66585e498b16ff6717548e31ad61bbfe1e04de3554183c8a4de540d9280de1e6370303845010164b3b2ac53ecce1e7434a48
 EBUILD syslog-ng-3.22.1.ebuild 4950 BLAKE2B 8f357d97832fa2b34281ca0db58afbd648d33d9cb9de955edfe6f22fa442bd0a1a9661ea398ed2d7d964de416d73d338ca8237d881348f9e5a6438454a11c504 SHA512 8c91d2a427f451eb6fead571a9101615faf2f8aa29c0938fe491662ddda4e073efd2efb029fb1b56abb56985e2defb2e56b9ef16c46f77a38c06197668c90890
-EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
+EBUILD syslog-ng-3.23.1-r1.ebuild 5040 BLAKE2B 42fe6556ac3b19d5faf90b6b48a8f57b97bd61ced33d861ffdfe1d0fd314332437768a8803e607fd5841b95780f11b196642544cbe525f21cac1531d8c223761 SHA512 1ac2e842474c19050fbf9bd90c9027d211df516bc962def2508b3397733094049b483aa8e1c32168412d92aafba46ce24a2eb3ca59e4e673a7a18cea89b568c3
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo
deleted file mode 100644
index ee8c76a7f535..000000000000
--- a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo
+++ /dev/null
@@ -1,36 +0,0 @@
-@version: 3.13
-#
-# Syslog-ng default configuration file for Gentoo Linux
-
-# https://bugs.gentoo.org/426814
-@include "scl.conf"
-
-options {
-	threaded(yes);
-	chain_hostnames(no);
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200);
-	# The default action of syslog-ng is to log a MARK line
-	# to the file every 20 minutes.  That's seems high for most
-	# people so turn it down to once an hour.  Set it to zero
-	# if you don't want the functionality at all.
-	mark_freq(3600);
-};
-
-source src { system(); internal(); };
-
-destination messages { file("/var/log/messages"); };
-
-# By default messages are logged to tty12...
-destination console_all { file("/dev/tty12"); };
-# ...if you intend to use /dev/console for programs like xconsole
-# you can comment out the destination line above that references /dev/tty12
-# and uncomment the line below.
-#destination console_all { file("/dev/console"); };
-
-log { source(src); destination(messages); };
-log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.fbsd
deleted file mode 100644
index e9122a89061a..000000000000
--- a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.fbsd
+++ /dev/null
@@ -1,24 +0,0 @@
-@version: 3.13
-#
-# Syslog-ng default configuration file for Gentoo FreeBSD
-#
-
-# https://bugs.gentoo.org/426814
-@include "scl.conf"
-
-options {
-	threaded(yes);
-	chain_hostnames(no);
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200);
-};
-
-source src { system(); internal(); };
-
-destination messages { file("/var/log/messages"); };
-
-log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.hardened
deleted file mode 100644
index db6e7f0a1ce1..000000000000
--- a/app-admin/syslog-ng/files/3.13/syslog-ng.conf.gentoo.hardened
+++ /dev/null
@@ -1,115 +0,0 @@
-@version: 3.13
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# https://bugs.gentoo.org/426814
-@include "scl.conf"
-
-#
-# Syslog-ng configuration file, compatible with default hardened installations.
-#
-
-options {
-	threaded(yes);
-	chain_hostnames(no);
-	stats_freq(43200);
-};
-
-source src {
-    system();
-    internal();
-};
-
-source kernsrc {
-    file("/proc/kmsg");
-};
-
-#source net { udp(); };
-#log { source(net); destination(net_logs); };
-#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
-
-destination authlog { file("/var/log/auth.log"); };
-destination _syslog { file("/var/log/syslog"); };
-destination cron { file("/var/log/cron.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kern { file("/var/log/kern.log"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination user { file("/var/log/user.log"); };
-destination uucp { file("/var/log/uucp.log"); };
-#destination ppp { file("/var/log/ppp.log"); };
-destination mail { file("/var/log/mail.log"); };
-
-destination avc { file("/var/log/avc.log"); };
-destination audit { file("/var/log/audit.log"); };
-destination pax { file("/var/log/pax.log"); };
-destination grsec { file("/var/log/grsec.log"); };
-
-destination mailinfo { file("/var/log/mail.info"); };
-destination mailwarn { file("/var/log/mail.warn"); };
-destination mailerr { file("/var/log/mail.err"); };
-
-destination newscrit { file("/var/log/news/news.crit"); };
-destination newserr { file("/var/log/news/news.err"); };
-destination newsnotice { file("/var/log/news/news.notice"); };
-
-destination debug { file("/var/log/debug"); };
-destination messages { file("/var/log/messages"); };
-destination console { usertty("root"); };
-destination console_all { file("/dev/tty12"); };
-#destination loghost { udp("loghost" port(999)); };
-
-destination xconsole { pipe("/dev/xconsole"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { not facility(authpriv, mail); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kern { facility(kern); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_user { facility(user); };
-filter f_uucp { facility(uucp); };
-#filter f_ppp { facility(ppp); };
-filter f_news { facility(news); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn)
-	and not facility(auth, authpriv, mail, news); };
-filter f_emergency { level(emerg); };
-
-filter f_info { level(info); };
-
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-
-filter f_avc { message(".*avc: .*"); };
-filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
-filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
-filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
-
-log { source(src); filter(f_authpriv); destination(authlog); };
-log { source(src); filter(f_syslog); destination(_syslog); };
-log { source(src); filter(f_cron); destination(cron); };
-log { source(src); filter(f_daemon); destination(daemon); };
-log { source(kernsrc); filter(f_kern); destination(kern); destination(console_all); };
-log { source(src); filter(f_lpr); destination(lpr); };
-log { source(src); filter(f_mail); destination(mail); };
-log { source(src); filter(f_user); destination(user); };
-log { source(src); filter(f_uucp); destination(uucp); };
-log { source(kernsrc); filter(f_pax); destination(pax); };
-log { source(kernsrc); filter(f_grsec); destination(grsec); };
-log { source(kernsrc); filter(f_audit); destination(audit); };
-log { source(kernsrc); filter(f_avc); destination(avc); };
-log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
-log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
-log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
-log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
-log { source(src); filter(f_news); filter(f_err); destination(newserr); };
-log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
-log { source(src); filter(f_debug); destination(debug); };
-log { source(src); filter(f_messages); destination(messages); };
-log { source(src); filter(f_emergency); destination(console); };
-#log { source(src); filter(f_ppp); destination(ppp); };
-log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.confd b/app-admin/syslog-ng/files/3.13/syslog-ng.confd
deleted file mode 100644
index 42fa26ab4cf4..000000000000
--- a/app-admin/syslog-ng/files/3.13/syslog-ng.confd
+++ /dev/null
@@ -1,42 +0,0 @@
-# Config file for /etc/init.d/syslog-ng
-
-# If you are not using network logging, this entire section should be
-# commented out. Otherwise, choose one of the settings below based on
-# how you are configuring your network.
-#
-# If you are using the net.* scripts to configure your network, you should
-# set rc_need to match the interface through which your logging server
-# can be reached.
-#rc_need="net.eth0"
-#
-# If you are using an interface manager like wicd, dhcpcd in standalone
-# mode, networkmanager, etc to control your interfaces, set rc_need to
-# the name of that service.
-# rc_need="dhcpcd"
-#rc_need="networkmanager"
-#
-# If you are using newnet and configuring your interface statically with
-# the network script, you should use this setting.
-#rc_need="network"
-#
-# You can use this setting, but I do not recommend relying on it.
-#rc_need="net"
-#
-# You may also want to uncomment the following if you are using network
-# logging.
-#rc_use="stunnel"
-
-# For very customized setups these variables can be adjusted as needed
-# but for most situations they should remain commented:
-# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
-# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
-# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
-# SYSLOG_NG_PIDFILE_DIR=/run
-# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
-# SYSLOG_NG_GROUP=root
-# SYSLOG_NG_USER=root
-
-# Put any additional options for syslog-ng here.
-# See syslog-ng(8) for more information.
-
-SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/3.13/syslog-ng.rc b/app-admin/syslog-ng/files/3.13/syslog-ng.rc
deleted file mode 100644
index 4a6f6451b7da..000000000000
--- a/app-admin/syslog-ng/files/3.13/syslog-ng.rc
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-: ${SYSLOG_NG_CONFIGFILE:=/etc/syslog-ng/${RC_SVCNAME}.conf}
-: ${SYSLOG_NG_STATEFILE_DIR:=/var/lib/syslog-ng}
-: ${SYSLOG_NG_STATEFILE:=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
-: ${SYSLOG_NG_PIDFILE_DIR:=/run}
-: ${SYSLOG_NG_PIDFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
-
-: ${SYSLOG_NG_GROUP:=root}
-: ${SYSLOG_NG_USER:=root}
-
-command="/usr/sbin/syslog-ng"
-command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
-extra_commands="checkconfig"
-extra_started_commands="reload"
-pidfile="${SYSLOG_NG_PIDFILE}"
-start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
-description="Syslog-ng is a syslog replacement with advanced filtering features."
-description_checkconfig="Check the configuration file that will be used by \"start\""
-description_reload="Reload the configuration without exiting"
-required_files="${SYSLOG_NG_CONFIGFILE}"
-required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
-
-depend() {
-	use clock
-	need hostname localmount
-	after bootmisc
-	provide logger
-}
-
-checkconfig() {
-	ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
-	syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
-	eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
-}
-
-start_pre() {
-	checkconfig || return 1
-	checkpath \
-		-d \
-		--mode 0700 \
-		--owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
-		"${SYSLOG_NG_STATEFILE_DIR}"
-}
-
-stop_pre() {
-	[ "$RC_CMD" = "restart" ] && sleep 1
-	return 0
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading configuration and re-opening log files"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo
deleted file mode 100644
index 7833f3aac376..000000000000
--- a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo
+++ /dev/null
@@ -1,36 +0,0 @@
-@version: 3.14
-#
-# Syslog-ng default configuration file for Gentoo Linux
-
-# https://bugs.gentoo.org/426814
-@include "scl.conf"
-
-options {
-	threaded(yes);
-	chain_hostnames(no);
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200);
-	# The default action of syslog-ng is to log a MARK line
-	# to the file every 20 minutes.  That's seems high for most
-	# people so turn it down to once an hour.  Set it to zero
-	# if you don't want the functionality at all.
-	mark_freq(3600);
-};
-
-source src { system(); internal(); };
-
-destination messages { file("/var/log/messages"); };
-
-# By default messages are logged to tty12...
-destination console_all { file("/dev/tty12"); };
-# ...if you intend to use /dev/console for programs like xconsole
-# you can comment out the destination line above that references /dev/tty12
-# and uncomment the line below.
-#destination console_all { file("/dev/console"); };
-
-log { source(src); destination(messages); };
-log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.fbsd
deleted file mode 100644
index bb21cdf0f04d..000000000000
--- a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.fbsd
+++ /dev/null
@@ -1,24 +0,0 @@
-@version: 3.14
-#
-# Syslog-ng default configuration file for Gentoo FreeBSD
-#
-
-# https://bugs.gentoo.org/426814
-@include "scl.conf"
-
-options {
-	threaded(yes);
-	chain_hostnames(no);
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200);
-};
-
-source src { system(); internal(); };
-
-destination messages { file("/var/log/messages"); };
-
-log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.hardened
deleted file mode 100644
index 51b41e8ea48b..000000000000
--- a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.hardened
+++ /dev/null
@@ -1,115 +0,0 @@
-@version: 3.14
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# https://bugs.gentoo.org/426814
-@include "scl.conf"
-
-#
-# Syslog-ng configuration file, compatible with default hardened installations.
-#
-
-options {
-	threaded(yes);
-	chain_hostnames(no);
-	stats_freq(43200);
-};
-
-source src {
-    system();
-    internal();
-};
-
-source kernsrc {
-    file("/proc/kmsg");
-};
-
-#source net { udp(); };
-#log { source(net); destination(net_logs); };
-#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
-
-destination authlog { file("/var/log/auth.log"); };
-destination _syslog { file("/var/log/syslog"); };
-destination cron { file("/var/log/cron.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kern { file("/var/log/kern.log"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination user { file("/var/log/user.log"); };
-destination uucp { file("/var/log/uucp.log"); };
-#destination ppp { file("/var/log/ppp.log"); };
-destination mail { file("/var/log/mail.log"); };
-
-destination avc { file("/var/log/avc.log"); };
-destination audit { file("/var/log/audit.log"); };
-destination pax { file("/var/log/pax.log"); };
-destination grsec { file("/var/log/grsec.log"); };
-
-destination mailinfo { file("/var/log/mail.info"); };
-destination mailwarn { file("/var/log/mail.warn"); };
-destination mailerr { file("/var/log/mail.err"); };
-
-destination newscrit { file("/var/log/news/news.crit"); };
-destination newserr { file("/var/log/news/news.err"); };
-destination newsnotice { file("/var/log/news/news.notice"); };
-
-destination debug { file("/var/log/debug"); };
-destination messages { file("/var/log/messages"); };
-destination console { usertty("root"); };
-destination console_all { file("/dev/tty12"); };
-#destination loghost { udp("loghost" port(999)); };
-
-destination xconsole { pipe("/dev/xconsole"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { not facility(authpriv, mail); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kern { facility(kern); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_user { facility(user); };
-filter f_uucp { facility(uucp); };
-#filter f_ppp { facility(ppp); };
-filter f_news { facility(news); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn)
-	and not facility(auth, authpriv, mail, news); };
-filter f_emergency { level(emerg); };
-
-filter f_info { level(info); };
-
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-
-filter f_avc { message(".*avc: .*"); };
-filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
-filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
-filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
-
-log { source(src); filter(f_authpriv); destination(authlog); };
-log { source(src); filter(f_syslog); destination(_syslog); };
-log { source(src); filter(f_cron); destination(cron); };
-log { source(src); filter(f_daemon); destination(daemon); };
-log { source(kernsrc); filter(f_kern); destination(kern); destination(console_all); };
-log { source(src); filter(f_lpr); destination(lpr); };
-log { source(src); filter(f_mail); destination(mail); };
-log { source(src); filter(f_user); destination(user); };
-log { source(src); filter(f_uucp); destination(uucp); };
-log { source(kernsrc); filter(f_pax); destination(pax); };
-log { source(kernsrc); filter(f_grsec); destination(grsec); };
-log { source(kernsrc); filter(f_audit); destination(audit); };
-log { source(kernsrc); filter(f_avc); destination(avc); };
-log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
-log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
-log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
-log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
-log { source(src); filter(f_news); filter(f_err); destination(newserr); };
-log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
-log { source(src); filter(f_debug); destination(debug); };
-log { source(src); filter(f_messages); destination(messages); };
-log { source(src); filter(f_emergency); destination(console); };
-#log { source(src); filter(f_ppp); destination(ppp); };
-log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.confd b/app-admin/syslog-ng/files/3.14/syslog-ng.confd
deleted file mode 100644
index 9ddeda7e0987..000000000000
--- a/app-admin/syslog-ng/files/3.14/syslog-ng.confd
+++ /dev/null
@@ -1,43 +0,0 @@
-# Config file for /etc/init.d/syslog-ng
-
-# If you are not using network logging, this entire section should be
-# commented out. Otherwise, choose one of the settings below based on
-# how you are configuring your network.
-#
-# If you are using the net.* scripts to configure your network, you should
-# set rc_need to match the interface through which your logging server
-# can be reached.
-#rc_need="net.eth0"
-#
-# If you are using an interface manager like wicd, dhcpcd in standalone
-# mode, networkmanager, etc to control your interfaces, set rc_need to
-# the name of that service.
-# rc_need="dhcpcd"
-#rc_need="networkmanager"
-#
-# If you are using newnet and configuring your interface statically with
-# the network script, you should use this setting.
-#rc_need="network"
-#
-# You can use this setting, but I do not recommend relying on it.
-#rc_need="net"
-#
-# You may also want to uncomment the following if you are using network
-# logging.
-#rc_use="stunnel"
-
-# For very customized setups these variables can be adjusted as needed
-# but for most situations they should remain commented:
-# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
-# SYSLOG_NG_CONTROLFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.ctl
-# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
-# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
-# SYSLOG_NG_PIDFILE_DIR=/run
-# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
-# SYSLOG_NG_GROUP=root
-# SYSLOG_NG_USER=root
-
-# Put any additional options for syslog-ng here.
-# See syslog-ng(8) for more information.
-
-SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/3.14/syslog-ng.rc b/app-admin/syslog-ng/files/3.14/syslog-ng.rc
deleted file mode 100644
index fddf34c4ecda..000000000000
--- a/app-admin/syslog-ng/files/3.14/syslog-ng.rc
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-: ${SYSLOG_NG_CONFIGFILE:=/etc/syslog-ng/${RC_SVCNAME}.conf}
-: ${SYSLOG_NG_STATEFILE_DIR:=/var/lib/${RC_SVCNAME}}
-: ${SYSLOG_NG_STATEFILE:=${SYSLOG_NG_STATEFILE_DIR}/${RC_SVCNAME}.persist}
-: ${SYSLOG_NG_PIDFILE_DIR:=/run}
-: ${SYSLOG_NG_PIDFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
-: ${SYSLOG_NG_CONTROLFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.ctl}
-
-: ${SYSLOG_NG_GROUP:=root}
-: ${SYSLOG_NG_USER:=root}
-
-command="/usr/sbin/syslog-ng"
-command_args="--cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --control \"${SYSLOG_NG_CONTROLFILE}\" --persist-file \"${SYSLOG_NG_STATEFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
-command_user="${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}"
-extra_commands="checkconfig"
-extra_started_commands="reload"
-pidfile="${SYSLOG_NG_PIDFILE}"
-description="Syslog-ng is a syslog replacement with advanced filtering features."
-description_checkconfig="Check the configuration file that will be used by \"start\""
-description_reload="Reload the configuration without exiting"
-required_files="${SYSLOG_NG_CONFIGFILE}"
-required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
-
-depend() {
-	use clock
-	need hostname localmount
-	after bootmisc
-	provide logger
-}
-
-checkconfig() {
-	ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
-	syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
-	eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
-}
-
-start_pre() {
-	checkconfig || return 1
-	checkpath \
-		-d \
-		--mode 0700 \
-		--owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
-		"${SYSLOG_NG_STATEFILE_DIR}"
-}
-
-stop_pre() {
-	[ "$RC_CMD" = "restart" ] && sleep 1
-	return 0
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading configuration and re-opening log files"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo
deleted file mode 100644
index 131dea1f71ad..000000000000
--- a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo
+++ /dev/null
@@ -1,36 +0,0 @@
-@version: 3.7
-#
-# Syslog-ng default configuration file for Gentoo Linux
-
-# https://bugs.gentoo.org/show_bug.cgi?id=426814
-@include "scl.conf"
-
-options { 
-	threaded(yes);
-	chain_hostnames(no); 
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200); 
-	# The default action of syslog-ng is to log a MARK line
-	# to the file every 20 minutes.  That's seems high for most
-	# people so turn it down to once an hour.  Set it to zero
-	# if you don't want the functionality at all.
-	mark_freq(3600); 
-};
-
-source src { system(); internal(); };
-
-destination messages { file("/var/log/messages"); };
-
-# By default messages are logged to tty12...
-destination console_all { file("/dev/tty12"); };
-# ...if you intend to use /dev/console for programs like xconsole
-# you can comment out the destination line above that references /dev/tty12
-# and uncomment the line below.
-#destination console_all { file("/dev/console"); };
-
-log { source(src); destination(messages); };
-log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd
deleted file mode 100644
index eb2e3d986e6d..000000000000
--- a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd
+++ /dev/null
@@ -1,24 +0,0 @@
-@version: 3.7
-#
-# Syslog-ng default configuration file for Gentoo FreeBSD
-#
-
-# https://bugs.gentoo.org/show_bug.cgi?id=426814
-@include "scl.conf"
-
-options {
-	threaded(yes);
-	chain_hostnames(no);
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200); 
-};
-
-source src { system(); internal(); };
-
-destination messages { file("/var/log/messages"); };
-
-log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened
deleted file mode 100644
index b7443f0bd66a..000000000000
--- a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened
+++ /dev/null
@@ -1,114 +0,0 @@
-@version: 3.7
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# https://bugs.gentoo.org/show_bug.cgi?id=426814
-@include "scl.conf"
-
-#
-# Syslog-ng configuration file, compatible with default hardened installations.
-#
-
-options {
-	threaded(yes);
-	chain_hostnames(no);
-	stats_freq(43200);
-};
-
-source src {
-    unix-dgram("/dev/log");
-    internal();
-};
-source kernsrc {
-    file("/proc/kmsg");
-};
-
-#source net { udp(); };
-#log { source(net); destination(net_logs); };
-#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
-
-destination authlog { file("/var/log/auth.log"); };
-destination _syslog { file("/var/log/syslog"); };
-destination cron { file("/var/log/cron.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination user { file("/var/log/user.log"); };
-destination uucp { file("/var/log/uucp.log"); };
-#destination ppp { file("/var/log/ppp.log"); };
-destination mail { file("/var/log/mail.log"); };
-
-destination avc { file("/var/log/avc.log"); };
-destination audit { file("/var/log/audit.log"); };
-destination pax { file("/var/log/pax.log"); };
-destination grsec { file("/var/log/grsec.log"); };
-
-destination mailinfo { file("/var/log/mail.info"); };
-destination mailwarn { file("/var/log/mail.warn"); };
-destination mailerr { file("/var/log/mail.err"); };
-
-destination newscrit { file("/var/log/news/news.crit"); };
-destination newserr { file("/var/log/news/news.err"); };
-destination newsnotice { file("/var/log/news/news.notice"); };
-
-destination debug { file("/var/log/debug"); };
-destination messages { file("/var/log/messages"); };
-destination console { usertty("root"); };
-destination console_all { file("/dev/tty12"); };
-#destination loghost { udp("loghost" port(999)); };
-
-destination xconsole { pipe("/dev/xconsole"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { not facility(authpriv, mail); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kern { facility(kern); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_user { facility(user); };
-filter f_uucp { facility(uucp); };
-#filter f_ppp { facility(ppp); };
-filter f_news { facility(news); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn)
-	and not facility(auth, authpriv, mail, news); };
-filter f_emergency { level(emerg); };
-
-filter f_info { level(info); };
-
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-
-filter f_avc { message(".*avc: .*"); };
-filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
-filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
-filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
-
-log { source(src); filter(f_authpriv); destination(authlog); };
-log { source(src); filter(f_syslog); destination(_syslog); };
-log { source(src); filter(f_cron); destination(cron); };
-log { source(src); filter(f_daemon); destination(daemon); };
-log { source(kernsrc); filter(f_kern); destination(kern); };
-log { source(src); filter(f_lpr); destination(lpr); };
-log { source(src); filter(f_mail); destination(mail); };
-log { source(src); filter(f_user); destination(user); };
-log { source(src); filter(f_uucp); destination(uucp); };
-log { source(kernsrc); filter(f_pax); destination(pax); };
-log { source(kernsrc); filter(f_grsec); destination(grsec); };
-log { source(kernsrc); filter(f_audit); destination(audit); };
-log { source(kernsrc); filter(f_avc); destination(avc); };
-log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
-log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
-log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
-log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
-log { source(src); filter(f_news); filter(f_err); destination(newserr); };
-log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
-log { source(src); filter(f_debug); destination(debug); };
-log { source(src); filter(f_messages); destination(messages); };
-log { source(src); filter(f_emergency); destination(console); };
-#log { source(src); filter(f_ppp); destination(ppp); };
-log { source(src); destination(console_all); };
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.confd b/app-admin/syslog-ng/files/3.7/syslog-ng.confd
deleted file mode 100644
index 42fa26ab4cf4..000000000000
--- a/app-admin/syslog-ng/files/3.7/syslog-ng.confd
+++ /dev/null
@@ -1,42 +0,0 @@
-# Config file for /etc/init.d/syslog-ng
-
-# If you are not using network logging, this entire section should be
-# commented out. Otherwise, choose one of the settings below based on
-# how you are configuring your network.
-#
-# If you are using the net.* scripts to configure your network, you should
-# set rc_need to match the interface through which your logging server
-# can be reached.
-#rc_need="net.eth0"
-#
-# If you are using an interface manager like wicd, dhcpcd in standalone
-# mode, networkmanager, etc to control your interfaces, set rc_need to
-# the name of that service.
-# rc_need="dhcpcd"
-#rc_need="networkmanager"
-#
-# If you are using newnet and configuring your interface statically with
-# the network script, you should use this setting.
-#rc_need="network"
-#
-# You can use this setting, but I do not recommend relying on it.
-#rc_need="net"
-#
-# You may also want to uncomment the following if you are using network
-# logging.
-#rc_use="stunnel"
-
-# For very customized setups these variables can be adjusted as needed
-# but for most situations they should remain commented:
-# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
-# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
-# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
-# SYSLOG_NG_PIDFILE_DIR=/run
-# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
-# SYSLOG_NG_GROUP=root
-# SYSLOG_NG_USER=root
-
-# Put any additional options for syslog-ng here.
-# See syslog-ng(8) for more information.
-
-SYSLOG_NG_OPTS=""
diff --git a/app-admin/syslog-ng/files/3.7/syslog-ng.rc6 b/app-admin/syslog-ng/files/3.7/syslog-ng.rc6
deleted file mode 100644
index a27ae55dcbdf..000000000000
--- a/app-admin/syslog-ng/files/3.7/syslog-ng.rc6
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
-SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
-SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
-SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run}
-SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
-
-SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
-SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
-
-command="/usr/sbin/syslog-ng"
-command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
-extra_commands="checkconfig"
-extra_started_commands="reload"
-pidfile="${SYSLOG_NG_PIDFILE}"
-start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
-description="Syslog-ng is a syslog replacement with advanced filtering features."
-description_checkconfig="Check the configuration file that will be used by \"start\""
-description_reload="Reload the configuration without exiting"
-required_files="${SYSLOG_NG_CONFIGFILE}"
-required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
-
-depend() {
-	use clock
-	need hostname localmount
-	after bootmisc
-	provide logger
-}
-
-checkconfig() {
-	ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
-	syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
-	eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
-}
-
-start_pre() {
-	checkconfig || return 1
-	checkpath \
-		-d \
-		--mode 0700 \
-		--owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
-		"${SYSLOG_NG_STATEFILE_DIR}"
-}
-
-stop_pre() {
-	[ "$RC_CMD" = restart ] && sleep 1
-	return 0
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading configuration and re-opening log files"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch
deleted file mode 100644
index 3703bec22ba1..000000000000
--- a/app-admin/syslog-ng/files/patches/syslog-ng-3.12.1-json-c-0.13+.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1b824dd6389e209eab752d5a698c6093f311e3e3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
-Date: Mon, 11 Dec 2017 15:46:06 +0100
-Subject: [PATCH] modules/json: Adaptions for json-c v0.13
-
----
- modules/json/json-parser.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c
-index 0368ed8f7..356df48b9 100644
---- a/modules/json/json-parser.c
-+++ b/modules/json/json-parser.c
-@@ -20,6 +20,8 @@
-  * COPYING for details.
-  */
- 
-+#define JSON_C_VER_013 (13 << 8)
-+
- #include "json-parser.h"
- #include "dot-notation.h"
- #include "scratch-buffers.h"
-@@ -28,7 +30,10 @@
- #include <ctype.h>
- 
- #include <json.h>
-+
-+#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
- #include <json_object_private.h>
-+#endif
- 
- typedef struct _JSONParser
- {
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch
deleted file mode 100644
index 4339612f58c8..000000000000
--- a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-automake-1.16-build.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 41dd64e7b11d527f8f3cc6ae13067d0225191538 Mon Sep 17 00:00:00 2001
-From: kokan <peter.kokai@balabit.com>
-Date: Sat, 31 Mar 2018 15:36:08 +0200
-Subject: [PATCH] libsyslog-ng: missing dependency libsecret-storage
-
-Signed-off-by: kokan <peter.kokai@balabit.com>
----
- lib/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index af2f44ece2..4a0b11c92f 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -47,7 +47,7 @@ lib_libsyslog_ng_la_LDFLAGS		= -no-undefined -release ${LSNG_RELEASE} \
- 
- lib_test_subdirs			= lib_filter lib_logproto lib_parser lib_rewrite lib_template lib_stats lib_control
- 
--lib_libsyslog_ng_la_DEPENDENCIES	= lib/eventlog/src/libevtlog.la
-+lib_libsyslog_ng_la_DEPENDENCIES       = lib/eventlog/src/libevtlog.la lib/secret-storage/libsecret-storage.la
- 
- if IVYKIS_INTERNAL
- lib_libsyslog_ng_la_DEPENDENCIES	+= lib/ivykis/src/libivykis.la
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch
deleted file mode 100644
index b4046bdbadb1..000000000000
--- a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From a4f7b9dc75c2b678466cc104d8ca111bd90fba11 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@balabit.com>
-Date: Wed, 7 Mar 2018 18:35:09 +0100
-Subject: [PATCH 1/3] tls: fix tls_context_load_key_and_cert()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-key_file and cert_file are optional (the client cert is not mandatory).
-
-Signed-off-by: László Várady <laszlo.varady@balabit.com>
----
- lib/tlscontext.c                         | 9 +++++++++
- modules/afsocket/transport-mapper-inet.c | 6 +++---
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/lib/tlscontext.c b/lib/tlscontext.c
-index 510ac2738d..b202c397f3 100644
---- a/lib/tlscontext.c
-+++ b/lib/tlscontext.c
-@@ -599,9 +599,18 @@ _are_key_and_cert_files_accessible(TLSContext *self)
-          file_exists(self->cert_file);
- }
- 
-+static gboolean
-+_client_key_and_cert_files_are_not_specified(TLSContext *self)
-+{
-+  return self->mode == TM_CLIENT && (!self->key_file && !self->cert_file);
-+}
-+
- static TLSContextLoadResult
- tls_context_load_key_and_cert(TLSContext *self)
- {
-+  if (_client_key_and_cert_files_are_not_specified(self))
-+    return TLS_CONTEXT_OK;
-+
-   if (!_are_key_and_cert_files_accessible(self))
-     return TLS_CONTEXT_FILE_ACCES_ERROR;
-   if (!SSL_CTX_use_PrivateKey_file(self->ssl_ctx, self->key_file, SSL_FILETYPE_PEM))
-diff --git a/modules/afsocket/transport-mapper-inet.c b/modules/afsocket/transport-mapper-inet.c
-index 80c0d21801..1afb34b33f 100644
---- a/modules/afsocket/transport-mapper-inet.c
-+++ b/modules/afsocket/transport-mapper-inet.c
-@@ -176,17 +176,17 @@ transport_mapper_inet_async_init(TransportMapper *s, TransportMapperAsyncInitCB
- 
-   TLSContextSetupResult tls_ctx_setup_res = tls_context_setup_context(self->tls_context);
- 
-+  const gchar *key = tls_context_get_key_file(self->tls_context);
-+
-   if (tls_ctx_setup_res == TLS_CONTEXT_SETUP_OK)
-     {
--      const gchar *key = tls_context_get_key_file(self->tls_context);
--      if (secret_storage_contains_key(key))
-+      if (key && secret_storage_contains_key(key))
-         secret_storage_update_status(key, SECRET_STORAGE_SUCCESS);
-       return func(func_args);
-     }
- 
-   if (tls_ctx_setup_res == TLS_CONTEXT_SETUP_BAD_PASSWORD)
-     {
--      const gchar *key = tls_context_get_key_file(self->tls_context);
-       msg_error("Error setting up TLS context",
-                 evt_tag_str("keyfile", key));
-       call_finalize_init_args *args = g_new0(call_finalize_init_args, 1);
-
-From 9e3eae23330442c9e58ae5ccc732457f2d0e694e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@balabit.com>
-Date: Wed, 7 Mar 2018 19:39:24 +0100
-Subject: [PATCH 2/3] tlscontext: fix error logging of cert_file
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-file_exists() has a side effect: it logs when the file can't be opened.
-
-Since the && operator is evaluated lazily, the error messages of cert_file
-were not displayed when the first invocation of file_exists failed
-(on key_file).
-
-Signed-off-by: László Várady <laszlo.varady@balabit.com>
----
- lib/tlscontext.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/lib/tlscontext.c b/lib/tlscontext.c
-index b202c397f3..5a503387c4 100644
---- a/lib/tlscontext.c
-+++ b/lib/tlscontext.c
-@@ -595,8 +595,10 @@ tls_context_load_pkcs12(TLSContext *self)
- static gboolean
- _are_key_and_cert_files_accessible(TLSContext *self)
- {
--  return file_exists(self->key_file) &&
--         file_exists(self->cert_file);
-+  gboolean key_file_exists = file_exists(self->key_file);
-+  gboolean cert_file_exists = file_exists(self->cert_file);
-+
-+  return key_file_exists && cert_file_exists;
- }
- 
- static gboolean
-
-From 3eef78b6ac8016d3eb33b36bd98419d5b086767f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@balabit.com>
-Date: Wed, 7 Mar 2018 19:43:41 +0100
-Subject: [PATCH 3/3] tlscontext: rename file_exists() to is_file_accessible()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: László Várady <laszlo.varady@balabit.com>
----
- lib/tlscontext.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/lib/tlscontext.c b/lib/tlscontext.c
-index 5a503387c4..73015d2462 100644
---- a/lib/tlscontext.c
-+++ b/lib/tlscontext.c
-@@ -322,7 +322,7 @@ tls_session_free(TLSSession *self)
- }
- 
- static gboolean
--file_exists(const gchar *fname)
-+_is_file_accessible(const gchar *fname)
- {
-   if (!fname)
-     return FALSE;
-@@ -444,7 +444,7 @@ _is_dh_valid(DH *dh)
- static DH *
- _load_dh_from_file(const gchar *dhparam_file)
- {
--  if (!file_exists(dhparam_file))
-+  if (!_is_file_accessible(dhparam_file))
-     return NULL;
- 
-   BIO *bio = BIO_new_file(dhparam_file, "r");
-@@ -528,7 +528,7 @@ tls_context_setup_dh(TLSContext *self)
- static PKCS12 *
- _load_pkcs12_file(const gchar *pkcs12_file)
- {
--  if (!file_exists(pkcs12_file))
-+  if (!_is_file_accessible(pkcs12_file))
-     return NULL;
- 
-   FILE *p12_file = fopen(pkcs12_file, "rb");
-@@ -595,10 +595,10 @@ tls_context_load_pkcs12(TLSContext *self)
- static gboolean
- _are_key_and_cert_files_accessible(TLSContext *self)
- {
--  gboolean key_file_exists = file_exists(self->key_file);
--  gboolean cert_file_exists = file_exists(self->cert_file);
-+  gboolean key_file_accessible = _is_file_accessible(self->key_file);
-+  gboolean cert_file_accessible = _is_file_accessible(self->cert_file);
- 
--  return key_file_exists && cert_file_exists;
-+  return key_file_accessible && cert_file_accessible;
- }
- 
- static gboolean
-@@ -650,10 +650,10 @@ tls_context_setup_context(TLSContext *self)
-         goto error;
-     }
- 
--  if (file_exists(self->ca_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->ca_dir))
-+  if (_is_file_accessible(self->ca_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->ca_dir))
-     goto error;
- 
--  if (file_exists(self->crl_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->crl_dir))
-+  if (_is_file_accessible(self->crl_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->crl_dir))
-     goto error;
- 
-   if (self->crl_dir)
diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-3.23.1-fix-sigabrt.patch b/app-admin/syslog-ng/files/patches/syslog-ng-3.23.1-fix-sigabrt.patch
new file mode 100644
index 000000000000..6d27e88abf71
--- /dev/null
+++ b/app-admin/syslog-ng/files/patches/syslog-ng-3.23.1-fix-sigabrt.patch
@@ -0,0 +1,72 @@
+diff --git a/lib/logsource.c b/lib/logsource.c
+index 3f38b66e8b..83c61a8e93 100644
+--- a/lib/logsource.c
++++ b/lib/logsource.c
+@@ -633,7 +633,20 @@ log_source_queue(LogPipe *s, LogMessage *msg, const LogPathOptions *path_options
+                   evt_tag_printf("msg", "%p", msg));
+ 
+   msg_set_context(NULL);
++}
++
++static void
++_initialize_window(LogSource *self, gint init_window_size)
++{
++  self->window_initialized = TRUE;
++  window_size_counter_set(&self->window_size, init_window_size);
++  self->full_window_size = init_window_size;
++}
+ 
++static gboolean
++_is_window_initialized(LogSource *self)
++{
++  return self->window_initialized;
+ }
+ 
+ void
+@@ -645,11 +658,9 @@ log_source_set_options(LogSource *self, LogSourceOptions *options,
+    * configuration and we received a SIGHUP.  This means that opened
+    * connections will not have their window_size changed. */
+ 
+-  if ((gint)window_size_counter_get(&self->window_size, NULL) == -1)
+-    {
+-      window_size_counter_set(&self->window_size, options->init_window_size);
+-      self->full_window_size = options->init_window_size;
+-    }
++  if (!_is_window_initialized(self))
++    _initialize_window(self, options->init_window_size);
++
+   self->options = options;
+   if (self->stats_id)
+     g_free(self->stats_id);
+@@ -679,7 +690,7 @@ log_source_init_instance(LogSource *self, GlobalConfig *cfg)
+   self->super.free_fn = log_source_free;
+   self->super.init = log_source_init;
+   self->super.deinit = log_source_deinit;
+-  window_size_counter_set(&self->window_size, (gsize)-1);
++  self->window_initialized = FALSE;
+   self->ack_tracker = NULL;
+ }
+ 
+@@ -696,7 +707,9 @@ log_source_free(LogPipe *s)
+ 
+   ack_tracker_free(self->ack_tracker);
+   self->ack_tracker = NULL;
+-  _release_dynamic_window(self);
++
++  if (G_UNLIKELY(dynamic_window_is_enabled(&self->dynamic_window)))
++    _release_dynamic_window(self);
+ }
+ 
+ void
+diff --git a/lib/logsource.h b/lib/logsource.h
+index 370842efc2..75d4926046 100644
+--- a/lib/logsource.h
++++ b/lib/logsource.h
+@@ -71,6 +71,7 @@ struct _LogSource
+   gchar *stats_instance;
+   WindowSizeCounter window_size;
+   DynamicWindow dynamic_window;
++  gboolean window_initialized;
+   /* full_window_size = static + dynamic */
+   gsize full_window_size;
+   atomic_gssize window_size_to_be_reclaimed;
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.in b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.in
deleted file mode 100644
index d9df76c7fbc2..000000000000
--- a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.fbsd.in
+++ /dev/null
@@ -1,24 +0,0 @@
-@version: @SYSLOGNG_VERSION@
-#
-# Syslog-ng default configuration file for Gentoo FreeBSD
-#
-
-# https://bugs.gentoo.org/426814
-@include "scl.conf"
-
-options {
-	threaded(yes);
-	chain_hostnames(no);
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200);
-};
-
-source src { system(); internal(); };
-
-destination messages { file("/var/log/messages"); };
-
-log { source(src); destination(messages); };
diff --git a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in
index 845267390992..5e656f920980 100644
--- a/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in
+++ b/app-admin/syslog-ng/files/syslog-ng.conf.gentoo.hardened.in
@@ -1,5 +1,5 @@
 @version: @SYSLOGNG_VERSION@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # https://bugs.gentoo.org/426814
diff --git a/app-admin/syslog-ng/files/syslog-ng.rc b/app-admin/syslog-ng/files/syslog-ng.rc
index c13e4b1d46f9..71011e85cacf 100644
--- a/app-admin/syslog-ng/files/syslog-ng.rc
+++ b/app-admin/syslog-ng/files/syslog-ng.rc
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 : ${SYSLOG_NG_CONFIGFILE:=/etc/syslog-ng/${RC_SVCNAME}.conf}
diff --git a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
deleted file mode 100644
index 49c6e17b35ba..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1 eutils multilib systemd versionator
-
-MY_PV=${PV/_/}
-MY_PV_MM=$(get_version_component_range 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 arm64 hppa ia64 ppc64 sparc x86"
-IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test"
-
-RDEPEND="
-	amqp? ( >=net-libs/rabbitmq-c-0.8.0 )
-	caps? ( sys-libs/libcap )
-	dbi? ( >=dev-db/libdbi-0.9.0 )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
-	http? ( net-misc/curl )
-	json? ( >=dev-libs/json-c-0.9:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( >=dev-libs/hiredis-0.11.0 )
-	smtp? ( net-libs/libesmtp )
-	spoof-source? ( net-libs/libnet:1.1 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=dev-libs/ivykis-0.36.1
-	>=dev-libs/libpcre-6.1
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	!dev-libs/eventlog
-	>=dev-libs/glib-2.10.1:2"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/patches/${PN}-3.12.1-json-c-0.13+.patch
-)
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local f
-
-	use python && python_fix_shebang .
-
-	# remove bundled libs
-	rm -r lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die
-
-	# drop scl modules requiring json
-	if use !json; then
-		sed -i -r '/cim|ewmm|graylog2/d' scl/Makefile.am || die
-	fi
-
-	# use gentoo default path
-	if use systemd; then
-		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
-			-i contrib/systemd/syslog-ng@default || die
-	fi
-
-	for f in "${FILESDIR}"/*logrotate*.in ; do
-		local bn=$(basename "${f}")
-
-		sed \
-			-e "$(usex systemd \
-				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng@default/' \
-				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
-			"${f}" > "${T}/${bn/.in/}" || die
-	done
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		--disable-java \
-		--disable-java-modules \
-		--disable-riemann \
-		--enable-manpages \
-		--localstatedir=/var/lib/syslog-ng \
-		--sysconfdir=/etc/syslog-ng \
-		--with-embedded-crypto \
-		--with-ivykis=system \
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
-		--with-pidfile-dir=/var/run \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(use_enable amqp) \
-		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) \
-		$(use_enable caps linux-caps) \
-		$(use_enable dbi sql) \
-		$(use_enable geoip) \
-		$(use_enable http) \
-		$(use_enable ipv6) \
-		$(use_enable json) \
-		$(use_enable mongodb) \
-		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") \
-		$(use_enable pacct) \
-		$(use_enable python) \
-		$(use_enable redis) \
-		$(use_enable smtp) \
-		$(use_enable spoof-source) \
-		$(use_enable systemd) \
-		$(use_enable tcpd tcp-wrapper)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
-		contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
-		"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
-
-	# Install default configuration
-	insinto /etc/default
-	doins contrib/systemd/syslog-ng@default
-
-	insinto /etc/syslog-ng
-	if use userland_BSD ; then
-		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${T}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc" syslog-ng
-	newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
-	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
-	prune_libtool_files --modules
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	# bug #355257
-	if ! has_version app-admin/logrotate ; then
-		echo
-		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-		elog "for logrotate to use."
-		echo
-	fi
-
-	if use systemd; then
-		echo
-		ewarn "The service file for systemd has changed to support multiple instances."
-		ewarn "To start the default instance issue:"
-		ewarn "# systemctl start syslog-ng@default"
-		echo
-	fi
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
deleted file mode 100644
index 681e65a6b85d..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.17.2.ebuild
+++ /dev/null
@@ -1,171 +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,6} )
-inherit autotools eapi7-ver python-single-r1 systemd
-
-MY_PV_MM=$(ver_cut 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# unit tests require https://github.com/Snaipe/Criterion with additional deps
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.10.1:2
-	>=dev-libs/ivykis-0.42.3
-	>=dev-libs/libpcre-6.1:=
-	!dev-libs/eventlog
-	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
-	caps? ( sys-libs/libcap )
-	dbi? ( >=dev-db/libdbi-0.9.0 )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
-	geoip2? ( dev-libs/libmaxminddb:= )
-	http? ( net-misc/curl )
-	json? ( >=dev-libs/json-c-0.9:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	smtp? ( net-libs/libesmtp )
-	spoof-source? ( net-libs/libnet:1.1= )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
-	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
-	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local f
-
-	use python && python_fix_shebang .
-
-	# remove bundled libs
-	rm -r lib/ivykis modules/afmongodb/mongo-c-driver || die
-
-	# drop scl modules requiring json
-	if use !json; then
-		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic/d' scl/Makefile.am || die
-	fi
-
-	# drop scl modules requiring http
-	if use !http; then
-		sed -i -r '/telegram/d' scl/Makefile.am || die
-	fi
-
-	# use gentoo default path
-	if use systemd; then
-		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
-			-i contrib/systemd/syslog-ng@default || die
-	fi
-
-	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
-		sed \
-			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
-				"/etc/init.d/syslog-ng reload")#g" \
-			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	for f in syslog-ng.conf.gentoo.fbsd.in \
-			syslog-ng.conf.gentoo.hardened.in \
-			syslog-ng.conf.gentoo.in; do
-		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-docs
-		--disable-java
-		--disable-java-modules
-		--disable-riemann
-		--enable-manpages
-		--localstatedir=/var/lib/syslog-ng
-		--sysconfdir=/etc/syslog-ng
-		--with-embedded-crypto
-		--with-ivykis=system
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng
-		--with-pidfile-dir=/var/run
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_enable amqp)
-		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
-		$(use_enable caps linux-caps)
-		$(use_enable dbi sql)
-		$(use_enable geoip)
-		$(use_enable geoip2)
-		$(use_enable http)
-		$(use_enable ipv6)
-		$(use_enable json)
-		$(use_enable mongodb)
-		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
-		$(use_enable pacct)
-		$(use_enable python)
-		$(use_enable redis)
-		$(use_enable smtp)
-		$(use_enable spoof-source)
-		$(use_enable systemd)
-		$(use_enable tcpd tcp-wrapper)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	# Install default configuration
-	insinto /etc/default
-	doins contrib/systemd/syslog-ng@default
-
-	insinto /etc/syslog-ng
-	if use userland_BSD ; then
-		newins "${T}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${T}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
-	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
-	find "${D}" -name '*.la' -delete || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	# bug #355257
-	if ! has_version app-admin/logrotate ; then
-		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-		elog "for logrotate to use."
-	fi
-
-	if use systemd; then
-		ewarn "The service file for systemd has changed to support multiple instances."
-		ewarn "To start the default instance issue:"
-		ewarn "# systemctl start syslog-ng@default"
-	fi
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.18.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.18.1.ebuild
deleted file mode 100644
index be02fccb0921..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.18.1.ebuild
+++ /dev/null
@@ -1,171 +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,6} )
-inherit autotools eapi7-ver python-single-r1 systemd
-
-MY_PV_MM=$(ver_cut 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# unit tests require https://github.com/Snaipe/Criterion with additional deps
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.10.1:2
-	>=dev-libs/ivykis-0.42.3
-	>=dev-libs/libpcre-6.1:=
-	!dev-libs/eventlog
-	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
-	caps? ( sys-libs/libcap )
-	dbi? ( >=dev-db/libdbi-0.9.0 )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
-	geoip2? ( dev-libs/libmaxminddb:= )
-	http? ( net-misc/curl )
-	json? ( >=dev-libs/json-c-0.9:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	smtp? ( net-libs/libesmtp )
-	spoof-source? ( net-libs/libnet:1.1= )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
-	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
-	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local f
-
-	use python && python_fix_shebang .
-
-	# remove bundled libs
-	rm -r lib/ivykis || die
-
-	# drop scl modules requiring json
-	if use !json; then
-		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic/d' scl/Makefile.am || die
-	fi
-
-	# drop scl modules requiring http
-	if use !http; then
-		sed -i -r '/telegram/d' scl/Makefile.am || die
-	fi
-
-	# use gentoo default path
-	if use systemd; then
-		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
-			-i contrib/systemd/syslog-ng@default || die
-	fi
-
-	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
-		sed \
-			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
-				"/etc/init.d/syslog-ng reload")#g" \
-			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	for f in syslog-ng.conf.gentoo.fbsd.in \
-			syslog-ng.conf.gentoo.hardened.in \
-			syslog-ng.conf.gentoo.in; do
-		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-docs
-		--disable-java
-		--disable-java-modules
-		--disable-riemann
-		--enable-manpages
-		--localstatedir=/var/lib/syslog-ng
-		--sysconfdir=/etc/syslog-ng
-		--with-embedded-crypto
-		--with-ivykis=system
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng
-		--with-pidfile-dir=/var/run
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_enable amqp)
-		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
-		$(use_enable caps linux-caps)
-		$(use_enable dbi sql)
-		$(use_enable geoip)
-		$(use_enable geoip2)
-		$(use_enable http)
-		$(use_enable ipv6)
-		$(use_enable json)
-		$(use_enable mongodb)
-		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
-		$(use_enable pacct)
-		$(use_enable python)
-		$(use_enable redis)
-		$(use_enable smtp)
-		$(use_enable spoof-source)
-		$(use_enable systemd)
-		$(use_enable tcpd tcp-wrapper)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	# Install default configuration
-	insinto /etc/default
-	doins contrib/systemd/syslog-ng@default
-
-	insinto /etc/syslog-ng
-	if use userland_BSD ; then
-		newins "${T}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${T}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
-	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
-	find "${D}" -name '*.la' -delete || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	# bug #355257
-	if ! has_version app-admin/logrotate ; then
-		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-		elog "for logrotate to use."
-	fi
-
-	if use systemd; then
-		ewarn "The service file for systemd has changed to support multiple instances."
-		ewarn "To start the default instance issue:"
-		ewarn "# systemctl start syslog-ng@default"
-	fi
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
deleted file mode 100644
index fd48426d446f..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.19.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit autotools python-single-r1 systemd
-
-MY_PV_MM=$(ver_cut 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="https://syslog-ng.com/open-source-log-management"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-# unit tests require https://github.com/Snaipe/Criterion with additional deps
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.10.1:2
-	>=dev-libs/ivykis-0.42.3
-	>=dev-libs/libpcre-6.1:=
-	!dev-libs/eventlog
-	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
-	caps? ( sys-libs/libcap )
-	dbi? ( >=dev-db/libdbi-0.9.0 )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
-	geoip2? ( dev-libs/libmaxminddb:= )
-	http? ( net-misc/curl )
-	json? ( >=dev-libs/json-c-0.9:= )
-	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( >=dev-libs/hiredis-0.11.0:= )
-	smtp? ( net-libs/libesmtp )
-	spoof-source? ( net-libs/libnet:1.1= )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
-	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
-	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local f
-
-	use python && python_fix_shebang .
-
-	# remove bundled libs
-	rm -r lib/ivykis || die
-
-	# drop scl modules requiring json
-	if use !json; then
-		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|nodejs|osquery|slack/d' scl/Makefile.am || die
-	fi
-
-	# drop scl modules requiring http
-	if use !http; then
-		sed -i -r '/slack|telegram/d' scl/Makefile.am || die
-	fi
-
-	# use gentoo default path
-	if use systemd; then
-		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
-			-i contrib/systemd/syslog-ng@default || die
-	fi
-
-	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
-		sed \
-			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
-				"/etc/init.d/syslog-ng reload")#g" \
-			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	for f in syslog-ng.conf.gentoo.fbsd.in \
-			syslog-ng.conf.gentoo.hardened.in \
-			syslog-ng.conf.gentoo.in; do
-		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
-	done
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-docs
-		--disable-java
-		--disable-java-modules
-		--disable-riemann
-		--enable-manpages
-		--localstatedir=/var/lib/syslog-ng
-		--sysconfdir=/etc/syslog-ng
-		--with-embedded-crypto
-		--with-ivykis=system
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng
-		--with-pidfile-dir=/var/run
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_enable amqp)
-		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
-		$(use_enable caps linux-caps)
-		$(use_enable dbi sql)
-		$(use_enable geoip)
-		$(use_enable geoip2)
-		$(use_enable http)
-		$(use_enable ipv6)
-		$(use_enable json)
-		$(use_enable mongodb)
-		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
-		$(use_enable pacct)
-		$(use_enable python)
-		$(use_enable redis)
-		$(use_enable smtp)
-		$(use_enable spoof-source)
-		$(use_enable systemd)
-		$(use_enable tcpd tcp-wrapper)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	# Install default configuration
-	insinto /etc/default
-	doins contrib/systemd/syslog-ng@default
-
-	insinto /etc/syslog-ng
-	if use userland_BSD ; then
-		newins "${T}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${T}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
-	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
-	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
-	find "${D}" -name '*.la' -delete || die
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	# bug #355257
-	if ! has_version app-admin/logrotate ; then
-		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-		elog "for logrotate to use."
-	fi
-
-	if use systemd; then
-		ewarn "The service file for systemd has changed to support multiple instances."
-		ewarn "To start the default instance issue:"
-		ewarn "# systemctl start syslog-ng@default"
-	fi
-}
diff --git a/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.23.1-r1.ebuild
index b36361d82793..bc13ee0fdc78 100644
--- a/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.23.1-r1.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)
@@ -14,14 +14,14 @@ 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"
-IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+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
 RESTRICT="test"
 
 RDEPEND="
 	>=dev-libs/glib-2.10.1:2
-	>=dev-libs/ivykis-0.42.3
+	>=dev-libs/ivykis-0.42.4
 	>=dev-libs/libpcre-6.1:=
 	!dev-libs/eventlog
 	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
@@ -31,10 +31,12 @@ RDEPEND="
 	geoip2? ( dev-libs/libmaxminddb:= )
 	http? ( net-misc/curl )
 	json? ( >=dev-libs/json-c-0.9:= )
+	kafka? ( >=dev-libs/librdkafka-1.0.0:= )
 	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
 	python? ( ${PYTHON_DEPS} )
 	redis? ( >=dev-libs/hiredis-0.11.0:= )
 	smtp? ( net-libs/libesmtp )
+	snmp? ( net-analyzer/net-snmp )
 	spoof-source? ( net-libs/libnet:1.1= )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
@@ -49,6 +51,9 @@ DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunO
 	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
 	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
 
+# bug #695176
+PATCHES=( "${FILESDIR}/patches/${PN}-3.23.1-fix-sigabrt.patch" )
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -84,8 +89,7 @@ src_prepare() {
 			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
 	done
 
-	for f in syslog-ng.conf.gentoo.fbsd.in \
-			syslog-ng.conf.gentoo.hardened.in \
+	for f in syslog-ng.conf.gentoo.hardened.in \
 			syslog-ng.conf.gentoo.in; do
 		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
 	done
@@ -117,12 +121,14 @@ src_configure() {
 		$(use_enable http)
 		$(use_enable ipv6)
 		$(use_enable json)
+		$(use_enable kafka)
 		$(use_enable mongodb)
 		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
 		$(use_enable pacct)
 		$(use_enable python)
 		$(use_enable redis)
 		$(use_enable smtp)
+		$(use_enable snmp snmp-dest)
 		$(use_enable spoof-source)
 		$(use_enable systemd)
 		$(use_enable tcpd tcp-wrapper)
@@ -139,11 +145,7 @@ src_install() {
 	doins contrib/systemd/syslog-ng@default
 
 	insinto /etc/syslog-ng
-	if use userland_BSD ; then
-		newins "${T}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
+	newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
 
 	insinto /etc/logrotate.d
 	newins "${T}/syslog-ng.logrotate" syslog-ng
diff --git a/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild
deleted file mode 100644
index 45a21915a87a..000000000000
--- a/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 eutils multilib systemd versionator
-
-MY_PV=${PV/_/}
-MY_PV_MM=$(get_version_component_range 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
-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 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test"
-
-RDEPEND="
-	caps? ( sys-libs/libcap )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
-	json? ( >=dev-libs/json-c-0.9:= )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( dev-libs/hiredis )
-	smtp? ( net-libs/libesmtp )
-	spoof-source? ( net-libs/libnet:1.1 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	dev-libs/libpcre
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-libs/eventlog-0.2.12
-	>=dev-libs/glib-2.10.1:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local f
-
-	use python && python_fix_shebang .
-
-	if use !json ; then
-		sed -i -e '1 s/cim //' scl/Makefile.am || die
-		eautoreconf
-	fi
-
-	for f in "${FILESDIR}"/*logrotate*.in ; do
-		local bn=$(basename "${f}")
-
-		sed \
-			-e "$(usex systemd \
-				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
-				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
-			"${f}" > "${T}/${bn/.in/}" || die
-	done
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--disable-java \
-		--disable-docs \
-		--enable-manpages \
-		--with-embedded-crypto \
-		--with-ivykis=internal \
-		--with-libmongo-client=internal \
-		--sysconfdir=/etc/syslog-ng \
-		--localstatedir=/var/lib/syslog-ng \
-		--with-pidfile-dir=/var/run \
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
-		$(systemd_with_unitdir) \
-		$(use_enable systemd) \
-		$(use_enable caps linux-caps) \
-		$(use_enable geoip) \
-		$(use_enable ipv6) \
-		$(use_enable json) \
-		$(use_enable mongodb) \
-		$(use_enable pacct) \
-		$(use_enable python) \
-		$(use_enable redis) \
-		$(use_enable smtp) \
-		$(use_enable amqp) \
-		$(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
-		$(use_enable spoof-source) \
-		$(use_enable dbi sql) \
-		$(use_enable tcpd tcp-wrapper)
-}
-
-src_install() {
-	# -j1 for bug #484470
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
-		contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
-		"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
-
-	# Install default configuration
-	insinto /etc/syslog-ng
-	if use userland_BSD ; then
-		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${T}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc6" syslog-ng
-	newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
-	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
-	prune_libtool_files --modules
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	elog "For detailed documentation please see the upstream website:"
-	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.7-guides/en/syslog-ng-ose-v3.7-guide-admin/html/index.html"
-
-	# bug #355257
-	if ! has_version app-admin/logrotate ; then
-		echo
-		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-		elog "for logrotate to use."
-		echo
-	fi
-}
diff --git a/app-admin/syslog-summary/Manifest b/app-admin/syslog-summary/Manifest
index 81258627faad..a4d883ce892a 100644
--- a/app-admin/syslog-summary/Manifest
+++ b/app-admin/syslog-summary/Manifest
@@ -1,4 +1,4 @@
 DIST syslog-summary-1.14.tar.gz 7278 BLAKE2B 609e506c099b734be87ba6d6e21f70283d4654ab5c6d3794da71099f3e590d178348c13ab271ddb84682220091adfd702c107bf2dee792419de3ce14d2a9c9db SHA512 db1f0660ad435eea26fc3ec4cd475f5f1b98bb629495707741077e52aef88fe8bff4a318bb5b0821e57ccfa0646454c6825a5a4fc1fb4b73ea67cbd4defef277
-EBUILD syslog-summary-1.14-r1.ebuild 753 BLAKE2B f53172e88a9c133bdbb4130fd2a9a45c563723ad7b2d2679745d60abf2b3d3febd03d68b7f11d2104b50bccb1538c67b178138738e404ab6449d224e136e0011 SHA512 d3a1d4bd6634b7a37b029b5231c924ab603f8512c55309a686851aa9d71f8f8e93315a72fb2566d35d22712aa6afea71849f6e940b8ec7ba9d7d6f020d96c83c
-EBUILD syslog-summary-1.14-r2.ebuild 931 BLAKE2B 03b945b067d8021b04bec57f6861b07af60bffc3a821eab41da18689cf3b95dfb3ff6709ca5503efd552c6e02bfc4587edb4673c9c28e0770a45289264b91ddd SHA512 e06eda58188b9a2ef9f55cf3c22117a950d142747268adcf6539e4c22aa291bdf0c08870f200dc637e6d1fb911aeb38d681097c88b2aa39ece54b78eba38e914
+EBUILD syslog-summary-1.14-r1.ebuild 766 BLAKE2B 036754524dd9c11b985c2ef5777636aba3be7bc92b1ed430cc00cf1ac93701f442354dfe9b12e7a0dcbfca4625a7b6fceea2cb218e9ad3fa2a42f39e098bda39 SHA512 f865914965a0ea4f6db355429c4ffedc768c491c9d7f93a6668422bc3e307be31465fe003462bbf45c73857b292110132bd4499d023040516a1c614fb716a549
+EBUILD syslog-summary-1.14-r2.ebuild 944 BLAKE2B ef4dde4b5da0ce5ae1b28e9200d2d51fbca075f30bb72a6f1bb49104d980da37ea44c872901ee207e392cf5f06a3f4a9a5bc032da5f4d50a9fc8805c12366c66 SHA512 47fe494a2bc164750e4804b6c6e8dfa9328b072ab9e7ca0e77e1f2bc4d253387f4e3ed13bfd1d84cc729d15f71faf58660484803ae2c38dcd61d77c2ef79ff5a
 MISC metadata.xml 464 BLAKE2B 862ef04e25fe1aa6609e2ea68c9d61a9c201d43ffab9db6a02244ca9192f4fd11a1f1f4e4d6f7e365660c4043b28a959d5da9783f3c6f0ed4f69eb625784763c SHA512 64073e0ef15c4fbe057f51c09505ea3db8d5e1427c2d581b55137e7fba37f5fef13103cfe4d0e58c74052601d4bae0ed26e36346d497653ea080fe5649f956eb
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
index f23f58c39b83..616c8e62c12f 100644
--- a/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
@@ -9,7 +9,7 @@ inherit eutils python-single-r1
 
 DESCRIPTION="Summarizes the contents of a syslog log file"
 HOMEPAGE="https://github.com/dpaleino/syslog-summary"
-SRC_URI="mirror://github/dpaleino/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r2.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r2.ebuild
index 7c61b49b0cbf..d6e65dce99c8 100644
--- a/app-admin/syslog-summary/syslog-summary-1.14-r2.ebuild
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r2.ebuild
@@ -9,7 +9,7 @@ inherit python-single-r1
 
 DESCRIPTION="Summarizes the contents of a syslog log file"
 HOMEPAGE="https://github.com/dpaleino/syslog-summary"
-SRC_URI="mirror://github/dpaleino/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index 65f85feef36b..d192a8396c39 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -3,4 +3,4 @@ AUX ulogd.logrotate 193 BLAKE2B 65e6d518260ad322539f05ea5a3177092db8cfa67bd8cd03
 AUX ulogd.service 390 BLAKE2B e1395888ffe09cafd98a4384ab7b06e18c0e1b92fa80fb07a05415a3927bcd68a5d3d900ada141c684359bd37910801d40e069cba8cefc8a7c323584b9d8b993 SHA512 73923e6a851bf4f34f532c8b3fa17eb227f2fb2b4c485b89a488789f2d4af3605bd09538095a6acbee6d74300e98755bb03bacabe450104319938cfff62e4c89
 DIST ulogd-2.0.7.tar.bz2 394573 BLAKE2B bec028a3b35038a8cc0f3f8b81b3e19addb66fce09e4ea0f3b2cd29b20cdb28025a576badd0765d9bb15f9d097799b6f55ff45058f8a838daa836c3fe878eef0 SHA512 1ad12bcf91bebe8bf8580de38693318cdabd17146f1f65acf714334885cf13adf5f783abdf2dd67474ef12f82d2cfb84dd4859439bc7af10a0df58e4c7e48b09
 EBUILD ulogd-2.0.7-r1.ebuild 3198 BLAKE2B 8c6bafa8d1d514ef8fa8b73d456c2e254a32a138172fa43471083544234c55cbb0167be9cd74604cf49f3bb27f325589e727d83be92a84c4f35ecb4fa3fc356b SHA512 0510dbd4d7c53368d2c95d5d7270cdf87ad698fdfc9263a842041d1a13b9ec91a1b1d81716a203aac6ea394a87fe9f6d542da06a183e6592821e16cbca50a58e
-MISC metadata.xml 1106 BLAKE2B b3573379c3ff51e2547356bca45add6e891b5ab04784c8c926c52633551209c91ccf51103c289d4e45e16e7fb1f9775055131c400fdfa3627c158282ba0991ef SHA512 d97a125e3fcc6ed123c2da7520bd9f2fa615394d583ac5d984225286676ad3b01d0b5ccf01567d68cacffed6e12e5182bdbd618355e8bec2a05ade66369f9f1d
+MISC metadata.xml 907 BLAKE2B db3e8f8baa571251c26d3b7c860b5fcd5019d5987f8932e4a65197811f5ca36dc4220e5c9deb3b42ded8b0c26f5cfeac76f85d4bb1ff35d0818021127f699ccb SHA512 0dcb4e1c7261bf298e0c0a89fffbfff2e497f66f9215d2cb0b488e460a224f8128648d907cc1ad09c2a2209a917e1f7ac4b97efce62b53cfc6e71068400aa56e
diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml
index 20ac91005d26..b155d9e37204 100644
--- a/app-admin/ulogd/metadata.xml
+++ b/app-admin/ulogd/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>itumaykin+gentoo@gmail.com</email>
-		<name>Coacher</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="json">Build JSON output plugin to save packets in JSON file format</flag>
 		<flag name="pcap">Build PCAP output plugin to save packets in libpcap file format</flag>
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index cdbfe7a15c35..80afbfb84849 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,21 +3,10 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 573 BLAKE2B 444541b8912910cf6b5d038e466e18baebb7dfd2905d802217baf9e861bb7f2a3e032716545c74e269782aa420fbd052745322576b4bcb8c4cf53ba07471b261 SHA512 11124e6fc656977c20b55b578e30fd76b8f6905760c2f17f93b960a317975f1914c6bd8d4ffd3741ba405bfe5aa0cecb68067f8ce52b2df9015863d31f9a7aad
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
-DIST vault-0.11.5.tar.gz 25459691 BLAKE2B 9f77e90b71629e1ed341d03830a0376b6731d85189dde0205148c7c8002556521538144cbf1b7bc425253cc55de6ab3d48cbcc1d270165e5804f7f632d06523b SHA512 b290523ee94199d241bbd2477ca686076f645804953181996aefe2a425bc5114db3d375fd5c832d1fa257a790947544406f50777317e854ccf2d4d4477ab6ffd
-DIST vault-1.0.2-webui.tar.xz 1252768 BLAKE2B d4af46bae84eb2e0e76633e5af061b351d486f19eebd0323a0ae5eb13275310e23169a88e3984a753ae45102c1010b54ae2ca789fe0c62e8e302305eec2bd129 SHA512 9282135e1f1cf983fb1ea4b72b7b3e5cc49aa42299aa5be40e9697da028c3e0bb8c2869e72a79b27ee2124a1b0f913b1b22ef98f96401289edb9e3407d460465
-DIST vault-1.0.2.tar.gz 25834864 BLAKE2B 88f3252547e05a70a377d7711c7df279619455ce26003868465df1030da9ffe95bddd094b40b99f7f4698bbacfd883cdee31d14ee47e815299eb41a18ef99b3d SHA512 e90a1db0401778650f16fa01827b274dc8e38e5f6fb420814bdc3f89507d3507a94d6bd3eacabf1ae782e72286dda598106918030b674f9b7d3f8e69cddbd3ec
-DIST vault-1.1.0-webui.tar.xz 1278712 BLAKE2B f0a61d644f613e14e1e8d2adcb894a9cc4ff7580afc2150757c8786dd6aa1c3641eae013289cf4cc696e6e16d67f9ff967413ee75dedeaaed007f1621d972499 SHA512 2a318a5b1ada29856bbb3411fa6f42666531acbe4f2dbdde012a7ae60defcfe1f71d4fb18e4640c5c1f66be29de5c2c1de8f841098458991b3f4e11c94ad48e8
-DIST vault-1.1.0.tar.gz 25943119 BLAKE2B 44a7e339a7ab5e5ecfa33b70f28424b45305714df9eccee1286bdc063e3b1036f7ef830138df54482257a112b03c8e7289f921ad4f353aa37aff8ad06cb405c0 SHA512 b0bc32f438e8432d849aa896f610c9532fa923384d40749efe49985d64a91f4768a3309af449efd8c8ab4604ecdb2474c39999bfe196f0f876894f788618ae61
-DIST vault-1.1.2-webui.tar.xz 1281868 BLAKE2B 9c3662dabfd9403fda4a8acd8f9a86ff867b1cdafb5e7fb01c426e1f83fa33fc7a9bce27f70991fbed4a1e0b5cacd05b20d24644521487bd1746cb83fe1d9eaa SHA512 a33ee124592faa9e7aa02093d4219f1706a34c97159d9e32c71923ddc377f7dd26f3705bc31f968b4036bf354b226f8d2dc2fac7a9fec49a7b73558f1e3e3062
-DIST vault-1.1.2.tar.gz 26026601 BLAKE2B df208b15076007ab87c3c6683698dc4348f56d5a73ff2a52ce17c5a9858acf4d597f7c53f709a1415247cd4cdc65454cc1aa6c18504cbb10368d39df2974175d SHA512 bc645bc5efeaf5a185479ab2ea78589762d09a40e889845d8cceac94568fcfcfeac94ae602c548648aea800b791121fbb2b75c3af9a9651d08dd9e38c1219826
-DIST vault-1.1.3-webui.tar.xz 1284144 BLAKE2B b84260974ce0827ce8ae834827c331a9bf70f589984975152188615aa480172cf41f4a45abc96fa13bfb7837ae1679bcff519f6aa7ab0678048b2cffbbe11afe SHA512 36331457c50e2a5d42269a5f91cd3e982c3f7dbfd0a2cfa4f8f435c253af6f075da6401b59a92e1949c683b4c5e899ef2f28bbd8a5cbeabcca8ef30816d75e73
-DIST vault-1.1.3.tar.gz 26026249 BLAKE2B a8fb531caf43f675d604f58126a7e56f7bf86defa2309d5d81d92911457efe5595b5c3244be4d0f73806ca5b746bddc852f871c10841da0e7ec128e53c6c18a4 SHA512 bf757558b984711967fdc623393e71c74d5e73922de3b0574ecb229a5d52320ebc3f848b48eabf0ed7a8d6e9d9f6c12d69fb23309fb8c19492b135344c8c4be2
 DIST vault-1.2.2-webui.tar.xz 1920136 BLAKE2B 81b90a0d796727c7523712ae50f85a24fa98b8b78c304d3ee50654e7f0ea1b3d58005abcbe55a15c3b496f5fce5701306ac57f0c6decc7ab8ae24ab12f5dd81d SHA512 b454e02e664190903b11bf0e3e465463182f3b7060efeb2c858127306869d731193102ba58398c28441d2be1a3956b88b2591aab1460047647742ba9dab5a00c
 DIST vault-1.2.2.tar.gz 27588019 BLAKE2B 5d989d1750a134f0c68e25ced7406ec8e7ae1d2233a1ece634e1487e4879af2d4a3e938aea1016d6872754f31ef19c85d04cd65e63f6547d7a5cf3cfa93ec208 SHA512 ce9211b3deb1839759646f8488fe2b89fec379bafed472921a62cd507f842ed05647fe4da7cb9482d195b028a29eb576f947da24aecd8b19181c7282fd3a155d
-EBUILD vault-0.11.5.ebuild 1620 BLAKE2B 7130a0a55407c092d96c3e22b216bdfab9d2e0168176539745afda5563808efbec06051adaa66fbf644a530ae91ac6f21fa7d58f78f57aab3f8b19dc65812399 SHA512 5d22bb29b0a7bffe7410af9b9cb07ab6957ca78aa0d82016341327eb739011799f330bc1f2eacc8d3509eb52f445ccb1f04ecb5332fd8d2601bfb2ba8d36486c
-EBUILD vault-1.0.2.ebuild 2177 BLAKE2B b0eca28eea305d1959990faa564907ba489d896e11be44c31a70a56b70e66666d7006d00ce5e652d028d15157178c16e7c8fab0b1962dfbefcecee3c9e494e60 SHA512 54b48f145821acc8dff09e5ed22070fdf7c3303e186de1c1721ee654e76a51025d041a1f45c3b3fde3f55a23b2f91cdf4b8d2ac94024fe266860faf4f04162a4
-EBUILD vault-1.1.0.ebuild 2177 BLAKE2B 089d6b0dc8be55d3abbabab1193fdb5debac444d39e52fa2ccae2e695d746b93b05705ab6f743f37eea505eabed5cb774c78df4a39caa46d926653a409f755b5 SHA512 98a453127a49429823e79544cdec581707623106002e2c0d402a9af64d585e57735c10d083699d3911f2e4f1794e99b48dd666d026f7abaad55b61015321fdde
-EBUILD vault-1.1.2-r1.ebuild 2177 BLAKE2B 089d6b0dc8be55d3abbabab1193fdb5debac444d39e52fa2ccae2e695d746b93b05705ab6f743f37eea505eabed5cb774c78df4a39caa46d926653a409f755b5 SHA512 98a453127a49429823e79544cdec581707623106002e2c0d402a9af64d585e57735c10d083699d3911f2e4f1794e99b48dd666d026f7abaad55b61015321fdde
-EBUILD vault-1.1.3.ebuild 2177 BLAKE2B 089d6b0dc8be55d3abbabab1193fdb5debac444d39e52fa2ccae2e695d746b93b05705ab6f743f37eea505eabed5cb774c78df4a39caa46d926653a409f755b5 SHA512 98a453127a49429823e79544cdec581707623106002e2c0d402a9af64d585e57735c10d083699d3911f2e4f1794e99b48dd666d026f7abaad55b61015321fdde
-EBUILD vault-1.2.2.ebuild 2314 BLAKE2B 30a0dfe3dd22cbd5319977028014a28ccceffd6cfb4191963814608b875ee0c7f0137dc4427b081f54c82975a733ffef01a12e19b2c1b6ed11fb5395565f10dc SHA512 ee0ee2bd0026ec3743d785e7b841b3a1da443081fb1e7a9cff0a27347c3e8b339e178355b43de03582a2e41dc6bad07cac56d3afad0a4034f3985377c5ea3523
+DIST vault-1.2.3-webui.tar.xz 1916848 BLAKE2B 503425336fac45645b837380dcf94be4bdbb3876b1408a6bbd6ccaca96fd93e47dd2fcaf9913a70cb69fc0c7c1c36a90680acb629be3d616fe77d95662d93ed0 SHA512 1e414143ea163dc021ffefba023ff827f8241db5c125c3aa5de407dc4ae476413d32bf3b150167ffb14026f07663a26f3ab62b142019758f751a4f115d438d87
+DIST vault-1.2.3.tar.gz 27773681 BLAKE2B 862b386c96e7d284c5b82a89dca5a0a8668a900a5b32758a472b5d7ea4ed995dce608dfda0398bcf15e703f21099ddc662abb585cca0e2d2f43a0863184e055c SHA512 9543e394f187cd9b06e88b64319504e07519041741650db3b7b905f1b34348ed7d9e22955ce2a456ffd2e06210e9e01b1a0ded459cde4840fbf5903ff6e21e75
+EBUILD vault-1.2.2.ebuild 2356 BLAKE2B 44b548555490725c9cdd4d94868a3a056a57e513f1cfca5c6a88b177dff71bcf2b0041e3cd9a4680d06671b87f784de6baeb86d51aca668120cd5b7769d209e7 SHA512 a8ac5a57df9e4994cce9ac55a720b2fe54dfa4ef076887d7068dfaa1dc70fbe611ece1ec6b25118979fac7a6aeea8875a4ecd46d57f953cfc5c34725c1701d25
+EBUILD vault-1.2.3.ebuild 2356 BLAKE2B 44b548555490725c9cdd4d94868a3a056a57e513f1cfca5c6a88b177dff71bcf2b0041e3cd9a4680d06671b87f784de6baeb86d51aca668120cd5b7769d209e7 SHA512 a8ac5a57df9e4994cce9ac55a720b2fe54dfa4ef076887d7068dfaa1dc70fbe611ece1ec6b25118979fac7a6aeea8875a4ecd46d57f953cfc5c34725c1701d25
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-0.11.5.ebuild b/app-admin/vault/vault-0.11.5.ebuild
deleted file mode 100644
index 52a7f68b449b..000000000000
--- a/app-admin/vault/vault-0.11.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.10:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i src/${EGO_PN}/scripts/build.sh || die
-	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export GOPATH=${S}
-	cd src/${EGO_PN} || die
-	# The fmt target may need to be executed if it was previously
-	# executed by an older version of go (bug 665438).
-	emake fmt
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-}
diff --git a/app-admin/vault/vault-1.0.2.ebuild b/app-admin/vault/vault-1.0.2.ebuild
deleted file mode 100644
index dd41276fb783..000000000000
--- a/app-admin/vault/vault-1.0.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
-IUSE="+webui"
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.10:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	if use webui; then
-		# The webui assets build has numerous nodejs dependencies,
-		# see https://github.com/hashicorp/vault/blob/master/ui/README.md
-		pushd "${S}/src/${EGO_PN}" >/dev/null || die
-		unpack "${VAULT_WEBUI_ARCHIVE}"
-		popd >/dev/null
-	fi
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i src/${EGO_PN}/scripts/build.sh || die
-	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export -n GOCACHE XDG_CACHE_HOME #678970
-	export GOBIN=${S}/bin GOPATH=${S}
-	cd src/${EGO_PN} || die
-	# The fmt target may need to be executed if it was previously
-	# executed by an older version of go (bug 665438).
-	emake fmt
-	BUILD_TAGS="$(usex webui ui '')" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-}
diff --git a/app-admin/vault/vault-1.1.0.ebuild b/app-admin/vault/vault-1.1.0.ebuild
deleted file mode 100644
index a8b0cbdb9a1d..000000000000
--- a/app-admin/vault/vault-1.1.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
-IUSE="+webui"
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.11:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	if use webui; then
-		# The webui assets build has numerous nodejs dependencies,
-		# see https://github.com/hashicorp/vault/blob/master/ui/README.md
-		pushd "${S}/src/${EGO_PN}" >/dev/null || die
-		unpack "${VAULT_WEBUI_ARCHIVE}"
-		popd >/dev/null
-	fi
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i src/${EGO_PN}/scripts/build.sh || die
-	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export -n GOCACHE XDG_CACHE_HOME #678970
-	export GOBIN=${S}/bin GOPATH=${S}
-	cd src/${EGO_PN} || die
-	# The fmt target may need to be executed if it was previously
-	# executed by an older version of go (bug 665438).
-	emake fmt
-	BUILD_TAGS="$(usex webui ui '')" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-}
diff --git a/app-admin/vault/vault-1.1.3.ebuild b/app-admin/vault/vault-1.1.3.ebuild
deleted file mode 100644
index a8b0cbdb9a1d..000000000000
--- a/app-admin/vault/vault-1.1.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
-IUSE="+webui"
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.11:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	if use webui; then
-		# The webui assets build has numerous nodejs dependencies,
-		# see https://github.com/hashicorp/vault/blob/master/ui/README.md
-		pushd "${S}/src/${EGO_PN}" >/dev/null || die
-		unpack "${VAULT_WEBUI_ARCHIVE}"
-		popd >/dev/null
-	fi
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i src/${EGO_PN}/scripts/build.sh || die
-	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export -n GOCACHE XDG_CACHE_HOME #678970
-	export GOBIN=${S}/bin GOPATH=${S}
-	cd src/${EGO_PN} || die
-	# The fmt target may need to be executed if it was previously
-	# executed by an older version of go (bug 665438).
-	emake fmt
-	BUILD_TAGS="$(usex webui ui '')" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-}
diff --git a/app-admin/vault/vault-1.2.2.ebuild b/app-admin/vault/vault-1.2.2.ebuild
index 851d2b1431fa..cda2c7eb5033 100644
--- a/app-admin/vault/vault-1.2.2.ebuild
+++ b/app-admin/vault/vault-1.2.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
 	)"
 SLOT="0"
-LICENSE="MPL-2.0"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 KEYWORDS="~amd64"
 IUSE="+webui"
 
diff --git a/app-admin/vault/vault-1.1.2-r1.ebuild b/app-admin/vault/vault-1.2.3.ebuild
index a8b0cbdb9a1d..cda2c7eb5033 100644
--- a/app-admin/vault/vault-1.1.2-r1.ebuild
+++ b/app-admin/vault/vault-1.2.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
 	)"
 SLOT="0"
-LICENSE="MPL-2.0"
+LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 KEYWORDS="~amd64"
 IUSE="+webui"
 
@@ -46,7 +46,12 @@ src_prepare() {
 		-e 's:^\(GIT_DIRTY=\).*:\1:' \
 		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
 		-i src/${EGO_PN}/scripts/build.sh || die
-	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
+	sed -e "/hooks/d" \
+		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
+		-i src/${EGO_PN}/Makefile || die
+
+	# Avoid network-sandbox violations since go-1.13
+	rm src/${EGO_PN}/go.mod || die
 }
 
 pkg_setup() {
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
deleted file mode 100644
index c0b96523c503..000000000000
--- a/app-admin/webmin/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX gentoo-setup 13727 BLAKE2B dca9dadd5775006f5bfbeee870723db8806a2236c984e2b4cec70031101f97fc5d4e1e1fd9219f27cdaa31ee860d247f71a01180b392154c16ca6554b1f73483 SHA512 fa6fde84eb9a16fea5d019fd920aed2a2f5dd51e5f32fa407fd1c424a0627eaafab7cd3b572a57e4f97e06ce5b6b5a7373ac377776a474a8512e077130eadc6e
-AUX init.d.webmin 2160 BLAKE2B b26d1e22ceb655d62e467a30501ddacf29c825c84ed926805f39861982ff829d119da03f45ec60fd3c35c17b12a06ca051e15fbd3e54e53cde5d84681d15f839 SHA512 9a8b11f1375be7ced1a402b97bb16b627c3459871722d52b2c471f36f103bcfe51a1598014905ac22072aff38e4baf25f53ad08b99dc3d367ce9851c489c1681
-AUX webmin.service 416 BLAKE2B aef00b0f948286c54736613e37f114e6ffd90453cc6eadc3afffe7fa114df4e6a8b91e4f02da6fdfaa3eb2f57254e5e6785b201d0461f28839742cc13d883816 SHA512 7cf86342db3d34cbe39b62fa768660ba7dd160d9c0d113ef6a3a176187fa0c72531bed38e3203cf627ab05c1ac4d9a8b9e829d1baa9739d63dfa74f09c445f1e
-DIST webmin-1.881-minimal.tar.gz 2827351 BLAKE2B b8ea9964147c09c91413fbdad3b6a0e5161497296bb33b614161e370ac1292ac9cdf752483835fb279aa70ba41eb09f2774d08caa58861049e467346ad0b64ff SHA512 5b855c5562a6eb6a8fd836e3bd1dcc30696b7f63776d0f8b5ee69f5e219c749210436315fe5fd8f811f4f19e02fe4d7d3cff451a831b085101081b97b8ce794d
-DIST webmin-1.881.tar.gz 28903876 BLAKE2B beaab3282ccbbe7716fe35e62ee93e64b636f420fa9235398954904b5e14888cdc4b0acd5126184dcdab59274d3e5b71a7997df3e73e18c55849b7197f024971 SHA512 eab1acb53aca5e947bb9fac1c08a32e9eeca2903bc19595fbc8e19895bda8f4c3432550c2a87cf8c2b577b223b97566b046b7c339bd8754266544f5777560cc7
-EBUILD webmin-1.881.ebuild 10425 BLAKE2B 81bf2acb05996ff6b601c5145bf2c1e1a55c0162c462e6fc70822ff400c8c63d1c5ec2305e231c20390ef327b4580b968f3329bd0b0b2594fc905c430b5f3e89 SHA512 a91a9acd44a690ae619a71823b8509868166d6bbb2cab7b75aee60e6391bfbdb6e2434f605ed0c9590053342b1a96227f55c387fcb350e3f50d986200d99c658
-MISC metadata.xml 245 BLAKE2B fb529d74f567dd37b9744ec3bfe3de132890694f483fcec456927b8edbdb0a7257fb39685079fe93cf8e8c52377bf87750dea764c98092dc8d6868b19d5dc7d9 SHA512 eb79433135fa9654e593b79830b2a34d158af83164c3f77c2b46950924ade8d03687ff26bb856e49c1e02bb33753c9771380480768ded4983d330f3e25f7c28a
diff --git a/app-admin/webmin/files/gentoo-setup b/app-admin/webmin/files/gentoo-setup
deleted file mode 100644
index 680dfbb5303b..000000000000
--- a/app-admin/webmin/files/gentoo-setup
+++ /dev/null
@@ -1,438 +0,0 @@
-#!/bin/sh
-# gentoo-setup.sh
-#
-# Version 1.2
-#
-# A modified original Webmin setup.sh script to comply with Gentoo specifics
-#
-# Modification done by: PhobosK <phobosk@kbfx.net>
-#
-# This script runs after the webmin archive is installed, and in the pkg_config() phase.
-# It does setup the various config files of Webmin depending on if it is
-# a new install, an upgrade or a reset.
-
-LANG=
-export LANG
-
-if [ -z ${wadir} ]; then
-	echo "You can't run this script outside of the 'emerge --config app-admin/webmin' command."
-	exit 1
-fi
-
-# All things we do is from the Webmin install dir - $wadir
-cd $wadir
-
-
-# Are we hard resetting everything?
-# If yes, we do:
-# 1. Run the specific Webmin $wadir/run-uninstalls.pl
-#	 It runs all uninstall.pl files in every module's folder.
-#	 They delete all the set specific Webmin cron jobs.
-#	 If bumping you should go through these files using the command:
-#	 find . -name uninstall.pl -exec cat {} \; -print
-# 2. Delete the whole /etc/webmin content, keeping only the gentoo .keep_* files
-if [ "$reset" = "hard" ]; then
-	echo "Running Webmin's specific uninstall procedures.. (Please ignore any possible errors)"
-	(WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir LANG= "$wadir/run-uninstalls.pl")
-	echo "..done"
-	echo ""
-
-	echo "Deleting the content of user's config folder: $config_dir .."
-	find $config_dir ! -name '.keep_*' -delete 2>/dev/null
-	echo "..done"
-	echo ""
-fi
-
-
-# Are we soft resetting?
-# If yes we do:
-# - Delete the $config_dir/config file so we get new config values
-if [ "$reset" = "soft" ]; then
-	echo "Deleting the user's $config_dir/config file.."
-	if [ -f "$config_dir/config" ]; then
-		rm -f "$config_dir/config"
-	fi
-	echo "..done"
-	echo ""
-fi
-
-
-# Get all available modules of this version
-allmods=`echo */module.info | sed -e 's/\/module.info//g'`
-
-# Get current Webmin version
-ver=`cat "$wadir/version"`
-
-if [ -r "$config_dir/config" ]; then
-	upgrading=1
-fi
-
-
-# Check if upgrading from an old version
-if [ "$upgrading" = 1 ]; then
-	echo "Updating existant Webmin's config files.."
-
-	# Get current var path
-	if [ -r "$config_dir/var-path" ]; then
-		_var_dir=`cat $config_dir/var-path`
-		if [ -n ${_var_dir} ]; then
-			var_dir=${_var_dir}
-		fi
-	fi
-
-	# Get current perl path
-	if [ -r "$config_dir/perl-path" ]; then
-		_perl=`cat $config_dir/perl-path`
-		if [ -n ${_perl} ]; then
-			perl=${_perl}
-		fi
-	fi
-
-	# Get old os name and version
-	os_type=`grep "^os_type=" $config_dir/config | sed -e 's/os_type=//g'`
-	os_version=`grep "^os_version=" $config_dir/config | sed -e 's/os_version=//g'`
-	real_os_type=`grep "^real_os_type=" $config_dir/config | sed -e 's/real_os_type=//g'`
-	real_os_version=`grep "^real_os_version=" $config_dir/config | sed -e 's/real_os_version=//g'`
-
-	# Get port, ssl, no_ssl2, no_ssl3, ssl_redirect, no_sslcompression, ssl_honorcipherorder, no_tls1, no_tls1_1 and keyfile
-	port=`grep "^port=" $config_dir/miniserv.conf | sed -e 's/port=//g'`
-	ssl=`grep "^ssl=" $config_dir/miniserv.conf | sed -e 's/ssl=//g'`
-	no_ssl2=`grep "^no_ssl2=" $config_dir/miniserv.conf | sed -e 's/no_ssl2=//g'`
-	no_ssl3=`grep "^no_ssl3=" $config_dir/miniserv.conf | sed -e 's/no_ssl3=//g'`
-	ssl_redirect=`grep "^ssl_redirect=" $config_dir/miniserv.conf | sed -e 's/ssl_redirect=//g'`
-	ssl_honorcipherorder=`grep "^ssl_honorcipherorder=" $config_dir/miniserv.conf | sed -e 's/ssl_honorcipherorder=//g'`
-	no_sslcompression=`grep "^no_sslcompression=" $config_dir/miniserv.conf | sed -e 's/no_sslcompression=//g'`
-	no_tls1=`grep "^no_tls1=" $config_dir/miniserv.conf | sed -e 's/no_tls1=//g'`
-	no_tls1_1=`grep "^no_tls1_1=" $config_dir/miniserv.conf | sed -e 's/no_tls1_1=//g'`
-	keyfile=`grep "^keyfile=" $config_dir/miniserv.conf | sed -e 's/keyfile=//g'`
-
-	# Update ACLs
-	$perl "$wadir/newmods.pl" $config_dir $allmods
-
-	# Update miniserv.conf with new root directory, mime types file and server info
-	grep -v "^root=" $config_dir/miniserv.conf | grep -v "^mimetypes=" | grep -v "^server=" >$tempdir/$$.miniserv.conf
-	mv $tempdir/$$.miniserv.conf $config_dir/miniserv.conf
-	echo "root=$wadir" >> $config_dir/miniserv.conf
-	echo "mimetypes=$wadir/mime.types" >> $config_dir/miniserv.conf
-	echo "server=MiniServ/$ver" >> $config_dir/miniserv.conf
-	grep logout= $config_dir/miniserv.conf >/dev/null
-	if [ $? != "0" ]; then
-		echo "logout=$config_dir/logout-flag" >> $config_dir/miniserv.conf
-	fi
-
-	# Remove old cache of module infos
-	rm -f $config_dir/module.infos.cache
-	echo "..done"
-	echo ""
-else
-	# Create webserver's new config files
-	echo "Creating Webmin's new config files.."
-
-	echo $perl > $config_dir/perl-path
-	echo $var_dir > $config_dir/var-path
-
-	# Create a totally new conf file
-	cfile=$config_dir/miniserv.conf
-	echo "port=$port" > $cfile
-	echo "root=$wadir" >> $cfile
-	echo "mimetypes=$wadir/mime.types" >> $cfile
-	echo "addtype_cgi=internal/cgi" >> $cfile
-	echo "realm=Webmin Server" >> $cfile
-	echo "logfile=$var_dir/miniserv.log" >> $cfile
-	echo "errorlog=$var_dir/miniserv.error" >> $cfile
-	echo "pidfile=$pidfile" >> $cfile
-	echo "logtime=168" >> $cfile
-	echo "ppath=$ppath" >> $cfile
-	echo "ssl=$ssl" >> $cfile
-	echo "no_ssl2=$no_ssl2" >> $cfile
-	echo "no_ssl3=$no_ssl3" >> $cfile
-	echo "ssl_redirect=$ssl_redirect" >> $cfile
-	echo "ssl_honorcipherorder=$ssl_honorcipherorder" >> $cfile
-	echo "no_sslcompression=$no_sslcompression" >> $cfile
-	echo "no_tls1=$no_tls1" >> $cfile
-	echo "no_tls1_1=$no_tls1_1" >> $cfile
-	echo "keyfile=$keyfile" >> $cfile
-	echo "env_WEBMIN_CONFIG=$config_dir" >> $cfile
-	echo "env_WEBMIN_VAR=$var_dir" >> $cfile
-	echo "atboot=$atboot" >> $cfile
-	echo "logout=$config_dir/logout-flag" >> $cfile
-	echo "listen=10000" >> $cfile
-	echo "denyfile=\\.pl\$" >> $cfile
-	echo "log=1" >> $cfile
-	echo "blockhost_failures=5" >> $cfile
-	echo "blockhost_time=60" >> $cfile
-	echo "syslog=1" >> $cfile
-	echo "session=1" >> $cfile
-	echo "premodules=WebminCore" >> $cfile
-	echo "server=MiniServ/$ver" >> $cfile
-
-	# Append package-specific info to config file.
-	# miniserv-conf can be created by upstream or by us in src_install phase (see there).
-	if [ -f "$wadir/miniserv-conf" ]; then
-		cat "$wadir/miniserv-conf" >>$cfile
-	fi
-
-	# Create the default user allowed to login - root only
-	login="root"
-
-	if [ -r /etc/shadow ]; then
-		#crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
-		crypt=x
-	else
-		crypt=`grep "^root:" /etc/passwd | cut -f 2 -d :`
-	fi
-
-	ufile=$config_dir/miniserv.users
-	echo "$login:$crypt:0" > $ufile
-	chmod 600 $ufile
-
-
-	echo "userfile=$ufile" >> $cfile
-	chmod 600 $cfile
-	echo "..done"
-	echo ""
-
-	echo "Creating access control file.."
-	afile=$config_dir/webmin.acl
-	echo "$login: $allmods" > $afile
-	chmod 600 $afile
-	echo "..done"
-	echo ""
-fi
-
-
-# Create start, stop, restart and reload Gentoo compliant Webmin scripts
-# We use sys-apps/openrc functions which is already pulled by sys-apps/baselayout
-# or systemctl if we run under systemd
-echo "Creating start and stop scripts.."
-rm -f $config_dir/{start,stop,restart,reload}
-
-# The start script in /etc/webmin (Gentoo compliant)
-cat <<END >>"$config_dir/start"
-#!/bin/sh
-
-if [ ! -f "${pidfile}" ]; then
-	if [[ -d /run/systemd/system ]] ; then
-		systemctl start webmin.service
-	else
-		rc-service --ifexists -- webmin start
-	fi
-fi
-END
-
-# The stop script in /etc/webmin (Gentoo compliant)
-cat <<END >>"$config_dir/stop"
-#!/bin/sh
-
-if [[ -d /run/systemd/system ]] ; then
-	systemctl stop webmin.service
-else
-	rc-service --ifexists -- webmin --ifstarted stop
-fi
-END
-
-# The restart script in /etc/webmin (Gentoo compliant)
-cat <<END >>"$config_dir/restart"
-#!/bin/sh
-
-if [[ -d /run/systemd/system ]] ; then
-	systemctl try-restart webmin.service
-else
-	rc-service --ifexists -- webmin --ifstarted restart
-fi
-END
-
-# The reload script in /etc/webmin (Gentoo compliant)
-cat <<END >>"$config_dir/reload"
-#!/bin/sh
-
-if [[ -d /run/systemd/system ]] ; then
-	systemctl reload-or-try-restart webmin.service
-else
-	rc-service --ifexists -- webmin --ifstarted reload
-fi
-END
-
-chmod 755 $config_dir/{start,stop,restart,reload}
-echo "..done"
-echo ""
-
-
-if [ "$upgrading" = 1 ]; then
-	echo "Updating other config files.."
-else
-	echo "Copying other config files.."
-fi
-
-# This just copies and merges the Webmin's release config files, with user's in the /etc/webmin folder
-newmods=`$perl "$wadir/copyconfig.pl" "$os_type/$real_os_type" "$os_version/$real_os_version" "$wadir" $config_dir "" $allmods`
-if [ "$upgrading" != 1 ]; then
-	# Store the OS and version
-	echo "os_type=$os_type" >> $config_dir/config
-	echo "os_version=$os_version" >> $config_dir/config
-	echo "real_os_type=$real_os_type" >> $config_dir/config
-	echo "real_os_version=$real_os_version" >> $config_dir/config
-
-	# Turn on logging by default
-	echo "log=1" >> $config_dir/config
-
-	# Disallow unknown referers by default
-	echo "referers_none=1" >>$config_dir/config
-else
-	# one-off hack to set log variable in config from miniserv.conf
-	grep log= $config_dir/config >/dev/null
-	if [ "$?" = "1" ]; then
-		grep log= $config_dir/miniserv.conf >> $config_dir/config
-		grep logtime= $config_dir/miniserv.conf >> $config_dir/config
-		grep logclear= $config_dir/miniserv.conf >> $config_dir/config
-	fi
-
-	# Disallow unknown referers if not set
-	grep referers_none= $config_dir/config >/dev/null
-	if [ "$?" != "0" ]; then
-		echo "referers_none=1" >>$config_dir/config
-	fi
-fi
-echo $ver > $config_dir/version
-echo "..done"
-echo ""
-
-# Set passwd_ fields in miniserv.conf from global config
-for field in passwd_file passwd_uindex passwd_pindex passwd_cindex passwd_mindex; do
-	grep $field= $config_dir/miniserv.conf >/dev/null
-	if [ "$?" != "0" ]; then
-		grep $field= $config_dir/config >> $config_dir/miniserv.conf
-	fi
-done
-grep passwd_mode= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
-	echo passwd_mode=0 >> $config_dir/miniserv.conf
-fi
-
-grep ssl_honorcipherorder= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
-	echo ssl_honorcipherorder=1 >> $config_dir/miniserv.conf
-fi
-
-# Disable SSL compression to defeat BEAST attack
-grep no_sslcompression= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
-	echo no_sslcompression=1 >> $config_dir/miniserv.conf
-fi
-
-# Tighten SSL security
-grep no_ssl2= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
-	echo no_ssl2=1 >> $config_dir/miniserv.conf
-fi
-
-grep no_ssl3= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
-	echo no_ssl3=1 >> $config_dir/miniserv.conf
-fi
-
-grep no_tls1= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
-    echo no_tls1=1 >> $config_dir/miniserv.conf
-fi
-
-grep no_tls1_1= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
-    echo no_tls1_1=1 >> $config_dir/miniserv.conf
-fi
-
-# Make Perl crypt MD5 the default
-grep md5pass= $config_dir/config >/dev/null
-if [ "$?" != "0" ]; then
-	echo md5pass=1 >> $config_dir/config
-fi
-
-# Set a special theme if none was set before
-if [ "$theme" = "" ]; then
-	theme=`cat "$wadir/defaulttheme" 2>/dev/null`
-fi
-oldthemeline=`grep "^theme=" $config_dir/config`
-oldtheme=`echo $oldthemeline | sed -e 's/theme=//g'`
-if [ "$theme" != "" ] && [ "$oldthemeline" = "" ] && [ -d "$wadir/$theme" ]; then
-	themelist=$theme
-fi
-
-# Set a special overlay if none was set before
-if [ "$overlay" = "" ]; then
-	overlay=`cat "$wadir/defaultoverlay" 2>/dev/null`
-fi
-if [ "$overlay" != "" ] && [ "$theme" != "" ] && [ -d "$wadir/$overlay" ]; then
-	themelist="$themelist $overlay"
-fi
-
-# Apply the theme and maybe overlay
-if [ "$themelist" != "" ]; then
-	echo "theme=$themelist" >> $config_dir/config
-	echo "preroot=$themelist" >> $config_dir/miniserv.conf
-fi
-
-# If the old blue-theme is still in use, change it (new in 1.730)
-oldtheme=`grep "^theme=" $config_dir/config | sed -e 's/theme=//g'`
-if [ "$oldtheme" = "blue-theme" ]; then
-   sed -i -e 's/theme=blue-theme/theme=gray-theme/g' $config_dir/config
-   sed -i -e 's/preroot=blue-theme/preroot=gray-theme/g' $config_dir/miniserv.conf
-fi
-
-# Set the product field in the global config
-grep product= $config_dir/config >/dev/null
-if [ "$?" != "0" ]; then
-	echo product=webmin >> $config_dir/config
-fi
-
-# If password delays are not specifically disabled, enable them
-grep passdelay= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
-	echo passdelay=1 >> $config_dir/miniserv.conf
-fi
-
-
-echo "Changing ownership and permissions.."
-# Make all config dirs non-world-readable
-for m in $newmods; do
-	chown -R root:root $config_dir/$m
-	chmod -R og-rw $config_dir/$m
-done
-
-# Make miniserv config files non-world-readable
-for f in miniserv.conf miniserv.users; do
-	chown -R root:root $config_dir/$f
-	chmod -R og-rw $config_dir/$f
-done
-chmod +r $config_dir/version
-
-# Fix up bad permissions from some older installs
-for m in ldap-client ldap-server ldap-useradmin mailboxes mysql postgresql servers virtual-server; do
-	if [ -d "$config_dir/$m" ]; then
-		chown root:root $config_dir/$m
-		chmod og-rw $config_dir/$m
-		chmod og-rw $config_dir/$m/config 2>/dev/null
-	fi
-done
-echo "..done"
-echo ""
-
-
-# This executes all postinstall.pl for every module
-# If you do bump, you should look at the specific changes they do with this command in root folder:
-# find . -name postinstall.pl -exec cat {} \; -print
-# Generally they are safe to run 'cause they change only user's config in /etc/webmin
-# or setup some cron jobs
-if [ "$nopostinstall" = "" ]; then
-	echo "Running postinstall scripts.. (Please ignore any possible errors)"
-	(cd "$wadir" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir "$wadir/run-postinstalls.pl")
-	echo "..done"
-	echo ""
-fi
-
-# Enable background collection
-if [ "$upgrading" != 1 -a -r $config_dir/system-status/enable-collection.pl ]; then
-	echo "Enabling background status collection.. (Please ignore any possible errors)"
-	$config_dir/system-status/enable-collection.pl 5
-	echo "..done"
-	echo ""
-fi
diff --git a/app-admin/webmin/files/init.d.webmin b/app-admin/webmin/files/init.d.webmin
deleted file mode 100644
index 0c9dcc08831a..000000000000
--- a/app-admin/webmin/files/init.d.webmin
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-
-# We do not give a choice to user for configuring these 'cause it will mess up
-# Webmin's configuration
-WEBMIN_EXE="%exe%"
-WEBMIN_PID="%pid%"
-WEBMIN_CONF="%conf%"
-WEBMIN_CONFIG="%config%"
-
-extra_started_commands="reload"
-
-depend() {
-	use net logger
-}
-
-checkconfig() {
-	# Check if Webmin setup has been done
-	if [ ! -f ${WEBMIN_CONFIG} ]; then
-		eerror "Error in Webmin's configuration. The ${WEBMIN_CONFIG} is not present."
-		eerror "Please run 'emerge --config app-admin/webmin' to fix this."
-		return 1
-	fi
-
-	# Check if ssl cert is present
-	local key ssl
-	key=`grep "^keyfile=" ${WEBMIN_CONF} | sed -e 's/keyfile=//g'`
-	ssl=`grep "^ssl=" ${WEBMIN_CONF} | sed -e 's/ssl=//g'`
-
-	if [ ! -f "${key}" ] ; then
-		if [ "${ssl}" = "0" ]; then
-			ewarn "Your SSL certificate is not present."
-			ewarn "Please either fix the path in the 'keyfile=' option of your ${WEBMIN_CONF}"
-			ewarn "OR run 'emerge --config app-admin/webmin'"
-		else
-			eerror "Error in Webmin's configuration. No SSL certificate is present."
-			eerror "Please either fix the path in the 'keyfile=' option of your ${WEBMIN_CONF}"
-			eerror "OR change the 'ssl=' option of your ${WEBMIN_CONF} to 'ssl=0'"
-			eerror "OR run 'emerge --config app-admin/webmin'"
-			return 1
-		fi
-	fi
-
-	return 0
-}
-
-reload() {
-	if [ ! -f "${WEBMIN_PID}" ]; then
-		eerror "Webmin is not running"
-		return 1
-	fi
-
-	checkconfig || return 1
-
-	ebegin "Reloading Webmin's configuration files"
-	start-stop-daemon --signal USR1 --pidfile "$WEBMIN_PID"
-	eend $?
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting Webmin"
-
-	start-stop-daemon --start --background --interpreted \
-		--env LANG= \
-		--env PERLLIB="%perllib%" \
-		--exec "$WEBMIN_EXE" \
-		--pidfile "$WEBMIN_PID" \
-		-- "$WEBMIN_CONF"
-	eend $?
-	# Leave time to spawn, so no stop is received while spawning
-	sleep 3
-}
-
-stop() {
-	ebegin "Stopping Webmin"
-	start-stop-daemon --stop  --interpreted --quiet \
-		--exec "$WEBMIN_EXE" \
-		--pidfile "$WEBMIN_PID"
-	eend $?
-	# Leave time to stop because of the scripts that use this
-	sleep 3
-}
diff --git a/app-admin/webmin/files/webmin.service b/app-admin/webmin/files/webmin.service
deleted file mode 100644
index 5bec85b97c8c..000000000000
--- a/app-admin/webmin/files/webmin.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Webmin Administration Tool
-After=network.target remote-fs.target nss-lookup.target
-ConditionFileNotEmpty=%config%
-ConditionFileNotEmpty=%conf%
-
-[Service]
-RemainAfterExit=yes
-KillMode=mixed
-# Webmin is exiting with 1 on SIGTERM
-SuccessExitStatus=1
-ExecStart=%exe% %conf%
-PIDFile=%pid%
-Environment="PERLLIB=%perllib%" LANG= 
-ExecReload=/bin/kill -USR1 $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/webmin/metadata.xml b/app-admin/webmin/metadata.xml
deleted file mode 100644
index e12b2ca96ebf..000000000000
--- a/app-admin/webmin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">webadmin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/webmin/webmin-1.881.ebuild b/app-admin/webmin/webmin-1.881.ebuild
deleted file mode 100644
index 28d8074d3a83..000000000000
--- a/app-admin/webmin/webmin-1.881.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit pam ssl-cert systemd
-
-DESCRIPTION="A web-based Unix systems administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
-	!minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
-# because openssl is forced by dev-perl/Net-SSLeay
-IUSE="minimal +ssl mysql postgres ldap"
-REQUIRED_USE="minimal? ( !mysql !postgres !ldap )"
-
-# All the required perl modules can be found easily using (in Webmin's root src dir):
-# find . -name cpan_modules.pl -exec grep "::" {} \;
-# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
-# to install them using the in-built cpan module, and this will mess up perl on the system
-# That's why some modules are forced without a use flag
-# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
-DEPEND="virtual/perl-MIME-Base64
-	virtual/perl-Socket
-	virtual/perl-Sys-Syslog
-	virtual/perl-Time-HiRes
-	virtual/perl-Time-Local
-	dev-perl/Authen-Libwrap
-	dev-perl/IO-Tty
-	dev-perl/MD5
-	dev-perl/Net-SSLeay
-	dev-perl/Authen-PAM
-	dev-perl/Sys-Hostname-Long
-	>=net-dns/dnssec-tools-1.13
-	!minimal? (
-		mysql? ( dev-perl/DBD-mysql )
-		postgres? ( dev-perl/DBD-Pg )
-		ldap? ( dev-perl/perl-ldap )
-		dev-perl/XML-Generator
-		dev-perl/XML-Parser
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	local perl="$( which perl )"
-
-	# Remove the unnecessary and incompatible files
-	rm -rf acl/Authen-SolarisRBAC-0.1*
-	if ! use minimal ; then
-		rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
-		rm -f mount/{free,net,open}bsd-mounts*
-		rm -f mount/macos-mounts*
-	fi
-
-	# For security reasons remove the SSL certificate that comes with Webmin
-	# We will create our own later
-	rm -f miniserv.pem
-
-	# Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
-	# We will use our own later
-	rm -f setup.{sh,pl}
-
-	# Set the installation type/mode to Gentoo
-	echo "gentoo" > install-type
-
-	# Fix the permissions of the install files
-	chmod -R og-w "${S}"
-
-	# Since we should not modify any files after install
-	# we set the perl path in all cgi and pl files here using Webmin's routines
-	# The pl file is Prefix safe and works only on provided input, no other filesystem files
-	ebegin "Fixing perl path in source files"
-	(find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
-	eend $?
-}
-
-src_install() {
-	# Create config dir and keep
-	diropts -m0755
-	dodir /etc/webmin
-	keepdir /etc/webmin
-
-	# Create install dir
-	# Third party modules installed through Webmin go here too, so keep
-	dodir /usr/libexec/webmin
-	keepdir /usr/libexec/webmin
-
-	# Copy our own setup script to installation folder
-	insinto /usr/libexec/webmin
-	newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
-	fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
-
-	# This is here if we ever want in future ebuilds to add some specific
-	# config values in the /etc/webmin/miniserv.conf
-	# The format of this file should be the same as the one of miniserv.conf:
-	# var=value
-	#
-	# Uncomment it if you use such file. Before that check if upstream
-	# has this file in root dir too.
-	#newins "${FILESDIR}/miniserv-conf" miniserv-conf
-
-	# Create the log dir and keep
-	diropts -m0700
-	dodir /var/log/webmin
-	keepdir /var/log/webmin
-
-	# Create the init.d file and put the neccessary variables there
-	newinitd "${FILESDIR}"/init.d.webmin webmin
-	sed -i \
-		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
-		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
-		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
-		-e "s:%config%:${EROOT}etc/webmin/config:" \
-		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
-		"${ED}etc/init.d/webmin" \
-		|| die "Failed to patch the webmin init file"
-
-	# Create the systemd service file and put the neccessary variables there
-	systemd_newunit "${FILESDIR}"/webmin.service webmin.service
-	sed -i \
-		-e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
-		-e "s:%pid%:${EROOT}var/run/webmin.pid:" \
-		-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
-		-e "s:%config%:${EROOT}etc/webmin/config:" \
-		-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
-		"${ED}$(_systemd_get_systemunitdir)/webmin.service" \
-		|| die "Failed to patch the webmin systemd service file"
-
-	# Setup pam
-	pamd_mimic system-auth webmin auth account session
-
-	# Copy files to installation folder
-	ebegin "Copying install files to destination"
-	cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
-	eend $?
-}
-
-pkg_preinst() {
-	# First stop service if running so Webmin to not messup our config
-	ebegin "Stopping any running Webmin instance prior merging"
-	if systemd_is_booted ; then
-		systemctl stop webmin.service 2>/dev/null
-	else
-		rc-service --ifexists -- webmin --ifstarted stop
-	fi
-	eend $?
-}
-
-pkg_postinst() {
-	# Run webmin_config first - non interactively
-	export INTERACTIVE="no"
-	webmin_config
-	# Every next time webmin_config should be interactive
-	INTERACTIVE="yes"
-
-	ewarn
-	ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
-	ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
-	ewarn "To avoid problems, please before using any module, look at its configuration options first."
-	ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
-	ewarn
-	if systemd_is_booted ; then
-		elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'"
-	else
-		elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
-	fi
-	elog "- The default URL to connect to Webmin is: https://localhost:10000"
-	elog "- The default user that can login is: root"
-	elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
-}
-
-pkg_prerm() {
-	# First stop service if running - we do not want Webmin to mess up config
-	ebegin "Stopping any running Webmin instance prior unmerging"
-	if systemd_is_booted ; then
-		systemctl stop webmin.service 2>/dev/null
-	else
-		rc-service --ifexists -- webmin --ifstarted stop
-	fi
-	eend $?
-}
-
-pkg_postrm() {
-	# If removing webmin completely, remind the user for the Webmin's own cron jobs.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		ewarn
-		ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
-		ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
-		ewarn "To fix this just disable them if you intend to use Webmin again,"
-		ewarn "OR delete them if not."
-		ewarn
-	fi
-}
-
-pkg_config(){
-	webmin_config
-}
-
-webmin_config(){
-	# First stop service if running
-	ebegin "Stopping any running Webmin instance"
-	if systemd_is_booted ; then
-		systemctl stop webmin.service 2>/dev/null
-	else
-		rc-service --ifexists -- webmin --ifstarted stop
-	fi
-	eend $?
-
-	# Next set the default reset variable to 'none'
-	# reset/_reset can be:
-	# 'none' - does not reset anything, just upgrades if a conf is present
-	#		   OR installs new conf if a conf is missing
-	# 'soft' - deletes only $config_dir/config file and thus resetting most
-	#		  conf values to their defaults. Keeps the specific Webmin cron jobs
-	# 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
-	#		  and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
-	local _reset="none"
-
-	# If in interactive mode ask user what should we do
-	if [[ "${INTERACTIVE}" = "yes" ]]; then
-		einfo
-		einfo "Please enter the number of the action you would like to perform?"
-		einfo
-		einfo "1. Update configuration"
-		einfo "   (keeps old config options and adds the new ones)"
-		einfo "2. Soft reset configuration"
-		einfo "   (keeps some old config options, the other options are set to default)"
-		ewarn "   All Webmin users will be reset"
-		einfo "3. Hard reset configuration"
-		einfo "   (all options including module options are set to default)"
-		ewarn "   You will lose all Webmin configuration options you have done till now"
-		einfo "4. Exit this configuration utility (default)"
-		while [ "$correct" != "true" ] ; do
-			read answer
-			if [[ "$answer" = "1" ]] ; then
-				_reset="none"
-				correct="true"
-			elif [[ "$answer" = "2" ]] ; then
-				_reset="soft"
-				correct="true"
-			elif  [[ "$answer" = "3" ]] ; then
-				_reset="hard"
-				correct="true"
-			elif  [ "$answer" = "4" -o "$answer" = "" ] ; then
-				die "User aborted configuration."
-			else
-				echo "Answer not recognized. Enter a number from 1 to 4"
-			fi
-		done
-
-		if [[ "$_reset" = "hard" ]]; then
-			while [ "$sure" != "true" ] ; do
-				ewarn "You will lose all Webmin configuration options you have done till now."
-				ewarn "Are you sure you want to do this? (y/n)"
-				read answer
-				if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-					sure="true"
-				elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-					die "User aborted configuration."
-				else
-					echo "Answer not recognized. Enter 'y' or 'n'"
-				fi
-			done
-		fi
-	fi
-
-	export reset=$_reset
-
-	# Create ssl certificate for Webmin if there is not one in the proper place
-	if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
-		SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
-		install_cert "${EROOT}/etc/ssl/webmin/server"
-	fi
-
-	# Ensure all paths passed to the setup script use EROOT
-	export wadir="${EROOT}usr/libexec/webmin"
-	export config_dir="${EROOT}etc/webmin"
-	export var_dir="${EROOT}var/log/webmin"
-	export tempdir="${T}"
-	export pidfile="${EROOT}var/run/webmin.pid"
-	export perl="$( which perl )"
-	export os_type='gentoo-linux'
-	export os_version='*'
-	export real_os_type='Gentoo Linux'
-	export real_os_version='Any version'
-	# Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression',
-	# 'ssl_honorcipherorder', 'no_tls1' and 'no_tls1_1' for tightening security
-	export ssl=1
-	export no_ssl2=1
-	export no_ssl3=1
-	export ssl_redirect=1
-	export ssl_honorcipherorder=1
-	export no_sslcompression=1
-	export no_tls1=1
-	export no_tls1_1=1
-	export keyfile="${EROOT}etc/ssl/webmin/server.pem"
-	export port=10000
-
-	export atboot=0
-
-	einfo "Executing Webmin's configure script"
-	$wadir/gentoo-setup.sh
-
-	einfo "Configuration of Webmin done"
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-09-25 19:33:39 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-09-25 19:33:39 +0100
commit	a5b65c81168c90928784a1e92cda84ed5d6b9eb3 (patch)
tree	4aa7483cd0ad7de54338afc8e7971417abe1dd81 /app-admin
parent	e8f81810baa21f490d6910e8e2d424546b72a333 (diff)