gentoo resync : 28.09.2019

23 files changed, 190 insertions, 381 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index ed4cc60de16a..77c833fd4a8f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk-extra-sounds/Manifest b/net-misc/asterisk-extra-sounds/Manifest
index 11d378cafdb0..50c044ef8cf5 100644
--- a/net-misc/asterisk-extra-sounds/Manifest
+++ b/net-misc/asterisk-extra-sounds/Manifest
@@ -16,5 +16,6 @@ DIST asterisk-extra-sounds-fr-siren7-1.4.11.tar.gz 7128320 BLAKE2B cfc9b2fb2734d
 DIST asterisk-extra-sounds-fr-sln16-1.4.11.tar.gz 48517491 BLAKE2B 80b6e4da30b5e2c65c48c81bfa44cd14bff3eb19fbb3d6385dbe7fbca7e39a881154f6c1fa839360874c65f6e4916ef9574006041ef0f68ee9245c7340d1e46e SHA512 f8b0a1eebd93fdda707846dc73d30418462a07572962cbe822eb11ed5c2ce7741b185b0e4abd05c47d0c2c53e817c47b3c493d94e92e50848c7a270e87e9a586
 DIST asterisk-extra-sounds-fr-ulaw-1.4.11.tar.gz 11818928 BLAKE2B e6669c4b041e96fda7beed7de4af3ad876c28419e639b4d45797c00272ac03fb71ce23cd584aca480e203e37585a1e793e42514f83341a745e4111ed49bdba54 SHA512 34ba851729186250a3fc459b685c0a4d475e32820e4a49b3a1b2c038e0252a71a0637e1bfd67e0bd4960cb90ec24f8cb28435a049fcc91f7b3ed4f0f1009b0ab
 DIST asterisk-extra-sounds-fr-wav-1.4.11.tar.gz 23829634 BLAKE2B 8d45ecaa92673599430a9d652e4965cf1d7d8557bbcc07d49238e21a22b7dbf35fc1bf41f66c35df298bdd2af189a3f63dc3aab7df43961003a0cd42fd8f19fc SHA512 4482f7a95fcd5b43ead86e877e4df88d017ea003bbe56c4813fe6814956fb015d4359bd1257513b34c3d80ac171472c0749e534ede6ab9aecf42a589ad76c0ba
+EBUILD asterisk-extra-sounds-1.4.11-r1.ebuild 1422 BLAKE2B 1a7b35f6f6537576fa40ecc0ce27b534c78411a739fd532e86a1c428927c5d7973df7dd0a983f3916f08e5bc556355922b33528c5a107f0268f9bd94fb4cfa42 SHA512 07f1afe48c9a934ce9d12c5f2274212d9a580767f01cd3c757473343e8b31fd9d69870085043ec7e6208870fbffdeaa7d85937d429039d02cfbdbe1eb23eb63d
 EBUILD asterisk-extra-sounds-1.4.11.ebuild 1776 BLAKE2B 3a0177d12cea37b08e56cb20a27f8db13d1332a4b837c9645dfb9076f48635075c0dc03e1788d80a4ebe208459800cc5cd24cadcbb508539779a75e830bd7e5e SHA512 9cb8c04f6213fb16d84d54f6247fcd9c94850a1a4c002668bd21d46ec8749a5c444bea028364ce8fd3dba87080a779d538be1de0acac9f298b9a041a2b95cd80
 MISC metadata.xml 917 BLAKE2B 267b110b5ef3fea60a4fba48147dc7d47897f0b5854039df6e8a47f3c2ce3ddb94f832926b28853caa6fa3e6dbfd0182cd63cf07c4377e796b9ad467ccec1ff8 SHA512 834aff23b944bdd2ad940458323fee9db3e4b9cf3b2e83265bc59a1c7a1b9d992c244b834fbf465a1f3d135470741b27dfa150193f9371519e19d8550a86742a
diff --git a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11-r1.ebuild b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11-r1.ebuild
new file mode 100644
index 000000000000..4ec2a9e70bcc
--- /dev/null
+++ b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Extra sounds for asterisk"
+HOMEPAGE="http://www.asterisk.org/"
+MY_L10N=(^en fr) # ^ is used to indicate to the loops below to NOT set this as an optional
+CODECS=(alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav)
+
+SRC_URI=""
+IUSE="${CODECS[*]}"
+REQUIRED_USE="|| ( ${CODECS[*]#+} )"
+for l in "${MY_L10N[@]}"; do
+	[[ ${l} != ^* ]] && IUSE+=" l10n_${l}" && SRC_URI+=" l10n_${l}? ("
+	for c in "${CODECS[@]}"; do
+		SRC_URI+=" ${c#+}? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/${PN}-${l#^}-${c#+}-${PV}.tar.gz )"
+	done
+	[[ ${l} == ^* ]] || SRC_URI+=" )"
+done
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=net-misc/asterisk-1.4"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	local ar
+	for ar in ${A}; do
+		local l="${ar#${PN}-}"
+		l=${l%%-*}
+		mkdir -p "${WORKDIR}/${l}" || die
+		cd "${WORKDIR}/${l}" || die
+		unpack "${ar}"
+	done
+}
+
+src_install() {
+	local l
+	for l in "${MY_L10N[@]}"; do
+		if [[ ${l} == ^* ]] || use "l10n_${l}"; then
+			l="${l#^}"
+			dodoc "${l}/CHANGES-${PN%-sounds}-${l}-${PV}" \
+				"${l}/${PN#asterisk-}-${l}.txt"
+			rm "${l}/CHANGES-${PN%-sounds}-${l}-${PV}" \
+				"${l}/${PN#asterisk-}-${l}.txt" || die
+		fi
+	done
+
+	diropts -m 0770 -o asterisk -g asterisk
+	insopts -m 0660 -o asterisk -g asterisk
+	insinto /var/lib/asterisk/sounds
+	doins -r .
+}
diff --git a/net-misc/autossh/Manifest b/net-misc/autossh/Manifest
index de904516ab78..8bd51e209f4c 100644
--- a/net-misc/autossh/Manifest
+++ b/net-misc/autossh/Manifest
@@ -3,5 +3,5 @@ DIST autossh-1.4f.tgz 67128 BLAKE2B 197c964272c47bce1a137eb45560a9f70c64686915d1
 DIST autossh-1.4g.tgz 67599 BLAKE2B 179af97ee6f3b9c1c4fcbad1593118aa5d69dbd2b6215efd4a16ab7641f6f0194faaca3c3101b3a918d652988a06b5fa8ce6e52f85f81edd95b3d71d49aad076 SHA512 499b560d978736f4e764d5d828282fdaba1cbf94811ae6be0be5434d9c1cdc6ca5513d728b6372aa243843cb1b91e61cfc5fdeb77ddb0b6a7ce027218ba67466
 EBUILD autossh-1.4e.ebuild 578 BLAKE2B 4fcda511da857ad5a5bb893b9ad1af5f9eb4c074b45b68c6547603a652a5502047822f1f0a13d1164f90145ba85a1404b814164748b0041c7fa01909be190c37 SHA512 59495546014f6a0e55335b235641ca9c9232bd7f680094153ca6f6c01a33b90235b6028e76e7db688d9aa76542633685e04f4c0d37d0d9eda304d6ec5ce960ab
 EBUILD autossh-1.4f.ebuild 506 BLAKE2B 3599e44f761fef5eff0d46b1e9091032922fa15a90e40cc2fb7c5bf2d45bd3cb764def709ba330c39699fab013e35f3e65d370e0342e2104a19d1a19e364fc68 SHA512 6b32ff9d21fa98311ed197659b359be4f47d07534472edc1f8cdace741674113720ef637f246b923c3ccb2dbe3765d79b714a4a6112c2b4ae4e27531687cb8cb
-EBUILD autossh-1.4g.ebuild 503 BLAKE2B a04754d13134af16e487520863c4bf9bb32cec6ddbebb43e50a1111da4b09d2bb9e1d8c3e424f64da0dd9c9bcf78b229fdb033ff888f716ba07eabb4ecea84a7 SHA512 d3a1006086423bbd823f53c7a055da4b10675dd44dc66a0cfa425f1817d61faeb1c1a67bbb4d816c9543af17e02fdaa46fd17098f6a5f47f7b51e23c8702c352
+EBUILD autossh-1.4g.ebuild 505 BLAKE2B 2c9b71350877d571675bd3ea3870fed4fb30238e52e30b4124c82d300cd2feda9e75d103b0e739f27584c08bf3eef1863b476c55e2bb81204515d7b8f6e3d8e3 SHA512 433af5c833e4caa82a06793ddde01837c6de1e5f0ce087a7746b7cb03b31fda61d438a5a1003f7aa9712dad65844042b9f5f7312a12abb90fed22697ce21f218
 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/net-misc/autossh/autossh-1.4g.ebuild b/net-misc/autossh/autossh-1.4g.ebuild
index 14991df99f5a..44afe463bad1 100644
--- a/net-misc/autossh/autossh-1.4g.ebuild
+++ b/net-misc/autossh/autossh-1.4g.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 DESCRIPTION="Automatically restart SSH sessions and tunnels"
-HOMEPAGE="http://www.harding.motd.ca/autossh/"
-SRC_URI="http://www.harding.motd.ca/${PN}/${P}.tgz"
+HOMEPAGE="https://www.harding.motd.ca/autossh/"
+SRC_URI="https://www.harding.motd.ca/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index d73f2cc908c9..724ecaa3f52c 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,5 +1,6 @@
 AUX chrony-2.4-r1.logrotate 131 BLAKE2B 4e649ce1c126639ea73c4e03d42175d1715b1c321544376ff2e48d67ee13bebcf04a8fea56326bf5efe66f568913dc92ff7f16a641ffb39a456e9cdac6004a6c SHA512 e6febb744476be6c83ac086f2054dc2c190b6e1abd2cf20d4187f222b2485817f06c4ad62b8d40fcea3e18a771cf21899fe0a1dafbfb31f5c99da9092d24d79b
 AUX chrony-3.4-systemd-gentoo.patch 765 BLAKE2B 541cf597dcecb800f569847e813edfbfaa13130fee2d1b991de710ff2936cc593aad65497505e99da3f563288e0d52d52432f392817a45c5fcf123a5af370d7b SHA512 0662ab22428d221f62e76e97217c8f5589b54d12deac7d4fc2f9359987b57f39d7c42e6a10c3b97ae0c17b57d63cd11e8e586110194249f7ed2d5dd0fb9a8041
+AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1e70565a8437f142f317abe81531c31e934af05eda5e3043f7874bc9b4592d44579ae1827ddba06c514b4b8124c899931ed0f SHA512 0a109e1b8367def620f5089b3fcb92d84e592eb1a2fced2b60f6c9295159a605d9605e837a06e118c8ba8095208da68592fb9cd537937a153d6eecfa0eb35eb4
 AUX chrony-3.5-systemd-gentoo.patch 297 BLAKE2B b7a8502ede5886b7e51fbaf43d62b59bdb43d8c5059d1ee0c8a14de843d58d576efd6b5c53cb3cbdd1c4583b787a8c180bea93a97a997349d97f652b7b4f1fbb SHA512 ecf0eda8de2c36f14a6d3dac8b7b688b06f46516ae064513314cc46323962147b29f13a57beb34cc7d2664b967b5f0eee26a00ddeac63d88dda59fc196f1aec1
 AUX chronyd.conf 378 BLAKE2B b5c07f873640d78e26d23206b253b8c85ceb2a3d89f1dfb3686ea0012fb38ae30b323ceceffac43c0a8168b3e2d288714297a0905e60779d00161e93d8f5773b SHA512 6919c7bddce2a8f81c0f2759c7c58506e97f89102bfeb7b5c19c6da5ed4cbd9070faddd4f3fb411bb4c653fffbdcc93a7f7dc810f38b199f038b1d4072f57640
 AUX chronyd.init 1634 BLAKE2B f67d3e2b8aaca19e1c9f86434e8a1ba757babebe8b39fe26be98b7d1d40b259fde5313dcb840c86a7d409ac811a5d854178af66ab82d851b66d27a2acf5f7575 SHA512 1712775c133c4e7f1e869806be2a0723d171c344fc18473606397c74103bb70990302b475ed3629adb5277deed8e892f1ad48d5ee339cf112f425d9209cc3872
@@ -13,6 +14,6 @@ DIST chrony-3.5.tar.gz 458226 BLAKE2B 611f21e36c6e745208e00eba988519fcd912c6c0c3
 EBUILD chrony-3.1.ebuild 2825 BLAKE2B c3af56079c3130002499dda974bb5117a2cce988f8a1aaca7cb6f9f11a0aa011fefe3f600262939b72b4f41d7e096a94dd1305572a04aabe96519cff36ec0165 SHA512 f97265a0a7006c1f8fc07f4a25f27ff0f78b123fdeabe2329a0e48ba33409e16a8373d6c114c2d25f463f560b47e8ef5510c140e5e045a02ccfd4eb669f463b3
 EBUILD chrony-3.3.ebuild 2909 BLAKE2B 2d314e96402839948b95e9f8650e8523676f201deab27230ac9d006a0a73c878239c23c7118d0698bec9d7c2796b3a08be9cfa695c21b84ee333c23161d963ad SHA512 0ef1db3668f626dc07057728f7d33d9a200f1e4fcb93e6fb3b69e874b8d5d0e3bbb2d57c21513d7825151b08b0a86a36ef1838c44f27e536aa7abd5b9e973cdf
 EBUILD chrony-3.4.ebuild 2912 BLAKE2B 0b8948414c95862295efec709f2f4467974c2955fc03153d5d2bfa15a74fcee2714f012425b4b1002b90cafe9008fa7ce02f0f40582b7b4b0917d82363cc9c77 SHA512 13c6caf8f3d813e1caa515d1ab00f1e5c1539198ee51913f649ee2ef2562bffee15b0f78c78ff5419728740a867d02a90eb889f2711a32db85f7756c3bdda3b3
-EBUILD chrony-3.5.ebuild 2909 BLAKE2B 7aa6ed3307387d3be48b0f215a1ffa28eafe89cb4856d89f2f2613738e6415c88adc2bc0e384b8cf28fb1ce76fcbab1a553fc3790c2883e21950d648cdd70024 SHA512 e9ebfbb5d22296bad677cb6c1372e6fc866f8eb2c3b3b0fe5166862560d8b9d9f11552271129cafd07e09c7791b64f92b4a0b740aa8d3982f7228e77bbd6afb4
-EBUILD chrony-9999.ebuild 2801 BLAKE2B eb782d5490812e898b6d660cb7b49eaccd610dd3dfc6afba21676effcf9a9ada57b4e2d6fb96ffa4474439215e32e0bcefeff0b5b686d21e63fa95e289d8c59a SHA512 87f76580a6dbd2fa2aa81225f7e0b0262f1b4030a9e2905f5e0e159265808836a6af5081b8461a7f3e7c7c48e5933d0dc192c58a9d334f5dde0ef0ee445ac59e
+EBUILD chrony-3.5-r2.ebuild 3042 BLAKE2B e5cb16eb143b4ea9db59ae163b77d4ee20e31dfdcffae283f9effa5945b81fb5f49002e384fca0a6d7fdaf15d5211d7794f25d270c6e7077e72e000ffcbdae43 SHA512 72865b3925c98ef17af7a761bfa0528ede5ba716f177b609ac4b7f2c04093df3d3d43c1fbd8059bb12b3397f5340504e51fbfff901383aef679adf75c70b1741
+EBUILD chrony-9999.ebuild 2934 BLAKE2B 325fccb1baf09e65dee2fd3d4a7f1fa1e665ae95daf36a8b9a00ffa9770f69bf29940584595c9cb13bd32ef8695169dc3d19c6d2f34812da00540efc67b6a57a SHA512 2414c0b1f95ae47de1ec308dabacc4a791982af9dad4fa8a45297c336695298df826bca0a5a565adc6667a69166a41910aa093bd4c120827aba4a1d533fe0a9c
 MISC metadata.xml 1566 BLAKE2B 88bf43a72fed47580395641d87651a7828fa3fb443a36568bc8ee44f2d09117aa296f8b214f1560279cce2e9bad189a3d941708fe37c1760b053f3669f25ed8e SHA512 acdca169396f72dbbfd3c2ca781024818133ec4af07661a0c8b5a619ca6a43713910aadc28e6d8e5b3d0d8da960ac1bfba05ec5cb5c49d80b17fdf9c1c5d1b1d
diff --git a/net-misc/chrony/chrony-3.5.ebuild b/net-misc/chrony/chrony-3.5-r2.ebuild
index 21c96f642157..c1d5a7b717e3 100644
--- a/net-misc/chrony/chrony-3.5.ebuild
+++ b/net-misc/chrony/chrony-3.5-r2.ebuild
@@ -40,6 +40,7 @@ RESTRICT=test
 S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
 	"${FILESDIR}"/${PN}-3.5-systemd-gentoo.patch
 )
 
@@ -66,34 +67,33 @@ src_configure() {
 	fi
 
 	# not an autotools generated script
-	local CHRONY_CONFIGURE="
-	./configure \
-		$(use_enable seccomp scfilter) \
-		$(usex adns '' --disable-asyncdns) \
-		$(usex caps '' --disable-linuxcaps) \
-		$(usex cmdmon '' --disable-cmdmon) \
-		$(usex ipv6 '' --disable-ipv6) \
-		$(usex ntp '' --disable-ntp) \
-		$(usex phc '' --disable-phc) \
-		$(usex pps '' --disable-pps) \
-		$(usex refclock '' --disable-refclock) \
-		$(usex rtc '' --disable-rtc) \
-		${CHRONY_EDITLINE} \
-		${EXTRA_ECONF} \
-		--chronysockdir=/run/chrony \
-		--disable-sechash \
-		--docdir=/usr/share/doc/${PF} \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--sysconfdir=/etc/chrony \
+	local myconf=(
+		$(use_enable seccomp scfilter)
+		$(usex adns '' --disable-asyncdns)
+		$(usex caps '' --disable-linuxcaps)
+		$(usex cmdmon '' --disable-cmdmon)
+		$(usex ipv6 '' --disable-ipv6)
+		$(usex ntp '' --disable-ntp)
+		$(usex phc '' --disable-phc)
+		$(usex pps '' --disable-pps)
+		$(usex refclock '' --disable-refclock)
+		$(usex rtc '' --disable-rtc)
+		${CHRONY_EDITLINE}
+		${EXTRA_ECONF}
+		--chronysockdir="${EPREFIX}/run/chrony"
+		--disable-sechash
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--mandir="${EPREFIX}/usr/share/man"
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc/chrony"
 		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-		--without-nss \
+		--without-nss
 		--without-tomcrypt
-	"
+	)
 
 	# print the ./configure call to aid in future debugging
-	einfo ${CHRONY_CONFIGURE}
-	bash ${CHRONY_CONFIGURE} || die
+	echo bash ./configure "${myconf[@]}" >&2
+	bash ./configure "${myconf[@]}" || die
 }
 
 src_compile() {
@@ -122,5 +122,6 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
 
-	systemd_dounit examples/chronyd.service
+	systemd_dounit examples/{chronyd,chrony-wait}.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
 }
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index a9bf2fae2782..e939129a01ac 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -38,6 +38,7 @@ RESTRICT=test
 S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
 	"${FILESDIR}"/${PN}-3.5-systemd-gentoo.patch
 )
 
@@ -64,34 +65,33 @@ src_configure() {
 	fi
 
 	# not an autotools generated script
-	local CHRONY_CONFIGURE="
-	./configure \
-		$(use_enable seccomp scfilter) \
-		$(usex adns '' --disable-asyncdns) \
-		$(usex caps '' --disable-linuxcaps) \
-		$(usex cmdmon '' --disable-cmdmon) \
-		$(usex ipv6 '' --disable-ipv6) \
-		$(usex ntp '' --disable-ntp) \
-		$(usex phc '' --disable-phc) \
-		$(usex pps '' --disable-pps) \
-		$(usex refclock '' --disable-refclock) \
-		$(usex rtc '' --disable-rtc) \
-		${CHRONY_EDITLINE} \
-		${EXTRA_ECONF} \
-		--chronysockdir=/run/chrony \
-		--disable-sechash \
-		--docdir=/usr/share/doc/${PF} \
-		--mandir=/usr/share/man \
-		--prefix=/usr \
-		--sysconfdir=/etc/chrony \
+	local myconf=(
+		$(use_enable seccomp scfilter)
+		$(usex adns '' --disable-asyncdns)
+		$(usex caps '' --disable-linuxcaps)
+		$(usex cmdmon '' --disable-cmdmon)
+		$(usex ipv6 '' --disable-ipv6)
+		$(usex ntp '' --disable-ntp)
+		$(usex phc '' --disable-phc)
+		$(usex pps '' --disable-pps)
+		$(usex refclock '' --disable-refclock)
+		$(usex rtc '' --disable-rtc)
+		${CHRONY_EDITLINE}
+		${EXTRA_ECONF}
+		--chronysockdir="${EPREFIX}/run/chrony"
+		--disable-sechash
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--mandir="${EPREFIX}/usr/share/man"
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc/chrony"
 		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-		--without-nss \
+		--without-nss
 		--without-tomcrypt
-	"
+	)
 
 	# print the ./configure call to aid in future debugging
-	einfo ${CHRONY_CONFIGURE}
-	bash ${CHRONY_CONFIGURE} || die
+	echo bash ./configure "${myconf[@]}" >&2
+	bash ./configure "${myconf[@]}" || die
 }
 
 src_compile() {
@@ -118,5 +118,6 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
 
-	systemd_dounit examples/chronyd.service
+	systemd_dounit examples/{chronyd,chrony-wait}.service
+	systemd_enable_ntpunit 50-chrony chronyd.service
 }
diff --git a/net-misc/chrony/files/chrony-3.5-pool-vendor-gentoo.patch b/net-misc/chrony/files/chrony-3.5-pool-vendor-gentoo.patch
new file mode 100644
index 000000000000..817a41067382
--- /dev/null
+++ b/net-misc/chrony/files/chrony-3.5-pool-vendor-gentoo.patch
@@ -0,0 +1,16 @@
+- Use the Gentoo pool
+- Use the server directive instead of the pool directive so we get four time
+  sources and not twelve.
+
+--- a/examples/chrony.conf.example1
++++ b/examples/chrony.conf.example1
+@@ -1,5 +1,8 @@
+ # Use public NTP servers from the pool.ntp.org project.
+-pool pool.ntp.org iburst
++server 0.gentoo.pool.ntp.org iburst
++server 1.gentoo.pool.ntp.org iburst
++server 2.gentoo.pool.ntp.org iburst
++server 3.gentoo.pool.ntp.org iburst
+ 
+ # Record the rate at which the system clock gains/losses time.
+ driftfile /var/lib/chrony/drift
diff --git a/net-misc/mrouted/Manifest b/net-misc/mrouted/Manifest
index dbda15a763e0..7204b3a44923 100644
--- a/net-misc/mrouted/Manifest
+++ b/net-misc/mrouted/Manifest
@@ -1,4 +1,6 @@
 AUX mrouted.rc 603 BLAKE2B 076ee25d2503a9e53d8535f3ce0db2f491db687cd4408f5635a9482fa0eca45d15b8aa5e544dc24f80152c29d0d47931e2a68c26b55cbcf7f4257cf55cd6592a SHA512 08e65f7bcf759889fe42349d6b7432e7b76c84069ff295ad7d72e0517cae2eabd2de11619e07cf7a573e5c2eeb3f0159becd355cae4358be093b93a9824424d3
 DIST mrouted-3.9.5.tar.bz2 112746 BLAKE2B 146d088b0fe3691c48b86a5bb4fb191c6a138fcef065c2afb549e068181953bb5ec46a6d710b2f158ba9290f8b7cc8dd3314cafeb0d681a43419a69d2cda58e4 SHA512 6ab7335fd18bcb971eb0f9af26e8fd566b1bf2e53abdfcdea847c4bd719d282496c443914678c6fcbcf754e276663ed48ac9f0ae9e940e60eff71ceb1f4622fd
+DIST mrouted-3.9.8.tar.bz2 112863 BLAKE2B 4a7defbb1b97be8e452881a689d99742df2878dc9c2613c79e1bdc33af398c2be1b2d21de94e90592877ee5b6aa6b2f0c64948193eda9005c828a6cc84e492c0 SHA512 50abf2271c76b604d1e356ca5c0b62a7f07487f364991502326bbee169c451b43b3dbf01b88340d6b406f16d86a6d6fd9e7bb03c6e76d6af463b46d8423a41f4
 EBUILD mrouted-3.9.5-r1.ebuild 841 BLAKE2B 4f26bdc8cb8fe714e058c15144ce651b09bd2f16cb4b3c9200c327b7e55e6c9b411b440df1511d3cbe156fcebafcaf92047124506e9b130f456457de1a5563dd SHA512 e45dd94d7e7ea511e7798c0a9f75b5fdff669d98b9cc00f272c153d2ce2ab37296c5605390bb9df115928de99f654b3ed17242619e8b5c1ce4f8c25d790ec725
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD mrouted-3.9.8.ebuild 1084 BLAKE2B cebd4e2a3f6709311c52158bf979f332e93b0c2ac6ee28af9955fcb0408129cb14d8060acb8dacebf29f17f52269fd38eda094c3d2ab77d1f61da76c2cc7d3ae SHA512 7b82b462480a3264d59c53cc2cb7988500982aca9738496bccec077a4c20a17063aa1d4f833b9681b2305e56afb04a0084658b5dc4acc1e05126c92ddebe1250
+MISC metadata.xml 263 BLAKE2B cb359879b778e3cab54eb78f0d469b2acafd5dae71b337927dc91c871bc0b3477948813a77830721f9370c7c4e83f8aa0157eb29cb6a6548166028fe7564bbff SHA512 a671dd27602ae33831b300d8d25ee33335d220722d9004e5db3ef1d3f2bcf8646b4281f28a7a7baee9913e30a4f9699e5ae53233ddb8fcc11090162ab5945000
diff --git a/net-misc/mrouted/metadata.xml b/net-misc/mrouted/metadata.xml
index 6f49eba8f496..b3b5c800ae34 100644
--- a/net-misc/mrouted/metadata.xml
+++ b/net-misc/mrouted/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<use>
+<flag name='rsrr'>Enable Routing Support for Resource Reservations, for RSVP</flag>
+</use>
 </pkgmetadata>
diff --git a/net-misc/mrouted/mrouted-3.9.8.ebuild b/net-misc/mrouted/mrouted-3.9.8.ebuild
new file mode 100644
index 000000000000..74cff54b4c32
--- /dev/null
+++ b/net-misc/mrouted/mrouted-3.9.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="IP multicast routing daemon"
+HOMEPAGE="https://troglobit.com/projects/mrouted/"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/${PV}/${P}.tar.bz2"
+LICENSE="Stanford GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="rsrr"
+RESTRICT="test"
+
+DEPEND="|| ( dev-util/yacc sys-devel/bison )"
+
+src_prepare() {
+	# Respect user CFLAGS, remove upstream optimisation and -Werror, do not
+	# print command summaries, do print commands
+	sed -i \
+		-e '/^CFLAGS/{s|[[:space:]]=| +=|g;s|-O2||g;s|-Werror||g}' \
+		-e '/@printf/d' \
+		-e 's|^\t-@|\t-|g' \
+		-e 's|^\t@|\t|g' \
+		Makefile || die
+	default
+}
+
+src_configure() {
+	sh configure $(usex rsrr --enable-rsrr '')
+	tc-export CC CXX
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX)
+}
+
+src_install() {
+	dobin mrouted
+	dosbin mtrace mrinfo map-mbone
+	doman mrouted.8 mtrace.8 mrinfo.8 map-mbone.8
+
+	insinto /etc
+	doins mrouted.conf
+	newinitd "${FILESDIR}"/mrouted.rc mrouted
+}
diff --git a/net-misc/tokyotyrant/Manifest b/net-misc/tokyotyrant/Manifest
deleted file mode 100644
index 704a854ad0c4..000000000000
--- a/net-misc/tokyotyrant/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX fix_makefiles-1.4.41.patch 3247 BLAKE2B 6951d7a58fe844b5f29db84fecffb7c9670a8de366cd1b8c2ff854d6d61b14c0cbd552fc1676d3339407c371926670f0d5cd4f2abc490c2ef106b4211c59356f SHA512 0b9a1cc16f999a0a89c5e58fdc7e9aa98c66c9357804c46bb4657279434d59c3928d37ddc774fba53a8bccdd1fd530efa5f418388cb18805a5ffc81fc3405a4b
-AUX fix_testsuite.patch 6594 BLAKE2B 415936e5b506e0fe979395ac9167f42a09d0a037064f537f362aa1fdd4f143e99a14572153ba5657ea03a25c6911de8038b40c8240ae950d2fa3caad1ea9a30e SHA512 2d64147c4721d5d59589e8a038fbcffb4db61f35e5bcbc4f29e806df616d4534cc281fe6a9ac00cf74cda6677b60bc6f1b44f2085d703affb9ccf81717026cd0
-AUX tokyotyrant.confd 361 BLAKE2B b1fd84606e4f3e5c528ef8fb1c4cff4c4b7ac5568fdd25951a3cdc6e5c72bba09e8ed0f9596e6ba543f2c459d17673c17ef965e63af1496df7829c5ec462e29a SHA512 5e762267eba0f214a47d385c41d32b9a2a82c7ece41c42266ad980a936080528b42d7f86fd2b32679f65e97f6b1b6a3a74d8d7c4465cc9b2739c4d1746f04cf0
-AUX tokyotyrant.initd 800 BLAKE2B 4a09d86f8dbf70ebcc38c72a9f55ee42004a94ea4c7428312b50ce60f5b89cb29a197d4293754e549ee7615f230e9d15c0cd0f1d10608974cd36aabce4d89508 SHA512 e00874a33eeab7228815e303d9a028e9ce50dde96012db397bcf11a530acecbb9a3252468d2745e239e1b7a7e873f3bb87962c585cea122e011a981fdf0ba9bf
-DIST tokyotyrant-1.1.41.tar.gz 196196 BLAKE2B adfeb14146a4078d01d75608c8deb206de60b956b73d7cab2d2b29b2daf9ef7be7c3ab932984460fc07858e836421932472eaef801d0d79f4e8dd3ed7ab37580 SHA512 fb181ecab19981733b4b478614f9b28d7f1f776bafe6c58c4bc3e26ed294301a6242d7cd1d47b7d6b55a93305474d2e8e0a75f2f01af21a8bc93d158c8f8179e
-EBUILD tokyotyrant-1.1.41-r2.ebuild 1177 BLAKE2B 8edfe177dd4acd0aa12283c517973c622d5e2ff0a2763ef8658baf4b92df9fd010349e2ac7fcd0ef0a46d1e608e030a77d63c34ea0ef202a738ddfd38bbcaa42 SHA512 9c729c7a9c1d3f52e5e47dcafbc8bb7292ceb71a431b0d115b9c8f3b63ccc14bc433bd2d89337022a2ce1ac2001bb32be47495cf5b89dd66f56b0fbeeaa6e783
-MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch b/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch
deleted file mode 100644
index 40d26cc5f93a..000000000000
--- a/net-misc/tokyotyrant/files/fix_makefiles-1.4.41.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index b388455..52d3bc3 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -58,8 +58,8 @@ CFLAGS = @MYCFLAGS@
- LDFLAGS = @MYLDFLAGS@
- CMDLDFLAGS = @MYCMDLDFLAGS@
- LIBS = @LIBS@
--LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
--RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
-+LDENV = 
-+RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
- POSTCMD = @MYPOSTCMD@
- 
- 
-@@ -120,10 +120,6 @@ install :
- 	cp -Rf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR)
- 	mkdir -p $(DESTDIR)$(BINDIR)
- 	cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR)
--	mkdir -p $(DESTDIR)$(SBINDIR)
--	cp -Rf $(INITFILES) $(DESTDIR)$(SBINDIR)
--	mkdir -p $(DESTDIR)$(DATADIR)
--	cp -Rf $(SCREXTFILES) $(DOCUMENTFILES) $(DESTDIR)$(DATADIR)
- 	mkdir -p $(DESTDIR)$(MAN1DIR)
- 	cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR)
- 	mkdir -p $(DESTDIR)$(MAN3DIR)
-@@ -132,7 +128,6 @@ install :
- 	cd man && cp -Rf $(MAN8FILES) $(DESTDIR)$(MAN8DIR)
- 	mkdir -p $(DESTDIR)$(PCDIR)
- 	cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
--	[ "$$UID" == 0 ] && ldconfig || true
- 	@printf '\n'
- 	@printf '#================================================================\n'
- 	@printf '# Thanks for using Tokyo Tyrant.\n'
-diff --git a/configure.in b/configure.in
-index fbe0c71..809a839 100644
---- a/configure.in
-+++ b/configure.in
-@@ -28,33 +28,15 @@ MYDOCUMENTFILES="COPYING ChangeLog THANKS doc tokyotyrant.idl"
- MYPCFILES="tokyotyrant.pc"
- 
- # Building flags
--MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
-+MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char"
- MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include"
- MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1 -D_REENTRANT -D__EXTENSIONS__"
--MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
-+MYLDFLAGS="-L. -L\$(LIBDIR)"
- MYCMDLDFLAGS=""
- MYRUNPATH="\$(LIBDIR)"
- MYLDLIBPATHENV="LD_LIBRARY_PATH"
- MYPOSTCMD="true"
- 
--# Building paths
--PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
--PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
--CPATH="$HOME/include:/usr/local/include:$CPATH"
--LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
--LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
--PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
--export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
--if type pkg-config > /dev/null 2>&1
--then
--  PATH="$PATH:`pkg-config --variable=bindir tokyocabinet`"
--  CPATH="$CPATH:`pkg-config --variable=includedir tokyocabinet`"
--  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`"
--  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`"
--fi
--
--
--
- #================================================================
- # Options
- #================================================================
-diff --git a/tokyotyrant.pc.in b/tokyotyrant.pc.in
-index efb3749..efec1f6 100644
---- a/tokyotyrant.pc.in
-+++ b/tokyotyrant.pc.in
-@@ -10,5 +10,5 @@ datadir=@datadir@
- Name: Tokyo Tyrant
- Description: network interface of Tokyo Cabinet
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -ltokyotyrant @LIBS@
-+Libs: -L${libdir} -ltokyotyrant
- Cflags: -I${includedir}
diff --git a/net-misc/tokyotyrant/files/fix_testsuite.patch b/net-misc/tokyotyrant/files/fix_testsuite.patch
deleted file mode 100644
index 7ee9dc801cb6..000000000000
--- a/net-misc/tokyotyrant/files/fix_testsuite.patch
+++ /dev/null
@@ -1,104 +0,0 @@
---- a/Makefile.in	2009-10-14 10:33:16.000000000 +0200
-+++ b/Makefile.in.new	2009-10-14 10:27:39.000000000 +0200
-@@ -166,48 +166,49 @@
- 
- 
- check :
-+	$(RUNENV) $(RUNCMD) ./ttserver -dmn -host 127.0.0.1 -port 19781 -pid /tmp/tttest.pid /tmp/tttest.tch
- 	$(RUNENV) $(RUNCMD) ./tcrmgr version
--	$(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 -rnd 127.0.0.1 50000
--	$(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 -nr -rnd 127.0.0.1 50000
--	$(RUNENV) $(RUNCMD) ./tcrtest write -cnum 5 -tout 5 127.0.0.1 50000
--	$(RUNENV) $(RUNCMD) ./tcrtest read -cnum 5 -tout 5 127.0.0.1
--	$(RUNENV) $(RUNCMD) ./tcrtest read -cnum 5 -tout 5 -mul 5 127.0.0.1
--	$(RUNENV) $(RUNCMD) ./tcrtest remove -cnum 5 -tout 5 127.0.0.1
--	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 127.0.0.1 50000
--	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -shl 50 127.0.0.1 50000
--	$(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1
--	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -dad 127.0.0.1 50000
--	$(RUNENV) $(RUNCMD) ./tcrtest rcat -cnum 5 -tout 5 -ext putcat -xlr 127.0.0.1 50000
--	$(RUNENV) $(RUNCMD) ./tcrtest misc -cnum 5 -tout 5 127.0.0.1 5000
--	$(RUNENV) $(RUNCMD) ./tcrtest wicked -cnum 5 -tout 5 127.0.0.1 5000
--	$(RUNENV) $(RUNCMD) ./tcrmgr inform 127.0.0.1
--	$(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1
--	$(RUNENV) $(RUNCMD) ./tcrmttest write -tnum 5 127.0.0.1 5000
--	$(RUNENV) $(RUNCMD) ./tcrmttest read -tnum 5 127.0.0.1
--	$(RUNENV) $(RUNCMD) ./tcrmttest remove -tnum 5 127.0.0.1
--	$(RUNENV) $(RUNCMD) ./tcrmttest write -tnum 5 -ext putcat -rnd 127.0.0.1 5000
--	$(RUNENV) $(RUNCMD) ./tcrmttest typical -tnum 5 127.0.0.1 5000
--	$(RUNENV) $(RUNCMD) ./tcrmgr vanish 127.0.0.1
--	$(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 one first
--	$(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 two second
--	$(RUNENV) $(RUNCMD) ./tcrmgr put -dk 127.0.0.1 three third
--	$(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third
--	$(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third
--	$(RUNENV) $(RUNCMD) ./tcrmgr put -dc 127.0.0.1 three third
--	$(RUNENV) $(RUNCMD) ./tcrmgr put 127.0.0.1 four fourth
--	$(RUNENV) $(RUNCMD) ./tcrmgr put -dk 127.0.0.1 five fifth
--	$(RUNENV) $(RUNCMD) ./tcrmgr out 127.0.0.1 one
--	$(RUNENV) $(RUNCMD) ./tcrmgr out 127.0.0.1 two
--	$(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 three > check.out
--	$(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 four > check.out
--	$(RUNENV) $(RUNCMD) ./tcrmgr get 127.0.0.1 five > check.out
--	$(RUNENV) $(RUNCMD) ./tcrmgr mget 127.0.0.1 one two three four five > check.out
--	$(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 putlist six sixth seven seventh
--	$(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 outlist six
--	$(RUNENV) $(RUNCMD) ./tcrmgr misc 127.0.0.1 getlist three four five six > check.out
--	$(RUNENV) $(RUNCMD) ./tcrmgr list -pv 127.0.0.1 > check.out
--	$(RUNENV) $(RUNCMD) ./tcrmgr list -pv -fm f 127.0.0.1 > check.out
--	$(RUNENV) $(RUNCMD) ./tcrmgr http -ih http://127.0.0.1:1978/five > check.out
-+	$(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 -rnd 127.0.0.1 50000
-+	$(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 -nr -rnd 127.0.0.1 50000
-+	$(RUNENV) $(RUNCMD) ./tcrtest write -port 19781 -cnum 5 -tout 5 127.0.0.1 50000
-+	$(RUNENV) $(RUNCMD) ./tcrtest read -port 19781 -cnum 5 -tout 5 127.0.0.1
-+	$(RUNENV) $(RUNCMD) ./tcrtest read -port 19781 -cnum 5 -tout 5 -mul 5 127.0.0.1
-+	$(RUNENV) $(RUNCMD) ./tcrtest remove -port 19781 -cnum 5 -tout 5 127.0.0.1
-+	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 127.0.0.1 50000
-+	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -shl 50 127.0.0.1 50000
-+	$(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1
-+	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -dad 127.0.0.1 50000
-+	$(RUNENV) $(RUNCMD) ./tcrtest rcat -port 19781 -cnum 5 -tout 5 -ext putcat -xlr 127.0.0.1 50000
-+	$(RUNENV) $(RUNCMD) ./tcrtest misc -port 19781 -cnum 5 -tout 5 127.0.0.1 5000
-+	$(RUNENV) $(RUNCMD) ./tcrtest wicked -port 19781 -cnum 5 -tout 5 127.0.0.1 5000
-+	$(RUNENV) $(RUNCMD) ./tcrmgr inform -port 19781 127.0.0.1
-+	$(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1
-+	$(RUNENV) $(RUNCMD) ./tcrmttest write -port 19781 -tnum 5 127.0.0.1 5000
-+	$(RUNENV) $(RUNCMD) ./tcrmttest read -port 19781 -tnum 5 127.0.0.1
-+	$(RUNENV) $(RUNCMD) ./tcrmttest remove -port 19781 -tnum 5 127.0.0.1
-+	$(RUNENV) $(RUNCMD) ./tcrmttest write -port 19781 -tnum 5 -ext putcat -rnd 127.0.0.1 5000
-+	$(RUNENV) $(RUNCMD) ./tcrmttest typical -port 19781 -tnum 5 127.0.0.1 5000
-+	$(RUNENV) $(RUNCMD) ./tcrmgr vanish -port 19781 127.0.0.1
-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 one first
-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 two second
-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dk 127.0.0.1 three third
-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third
-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third
-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dc 127.0.0.1 three third
-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 127.0.0.1 four fourth
-+	$(RUNENV) $(RUNCMD) ./tcrmgr put -port 19781 -dk 127.0.0.1 five fifth
-+	$(RUNENV) $(RUNCMD) ./tcrmgr out -port 19781 127.0.0.1 one
-+	$(RUNENV) $(RUNCMD) ./tcrmgr out -port 19781 127.0.0.1 two
-+	$(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 three > check.out
-+	$(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 four > check.out
-+	$(RUNENV) $(RUNCMD) ./tcrmgr get -port 19781 127.0.0.1 five > check.out
-+	$(RUNENV) $(RUNCMD) ./tcrmgr mget -port 19781 127.0.0.1 one two three four five > check.out
-+	$(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 putlist six sixth seven seventh
-+	$(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 outlist six
-+	$(RUNENV) $(RUNCMD) ./tcrmgr misc -port 19781 127.0.0.1 getlist three four five six > check.out
-+	$(RUNENV) $(RUNCMD) ./tcrmgr list -port 19781 -pv 127.0.0.1 > check.out
-+	$(RUNENV) $(RUNCMD) ./tcrmgr list -port 19781 -pv -fm f 127.0.0.1 > check.out
-+	$(RUNENV) $(RUNCMD) ./tcrmgr http -ih http://127.0.0.1:19781/five > check.out
- 	rm -rf ulog ; mkdir -p ulog
- 	$(RUNENV) $(RUNCMD) ./ttultest write -lim 10000 ulog 5000
- 	$(RUNENV) $(RUNCMD) ./ttultest write -lim 10000 -as ulog 5000
-@@ -215,6 +216,10 @@
- 	rm -rf ulog ; mkdir -p ulog
- 	$(RUNENV) $(RUNCMD) ./ttultest thread -lim 10000 ulog 5 5000
- 	$(RUNENV) $(RUNCMD) ./ttultest thread -lim 10000 -as ulog 5 5000
-+
-+	kill `cat /tmp/tttest.pid`
-+	rm /tmp/tttest.tch
-+
- 	@printf '\n'
- 	@printf '#================================================================\n'
- 	@printf '# Checking completed.\n'
diff --git a/net-misc/tokyotyrant/files/tokyotyrant.confd b/net-misc/tokyotyrant/files/tokyotyrant.confd
deleted file mode 100644
index b6417134f47c..000000000000
--- a/net-misc/tokyotyrant/files/tokyotyrant.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Tokyo tyrant config
-
-# Listening options
-TT_HOST=127.0.0.1
-TT_PORT=1978
-
-# Database file - please refer to man ttserver for alternatives
-TT_DB="/var/lib/tokyotyrant/casket.tch#bnum=1000000#opts=ld"
-
-# ttserver accepts a wide range of options, put them here
-TT_OPTS=""
-
-# don't change these
-TT_PID=/var/run/tokyotyrant/db.pid
-TT_LOG=/var/log/tokyotyrant/db.log
\ No newline at end of file
diff --git a/net-misc/tokyotyrant/files/tokyotyrant.initd b/net-misc/tokyotyrant/files/tokyotyrant.initd
deleted file mode 100644
index f754d4901bfc..000000000000
--- a/net-misc/tokyotyrant/files/tokyotyrant.initd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-
-extra_commands="configtest reload"
-
-depend() {
-	need net
-}
-
-start() {
-	configtest || return 1
-	ebegin "Starting tokyo tyrant"
-	start-stop-daemon --start --exec /usr/bin/ttserver -- \
-		-pid ${TT_PID} -dmn -host ${TT_HOST} -log ${TT_LOG} \
-		-port ${TT_PORT} ${TT_OPTS} ${TT_DB}
-	eend $? "Failed to start tokyo tyrant"
-}
-
-stop() {
-	configtest || return 1
-	ebegin "Stopping tokyo tyrant"
-	start-stop-daemon --stop --pidfile ${TT_PID}
-	eend $? "Failed to stop tokyo tyrant"
-	rm -f ${TT_PID}
-}
-
-reload() {
-	configtest || return 1
-	ebegin "Gracefully restarting tokyo tyrant"
-	kill -HUP `cat ${TT_PID}` &>/dev/null
-	eend $? "Failed to reload tokyo tyrant"
-}
-
-configtest() {
-	if [ -z "${TT_DB}" ] || [ -z "${TT_PORT}" ] ; then
-		eerror "Please check your configuration"
-		eend $?
-	fi
-}
diff --git a/net-misc/tokyotyrant/metadata.xml b/net-misc/tokyotyrant/metadata.xml
deleted file mode 100644
index 40aa45df2b01..000000000000
--- a/net-misc/tokyotyrant/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 type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-misc/tokyotyrant/tokyotyrant-1.1.41-r2.ebuild b/net-misc/tokyotyrant/tokyotyrant-1.1.41-r2.ebuild
deleted file mode 100644
index 1da7a34c2009..000000000000
--- a/net-misc/tokyotyrant/tokyotyrant-1.1.41-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user
-
-DESCRIPTION="A network interface to Tokyo Cabinet"
-HOMEPAGE="https://fallabs.com/tokyotyrant/"
-SRC_URI="https://fallabs.com/tokyotyrant/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x86-macos"
-IUSE="debug examples lua"
-
-DEPEND="dev-db/tokyocabinet
-	sys-libs/zlib
-	lua? ( dev-lang/lua )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use !prefix ; then
-		enewgroup tyrant
-		enewuser tyrant -1 -1 /var/lib/${PN} tyrant
-	fi
-}
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/fix_makefiles-1.4.41.patch
-	eapply "${FILESDIR}"/fix_testsuite.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable lua)
-}
-
-src_install() {
-	rm ttservctl || die "Install failed"
-	default
-
-	for x in /var/{lib,run,log}/${PN}; do
-		dodir "${x}" || die "Install failed"
-		use prefix || fowners tyrant:tyrant "${x}"
-	done
-
-	if use examples; then
-		insinto /usr/share/${PF}/example
-		doins -r example/
-	fi
-
-	dodoc -r doc
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-}
-
-src_test() {
-	emake -j1 check
-}
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index 18477ab1aa24..5e9652122e0c 100644
--- a/net-misc/wol/Manifest
+++ b/net-misc/wol/Manifest
@@ -1,4 +1,4 @@
 DIST wol-0.7.1.tar.gz 445648 BLAKE2B 80e34ee5a588f7caec92c17d3455abec8227789c30dcde46ecbb75d2f5d7f2a852f6a8c11dea54c036e63db73e28f6d2aaa32bbf7b5708f23c9005f163a17f5f SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3
 EBUILD wol-0.7.1-r1.ebuild 401 BLAKE2B 6ff91aaa835637c8d15ca4dece6ce25b3572720a60bac41551a106c95091b212be200c693269c94762952ec9dcf6097a6a58121b6d45f6af27ce5b78316bbdf8 SHA512 cb1396eb681e2bd3b09ea4b3c5327995c12e58f608e8685de7507a393feba86011ab31b2564e8a660c60834691720e54d7293810a4b14703a8cfbab57e18e78c
-EBUILD wol-0.7.1-r2.ebuild 484 BLAKE2B 9adcd4458a21f78c7a97180cbca000bcefb96f1ade4b50fdddaf1b01d745aa576d76429c142e463ed5b9bb0731877dfcb03031f938cd89d8fd4024fbbca1e5b1 SHA512 0bd4f65e476f23f3f4c0e4733e99ec1f4ff7cf3ef30a099ca65682d087f7b5e7ce02de3191f12afe184e8430fe7dc2fda8b01d6b4daacc8649f697f1970f3550
+EBUILD wol-0.7.1-r2.ebuild 483 BLAKE2B 6b4de653582a5ae031b656172f7c12f3a8d84c5f2423c7fda12d08b5d14ef46b40b7c2bc76cba052b5aa6bced9ae483f3b95f180d0b0aa6bf2a3bd554af23a9c SHA512 c48b48262ca61fe6bcc9ef5905edda43c30bd50137f21f11c9e9286152c182680f19682a261aecba92dcad4875695ff92d28cf2345ac7e18a6329a71b8056231
 MISC metadata.xml 735 BLAKE2B 6c3b6199ccb776a5ad5b817d70e72da0416207f98fd3b7bcf082f98088e592535da06571fe4f77c82d40b456e55271f3084ccff2f64e4c5cd610c31cd24c44e8 SHA512 0cff2c4127942f5dc455beeb78c63a271451a7ae38e03e53dace85c64353fc9214e803f67d39996289096b19e60ec2ae5ff3a4be61dd7a2570d9c9864182fcb7
diff --git a/net-misc/wol/wol-0.7.1-r2.ebuild b/net-misc/wol/wol-0.7.1-r2.ebuild
index 7879c04f3c20..d6279676502c 100644
--- a/net-misc/wol/wol-0.7.1-r2.ebuild
+++ b/net-misc/wol/wol-0.7.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ahh/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="nls"
 
 src_configure() {
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index 29f7bf430681..236ffd46bc56 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -2,7 +2,7 @@ DIST youtube-viewer-3.5.4.tar.gz 237736 BLAKE2B 900cd48025d28a1077f909a740d94824
 DIST youtube-viewer-3.5.5.tar.gz 238922 BLAKE2B 8e5b57f5e83ce53b3249e948e141042a4dff019e201718c5a75d5577a349707add5f2d4a6e5a53ff4968394b0b54df43bdee4933e9d4fe9ef62b6ed489a54678 SHA512 6e73565e7b8ba415e0f056a402804510af2d2d3e833daf3254330f75b404a21042318441d52b9b7ecb6659a693189c43a9b9148be4d3e154d4a1d23b402e8a63
 DIST youtube-viewer-3.5.8.tar.gz 239590 BLAKE2B 7230518b87f77d153820ba8c60af8e017cbc7e5f65d96597673f5c9500f5116a63aac28f385eac92a0df9e7f36ea7c3af8c4efa5b1ad55ae66afdb03abad95d7 SHA512 1d657c08ccf4fc4d79408e2020fda1f9187ffc1b6faea5524b4190627b46d22336b8faff22330882507ac81e3717344fdef614ea57717c1face1807a835ef746
 EBUILD youtube-viewer-3.5.4.ebuild 2077 BLAKE2B aeccdf3f4c52ef9c7c1d87fcf73abbaae60ed073379e8d49296555cefa04a8a4a35377a5813701de4434473efd9b7f93122b4432aab38f713b5840a16c28533e SHA512 e643fd7e4b39e992619b4c16acc4fbd23ff5227348a3d0379a67cb4608164c7115bcd5737db3e3be4075182ed963aa646e194715ea19162ad3698a4701e55181
-EBUILD youtube-viewer-3.5.5.ebuild 2079 BLAKE2B 7757729231aff1136e15af651df558b62f015d0da273111ead2085461e52b65e3f5fb70df8fe132231ae4f1e80d99ac48e5f64191d9695c85985b58b23d16648 SHA512 72ac6fe280939c42eeaf44c6e2d2827db79eda151d88dd212ac6d378f70607e1e816e74429acd2d241a967fbb9d4e2376b3706965df8bb5bfda471a02d976d5c
+EBUILD youtube-viewer-3.5.5.ebuild 2078 BLAKE2B 1837ac6173adf5ef912ee24629aab1ed60bd4b517afdb837bed91c116db388b781420ed8090922e4e382b9b8a0e5b3f8e8285bc4cb50e30562eb0b704236006b SHA512 0de363b4f06f55e7f474140984cefcc3fe0c279fd0733841ce2b200aa4d10b1324b7018c869b71210b4e0b4d93bdb70439c766338bfca88c7dd090d77215dac9
 EBUILD youtube-viewer-3.5.8.ebuild 2078 BLAKE2B 01429597f4165f51927b917bad7e9d98ed8d97e984246cc6a520f30722ff19d40dcacf97c57b7e094307368c5fd46727ba75b90b47d2ddefe035b565e606c151 SHA512 b134287f341b13dff777e469350e2ec40bd8126b89e5da0816a27906bfb39a40e5ec2c48d1809a8d98c64b2900019e6752c4f197cec9f21b2f5af30030378de2
 EBUILD youtube-viewer-9999.ebuild 2066 BLAKE2B 2e4b124f1665cf74802d26c2846bada76df74c1ec3c924209b5337317f54eec6966e91938813d07dc3a19b1fe175da51744a10ea1647a879d332865bece9c325 SHA512 020de8cd2fe7a25980841da52c21deab563bebd1e40f5135b8cac247dff88f55d5ddb1736ed75d631c82b171f2bdc1482040b5b723e5c4ffdfe32f6a0ff70b4a
 MISC metadata.xml 1001 BLAKE2B ea9aae31db72d91c37e3f37b672404262ad303a26461df31c78d4a45050ac27c46e9ed18b160eb96f34d15b08bd6250139ed2960834b0aa93923c2651bd19e58 SHA512 2136df64736fa79cae9cda680d3412ff700c03b943c19184a0d1c94d51f161b34eddefee88468ef63a99e87a553973caeb1241226fbac13eabb5462990d98fd6
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.5.5.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.5.5.ebuild
index b41e4a52107c..49098eec05de 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.5.5.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.5.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="gtk"
 
 RDEPEND="