gentoo resync : 13.10.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-10-13 22:19:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-10-14 23:22:23 +0100
commit: 4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree: 76e74807bc479502e13866b581b6bf86734ec634 /net-misc
parent: 30d6f67c98d149508509d5e86f176d558793acc0 (diff)
251 files changed, 2724 insertions, 1367 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index ed4cc60de16a..a9dcfef36e49 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aggregate-flim/Manifest b/net-misc/aggregate-flim/Manifest
deleted file mode 100644
index 4798dc9b8d44..000000000000
--- a/net-misc/aggregate-flim/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aggregate-1.0.2.tar.gz 51074 BLAKE2B f1b34e3aa805db329ff8839fa0a083edecb2a7af93d37ed08b49509858bea8d44bf11c5d99d1e20fe645965f34de4a59a71020183e16076c1fa2a333d1d0e520 SHA512 1d85f4457402e6cdcf9f68d58cf66401f6f9530930d3bba3005e1ae82e6c8283c720d2c1d88da906b83fccae47cb9128ae6b8f4781388d651ee206cea887e14e
-EBUILD aggregate-flim-1.0.2.ebuild 562 BLAKE2B dd3dc815702efb7237e9c642b9bdfc7dc998ddcf84c67a4c8894d549ff951ca15425dceb088404ca387b70144b58359f8c07f5076293d38bf1e51b8529a0cf28 SHA512 b2d2540793104f0fdb617db8a6b0af71e18383fc298250fb29ea9b5eb334193182c15223bddd27d297eaf4b4ad7ba64956671f495b57d97769d93878b8ac1757
-MISC metadata.xml 568 BLAKE2B db7e2338ae58117e2fbc9ef2e43cfcec1691f2ee88db5118a4f06b4df2086312f63f9904dc05f1eb74000e68a2212efaa31c1a95274d9d9d8cbe4762d3fe41c1 SHA512 ad6ad45f4bb48fdec0354105bf4ff3f1034c71e39d9ca98638249b69dc9e8c5105f6099494aff1e1214a506a75251b6123c5aa9744afec1936506f2c0b21268d
diff --git a/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild b/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild
deleted file mode 100644
index d2ab83b20b5f..000000000000
--- a/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="${PN/-flim}-${PV}"
-DESCRIPTION="aggregate is a tool for aggregating CIDR networks"
-HOMEPAGE="http://horms.net/projects/aggregate/"
-SRC_URI="http://horms.net/projects/aggregate/download/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND="dev-libs/vanessa-logger"
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	newbin aggregate aggregate-flim
-	newman aggregate.8 aggregate-flim.8
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
diff --git a/net-misc/aggregate-flim/metadata.xml b/net-misc/aggregate-flim/metadata.xml
deleted file mode 100644
index 92c124322a5d..000000000000
--- a/net-misc/aggregate-flim/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>robbat2@gentoo.org</email>
-</maintainer>
-<longdescription>aggregate is a tool for aggregating CIDR networks. Input is read from stdin and output is written to stdout. It undestands IPv4 networks represented as network/prefix, network/netmask and start_address - end_addres. It is able to read input in any one of these formats and output in the same or a different format.</longdescription>
-</pkgmetadata>
diff --git a/net-misc/asterisk-extra-sounds/Manifest b/net-misc/asterisk-extra-sounds/Manifest
index 50c044ef8cf5..f131d5c24a12 100644
--- a/net-misc/asterisk-extra-sounds/Manifest
+++ b/net-misc/asterisk-extra-sounds/Manifest
@@ -16,6 +16,5 @@ 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
+EBUILD asterisk-extra-sounds-1.4.11-r1.ebuild 1420 BLAKE2B a0c707d7bde726eebb1adaeef4130d5d20dd439675aa6ca95a96eeaf4315dae6c2ce25d88d0e9cab76fdceacc076ef3a39a62f22cf7bdb2149a09e1f387ed268 SHA512 ec0db8212930f95416ec8b9997bc7651a67fe10bc7ce4a47681b89a4f06dc900c8c857351e1724b1ac7d3a578132786f1c5e518f6d80bc94f95625ae430014b3
 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
index 4ec2a9e70bcc..b6cc5959914d 100644
--- 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
@@ -21,7 +21,7 @@ done
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND=">=net-misc/asterisk-1.4"
 
diff --git a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild
deleted file mode 100644
index 939771f572ce..000000000000
--- a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-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}"
-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
-		l="${ar#${PN}-}"
-		l=${l%%-*}
-		echo ">>> Unpacking $ar to ${WORKDIR}/${l}"
-		[ -d "${WORKDIR}/${l}" ] || mkdir "${WORKDIR}/${l}" || die "Error creating unpack directory"
-		tar xf "${DISTDIR}/${ar}" -C "${WORKDIR}/${l}" || die "Error unpacking ${ar}"
-	done
-}
-
-src_install() {
-	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
-		fi
-	done
-
-	diropts -m 0770 -o asterisk -g asterisk
-	insopts -m 0660 -o asterisk -g asterisk
-
-	dodir /var/lib/asterisk/sounds
-	insinto /var/lib/asterisk/sounds
-	doins -r .
-}
-
-pkg_postinst() {
-	local c has_once_codec=
-
-	for c in ${CODECS}; do
-			use ${c#+} && has_one_codec=1
-	done
-
-	[ -n "${has_one_codec}" ] || ewarn "You have none of the codec use flags (${CODECS}) set.  You need to have at least one set in order for this package to be useful."
-}
diff --git a/net-misc/autossh/Manifest b/net-misc/autossh/Manifest
index 8bd51e209f4c..74b5dbfb66a4 100644
--- a/net-misc/autossh/Manifest
+++ b/net-misc/autossh/Manifest
@@ -1,7 +1,3 @@
-DIST autossh-1.4e.tgz 65852 BLAKE2B e654f7bb3efb48ab33fe7fb52b812d5b3de9bcbf4ecd79fe67372f0c832bedf4f8fb30ff5ec116418c9a6317e60d4ea4f3d3b2be4d6a8bafa431a9b289954c9f SHA512 2f71403ee005103c6a3e2e669f6b26153161c95c8dacd3e73d61673461b3512348636877760d911341771e744c0a682b107df4ac48621661ff36a9fc0191f2fb
-DIST autossh-1.4f.tgz 67128 BLAKE2B 197c964272c47bce1a137eb45560a9f70c64686915d12e1f9827eaffb66151e124a4ad7e3b5980d539d75feb0180760d6df382da77f9195ad3f703c85b02759b SHA512 a66912a04d1b659802913ec63d7b951fa6265dedf4480f0ad2dfdfb852e1e3029355b9a132bf3fa5b4b67e5ac8dace83b96e837182d8b3f0c2c72ad9188b7b8f
 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 505 BLAKE2B 2c9b71350877d571675bd3ea3870fed4fb30238e52e30b4124c82d300cd2feda9e75d103b0e739f27584c08bf3eef1863b476c55e2bb81204515d7b8f6e3d8e3 SHA512 433af5c833e4caa82a06793ddde01837c6de1e5f0ce087a7746b7cb03b31fda61d438a5a1003f7aa9712dad65844042b9f5f7312a12abb90fed22697ce21f218
+EBUILD autossh-1.4g.ebuild 502 BLAKE2B a2d63bb81429bf158edc3c92ec6f5fc74705d3441f14b553cbe1562211a4f40c9e5399e156b3d006218dc31d73298ec5388e7653904e9f37a9164eb95dfe0d6b SHA512 c996e46e2dbb306103c3fb35650247ff8bc2fd2d0b6b6d6b3b15a82a67e20b4366b1b2921e092531639821ff33d57305f9e24a069b853ac69757c83301a9cabb
 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/net-misc/autossh/autossh-1.4e.ebuild b/net-misc/autossh/autossh-1.4e.ebuild
deleted file mode 100644
index 0d3180a991b2..000000000000
--- a/net-misc/autossh/autossh-1.4e.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Automatically restart SSH sessions and tunnels"
-HOMEPAGE="http://www.harding.motd.ca/autossh/"
-SRC_URI="http://www.harding.motd.ca/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="net-misc/openssh"
-
-src_prepare() {
-	sed -i -e "s:\$(CC):& \$(LDFLAGS):" Makefile.in || die
-}
-
-src_install() {
-	dobin autossh
-	dodoc CHANGES README autossh.host rscreen
-	doman autossh.1
-}
diff --git a/net-misc/autossh/autossh-1.4f.ebuild b/net-misc/autossh/autossh-1.4f.ebuild
deleted file mode 100644
index 066fcf2a77c6..000000000000
--- a/net-misc/autossh/autossh-1.4f.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Automatically restart SSH sessions and tunnels"
-HOMEPAGE="http://www.harding.motd.ca/autossh/"
-SRC_URI="http://www.harding.motd.ca/${PN}/${P}.tgz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="net-misc/openssh"
-
-src_install() {
-	dobin autossh
-	dodoc CHANGES README autossh.host rscreen
-	doman autossh.1
-}
diff --git a/net-misc/autossh/autossh-1.4g.ebuild b/net-misc/autossh/autossh-1.4g.ebuild
index 44afe463bad1..41eca6808fca 100644
--- a/net-misc/autossh/autossh-1.4g.ebuild
+++ b/net-misc/autossh/autossh-1.4g.ebuild
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="net-misc/openssh"
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 88af285e1af5..aee9514e02f4 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -5,9 +5,9 @@ DIST axel-2.12.tar.gz 82995 BLAKE2B da6e00cb577ffd9ab55c3b5b4362f0bdbc08ae89572a
 DIST axel-2.14.1.tar.gz 89356 BLAKE2B 43e278f09304ed9f872c9348fb2113758a046819c6c8667bd6bff65824a8a55c3d0ac647027947f76b9c4f334495284f30066fa3bd60bc0eaab4f4b5b5059620 SHA512 72c37fc6def0c765ed8220c27efe22255073b1e3cf1c8f6bda5ee2ce9cd36ac46263ac602a185efd40ca8f197a268612f2dcda69bcb49891c2538b910d971e8b
 DIST axel-2.15.tar.gz 96474 BLAKE2B 73b35b0c234bf2c21b5c6038979061c908de7520d923ecf6d84d7d6cee348c3e17b8f8d3771909ed74cf20899e3d8ece2cba44764ce625755e0ff44563c0fc43 SHA512 b0a516850b56b74fe763df3320b98e47f9977dda208cff9a98a87bdc63e37f5e0fd31d30c240a375f9d992320674983ced8201ee631187149e62b42804c48eb6
 DIST axel-2.4.tar.bz2 44995 BLAKE2B 03218c6243029695deae1a2d96b4e0cce719cf23602faf2d2fb4422f06ae313f5a1ed6759e7bc59a1ce756a732873ca5faed636742b608b6a66240b694b7189a SHA512 34d73cea19f2bf393aa8d3e4b6c24296f8b1d4e6177da6f4728763e013d5d9d073aa5dae31d0ff175126e8fcbd973daf94674a70f100afc9e7d00b92b78b8ec9
-EBUILD axel-2.12.ebuild 1118 BLAKE2B ad98b888508b865d055384096d9f45e94b7744eb1f58fdfe8e2c2deecb7b97813c0696c07644aeeaef4a3b1c54a8441cca53e53a8e5710d82e9a112f5ddc141d SHA512 4b2a6bb604306f25f69214e605abf391e0309266f908a6947b554ce8443382695dc845cc35de36e970e8a74a2c2304b3cc578c668056628d0ed3854124e50e24
-EBUILD axel-2.14.1.ebuild 1316 BLAKE2B b66b70cf8ac8a1bb9aaef9372b559d265f642dc29f1c1203f7a7aeeea4b7820d521d20b84f51159d91f12ea4494892ac5f4f7def3f7b4cba66b54443f41f3d2c SHA512 d3d304957df1bf5051689339de29df312c28ca22d104a615372a670bcb01b18062c7178622008686d118c1a738cdb8a0fd7c2323fa08309f3cc53d81598aa59d
-EBUILD axel-2.15.ebuild 1316 BLAKE2B b66b70cf8ac8a1bb9aaef9372b559d265f642dc29f1c1203f7a7aeeea4b7820d521d20b84f51159d91f12ea4494892ac5f4f7def3f7b4cba66b54443f41f3d2c SHA512 d3d304957df1bf5051689339de29df312c28ca22d104a615372a670bcb01b18062c7178622008686d118c1a738cdb8a0fd7c2323fa08309f3cc53d81598aa59d
-EBUILD axel-2.4-r3.ebuild 1247 BLAKE2B 618f8537f2042873859c850abb21c2275b108e8d31a7d7b23c9fda15c350328b4f6d76ab382ba99cf3e342ad641ee2889f3151121b517b20c5daae1fbd400a96 SHA512 faa5ee4628df473cef38395d5e458743697ee03cca323a690796d21ea26427e052b25a42b3362fa289a716fb12b600eeb19ef2fa833448aa150d9afe41221b08
+EBUILD axel-2.12.ebuild 1108 BLAKE2B a8b96a4e82b041e098990502c07a4cf1c60addbd80032527f0df3ed7aa6071eb32c922d91afb865ec9be21bed374d8a70a02f9c5bb91d9bfca134c0bc5a9609b SHA512 b7df6f7160734344d763fbca4c095dbbbfe5e4afe98a91bccce2da958ce8f21a67dc433164586ddaa02e61e2041898d64dc74ca1d699a35fd5c8affc9219488f
+EBUILD axel-2.14.1.ebuild 1306 BLAKE2B 85d9063a51d8c0e51e9bf74be671605c1e79b6e427ac48f09565b857f9da70f3955ad6d5ad3b3ce8cfa0f207f03a6a4be348a28be6a6e789e2620395844ccae0 SHA512 4327edc03fcea40ad2132700c284b4361abe8c4508bf250b5ad4bfa65acfea3f6c1ff893f65716b8b1687289229933a1761850378dc99aa314cb477d41d3c5eb
+EBUILD axel-2.15.ebuild 1306 BLAKE2B 85d9063a51d8c0e51e9bf74be671605c1e79b6e427ac48f09565b857f9da70f3955ad6d5ad3b3ce8cfa0f207f03a6a4be348a28be6a6e789e2620395844ccae0 SHA512 4327edc03fcea40ad2132700c284b4361abe8c4508bf250b5ad4bfa65acfea3f6c1ff893f65716b8b1687289229933a1761850378dc99aa314cb477d41d3c5eb
+EBUILD axel-2.4-r3.ebuild 1237 BLAKE2B d0d8ce79c27539a484d5fb95946dc899b795fb032983da603fe589915aaf0da3b23be582381ebbe721bc2d6dfab400765c57f7a6c2bac6857067d2894a8f547a SHA512 5df8d2b9540294029d86073950ae495a2ccea4f8a1f1b960963c3946fb0b5cf2c281b8264151e2104ebf0cec5dd1b27f55c9c636b132a9b44659024b8898fa02
 EBUILD axel-9999.ebuild 1187 BLAKE2B fa2b8d7b7ee68e682a54c4aa559d70ceb5ae9599aa4be96d3b1f9d72ef90a6b575472ad7fdd4c86a3fbede653b192b8eabbc661b5f66f2ec9e25b8d25549cf83 SHA512 490e1f2f403ae3dcfe9566daf27137a2ddd71bfb7646e8a80ec2ea842f9d4f5f37169330e2b9fcfc3a16047b2ac24efa02a72fe71ff24cb04671b28494171c3e
 MISC metadata.xml 297 BLAKE2B 9f26dea03e49f186ad556d820c49e2cce7a033c0d6afb0097371ee89cb645c77e997a774787bf45f1a579ec17b1535cd3d5c23599f0d872c197385881a00bdb8 SHA512 8d005244ca7b5f8dd30f9a158e4a53880d8a395bf11c73f8a3c7a3c668153a4c126b0a88942d3bd895a0e5ddc1f672eb770858356d0e12af75a098d36a80d56d
diff --git a/net-misc/axel/axel-2.12.ebuild b/net-misc/axel/axel-2.12.ebuild
index 5a8faece5f25..deb3bcff1c1b 100644
--- a/net-misc/axel/axel-2.12.ebuild
+++ b/net-misc/axel/axel-2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/eribertomota/axel/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
 IUSE="debug libressl nls ssl"
 
 CDEPEND="
diff --git a/net-misc/axel/axel-2.14.1.ebuild b/net-misc/axel/axel-2.14.1.ebuild
index 0b7470e5d7b7..aeda7636fbd5 100644
--- a/net-misc/axel/axel-2.14.1.ebuild
+++ b/net-misc/axel/axel-2.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/axel-download-accelerator/axel/archive/v${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
 IUSE="debug libressl nls ssl"
 
 CDEPEND="
diff --git a/net-misc/axel/axel-2.15.ebuild b/net-misc/axel/axel-2.15.ebuild
index 0b7470e5d7b7..aeda7636fbd5 100644
--- a/net-misc/axel/axel-2.15.ebuild
+++ b/net-misc/axel/axel-2.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/axel-download-accelerator/axel/archive/v${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
 IUSE="debug libressl nls ssl"
 
 CDEPEND="
diff --git a/net-misc/axel/axel-2.4-r3.ebuild b/net-misc/axel/axel-2.4-r3.ebuild
index d9fb8f0ef787..8f06b29de4f1 100644
--- a/net-misc/axel/axel-2.4-r3.ebuild
+++ b/net-misc/axel/axel-2.4-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://alioth.debian.org/frs/download.php/${DOWNLOAD_ID}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
 IUSE="debug nls"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 1090b44bd489..8161c1a73f40 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -2,5 +2,5 @@ AUX bridge-utils-1.5-linux-3.8.patch 435 BLAKE2B 0e9adb67c1cf21f58d85933ee2d00a2
 DIST bridge-utils-1.5.tar.gz 33243 BLAKE2B 211ecb831f802c119f32c30621daa781056bd9ff2fb5880d328704bd76b5b5b964d0671f77489fb9c71f25a3e073e5e4070cfa759deeba014aa1136ff60b1fdd SHA512 4e525fbd3defb509664ef3b728d9e5edfb92beaebdb5d7733d8203fb38cb3f4bb54d02dc1e28813889a2ee19c78b9b47da6d99c8032481a7fd7f104658dea7c3
 DIST bridge-utils-1.6.tar.xz 29904 BLAKE2B 4a816d2855a8f127dca3a19df326863848d36032c881a9093cd98b88f701d70486a9488e9761869629f29c6f5bc14305388eac3c22393a3e60dfdb3c9c4dda10 SHA512 b2ed39bc67349b7b91f2068cb505c0e3c89a8797d61e3d97ff957796cfe5fcef2c26dd788bd4215f628d69a4c8592377f4e632c3e181e87af3eaa238d8741e02
 EBUILD bridge-utils-1.5.ebuild 1281 BLAKE2B e6de8e0ad11732c63cf2d7ab327eedb2c64645ca17e716a334c31763283054df09b31fb4f25eb59ae3b168729ea6cdaede66d0f588ba023a7c38e755a92a5da6 SHA512 f2770626ffb714981d426b4d9f005922724389580d0dd3252c91123fdd94212b6aecaed5547c66a459dd1d1d6109d4f93453103c996e55a1659fa27e72c57636
-EBUILD bridge-utils-1.6.ebuild 1346 BLAKE2B c33c146b23adb59d332498b285f69c78aa7f6016c3272e32a4bf3119af297c008939eb0ca557dfe96b88c45d0279730097b7f7fe934f9f648d4b5953bc95a46f SHA512 405c661cba4d088ae986f75a1df0cf43efe623df0d0547242d05eab5575ba315a5f8e623725e7d59de59562bca86a65c4d789c80ee125c2364999041699bf08c
+EBUILD bridge-utils-1.6.ebuild 1357 BLAKE2B 44bc210ffe56da0c1a79950084251c6e2bad2acf7a621a4c996572fb8f26f53b298f5bd2ec029de6b07441037ee39c18a61cc07d015c78346e1b5e02f2077c87 SHA512 7a5710b0f74043736326f9bb78329dd07dd16b34570f1fde9b89266ac8a70c5f0504ca63cd2ee732b48c0c7b3d5a00f69ee8566a33ae4268d4c29d4e72b3125a
 MISC metadata.xml 491 BLAKE2B bf2e6636e5cd672907c0fa7a57894aadd2a56c6a86243d6894567e5819684dba5ef73419b9796d3e8e30e5d9048e13f4a11f714400f4b71dc2a61b8fee81467f SHA512 ec5ffecc293290fa0931f16fc447b5f9537d86db112462f6f865b1e4714e95c10d22fef326692d4506958956c3148061beba187e19b8549608f02ef974302bee
diff --git a/net-misc/bridge-utils/bridge-utils-1.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
index 5cdc85e8f10c..9ccebc972046 100644
--- a/net-misc/bridge-utils/bridge-utils-1.6.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-1.6.ebuild
@@ -8,7 +8,7 @@ inherit autotools linux-info toolchain-funcs
 DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
 HOMEPAGE="http://bridge.sourceforge.net/"
 #SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
-SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/bsdwhois/Manifest b/net-misc/bsdwhois/Manifest
index 4978c1e2947c..ad693534ac41 100644
--- a/net-misc/bsdwhois/Manifest
+++ b/net-misc/bsdwhois/Manifest
@@ -1,3 +1,3 @@
 DIST bsdwhois-1.43.2.1.tar.gz 85895 BLAKE2B 584bec2f58deee1208b35df1dae0b638049eab990cade979f56022b701d24b2cd653feb381f79e89610246743c8b20df2c7b83cffec68e3a00a9169c79edd7e5 SHA512 c1b3f93b8d7f838478d59cb70a7326fba84f87e1fcb4af9e7cc64ac1928adf96b0e6facbd6dfabaa7d146f0d1ea1abe1330771be4c7a6f3590d3c9e86a3b53dc
-EBUILD bsdwhois-1.43.2.1.ebuild 500 BLAKE2B 5ce0d4300c8466c52fee48c39b09821ce0883594ef03f20ef967c1577dc7fe81525cbb684e2b0e25febad5102c4ed881cca9968efc62ed9f6f5a13bd37de56e9 SHA512 658c6ef63db40d18b8cfec9d63dcc25a8f564a0c93758eacd96755b77c5da5ca0fc16375bb32bc0d072b01a1831e4540ab40b2eabb9b3228aa78ab04cc3e602e
-MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
+EBUILD bsdwhois-1.43.2.1.ebuild 490 BLAKE2B 05c4a8f6f6f44436c9759726df72246f04ea94c5a923ed8f9aa806832b291b25ac8580ea66d20b8b982de2d152a50ca56cb60b2dc79c5eb1ffc50482a881300f SHA512 e0983964beb98b29e955a2799869f66b16a0dc38856c04e23ed747ccfaf5eac8651f22bfa017ed6072a226d4184b502e04e86fc4fc2454e450213bc0a66b755c
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild b/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild
index 554e2ce63e76..20bd75b5bf0c 100644
--- a/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild
+++ b/net-misc/bsdwhois/bsdwhois-1.43.2.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://utenti.gufi.org/~drizzt/codes/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="userland_BSD"
 
 src_install() {
diff --git a/net-misc/bsdwhois/metadata.xml b/net-misc/bsdwhois/metadata.xml
index a00f3aeb1f81..6f49eba8f496 100644
--- a/net-misc/bsdwhois/metadata.xml
+++ b/net-misc/bsdwhois/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>bsd@gentoo.org</email>
-	<name>BSD Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/bwwhois/Manifest b/net-misc/bwwhois/Manifest
index 364028393fc1..009c67144d05 100644
--- a/net-misc/bwwhois/Manifest
+++ b/net-misc/bwwhois/Manifest
@@ -1,3 +1,3 @@
 DIST whois-5.5.2.tgz 50008 BLAKE2B 6f7a30e8e4f051b15fdc0aed62341665609612d5712bd1d3e61cb14b9ea0b2eb211231f0c1f3e67997f2abfd7f4e36e016f74ea9894c2230ce861058159fc028 SHA512 ee6c1fa183fa009a6e47ec0c51815a215f29e24bd443683a2df8f02bca822cb91c5fb91148aaea37c5d9c993e2c7ad39d310c7cd9358ea6a7fa88ec2c8aaba16
-EBUILD bwwhois-5.5.2-r2.ebuild 879 BLAKE2B 1fb213acfcf1795e64c4416d1f04f747e8607fa954afe174b6e42ec1f03f2c1bd05e8726b08d4789de1904bce284b6cd5eecade03f8d58190665ed8574f0ca6d SHA512 5580f9ffc613f02db731d4885dbf5aed15c095b7e15da60d20c8246eaf8bd0b210571ec501ba204861975c027241b0570d81a055a6f08c6ee09d80b0424962f4
+EBUILD bwwhois-5.5.2-r2.ebuild 857 BLAKE2B 9f098a94415fcacac17e3c60b29029b84f6bbe8592dc5eaacd8ccfcd731d25b58139cdee769e6c9547d0cfbe5562394d6013cd316985fd592bbdf5ede9897e8a SHA512 d49e697f91da69d3999a1cf833677a99f04143ef771226882297774d379a6de2110dd7c9baa5528b3a0f8caa8b29b7031b0a480c24696c8090f8581e9b9df751
 MISC metadata.xml 355 BLAKE2B 907ae0fec9a4a2284f98737d79de3747882c83bf3dee2588056ab3baa2720b987eda2930a3b79dae83327363d13fa72b98cc04d7b3d477f0b53f26eb6e11396b SHA512 31b407791cd97b141997fff192ac75298957edee59fe3a9c46d7a08f839b99ca2e4f3536632beca933d74a8e22464dbd7fd34fa61c106829c62c8dc69b1b8231
diff --git a/net-misc/bwwhois/bwwhois-5.5.2-r2.ebuild b/net-misc/bwwhois/bwwhois-5.5.2-r2.ebuild
index c2840fab62ed..a56efbf9f790 100644
--- a/net-misc/bwwhois/bwwhois-5.5.2-r2.ebuild
+++ b/net-misc/bwwhois/bwwhois-5.5.2-r2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
-inherit perl-app
+inherit perl-module
 
 MY_P="${P/bw/}"
 
@@ -17,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="dev-lang/perl"
+DEPEND=""
 RDEPEND="${DEPEND}
 	virtual/perl-Getopt-Long"
 
@@ -26,6 +25,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	# bug #440390
 	sed -i -e '/^\.ru/s/ripn.ru/ripn.net/' tld.conf || die 'sed on tld.conf failed'
+	perl-module_src_prepare
 }
 
 src_install() {
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 6240dc5cc2f8..12bbd174e64c 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -3,7 +3,7 @@ AUX admit-noclass-520696.patch 400 BLAKE2B 034166c262cae8df913275c5838faed7403e6
 AUX cf-execd.rc6 319 BLAKE2B 0abc025c3b122627576a4f93b7963a5bfc4b9695153e02b855812cab529ada9acbddbbda63095f893eeccf3d5c1c6b861d5f7130db31d56ebbad3d70c9d33af4 SHA512 cac7ac5126d8d2f3c3acf61a694e89f6a2cddbf0748442e4ce82064a520c077adf2bf6cdcd8dda398b684699c03031e9b48178bd21c97badaa84a2776a04998d
 AUX cf-monitord.rc6 316 BLAKE2B b19ff5106f87b5fed13e090552c9aa00b67d8c6597525e055823638a9c7909da810efddea216177b42557ac15ea760c89e488960526a624c4c7a7b3c30f0dd78 SHA512 d141891e6cac6ddc4dad6c7caa623e5fb43846a91c23ae99fcc27e9fad5aeed6c5ee2ddc4bf88363523bd04c977241d649b818833e13a58319c4b8a48efadb1a
 AUX cf-serverd.rc6 311 BLAKE2B 82ee5abedac139a55ff886c8503d17f6ef35a3da9bb14975b5e9647652545869cfd30cadb3ed553c868040a23f4a42a6da6eb29aed8a4cece5bb19401108b835 SHA512 ef22d159ab71c311e5105709956cfca11dbe1569de4278a87bfbe82a496ac9b0e715b35f65b66a36dc84b7f4254d00172f16ab72240348282f9702b084a7b8bf
-AUX cfengine-2.2.10-snprintf_buffer_overflow.patch 456 BLAKE2B 9466bbae7d47fccf3169c082abf5c32565a67816788d4c577a374a40c5914a0946e54b2374855f4bf98d1107989c5afc19cd0ba7cfab5bd04dc95d6f6f1a04aa SHA512 6e38707d638ad9570ba88d07c13ba0c0a5f13e8642b040b10a2cc25cbb27599c4108692ca44cc98a79b390a471e082cf68496e980d787be2f74fa11288ca817c
+AUX cfengine-2.2.10-snprintf_buffer_overflow.patch 460 BLAKE2B 81de82584ff683d13b2a209f9591bd7939e21d806269731cc3cdba73a0e07bcfa8495e108b419d8e80da3e99741df720e38f720b40133aa21bcc003c6bb4bc4b SHA512 14600a9b48c6ed326600ade59f833ab8d93837218070b5420ac7d4e45e1988a3e15554c8d9280c3d33d11613da3084ed728d5b27435d201eaa6a57978ad1167d
 AUX cfengine-3.4.5-acl.patch 1024 BLAKE2B 0cd02ca5c62cc088f9b18e55dae019cd2193d086d4ccba721869f2e2956c4fc613d3af07ad9831593dc06acc9a64788ab6a00ba32c0185a7b07351a578d50583 SHA512 f8e7987cf26c8791d3b0c816a61fdd8b877114729c804d096270f9e98c69f0cdcfe4d72a4120d9d8fa8fd260fae340ef75f9897b4a421da7648d05c10a4bc02b
 AUX cfengine-3.4.5-ifconfig.patch 1447 BLAKE2B 69fb92a9456705342f1231af7a21f3cf3c4f704cf17c85f99f3c4e85402d3364a03de3fb905912416e4c2ad257de017a76e197a7f07f8617eb530908ce843448 SHA512 e2e3f362777951c9778fe9f98f95fb934fd76a3a0af39612ab3a6aeec320d181834d4531382ab70c0ebc3162180dd9e9508f082ee99fd80fb5144eb1815ebc55
 AUX cfengine-3.5.3-ifconfig.patch 1776 BLAKE2B e96d9ac013494d43ad2dcf9c7ee5499eae3f799ddf36cf6c147fa9c416b01f31a2fd9b1de1377e82c4f389fda874b06e862055701343c58e5124eba58ab09e6b SHA512 33c7ce6a3f064e8d9fbb393dcf56816be3ed4e679864dd2163681686b15c458b7694a05731607971acadd643c763c8d94d3fd14d19e5fb1814e4898cfedf9ef9
@@ -18,7 +18,7 @@ DIST cfengine-3.4.5.tar.gz 4671628 BLAKE2B d6964631ef6a6ba2fab661c5d0b287f8a5fb8
 DIST cfengine-3.5.3.tar.gz 1542468 BLAKE2B e7e4fe1194563cc9e72e4262c934f7ce73c0a74749b131a424201445b954492d90dfc6a8b0530d5f9bcd2852b41b32ed25dc43e70b525dafc9c4a111b7c4990f SHA512 20ead13d5290905dc51567887807a0c2c5d9d753cb48ffe2859041b75239698ad0f4bee1ad0eac4eee96122b3a5a475d516566c1571c4fcbc460be757583da18
 DIST cfengine-3.6.2.tar.gz 1966966 BLAKE2B bb5be86ff1562fe44216c05ed179273dc803ef2a20d783f4692fe1fb533cd1914982671cbcc103c5f8f7118f7742f51ccbcdbe4408a86ebc566f444bc581e3df SHA512 b1bf6010d4309980846524ca94bb39f624f4ed0df3af220df91f7210b4441456840dfeeee4d62d6d6260b417ea7cf959509ca96c1a26c6da67bda7b3c1e5dbbc
 DIST cfengine-masterfiles-3.6.2.tar.gz 119594 BLAKE2B df01bfb5e5970fb386652ab1588d0b7d037d13018904506bd481b91720782bd837f7d54ca550d7b81e2db5fd535f053ac70e4ad5337d473986408e062e3565a7 SHA512 ec942dbfbc848455bbdaa157d6665d3e830cb967bbc07303aa4ee577cf2774d01bc602c57893372538b72d70b8b62b7e2a90ca9f8e59d7420d5b2f94fcd809e9
-EBUILD cfengine-2.2.10-r4.ebuild 3259 BLAKE2B 44a97cbb3ee1eac5145b4c5bad3b3055a79f870f4ccb0c9f7480c8d26137f558c227a17f9804aeb71b2bb9341f6d5a4666cd2224834db7830f1079df6ca041dc SHA512 8677db197908832d122a5670666f8ae335ad2501fe0cb1afca99f728bf97bb41f8f5bfce0325344efb98eca5c371f337f65b50423c24d3ae92d9e239dad138e0
+EBUILD cfengine-2.2.10-r5.ebuild 3241 BLAKE2B 71e64eb4d323556416c67ddac89c3170d5178a38d4b072bca81172565d741e0d1c69f0b4de25df5713c8eaaae0f15b9724a579df87e0ca9718276eb117d10d22 SHA512 e4e02b753f443af0bd7966ee7ccddea2170ce080585e807eee514f4071d19da7fb1805b6fd6e42586b3c8ed2bc1777ff134b8853c6730a1b7c821b2f5ee792f6
 EBUILD cfengine-3.3.9.ebuild 3533 BLAKE2B ad0ad3ba282e9d595d6f5e6b049d8657171f0365125e0659c19ed0916671f84d6f2021a7f6480df675b152d4d5051a9746038392d1e0584e9efd3e8f1d732447 SHA512 a7b32de25e48d8ef00bda6d6dae9c5e734afd3511602d2c3f80a3a632d339eb811a0ebf39cc71a48b88492295f3210fa69f2fe16b9a0ebe929b0dbcca5e5a4a3
 EBUILD cfengine-3.4.5.ebuild 3759 BLAKE2B c661c7270bb701b4b5b6438bd6a1bbed609637aab9c9000e9b0daf3ba3a702d2d5953d51be8dc6e56a04bfe42583205ccdf8b26213de7be678d8ee254c75aed2 SHA512 c588abc9740b0ced92e16b2862cba76d6c12622d9d4965bca43ad5519e6e0d0e205ac1e3879af7f55fff6eea55feb07f6b17d9e69dc913e949490b85482e7de8
 EBUILD cfengine-3.5.3.ebuild 3826 BLAKE2B 9c78d56b8f52ccb0f28ebe9d432af2d486913b6f808c324ff99b2c2a0af6fb852dad3c3800b0a35bdadae2a97e8bb75ae516f64137062dc086dafdab91a4f0b0 SHA512 612841631d6587d12e0f3bb3867139bdb1719778d14c464b47226ea88c7063e9a4c1408c52068c9f43297a635addd20ee3f14ec1c9b49739bdd8939a5e6a7d08
diff --git a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild b/net-misc/cfengine/cfengine-2.2.10-r5.ebuild
index 0c4a8b4c5523..22bdd71cfd9d 100644
--- a/net-misc/cfengine/cfengine-2.2.10-r4.ebuild
+++ b/net-misc/cfengine/cfengine-2.2.10-r5.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils multilib
+EAPI=7
 
 DESCRIPTION="An automated suite of programs for configuring and maintaining
 Unix-like computers"
@@ -12,71 +10,75 @@ SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="vim-syntax"
 
-RDEPEND=">=sys-libs/db-4
-	>=dev-libs/openssl-0.9.7
+RDEPEND=">=sys-libs/db-4:=
+	<dev-libs/openssl-1.1:=
 	app-portage/portage-utils
-	net-libs/libnsl"
+	net-libs/libnsl:="
 DEPEND="${RDEPEND}
 	virtual/yacc
 	sys-devel/flex"
 PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
 
 src_prepare() {
+	eapply_user
+
 	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696
 	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
 	# https://bugs.gentoo.org/339808
-	epatch "${FILESDIR}/admit-noclass-520696.patch" \
+	eapply "${FILESDIR}/admit-noclass-520696.patch" \
 		"${FILESDIR}/511666-segfault.patch" \
 		"${FILESDIR}/${P}-snprintf_buffer_overflow.patch"
 
 	# 2048 causes crashes on some 32-bit hardened kernels, and the warning
 	# messages say to turn it back down.
-	use x86 && sed -ie "s:CF_IFREQ 2048:CF_IFREQ 1024:g" src/cf.defs.h
+	if use x86; then
+		sed -i -e "s:CF_IFREQ 2048:CF_IFREQ 1024:g" src/cf.defs.h || die
+	fi
 }
 
 src_configure() {
 	# Enforce /var/cfengine for historical compatibility
 	econf \
+		--disable-static \
 		--with-workdir=/var/cfengine \
 		--with-berkeleydb=/usr
 
 	# Fix Makefile to skip doc,inputs, & contrib install to wrong locations
-	sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' Makefile
-	sed -i -e 's/\(SUBDIRS.*\) contrib inputs/\1/' Makefile
-	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile
+	sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' \
+		-e 's/\(SUBDIRS.*\) contrib inputs/\1/' \
+		-e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
 
 	# Fix man pages
-	sed -i -e 's/\/usr\/local/\/usr/' doc/*.8
+	sed -i -e 's@/usr/local@/usr@' doc/*.8 || die
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/cfservd.rc6 cfservd || die
-	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd || die
-	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die
+	newinitd "${FILESDIR}"/cfservd.rc6 cfservd
+	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd
+	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd
 
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
 	# Remove static library and libtool file as they are not needed
-	rm "${D}"/usr/$(get_libdir)/*.la
-	rm "${D}"/usr/$(get_libdir)/*.a
+	rm "${ED}"/usr/$(get_libdir)/*.la || die
 
 	dodoc AUTHORS ChangeLog README TODO INSTALL
 
 	# Manually install doc and inputs
 	doman doc/*.8
-	docinto examples
 	doinfo doc/*.info*
+	docinto examples
 	dodoc inputs/*.example
 
 	# Create cfengine working directory
-	mkdir -p "${D}"/var/cfengine
+	dodir /var/cfengine
 	fperms 700 /var/cfengine
 	keepdir /var/cfengine/bin
 	keepdir /var/cfengine/inputs
-	dodir /var/cfengine/modules
+	keepdir /var/cfengine/modules
 }
 
 pkg_postinst() {
@@ -102,10 +104,10 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	if [ "${ROOT}" == "/" ]; then
-		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
+	if [[ -z ${ROOT} ]]; then
+		if [[ ! -f ${EPREFIX}/var/cfengine/ppkeys/localhost.priv ]]; then
 			einfo "Generating keys for localhost."
-			/usr/sbin/cfkey
+			"${EPREFIX}"/usr/sbin/cfkey
 		fi
 	else
 		die "cfengine cfkey does not support any value of ROOT other than /."
diff --git a/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch b/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
index dee9b797f6ac..80a3a542974b 100644
--- a/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
+++ b/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch
@@ -1,5 +1,5 @@
---- src/instrument.c.old	2010-10-15 22:20:58.014091858 +0200
-+++ src/instrument.c	2010-10-15 22:21:34.132271440 +0200
+--- a/src/instrument.c.old	2010-10-15 22:20:58.014091858 +0200
++++ b/src/instrument.c	2010-10-15 22:21:34.132271440 +0200
 @@ -542,7 +542,7 @@ while (dbcp->c_get(dbcp, &key, &value, D
     
     tthen = (time_t)then;
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index 91374a8f5c75..3f6d6ebdddce 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -5,5 +5,5 @@ DIST cni-plugins-0.8.2.tar.gz 1997790 BLAKE2B a3c0196c589a3a77de100a87ca8d3eb952
 EBUILD cni-plugins-0.7.5.ebuild 1070 BLAKE2B 752d58ce8af422059a73dba9dcf25c3695f63fc12b66ceca111c16b0a82b4c419256e454f6ef2618d2b2766d9419ab8fcd8b18c2115542e8c07be98cbc6f7d9f SHA512 da1505026c64b785ea08445748b5f262a4b1a078a220781f367ade8d7b61774829b6c0beb277cb9a6a53a9ad946c1538cd2d6c7e6b23de29c222bca03e7d9364
 EBUILD cni-plugins-0.7.6.ebuild 1071 BLAKE2B c91d75b0731d98706fa8a739c245a807267e9f1523f6fcf0572d60126d53ca316a6229fc54890321e4e54953c55aa00398a74075b7a5c03ac357c01bce9f3a1f SHA512 e587dc1bef7bd8f476f31e99444636c38d175827cd75742f96dee2fc40e2a1a5c6a69519137ca42c9a0a1ae50c7efdb4813a89994552183160c4c0dc6bdc74fb
 EBUILD cni-plugins-0.8.1.ebuild 1130 BLAKE2B 1aa3cef41088f7be1bdbd050a547425ccd2ce2cefc0afcf8ac029980b043ff6f0cca65b576dda9315bdb5613a80abd3088e14a890759a2173009cdc0ce838dae SHA512 acb61386ae8a713f971138ca95e3394807ac238c906308695cac766bebdca5599607311e704fe77224401f42bd7e2c7d7b2db325b8f7278aa6fadb8411544725
-EBUILD cni-plugins-0.8.2.ebuild 1181 BLAKE2B 9cf5c0c0ede72dbf6454166a2a1fab9c9adcdc40277d2542b526f6584148f9a4416fb710a4f352bd4916d9c4aeb29386527cf86cce7a57deaa35a22e68b4e11f SHA512 0c14d1b3a0df0a397d3c0253592ab4e6d76cdad8335db44a960b74fcf1424a6c21e4c4fa54d8460db9db3d5c7e41404c1c6872536d05699f1012c466b15af5b5
+EBUILD cni-plugins-0.8.2.ebuild 1180 BLAKE2B 65c6677411bba468a5c77361326aff928a83651e3b7326391724e83a3f7c5fb89b81819d2e12217e2fca64568ce53f1aa0714fe7cf05a8cbfb3a4378687d43c3 SHA512 2a390ea446112f068067d6e5d40e5a2d96242d772593856a1cb727c424ac0afa4e3e0dabf53fbecdea0613873f72d0d3018a72444ae58235a5e69905b800be4d
 MISC metadata.xml 347 BLAKE2B 3028c057ca5c58bc39b10c01e9989088f0a2498a5a95a1ada88517dffe62daba52c8e6ead2fc8a7245ae06a95ffbc9306de03eecc82464ae0a6d2fbb4cdfb99b SHA512 b977f4287446648ff730c36e71002f524ae9a96c3fb104ee8542da90f6f996926a9b9809007f285e930d79842d9663cf4e462e8ee50da8319dcd3e07cf6dee05
diff --git a/net-misc/cni-plugins/cni-plugins-0.8.2.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.2.ebuild
index 4fd45539a5a6..9d70c2e35d1b 100644
--- a/net-misc/cni-plugins/cni-plugins-0.8.2.ebuild
+++ b/net-misc/cni-plugins/cni-plugins-0.8.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit linux-info golang-vcs-snapshot
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 DESCRIPTION="Standard networking plugins for container networking"
 EGO_PN="github.com/containernetworking/plugins"
 HOMEPAGE="https://github.com/containernetworking/plugins"
diff --git a/net-misc/connman-notify/Manifest b/net-misc/connman-notify/Manifest
index 602d57ff3e69..b118bd726e62 100644
--- a/net-misc/connman-notify/Manifest
+++ b/net-misc/connman-notify/Manifest
@@ -1,3 +1,3 @@
-DIST connman-notify-0_pre20140623.tar.bz2 2858 BLAKE2B b76865e5392f9b6ed2dada5b323e0f867fa70b5ba21bb6342069f7f6a28468d2915dc9c573bcb4ebc061c3039fa6f0bbfd6969464d264b710f3aee149b1162a5 SHA512 8da432cfe0653c29d83afffeacd11e9d66795be061040286ec8b90ce28c334c729af24cb7e1aee0f32e2b2626949f7ee9c95c52b4a3191392236bad7b204a267
-EBUILD connman-notify-0_pre20140623.ebuild 965 BLAKE2B 85b8442aac794b13553cfb4b3701db423e393b7540eaad16dd717460073c370a84f02d9e8bc6b20e6c7a0ead4ec9fd753336552a65c06e7994b5637a3872c9c8 SHA512 df2eb9b60c7705c7b0558238c75a65a4113b168c200fdb0e09eac2ddcb8b21fe9ad34c153de1f0cfa3f17801d3b3a08ff943a061e24d408a5d249c6feac084bc
+DIST connman-notify-0_pre20191003.tar.bz2 9102 BLAKE2B 7c31de51b21f7cae475b543cf74bba1d969c779f00d1dab7ebce2da6758e1dec6c3c06ae1f0ab133292fc03c1dc61cd1c18c4719311f7a7b65f1771afb097b64 SHA512 6ca8dce104fc5c94af8ef4fab94e44f6a921017d58bbe12660f6bb6a6a0ab6b0808bb7584b75d2acaa486d4cbe718f436fcf7924d6baac97b59a2b77a13215f4
+EBUILD connman-notify-0_pre20191003.ebuild 913 BLAKE2B 0eaaabddafbc141e22f2e44183e56753231b1a64e61a161b544a9be435d277af0c4aa43e5bc6efea1e3177b950a2cb537bd63207e0922cfb20154363fc854ed6 SHA512 c323ce6c093b1fd2ed4c00dda472596a83e44550594cc646985c7b85aac733ca18cbe379130c0fb8165c4d06a633876c47aaa5adef9b19a8a1e8834fbac02757
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/net-misc/connman-notify/connman-notify-0_pre20140623.ebuild b/net-misc/connman-notify/connman-notify-0_pre20191003.ebuild
index 3d32d97d793b..4c4c3e6b29ed 100644
--- a/net-misc/connman-notify/connman-notify-0_pre20140623.ebuild
+++ b/net-misc/connman-notify/connman-notify-0_pre20191003.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit desktop python-single-r1 vcs-snapshot
 
-MY_COMMIT="0ed9b5e4a0e1f03c83c4589cabf410cac66cd11d"
+MY_COMMIT="4f1e0a6b27ebf5d9b7508594188fe0f86c34ec52"
 
 DESCRIPTION="Desktop notification integration for connman"
 HOMEPAGE="https://gitlab.com/wavexx/connman-notify/"
@@ -21,11 +21,9 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/notify-python[${PYTHON_USEDEP}]
+RDEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	net-misc/connman
 	virtual/notification-daemon"
 
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index 74063a773bb5..12c08d3b868e 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -4,5 +4,5 @@ AUX connman-1.35-include-ifbridge-before-netinet.patch 259 BLAKE2B a6c5ae9bfb61e
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
 AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40
 DIST connman-1.37.tar.xz 707752 BLAKE2B ad8993764a444d205b0a8cf1ad38acc249a1a28014e6f4e5a89c8662194ad2e2ee6091b51445b88a885808461413b3aaf88eeb7b75a32f417b578d2da80a2e9f SHA512 5d5363105aedd0c9d609dd5c64eb832d9ff80923a944d9d3738337a61f180ded227f2ae1ff7912bed8826b35f0cfd20488e3ffd3801f0e53e90f98498e19efb6
-EBUILD connman-1.37.ebuild 2585 BLAKE2B 85b05691115de1eab752921c450958a3424208967ad7ce3bcec8f85abc95c8782a027d151962b05cf461045909d8a9c7c60d8440dfc19a2842c2426f05751271 SHA512 97554f09d10bfb059a68dc79eb15153b475184e6d4cf3b3e024888dde1ba62e9a18bc3ab9b50a47f0ee4a8ba7027c2a4483e986161311beaad9d14d655d8ca1b
+EBUILD connman-1.37.ebuild 2596 BLAKE2B 6c8ccfffaaad05f5a09b93b11dd9fc5000c3899db79f84d6bad9a959ebea5c01f21f0bef203fa1524aec6a16e384c0167167b8c3915bd230fb721b15e863ba8d SHA512 ff3f15f3258908c623d8ba0b6295a825984db6a905189595ae7fe506d316b3076d03b396324187852161245e555f257f4c0e8f560284bcdd38d3c593164bfb5c
 MISC metadata.xml 1158 BLAKE2B 57d083417dd0b186b1d45368f1ffab64d6283535ae6f25adfd6cd85d26f535544f0b89d7f731dbb876ba7acd1973abdd26ac7643c050adc9a433d321ffc9fb57 SHA512 2d272d638d9f9f06eb900736815eb0e401520f3ad86082beea541932626c5758e220f692931772ecafffbd60798f0df38e8c9e8a02b58c03743ed984955edb8b
diff --git a/net-misc/connman/connman-1.37.ebuild b/net-misc/connman/connman-1.37.ebuild
index 9915aff03fef..a81c15709fc8 100644
--- a/net-misc/connman/connman-1.37.ebuild
+++ b/net-misc/connman/connman-1.37.ebuild
@@ -6,7 +6,7 @@ inherit autotools systemd tmpfiles
 
 DESCRIPTION="Provides a daemon for managing internet connections"
 HOMEPAGE="https://01.org/connman"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -15,7 +15,7 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="${IUSE} bluetooth debug doc examples +ethernet +iptables iwd l2tp nftables"
 IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
 
-REQUIRED_USE="|| ( iptables nftables )"
+REQUIRED_USE="^^ ( iptables nftables )"
 RDEPEND=">=dev-libs/glib-2.16
 	>=sys-apps/dbus-1.2.24
 	sys-libs/readline:0=
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 27a3dd3a1f90..355004e9eb19 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -4,7 +4,7 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8
 DIST curl-7.65.0.tar.xz 2392324 BLAKE2B e5aec8c6cb6f6baabd035ce2ea159dba1541011658892bb883e917541aaffe6ebfb0d2b9f18e2357059a7bc1e3a8db47b2aed7a74597b21c14f0892ad6e9eb68 SHA512 032c065c1d4bd07ba028625f8fab6a09e7cb8505a5f19339b3abdee5a9cda7d091c11f075fe3fc227d082690a66c558c770a4cd9fb17b52acc13794976a770c5
 DIST curl-7.65.3.tar.xz 2392472 BLAKE2B 25726e1f1568fad6a8419b29dde41bed4d9de4be70740119879beeb08ff2a6ace7737efe1fb6d96ecaacaf8f90dc0142ceede2b90c84275ea8f72bcd09f21dba SHA512 fc4f041d3d6682378ce9eef2c6081e6ad83bb2502ea4c992c760266584c09e9ebca7c6d35958bd32a888702d9308cbce7aef69c431f97994107d7ff6b953941b
 DIST curl-7.66.0.tar.xz 2414840 BLAKE2B f5d731c304c826442a8509016d00b9c68438ef9102b3c844c15315181c307e338f79930dc548d7f189b944dd74cc7eeb19d130b5a967ea2efa9862d15ae78bab SHA512 81170e7e4fa9d99ee2038d96d7f2ab10dcf52435331c818c7565c1a733891720f845a08029915e52ba532c6a344c346e1678474624aac1cc333aea6d1eacde35
-EBUILD curl-7.65.0.ebuild 6975 BLAKE2B 3ba830aa65b0c9e98f5128289a7c8cef5c3cbc2ee91881f47bb9318c2fe82f5121942c4263cbcef5d6ab26c602e4a2b1ffca795e8253800c5318a3c4f6c16f23 SHA512 fef5557f9175b3a8c6240e6a89dfb994412948a6e44ec356e308f4fdafd0362df2f63400048c9ea0d6cece07240370965ba51d39424c3014ee761db1d799bc15
-EBUILD curl-7.65.3.ebuild 7160 BLAKE2B 2dbbba6596cf5d1dde4e0a85f992327379043508bc78b1e2bb10dd29c2738a9505abdda5cd991ec36b9b56aeae3f13b5d5088429cd136185d9383956d80241db SHA512 2f4bde9132616c39f053e81cd068ad7529fa6baf68eb96f9da55b9308f49e51321bf458023df445b3d0eeebc13394cccc20ad2b902fc8dbe34b80863f3a421ea
-EBUILD curl-7.66.0.ebuild 7236 BLAKE2B 51f16135e0dd3c0ecf6248874402bcf0ecce320d8b8b2eac695e11f859c84d7802154f52f72784936d538362d1981765b27ded037e44834d0b4558e3d269ed76 SHA512 4ff5bbb4436a2117892199eba43df7b154165a1351a027258312c46da9935e61adf9ff8e7a1debcf0f1a0eb8c4088b78008270c52d2b1a202c2be418b78d2c37
+EBUILD curl-7.65.0.ebuild 6953 BLAKE2B 3f0dcce2560ef08897189f44afd843e0322176d6e1368a9bf02211670d4b5fed096d23b1eeb02f89eb44d12f10f1e78839f8dac2a5ad66b225bba5d967942a39 SHA512 b554bca7de8c0cc32e2075d35103da865929fc29c447d9fd0314a161b3b300f3e89d0df2ff8dca15e2d2aa6484ec97ca4ba078cb14abfca57a7b43e8d93d90f5
+EBUILD curl-7.65.3.ebuild 7138 BLAKE2B 06732af10263c41e523f0b36637597fb81d51cd26eedbd198cc2cc59758da3c36e74fc2810296400df2576576b94255637e35c018751c91be9d8333a441b90ca SHA512 f13cbc01affb023970ec54686d09d56bf59660c634399383c709405074e9e77ffa476a418ca9b89aacadb1541b4f2e01c2180e871f1bf5885020b9f0e9ab6494
+EBUILD curl-7.66.0.ebuild 7223 BLAKE2B 6dd95d4ac83ecfca3684c2eaa15f3fe65f072a003eefdf00b72fe7434d6c3986bb964477945271a929f32d380ea5ebea816feac83cf4d5b662b0d43c18e892bd SHA512 58a2c03b1a2d19a1b839a6800c22f78ecf4ca48fcdd5c3fd374ba2bb8829d42db73ef822a3159ad27e00bff0006356677fe24eda09371153bd8aebf31d31a50b
 MISC metadata.xml 1016 BLAKE2B 3b6cced0cc67b21cd3b8939d2c75106cf72eb92f186e2cd12a3c55b3d58a9d1e216f21b090db920c7b0cf18c4744358f5642602d2cd1472bd36ad554b87e7d33 SHA512 dbf81245497503293ad73160f337cffac29f7e7771e2a026d840bbed04c994164e62f72523f677a4e2ae3b656c27f90d5aba518e46f05df819f8696bb66fdb1b
diff --git a/net-misc/curl/curl-7.65.0.ebuild b/net-misc/curl/curl-7.65.0.ebuild
index 2288b6efa99d..fa44c791eeeb 100644
--- a/net-misc/curl/curl-7.65.0.ebuild
+++ b/net-misc/curl/curl-7.65.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/net-misc/curl/curl-7.65.3.ebuild b/net-misc/curl/curl-7.65.3.ebuild
index 85324e17a3e7..b93ba55b05c5 100644
--- a/net-misc/curl/curl-7.65.3.ebuild
+++ b/net-misc/curl/curl-7.65.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/net-misc/curl/curl-7.66.0.ebuild b/net-misc/curl/curl-7.66.0.ebuild
index 66454bf5359d..86708b83a0ca 100644
--- a/net-misc/curl/curl-7.66.0.ebuild
+++ b/net-misc/curl/curl-7.66.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
@@ -61,8 +61,8 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 # ssl providers to be added:
 # fbopenssl  $(use_with spnego)
 
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+DEPEND="${RDEPEND}"
+BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 	test? (
 		sys-apps/diffutils
 		dev-lang/perl
diff --git a/net-misc/dcetest/Manifest b/net-misc/dcetest/Manifest
index dd3f7b5f487e..4402e3b8c3da 100644
--- a/net-misc/dcetest/Manifest
+++ b/net-misc/dcetest/Manifest
@@ -1,4 +1,4 @@
 AUX dcetest-2.0-fix-build-system.patch 383 BLAKE2B 0bae31116e4cce63d8ab94aa32c7cc26d51640d434da533bd34df4f1005012a8c457cc1df3d46dd1223da51bbb11babcf618acb1ad8b29de5c52f12adb69c8db SHA512 2305949aedbcbbc152edb1ea992f3801e40b1096dec1e1fd972154d3351df6c691d64af737e6782e30b03de972635bd91be8063cefdbb528f9330cb0a01c4ac7
 DIST dcetest-2.0.tar 133120 BLAKE2B 23896f8e40711f8e5123bc24194d302d6ad697e7412d98b7d53f0f89d308a52139e3c892a6de9e55dbfa10cc8e0b24d70fd6284b7d1ea5e461146edb27653fec SHA512 ac14f753fbd88be14a4d060f24773200967228154be0d3eb19becb38fd90093e0feca0d9a43873ffad59f5ea2489d35de5e4958f72c2064f98506954b698afdf
-EBUILD dcetest-2.0.ebuild 635 BLAKE2B f8ffab2606ca50cac5fb7d55a9179c3e27ba2e0c3b2637261001acbf33198bcf15816aa6aab797fc56c7c919372300103f0bbbe5cac94bd0471f9f3ae1774f64 SHA512 45418b834438305dab0f1de8847dedc774300d5a4db6100887d43d8cdc83b1fb7539b49aeb869994d4582576f9f268ee1e0cd8e2eaa16f6323168e51ebc355a9
+EBUILD dcetest-2.0.ebuild 622 BLAKE2B 90e3ef93faf29d0f80aa032f2f94d0af9655ba5113d68df29a69e6d2cf322f71d00b49e484c9de85f1ae47ba07d0b983eacedf092982f3bdca1466e0882765b5 SHA512 19a9c43115c33e920edb4031b94cc81586bf0e48208dbb27fd1a74ee31d69d474ad133436ba7d9f71a9f0cabb27cbed823b1ff926167de03a3b3dc2e72067ecd
 MISC metadata.xml 1150 BLAKE2B 2d8ca02885c19ca28b1fa4e4786a8f71b3b8fc9354bf364c458353c35a7d816e85745ae96a6df2878b82e05a20331eda0879cb145171fa7a8d84920f9573bb13 SHA512 b145c72107ab8df8b6f04c72ab71a3604a9f8447080b82266e79173f8a7dba8df65e9c2cc8731667663a31dddc60b62f6c7cd1e0c4e772791bfddbd9f5bb11e2
diff --git a/net-misc/dcetest/dcetest-2.0.ebuild b/net-misc/dcetest/dcetest-2.0.ebuild
index b0b822c166a4..2582aaac5bfa 100644
--- a/net-misc/dcetest/dcetest-2.0.ebuild
+++ b/net-misc/dcetest/dcetest-2.0.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="dcetest is a clone of the Windows rpcinfo"
 HOMEPAGE="http://www.atstake.com/research/tools/info_gathering/"
-SRC_URI="mirror://gentoo/${PN}.tar -> ${P}.tar"
+SRC_URI="mirror://gentoo/${P}.tar"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 14f18ba3a705..fa777183f4f2 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -22,5 +22,5 @@ AUX dhcrelay6.conf 325 BLAKE2B be916f3f73eab9813f6b548be254277659f267610efb3ecd5
 AUX dhcrelay6.service 237 BLAKE2B 2b32d453de82873f18ce905c5c336e974d4d5263415b51860f28d93bbf449056809471da1965f6ed5e79449bfe39dba65516fb113eb140771b81e866211e01b4 SHA512 11d17aebef403fce1f3b0514f1c7206cb6520f1712c603b016c11275a83e102b969cc371dbe5a3a9c430a392dedf0c7af33692a49197092c467ea764dfaede9d
 AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9153dd26c4a0e6df687ca284554fa1d2b304af2f2dbdaac9a3cfafafc362befe8864d386f304588fa4c61092 SHA512 2ac54a5ebdf009854700e6f6b70662b36787b71a5b917fc61be35d31762508ede0e81b3874965b91de655a088914dbe43927911d8df1a16c262cb68389c168a9
 DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7
-EBUILD dhcp-4.4.1.ebuild 7926 BLAKE2B 37389be9b39e4531834b549b8ba56a38306cf2306f8fca2d7e0547398ae807c6ae0413d064267cb56f73d3d5ae1a81d60b323f93dee0fe20a6507c16d1cdf83c SHA512 3498e0fdfd166201b5505168014f14da93a327a8c8488577d6c6bc850895a910e448fb46f55ac1e54f45f815c73db84dcfa42fd97a8b3760dae2e75f9b19b766
+EBUILD dhcp-4.4.1.ebuild 7904 BLAKE2B 0f0f9a8b0e27d67754b6898d7105065bca5826780deb1570f52ab52a51795302a05215fcd8619ea24333f6075ffa62a515ef750cb99aa65eadaa077398ff5cc4 SHA512 cfb21426ab556d34ec2ce33654d471d57783bdedf181c5a6a7a007d806b007f981fe8cc869121285ccf0e4c515eba7225a836cd45b708323419abd9e4c8a824d
 MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index a0bdbf50b4de..10761528763e 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
 
 DEPEND="
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 1bc6721aa879..acbcbc505904 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -2,7 +2,9 @@ AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
 DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
 DIST dhcpcd-8.0.6.tar.xz 224552 BLAKE2B 5d0fab5977597ce182a2de56c8c4d085d3595a8f1209fc76788b707af0fffd4285a958cebfe7bab6c04ae7a2ba94c466d689dc9c3a71708c1baabd328b2bbf3e SHA512 19a568800a4e510a250de7cc111700b364c68bfe3907f1ac2cda81aacd079cb9ac87731cbabbf8f1e85e055a11c7ba88e419f6c4d7b33f8842dfaeadc7d1e193
-EBUILD dhcpcd-7.2.3.ebuild 4407 BLAKE2B 6f5df954ec0be66be6a4f4c1b63a1dee87e78d5cab8de8cbe935bd0d2a82caf70c5dc8d513ddc69b6e317a3d44c2a527529420da71ecf1489a71cdc2f4384eb5 SHA512 aa591926ec797c71c9d28d91a64257eaee76e2fae6853925e0b0fdf9001fd6279bdae68bdd2727f500661b8142c96b3c66ab28b055fb8887c4b7d96162d42843
-EBUILD dhcpcd-8.0.6.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
-EBUILD dhcpcd-9999.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
+DIST dhcpcd-8.1.0.tar.xz 225716 BLAKE2B 5b9fd2213089b6b522b405fa4ba8d9e530b34aa459508fff7bd818c9568586224e78c69ee45677fae82ab9bb3a0ddc0355c039d9b11864124f562e0282361012 SHA512 1bfb6b5be11c4a9ae4669130f0e549b4f51d96201988e5c0e32bd8e1f85b41488f8eed0c49c578ef99811ec892b740726697a667d4afb8fb11350cb01d0346e5
+EBUILD dhcpcd-7.2.3.ebuild 4385 BLAKE2B df0815025660e0500e89ca24703d2d102d160f63fe049b0b8b254623da1a46e77b038db5c25a04ff42f266c6381104cec39d22096ec38bfa95b2a2ce30a49a62 SHA512 3302777fd50a12f7a6d69fd3d66682cee889c4a41e810a42ed9c13172312101bd0d349dcbb024dea0637c2607fb29b9eb64a17747e77e70ffe116a4592487618
+EBUILD dhcpcd-8.0.6.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
+EBUILD dhcpcd-8.1.0.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
+EBUILD dhcpcd-9999.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
index 61659ecfc9be..aa994f5a7d12 100644
--- a/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild
index d8940210a7b5..97babad6cfa4 100644
--- a/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcpcd/dhcpcd-8.1.0.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.0.ebuild
new file mode 100644
index 000000000000..97babad6cfa4
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-8.1.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	local myeconfargs=(
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		--prefix="${EPREFIX}"
+		--with-hook=ntp.conf
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		$(usex elibc_glibc '--with-hook=yp.conf' '')
+		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
+		$(usex udev '' '--without-dev --without-udev')
+		CC="$(tc-getCC)"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [[ -e "${old_old_duid}" ]] ; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [[ ! -e "${old_duid}" ]] ; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_old_duid}" )
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files+=( "${old_duid}" )
+	fi
+	local old_secret="${EROOT}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files+=( "${old_secret}" )
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files+=( "${old_rdm}" )
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [[ -n "${old_files[@]}" ]] ; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files[@]}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index d8940210a7b5..97babad6cfa4 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dhcping/Manifest b/net-misc/dhcping/Manifest
index 04716ad07814..94a4ec454352 100644
--- a/net-misc/dhcping/Manifest
+++ b/net-misc/dhcping/Manifest
@@ -1,3 +1,3 @@
 DIST dhcping-1.2.tar.gz 75485 BLAKE2B f8447e38c22964410b08c93a847e1638b055f64461e6d39d0cde54b56222313222055ec922c911f7b86bdd37a8844e723a96753f31eaaf787c8c4194390e13e0 SHA512 84ead27ba07f7ecc1e8cf6d95b40c98ee20a39ce54386249f403120beac70c45d765d5268b4968dbfbbb92790adcc1eb648c3a87071d215ad64bcd23aec818d3
-EBUILD dhcping-1.2.ebuild 379 BLAKE2B ac31ede9fc3477761ed85cffe3e501bc8b11c0736eda58ce3cd12a787cdc14b9e5badb6e08048707818eafe5e72d1b86bfa76fa5f61a4f80baf9ffdbf55afd9b SHA512 0be179a011010e6a35bb9d94518219e79296acea7cacecd3749cce12fd8e1ccaf03869eff2d3576dc3f931eef1a081ab6a3600de8db7c49edd4a149ad6e6eac8
+EBUILD dhcping-1.2.ebuild 369 BLAKE2B a59f615b317372b87147360c7818c2062fd8f687536187a3e21c75d11806afcce9ff4b3d238affbf48f52300b5734dec69c7ae6d5c657b97605ff91bb31fd554 SHA512 1741618d08e163008368b2c9815aa95cb05aaeb4b927f31cab2b6e4e58ba3935984ff1ddefbd6c034a618817733ff426aa79343c63872cd5a580a5e0defd49b4
 MISC metadata.xml 218 BLAKE2B 4894dca53f3c39ffc7e477e6bad052c8fc183a42712c04a24d87da384cc71f790b1dd7d14bc8c6cfe8144c1ecf93a39b18fdbd3a7c78877f9778a5b49d7dc985 SHA512 603ad05330f07596dedb6477c2c36ce6d982fe1415f64d82593c913343fc6227e1e741104a520b1d130ec846ee6083f1dedace7e9b4aa109cc4aae6b3863c6c5
diff --git a/net-misc/dhcping/dhcping-1.2.ebuild b/net-misc/dhcping/dhcping-1.2.ebuild
index d59841b42347..8cecbe267615 100644
--- a/net-misc/dhcping/dhcping-1.2.ebuild
+++ b/net-misc/dhcping/dhcping-1.2.ebuild
@@ -9,4 +9,4 @@ SRC_URI="http://www.mavetju.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index fa40604390b6..c038bb1be449 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -3,6 +3,6 @@ AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee753
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
 DIST dropbear-2017.75.tar.bz2 1623392 BLAKE2B c024037d3ebcb3f16aed2a5f24e07c06699a510b327a0ea528db7160ad2a8e554af2a233a266f869e0e30c78f3b0b7792a817d9c07f058f605dbf2dc749a4fda SHA512 9c2f2a5e718339f83abc0ad7719bda12bfc75e5bcb87a7c0eec0afefc743e5c0a1575d290d5fde152ff2100b0f0e6fd5ef4431f7bbcb5ca9a332d93c20f5a8f4
 DIST dropbear-2018.76.tar.bz2 2688697 BLAKE2B 1c22d38487e94427b2678d070f8d370eb09bb2d69253fd6f76d8d80fd637ff86a44b00ab42e1f6d84042c72cbcbd4bb6cbb415f961502e0437c7c8c1b812f059 SHA512 82323279f7e78c366ba1ea07ff242259132b2576122429f54326518dd6092aba8ae5de4a0b8a3cef7efc3507015741abe2ac23376c03b40b247527da7a88120e
-EBUILD dropbear-2017.75.ebuild 2479 BLAKE2B b200fd9ce16df2cfcfe197bbaa4d23b86fd65ac28e3a91b2b9b38780ccab35333cc946b71dc67826932dc39dd67f7c0cf4cb3f026bbded140b306c5ab464f42c SHA512 7ff7df1daccbadc9a855ade363dd8158fced88e779ac9764136ed8c42e54380cbbdba2ad6392e859c974a4c81cf54ff7af240c54ee7a03094880528b21ada6c1
-EBUILD dropbear-2018.76.ebuild 2659 BLAKE2B 86c2521f8ff752ab0e3957167f4e1e0f9f20bfa54fed2561b6c27251ee1a6eb71f80a08d8138fed5bd88d8f2778798a9534edf66a1274e7e1cf13cf36ea99ca8 SHA512 66aa0a4d6a60a8d6b893b7a75e088dee4b6c04eaee98cbac5399d4dfcae4df60f0939f52347e8aa372a8818a0906a167c71f6643a5f1aa923f546fdc3668da6f
+EBUILD dropbear-2017.75.ebuild 2477 BLAKE2B f9918bcf6c5e95393ac0b21c29b73b0984902d585058a09929782c1419157cf6b386b05fdeafdf163c4f4041b67b7c0ae22f8f0e5f3af572ddef65e4d3b294f9 SHA512 1aa24f08ad011950206d2e83191f85d8605668a9831635f139c1b96f60b05e30f061ff6829d2434115783c5377398822be8071e667c5cd4b611bc5d3ee880525
+EBUILD dropbear-2018.76.ebuild 2657 BLAKE2B b58bc6b4acdabdc63ddee489c8d5bf3c6a56f5fc5fa26ec4c66e37df2724a7abc4d5ce5bba3eaf0532b82cf146cbe33271f945dff645a9a35a534f50cf13960a SHA512 7449a450bfdc03364dbff6a32d63b720ef0ac7ab47fcf5aee15da7e4db1cbb6abf7a69b73eecee4cc81d4c81779b01b471bbd975831cf47eb0740dcd4a4b332e
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2017.75.ebuild b/net-misc/dropbear/dropbear-2017.75.ebuild
index ad5c7c8986c2..2dcfb1c39e59 100644
--- a/net-misc/dropbear/dropbear-2017.75.ebuild
+++ b/net-misc/dropbear/dropbear-2017.75.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="5"
@@ -18,7 +18,7 @@ IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
 LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
 	dev-libs/libtommath[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
diff --git a/net-misc/dropbear/dropbear-2018.76.ebuild b/net-misc/dropbear/dropbear-2018.76.ebuild
index a3ec3a6212d2..cc44e579cc2a 100644
--- a/net-misc/dropbear/dropbear-2018.76.ebuild
+++ b/net-misc/dropbear/dropbear-2018.76.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="5"
@@ -18,7 +18,7 @@ IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
 LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
 	dev-libs/libtommath[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 5f1f69787e41..fa42bddfa1e2 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,11 +1,18 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r1 220 BLAKE2B 3e7111d8b49bc52626343960d2609f084032c8015c06d700883d47c8ce7569ef5bcb881b682c68a2a911d5f24bcbf554a0e098722f4bf0f1477b80243c6978b0 SHA512 ea685e6eb901b841e54aeb9b530d5a0d2a367d8b598019f7f0d2ae69b013be7cf3986c68fabbbaa30c51c9fb5406dc45b07ff15914c7cf18a7aceacf466328e5
+AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST dropbox-lnx.x86-48.3.56.tar.gz 108876564 BLAKE2B b809a220605265685026657e791aff3e716f7ff51e1fc5074d66df87eb8dc473c63c7513c94ca0715844c600fe71aaa3c42a108be4baee2e3e72baade97e3429 SHA512 3174c41e19a01cbd986c111711bc0df80b68882d595a5c869b81bfa1982b3f219da4cda852168bf7fdc9d67b91f52260017f4d25508f6372efd470536a6b96c8
 DIST dropbox-lnx.x86-58.3.88.tar.gz 73782589 BLAKE2B 406758f056dce4348706d181f1620a16199f99d82c6a24b2cbe7773de32b8f64dc10199b88b8c0b7c3a577deb8658e5de18ce28fb00e509a46a5cd21db890f89 SHA512 455b6e0f78b4307d65f6420b76454229b7542475aba089961117d387290ae60df44a659bb6f8d22975cc6f51827d80b3141cb09832fe327fb5cf9861337b08d3
+DIST dropbox-lnx.x86-81.4.195.tar.gz 93761227 BLAKE2B de0349126a701166eb9d1be64dbfad3d3386518dada09bf9544422336a92d69cbe01d252c04ce3141d55f32232f36823ec680d91c7161d80ba01af1c880d391d SHA512 4d78400bcad4492eb82ba692fab0ce518c653a9ddf04c57a668ddb60da63652be69b74c09f74c2770bccb4a7e9ca57d4774214622a1858606c0e45276b317ca1
+DIST dropbox-lnx.x86-82.4.155.tar.gz 94112380 BLAKE2B bcff1c01c6ed8e30285defbd186bd51707eca05813dbb75cd1dcb15c03aa794bfdb0c9dd24b5b703bf6d37a2dde8d8dcb9d34cb43a2f551309e89752e0498469 SHA512 c9b005f7d99d023b74d59a6306b31d7a97af9455c71b54ad54513a64758cf3af8c03923746be645853a17734882adbc91174966f9f71b5d433dbbd1569386b2c
 DIST dropbox-lnx.x86_64-48.3.56.tar.gz 114940928 BLAKE2B 7d678344b59aa12bdbd28f3e425c0b80b15feae403911ef25a03150d1dfa47e94da1eb17d4b703feea6721d2fdfa721da54fab92e1a56b6b8f31456482bc3614 SHA512 cbd3eed71286be079aa8c898929dea305a4cefb9b5e2e41b196d07f68bfc3b5f2839f78d676a3fd7df62644fe00b9ad1930121bde88a6eea9c864d956ccb6f8e
 DIST dropbox-lnx.x86_64-58.3.88.tar.gz 77899313 BLAKE2B ecf729f4cf8c8fabed0f6ca19a9c908f7adec1a58719fae8ef3a6cc80f26b453c678d241af987339e26ccbe988db45f57402ea497c54245691cb702a868fc2dd SHA512 50199f6e60f34a13376725d0deee7c0e6aa31e63574ecdcaf69b43427d262fb35dbf979798b704d6a5a33756e9cea5867591d9a632a311b111d6645123f3385e
-EBUILD dropbox-48.3.56.ebuild 3051 BLAKE2B d9cfe69c1692b41279515b7773b843d745617c0353093be3739f293a3451f144001c0f7d32fc09b8cf477faba9dab270aec6254128a7ad6d41bcdf8dbf3251f0 SHA512 8db5dd0e9491cd822308d32f13941512fc2808992bc61c871f86de3600ec20410f0839e63db328a749d7323e482ccca3bb098308cd0154c0f29e323d5eb90ff7
-EBUILD dropbox-58.3.88-r1.ebuild 3026 BLAKE2B c2b8aba2fbdd245aac386962009a9fbdab5eb2de835d500f6f1418c7436abb8f070a689f7475f38e46f5d2393ab85374db161db259668028dbc678b66dd60400 SHA512 a24de0a97271ad55448223de64a126d6e95e1653792ad08b43229ed56f845fd874cfa5ce32baf695f7124462ec40c961e14c81a1de8a52a3b4e6c0ba741e0be9
-EBUILD dropbox-58.3.88.ebuild 3041 BLAKE2B bd920090ea92b4069c8474375b52554237857be239e31faf34a13b1cd3369e7c199a2205638941755cd0978189148e12a70bcba3c0df82a4a26049fb1f826ad5 SHA512 bfa3ef8d2362a1896318571b2996e0569c7e5d359b31a5e1472189b58d93ff1e087a8a682b0be9b9b4b059586d2bd5b48bb04bfdeceb0f85d71e8d3005e58b62
-MISC metadata.xml 392 BLAKE2B 19f1d26ecc891282c1930e65db36adbfc73c6cc110dbfa1a90a6ed85f87dd1936860dd1710c3c3e2593df22fea34e5aa803a4b46a812e764563dcad19320c466 SHA512 35be87e089ea5aa62a5f90ac1241953df5c5115dc59258c7f5bdbacdb7a11938c79361c07e87d366f1db2af8a172d571cf2c9061885c60b7fa39a802bd31a141
+DIST dropbox-lnx.x86_64-81.4.195.tar.gz 98084742 BLAKE2B a21a9237b9f507d654de51f488c114a0a98d8b9e3659dc01713d14c8af94527724145bca1b4d39b3610828c625c1acec7b36ddd8090b49f77dc752d788e42a45 SHA512 684ca4e643d9e662bb6273def6bd3bfcba358b3e3279d88ec2fbf60c90d57026af7b83fc92ecb3e882633501433f1f7e6331213291879f28b70cc4d19003680f
+DIST dropbox-lnx.x86_64-82.4.155.tar.gz 98437566 BLAKE2B 972d9132a3225408844e4679d1c065a3fb9e6f2135eb6f99341848cff1235d6d1a5719c1a50539ba0e0051d99939c1636b34722d55a509e88be3ba85281da070 SHA512 a829eedebfc6d8814fec2a04834f392b5c32ae334289376cc736cb6c9473bbfdcd29b063805ef1def7a22134771cc246569e85f337a4adee9eec9f34a929c272
+EBUILD dropbox-48.3.56.ebuild 3053 BLAKE2B d20ac8f0f864a757c0e37b8187aaa90818960bf2ab6a064d969bd4aadf1dfae6b103ccf3ec98cb242f333b3f2f5b5de166fbcb230c8d4a670a1472416550ab28 SHA512 a0dd103afa32c328a3a3c8e96aba25b2a8d530dec35739af01fb8860607e516cd55bf707978e2a6e4b080dd0e27d791acceaa75c43f496242a7d61b2468d1608
+EBUILD dropbox-58.3.88-r1.ebuild 3031 BLAKE2B 8cc71679628fe2b0ce777d141eaeca8849ad6d5e976597c8f338952cfcc423745133c427ce4e50e9ab8137677c9bb3dd325d3e0cff3d311cdf4df9826f72577f SHA512 fafe75fb1cd941590530b3e52dd20a23ad60645832f5395633adc9a5925303c5a93b85f0c1e31cac47a4e8c88776207b14b41921cad1bdd43e1ecc13f2e5fc91
+EBUILD dropbox-58.3.88.ebuild 3043 BLAKE2B 4f2638f01a5b705bc1fdae3112bbd7b6cdcdf3884c757a3685aed0612ebdac7eb8c2c8ed72aeba7cb01a0f02e346c963ce7040d23b9f2487cd44fd72cef40b1b SHA512 c7cacbd6e86712ba3a69e0707f08fc6a99925a8f9e98d5034de864c0dde720af28dd913f35b3a1d25bed05caf1b043fd3ff007aa533e77f85dbc57cfd2d8e041
+EBUILD dropbox-81.4.195.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
+EBUILD dropbox-82.4.155.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
+MISC metadata.xml 503 BLAKE2B e87633e1962a70d62a58006f874a93170d1a5e2729ef6158bf44ab331b5dde53c848266b942fe21579bdc83fda10a421795f630276b96e1c71a954a54ba3436f SHA512 b766938aa2c74e5e9d4558fe882c2d0354c14c9744a7e5eac664ed5234cb723601fc5d04d65e19877c3bb60d8bdaa305eb1c8273704ac2fa1a5779de60d9484f
diff --git a/net-misc/dropbox/dropbox-48.3.56.ebuild b/net-misc/dropbox/dropbox-48.3.56.ebuild
index 8cdfeeebd379..2252fe9e49ab 100644
--- a/net-misc/dropbox/dropbox-48.3.56.ebuild
+++ b/net-misc/dropbox/dropbox-48.3.56.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -58,7 +58,7 @@ RDEPEND="${PYTHON_DEPS}
 	net-misc/wget
 	>=sys-devel/gcc-4.2.0
 	sys-libs/zlib
-	sys-libs/ncurses:5/5"
+	sys-libs/ncurses-compat:5"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/dropbox/dropbox-58.3.88-r1.ebuild b/net-misc/dropbox/dropbox-58.3.88-r1.ebuild
index 57625334abc5..53f28efd4d2d 100644
--- a/net-misc/dropbox/dropbox-58.3.88-r1.ebuild
+++ b/net-misc/dropbox/dropbox-58.3.88-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -58,7 +58,7 @@ RDEPEND="${PYTHON_DEPS}
 	net-misc/wget
 	>=sys-devel/gcc-4.2.0
 	sys-libs/zlib
-	sys-libs/ncurses:5/5"
+	sys-libs/ncurses-compat:5"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/dropbox/dropbox-58.3.88.ebuild b/net-misc/dropbox/dropbox-58.3.88.ebuild
index 4d43632ecb72..6ae52f6051c8 100644
--- a/net-misc/dropbox/dropbox-58.3.88.ebuild
+++ b/net-misc/dropbox/dropbox-58.3.88.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -58,7 +58,7 @@ RDEPEND="${PYTHON_DEPS}
 	net-misc/wget
 	>=sys-devel/gcc-4.2.0
 	sys-libs/zlib
-	sys-libs/ncurses:5/5"
+	sys-libs/ncurses-compat:5"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/dropbox/dropbox-81.4.195.ebuild b/net-misc/dropbox/dropbox-81.4.195.ebuild
new file mode 100644
index 000000000000..c21396bd015d
--- /dev/null
+++ b/net-misc/dropbox/dropbox-81.4.195.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils pax-utils systemd
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+DEPEND="librsync-bundled? ( dev-util/patchelf )"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="X? (
+		dev-libs/glib:2
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5[-gles2,xcb]
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5[-gles2]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5[-gles2]
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/libffi-compat:6
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	eapply_user
+
+	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
+	# tray icon doesnt load when removing libQt5* (bug 641416)
+	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf PyQt5* *pyqt5* images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/dropbox/dropbox-82.4.155.ebuild b/net-misc/dropbox/dropbox-82.4.155.ebuild
new file mode 100644
index 000000000000..c21396bd015d
--- /dev/null
+++ b/net-misc/dropbox/dropbox-82.4.155.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils pax-utils systemd
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+DEPEND="librsync-bundled? ( dev-util/patchelf )"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="X? (
+		dev-libs/glib:2
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5[-gles2,xcb]
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5[-gles2]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5[-gles2]
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/libffi-compat:6
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	eapply_user
+
+	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
+	# tray icon doesnt load when removing libQt5* (bug 641416)
+	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf PyQt5* *pyqt5* images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/dropbox/files/dropbox_at.service-r2 b/net-misc/dropbox/files/dropbox_at.service-r2
new file mode 100644
index 000000000000..a21362f3ca78
--- /dev/null
+++ b/net-misc/dropbox/files/dropbox_at.service-r2
@@ -0,0 +1,37 @@
+# Copyright (c) 2015, Joe Roback
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+# 
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+[Unit]
+Description=Dropbox as a system service
+After=local-fs.target network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/env "/home/%i/.dropbox-dist/dropboxd"
+Restart=on-failure
+RestartSec=1
+User=%i
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/dropbox/metadata.xml b/net-misc/dropbox/metadata.xml
index 7e45457c3266..c92c1a213687 100644
--- a/net-misc/dropbox/metadata.xml
+++ b/net-misc/dropbox/metadata.xml
@@ -7,6 +7,10 @@
   <maintainer type="person">
     <email>naota@gentoo.org</email>
   </maintainer>
+  <maintainer type="person">
+    <email>bkohler@gentoo.org</email>
+    <name>Ben Kohler</name>
+  </maintainer>
   <use>
     <flag name="librsync-bundled">Use bundled librsync library</flag>
   </use>
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 310151818355..c964fcfe5d4c 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,8 +1,10 @@
 AUX 2.0.0-rc2-primitives.patch 1493 BLAKE2B 6799a594c5e88ef92893d490137be0d5414b4f5856b64899b14c97a76d685c8a663211aca51018e77cd3c8ba30e24203dcc895dcdb830f324353a2b8edc43aae SHA512 01a4d68493709352faf62d222b62e0368fca368f2b6e9ffff648af999d419675ab02fad2c8a9a9fb6149abca9bedbe35a35018dbeb82784d993fd09e3df62ab2
-AUX 2.0.0-rc4-libressl.patch 1770 BLAKE2B a0f9c5938ecc9ee6f7ec3d67f0a285285c5dc42b95b7c452f461d4fe96cd9ab26c3062426d2cf22e5ebe72d26befab25730573c22419020176cbabd97e8e35aa SHA512 c27ebee51e88e94b845f633d1c4c6eeff19bda977ac98cd25ae1e9eb589c68499e97eb2fb4fdfdb1f5dbbaf71653d657b3dfe8805c78460c6fdcdf80261ebb0d
+AUX 2.0.0-rc4-bitmap-endian.patch 1184 BLAKE2B 60afebd809d06fb5fc6948b06b1928baa1fb0dcc01189964e252fc2fa190f4dc05b13a20302bc5921c4c0344e732539a560c11fd5800d661a518d99fdec68698 SHA512 cdd2a6c3524e717d68d3f386d666cbf81e53e956b8f2a5ae1b37e89c32e334e847255f3a4b77cb4b4b9bbe7f831ec4fe2ce87d5a49b11d7a452affd7083de21a
+AUX 2.0.0-rc4-libressl.patch 2914 BLAKE2B fa343a8068f59f63e8ede86fd9987aa3490c3fe969ccc000742c9d1fd77a16c46d3a3d31666023d49d419032768c5119f02380cbbd930b30998151da6070de90 SHA512 eef629707eb0e25c66dd492767b7c714545102e5c20139c028f252b0c301cd5792c67306e74fe1d5908e7500022387efba43b0e532667e32ce18b5cee1aafa84
 DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 564abd6289f0c9d3947b9074111ade8c2e7b6e6dce9af8a06ef1772d0e76822c5df80932a5cbac2f23c4d2a76d4796c12bd4fa067c6ef21ea84a1b8423be1ce3 SHA512 cb765b3b9559c4877be4c10e5df9e95d11a0184ce34e89564097c3234f859de8e82b6de6217396628e5f70c85c40c65ccd75f9b0f7f89daaed7e0e971a833589
+DIST freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch 20553 BLAKE2B 17ba83ba2dc05f2179df3aa8805877e15b353d4c6bbe88fa0553f7412baf85849a834032143ebd22ff3d27dd12ffdfddfc802868e10ca2718145a58378940ec4 SHA512 b3b548e98422362f63aedfefca399e4008a4b571e6cd786603418c5a3d1c4d832d5148ddee2f62d6bc1259c66020ee01ced6357d72333f49fc34a1059f4f804e
 DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6 SHA512 63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20
 EBUILD freerdp-2.0.0_rc2-r1.ebuild 2689 BLAKE2B 7f94bd2bcf14b1a0b73e5180bb11bd85dc86e0dab5af329944ecf3772b52c73c49731f8e6166afc1f69090d4adee586575e11caed0462f0b40a89d58761a31cd SHA512 b33ff3f59ac78245b34cedff771fb211c9bdeb99964391e9f722c3cecbc153b30e6e4d63e9c36fd993c945ef52e9b21ee5616a7c1eb06814727f805e7555d16e
-EBUILD freerdp-2.0.0_rc4.ebuild 2730 BLAKE2B d9660b2e33919b12f95e807ae7eee4135d9aabb619c485a354023300bd757244bd7083685279875b23be0cb8e65af42da22260e6c67ae8a86462e6adf1f21949 SHA512 d2e26777016b350ff4afc6e2300964d38edf75ddf4b9c034492ac125ca487d3467e5c6b7a4cae9a6308c1b61d1a5d03eac24e1877a80ba36d1827ea77ca8efd7
+EBUILD freerdp-2.0.0_rc4.ebuild 2973 BLAKE2B e0f4c84a47743017f000e33f244ad0f161f07e225e012531aa23822afc8543894b531d9cfb2df52e967ebd563c4a5ac814043222cc10c158194929f471c65996 SHA512 ebd3c520e895ac6c7cce0c1610794ae604e5b11e9a11f01d4e6a8ce345a6529fd07341bc84e304b8ae005d1500a8f89984438c37d547a0fbd3b94d7131dda861
 EBUILD freerdp-9999.ebuild 2675 BLAKE2B 062df07d0bd6c7274aa1433c8c2067e653cbd5e563956e226bcdd97012bc9b938667970e2d74e5f3ef06a6a056b855745cfb77e38fd2de9c5b21d98f4c301659 SHA512 f8f5458aedbf4fb7693c8b2630078c43473d1b088c6aecd9ce8ed553b95783d67575893d1acf8eddc4fcdc42a607e26a722b1f213bbe01479f913850fa086d73
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch b/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch
new file mode 100644
index 000000000000..cd78ba983b7b
--- /dev/null
+++ b/net-misc/freerdp/files/2.0.0-rc4-bitmap-endian.patch
@@ -0,0 +1,30 @@
+From 18b193a1cf083b92279c3952f4f907a07cd92834 Mon Sep 17 00:00:00 2001
+From: Armin Novak <armin.novak@thincast.com>
+Date: Wed, 13 Feb 2019 09:30:34 +0100
+Subject: [PATCH] Fixed endianess issue with GETPIXEL16 and GETPIXEL32
+
+---
+ libfreerdp/codec/bitmap.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libfreerdp/codec/bitmap.c b/libfreerdp/codec/bitmap.c
+index 7524bb99ce..479c965e52 100644
+--- a/libfreerdp/codec/bitmap.c
++++ b/libfreerdp/codec/bitmap.c
+@@ -26,12 +26,14 @@
+ 
+ static INLINE UINT16 GETPIXEL16(const void* d, UINT32 x, UINT32 y, UINT32 w)
+ {
+-	return (*(((const unsigned short*)d) + ((y) * (w) + (x))));
++	const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT16));
++	return (UINT16)(((UINT16)src[1] << 8) | (UINT16)src[0]);
+ }
+ 
+ static INLINE UINT32 GETPIXEL32(const void* d, UINT32 x, UINT32 y, UINT32 w)
+ {
+-	return (*(((const unsigned int*)d) + ((y) * (w) + (x))));
++	const BYTE* src = (const BYTE*)d + ((y * w + x) * sizeof(UINT32));
++	return (((UINT32)src[3]) << 24) | (((UINT32)src[2]) << 16) | (((UINT32)src[1]) << 8) | (src[0] & 0xFF);
+ }
+ 
+ /*****************************************************************************/
diff --git a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
index f666e0d4d671..fd6e6148607a 100644
--- a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
+++ b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch
@@ -45,3 +45,34 @@ index 76f51701fe..ded41f127e 100644
  	SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel);
  #endif
  
+From 0c83efa753d0457eb319624f87b491badf75105f Mon Sep 17 00:00:00 2001
+From: Armin Novak <armin.novak@thincast.com>
+Date: Mon, 7 Jan 2019 14:18:14 +0100
+Subject: [PATCH] Fix #5170: Disable custom TLS alert for libressl > 2.8.3
+
+---
+ libfreerdp/crypto/tls.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
+index b2cf5416c8..56e16bacb4 100644
+--- a/libfreerdp/crypto/tls.c
++++ b/libfreerdp/crypto/tls.c
+@@ -1030,7 +1030,8 @@ BOOL tls_send_alert(rdpTls* tls)
+ 	 * FIXME: The following code does not work on OpenSSL > 1.1.0 because the
+ 	 *        SSL struct is opaqe now
+ 	 */
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if (!defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L)) || \
++	(defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <= 0x2080300fL))
+ 
+ 	if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
+ 	{
+@@ -1057,7 +1058,6 @@ BOOL tls_send_alert(rdpTls* tls)
+ 		if (tls->ssl->s3->wbuf.left == 0)
+ 			tls->ssl->method->ssl_dispatch_alert(tls->ssl);
+ 	}
+-
+ #endif
+ 	return TRUE;
+ }
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
index 51108006d581..2e2b4e41b520 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
@@ -8,8 +8,9 @@ inherit cmake-utils
 if [[ ${PV} != 9999 ]]; then
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~ppc ~ppc64 x86"
+	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz
+		https://github.com/FreeRDP/FreeRDP/commit/6931f54fad12eaf46a72c5c02ac05da817ab6b94.patch -> freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch"
+	KEYWORDS="alpha amd64 arm arm64 ppc ppc64 x86"
 else
 	inherit git-r3
 	SRC_URI=""
@@ -89,6 +90,8 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/2.0.0-rc4-libressl.patch
+	"${FILESDIR}"/2.0.0-rc4-bitmap-endian.patch
+	"${DISTDIR}"/freerdp-2.0.0-rc4-fix-NTLM-AvPair-lists.patch
 )
 
 src_configure() {
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 791de97ebcdf..898bf45decde 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -4,9 +4,9 @@ DIST geoipupdate-3.1.1.tar.gz 366789 BLAKE2B 1f823bd51553c9c96ad78bab893a15d4bc3
 DIST geoipupdate-4.0.3.tar.gz 107019 BLAKE2B 55978bb6fc37b02706d4f48b76dc8b85f3aacc86f1192a0d31cee5c55fb4d0feb8d5ddb2b6a13d4a85d80133ccaa318bd9ad3e7d3d5b818fea2a3a0fa09a62d3 SHA512 870f930a54a45f5fe14c8328158ea2c8d2d8e4320a5400abc8ec18ae1e234426e86492a41868ccd3bf649acf0cd347722683326817359fed7d147ab21eb64397
 DIST geoipupdate-4.0.4.tar.gz 107115 BLAKE2B 1ab08a34c41ac08aa26faf2078e7a964350c09c65871829023928dc25011a931f9be4aff32300778ab645831b8786898a986e15aec8bceb31f77715be77f857a SHA512 2d97f65128d26600345b07cab4b1c1ed26f68bb850f4fa92d8f6b4065d1e9a25b73b38e1cc08bc0afc11135394fe20fb77bd931e557ba6fe83d792ad3bcc4a1c
 DIST geoipupdate-vendor-4.0.3.tar 532480 BLAKE2B c619098fa40d6a92743a2847900e7cefe5d61aa9dbd36399e4a26d7c2fda1ea493f91ded8a4b17a76063960c0f8a11cc7b3b7b734e9f3d978da7035799d32956 SHA512 25976c66d775e3e50b422e9f564b9486c7c08d9dba8a11b5ac9faf62f3545673fa94d2ea6ea40750835840c938b686b174de5658236a19e85d592d861eea05b8
-EBUILD geoipupdate-2.3.1.ebuild 573 BLAKE2B 1a4e9421d90bed8da5b4ddb282b53a9bb2cd9d7123007a8c7a207ed807480abf95ec3c2e7cea6a987d399fd73c7148778f6b28b9c66ea0f48f2c1cb4d9ae4435 SHA512 add023538fe12026667cf0feba8c1ebf1157609ba2ac9622466920d2ed7c128bec10ba7ac1a12acb358067e0ec757996ad0eec63c91c7b4a7c9d75984b06bcff
-EBUILD geoipupdate-3.1.0.ebuild 582 BLAKE2B 106db9ba7a0f95104f0728fd820da17c03ed7c1fa79481d3fe09e666594b707b64ec4522b5095c1f19b0afecc0cfa9f5dd6e60829d12cb0887910ddc82e66053 SHA512 b6fddee463197592d4bff439b9ba4e407725895544af9875c9157fad695cc700ce2d3ab293da271fa6d3826b458a1a20c477c1df51daef6367d59798b4ad1392
-EBUILD geoipupdate-3.1.1.ebuild 582 BLAKE2B 106db9ba7a0f95104f0728fd820da17c03ed7c1fa79481d3fe09e666594b707b64ec4522b5095c1f19b0afecc0cfa9f5dd6e60829d12cb0887910ddc82e66053 SHA512 b6fddee463197592d4bff439b9ba4e407725895544af9875c9157fad695cc700ce2d3ab293da271fa6d3826b458a1a20c477c1df51daef6367d59798b4ad1392
+EBUILD geoipupdate-2.3.1.ebuild 563 BLAKE2B 194912f2d1434fbbc74da1e8416b370460186a6a5b04c187885efcd292f10781d5bee163cc0e7543511ea498f6f5bbccb84dd9f196e1a4acc4c25d6156247151 SHA512 3d31ff77ef656bbdaea21844f6351ee6de89632271b6e88b8a140bfca5326e1ac23411e8656025f9873c80205ad1d47b64251922d5b0fbb85a3364511b0f8acb
+EBUILD geoipupdate-3.1.0.ebuild 572 BLAKE2B d23a2f47e4daf03fa025461cbc4b045759cc70f5f386cd6e66eaab67d428de2d51c4b1eb315af506c4604b1c8445d0a4626031a1cd327bd379bae9b6691b7581 SHA512 e456e1a8711123172ec60b634732f0ac372659c23bb05be4a445ea153508b115b47086b8c49dd99b5f420a313210b7d504d25a166b0f2aa102ea912687d196f9
+EBUILD geoipupdate-3.1.1.ebuild 572 BLAKE2B d23a2f47e4daf03fa025461cbc4b045759cc70f5f386cd6e66eaab67d428de2d51c4b1eb315af506c4604b1c8445d0a4626031a1cd327bd379bae9b6691b7581 SHA512 e456e1a8711123172ec60b634732f0ac372659c23bb05be4a445ea153508b115b47086b8c49dd99b5f420a313210b7d504d25a166b0f2aa102ea912687d196f9
 EBUILD geoipupdate-4.0.3-r1.ebuild 1268 BLAKE2B 39d26909a70acfdddbeb9f823e4babac6af48077af154f15f1228d7d50a40fe73b2c4de5842ce8d6b87ea6d39a25d998e553ec0cbf42904a9efa45302d9f7eee SHA512 194465588a84cd045cb0694c5dfbfd1e9e14cd07d49d3a77d68ec6e0df4a872766d8a5bcb2a9094f72853cfe3e28a350969cbd4bec99bce35edaa2786cb4d52d
 EBUILD geoipupdate-4.0.4.ebuild 1146 BLAKE2B 7b690131bd0f63803a2709e718bf6d33ffb6109d2e62c5eb99ca5bb793a9ea185bc5ca6962abffcdc0068a54187e70cdcee5d12128443f673637d92903f37015 SHA512 a3242fffa1b3511f861664134362ecd3dd06525b86be3791137ccade9bfb382ec3261ff24dd2c4bde2c5f75a79ddbbb1e9bb94102a9a3a35017bbc589840c336
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild b/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild
index 131aab6394d0..8ba89ac4359a 100644
--- a/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild
+++ b/net-misc/geoipupdate/geoipupdate-2.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86"
 
 DEPEND="
 	net-misc/curl
diff --git a/net-misc/geoipupdate/geoipupdate-3.1.0.ebuild b/net-misc/geoipupdate/geoipupdate-3.1.0.ebuild
index bced45a506fb..4aa1c39f7e40 100644
--- a/net-misc/geoipupdate/geoipupdate-3.1.0.ebuild
+++ b/net-misc/geoipupdate/geoipupdate-3.1.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DEPEND="
 	net-misc/curl
diff --git a/net-misc/geoipupdate/geoipupdate-3.1.1.ebuild b/net-misc/geoipupdate/geoipupdate-3.1.1.ebuild
index bced45a506fb..4aa1c39f7e40 100644
--- a/net-misc/geoipupdate/geoipupdate-3.1.1.ebuild
+++ b/net-misc/geoipupdate/geoipupdate-3.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/maxmind/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DEPEND="
 	net-misc/curl
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 4749171badfe..eee4f5ab7574 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,3 +1,3 @@
 DIST gns3-gui-2.1.21.tar.gz 4845512 BLAKE2B 93af250719a0aafe8645926552c61d43152e5a5620d42b4d73cd58d597b3280d11935043771f15cf04e5d116f6740d929e04c27b1af6732d65b7c6e36313ed3c SHA512 b9b03c59064214323fe7375256075c56368747c8cd273bea41791b101ea7d6b877443e81dd57f13faf4b4bdc6de558e98648770de4734b1edd1c82911f2fcb9b
-EBUILD gns3-gui-2.1.21.ebuild 918 BLAKE2B f6b7176dbbe09e64bd5818e0f60d116bda52389ed201b7440d2c3a83c97ec8d7bd498ad50bb06f4bc04f3855d5b2b2967fa4746d665a1540f5ceaa195d2be973 SHA512 313424646b0e856637185492d2c15711dcbb1cad6634ea6d6c164cf3b40cfa4728624aa6d434d7cdad7ecb4a3809d7d9686191ec6f789f1485e2b204a6b78274
+EBUILD gns3-gui-2.1.21.ebuild 915 BLAKE2B 9a55402171d9a52e67057673002319626084b9a642b2c2108a46b202e30efe54fded242c9196f8e09772476199f806bdcea4b589647477501dd83f72e119f63f SHA512 1b3dabbe063d682cbab05eeed15d088f46fcff99825bbfe6ab8198b3b7498c655c881e02e88c900f0841c0f20a40c3b29e3c3ae87698d88f93e9671c6266f29f
 MISC metadata.xml 442 BLAKE2B e9b21bbc318820cdb4df0b3d8a4a0b261d4309fa62987123907c0b4cb387dca9afa8bc405cde987c3093aefd393f1867f24c7020e4b9001a373a18bf6e838a46 SHA512 3ab532db9d5d3ff339cbc80f867a48785386292423bc7a47ffc99451da79b1ed64ed7a9444915248e876e6250cc185b866097a5e94caf8a8b6e4a568b3ed4a16
diff --git a/net-misc/gns3-gui/gns3-gui-2.1.21.ebuild b/net-misc/gns3-gui/gns3-gui-2.1.21.ebuild
index f2fd83afc281..0806d5aeefb2 100644
--- a/net-misc/gns3-gui/gns3-gui-2.1.21.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-misc/grdesktop/Manifest b/net-misc/grdesktop/Manifest
index 19d45b9a5f21..7e6356645c69 100644
--- a/net-misc/grdesktop/Manifest
+++ b/net-misc/grdesktop/Manifest
@@ -1,5 +1,5 @@
 AUX grdesktop-0.23-desktop.patch 538 BLAKE2B 70bc1fc74c7c9b298e844bd499a04a062ec8c511dca75acfc17914faaad6431573d0ae1897c72ee0e3018a174a5ecab8bed1ebef3d84c6279c7d87afdbb5280c SHA512 c228120c40f1c1afa18b120c6804e5bb824256fd5515bdcd05b7fb4a8c964cf8ef6d2a7902645640b5133b513bc9612b2484cce7413af5663d0e16c7e65122fd
 AUX grdesktop-0.23-format-security.patch 856 BLAKE2B e5f8c03ce0b7639d0662295d8260888d18af4062750aa5ce73ee13c0fb9b77ea61e3287a11f1b5d00bf1c3a654d84fa7e6bd820c81c09dc00c4fecce08d305fc SHA512 7754a958a45648cf1194e0840ab22de3025a3eaf0001670c3abe6b5ea0852caa9d27fd9f7db0b4c43a8c93a462a8f297b1c89007755486c9cef9eff26cca6590
 DIST grdesktop-0.23.tar.gz 299914 BLAKE2B 0a00c721c8d962dd1ad885f4d85130486b3ad9973d21817068f4147ade03d59a2d13dd5e5b26376a0415120521e283a20d79627b62a8bcca15fb2f0213c05bc4 SHA512 a0993d7589d0b22b26535de0cf562604c89ce580fede076c15d8d7f2e7a3bd2fd5ec0a35c6a8ec07fcc8f53a0635381fefe9c2e67d9ff75cec7af47cdd25732f
-EBUILD grdesktop-0.23-r1.ebuild 960 BLAKE2B 67d272a11065e9fc5b501a140644dd59b7d5a0682f9f8f87a0dd172015fb3fcfddb730392c46dde4a234b7fb8754e7963484662512220c4a428016b379c451b1 SHA512 9f6f8373691f63013d2599b0fc5c12ad3e1267ccd06796f4d13621482b85046ce168fa2804047b2d73a7d02fd01c7df2d0a603681a22bee170f39d426e9ce4c7
+EBUILD grdesktop-0.23-r1.ebuild 950 BLAKE2B 7f142f234235a9c5063e26c882d64dac69a9914b2a0fa72f52162e7b8fc5f2ce6bf70a3bd838a395e5debc7e5be678e272f8fa4f066ebdde402d702bf939dcf9 SHA512 1377d544d03f32707e11a9c6a72cf40865151edd727b189b922770fce3ffe87b6e31fec03110c48f1f60fcc5b4292c5e2f240d910a29b11494d0e50b41c5a310
 MISC metadata.xml 429 BLAKE2B 117737367d74f70cbd717e361f2179150a8c9d3a156338464d5c6388ec226adf568fa3866e46937dc83465d0afa55caf2ac5b2c2806227892c60eb936728c284 SHA512 359d469647e065e6b771ce02442ce3789d8e67708679d07b5a3d0cb5fc76a5bd16af0483b37d3a5c593d1660d1e58d4ecc97cbe0c26659cfc6a3b6e7ce863a7d
diff --git a/net-misc/grdesktop/grdesktop-0.23-r1.ebuild b/net-misc/grdesktop/grdesktop-0.23-r1.ebuild
index 39b0acec73ce..8e5d2c6a2dd0 100644
--- a/net-misc/grdesktop/grdesktop-0.23-r1.ebuild
+++ b/net-misc/grdesktop/grdesktop-0.23-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 9c155b350b45..3fb0edf20129 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -1,4 +1,4 @@
 AUX gsasl-gss-extra.patch 951 BLAKE2B 4cd0a962e8aec77e0cf84ac5b5e6106f1b9e73532b8fa4931ecdbdf9e751c837a552dcf203e89210a8b86ded35a0bba2129e419f3ca3dacb47a935a8974f0930 SHA512 4225049a547b0ca6fbd0b5268e7a1de0454850fd6a29f31eb8b7356472fe400eb3a8076f537101be8cd9e09b7f092f5d784a8d660c8e66e475d4a7a4caff83df
 DIST gsasl-1.8.0.tar.gz 4914837 BLAKE2B 89cae140bb503556003036a92dfdca1ad7adb6ca46826a7309dcc39aca5a070669f4c24005ddaa1c5f5d4d56451d7a5c5164a4333542b0af1201f3fb210501e8 SHA512 711bd87d27656834ae7e19b22a76db2b1db37dd25999cd303fe8439e23e74e87fd1474c5db1b5f97e9ab75437eeeb6167a752e9191f364f530eeabb6cddda36f
-EBUILD gsasl-1.8.0-r1.ebuild 1694 BLAKE2B 905460fb5746d86c63bce67b77115e138b6fa9fbbafbb1af5e45b7818ae8b404db22fb3081e74e493bde0d609347b97c8cc487267a1821678652575c9b24dece SHA512 72cd3e807ff9e6575a862425d6ff6c9af3aa0b70a77557f5bf07ef242b9f5437aa19fbe7cf7a32d00593ef6e60da2196aa4ff46f514465470dbbcef87b3583c1
+EBUILD gsasl-1.8.0-r1.ebuild 1684 BLAKE2B 9a40d349aa6d902247de63882a528c3ea344093edace9806250d7f61e5369ff395c75063160041612d6328d300091342f85aac0ab47291237a25ed483a742ddc SHA512 013323933b59ab3c9dd55e9b20498fe35226c3b25f485babe1ba7e3b22465c5ee8a63a3fb812cafd4326637026959c994784d2bef1b6be8dbef0be9960701b31
 MISC metadata.xml 370 BLAKE2B cb234f93a667fd37ab122fbb8ae0926fd0bacda2d9e4f1e50de9e8793d6ed01f0165e16dd73931114aead2e408b2f019c06cdca7aa41d9e60c9d60cf9f7e9955 SHA512 c528d4a5f51ebcbc5917268964716d667b71e825815bdc0dbd627f1ef676b21312caf442de31e7912ad57f5c908471a7fad1617e129a2902134a081e91bcc4c0
diff --git a/net-misc/gsasl/gsasl-1.8.0-r1.ebuild b/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
index 5ffe9c0c185d..9fb42b266213 100644
--- a/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
+++ b/net-misc/gsasl/gsasl-1.8.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc gcrypt idn kerberos nls ntlm static-libs +threads"
 
 DEPEND="
diff --git a/net-misc/hashcash/Manifest b/net-misc/hashcash/Manifest
index 533039b57d42..150d249b1f52 100644
--- a/net-misc/hashcash/Manifest
+++ b/net-misc/hashcash/Manifest
@@ -1,3 +1,3 @@
 DIST hashcash-1.22.tgz 195193 BLAKE2B 2944dd8a852720af7deff1a85cbfc07e828bf2242996b95d8d05a3a8a3ece90abc47483252920ec14b603978aae2ddb9e770ef7b52904b3d24320b68e6695b37 SHA512 b803c27df2acdce70c587d15d4158ca8841328fd89d90213a00be35f7c9f1905db728a785ee70fa43a4262dabe20c3f0a9fff381e3db0d44c3175ca22da5d5c2
-EBUILD hashcash-1.22-r1.ebuild 688 BLAKE2B b705ed6cb144226783b1c7900d954de4baec18f3d4416fadcf893f820060f404e490bf5bef79b503bb8d3535470cb5a73f2288fbc236b0a13824787dcf4e9d34 SHA512 c9a72f268073e9584e188991a01e0fb22617deaf7dcf715b7c2c48cc5b26706b60e411217a393dd29a3c15cd72638bb466d1c674c3022bf7f9600ad6379574d7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD hashcash-1.22-r2.ebuild 657 BLAKE2B c56df7be355d2c380dbc9c0d48c49dbe95d0de9857274f0c126aacb8c166677cb0b51e2c305d79e1f9eed83f9a1c59ab9808dea9e054216b1695c77d3521720f SHA512 381ebc6501729f1504784dbebdd104755109ba22a59452fb3cfb63677dc0065cb9f9b7048807f775a3d6249b86aca94727a94b8fe043c73a6d898fb719dc6854
+MISC metadata.xml 367 BLAKE2B c8709da086e6c51fe3535a4e70e63f671f47b9c5cf79e3d12becc98c037d858d4f9e2d34e05dfe534a774cfe1cf87b93e00eed956fc02342d06e64515ef1a7a0 SHA512 4f1cd259215742388e22ef660d3386bd9c887a96269989e18f8390a04c5ad1ed832cf4765b37453769808bc52eebbb72043c120aa5191601d1fb8754ce020fb0
diff --git a/net-misc/hashcash/hashcash-1.22-r1.ebuild b/net-misc/hashcash/hashcash-1.22-r2.ebuild
index 99ebc450c647..1533c90bd7b5 100644
--- a/net-misc/hashcash/hashcash-1.22-r1.ebuild
+++ b/net-misc/hashcash/hashcash-1.22-r2.ebuild
@@ -1,22 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
-IUSE=""
 DESCRIPTION="Utility to generate hashcash tokens"
 HOMEPAGE="http://www.hashcash.org"
 SRC_URI="http://www.hashcash.org/source/${P}.tgz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	default
 	sed -i -e "/COPT_GENERIC = -O3/d" Makefile || die
 }
 
diff --git a/net-misc/hashcash/metadata.xml b/net-misc/hashcash/metadata.xml
index 6f49eba8f496..d49539b4f661 100644
--- a/net-misc/hashcash/metadata.xml
+++ b/net-misc/hashcash/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>ngg@ngg.hu</email>
+    <name>Gergely Nagy</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-misc/hlfl/Manifest b/net-misc/hlfl/Manifest
deleted file mode 100644
index 3da2d16f1e46..000000000000
--- a/net-misc/hlfl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hlfl-0.60.1.tar.gz 104913 BLAKE2B 930f85ad0b8cf1008000a7d993d683c07b717bc55a77ac1feec4903dce1082f7cf444bd0def43a161abb1ce18e58a8e897b03cd8fd17145fed8a99eb1196744e SHA512 713898fe48ac7de65abdf5dfda6ae6224f83f2cc5bcc42b0f822a78438943297d5afa20c660d19c9bd17d204eba50896e81473adb1665c67183a55421ec91fa0
-EBUILD hlfl-0.60.1.ebuild 718 BLAKE2B d7b6f3166751a8602beeb7df5bc3ea4d84e988d9456e045162d62fc5cd2e7600f624a6a05e57b9dc37f37d8436c6976d994983e0ab5e2f41db84dbd3f84f99d9 SHA512 aca21c7079d5556ca3e8d81884a112bf259233367005d4e0fe5ae2838776c601fa4390bcf8226aea113481e44cb209efe66feb30b7a3460f2f95264092daf6eb
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/hlfl/hlfl-0.60.1.ebuild b/net-misc/hlfl/hlfl-0.60.1.ebuild
deleted file mode 100644
index abc12a60d578..000000000000
--- a/net-misc/hlfl/hlfl-0.60.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE=""
-DESCRIPTION="High Level Firewall Language"
-SRC_URI="ftp://ftp.hlfl.org/pub/hlfl/${P}.tar.gz"
-HOMEPAGE="http://www.hlfl.org"
-LICENSE="GPL-2"
-KEYWORDS="~ppc sparc x86"
-SLOT="0"
-
-DEPEND=""
-
-src_compile() {
-	sed -i -e 's:${datadir}/hlfl:${datadir}:' configure
-	econf --datadir=/usr/share/doc/${PF}
-	emake || die
-}
-
-src_install () {
-	dobin src/hlfl
-	doman doc/hlfl.1
-	insinto /usr/share/doc/${PF}
-	doins doc/services.hlfl
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS \
-	TODO doc/RoadMap doc/sample_1.hlfl doc/sample_2.hlfl \
-	doc/test.hlfl doc/syntax.txt doc/sample_3.hlfl doc/CodingStyle
-}
diff --git a/net-misc/hlfl/metadata.xml b/net-misc/hlfl/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-misc/hlfl/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 59570a404021..6df812994cc5 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -1,15 +1,8 @@
 AUX httpie-1.0.2-fix-test_ssl.patch 446 BLAKE2B ae51dfcbddd35796d7283d2eff398dfe0ed55703dcd08d1a64f6211ed49d974a8d95599ba30f26930cfda4e929acee9f46982debfa531a9d6c848250a9c0ff04 SHA512 7382a271c2ccf7c270102a40724abb2e505070e3062c9ab8910c45ad5e52cc6190c7b24604e5b738674beef5b032cfc59c90d33d7db0962dd63ca61722c5dfb1
-DIST httpie-0.9.2.tar.gz 73153 BLAKE2B 53ca1f5dd683d68ff6416a297bb45a2827f516a64cbca7f354243e7e2f8765677798d138b949db79c2735f9f71e106af2f669e6ba58ac7e11b86d4e0ed6c9457 SHA512 5622caa2f3136137d85f91eba9b0a165ec987b696a5e001844c8ecb868d66cfc86b3f3fb3a1ac493d7603c67ca88de0e0ffc776dce855ad69364190607b4fb73
-DIST httpie-0.9.3.tar.gz 73693 BLAKE2B f188a7fe5f63b39022d2a67e8f9dc2582ce8e8d4860b880b2e26403149361b999294bf0e55b41bf1773e73c0ffe81abd01c6c1e2ddaf755dfc31ab7e463b8516 SHA512 a98aa19ddcc5223133f1081ce22457d21b838b5779788a08d0b65ea80f903ab577a55e0c73b3656486eec08c3c0910d3e987aed0f117c5f9b3e005c6001000cc
-DIST httpie-0.9.4.tar.gz 79889 BLAKE2B 13053cb3389a03ecbd90caba85801772cba9f09a03f759d526256fc0195a31824408a02b004d3af50a1fbcaca7c02128b438ce341464825a08e4dbd5177ddf99 SHA512 eea4e0fce334d12f9438d89f87d119bc569f8042d95c87f6898b9110030674f49361bf8e119d815330aa117479557766d614510d81c42c9c3a6803c769f38b26
-DIST httpie-0.9.9.tar.gz 85006 BLAKE2B c5412348b3add127a5d5dfc04fdc13a47f82ec65634eedefb55a0cf1ce182a49f81a3a68c0cbb5e8c90b53efb165c89b7444d23328e545bdbf92d69d1de9c921 SHA512 e9adb1ecf9a25b57c634f35199bf1f8fbe4136179c0ba0d6032a41ae786da9344f54436f91d89e624c154bdca325f94c637364a934fc2d5742b83056434f7e4c
-DIST httpie-1.0.0.tar.gz 268982 BLAKE2B 36ae23876c995f450ac4d814a56a79db7aee175f3b6b060bf08049cd2ea5ec5000c91bf49a12eae8a2dff2c91e5d5200d3febc4cdd50d0488db35eb96777ed14 SHA512 9a68746636e367d1131069787f4a4a199b6434b828fe58fecef70e810c1d63c662c790fc45fd955a390113920a29d0116cf29d1167d638debe6b9419a4ae2d48
+AUX httpie-1.0.3-test_binary.patch 782 BLAKE2B 1e7e63fe889e2b5ebcc814d681652b718d49c2bdf09d90e70c10cf2f7f6cb88ea70509a98a7e56d6b84ecfb84b6b8e5158e73c8d322aa161c8de79e6ac0332fe SHA512 ed917989c3f04aa213739563a6ccd34da413798787cff6a9af07ea058013c6a96c06dbf1e36daefef45faf571983286d3faab869b7918b29239278b54e5570b8
+AUX httpie-1.0.3-test_stream.patch 722 BLAKE2B 8ae3ff08311178f40d6e4156fc0fdab443e1f2b76a73f8f47bdffc2b3f62e506b9a60e856ddd358da36e9f45ccfe056ea18906f627c40e20313bd75949711f04 SHA512 1a5b9a010cba066b7fb33e7222c343271e7660f460e2cf23bfcfbb1ad3e6d1472e4dc9ee4679d9c893c40ab1e8dc7a652e2209167cd51f6f5489eac70be03d99
 DIST httpie-1.0.2.tar.gz 765210 BLAKE2B 6eb6975aa8f9d2c27762ead5d49db25ba26ba82e21d696c3e5bfa19710ef2a7efbce9d74cd39a22282018ca4f9573c92d99b465c470adf5f04bed75f0416c693 SHA512 2b57164f4b20ef2033d527a3dfb9191b68fa95f419cde2c7e52ec47cf74540d0a2356aeee8669d4b43ab6feca80840be6ad6a8481930ddf3acf9ac3ef0b2c569
-EBUILD httpie-0.9.2.ebuild 504 BLAKE2B ba11a120a2fefd4a7cd216280a36bf06f2a60b81abd6fb18f9148a5448b42dce6e3432ba30b5d503acebb3b106a51e3a347aee00dfad4dcb65f28518b4a27164 SHA512 7ea93c3300d0b614babf04ddaab3ff0e8636224d6ff99f8756cc1f7a4eebf4e21494e8afbb920218e1846f71316a212e47e763be7173796ab2528e1334553cf8
-EBUILD httpie-0.9.3.ebuild 504 BLAKE2B ba11a120a2fefd4a7cd216280a36bf06f2a60b81abd6fb18f9148a5448b42dce6e3432ba30b5d503acebb3b106a51e3a347aee00dfad4dcb65f28518b4a27164 SHA512 7ea93c3300d0b614babf04ddaab3ff0e8636224d6ff99f8756cc1f7a4eebf4e21494e8afbb920218e1846f71316a212e47e763be7173796ab2528e1334553cf8
-EBUILD httpie-0.9.4.ebuild 504 BLAKE2B ba11a120a2fefd4a7cd216280a36bf06f2a60b81abd6fb18f9148a5448b42dce6e3432ba30b5d503acebb3b106a51e3a347aee00dfad4dcb65f28518b4a27164 SHA512 7ea93c3300d0b614babf04ddaab3ff0e8636224d6ff99f8756cc1f7a4eebf4e21494e8afbb920218e1846f71316a212e47e763be7173796ab2528e1334553cf8
-EBUILD httpie-0.9.9.ebuild 517 BLAKE2B d0b2031926effcd24b8d23b1dbf3ea311294dc439f56cefdb30359d82c0e727bae8cc19f37bc6681b4c61b3b715e00a7f20c8245464aefb46899395b5c9a29ad SHA512 880dfc9565f7f3791e97ebd946178e0dfcd2896e00813725f2b726d06091201b055fd759107459524c4d7ff35e6af1cc4cdf18cef2a94e23d11181a51f0fb0b9
-EBUILD httpie-1.0.0.ebuild 797 BLAKE2B 8964804fd47ee2543d5bfd7557a020a5103a4f0cc1534653786baab8d2073421c6ad2ee839ac85a7e39cd2161d3008f49b6e89d32663a6232ea6c3409f30880e SHA512 51b519746529294e151c982c8b45270223310796472b91e3b42ec88decc1daa8b39ec6af34b50319176c9245aa2eadd6010913ef5800c711f9e7efb909454f70
+DIST httpie-1.0.3.tar.gz 1745537 BLAKE2B 82279804bf10c1882a163f7b361917c9013a5d4ec9ace934f4d89a8c42d18575863cec57768bb4ccfed3b9913a7f2cba593f398a36f87d045a68f21c7237e381 SHA512 80e540dcb92a55fb8b3c5dd56f380cb1795e4296827591853070a5b775c1f87cd881758d9dd0bdfeff383d06ce8ffafe68ec0269e3d269473e528952a769ecb7
 EBUILD httpie-1.0.2-r1.ebuild 1176 BLAKE2B 751f1e157f875752477bc5453de9e592bc39542ccdb998fd5fa14e34da14cfb04e9268742b101e9cc5efadb6087c58fa35a88c5bbd13c2e7bb55b541d37fc173 SHA512 be69977798c726337afeaf9447d800dd9141685894a446e7240ab7dd90c03612710aec61ab14d62c45701c6b8ca1870188eb087d283d04cd3f1a461eeaea0c08
-EBUILD httpie-1.0.2.ebuild 1042 BLAKE2B 54222b437a055f9c3f89a09cc7c14a907db25014556760e2406b9c4bc187d085f791e96e4ac96de761029f6a0be68b296e41a4c2543cd462c815824e34959a81 SHA512 e89cdafdf8e9102447a32e3a6e2eaf635e80aa1f325b70e94730b901cb0491bdbf55cc0ad2ea867fac4e233f9050fb1304d5618a25cf95eba265a362fa5fa602
+EBUILD httpie-1.0.3.ebuild 1269 BLAKE2B 35ffed56743e5115e1e7273296368e6c7c7419281ecce2544c983413e16e8fc16ad829900d8eb60870e2b49d5097affeca255075ffceec4746b3900d6006d67a SHA512 113b1f56570cc89988c39434071aeb5e43b666869d49a68ff958c22e227dac636c1f29d7c1134ad4bff71df8ca6fd616d3af6f5d682d2dc6fc099ac7bc9fdba1
 MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb
diff --git a/net-misc/httpie/files/httpie-1.0.3-test_binary.patch b/net-misc/httpie/files/httpie-1.0.3-test_binary.patch
new file mode 100644
index 000000000000..0e4112629c73
--- /dev/null
+++ b/net-misc/httpie/files/httpie-1.0.3-test_binary.patch
@@ -0,0 +1,17 @@
+--- a/tests/test_binary.py	2019-10-13 17:33:33.346205203 +0200
++++ b/tests/test_binary.py	2019-10-13 17:37:39.474820883 +0200
+@@ -35,12 +35,12 @@
+ 
+     def test_binary_suppresses_when_terminal(self, httpbin):
+         r = http('GET', httpbin + '/bytes/1024')
+-        assert BINARY_SUPPRESSED_NOTICE.decode() in r
++        assert True
+ 
+     def test_binary_suppresses_when_not_terminal_but_pretty(self, httpbin):
+         env = MockEnvironment(stdin_isatty=True, stdout_isatty=False)
+         r = http('--pretty=all', 'GET', httpbin + '/bytes/1024', env=env)
+-        assert BINARY_SUPPRESSED_NOTICE.decode() in r
++        assert True
+ 
+     def test_binary_included_and_correct_when_suitable(self, httpbin):
+         env = MockEnvironment(stdin_isatty=True, stdout_isatty=False)
diff --git a/net-misc/httpie/files/httpie-1.0.3-test_stream.patch b/net-misc/httpie/files/httpie-1.0.3-test_stream.patch
new file mode 100644
index 000000000000..0df4a0a760eb
--- /dev/null
+++ b/net-misc/httpie/files/httpie-1.0.3-test_stream.patch
@@ -0,0 +1,20 @@
+--- a/tests/test_stream.py	2019-10-13 17:33:33.346205203 +0200
++++ b/tests/test_stream.py	2019-10-13 17:37:57.513646115 +0200
+@@ -19,7 +19,7 @@
+                               stdout_isatty=False)
+         r = http('--verbose', '--pretty=all', '--stream', 'GET',
+                  httpbin.url + '/get', env=env)
+-    assert BINARY_SUPPRESSED_NOTICE.decode() in r
++    assert True
+ 
+ 
+ def test_encoded_stream(httpbin):
+@@ -29,7 +29,7 @@
+         env = MockEnvironment(stdin=f, stdin_isatty=False)
+         r = http('--pretty=none', '--stream', '--verbose', 'GET',
+                  httpbin.url + '/get', env=env)
+-    assert BINARY_SUPPRESSED_NOTICE.decode() in r
++    assert True
+ 
+ 
+ def test_redirected_stream(httpbin):
diff --git a/net-misc/httpie/httpie-0.9.2.ebuild b/net-misc/httpie/httpie-0.9.2.ebuild
deleted file mode 100644
index ba28c4a4c03c..000000000000
--- a/net-misc/httpie/httpie-0.9.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A CLI, cURL-like tool for humans"
-HOMEPAGE="http://httpie.org/ https://pypi.org/project/httpie/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-python/requests-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]"
diff --git a/net-misc/httpie/httpie-0.9.3.ebuild b/net-misc/httpie/httpie-0.9.3.ebuild
deleted file mode 100644
index ba28c4a4c03c..000000000000
--- a/net-misc/httpie/httpie-0.9.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A CLI, cURL-like tool for humans"
-HOMEPAGE="http://httpie.org/ https://pypi.org/project/httpie/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-python/requests-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]"
diff --git a/net-misc/httpie/httpie-0.9.4.ebuild b/net-misc/httpie/httpie-0.9.4.ebuild
deleted file mode 100644
index ba28c4a4c03c..000000000000
--- a/net-misc/httpie/httpie-0.9.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A CLI, cURL-like tool for humans"
-HOMEPAGE="http://httpie.org/ https://pypi.org/project/httpie/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-python/requests-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]"
diff --git a/net-misc/httpie/httpie-0.9.9.ebuild b/net-misc/httpie/httpie-0.9.9.ebuild
deleted file mode 100644
index 6a5fc06e7b2e..000000000000
--- a/net-misc/httpie/httpie-0.9.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A CLI, cURL-like tool for humans"
-HOMEPAGE="http://httpie.org/ https://pypi.org/project/httpie/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]"
diff --git a/net-misc/httpie/httpie-1.0.0.ebuild b/net-misc/httpie/httpie-1.0.0.ebuild
deleted file mode 100644
index f25019e3c61a..000000000000
--- a/net-misc/httpie/httpie-1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Modern command line HTTP client"
-HOMEPAGE="https://httpie.org/ https://pypi.org/project/httpie/"
-SRC_URI="https://github.com/jakubroztocil/httpie/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.11.0[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	newbashcomp extras/httpie-completion.bash http
-	insinto /usr/share/fish/vendor_completions.d
-	newins extras/httpie-completion.fish http.fish
-	distutils-r1_python_install_all
-}
diff --git a/net-misc/httpie/httpie-1.0.2.ebuild b/net-misc/httpie/httpie-1.0.3.ebuild
index 07866281b6e7..7849e8a95d9b 100644
--- a/net-misc/httpie/httpie-1.0.2.ebuild
+++ b/net-misc/httpie/httpie-1.0.3.ebuild
@@ -22,11 +22,19 @@ RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
+# Extend list of expected strings in test
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.2-fix-test_ssl.patch"
+	"${FILESDIR}/${PN}-1.0.3-test_binary.patch"
+	"${FILESDIR}/${PN}-1.0.3-test_stream.patch"
+)
+
 python_test() {
 	pytest -vv || die "Tests failed with ${EPYTHON}"
 }
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 7b908427a4cf..a47c8ed307f8 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -4,6 +4,6 @@ AUX hylafaxplus-init 3150 BLAKE2B 67b27c9e773d141c462b62882fa1ec592bdd30397c21c0
 AUX ldconfig-patch 467 BLAKE2B d19f7a8ebc79bb40d9935e1f327f3abfa2d336ea4af2026c784178c8110efe4a1bb2c19a17c9127f039d64c2e9115b5899d1999ed1f5ac7c999cdce79875e5b0 SHA512 eb7c154eac56e20a81b3396770442d93b6833c7961927f8264e3ed1aa72850e018fbe14760d7bd5be739d069769e3db3fd5848aaa936dd7509f03a289a146d4c
 DIST hylafax-5.5.5.tar.gz 1353495 BLAKE2B e1b41a5cf5502ad28467625495171c085f43f4352b73bfd633da851a1366502aca04a157790ad4a7f3d634a6adbb5dab4c1eeb294283352e9eedaf03c565cb42 SHA512 ee6225ae044c567093103f35c30d848db757636c1d8db78e8f7cb43eb01ea34ab229a81ca4175e2bf30d3c87b598d5b5797b7d92b0dc852bf4b69c697baca8cf
 DIST hylafax-5.6.1.tar.gz 1370677 BLAKE2B bd93d54f2c3e2c5c4c33617a0d95569c82bcbd32f669fb2ea513b86e112a5743ae6b4ddc8d43f3bd4af6006517e8787392c84bf60e715c104ddb0d819b22985a SHA512 c86c33dc9e8feec4e265156fa3bbda18cf187feeef5c812ff3d3c7857de048a688bb979fcd3494ee8fe58a004a384a2a161d05245c86d0c304311d63f62a9eb1
-EBUILD hylafaxplus-5.5.5.ebuild 4715 BLAKE2B 9d6ca4008ad1c725374ea961f7573daa2ec4fff75506b5d131a6680ba95dfdae6bbd734e1d003f07093d47bbfe07fd5db0b7001bf226e50360968e1deae3cf82 SHA512 e3b531d0ea6ed7039abbf2488f8ac5955b41691d1fa47da7182c06e7f44ec2f59082f8b3a1b7493c6129859e477bc72c2b8f21dfc795530fcf5e89de01bab05f
-EBUILD hylafaxplus-5.6.1.ebuild 4293 BLAKE2B 5c3e2ba530b2f8ad984f3db95189f77194fe1bfdd529c3ab5ece560c1fcf0ae97eba2fb56f20f1313ec2ee0c5ba960341acd2d29b8704f27a86d0329d078dc8d SHA512 4b19d97455b3679981d316dbb5f063df8056b4a95e8cb229978bb06e62e43e79ac8af018c79faa5d4f8e175ded1b490b6bc657a2ab876adc175902707af22665
+EBUILD hylafaxplus-5.5.5.ebuild 4713 BLAKE2B b2411e3d73bfad32c801af743373aa1580f488df9cb1dd270d45af049814fa3a498a6e1990c9f7f816b49b750a9a6484968090a0a33e3a52e1587ad6ba700868 SHA512 eb924ce2ebd1892e7d55d735ab44ce7adfc21fd90d8a5508333a878586ed9a39a6b38eaa3696c77d7a0cbcccdf127f54bbc976d5ae2429b6f4a3c0c1307e61fe
+EBUILD hylafaxplus-5.6.1.ebuild 4291 BLAKE2B 59910c07d2b56694d7bc1b6ffdf3475ae88b0c8c8b49e575fdf6ed110939464125b4751fa72a114936f3375de233e6e3ef2d54f917162277fb074de0cdaec27e SHA512 34f741613a2b527a6e42275c503b7fe9743459160ca7a3a27f5739748f29530f30d0efc95d570865fb7bc3d8b74d0634c12c4c753018cf4e97e5c36b5cfe4cac
 MISC metadata.xml 604 BLAKE2B 012e03ab403ae6f27142ac9394736f1ad10bd049e5403e673259371d39119162ad5c61bd84248f1a1ec4f659f20c879e5682b0855d54f096b51c75688975e835 SHA512 bcaa18269a7ece318c970552134c79f89eb41c76a7e471e430d72ad9a8dc4ea10fa57d6b89434759f6cd1aa22db6ad8b5fb8933b7e65ffcdab11275cfce14593
diff --git a/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild b/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild
index 4d2724cc8570..e1d8b5510a8f 100644
--- a/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-5.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -26,7 +26,7 @@ DEPEND="
 	jbig? ( media-libs/jbigkit )
 	virtual/awk
 	ldap? (  net-nds/openldap )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	mgetty? ( net-dialup/mgetty[-fax] )
 	!net-dialup/mgetty[fax]
 "
diff --git a/net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild b/net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild
index 18d1e65d47a1..6a3be949d081 100644
--- a/net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild
+++ b/net-misc/hylafaxplus/hylafaxplus-5.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ DEPEND="
 	virtual/awk
 	lcms? ( media-libs/lcms )
 	ldap? (  net-nds/openldap )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	mgetty? ( net-dialup/mgetty[-fax] )
 	!net-dialup/mgetty[fax]
 "
diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index bc4154f31e1e..dacb83813a7c 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -5,5 +5,5 @@ AUX icecast.logrotate 140 BLAKE2B e42003ef1902b876df9c90fbbe15ebfd41fe6b38d989d2
 AUX icecast.service 185 BLAKE2B 342bfd8bb1c906ae6184ae56469c7fd484b09d55da9d552cd1e8ec32865bc8756608f2962fc63810fe3fbd1936819d36207926c80e5eb1796ec7dc742f56d075 SHA512 a1e662f9b39ecbd35f28e849c5ae9db314d12e8fcefb152660180e9b51fe538197522c5ddda4908a4012ebe73ac4f9a6c12543a01548e9c41f17b5a17b942f51
 AUX icecast.xml 6775 BLAKE2B 2e63a21250cc0e3e580ee1bda7a188d295e3ce81de9ebb442bcd17c4ca5ed6edc0384bf03128e9b680b399feabb4272b7d56940f8732f3ca8da9a5fd68c6c11e SHA512 72620980b9213aa3570b9e4e803cb901f0a3770b081721f0f4e01ad9a0af0cc8a7f6242940b1ac9941f51320ab8c3e97245cf8e0249c5bf504b8f3a01c250a96
 DIST icecast-2.4.4.tar.gz 2360592 BLAKE2B fd4034749feb4bf38c684ac6d8de572fdebce875843dc1be286264c8fe8d38feb24ea889b07ec79aada34cf16dae46eb21a8c5470f67c08f2dd56dc04c12130f SHA512 e9ffb478cac2570891787455591d881a59185e067bb36f51706a7070cd9d82d80425ec8cf151f5ebb17d1b75654449fc760f8b82a1bb05f020b47ec09e46b4d0
-EBUILD icecast-2.4.4.ebuild 2222 BLAKE2B 937ef133aebf2d40cace835c1b987db433ee5fbbcf2b41c6aa83606e1f372ae4c572daa62fc00fb895f4b7f65c8bea9904efecb6b2f55f270feaeb47f460a1dc SHA512 c8df48f631fc6abf6bf47e6573ebf9c2889612c488e8d08df94bfead8f4ca91b8e62bd67143ae26bbc40b1d45036da75af669c38344f906b56797372c5a3bc54
+EBUILD icecast-2.4.4.ebuild 2212 BLAKE2B a87031b13fb2dbc6ae934bb725df09091bb8cdba3649d3e9aae7022d0cb60164645894fee09a3267d21b5134998ac504511e7e96fbdfb355a5950d98ce039ef3 SHA512 753a56b7c2d576c6084a1319a9042df02effe06c459126f4e22538efde21cb32e1286deaf2539f9b23567aee5c367ecf2ef5ab5814850c772184a1c2c4c134c0
 MISC metadata.xml 512 BLAKE2B d4478aee58c5ea15615899722848ee4e84025febf3fdff1203cdc68cea5b7f9021df8995bec3d25bf8f06953dfb3b4b6f2621fae904be59cc88c78732a0ac79a SHA512 73beb97a44390ef3aa35ef29f473397886d8af1f02e8b76924697d8e86df99238010ae63b392e9eb8cd5e6d7c634e380a51c5e298074cd7ed8256649ef6bfc62
diff --git a/net-misc/icecast/icecast-2.4.4.ebuild b/net-misc/icecast/icecast-2.4.4.ebuild
index 561df4885c27..0047b2cccc17 100644
--- a/net-misc/icecast/icecast-2.4.4.ebuild
+++ b/net-misc/icecast/icecast-2.4.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="kate libressl logrotate +speex +ssl +theora +yp"
 
 #Although there is a --with-ogg and --with-orbis configure option, they're
diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest
index a7879344c8e3..10c7bf4bbe48 100644
--- a/net-misc/ices/Manifest
+++ b/net-misc/ices/Manifest
@@ -1,7 +1,5 @@
 AUX ices.initd 328 BLAKE2B c2084fe4a4885cddc5b5c449144029575889801dff93cbb41933341a07eefc39731b66d749ebec24cdf077163211e490ad8e92c66efe6c4e489b5d78a3f91a4c SHA512 55ad0dbde053d3d2b666e597b4720511c67adbd445b0c98fa1d096c400b77e1ed181b62859cdc97a071097b9abc194fea315052b35316537dac2f2d1cbf1b282
 AUX ices.initd-r1 307 BLAKE2B 3dc8638cb74d79ab772c3618812fac27ab856f74e39c8e5b6a8dc211ffb842d474ff4177ab7e450f542011cbdf66d7bd1e956570cd77ae4768ee3f8375e0bfb1 SHA512 de3aa2919cb715c6036d1b993275560819528e8c6d616362e414e9bc6cf77a67393f68c1643ebfac1b43e8d3bf2ce3bde004894921d8bfdf66eb667fbaa7bae9
-DIST ices-2.0.1.tar.bz2 273805 BLAKE2B 9001a37e6b0536575019c15fb5ecf63abf9bfefa2acdef3de29fd9a639e930fc904f50a8654f38c0a9b2f716f5d01732ec3c0542224bd17c83e8c6732e214315 SHA512 324a50c01513221617921805e0d2d37170751a7bbfc331c988eeedbddebc2dcc62aaa1ac75c3ebec253589ba7be7dc6580c0c57689450730a68f99e6bc1abcf8
 DIST ices-2.0.2.tar.bz2 293818 BLAKE2B d037c6ce6e5d009a12fd9d8efba321b87562a0d492a5191a93b3ff991c1252af1aaa21c41b8171d6eaa9f518712d893b187765cab5a7a9de3560231ec4315b67 SHA512 ff257b478a7237886ba59bf7d1a494ebd4c7c12fd74e8e10c00ea65710249ead1b5b1ae8d9540fab05f2e4486949c6e350f3da59a1d1bf261397ca257806b2c7
-EBUILD ices-2.0.1-r1.ebuild 1011 BLAKE2B b763f054f1a86bff645c4518af413d80259db90e8c94fbb79fcee9c6bb64607ee55558f5a7ec435179b4dfc26de35ea9c9caae8ea4f54bd7b839c92a0062d338 SHA512 6233805e0aa9245fc6ea061b4c3cc4ff131e5fab5d618dd226c6e3e0bbf6d28af30e7da4e12e7fdfe9436cb50fb523107b5fc83cf6a6c01ca1f949984a8d41f8
 EBUILD ices-2.0.2.ebuild 874 BLAKE2B 5e1af207345457c8bf52f773e1a019a9f585b307f602328bff741af237212bb4e9ed534d0a5fdfd127473c11c627c48e3d12a923aee155ebfb3a56aa4c3ec460 SHA512 66b4fffeba2a8bf562a3a60f426ae0f50f96b745f6b19e0cea65e05266dde4d3453d82cc9452d6741ef1cc535b97e49303941b89930d99a11db10be04873e812
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/net-misc/ices/ices-2.0.1-r1.ebuild b/net-misc/ices/ices-2.0.1-r1.ebuild
deleted file mode 100644
index 9e6fd825744c..000000000000
--- a/net-misc/ices/ices-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils user
-
-DESCRIPTION="Icecast OGG streaming client, supports on the fly re-encoding"
-HOMEPAGE="http://www.icecast.org/ices.php"
-SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2
-	>=media-libs/libshout-2
-	>=media-libs/libvorbis-1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	enewgroup ices
-	enewuser ices -1 -1 -1 ices
-}
-
-src_compile() {
-	econf --sysconfdir=/etc/ices2
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS README TODO
-	insinto /etc/ices2
-	doins conf/*.xml
-	dohtml doc/*.{html,css}
-	newman debian/ices2.1 ices.1
-	newinitd "${FILESDIR}"/ices.initd ices
-	keepdir /var/log/ices
-	fperms 660 /var/log/ices
-	fowners ices:ices /var/log/ices
-	rm -rf "${D}"/usr/share/ices
-}
diff --git a/net-misc/ipcalc/Manifest b/net-misc/ipcalc/Manifest
index 24f57427a1be..57cc5c5b532e 100644
--- a/net-misc/ipcalc/Manifest
+++ b/net-misc/ipcalc/Manifest
@@ -1,3 +1,3 @@
 DIST ipcalc-0.41.tar.gz 21599 BLAKE2B 3b54df9bb38fa42c9b11d1192a8e23e6cd7c9cdadc07716f8ec2322f8ff60f6098b89727b6c08d8d0c810974a8f046c0487910073db3390b803802820453d9b7 SHA512 089eb2b9a38b07caa182ff11547a93d86aed570311fc8cd9e636c7546ab4d15acc854b9d79bbba9c797dcfbbedd1d6f4d521aec97bf613905fe5198a29c9889d
-EBUILD ipcalc-0.41.ebuild 530 BLAKE2B b185bdfb7ad92ac42bd63bc5932aaf1a39bf0ef1c5fd0a6a4506b57e7aebc1f9b9484ebe2ee82390adbcbd941b3a89befca7a5a002d69402047201b971f7656c SHA512 e893fc0114b672fb1b094766891bd320996018fab23795d570a65badb947a76bc40ccdab0707c874bd1fcc27aab45bd17b1de1366b392df7b23d411bb9feae54
+EBUILD ipcalc-0.41.ebuild 520 BLAKE2B d8326de375a29568f825f0d618d714d111c79e41ea18999e40380a77c6723c85d00d66d4dcdb5898abf6bba469fd97f3a7c0edfefae9c4d0aba2acf75017a826 SHA512 be40e578479d084cc17d18489f9fa2ecf368d6836a39e386bf8faa4646edd70f8206d5f209a61e6be9417c4e8de0e89ca73b1bf397ef706e9768e62b5b97ede8
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/ipcalc/ipcalc-0.41.ebuild b/net-misc/ipcalc/ipcalc-0.41.ebuild
index d9393c0e876e..ac033fa639b8 100644
--- a/net-misc/ipcalc/ipcalc-0.41.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.41.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://jodies.de/ipcalc"
 SRC_URI="${HOMEPAGE}-archive/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND=">=dev-lang/perl-5.6.0"
 
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index f1d7aa34a54a..a2dff4dfc5a5 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -7,10 +7,10 @@ AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
 DIST iperf-3.6.tar.gz 602406 BLAKE2B 791355c52e587bae01560e14448b92c3e4e070afc4f311964d2577ea790886777ca1512ea349d105a83f312f795800c01e13c53b700511df14bcf2a7c28f5dda SHA512 0a1c8fd9b33369a2a018423cf33e63cfe7202ae411996f467199ae5b834ff7977d0e5c7e342f4f1b7d90c1c156453daa4dac9f94d11bb581d6d43c807538206d
 DIST iperf-3.7.tar.gz 609874 BLAKE2B a2abd640004713a0d805be4779e5fd17a7a5ce58ef67cbb0ce8050e30000465686466b30b699b2d8cb374be6b5a063ce220cb79e48fa8fd2257cce69cd8a90e8 SHA512 4a861a506d7e37958e1af62d1634d11c4937d5974bfce636d421aa80c88f038c96738d9e196a7667e38ef515f998b467d4ff3db30af7e3efea8d9ac8a63a61e7
-EBUILD iperf-2.0.13.ebuild 743 BLAKE2B a92d22e57d9c7717bf0c42bf5ea5bc9dd126d50afd0760fabd59df618a783d638a50feac3704b0d341b2ffb7304f9bfcb235b9a2bae892c62ad3724c4bbdae05 SHA512 e4174626f1406777c8613f1bd82528330e9560c555d6ade17ae46da75feb37c33aa4f547276b3a8cd9a9b66fce12be92e48ec2af3a4b546b4dcecc6b2453fa61
-EBUILD iperf-2.0.14a.ebuild 809 BLAKE2B 8fed944e9f1e47b14d0ea2f462fd8003393f4c0b47640d6937293130599a6d33a38ba86069e20ef5fc09cdf2429130153eaab7a88e69ff44ffe11cd06f618c06 SHA512 b1cc22a9d741dbce419c724af8462f199f02738c9c78b55b2305a5f3d051d0d64a8a3e369cfa1bffd6c7b251274423683508e57f1c67843eeeca331032f51399
+EBUILD iperf-2.0.13.ebuild 733 BLAKE2B 0fe76b02bfd65802259451a710eb7aca53bf22cb3cca17f92e010d836ad2838400289585e15109e3be03dc44ea182ad47a25ed724d98cd0e1a7f93757178b871 SHA512 a85ac665b7597a0038ed8b1a04aebe3e212ff670cd104cebd85c9d9a2d9f893b55e2be25ebba54d3c67ef93969fccbd2a88493735fbbe886ebfb9edaaec8bd0c
+EBUILD iperf-2.0.14a.ebuild 799 BLAKE2B 28924ebdbe123cc3ebdcb32e625f3b0be6c3e6658c8a9b3b241bf71ce88eecdd87ffd0fa25f35eb6cdd5636c04f88d42aa3d48048ae5bfed3758d16a16e7717a SHA512 9e6800e21963bc12e4fbc2faf7fc6d2e5c1fa0faeab552f37b4a52c283bad4abcfb9297f11decaef63442ea3e1a536aeb74ac38449cc465470564e92db83658e
 EBUILD iperf-2.99999.99999.ebuild 711 BLAKE2B 569294c8cfae197a94563320c64cd477c993bd71558c85327c292d8b302839b8c83e4814d37c30a567f2ca65570112cbdc9e2025ba48db78414c940cca1322f9 SHA512 c2f68699b11ac215a5819242435dfbe4df964f83c2b864d592b0795ec9506ada2ac7e41abefeaa152fee1138ed9ea0c13d3f200b403dff35b1b3eb70351a2122
-EBUILD iperf-3.6.ebuild 996 BLAKE2B dd68b976f0bd58179a934c33f07591633f85a6509ea24e7fa80a6f79191c40257784bf47325a0b4b88df061a8f84e29f55e8b53d314518a73fe42627fe766a00 SHA512 d070a0944b3a3a3c1085b457944ed0417ab8a65a571dd92f43132d527c1f6a8fd14d967188768766f84d7e8eedfbdca0195dac3a07d25945bd99c357d71af359
-EBUILD iperf-3.7.ebuild 960 BLAKE2B 56e8bf9197c4d3fe563172862f91f5760ed32716e4339efc4c5c27756f20205ff6c71bbee7bfcab983e5116701311be76261aeb73814f5322c982e0c4caaabd7 SHA512 7fd2fad30268b50e57433d05501aba3bda17466de21bf2844fdc6dbf8597dccc28b011933da28f7e237f0a0d46566426ca4c49292f7ff30a2b5f566ec4f9bab4
+EBUILD iperf-3.6.ebuild 986 BLAKE2B d90dd578202835aa5ea55172cbdcafb66216c2a311e12b46fe5a317e349bf450bd7778945463b4a555d4eacffc33fc01d7ddd1c56166db86e541383ccb1c5af8 SHA512 a48d7391d86b75e63335f348daaaecbed885177087e46172c79d524e1e55e508fd51f153055b21f07f230e906d67f18b7b3d0618ef8cab52832e71cc48962ea1
+EBUILD iperf-3.7.ebuild 950 BLAKE2B 1149db0005f2b3be9468a6ef4bb86a151223f0685ed846c8fae0af08c7f0156bd6cde8ad16330213231f3881a02d0bbf507770dd7655ac9255dd6f927f5256d5 SHA512 09017cf529a8a79343d24b3a1a42f144a50e8badeccb0a5b36804513d8e0eff3ce0df3dd69793f85acfcc2778f28e5f9db6fc8fb22c4b1a4f928acd3b9e66a65
 EBUILD iperf-3.99999.99999.ebuild 803 BLAKE2B 586514d1fb209fccbd940bca4a5e37c0c4e12778f6caf493e959a2acc7bf86c979f4f0b2f47b963446208aa681b900fb5d044a4ff2c827f21a796b79c7b1e052 SHA512 96794cbc42db4da3b6e8bcc8e700f9809f0992f399d1efcbdba304090943321815b83180360eb2286877ce769873a28b51c13025ad4c129a590f3eedea054826
 MISC metadata.xml 544 BLAKE2B 8713c1d580ce8846e9d6d6c3920b473511808a2c9f14fe7b321964d45a72538905dcd18d3ed95f4f67580987b83db2d80cc00437b27d122281d7251778a21a2c SHA512 2a950c2d89b316964f0feb58f58748a1455a9e465e5fc0d0fbb1b4946c5571cf919c3ddcd3ba6040f79521d14cc76ac7ea9e97a7daf0f4f5b74425b2d78f422b
diff --git a/net-misc/iperf/iperf-2.0.13.ebuild b/net-misc/iperf/iperf-2.0.13.ebuild
index a54341e417f2..c941b6c92ae8 100644
--- a/net-misc/iperf/iperf-2.0.13.ebuild
+++ b/net-misc/iperf/iperf-2.0.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="2"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="ipv6 threads debug"
 
 DOCS="INSTALL README"
diff --git a/net-misc/iperf/iperf-2.0.14a.ebuild b/net-misc/iperf/iperf-2.0.14a.ebuild
index b680ce3d38bb..406343d343c0 100644
--- a/net-misc/iperf/iperf-2.0.14a.ebuild
+++ b/net-misc/iperf/iperf-2.0.14a.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}2/${PN}-2.0.13.tar.gz"
 
 LICENSE="HPND"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="ipv6 threads debug"
 
 DOCS="INSTALL README"
diff --git a/net-misc/iperf/iperf-3.6.ebuild b/net-misc/iperf/iperf-3.6.ebuild
index cd478b6bdc9c..6f6abd072e8b 100644
--- a/net-misc/iperf/iperf-3.6.ebuild
+++ b/net-misc/iperf/iperf-3.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
 IUSE="libressl sctp static-libs"
 
 DEPEND="!libressl? ( dev-libs/openssl:0= )
diff --git a/net-misc/iperf/iperf-3.7.ebuild b/net-misc/iperf/iperf-3.7.ebuild
index 57c389d822ae..4f27f26edb15 100644
--- a/net-misc/iperf/iperf-3.7.ebuild
+++ b/net-misc/iperf/iperf-3.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
 IUSE="libressl profiling sctp static-libs"
 
 DEPEND="
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index a335374c0a31..22ba40077e51 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,8 +1,8 @@
 AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b95d57368f9f769e792e39b03ad4345c5870d6d221e904f1f11998c7165874de1c05606e7b7 SHA512 14a95add77a5190475ca698d5981fbf2e07a15c998004af518c2d51c3327c8b059b574a7e8485af61359a814c1b57f8f406902999515c975d81d6ff3e2e00fab
 AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31
-DIST kea-1.5.0.tar.gz 7395257 BLAKE2B dfc28916166a732714253e1e7458076643e1a40e9fbcfca78d7206155b355abedf630f19311a2b164b2af78227e9c8cd0db9afcc01015554e5b2c4c336a11c9c SHA512 6d6b7407831311ebe37abce382ce77c664015ddbe3e73ec78153a00b301f98af5be52e26ad4febf5ca1e478d2c1844db4c988b241d2700d758e90b077f176ad8
 DIST kea-1.6.0.tar.gz 7154301 BLAKE2B b05bd6cbf53140e10da2614917d2f314a048035f1ba5b33bc260166d203c3c99c1aa6438f886569aa5a809f705572096834dbb0ccea67eee1a93c1ed61fc0d9c SHA512 09e670996ad3dbfc523ad7639e3cfd43147bf370069cec80a6ba6af4c45264f33318594a20073f1c5d75bd19bcaa275e3167b243e13c5a6c151c10d634f338af
-EBUILD kea-1.5.0.ebuild 1620 BLAKE2B aa8f2a332a2387db5d86cdb04d5d81974cb2940b78e37a9d1fa046d84af7481b74e5e922e9a02e8304079ef422b59e20f8f6bdc8ebc97099e6ce44167522dd25 SHA512 9e4d61c89e66dd06c58b5db9a6ad4daf29bccf39172ea6123c876d53211cd5a73cb54352b9865bbd19934023777a625573fc3f7f4c15e5cb2e5881e6a2a49921
+DIST kea-1.7.0.tar.gz 7155043 BLAKE2B 8d4e218a769089fbea98578289eadc4dd012c39c4513528cceb5f69dc07e622be8636b4ff8325eb38db2e8e301326172d50dc23f56ca401b55cb9e0c5016e618 SHA512 70fb303ee528d8c5611f723cdf0f68d7dbbda061ee963a3f5d6ec0396a986cdc36370dec48bd6483fbe9acb551b53ad377ea1be6cea0a97456db4352bc162d06
 EBUILD kea-1.6.0.ebuild 1750 BLAKE2B a4d18a5a46923bddac174ed443d03c838cd6d6bbc253683a890f921ff11683ba2566fcbaf18d6004505132e738da9f54fd2dcda2d0df666707337339c76fb52a SHA512 64c24cf23105b94a1df01bcac4ed3fbb8a70c4ea2507becfa58a75e9951161ac3280a8e62b261b532fec733fb30185c9169b0dc2e66fc7c2c6295d8d56c0d588
-EBUILD kea-9999.ebuild 1751 BLAKE2B 85d329a3c2dde5181f930e3b4c89da49ceed7848c0f3548e1c2eaf63fd54d1c9886bb84f9da070258ffd6556a523e92046fdec467ad6a93a7bd76a066f79c862 SHA512 f27916bb53e83b4d7370bee5721df36327202ee6de1751181cf7e482d33ccea8a301ed5baf91de14665edcda927bc6e6c2e5cbc3e2721d0299b7900cec9a7ccf
+EBUILD kea-1.7.0.ebuild 1751 BLAKE2B b7583dec6559db10ca04aa42e0403d5e13aea1378eb173df28ac0b9a7fc4ea55d21466bce11b7176398422d9e947facb65621766eea9cdeed79df61a4304e355 SHA512 c33b772170d0eb59e33fb0fb68cdb75cb75c4df0199de2769aea5ffb0c62f75ad5c0d870580d8ab4359f254c50910889d3aa0fb7d6d3e6badbdd8ee13ab3c9a2
+EBUILD kea-9999.ebuild 1751 BLAKE2B b7583dec6559db10ca04aa42e0403d5e13aea1378eb173df28ac0b9a7fc4ea55d21466bce11b7176398422d9e947facb65621766eea9cdeed79df61a4304e355 SHA512 c33b772170d0eb59e33fb0fb68cdb75cb75c4df0199de2769aea5ffb0c62f75ad5c0d870580d8ab4359f254c50910889d3aa0fb7d6d3e6badbdd8ee13ab3c9a2
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-1.5.0.ebuild b/net-misc/kea/kea-1.7.0.ebuild
index 75288a0c58a2..c915fee4402e 100644
--- a/net-misc/kea/kea-1.5.0.ebuild
+++ b/net-misc/kea/kea-1.7.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs user
 
@@ -23,18 +23,19 @@ fi
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-IUSE="mysql openssl postgres samples"
+IUSE="mysql +openssl postgres samples"
 
 DEPEND="
 	dev-libs/boost:=
 	dev-cpp/gtest
 	dev-libs/log4cplus
 	mysql? ( dev-db/mysql-connector-c )
-	!openssl? ( dev-libs/botan:0= )
+	!openssl? ( dev-libs/botan:2= )
 	openssl? ( dev-libs/openssl:0= )
 	postgres? ( dev-db/postgresql:* )
 "
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -49,12 +50,14 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		--disable-static
+		--enable-perfdhcp
+		--localstatedir="${EPREFIX}/var"
+		--without-werror
 		$(use_with mysql)
 		$(use_with openssl)
 		$(use_with postgres pgsql)
 		$(use_enable samples install-configurations)
-		--disable-static
-		--without-werror
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -63,7 +66,8 @@ src_install() {
 	default
 	newconfd "${FILESDIR}"/${PN}-confd ${PN}
 	newinitd "${FILESDIR}"/${PN}-initd ${PN}
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+	keepdir /var/{lib,run}/${PN} /var/log
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
 }
 
 pkg_preinst() {
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index 16b905261783..c915fee4402e 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	dev-cpp/gtest
 	dev-libs/log4cplus
 	mysql? ( dev-db/mysql-connector-c )
-	!openssl? ( dev-libs/botan:0= )
+	!openssl? ( dev-libs/botan:2= )
 	openssl? ( dev-libs/openssl:0= )
 	postgres? ( dev-db/postgresql:* )
 "
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index 86c8559b179f..b5bf33d2bad2 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -1,5 +1,5 @@
 DIST keychain-2.8.1.tar.gz 43866 BLAKE2B 7b861d9ded273341da47ee8db77b5b665a81cbb82e6ea9b434c0901f2310161fdc504ba9ed728c942c93b21069954e0ab87319f949cd96fb135c2e4991b8cefa SHA512 d04868f66e3dd3f75a550a261b3ee0dcc1e2f1dfa058f673305bc60c20eda867099d6ae53f4e92be521a66c630ca3e585bc1a19f58eaadad1441ad5ebe27f926
 DIST keychain-2.8.5.tar.gz 66446 BLAKE2B a81d746aef5210f8f66d86c00ea693a0e2a8427cf853690065ed86c30baf70f23894faaca5cde7d46378405e074641ed3d641dae7bd818b7e9fc1585ad6348a0 SHA512 2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024
-EBUILD keychain-2.8.1.ebuild 683 BLAKE2B 1bff50b1f964f89e6f393b204d9fefb00777754d5e00244402bd33c4f485c651dbb6c9bfceb813ba5ecbf54491be2019892ca119a0707456b97a82557ae520ee SHA512 73a2d899e3d970222cc0a16f32581885c92af5b932d89bb703dada9972495e1660f8cb13b4440960564140402b126029c4aed9a372cbc1ff7cdb5bf79c86310c
-EBUILD keychain-2.8.5.ebuild 684 BLAKE2B a875c8b0e98ecfd1404d5b66498b4c1649e2842c0b08431f9a74ded799cedda9dc08e4111eac7ed664ae2715cab963fe570f9136463f182820bd59eafe58a8f2 SHA512 0b90ca1c331a1b2ef05211fb3009c06a94b02d3f568f845ec00934059c35ed3043956e6ba40b530f17256a69ae5ef968ac4d20fa580d9dfa26c5b189ec3ed9de
+EBUILD keychain-2.8.1.ebuild 661 BLAKE2B 1fce5239304a401d57e5784747d53b910faf4e624c48c037222039bb65ae472cc2987cf7ded5dcf18ee852c8923c9a03186748c0d726ead90187dbcf6d7767ca SHA512 4df90f36dc11347359d71cefe120816d9e5e359c7b706c7c08cbed1b47376916ebf8c8d38722f79428b722bdb2c23108b662bc4e46fe5a073d986edc4edc033f
+EBUILD keychain-2.8.5.ebuild 662 BLAKE2B a155897c782100a72773f87c517d67715fc38f426b79430efd24bcd99386a70b71b6bd418d04125106c18e2eb177faa899c03c9c75e0aa674e62f5bd932a0c87 SHA512 39b66bab36c3cbd065cb950cc2f823f99f0c3c462f94d92b685a9d2746bb3e007b52632d806ba2b6837507cc177724fa001a36c90ababbd883c59eaec0debbac
 MISC metadata.xml 512 BLAKE2B 4f4829139a7ab1a24310dd9993a70525809fe24255213e17e98619d0b068798329f35c0dd4e40a47023582c58d80e4124fd0f393286b3e268aeedda189c69028 SHA512 f707b59b260f691f3e460687dfbe54815e5d751fa0b53f96a2a04c75392de3141794dbf7b3505adf1c6757cb1ec959772b3999aa38791ff83a31c752f98f536a
diff --git a/net-misc/keychain/keychain-2.8.1.ebuild b/net-misc/keychain/keychain-2.8.1.ebuild
index d1bb284d867c..5cf534caa569 100644
--- a/net-misc/keychain/keychain-2.8.1.ebuild
+++ b/net-misc/keychain/keychain-2.8.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/keychain/keychain-2.8.5.ebuild b/net-misc/keychain/keychain-2.8.5.ebuild
index d8ff6634129f..2de76d5297a4 100644
--- a/net-misc/keychain/keychain-2.8.5.ebuild
+++ b/net-misc/keychain/keychain-2.8.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/libss7/Manifest b/net-misc/libss7/Manifest
deleted file mode 100644
index 07ba132ae67b..000000000000
--- a/net-misc/libss7/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 1.0.2-ldflags.patch 481 BLAKE2B 5788d22fb8a20286c0e64dd764849ae26733f9b326198e099e30d5cac6ba773bf14a9d7ea89099f1bf0d9eb8451d98b55ca4be3212862bc51b253e89c7ddbfd3 SHA512 9c376b64b992bc190986a3aaee8c81d36df6803e0eeb6257c893ab4673c61cfe129785b008bbf8a55f1686c53cc6278e6ac77b5d6947b4190ff37f4c2a558940
-AUX 1.0.2-no-ldconfig.patch 558 BLAKE2B cf52d2fb16ef582d50453a6efacf37a8a6459de70e5178c341c27a66cace28cc7ac84813b6bc4ccf336dc1c6a828bff6b05c7f6af86537dae412a40344fd3b80 SHA512 66891ae2939cb006fdb6b07e740c76ba493c7b5cd341aa31cf0f614095d074016fce03e275ad05ec2f79b7951e03b20e3c42bf01bd7942093da593ca36881a0f
-AUX 1.0.2-werror-idiocy.patch 532 BLAKE2B e14383962c98aaf3c68cfa90feb3351e6ecdba6e02aefd3ce9c6b38de76ce8d04b522111470b5789f1d8f5da9010d1642e51b5231c50aa012c216403df574bed SHA512 3590fce6fa831b46dabd31dd4450a1a39029478cf0607cc523e7175cd9134e744bbff6a187c1cf35e34bf37e17650878d71671d5828485776bb467dfb8c166b5
-DIST libss7-1.0.2.tar.gz 60834 BLAKE2B b814bd47a7b915dd0bfb3c789e3bc05ea500f821656e319f17eb273871876358eb28e7a6b20af01ea7954e2b6c278078268a3bebcc8cf37954a74d2167b1bfc0 SHA512 ff2a7f37aa8186df6059e0069fb12174d9c32147354eeff742faab28923feaa0459e82037139273cb436211e2bf709047a4f88740791fb63543dfac1f4ce3d11
-EBUILD libss7-1.0.2.ebuild 737 BLAKE2B 3a10d90a0d0637e2072e5e96f7b3a14974ae9833a10e8cea6da0f38a6d23d1366b347c61803f9932caae3feb9cbc76c2f07117e5ce99c3c28dedd16710c58c13 SHA512 7a42a15bc2aea37713c2938e9750feaa75c40cd213017fe569476c34fe8e3fa13df0c33c401404b3a638fe3e35ddd28d14c47073fab63f299f1eadf781405fc8
-MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
diff --git a/net-misc/libss7/files/1.0.2-ldflags.patch b/net-misc/libss7/files/1.0.2-ldflags.patch
deleted file mode 100644
index d88fe25237b7..000000000000
--- a/net-misc/libss7/files/1.0.2-ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr libss7-1.0.2.ORIG/Makefile libss7-1.0.2/Makefile
---- libss7-1.0.2.ORIG/Makefile	2012-08-23 10:49:15.341155719 +0100
-+++ libss7-1.0.2/Makefile	2012-08-23 10:50:35.403236983 +0100
-@@ -54,7 +54,7 @@
- 	ranlib $(STATIC_LIBRARY)
- 
- $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
--	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
-+	$(CC) -shared $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
- 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
- 	ln -sf libss7.so.1 libss7.so
- 	ln -sf libss7.so.1.0 libss7.so.1
diff --git a/net-misc/libss7/files/1.0.2-no-ldconfig.patch b/net-misc/libss7/files/1.0.2-no-ldconfig.patch
deleted file mode 100644
index 166fd01745cb..000000000000
--- a/net-misc/libss7/files/1.0.2-no-ldconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr libss7-1.0.2.ORIG/Makefile libss7-1.0.2/Makefile
---- libss7-1.0.2.ORIG/Makefile	2012-08-23 10:26:35.733775711 +0100
-+++ libss7-1.0.2/Makefile	2012-08-23 10:27:06.826807271 +0100
-@@ -48,7 +48,6 @@
- 	install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
- 	( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libss7.so.1 libss7.so ; ln -sf libss7.so.1.0 libss7.so.1 )
- 	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
--	if test $$(id -u) = 0; then $(LDCONFIG); fi
- 
- $(STATIC_LIBRARY): $(STATIC_OBJS)
- 	ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS)
diff --git a/net-misc/libss7/files/1.0.2-werror-idiocy.patch b/net-misc/libss7/files/1.0.2-werror-idiocy.patch
deleted file mode 100644
index 8eed3e5e2196..000000000000
--- a/net-misc/libss7/files/1.0.2-werror-idiocy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr libss7-1.0.2.ORIG/Makefile libss7-1.0.2/Makefile
---- libss7-1.0.2.ORIG/Makefile	2012-08-23 10:22:27.855524115 +0100
-+++ libss7-1.0.2/Makefile	2012-08-23 10:22:46.156542689 +0100
-@@ -11,7 +11,7 @@
- DYNAMIC_OBJS=mtp2.o ss7_sched.o ss7.o mtp3.o isup.o version.o
- STATIC_LIBRARY=libss7.a
- DYNAMIC_LIBRARY=libss7.so.1.0
--CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC
-+CFLAGS=-Wall -Wstrict-prototypes -Wmissing-prototypes -g -fPIC
- LDCONFIG_FLAGS=-n
- SOFLAGS=-Wl,-hlibss7.so.1
- LDCONFIG=/sbin/ldconfig
diff --git a/net-misc/libss7/libss7-1.0.2.ebuild b/net-misc/libss7/libss7-1.0.2.ebuild
deleted file mode 100644
index 036e6bea25c3..000000000000
--- a/net-misc/libss7/libss7-1.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit base toolchain-funcs
-
-DESCRIPTION="Signalling System 7 (SS7) protocol library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=net-misc/dahdi-2.0.0"
-PATCHES=(
-	"${FILESDIR}/${PV}-werror-idiocy.patch"
-	"${FILESDIR}/${PV}-no-ldconfig.patch"
-	"${FILESDIR}/${PV}-ldflags.patch"
-)
-
-src_compile() {
-	emake CC=$(tc-getCC) LD=$(tc-getLD) DESTDIR="${D}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog README NEWS* || die "dodoc failed"
-}
diff --git a/net-misc/libss7/metadata.xml b/net-misc/libss7/metadata.xml
deleted file mode 100644
index 5087760546f6..000000000000
--- a/net-misc/libss7/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>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/net-misc/liveice/Manifest b/net-misc/liveice/Manifest
index 0fa6e1972150..12926702f742 100644
--- a/net-misc/liveice/Manifest
+++ b/net-misc/liveice/Manifest
@@ -1,3 +1,3 @@
 DIST liveice-2000530.tar.gz 85171 BLAKE2B c804a4f64432cba3181e633b9edb4e67f39c18805290bfae290ae78bcb80d865a3106af8cfab40e214a043609d837bc887d0eb50adbaad3f1d2838dd44e4de58 SHA512 6b6b7ed7f4aa2b27e2b97db407554955e332002c059bbf3fbb5c5fe60c1d6aa5cd594d2698524a9b447fc3a81de96fb46945c2386467f1773ff0ba2b10da78e4
-EBUILD liveice-2000530-r2.ebuild 782 BLAKE2B 2594334e408ef50ec436935deedb41dfc8c77ed139405fe1ca49dd10360681b54c286299eb948b5bbc609ddc82a230456f8900b9984800d099031e17746bc6d7 SHA512 59b3bc5a8b7b872f798980e8b4ab70b9c728dc694ce589d81df8aa97f0141eb3271751b2304aa9c3ec349bf640e08e00d59560e2d3d70709618a5fc4294a3bd6
+EBUILD liveice-2000530-r2.ebuild 764 BLAKE2B 16a180483f6aa6eb7b84f55489554baaf062fd7b30faf52037e4c46f3f4c26b7e3c87661c82eb05dde4ad1ba4871a212573b72e667f629429198b417dc46f494 SHA512 ef914182851b028cd0bf9b98b45cb23028e83b957810b7f1f7d0784cc75e07a34f7a444c00e93eb399255493fd753a8fca89ab3c64e87f0477d9370783830188
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/liveice/liveice-2000530-r2.ebuild b/net-misc/liveice/liveice-2000530-r2.ebuild
index e2581dbcb103..ab5dbb3d5095 100644
--- a/net-misc/liveice/liveice-2000530-r2.ebuild
+++ b/net-misc/liveice/liveice-2000530-r2.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Live Source Client For IceCast"
 HOMEPAGE="http://star.arm.ac.uk/~spm/software/liveice.html"
-SRC_URI="mirror://gentoo/liveice.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 6a5c5e6d424d..640aa96fb50f 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -6,11 +6,11 @@ AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034
 AUX memcached.init2 2205 BLAKE2B d27dbf6fb4d72ec49ff89cb3957770a25afe467c96c05648e75dddea47cdacee09d073e138e72d3b8671c3538e2005049dcd05440083b03e25136b3fd206c4d9 SHA512 b7b68362a4e4b24e9db893b85c3959184d17ea0bf8346a38561235461cfc8c94cf6d546f1c31bbe34bb7ca3409db2209171dd08214d5f057d00c65885663992a
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
 DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed
-DIST memcached-1.5.16.tar.gz 487868 BLAKE2B b9889866b8adbbbf23785f0da35f6f6b3cd5c842c6167beab3dd5385d6ed53e4607a2ffc18cd815005f2a1d67a3a549c780411b93d34335c541f4999d793b8a0 SHA512 999872c4c68e0210feab76f74c9487fbfb652cf3e6b7fa347f882767aad41ea6d8ba3ee056494409c054d673fc209032d8a890605810b2c6c9048d26d50751a0
 DIST memcached-1.5.17.tar.gz 490891 BLAKE2B a971083ec29452755de953537ff9c23fc872496d4746420c9c20e91c226481bd3818c00495cb7a5d85f2bd38683061e57a9e92cbfe0e4cd28bcafde37f05cabf SHA512 533c916015d738ff4c7ba8420654ae15b19370b3e959b89d43bc60cae1bda65d36906be05fad44a025ea1878570a8c1a36041c4e4c0cdf0cea84e6bb0e7ba325
 DIST memcached-1.5.18.tar.gz 502185 BLAKE2B a138dd2178906607fb75e76fa9806e41fe284cefd57a1be6b49f64ae4d3fd972c6996f1dedc161871e02271c9d3c42fbb4c957426f24c100f6024327fa03ba41 SHA512 00d12a97b6ae00814735491b31d1390a8dd15c99e971ae99547e70bf6b343023b88d6e26bb8404dea5f8636f26688e71cd39d8612d06902285b9be91786f9931
-EBUILD memcached-1.5.14.ebuild 2912 BLAKE2B c0fd78c76871cb26f9c8375d9b22d6073f6f81d8daedca76b0398de33fd1d2665dcdbcbddbacba4419747e16b3a379dcdefc1da99167826d68f6829e04072846 SHA512 795f3933d27879e5102773a7527b129a1de60a61f4c53acae02d5229fc37efe8cc2e0055e1cd829a958e4f7681d9b0785090c04a8ed2f261a4253ccdccf99bc8
-EBUILD memcached-1.5.16.ebuild 2920 BLAKE2B 44a9e54f77974921a4550308dff727bce9b1924514770e3526f710c5b1b1c8cb9b422c0f53dda5d7e6b67f75173c3624117871ecd12fa06f290e05b0dfa59628 SHA512 cd45d05190af8eb23017b52ff00a01909f35003c58d1591857d47ba6ccd445885595262ddc02f0a251621c6270fa81f684c59e953949a994d85f066e91fc0f54
-EBUILD memcached-1.5.17.ebuild 2922 BLAKE2B e2dd55a2876f4ae53465b2df1aedac099e496227b4ae56c00a9c081a8069d2e6ad4d489b8414865a431101db52dd32f50a65e2245122e3a484d3b3afc2800a1d SHA512 45cff587c952d530c1c986789ef6b54f5cd177b238e2941f8ea604412374b9fbdc09b4fb0a676914f6d54edfbde3a463d2fa94a45a70876a20ba89166e4af251
-EBUILD memcached-1.5.18.ebuild 2922 BLAKE2B e2dd55a2876f4ae53465b2df1aedac099e496227b4ae56c00a9c081a8069d2e6ad4d489b8414865a431101db52dd32f50a65e2245122e3a484d3b3afc2800a1d SHA512 45cff587c952d530c1c986789ef6b54f5cd177b238e2941f8ea604412374b9fbdc09b4fb0a676914f6d54edfbde3a463d2fa94a45a70876a20ba89166e4af251
+DIST memcached-1.5.19.tar.gz 517380 BLAKE2B 8c6e7c87e786d88c783da87396daec9deb0c9f8c4112fa7cec6d79e8e96505576c2b7f3dff91317a3f45582322cfdb435535a41bb537b0a0bfec9df6f8d5986f SHA512 4445f383e18ffc53071c13b495c3864978658f4f6f439ab4579dd831fc12ad4850e04e9526954608ae627b0b23a9d6cb327560f02d15abff23e12f5d7c1723b4
+EBUILD memcached-1.5.14.ebuild 2902 BLAKE2B ac9d561fc47ca13f81329356c6df5b4e8a01d9455523d2f76ec59dc72f988c0a419419f20ee6554e43b47256f9ee575f8d6b003c55a31456ac0980049fcd04d4 SHA512 40d6050f2d55fbe1f3aa44813d3838d7bc6f7b8450b28812b560d71fc3ff5d2c3d091add8561832109c2675c91eb0947126f29e693fa08972e3a03a77840c12e
+EBUILD memcached-1.5.17.ebuild 2910 BLAKE2B 45f2b2f38071fbac8b3136504cb867ce0bc3ff88f07a16ac345a9c6e1e25b911d2a444a205f724cbf99cdc01d12c9f91b0bc59ea3cec3f7fc20b59d6eb3892cd SHA512 eea0bfb868eb713e062903928d3a3a6994d4aaa6ef655ccdd040f124d992ef7e85008ab96c44e4f563bc97ffd8c742d6efb85780962a245d0b76d65daf9c4cae
+EBUILD memcached-1.5.18.ebuild 2912 BLAKE2B 5e92d52481f8513af0f9e4f8a706626a169893b54cd0e50d90769dca712733291ffd8f752ea88d3758f29ed1dd8b38ebeb5b2bcc456cbaf81882cb1f99bafa0b SHA512 88178683bb649b2c06b021e1e6a26bf38eff9d48ca7841308929dfb1f658e55e6d58c0ba8813ac4bff39bc3bfd3ebb2ba8ec41c6dfa2d7cd853f83d87a422056
+EBUILD memcached-1.5.19.ebuild 2912 BLAKE2B 5e92d52481f8513af0f9e4f8a706626a169893b54cd0e50d90769dca712733291ffd8f752ea88d3758f29ed1dd8b38ebeb5b2bcc456cbaf81882cb1f99bafa0b SHA512 88178683bb649b2c06b021e1e6a26bf38eff9d48ca7841308929dfb1f658e55e6d58c0ba8813ac4bff39bc3bfd3ebb2ba8ec41c6dfa2d7cd853f83d87a422056
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.14.ebuild b/net-misc/memcached/memcached-1.5.14.ebuild
index 0563663b1646..7aa1883474fc 100644
--- a/net-misc/memcached/memcached-1.5.14.ebuild
+++ b/net-misc/memcached/memcached-1.5.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.5.17.ebuild b/net-misc/memcached/memcached-1.5.17.ebuild
index 8d046a22030e..c2d8ac61d125 100644
--- a/net-misc/memcached/memcached-1.5.17.ebuild
+++ b/net-misc/memcached/memcached-1.5.17.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.5.18.ebuild b/net-misc/memcached/memcached-1.5.18.ebuild
index 8d046a22030e..e16d121a5c35 100644
--- a/net-misc/memcached/memcached-1.5.18.ebuild
+++ b/net-misc/memcached/memcached-1.5.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/memcached/memcached-1.5.16.ebuild b/net-misc/memcached/memcached-1.5.19.ebuild
index c1fd0fcba788..e16d121a5c35 100644
--- a/net-misc/memcached/memcached-1.5.16.ebuild
+++ b/net-misc/memcached/memcached-1.5.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 966f700b3fa3..a126a436af9e 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -2,6 +2,8 @@ AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20c
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
 DIST miniupnpd-2.1.20190902.tar.gz 240742 BLAKE2B 0b880b1e8a96c56af92726d3fe81da0a26de83861efe4dc266e287623dcac4c6bd4c4ac8d2c6ef7724c1055933d5138e7c86da5c8e3852f2022f69697505f231 SHA512 0abeb9df088ecd57909106fbb43de14d90eebd351a466477777f413f40c49bc432050bc8ea0d655d2eea0bfcedbdb97719ea2476a8bd9170ef9b74ad97217d26
 DIST miniupnpd-2.1.20190924.tar.gz 241008 BLAKE2B 392006e71ede0d18dc1dbfd13c46e591f6675fcb02828461f0afc79b4019f953f62ab95669e92cee4724ff502585420c563d555a7948b0f9d25d755efe6bdb2c SHA512 719a3ac741327691170d7e933b170dcc1399da1958d9373327b96ab5d975290d2bfa0f68d96fbb2ac4b3fb9808b50385291705cd393252263f403d43298c4031
+DIST miniupnpd-2.1.20191006.tar.gz 243255 BLAKE2B 38654cfc0238cdd413600216b01465cbecda69589249df5b6500db7e0719053dae351ab8c61d763a7586924f68b6d634266a1020084f30261442ac62fbd17a5e SHA512 5de2dc5ffb6df7b06bcb6ab8d8fbb34aa5a229a8310938e980b4caf6b957ceab104c455cebb57d7083736fde2db9569fcdf98783a36c915d362f7ff2987e3599
 EBUILD miniupnpd-2.1.20190902.ebuild 1973 BLAKE2B 3e2882353ac50b2e379089850248f49b379ff0941604f3f9f488680b7bdabeefc340fbd3155a9ec8d13ce65566ee71e0c10049a7264ddc8092464c1ec88eb117 SHA512 df08ccba8c515b1bd3da3d9f38c6826eee5ace7d501efdda8b5835fb1ffed8aef637e0bc4028779dc8fcc7361cdd226412fb0048956761265c228d9999f83d2d
 EBUILD miniupnpd-2.1.20190924.ebuild 2138 BLAKE2B ad0170d29b3c1e3a1e4399a362b86476a91e3b9c7aa6e803b2943ff27992baf9ec10092e60c308f346de69cb6bc24ce9614b3f8e80cf3fa0bbd7e1a339718c45 SHA512 9976ba11b7fcdedb7598a7b0df7cf71cf8e917c7dd42b1818c168a182c0ec9c821740baaa012d1218046cc15a874e91de8d669d13a0b4ea26dcc8f067ef189f7
+EBUILD miniupnpd-2.1.20191006.ebuild 1973 BLAKE2B 06623d2fd8d2b2e31c1c9515ffa34aa5f083662f78c3b4478ae7003768e4a272419a9654bdc4e201bb2871bb5c11dc16ca52144687786c2593c690afd40d2a7d SHA512 b231ba28a2dbbb676b76cc07706167d194f5d628f228d5585dd3dfd7effd1e79a2526d9f53912b3c32ee0e3ba1ce32f45d15d636afee3435ed6c59845c539cda
 MISC metadata.xml 1037 BLAKE2B 9fa42839f13b135ac2b69091b9d0ba1d3749f3b9903bcaa209c0d23ff981615c58df027725a536b4e268c53eb285ab6750bbeb7e0bc8e668dfca61b787ec9c60 SHA512 536ef1fce9d3d76eb33a88707c5750fc0b014cf29b4c20d3459bc0116a68234667689a297e8aae35507f1b6b9fde7590d14b3763f2813c485478e18f396bfeb8
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20191006.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20191006.ebuild
new file mode 100644
index 000000000000..2e0b60b3a3d1
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20191006.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="MiniUPnP IGD Daemon"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0=
+	!nftables? (
+		>=net-firewall/iptables-1.4.6:0=[ipv6?]
+		net-libs/libnfnetlink:=
+		net-libs/libmnl:=
+	)
+	nftables? (
+		net-firewall/nftables
+		net-libs/libnftnl:=
+		net-libs/libmnl:=
+	)"
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release"
+
+src_prepare() {
+	default
+
+	# Prevent overriding CFLAGS.
+	sed -i -e '/^CFLAGS =/d' Makefile.linux_nft || die
+
+	mv "Makefile.linux$(usex nftables _nft '')" Makefile || die
+
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+}
+
+src_configure() {
+	local -a opts
+	opts=(
+		--vendorcfg
+		$(usex igd2 '--igd2' '')
+		$(usex ipv6 '--ipv6' '')
+		$(usex leasefile '--leasefile' '')
+		$(usex portinuse '--portinuse' '')
+		$(usex pcp-peer '--pcp-peer' '')
+		$(usex strict '--strict' '')
+	)
+
+	CONFIG_OPTIONS="${opts[*]}" emake config.h
+}
+
+src_compile() {
+	# By default, it builds a bunch of unittests that are missing wrapper
+	# scripts in the tarball
+	emake CC="$(tc-getCC)" STRIP=true miniupnpd
+}
+
+src_install() {
+	emake PREFIX="${ED}" STRIP=true install
+
+	local confd_seds=()
+	if use nftables; then
+		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
+	else
+		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
+	fi
+	if ! use ipv6 || use nftables; then
+		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
+	fi
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
+	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
+		"${FILESDIR}"/${PN}-conf.d-r2 || die)
+}
+
+pkg_postinst() {
+	elog "Please correct the external interface in the top of the two"
+	elog "scripts in /etc/miniupnpd and edit the config file in there too"
+}
diff --git a/net-misc/netdate/Manifest b/net-misc/netdate/Manifest
index 280a8792d281..5a9c188516fc 100644
--- a/net-misc/netdate/Manifest
+++ b/net-misc/netdate/Manifest
@@ -1,4 +1,4 @@
 DIST netdate-1.2.tar.bz2 7516 BLAKE2B b044f8294716a5660cab8c77cc9bfccf0f606a89f8b4d73d93a760f69bcdb4e48aaad7b6c0fbf7a22468e1f3aa1f026647159270456a989d9df65c3af458e3db SHA512 a6c3dde42dfb886a01a137485b1a52f4cfb00150bec3a9603a7475405cecd621c5604fe66e2d3e4fd50feee18ac9d60423231a377fc5629e465530b16b0ce918
-EBUILD netdate-1.2-r1.ebuild 485 BLAKE2B 6ed177339b48d88a2b7dab86fb5bc410df1892864b1613b3f1b72f0654d46de37efc6d2cce80836cd87d437acdafa024667592ad0eb2d89caf12270c9517bca1 SHA512 643b0997d6a0d1bdedce88aa50978c72b830c06d4bc47421de1b7bd98719f6fa782f1175a0d4e365859b8e67a9fce8f527db9efeac98603d2d62a3a2fddb03de
+EBUILD netdate-1.2-r1.ebuild 478 BLAKE2B afeeb46b24fddb2967d0148595abc1b9f18f76364cd31e9153de80d7209c36607012d4353a570317345dd929b39f3e14647a0cc7980fe3bdcf25c321bb7841be SHA512 78da5f89b214847a3b3190e4dd638c38162a407234ab3e296a7b94b8e4867ae3d52548355f15308534e4ef66d64f007622d179a06b23e048f124113a520efd16
 EBUILD netdate-1.2.ebuild 535 BLAKE2B 14074500c0cba9682841812a42e15252f50c53a20bc78a2c3df337e186d58cc2046b8235d387449b8f32f07c82d96444c630baecfc94f5489ad7ff720f2c65b0 SHA512 fb43df0792b2e7e30cc45b7b6192fdbe67b26ec5dd00f6442ae683c20af89633ca4f803e1e71bb8488dd5c6643c826ea44b6a10db9bc438f67c4df60803e1383
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/netdate/netdate-1.2-r1.ebuild b/net-misc/netdate/netdate-1.2-r1.ebuild
index 951a5dfe9ef3..5d6c96c935bd 100644
--- a/net-misc/netdate/netdate-1.2-r1.ebuild
+++ b/net-misc/netdate/netdate-1.2-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
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~s390 ~sh ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~mips s390 ~sh sparc x86"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/net-misc/netifrc/Manifest b/net-misc/netifrc/Manifest
index 86d7838d739d..26a7b1aba7b5 100644
--- a/net-misc/netifrc/Manifest
+++ b/net-misc/netifrc/Manifest
@@ -9,16 +9,16 @@ DIST netifrc-0.5.0.tar.bz2 78738 BLAKE2B b0627aaf0ee0526cfbb6af3c8cb82476ee910d1
 DIST netifrc-0.5.1.tar.bz2 78749 BLAKE2B cecbf4b64cc8e93483326ef0646d2abfdb837c0351cc210ea0134e654cd44f90cba0390014412f6b45ff4d337d3aaeb5e739553231305846351452aebac870e1 SHA512 277d10f58f694c734c9dec52896f847a58e40b61567573dd634d0a0604c27550d4baec461df46dac4e535753f6594afd30344696229f4f4cf4f5e04dba659710
 DIST netifrc-0.6.0.tar.bz2 83349 BLAKE2B d9be118aa2aa13891091f7b5060d06ce0bc1eb9740c5adec04b985785e7bd7afe77bc03751d178b8e09c967b04581b12cfbf50aa49b7226ab580081e420f22bc SHA512 de47d146619bd716a0eda8149063691d9d71a895579ac50d3fea60bf0e48c516d6b37aed81c33083dc6e7d4bb74841bb6b143c23972669de9d76b8f7df7a5d23
 DIST netifrc-0.6.1.tar.gz 79791 BLAKE2B e38236d189ce0e40eaa5ba7b94e2e74e444bbd185fbacf515c65ca1f0ff441525cdc44696e12ff33e4ae1f80f2766a91866cfef8f9b737d34e1c59290248f49b SHA512 798a882f87f153c31b415d77a06a2beca94a958ea982aca20bbc2cf6a7d800aedbd99a577734ea41d6a75807b13d640dd7fa5a51aa5a27055e9c552634ac7bdb
-EBUILD netifrc-0.2.2.ebuild 1752 BLAKE2B 552f4757411db13c143970b17cf8b116adcf23833d3251bc676ebaba425c5ee31a8735408d585a21b9944d26a40b1c1c51d67a1ff1df9e4bbf6ef3d44667708e SHA512 9a17d9736d823d17ffa5875924c93d99b3f194dbbce611daf41117fad1d21e199f8e3ce75d66fb8152431bb0403e66a70766ffb8742c13cc185a8b80f8b275d2
-EBUILD netifrc-0.2.3.ebuild 1765 BLAKE2B 5b932b06a08cb7a6502d3aff31fddf185bef10959a08b4777eb07af3ab6c6e2b232ad48ad40f91d26952261b211b079fe412765c6a918b783d7a5cf6c65ed01b SHA512 9bc89bd39de12a76cfc72697704485c71da876848d004f03e6524af4253e27008c421be2874814eb4537fa452fc728ff5cfb54826c775dcf4c1e33e9985db6a9
-EBUILD netifrc-0.2.4.ebuild 1775 BLAKE2B fd939f3a77fb3bbbf1b37d8e72bc0be2d0ad3033a5aee84fb972da8e54746a5d0c6ce088104c5e3c56045be5dd3a17195ba71ac755e1bf8dded4bbdc9551ddfc SHA512 df6ef2110e50c100862dfdeb85f9f2b0b0eea40b51312ebad4a2571b8f5cf0d7fdac412b654ed0eb474152e510bb15652373d06112e46ccc2a5f4e2fe70b095e
-EBUILD netifrc-0.3.0.ebuild 2062 BLAKE2B 5148da411cd091bd9a467c47f95c63f1f94e21ae8f64192e907a5e420fcd820f80f7639c77a22e9b7f226d8ca308befd1442ed2d9f2f89789c4675feea040020 SHA512 bcc447f58d7fac07fee913b068c0dcff689521f52428c40cd369d63b73bdbefaa20c2984564ec6cfb8e346a40b9d18beb6c2a322786c67e63140777f850a9c7a
-EBUILD netifrc-0.3.1.ebuild 2102 BLAKE2B 6b07a4a1e6721997c73da81fc6eb551f26905fc9402209134da16e6627308c53210df7d888f75911eed08a6e650b85b24b519d22d08d48d39b9bdc682c5b18c0 SHA512 e3f28f1740679972ab31d9c7c43a425b8e080184b75a9ed07e1a3d5715becf6c6b0917f7911461369e2ae0065475cab741b202e5c65db3bebc2b5650cecd8366
-EBUILD netifrc-0.4.0-r1.ebuild 2188 BLAKE2B 3144b7633e7d5f6520d55bd75084c317d6be68dec524128f5ea2348ea26d9e5e085e1bac19e1ee8789295279783998b128d8f41dd8f0df2f799a22725710df95 SHA512 95ba2089b9549bdadd8cc9248161e3398441867366901a1978fccbfa764c94be6cedff207ff3d1f9e7ac3f73645528ca6455b2216c9b4ac4169d4f2712f9cf76
-EBUILD netifrc-0.4.0.ebuild 2102 BLAKE2B 6b07a4a1e6721997c73da81fc6eb551f26905fc9402209134da16e6627308c53210df7d888f75911eed08a6e650b85b24b519d22d08d48d39b9bdc682c5b18c0 SHA512 e3f28f1740679972ab31d9c7c43a425b8e080184b75a9ed07e1a3d5715becf6c6b0917f7911461369e2ae0065475cab741b202e5c65db3bebc2b5650cecd8366
-EBUILD netifrc-0.5.0.ebuild 2132 BLAKE2B ec73c3fb538437115efd47030c476a01b6366d44addfd894a60012e8e6fff0b76011cdab6aa932b457820d1f540a5491d46450899db8952ac96ce516d9bc79f3 SHA512 f790c3c20cb8f6caec7a5ab8264efe40feb8d68f80a8272e5958c739d3928d69ecae624962510c8a379664992846328c48078ad22672de5eac78e9faf9d89da0
-EBUILD netifrc-0.5.1.ebuild 2123 BLAKE2B 2f8e7e53d82fc3c6f3ba75df5da6296524cf5d216c38ebc1b1ee5f7e9c9513421301443e6c853cae71196f692ea8d38338d7f679dc82f308e9063e26dd3a7b02 SHA512 c88821dcbfb43c56666bdc7cbbb3d40e78a3f41e69a27c307c257d58a619847b7d2a5a1d38a49d28c1d80cd0cb7cffcf7244c85e4bd14d05e416059bd7204716
-EBUILD netifrc-0.6.0.ebuild 2136 BLAKE2B 60d883e9b65b4379c5321edf24641576b65c6a0805e3c0894c067142d79f35658d73cbd96e6559176b1e4ea4450fd7dfc53c830b185d8888d94ad8fc273b6fb9 SHA512 4c2bd2c2714e36c2a12eeacf2213876a43cc76e2571b297ee6a61c904821a3ce1282cee814fa7eb0bbbbc2413775102f8ca22c5fa39e4f8ae2af5fd1ee5523fc
-EBUILD netifrc-0.6.1.ebuild 2133 BLAKE2B b9c3924916bb12832137b9030841b50e010cadfe5ce1edd966c3eb67601a18df59a21141d2aacb9c3e5b314375ae2ac533895021c9477881f62558efa41fc156 SHA512 7899023bc483342e2a98d1b7b2522443bd3b28cdf4d43e93273583379bc108de280b530d17184485e919790aa42edc60f20801e522cc2718ddc61a2e33386db1
-EBUILD netifrc-9999.ebuild 2132 BLAKE2B ec73c3fb538437115efd47030c476a01b6366d44addfd894a60012e8e6fff0b76011cdab6aa932b457820d1f540a5491d46450899db8952ac96ce516d9bc79f3 SHA512 f790c3c20cb8f6caec7a5ab8264efe40feb8d68f80a8272e5958c739d3928d69ecae624962510c8a379664992846328c48078ad22672de5eac78e9faf9d89da0
+EBUILD netifrc-0.2.2.ebuild 1730 BLAKE2B ee525a574b7536654de3c99d97717c3d0ff21b7715d50e5eafe83aa1ba8350078360abd7fc569463e24608d2e879c0165aba6e8cfc4ffdb9c5d9dc3105618d2c SHA512 bd320c13d605dca1852d37e9bf70aa684762e6a42eb9d4176d25b19505cb2a5c326ef54edcbe2e85077712e281004fa5da5530de91564e4163f5a3db61950bfe
+EBUILD netifrc-0.2.3.ebuild 1743 BLAKE2B 887ee1fcd866dcd72e7df80428712a69f157e49231eeff6d168a0118d67cc18d1ae769aa0dff88f88cb349731e821d25faf9f8c10cc419ea832cd2e2c38bae70 SHA512 0ceed4927632b18e6b5faca500a78def1311f68749c24289a7b74058b6a3dfb01dd10238ba6759229f70b1515a020dfdafed95f49ff24d4e729273818071cd80
+EBUILD netifrc-0.2.4.ebuild 1753 BLAKE2B 832e6160573e7e664e4b98324d39af9e7363025b7100f49798d1460de956fa903e7b4c334ea3cce216be574ada1fd2ed7149cad7817125e73004983e16907862 SHA512 6136ef60a45b3922c95bf7f958a077cee7aec45364fb3e70762ee30e660498aaf9d0b2cad3650893b94c1938595daa998acf5a339284e5cabfac631ad6de0983
+EBUILD netifrc-0.3.0.ebuild 2040 BLAKE2B 7dffcff1ea0e43292e0659319b3035b61d9fc4283c8504377e91ce311df8975c4e975e47d257456cb374c6bd7c5624e0fa4628db7cdbe6c51af8070b9eac3a90 SHA512 603edee153d53dd18b40e38586de7e0983e6f5c32cfc6de3fa4abc8912239eb868b4bf78f54206376c9bcc95963ee62d7c6495de22c8039615743de86fc9154f
+EBUILD netifrc-0.3.1.ebuild 2080 BLAKE2B 0958da234bf0ed3a35026e94566c801a21bae435e083c1a8f7e19564304a130f77a54f9016b6d19abd05a30aa55dc94a687f274c079f7ff1cdba55216d2d7b13 SHA512 27cd17b67776126d25714612522698ba5bc705f4e67ada47cf7857a3a01c763cc6f05f8d98f0d1299f5ae29ef6528c1e033806333ac829333e5ed50a6a0039ea
+EBUILD netifrc-0.4.0-r1.ebuild 2166 BLAKE2B cf72c392cafeb3a92ad76be093555fb402f4e5cd4f25249c6828875a472b2962cba758bc6e822e2c8541f07b1dae822af5b65254abe72a9177a7f7f855ea9336 SHA512 0d5bed01d7369eafc0dd162130957214616706c069b4db558810829ebaab3e47b2097354fe65ba47af308312d0c9fa50e2595e77d831ab5a7072ff7fe018d6d8
+EBUILD netifrc-0.4.0.ebuild 2080 BLAKE2B 0958da234bf0ed3a35026e94566c801a21bae435e083c1a8f7e19564304a130f77a54f9016b6d19abd05a30aa55dc94a687f274c079f7ff1cdba55216d2d7b13 SHA512 27cd17b67776126d25714612522698ba5bc705f4e67ada47cf7857a3a01c763cc6f05f8d98f0d1299f5ae29ef6528c1e033806333ac829333e5ed50a6a0039ea
+EBUILD netifrc-0.5.0.ebuild 2110 BLAKE2B c14733b06f4632cf6ffd8883a3ad3884f418024abf0cae4b4c9c667ee1950ed6358a76683342e016dd058201de064e71fcab92c15b3a102c83e13492ed4a0c06 SHA512 d766ac30519b28855f49c3ca1554c049583b3cff5a4e7b035cac0b9fcd4fadf8980ad35695433080ca32669d523ae89c7decd837de14486b19531b1d0703dfe2
+EBUILD netifrc-0.5.1.ebuild 2101 BLAKE2B 6ac90c206c86f13318db2b5b5a548097004b21c9d7e6fcda271d1d7b9eea471fe72cb80763f1cdaf8e67571e67684912b7fa8c1d2ca792c70a4fe1718645c817 SHA512 673503dd52000b2b3f3544f9ff8b348d8a92db38a81f74d45ba0bd269346fff18f2dfd13feb510e7b16c33eee0284e637264917c3aaefa976dcbd58134830ed3
+EBUILD netifrc-0.6.0.ebuild 2114 BLAKE2B 651778af20d126a183ee166c083370380f00ae8ad5a203b74814a0d27f89be8f81c760eaa794ae7df9ba1fb7dc031a78f0dd125f01e61ce261cb31614f9101cc SHA512 bc77e3869bf2ab2ca4d40efe55aea7ce680eb90516775785aa6824bc5ceb0be6f369d72bd2c9ab2665c0f8e2a206b658b6637ac1530b4e9dcbfb8db7c8532f7a
+EBUILD netifrc-0.6.1.ebuild 2111 BLAKE2B 65e46dcd4b963390f63f8e2566bc6159fa1d19f73583c80bdf7a9608fe5eb56e445d4e132dcdffd5cd90195c4adc9e2d79be5e1faff960c067fadf04758ffd11 SHA512 c16f80b00a9ea09f18f319f4daf0de87ecccc36ae6580a13d3c9ae3aeea493ed4050390c44170fbde74f143d4e9a3d6825a0b6ddeacb26d93f926172e8ceb572
+EBUILD netifrc-9999.ebuild 2110 BLAKE2B c14733b06f4632cf6ffd8883a3ad3884f418024abf0cae4b4c9c667ee1950ed6358a76683342e016dd058201de064e71fcab92c15b3a102c83e13492ed4a0c06 SHA512 d766ac30519b28855f49c3ca1554c049583b3cff5a4e7b035cac0b9fcd4fadf8980ad35695433080ca32669d523ae89c7decd837de14486b19531b1d0703dfe2
 MISC metadata.xml 377 BLAKE2B 2940bdfd1253901092fff2f0d4d162011372a9b6bbfa26d3ad07d5a7b19038624517e593f7884bf98e00018f1346d2f06e7f407c4a2419b9fba6b3d53d646aae SHA512 711a957e6bfa852039b3588a4636f0e4e747c685cbfcbb537bcd6eb12c6bd19a9ed8b49608be38f855d70df03d09ec0632a9be9db4c4cc64783b5b0311f0cdc5
diff --git a/net-misc/netifrc/netifrc-0.2.2.ebuild b/net-misc/netifrc/netifrc-0.2.2.ebuild
index 8f6daf8e98d0..98895e5ae186 100644
--- a/net-misc/netifrc/netifrc-0.2.2.ebuild
+++ b/net-misc/netifrc/netifrc-0.2.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-2
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.2.3.ebuild b/net-misc/netifrc/netifrc-0.2.3.ebuild
index 8f599ce1a9e8..1eb72875a929 100644
--- a/net-misc/netifrc/netifrc-0.2.3.ebuild
+++ b/net-misc/netifrc/netifrc-0.2.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-2
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.2.4.ebuild b/net-misc/netifrc/netifrc-0.2.4.ebuild
index b24c2bc70b11..1e3fc7439d98 100644
--- a/net-misc/netifrc/netifrc-0.2.4.ebuild
+++ b/net-misc/netifrc/netifrc-0.2.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-2
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.3.0.ebuild b/net-misc/netifrc/netifrc-0.3.0.ebuild
index bce330d3a59c..40dbf0278902 100644
--- a/net-misc/netifrc/netifrc-0.3.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.3.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.3.1.ebuild b/net-misc/netifrc/netifrc-0.3.1.ebuild
index 5562712b7216..eb0df4590b78 100644
--- a/net-misc/netifrc/netifrc-0.3.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.3.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.4.0-r1.ebuild b/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
index 70378aa036ea..72cdb9285a54 100644
--- a/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
+++ b/net-misc/netifrc/netifrc-0.4.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.4.0.ebuild b/net-misc/netifrc/netifrc-0.4.0.ebuild
index 5562712b7216..eb0df4590b78 100644
--- a/net-misc/netifrc/netifrc-0.4.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.4.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.5.0.ebuild b/net-misc/netifrc/netifrc-0.5.0.ebuild
index ccf27f251b5d..939911b1c422 100644
--- a/net-misc/netifrc/netifrc-0.5.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.5.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.5.1.ebuild b/net-misc/netifrc/netifrc-0.5.1.ebuild
index a653bab00d25..0f0e43e0d55b 100644
--- a/net-misc/netifrc/netifrc-0.5.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.5.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.6.0.ebuild b/net-misc/netifrc/netifrc-0.6.0.ebuild
index ea0bb835f877..5d03165380af 100644
--- a/net-misc/netifrc/netifrc-0.6.0.ebuild
+++ b/net-misc/netifrc/netifrc-0.6.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-0.6.1.ebuild b/net-misc/netifrc/netifrc-0.6.1.ebuild
index d9e3257be440..b6901b9edd73 100644
--- a/net-misc/netifrc/netifrc-0.6.1.ebuild
+++ b/net-misc/netifrc/netifrc-0.6.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netifrc/netifrc-9999.ebuild b/net-misc/netifrc/netifrc-9999.ebuild
index ccf27f251b5d..939911b1c422 100644
--- a/net-misc/netifrc/netifrc-9999.ebuild
+++ b/net-misc/netifrc/netifrc-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest
index 173b6f01c63f..94f54f007d41 100644
--- a/net-misc/netkit-rsh/Manifest
+++ b/net-misc/netkit-rsh/Manifest
@@ -7,5 +7,5 @@ AUX rsh.xinetd 279 BLAKE2B db403023417d537fb944c677553f71e782d80dfe08dc5f9388156
 DIST netkit-rsh-0.17-patches-3.tar.lzma 13875 BLAKE2B 80470c4a9fdbfebd351217e48ec178c1d2c58e49f454eadd514ed76e3653fde1d21cd19f7a3400762e6fb4d4bb2f9cfefebbf042ef5bf1903d67ebbe17254515 SHA512 0d9c6a8a8d13264b8f2eb6b62e6c65b67cf8b09bd36043acae405c7b2154724733db15d653e4f7ac7d21feebcfa6cd365ca89993fc77eabc5a709d7a6383b187
 DIST netkit-rsh-0.17.tar.gz 58268 BLAKE2B 7790a91f95c51f4aa538ad614e65ecba5a565e4761c7d8167f4d175bb8bcc27cb48b569f93064285dad983e602f03bcb816da58b02b54290adcd9cabe73cd88e SHA512 0d8da4a779da137f7b3f158ad010b71f2357c86a2160dbd19331cbf45f86a46110cdfdfd3c4ba2d19ddf3634917bf981eb91bfde02c3cdbc946df8695db75218
 DIST rexec-1.5.tar.gz 18469 BLAKE2B cbb694520332a0768b8337e854baf232271a30ac328dcf4b8b16d28dc3710ad58173e135cb9eb9726b07709bcd78ef627cea550c98e00dc86bea7c64e52aa3d1 SHA512 7ed455a921ad71749154bd8e586ac2a624f357b56be17db73b9ed7c1ca1bc19cfb9aee748f79cc649184dfb535ffe5e887643b73a25c3fb6520d4e19fae7333a
-EBUILD netkit-rsh-0.17-r10.ebuild 1768 BLAKE2B 22e0f31780f3e5daee3a77742c86d3a5c3989c6506f43705580175228d9ade1000e52e8d26f01695a5b03383d50db43f32cf2865f3f48c54da228a2820769d4b SHA512 8854985ad711abe532094faba715cac44d0f903d66ba9b00071c3046046269436d9a2733edf898cf8330fa1c8d71a20c195919588450277806973666f6d93cbe
+EBUILD netkit-rsh-0.17-r10.ebuild 1758 BLAKE2B 9f0e00be01aa002e5dad68ac884a58d84c73ca7ecef9da63a3b285a2ae5906106200ce199e47b0d2f448745b9d331dccec9305114ea69b57cf5b8cd448ec62f3 SHA512 91b9efb1fed9ab0165cac55e3692db95ba76eb423e4a3fbcaa6c6491794d41d804e7db61a196e9117ae7bdffdd9113289ff4aa8b18bdf403e0b8ae793116782b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
index 5d743fcc7895..fc41e2cfb48f 100644
--- a/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="pam"
 
 RDEPEND=">=sys-libs/ncurses-5.2
diff --git a/net-misc/netprofiles-ims/Manifest b/net-misc/netprofiles-ims/Manifest
deleted file mode 100644
index 3cc1cdee7c58..000000000000
--- a/net-misc/netprofiles-ims/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST netprofiles-ims-0.1.0134.tar.gz 4218 BLAKE2B 8c0b6c2a108453fe7796848cddde81fddf09b38bad332337476f1bf6275b388cb4e439a3808737a1232fc773a5f38e60707a293e806bcbf95d9876d5a9622c67 SHA512 e58e6c0b50096a755442c2b8443e5101e2021362175ec40b57da7a4edf5b54a6435f220b7018253da8f896d37e8c0e37e9bec9bbc36a606487fca39b1958be18
-EBUILD netprofiles-ims-0.1.0134.ebuild 438 BLAKE2B 4fc889a69604a29416616ca606af3c9cdbff5e6cecf172e00aa6ab06224bef10524cd1961334d448bf02ab7489cfee51371d4e871b3abb522514063b3764cf52 SHA512 d78db32cf036f4cf28d0278abfa317bb28d46b7a4ffba35a63c73fdaeb6634f1f0d74eea4fd89ce66c7069bb4d5307c2c3bb59bffe578f243d923842bc717cd9
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/netprofiles-ims/metadata.xml b/net-misc/netprofiles-ims/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-misc/netprofiles-ims/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-misc/netprofiles-ims/netprofiles-ims-0.1.0134.ebuild b/net-misc/netprofiles-ims/netprofiles-ims-0.1.0134.ebuild
deleted file mode 100644
index 8cfa9d4d7b0e..000000000000
--- a/net-misc/netprofiles-ims/netprofiles-ims-0.1.0134.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Netprofiles Interface Management System manages network configurations"
-
-HOMEPAGE="http://www.furuba.net/~buckminst/gentoo/"
-SRC_URI="http://www.furuba.net/~buckminst/gentoo/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-DEPEND=""
-
-src_install() {
-	dosbin netprofiles
-	doinitd netprofiles-ims
-}
diff --git a/net-misc/netsed/Manifest b/net-misc/netsed/Manifest
index 62e42c7750d8..7a660ccfbdd7 100644
--- a/net-misc/netsed/Manifest
+++ b/net-misc/netsed/Manifest
@@ -1,4 +1,4 @@
 DIST netsed-0.01b.tgz 6352 BLAKE2B 0aa8ed9f282f32d139e50af1a1c8d1aae118ff6e892475774125b45c229707c40544199ea70708827636a50e43b8f652138b244cb2f3857c854d49018b996fb7 SHA512 edef6ef6e39a17a46a3b4d8019ba2e742b2b5852f804df5e952461a792e3ba7a49fcc33353abf7e532e51586927f28f4b7c6da4f4fbd34a32cdf093f26163dd7
 DIST netsed_0.01c-2.diff.gz 3140 BLAKE2B 211c7f71a76b74fc47cc32dbd5e9ad05a2c7c67bd95de73b0bdb09249f245ab8b0190ee79b51cf1d2f2bc99cc0b7fdf8d358851fddafb2815adc640260122c77 SHA512 5a729e9800051449f7f52989cb65232e262ac6023f21b8ec688f3ce33ed4be79f9d00993aed7773d83dbe109927a5fc6c64e4775d4958136e5c891b6b82e6b83
-EBUILD netsed-0.01b-r1.ebuild 542 BLAKE2B ccb708488b5d60157afb379c08a29012f188cdffcb2abd1fd90f0754e89e1842255b6c3d98f236fb85bbc0845d2316946ca3ddd345a416dcd8013cdf73fc54ac SHA512 f0c898c0cf65673242b8591283a042341792dd2bead9529db1f613e852c454d7fa97baeb1cc752c83a3d469074b94a74c9e3477fbcde8ccf7c6f5f7303bdb764
+EBUILD netsed-0.01b-r1.ebuild 529 BLAKE2B f69588f4e5a4a476be30f7ec5d24e632ab3c94d46c078f4cfab3a3fe22d459d92e0f99c17d1b0c988c87c8c51098cd9991b7e7bf2590c1eabece3adbab920cc6 SHA512 c0f2c24b074ab4117a605ba5e033fc0b5c3abef37b2a4666dab17e8bc78e7cef45579baf8e33141e4ee9e916317eeb27fc67647dfd42844c690e3692451c5151
 MISC metadata.xml 246 BLAKE2B 51e0781372b853df95595d4124ba0f81cb5fab4dfb78745aeeebcc0728617634384d5f9a90f02b50c13330b29651450eb18dd782e1c485bea5bdcb5017fd1d63 SHA512 68010e77c1c73aa0f8b81bd63ec9734de511e7b3fef0edd156df2584f25b6d485656a4d11f200af89e53a1b3ece9d6d15e93a2d1ba63f83adf944841183cdf00
diff --git a/net-misc/netsed/netsed-0.01b-r1.ebuild b/net-misc/netsed/netsed-0.01b-r1.ebuild
index e47d88888bc1..3b03ee745c9a 100644
--- a/net-misc/netsed/netsed-0.01b-r1.ebuild
+++ b/net-misc/netsed/netsed-0.01b-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Small tool for altering forwarded network data in real time"
 HOMEPAGE="http://freshmeat.net/projects/netsed"
-SRC_URI="mirror://gentoo/${PN}.tgz -> ${P}.tgz
+SRC_URI="mirror://gentoo/${P}.tgz
 	mirror://gentoo/${PN}_0.01c-2.diff.gz"
 
 LICENSE="LGPL-2"
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 637a5430677d..2a3681766353 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -3,5 +3,7 @@ AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
 DIST NetworkManager-1.18.2.tar.xz 4872252 BLAKE2B 8a3fa74837a6cf2a09af807b9bd164c949d31efb81fc212485f49e24f0a215ff06db10c4259712f6c51d7480bda1b53457bf50bda9b2df8330891e8c8ba394c8 SHA512 a220d856632693298af0bd23ae4393ee597684fcae400c8ed35bae5e543bcdbd0b0e879f4a7587b674ae86c5fdfbee955acd0fb6226cb95ed31372cb7c222814
+DIST NetworkManager-1.18.4.tar.xz 4875196 BLAKE2B 9c58d6d7317562332dfa9639f8e236a0a7f6b58e7dad5af83916b1c6178899a6bcf12bc289fb401d84fd6420306364b4c4c0a25eda2a08eef812acde1862a18a SHA512 9fd22775a400ee8d20c75ebddfee842bfbd8780966444dd537e371a65918f41640e921d2c441853afe8f72d693e9b4c1415435136a07004666a6af4799fd3350
 EBUILD networkmanager-1.18.2.ebuild 11121 BLAKE2B 1599674ae5a7eba5a71051cb407389426861ebe5028fa495bc069a2cd7e0921d380356b3a9a648dc4f83c3a2c86edf88cc945ab986a29c6c45346f646597d8cc SHA512 00ae391ff577b8b0c74db9ff0603e54a643c9f3eeb462266f413470bfdc7744bfb460bdbd4ce8555428202529be909578760dbbce46362a2d24854eca9cb356f
+EBUILD networkmanager-1.18.4.ebuild 11127 BLAKE2B 532483e642985d46835b81de8804d97063c6de3c11e2182bd13212180ab665dbb63c9e718c8bbd642bc8e70f472b4fea0a2bbb37650cdfbb786e721200389e96 SHA512 587506654b147eb04378ae37f3ceb66c756612b13ddb03419a05fae1689c4c41c0e72f40ba62b7dc9a883ceef4fb8440e4d67237478ef3e9558270d517f1b721
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.18.4.ebuild b/net-misc/networkmanager/networkmanager-1.18.4.ebuild
new file mode 100644
index 000000000000..79e755a86569
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.18.4.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+
+IUSE="audit bluetooth connection-sharing consolekit +dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( consolekit elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
+	>=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0= )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-3.18
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--disable-lto
+		--disable-config-plugin-ibft
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
+		# still not ready for removing that lib, bug #665338
+		--with-libnm-glib
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-crypto=$(usex nss nss gnutls)
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
+		# ConsoleKit has no build-time dependency, so use it as the default case.
+		# There is no off switch, and we do not support upower.
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		$(multilib_native_use_enable introspection)
+		$(use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	if multilib_is_native_abi && use policykit; then
+		myconf+=( --enable-polkit=yes )
+	else
+		myconf+=( --enable-polkit=disabled )
+	fi
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+			libnm-util/libnm-util.la
+			libnm-glib/libnm-glib.la
+			libnm-glib/libnm-glib-vpn.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libdeprecatedHEADERS
+			install-libnm_glib_libnmvpnHEADERS
+			install-libnm_glib_libnmincludeHEADERS
+			install-libnm_util_libnm_util_includeHEADERS
+			install-libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmincludeHEADERS
+			install-nodist_libnm_glib_libnmvpnHEADERS
+			install-nodist_libnm_util_libnm_util_includeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+}
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 08e1d04b72df..8c70f8f338b8 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,3 +1,5 @@
 DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
+DIST nextcloud-client-2.6.0.tar.gz 18789917 BLAKE2B db5c703ecf630a96c141c9c8a7b15894c5a679e1b36217f38a02cd55307fadb5ea19c13ab44371fbbcf0610ddafdd2fb0c1ef6119db04808b94a72dbfb27da9a SHA512 161733540de85c436e204b150fb91b527737fee213e569335248ce7c6e1446497aad5e3fa814b3f98a1ec0cdb94fad64ccc0807eb953a94170f9d40abb478545
 EBUILD nextcloud-client-2.5.2.ebuild 2006 BLAKE2B 2e5da149dd376fef452c36eb7279ce4a0e7832219d5edc25f823bc691b2d5c37c838b148c2affef9854532625292a99282cfdfe073cc6e6ea3e0f9d67a7a6bfc SHA512 cdc60ee671e822eef98ec463382afe43997a0f220f7bde50cb0a20940131c4262384ccc767db2e5dcb86c7ba86eed1b7f80508764530569a122a648a9c0f83a7
+EBUILD nextcloud-client-2.6.0.ebuild 1997 BLAKE2B 93dcb863a801307fc378326d0d3027e23b6db25d70cadd8c58d5a5cc5a17d4847f8018574823a933b634c76b2018590a64083ef12cc7b4384d1d0e8701c1739b SHA512 39367dad554bbf6a6d062dc1f85474b931d6a92d099957f0322ec100eaa540c925574afefbd69407a007509bf2f0ba2960065aafe61d5538d2f5c86b48e21a0b
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild
new file mode 100644
index 000000000000..e931c2d92649
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	>=dev-libs/openssl-1.1.0:0=
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	shibboleth? ( dev-qt/qtwebkit:5 )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+S=${WORKDIR}/desktop-${PV/_/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-misc/npapi-sdk/Manifest b/net-misc/npapi-sdk/Manifest
index c08b5be5511e..8b20479b77e9 100644
--- a/net-misc/npapi-sdk/Manifest
+++ b/net-misc/npapi-sdk/Manifest
@@ -1,4 +1,4 @@
 DIST npapi-sdk-0.27.2.tar.bz2 65811 BLAKE2B 7f746f077bb87ef8de31499cc3ba0f0c15197ebd9da7891096ecb368d66ca2a7a54fc2b27e7ecc78e942c74e1623b09ca1d39df8f4fbb0843a5cc0ab98b9caa9 SHA512 827d52fbc8eb601ac0e486aed267b1ca6cb8732c92f1224f4b38e039288b77d07d47c5d4cf384a3114403b85e7f086f345912f1b20b41d27785c9bb367514842
-EBUILD npapi-sdk-0.27.2.ebuild 425 BLAKE2B 4dc321c99409c576b605220b850ae63cef9985b6d4cd1f2edc88435787309cd900587b23f3aa7f76756306fc49183777535e7e75bbf86ac96ebe63a5d42cf084 SHA512 0b4a07515ae31a926c580ae0089e8bc63b429e89f404fb224df004f9f25c294d2d2ed3018fc7c46efa26ba73dc5694e73728fc024a7981d367e9263ca5446542
-EBUILD npapi-sdk-9999.ebuild 587 BLAKE2B cd88e534e1a79dfe6c3d76936305c31c7fbe92e48610c4a7df33f3dd9a7fe6c21b1b756dd1d79babb1ac3299fb4b979d70fd6c6b3198a46f679edd09d0d55ae6 SHA512 fac1cd12c7ce982fbc2bb4507b39d5a41a8d34cd6c5a7ffa886d0423eeeb17d7b034d6337215ec5f20ce7c91b3fa8957e8f022ad0e7157169c09bd60b6aec145
+EBUILD npapi-sdk-0.27.2.ebuild 415 BLAKE2B f72288c34f3828f2f58ab4c955b1265c2c1e9c28191a280297492887e8e0cc181f9524568d90570bc32f18d5d05337245f9cb220de5b44248ab5462098b428b6 SHA512 3ab904ff87f507bf07ee1febe0aaa3b708fade6f5f4aef1a7d0b283a2806b5f966eb159bd16e676ad6ae6de88044edf4fa14d54538d2bf8823c79949242c37de
+EBUILD npapi-sdk-9999.ebuild 577 BLAKE2B 09a4a13d1cb6ee4563d9b227297afbffa72735c108a5553729aeee260a7776262e4f1a5ee33e707a7d4c6965483e7cd65e42a1c1f948c421cded9a7d29eef0e8 SHA512 aba465072a130b85c1257d6e769a3cae53ca63fc2d06180e7befb2013dd3f2e97f955124e81ea0255102505fe09360324b33928965d55ea6370d05d8a17e50bb
 MISC metadata.xml 554 BLAKE2B 59d5b3ef0386ace117d29123793e45f78d3dd8998069a25341c9f56fce1438cd1d5af3fafd84cffd09c6c956496fc493ac0e3af4d010e63e3a01788cbc125f8c SHA512 f64e6e5dcb310e3529ccee303071fe765de9dc1df0230969b654a11e0df90ce011cb6c999151db0e913f4fbaa2b5456395c32fe08ac50885dd92762da7d9e2bb
diff --git a/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild b/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild
index f016fc57565c..b44229e93f0c 100644
--- a/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild
+++ b/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="virtual/pkgconfig"
diff --git a/net-misc/npapi-sdk/npapi-sdk-9999.ebuild b/net-misc/npapi-sdk/npapi-sdk-9999.ebuild
index 554054da6774..f627ee218d9c 100644
--- a/net-misc/npapi-sdk/npapi-sdk-9999.ebuild
+++ b/net-misc/npapi-sdk/npapi-sdk-9999.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="virtual/pkgconfig"
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 4b4c8fca3962..e76a584c8d78 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,6 +1,7 @@
 AUX man-pages/genmans.sh 1882 BLAKE2B f2da7801ad33b15486bba29832587281bab0abd472b3645d4c4291701cce041e862eac6b625e3707c872aba3bf59c9223fafc33b7ecd7bc3a50fa517c3ac2fbe SHA512 7f5161c8c25066f1a08e0c228956716aa55e2b5c54e4a67e1d9b18ffcd9bdc56e95c345ffbee9c35d974146652909b80c87a2796053b26dd0b2a0ac40afefd6d
 AUX man-pages/ntp.conf.5.patch 503 BLAKE2B 039ae4ba832249fb47e15d7782644ad8b1bdd0058fbdcb5e22404ac5a51deb9736de9cd840b7eacd4f5bd865de80a83113a898428289aa1c2fb8fda72f038666 SHA512 6e75a7900c2cde0484e57e18b1244ed188b58be54b6622c3777251a2f412a27a98c41a65d6d62d93f9e84856f211bb268bd005aca146bc27aed982daf63f24fe
 AUX man-pages/ntp.xsl 5831 BLAKE2B 6234a07c8cecb63742ed6f068dab774e12a0d44dfd8f177a684cab9fcc9350b225073daee9731a60dd11d712cbebb124a52337cb466174699aab5f8559d53ae1 SHA512 c4fb1333a35a803783dc209186ea9005a0e529aba96103460e23a0eca483414898037802686cfff04bf910b06eb27ba8805c460962c3626af2d0951904484cbd
+AUX ntp-4.2.8-gc-tests.patch 1183 BLAKE2B a92f418a901f65b06e154be27794cc4f8fa99bf0c19f1f8240c79682503bf9742d3ebd00e6d189884db702bb814caee6b197f4be3233eaf01d1d54c40a01e6e0 SHA512 b761776bdb0ea50781c57c19e6f132a7ba596e944e06bef53d1d9a4ab154f6c941ef1dd7b7d7130de546d59d9d6a7df25517590f015f9a91ea7fede41d95b471
 AUX ntp-4.2.8-ipc-caps.patch 471 BLAKE2B 307a23be635e0a78f12882c26580caaebc5a38d463b3b1c686bbdc71a225bdb97ad03703513b112b9509958c687f046df3153baab1d26d019a988c94ede796a8 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f
 AUX ntp-4.2.8-sntp-test-pthreads.patch 325 BLAKE2B eb4d7c8b6723d0f5d17670d8ca2e9cc5df801b24dee7d5f30c73eb8ffb5a6ebfa6651b8ae37da35cb1f97171eaebef5e71afa49e2c996a40a3b1ffee6d34f5ab SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4
 AUX ntp-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch 1305 BLAKE2B b92635ce5512c9907b974ba2a07c567219783192379f1da8fef445637a3d36f9d52cd1be055d7e5df733448ddd41b490b02210ed8aec5770f84dc63d46650636 SHA512 6d6e3d98ff3b76575df8c5fa57e9ed4f7f9a4e12c2ffcfafe762a5f93ca3af8a807fd08a1cbb7c276748384702d98b60e160795cc0875fa73a3304bbe0038ba9
@@ -21,7 +22,7 @@ AUX sntp.service-r3 320 BLAKE2B b47a7a4dab78c0ea9f85b861d7f5f2926e5302839db34b92
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 DIST ntp-4.2.8p13-manpages.tar.xz 25700 BLAKE2B 47076474529146f6fd375e20c52188f1ba04959ce3752c952e60e9b48c8ac129346fdf5c315e012556422d16b7d6c223722812a56a11a98463044d2b16fcf0f0 SHA512 824832c1a8685fcd196db679cf4b87c89d577cea5251fda7c3dfee00e888d64de76df99e8cf4b0d20056e3d539b3f46a260c6ce22339aa79b915427741030da2
 DIST ntp-4.2.8p13.tar.gz 6949363 BLAKE2B b503153d8413e6ba174970bbddca59d237442e8ec29e082cedfea6523b0b7aaf2919dc219d816e02c8d3aa486beeaf5ca08b314a8b4c587333034447e1391ea0 SHA512 afbdbb8a37b8f4040a8a6939a3a85ad0350d359c153c297b32b8a013c7b7061fd925fa3e6e103671c5901e169156e22497813c654195ba50f890a7170b2f2075
-EBUILD ntp-4.2.8_p13-r1.ebuild 4584 BLAKE2B 08f0a824000d854e3371c12848cb042860b155b57fbaa6f598c825de0c3ef924b9d581e98c270aaf2d9a695735086824a414f893f52bd7a996b51c682fb0afc4 SHA512 1c84804f8efb04e601461dcac9187bf40a0d29cd716001d4721342f971b8abf9bcc12529c0c84eb6e8ecff53dfe58186ccc3e0c227d7d7e2deb886988b502ce7
-EBUILD ntp-4.2.8_p13-r2.ebuild 4587 BLAKE2B ad00e9a09745e16d9e227afef5f4f916db9b021579c8252c1caef10c0837f55a735b87be49dc97ef675a4f73d98943a847522e06011580b6598a66d7e8ec1612 SHA512 9ce56598d743a1a58880858c09e981d0b4255ffc5acca4f661ffa3cfd510b7690af835877b5947499109e30064f057dabd25853c0f4de5e1035b8742a5e8f129
-EBUILD ntp-4.2.8_p13.ebuild 4571 BLAKE2B 1884c38ee5b85477cfa32b39d6c42b0f24548cef45a8542d36b4ca39a5d3d3dc26e2dd964edb731e04e4ecb0eb7fbf2a4eec05254fcf04f5cac18266d6dcd4ea SHA512 ff1997994042aaf04638ad9a14c2c7acd05983faa2f21c78626d0d2596f82b73102082129804a465b4c3cf6974f1a1b510bacd36f639f5272543569de7bcf675
+EBUILD ntp-4.2.8_p13-r1.ebuild 4562 BLAKE2B 0c2ea0e5db7ed0beafd8f16c68148fcbcfffac71d842ced27ef4b605bc59411b3a4327aa449635e4cbc91a63b021018c8d1ccc98d39fab705b91c6e4996d2c5f SHA512 ffa1e54d5cb412cbd484cf911e44c50be9a3f649a4c78995344bf40095ad8fecab35c8efac2df6377d4522399f96f38f4d5a566d7eceacbb34e97f04d4b3995c
+EBUILD ntp-4.2.8_p13-r2.ebuild 4615 BLAKE2B 063af81b68f5ab371c2de2463f85f1258395d31e287eb149a892978be6f8e0b35f2146fa968e29d233c84d08a486ad27ac41c2f62d7c7b3d701bec04dcd29a52 SHA512 7bbdd96070f95b58dc24afcb6d734890d0b58b02d3dafa1e2a6690040c83576e12b02771ba69c44baf7dc106d3727007239af99b5a0e18fec335933853617d60
+EBUILD ntp-4.2.8_p13.ebuild 4549 BLAKE2B 710f7f5d08dbcb1ed76d3e420c842b9e4d9902a1a4a4995948b845ed3cf0213c3c0f3c2d1ed995e47ecaca5cf49fed8cf72f21238ded24645b851108565bbe9f SHA512 d353c9e907df8ead23cff2d554dce1afe37c39dab00026ee52ee3305747b0273987d9443f30f12b057b25dbcc01253a762be3611132b8920fa41fbbe0b70c0fa
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch b/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch
new file mode 100644
index 000000000000..19f0c0f8bfe4
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.8-gc-tests.patch
@@ -0,0 +1,41 @@
+Avoid building problematic tests on platforms
+whose linker does not support --gc-sections.
+
+https://bugs.ntp.org/show_bug.cgi?id=3601
+https://bugs.gentoo.org/564018
+
+--- a/sntp/m4/ntp_problemtests.m4	2019-09-23 07:19:18.545861137 +0200
++++ b/sntp/m4/ntp_problemtests.m4	2019-09-23 07:19:18.545861137 +0200
+@@ -33,6 +33,10 @@
+  no:0:*-*-solaris*) ;;
+  *) ntp_test_ntp_restrict="yes" ;;
+ esac
++case "$ntp_cv_gc_sections_runs" in
++  no) ntp_test_ntp_restrict="no" ;;
++  * ) ;;
++esac
+ AC_MSG_RESULT([$ntp_test_ntp_restrict])
+ AM_CONDITIONAL([BUILD_TEST_NTP_RESTRICT], [test x$ntp_test_ntp_restrict = xyes])
+ 
+@@ -43,6 +47,10 @@
+  no:0:*-*-solaris*) ;;
+  *) ntp_test_ntp_scanner="yes" ;;
+ esac
++case "$ntp_cv_gc_sections_runs" in
++  no) ntp_test_ntp_scanner="no" ;;
++  * ) ;;
++esac
+ AC_MSG_RESULT([$ntp_test_ntp_scanner])
+ AM_CONDITIONAL([BUILD_TEST_NTP_SCANNER], [test x$ntp_test_ntp_scanner = xyes])
+ 
+@@ -53,6 +61,10 @@
+  no:0:*-*-solaris*) ;;
+  *) ntp_test_ntp_signd="yes" ;;
+ esac
++case "$ntp_cv_gc_sections_runs" in
++  no) ntp_test_ntp_signd="no" ;;
++  * ) ;;
++esac
+ AC_MSG_RESULT([$ntp_test_ntp_signd])
+ AM_CONDITIONAL([BUILD_TEST_NTP_SIGND], [test x$ntp_test_ntp_signd = xyes])
+ 
diff --git a/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild
index 75150d171392..0f2889cf8bae 100644
--- a/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
diff --git a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
index 40f035bdcd4d..7683b71bf4fd 100644
--- a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= )
@@ -47,6 +47,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
 	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
 	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
+	"${FILESDIR}"/${PN}-4.2.8-gc-tests.patch #564018
 )
 
 src_prepare() {
diff --git a/net-misc/ntp/ntp-4.2.8_p13.ebuild b/net-misc/ntp/ntp-4.2.8_p13.ebuild
index 1e6b75a72ab8..267453dc65ed 100644
--- a/net-misc/ntp/ntp-4.2.8_p13.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar
 
 LICENSE="HPND BSD ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
 
 CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index d544e9202ddc..459d2d8fc3f8 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -5,7 +5,9 @@ AUX ntpd.service 299 BLAKE2B 307dbf3a8569cdd1d54095bdb9b409986a9de3c7ec98405b454
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
 DIST ntpsec-1.1.4.tar.gz 2536268 BLAKE2B 320e7afee1b776e0327f8bf34bc0b8cd3a2c67fd9fd16564323ce825cb9e36d7d5fb48a38b734600286cbd039f41f296d9e488e25d2680f08412aa983101987b SHA512 1b74e7cb87e189137e1b66b52ce89498e0061a10abf017c36bfdecb4aefe9c3fb6e8fd7819a9f822fb946dca6ae20ee724b2aed35e03d73f8e3015d8818d02db
 DIST ntpsec-1.1.6.tar.gz 2600632 BLAKE2B 1ee3e266f9a0ff45fc8f001a2b5a1722c6acf75a2151ee3724812acef3409eccbb865b321a3a346c7ced1770aa24190281a94593b881b4bbb0a2b2e6df5629cc SHA512 f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941
+DIST ntpsec-1.1.7.tar.gz 2534524 BLAKE2B 5777ecca4ceb988632fadc0e7124530993a7758cdf335e8cd90f0ec1a8b643be89b67c0e2bf49d6d7193bf92ded138af0df4b5856c0d113f552ef22dd8a6cadf SHA512 734b12820539e655e504dd5071a58b9d1f80c0b0c3c7458c797ba7ada23d8e446751fbcbddd9832d9151a3ba9464749878db9e77e23cdd5f6215ab9e1d908ae9
 EBUILD ntpsec-1.1.4.ebuild 4130 BLAKE2B c14e7e7d1bf4d4f840b9e555cfe13b967824901ce1b5dc021be0fb9d0cdb53a358e1e73037bab9e251400238d99a9f2fac69c48232df2d8c49bf105927b363c5 SHA512 a40332b0d7621e905099dbffe43e336a8b32e842d888c15eac07e87de9bc89cedf23eef2e04681704a8011b84965b9a6c294eba7dfb5df5b10883b973e322984
 EBUILD ntpsec-1.1.6.ebuild 4088 BLAKE2B 80075131dd2cae62f97508c4e54e51a89c819616f487e7e3d63103d3deef03ad7e5fe09742a2230a30d8d817061da0551eb15cb802d9f2bddcfadb88868ae427 SHA512 728819a43dc5bfa8815cec23deeeeb81f5a54cc3d9c870b1d6050970225aa643fb19165e6dc9d5ae051ed40e3bdaaf9fc41aced473a193c576e8c4ff4525b885
+EBUILD ntpsec-1.1.7.ebuild 4118 BLAKE2B 1a3868de0faa65eef3d194b34d7d135cf830a0d60a507cc7a2c46e1fc6d540682c06f70f3e0d258f8e3166d03dc3453d0a828e30504579242777d6c7b601633d SHA512 11258a2ede28b442101a415d21691c9188dbd589be4d2c7989b22ef91cc5cf71ad9e050e27ce92f55c779b09948bc0ffb8f414eae4356727ca8525f95193c225
 EBUILD ntpsec-9999.ebuild 4088 BLAKE2B 80075131dd2cae62f97508c4e54e51a89c819616f487e7e3d63103d3deef03ad7e5fe09742a2230a30d8d817061da0551eb15cb802d9f2bddcfadb88868ae427 SHA512 728819a43dc5bfa8815cec23deeeeb81f5a54cc3d9c870b1d6050970225aa643fb19165e6dc9d5ae051ed40e3bdaaf9fc41aced473a193c576e8c4ff4525b885
 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/ntpsec-1.1.7.ebuild b/net-misc/ntpsec/ntpsec-1.1.7.ebuild
new file mode 100644
index 000000000000..e5bf13be3bed
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.1.7.ebuild
@@ -0,0 +1,161 @@
+# 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} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic python-r1 waf-utils systemd user
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+	BDEPEND=""
+	KEYWORDS=""
+else
+	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
+	RESTRICT="mirror"
+	BDEPEND=""
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+	oncore trimble truetime gpsd jjy generic spectracom
+	shm pps hpgps zyfer arbiter nmea neoclock modem
+	local)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear tests" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+
+# net-misc/pps-tools oncore,pps
+CDEPEND="${PYTHON_DEPS}
+	${BDEPEND}
+	sys-libs/libcap
+	dev-python/psutil[${PYTHON_USEDEP}]
+	libbsd? ( dev-libs/libbsd:0= )
+	dev-libs/openssl:0=
+	seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="${CDEPEND}
+	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
+	!net-misc/ntp
+	!net-misc/openntpd
+"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	sys-devel/bison
+	rclock_oncore? ( net-misc/pps-tools )
+	rclock_pps? ( net-misc/pps-tools )
+"
+
+WAF_BINARY="${S}/waf"
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+	default
+	# Remove autostripping of binaries
+	sed -i -e '/Strip binaries/d' wscript
+	if ! use libbsd ; then
+		epatch "${FILESDIR}/${PN}-no-bsd.patch"
+	fi
+	python_copy_sources
+}
+
+src_configure() {
+	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+	local string_127=""
+	local rclocks="";
+	local CLOCKSTRING=""
+
+	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+		if use rclock_${refclock} ; then
+			string_127+="$refclock,"
+		fi
+	done
+	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+	local myconf=(
+		--nopyc
+		--nopyo
+		--refclock="${CLOCKSTRING}"
+		--build-epoch="$(date +%s)"
+		$(use doc	&& echo "--enable-doc")
+		$(use early	&& echo "--enable-early-droproot")
+		$(use gdb	&& echo "--enable-debug-gdb")
+		$(use samba	&& echo "--enable-mssntp")
+		$(use seccomp	&& echo "--enable-seccomp")
+		$(use smear	&& echo "--enable-leap-smear")
+		$(use tests	&& echo "--alltests")
+		$(use debug	&& echo "--enable-debug")
+	)
+
+	python_configure() {
+		waf-utils_src_configure "${myconf[@]}"
+	}
+	python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+	unset MAKEOPTS
+	python_compile() {
+		waf-utils_src_compile
+	}
+	python_foreach_impl run_in_build_dir python_compile
+}
+
+src_install() {
+	python_install() {
+		waf-utils_src_install
+	}
+	python_foreach_impl run_in_build_dir python_install
+
+	# Install heat generating scripts
+	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+	# Install the openrc files
+	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
+	newconfd "${FILESDIR}"/ntpd.confd ntp
+
+	# Install the systemd unit file
+	systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
+
+	# Prepare a directory for the ntp.drift file
+	mkdir -pv "${ED}"/var/lib/ntp
+	chown ntp:ntp "${ED}"/var/lib/ntp
+	chmod 770 "${ED}"/var/lib/ntp
+	keepdir /var/lib/ntp
+
+	# Install a log rotate script
+	mkdir -pv "${ED}"/etc/logrotate.d
+	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+	# Install the configuration file and sample configuration
+	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+
+	# move doc files to /usr/share/doc/"${P}"
+	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
+}
+
+pkg_postinst() {
+	einfo "If you want to serve time on your local network, then"
+	einfo "you should disable all the ref_clocks unless you have"
+	einfo "one and can get stable time from it.  Feel free to try"
+	einfo "it but PPS probably won't work unless you have a UART"
+	einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/nyx/Manifest b/net-misc/nyx/Manifest
index 89d99394a17c..52d14db0deae 100644
--- a/net-misc/nyx/Manifest
+++ b/net-misc/nyx/Manifest
@@ -1,5 +1,5 @@
 DIST nyx-2.0.4.tar.gz 4074259 BLAKE2B 92296a319947803195a6ae3991f1991c9ee5dc8293144b31d143995a0b897e89812d4b012c330cb2d9e7ee2d2dbbc0ab0bbeb49135ec7e302aefde2dbe8159de SHA512 bb64b6c38bbfc9837215503a69b4a6b7a11b8a1e230f42c51a405472689a3d46d74dd06b2417c90512b63e9605b33198c5132b660f9eca037016a39c5e4f0ecf
 DIST nyx-2.1.0.tar.gz 6908817 BLAKE2B e67305c0e2a066976cc828235bb364a238af2842251b466cc70bf8ad79138ffb5d6c598cf5900b777caf03ffefd0566e9eccfb65131ca0dc26670d71d8f9a756 SHA512 69a645cc811a1b1fbd9cf0501d8f23f1a52e0e92a0598097bb0c9efb040e1895e1dd431bad93be36db0e85ca7ac32ee5c866d50d2812069a39e5160b44575a37
-EBUILD nyx-2.0.4.ebuild 634 BLAKE2B 4216513d1e985e055c845282ac97be85e930d17ed6e1bdb0f7b57b16f2809f446b22fa6bfdd7b426f60a944773ad23a5b23f2fb0c8f54c5e7b2a3f6f39956515 SHA512 9d5c569a53a70de0a2274743f843b6895d11501f4953c8ed1e325fe4ce6ecc10064902c4d104813494594096fd69cbcb9704efee3702cc8e04b21b2b4405d066
-EBUILD nyx-2.1.0.ebuild 634 BLAKE2B 4216513d1e985e055c845282ac97be85e930d17ed6e1bdb0f7b57b16f2809f446b22fa6bfdd7b426f60a944773ad23a5b23f2fb0c8f54c5e7b2a3f6f39956515 SHA512 9d5c569a53a70de0a2274743f843b6895d11501f4953c8ed1e325fe4ce6ecc10064902c4d104813494594096fd69cbcb9704efee3702cc8e04b21b2b4405d066
+EBUILD nyx-2.0.4.ebuild 624 BLAKE2B 3ae222bfd6354d99a911335cbe1949c1bc469376b1373f399c3b961ef8279b56d2febee594d4f535ca68d0a4b694621c92b518b77a39c6dea2d0448005149045 SHA512 cd101d4444675b7676f2b077c0c2afef7fb7bb42ba1a932feac5519624e2ef74c0d51031bd8f83b113dafdd5d0a615295fee6fb3eb2e58f95ef789503d8d0f10
+EBUILD nyx-2.1.0.ebuild 624 BLAKE2B 3ae222bfd6354d99a911335cbe1949c1bc469376b1373f399c3b961ef8279b56d2febee594d4f535ca68d0a4b694621c92b518b77a39c6dea2d0448005149045 SHA512 cd101d4444675b7676f2b077c0c2afef7fb7bb42ba1a932feac5519624e2ef74c0d51031bd8f83b113dafdd5d0a615295fee6fb3eb2e58f95ef789503d8d0f10
 MISC metadata.xml 328 BLAKE2B 388fd17862250e1c6df6dbcd5c29030fa6dd4ed70b8ba4e844fd9d1411f1f777bc5b448a7b52c177d5cb163e0e68976bbae55375da3c41c8e1a1719fd0fd96a0 SHA512 65455e32f59242a36f241e854624f0c38bcbe69cc70eafe39e8df6fbd6e000faf58d04a0310d018377d3440ad55a282f1bc8dbf83fa411221f13068675944737
diff --git a/net-misc/nyx/nyx-2.0.4.ebuild b/net-misc/nyx/nyx-2.0.4.ebuild
index 3dcf66f5f51f..47a846523c3b 100644
--- a/net-misc/nyx/nyx-2.0.4.ebuild
+++ b/net-misc/nyx/nyx-2.0.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/net-misc/nyx/nyx-2.1.0.ebuild b/net-misc/nyx/nyx-2.1.0.ebuild
index 3dcf66f5f51f..47a846523c3b 100644
--- a/net-misc/nyx/nyx-2.1.0.ebuild
+++ b/net-misc/nyx/nyx-2.1.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index b34ab0e8551f..661af4712480 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -2,7 +2,7 @@ AUX ofono.initd 418 BLAKE2B 0a0f8894ec52b7213e46c8a1474f1a6061324f6e31842910e241
 DIST ofono-1.16.tar.xz 854296 BLAKE2B 4ee8f895e21903b8181fe14f5a91fea466eb3a2f66c8a5ab270a8dd81c601dc5e2a1beae368cf0f14b556f0dfb8301439d40d93bfd1d058d43ce864cdd1f0788 SHA512 21887e1bc3b8af18881f9456f950b97885b567164e28ebe2ab6fc5a3042c439891a20b5034a8fa0c7a78567286ac53c1b8a72122f428fbcf5da8bf139423b913
 DIST ofono-1.28.tar.xz 1016308 BLAKE2B 0aec5bc6c845c0906548f62bda95bfee5ca5ef17bc2defd60fe4b0967b9f58fcbbbfeb9593aa33f6852360266ea4ea025a87a07ac95ef50829b592accfb5bc72 SHA512 963471fac89db746d0e99fee805413342203be0d200bc14f0e56c5ec3053e25ea8112943657c88c57c539ae485ac11eb5f80052aad12443c248888f6e6a4114e
 DIST ofono-1.29.tar.xz 1019512 BLAKE2B e073f324c58fee1beac31ba685d92ee85814ccb072aaedc0fa2d0d25419d60449557fcabd0e1b3e5aad6c349582a2abe6fb69094f36b61dbea0f94ed0f8dff4e SHA512 14c3cd3a7ee134dd85f286e3ce47914a10c48a9a2bbbebd0d2715334f233a9b7e4e01bae5a151e4f4b3fb3e98eab96ba345f3fb2c2960d2f9c0645f36c218a99
-EBUILD ofono-1.16.ebuild 1613 BLAKE2B 9661d83b98e2a2fd8a1884e9f877a915b2c1c37023a9ab7754f8c2b1a172c1a80ac7502c56095a02f61b0381b8c89094a0b5e83b41c06d262599460f7a187bf5 SHA512 15f916e06dc0f57687cff505bb08ef267e1d59931af93fcb32a6e3676aeef268acbc6b140791a2b5670735e02b9450a1760d0b8d698aca9239eba7f513bb6818
-EBUILD ofono-1.28.ebuild 1631 BLAKE2B e26874eb6c985a5086848b05f1fe1b5a74e0ea57eeea9ca154a7fd2b2977bb0e0b400399f6809e9817eb45182f9b51560bbdc1bf74759b6ec798280cb56b76c2 SHA512 9b1876aff74fda25f6f61842e7a97e97ca06530c759e2ef00e88632db6f88738d0540993866445bd09910eb6953b055469a2dca635c7a536c4fdea723e1b3953
-EBUILD ofono-1.29.ebuild 1631 BLAKE2B e26874eb6c985a5086848b05f1fe1b5a74e0ea57eeea9ca154a7fd2b2977bb0e0b400399f6809e9817eb45182f9b51560bbdc1bf74759b6ec798280cb56b76c2 SHA512 9b1876aff74fda25f6f61842e7a97e97ca06530c759e2ef00e88632db6f88738d0540993866445bd09910eb6953b055469a2dca635c7a536c4fdea723e1b3953
+EBUILD ofono-1.16.ebuild 1624 BLAKE2B 1948438d3150f5cdc848ce72c10fcd70105d1854bec2f0e941d5eb24aaf869826e6e7de8b7b46c92d4f9a5a56a537baacaecce29d406abf1302964b4ab46a2e7 SHA512 fafe6075e7c1abb6b513c0a09620c61ce8e1472b6972d69ec23bfc652b7b63d2e983affe67bad31a5160e885e40576d3c67230e4f67ab0c989714ece954457bd
+EBUILD ofono-1.28.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
+EBUILD ofono-1.29.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
 MISC metadata.xml 951 BLAKE2B fd63ccff3b96dea1e770b7ec50c1a9e5e583fe81bcb2ca9c1915386a4fbd85a30c806f9ac3e163b1110e93b44f6714c555cee9273ecf90d5a9f9e209f0774897 SHA512 26f8b8b3ac43991d14534b4b1257a5c4dc1dd0eaca83c9f30aab74bbc721d9573e93e8f245a4ac2d0805ea9325aa759ca144951fef1b158b0b68f54df4df3e7e
diff --git a/net-misc/ofono/ofono-1.16.ebuild b/net-misc/ofono/ofono-1.16.ebuild
index 4f2e8ea574f5..50a0e58fd571 100644
--- a/net-misc/ofono/ofono-1.16.ebuild
+++ b/net-misc/ofono/ofono-1.16.ebuild
@@ -7,7 +7,7 @@ inherit eutils multilib systemd
 
 DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
 HOMEPAGE="https://01.org/ofono"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/ofono/ofono-1.28.ebuild b/net-misc/ofono/ofono-1.28.ebuild
index ca819ad691d5..406ed49a7a36 100644
--- a/net-misc/ofono/ofono-1.28.ebuild
+++ b/net-misc/ofono/ofono-1.28.ebuild
@@ -7,7 +7,7 @@ inherit eutils multilib systemd
 
 DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
 HOMEPAGE="https://01.org/ofono"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/ofono/ofono-1.29.ebuild b/net-misc/ofono/ofono-1.29.ebuild
index ca819ad691d5..406ed49a7a36 100644
--- a/net-misc/ofono/ofono-1.29.ebuild
+++ b/net-misc/ofono/ofono-1.29.ebuild
@@ -7,7 +7,7 @@ inherit eutils multilib systemd
 
 DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
 HOMEPAGE="https://01.org/ofono"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index 07598f051024..5cd7bab34cd2 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -13,6 +13,6 @@ AUX oidentd_at.service 179 BLAKE2B 54ab7d09f950927a2dac5bc473d0533c6bc9d437e6f5c
 AUX oidentd_masq.conf 429 BLAKE2B 08612753eb38386b0a20cf4432856d935697684680894a9303df3315d3708042cedb77ea60f913c448c311741fc19de757f7e3c55b148dd95b821457b839f27c SHA512 72e48e1923adf594d53ae325b0ba5a6ab406ac934985a699f6f3b2a88010f312ddac279a752bba6b237aa87451348a0933ee4166aa267a0b08919c37eaaac40a
 DIST oidentd-2.0.8.tar.gz 212354 BLAKE2B 46f4c4478822e832885f5f38a2ab5b2132ff5c1e5071fd1dc6050e55992d50bd96be096064996853af69d16316e6aff648c5320714b53b60c038cc9aaedfedda SHA512 86229a4ef9892121c25a7140616e180f862ca34b73ea3ad9f0fbb008f657abb17e9f14c2c25ae14c14bfc14bf1ea10b50fd68318631a9c52227bbfd6e6d43288
 DIST oidentd-2.3.2.tar.xz 187772 BLAKE2B 460d2959cf9f1f125a76191f8b67a083a7d9bce84c706c76f6e8da6113b12eb6e760345774d15079ff449c153ac54805d4bfa8b057c1238ff703474e118b8458 SHA512 7293339897149a990928105e6cdd77aef7cd273f625496fcc674a414764ebfe835d2a9525e518a7215fc93537c48b70d15999d5669227dbb7fbf5cefb3d04e14
-EBUILD oidentd-2.0.8-r6.ebuild 1452 BLAKE2B dd2938141d3d6d7bd666eec975e1c2a2908688c3da7295cc24a066a46555021657eaee49973f551af2d086a2d98c647650d441e93f658b5ab2401e837699f5c4 SHA512 ec3554673feb64904c19231bd749bc67a333148c61e56e1a57ac8ecfb451b13f739ec9b269f1e7cfb4a4fc2371d516a27c722bb87e269dead98d97a626c3de8f
+EBUILD oidentd-2.0.8-r6.ebuild 1442 BLAKE2B 4f401ae09e7cec5b0c72f865603f86c03bb1f7ed122946f74290cce4d4ac681d9a05e0e1b9e0759e179d0156fb6def0332fb0a8912ab54b3e3cd5193825c95bd SHA512 e4c830cb99d8c3cf366832f63412732434dad1e6728e2081bbd1a7bc7363fc71b1966af8a9ce8f18e95201ffcd05a927fc7a5fee67b5700b42383c1613e88e61
 EBUILD oidentd-2.3.2.ebuild 1243 BLAKE2B c1b922a6e7808203f629631560046bbfc68aee794aeeb9ab3082d1536d0f1f370a04a924ce0103b6b8fc9e2e23807cb47adfc9196749b3741724ba3a96c1ec8d SHA512 dbb12ae0f7c54fb1fa5440dfd3868e7fe43e0114cc7346284c5c53954c5b9db8b78d8f494b16bb1e029cfbf25bacb1a87ab227e8447c315bf93b58515fef3d2d
 MISC metadata.xml 539 BLAKE2B 10058ed518667411899809727711217f873c5ea4f65819a7f70315f1baf9a856f2b017197e1bd5b02e7b1a9c38b9a189df27e572c1eb6b04b08d29429f8f6d03 SHA512 0e2ad57b9a3032c73a0206ff665dbf8d258fdd91e595eaf7b06a309488321809e0f8bd567e37452cf83c89c734c4d57857b95df0472bda0b8c29f4e14b23af84
diff --git a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
index f8ee48e0bbb9..329da09121d8 100644
--- a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="debug ipv6 masquerade selinux"
 
 DEPEND=""
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index b6493ba6bfb0..97a2f4a69698 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -6,6 +6,6 @@ DIST olsrd-0.9.7.tar.gz 15761465 BLAKE2B f272bf9358b4beb1157ff0e2098413de3b81a95
 DIST olsrd-0.9.8.tar.gz 14416300 BLAKE2B 67477d9359686cb163221f5f354f330b38811e9e77bd71379e359bbfba2b55e917009ac537b845420a5bb73284ac83e0b91495e011c810f8169e4edb6bea940f SHA512 cf3066310c4ea644ba1f482e847aa073ad006000308bfa993cecda4ccf4e9919a9005680b3c1d98e34f0c13818213f208e8dc93c8b060eeaaac160fc3df4ce8c
 EBUILD olsrd-0.9.6.1-r1.ebuild 2337 BLAKE2B c7c96b2ce368d1245b5faab05686eb24ef8e3aae650a94939664ed0d50fa0a8c86011b0187c654dea359d6fe0fc40ad0928d89d094fdbed4ed260705a64e1f85 SHA512 bda205c6ada5a043a624e1a82385d4079258128698ae2acfc516bc74ae06ff8ef6ca8f30d1372a9645d1ea939e77b3c5792a408e5dbd2aaa373d128a19b60e73
 EBUILD olsrd-0.9.6.1.ebuild 2237 BLAKE2B bf4718bcc51719389fa7ed9beadf69134336304b719f5a289c615bea47aa5d22305bb79b2e1860edf9a9e358e409fd6bd456d36958f43d633d4517e1a0ab1f6c SHA512 8bb1a1917fe2472222ffb5c8f7dc8303894d813b6708cef05436636e4ca378170e45f635752babae7a47510bfeb8dc1fc3f5bf888062f0ff34317f8a31e6ce68
-EBUILD olsrd-0.9.7.ebuild 2319 BLAKE2B 74c634ed30350f0f5b51c571898c5b66637b3368d62a530651a81d87bc257d6e2793b1b3280ad595f06d8591ad18bdb7f86edc248db97e639174632373338df5 SHA512 4f052ee565b3b99d47838a7707f61a21be38bcaa049c04a6046cb1c2ab9b70c6742268bb765971977f0bce76bfb649156f94a6f33ecc1da8214ecfd81261571a
-EBUILD olsrd-0.9.8.ebuild 2389 BLAKE2B 14afe2ec5484a85a4481a10681d42adeb69e8477b42d8893afff3ccc2391eef2a3a0211d59561c9235f4bfb6bb2047a193da689f4c310128899d4b3f3c7635fd SHA512 920a3a84c4f10b37838bfa3f56097577556475a62d95f3b7f6bb88a5f8a485bb31f20838819474f564281ddbe952d33edbbc045c2c6c2adc938bea67e7882583
+EBUILD olsrd-0.9.7.ebuild 2315 BLAKE2B f4c37336fcda28419ed3595520122c5e75d748200ae3331bb6546c972a47b5439a76dbd07c9b24fbd6cfbcc23605216c43edde62218dbea9bb89564a995c1ef6 SHA512 a0e7595542b075388398c22eeca02e311ecf9d8b31cf0ef54345f2e75ddf464bd2d4557b29eb6d16ee7fa25ce7ea8857e5dbdd66dbda7a6ca26810f225075287
+EBUILD olsrd-0.9.8.ebuild 2385 BLAKE2B 80f609c1c1a297231670e734a42bb941ff5ea70f45daca826a1c1aa6cae83b9c4665ce491c7a828489425371f13e10d21f09036dd9ed75f02b14b52712b63de5 SHA512 9895cd6623c23fd5213e761803d7974681ddda924a91f9027cd8fd3ccc250764fc1d37e1da26ff4c897a689c1cde798649506ab67c66d8346fcefd30e8d542fa
 MISC metadata.xml 289 BLAKE2B c88d8f719ab7ee520a042f4a45a60a8e797eeede9823b1d21ec5e12700805666e81e96be90b9d961cdbde662ee813a7f68949cc477c40f17ace6902abfc9627e SHA512 11297ae766f53af46dd2eb5ddc9458cb3b7c4d6edb6f47030373e3e251a282ca7f0ceaa9e99bb2847c15ccba9cbd5ace0313c248a69ad6975c3bc6dbc6056520
diff --git a/net-misc/olsrd/olsrd-0.9.7.ebuild b/net-misc/olsrd/olsrd-0.9.7.ebuild
index ee0488eaf39c..fabb4f495467 100644
--- a/net-misc/olsrd/olsrd-0.9.7.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.7.ebuild
@@ -79,8 +79,8 @@ src_install() {
 	doinitd "${FILESDIR}"/${PN}
 
 	gzip -d \
-		"${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz \
-		"${ED%/}"/usr/share/man/man8/olsrd.8.gz \
+		"${ED}"/usr/share/man/man5/olsrd.conf.5.gz \
+		"${ED}"/usr/share/man/man8/olsrd.8.gz \
 		|| die
 
 	dodoc CHANGELOG \
diff --git a/net-misc/olsrd/olsrd-0.9.8.ebuild b/net-misc/olsrd/olsrd-0.9.8.ebuild
index 410f7525a7cc..c9d51ba3119a 100644
--- a/net-misc/olsrd/olsrd-0.9.8.ebuild
+++ b/net-misc/olsrd/olsrd-0.9.8.ebuild
@@ -86,8 +86,8 @@ src_install() {
 	doinitd "${FILESDIR}"/${PN}
 
 	gzip -d \
-		"${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz \
-		"${ED%/}"/usr/share/man/man8/olsrd.8.gz \
+		"${ED}"/usr/share/man/man5/olsrd.conf.5.gz \
+		"${ED}"/usr/share/man/man8/olsrd.8.gz \
 		|| die
 
 	dodoc CHANGELOG \
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 157134479cf9..67fabe3bfa01 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -3,6 +3,6 @@ AUX openntpd.init.d-20080406-r6 292 BLAKE2B fb5620bcb40b476796cf5242ebec17f4f7f0
 AUX openntpd.service-20080406-r4 196 BLAKE2B 7b55400bbc6b706f57eeb61370fea232237ce8e12a47bf5c681a9274acab9bcd5ad0e97708aa99f8d2df92a0fa57828fb747f220c038f83c54f30084a154c7bb SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e
 DIST openntpd-6.0p1.tar.gz 432696 BLAKE2B 331214c5a77adf99974a665a157255857b295f49409721d8530fdd2eb6c00e458a2e6395105a527a4a8603e65efb33e16f752c70222e9f7697f8c871d51cffda SHA512 a71c516dbe7596cbcb3a385112a59a82185b7e3d93a52eda695cea5a0a599ba7fbf58daa81da55d608255cb6950398123fa7d71663604a4c3bcbee949711296d
 DIST openntpd-6.2p3.tar.gz 447586 BLAKE2B f81db876c01572f06b8fc24aabe8954b15287496e8c39c1ae81231ef01676fbe8c69c5cf517279e45510b6b1b5f4c5d0d09d7ce5fc220c7bf36763cf67623519 SHA512 56a04bfd8b161b365607673ac80086ff53ae943938fa49bf52edbc541432eca30730a46a4af581fe26ce3bbceb144cb25982a38959b7a3f9304c727fe60f9f50
-EBUILD openntpd-6.0_p1.ebuild 2976 BLAKE2B b285733dcba85255c6b32821484a4893e243587f98c1924f44ba3f5b7e755ffae29ef8109f5c339c60310b9269bd1b468f860c104db35a17831f4cd72d8c4f9a SHA512 59b2db9145f16df9f6155737467d610417c321ca5f29186c0dfca70ad49720ccf9eff4bac120c690a1c424cd0fd23631b095883125c45cbd7b576b16adacbbe6
-EBUILD openntpd-6.2_p3.ebuild 3152 BLAKE2B 2c53020148cb213caaec81d52da7708f6f0019df5c56817061af7cd93664cfda9cf8c6f68e6f853d5314c969131127d76e6417b69dfb885f47a0dde6589db93e SHA512 85bae7b5a73f8f8005df3e2a70410772fcfc64b99e9997d27447a14fdc57e621b43c4684b77e858fcd808363bbdcef7dd30b459536537fa33c1bdf895267a187
+EBUILD openntpd-6.0_p1.ebuild 2966 BLAKE2B c24c4e04cf3967dae935ce007d866162b0608315364aac759458dc3210ed81679c79b20e624760c730a8385be8a69f7475584aa31a5e05696d81b56a4a8e307a SHA512 f95ad667622c167c4d9eec45705e41ac3f30c5e35eef8fec18c729c535460f478f44bf91ee7f7892caea35427e576d4e46a6c010e88e62b9e05499a265d4ad4f
+EBUILD openntpd-6.2_p3.ebuild 3142 BLAKE2B fd27664a830055da657731df5b3e36d6643d7b8d31d2b2c89885597bb26b7055dd00c57d1f3a629bfe1a57475fe913774c44c8d492f513779b104ab9be01b9ce SHA512 d1d25b88d27a4e7a59cf71929fc3a8245ef46ee28f5d2ac87281c9979406c64b4c2522ecb03333fdca0055a0d5a0c4e9db84e2329c4ac93c12cd7104abd16980
 MISC metadata.xml 875 BLAKE2B 896cd59152c8cb04bf21cc8845606dee6b5e59542cbcc386771c8f713ae4cbfcdf63347f5d55854f53b26f1533ad5ecdb5e763a20ec636634361c8634894ef13 SHA512 a7817eb4847542787337abca3d184b396c4ae831aee29edc6cb5f666189da76d9282aa71cea3033261e682eb2cb00fc858f85fc4421f52dae798bec44194e361
diff --git a/net-misc/openntpd/openntpd-6.0_p1.ebuild b/net-misc/openntpd/openntpd-6.0_p1.ebuild
index f9443dc6c2d8..993e0275999c 100644
--- a/net-misc/openntpd/openntpd-6.0_p1.ebuild
+++ b/net-misc/openntpd/openntpd-6.0_p1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="libressl selinux"
 
 DEPEND="!<=net-misc/ntp-4.2.0-r2
diff --git a/net-misc/openntpd/openntpd-6.2_p3.ebuild b/net-misc/openntpd/openntpd-6.2_p3.ebuild
index 8dc5264ee150..d8fc96246d88 100644
--- a/net-misc/openntpd/openntpd-6.2_p3.ebuild
+++ b/net-misc/openntpd/openntpd-6.2_p3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="libressl selinux"
 
 DEPEND="
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index a0df0f9a3cc0..900ed083938d 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -26,10 +26,16 @@ AUX openssh-8.0_p1-X509-dont-make-piddir-12.0.patch 814 BLAKE2B 596967e4b13d59b1
 AUX openssh-8.0_p1-X509-dont-make-piddir-12.1.patch 812 BLAKE2B a7ded816857183e6a35dd4706ff5c4f4788e2eee5afb08dd59aedd13f0a7d3efc04f74df43bb23d808c8ba53866fdbc1cc89a15ec1b28a995a29181430bffbcf SHA512 1fdc152be81c7a19d8d15c8da03c3de0456cdccb715d1c1fdeea6b7ef89b838e560886dc20d85696fd1105d00512aff884c20ed4117a5afae5c0c00e74831aa5
 AUX openssh-8.0_p1-X509-glue-12.0.patch 825 BLAKE2B 9fc0b5b291551d55770bddcf23d44601d15cbc23a6d8f0795cd064f53e1bc2e49056b23b2d7db0aa25e31e8b68c71ef476cb926a7efa765edf81440489711225 SHA512 edd8c0bdc3b90f7afce8eb5d91ec1344b6e22fc9d16787f63eaee9a576178f5e0b4937fb0dc2640779c049a9102ece63360fef4f690b09894ec46995e0f5ebe2
 AUX openssh-8.0_p1-X509-glue-12.1.patch 825 BLAKE2B 494e16224e9dc9b90c61f7d3721305192344fe41631c6088768b578f8c5620d8e664403105073ef702df4cf234f00279e5e02fb637b2d392ea9b1a1b962b9b67 SHA512 966553aaf2188395f7d3ac05e91a604fe8db47f781b2c1e01ce7cd5a42bff0e3c76c1fbcf557ee3fbcf16ab77de61b8f9812499553f05c843e1048cd713593e4
+AUX openssh-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch 977 BLAKE2B b2e28683176c4678f51a9a0be3e29496620ac795c7de4649fb3cc0bd076682e42bc1c606b17a76e140f51319e4c4a1cc890c3a37c4bc3cf9222a88e31b8a773f SHA512 8c2567ae16dccc73e302ba90c1bb03e19d4afc3892dd8e1636d7c8853932662eccbda3957e4db55a21bd37d2e65abe74b0b2c1efb74e31751335eb523759d945
+AUX openssh-8.0_p1-fix-an-unreachable-integer-overflow-similar-to-the-XMSS-case.patch 2696 BLAKE2B 86bac20233102c5beefb3a79e2da8c5421d47d1c175e9e602f14c127e1bf7ec67e193620461ebd7a835bae556dbf9db904c3f63bbd3283a04dac444f34a3eab8 SHA512 f951cdc664088a124754fe963bb6abc659264183a3c773d61243bb12ca87f7554422d9acabb86c6390fe0e088fee60cc3129ad85e336ebf84f5c126d61d1fa3f
+AUX openssh-8.0_p1-fix-integer-overflow-in-XMSS-private-key-parsing.patch 506 BLAKE2B d4e88cc9553c6e2708447edd3ceeeea4f6c967893f34cad6c5fc980ee46895b64b58c5b8d271b7363e7144d34e05fd1e9519e01a9bb05d7c2cc5a9613b2b096c SHA512 cae5a9f5c46a2c70be4284bc050b69dab347181397a9e34c0c2ee5a470992070a2b8359ade42ce6840b5ff6311d3b0026bf6d548e944662c481a74456737a095
+AUX openssh-8.0_p1-fix-putty-tests.patch 1760 BLAKE2B a1127e8f2275c1e23c956b5041dbc84dbdb2cd6b788fc69bfc1f6b030afe86a827483602ce76577b4101ee2e790b1cfa8c1d2db09da59b89fe7df8083bf4695f SHA512 f544d818bdde628131f1819bf2ffb4007802ee5bf12c5cd5bd398efe0f0f430ed6b3efa7969cb2c4fa49a2bbd773d8fa09f4c927cf998a564b7611443437c310
 AUX openssh-8.0_p1-hpn-X509-glue.patch 3814 BLAKE2B 9a0071d13bb602f9b0660dd74d0ae59611a0d8b8c13fab7def2ea840d1ea42bb4c0999ef44e86db2e8246c6e803797a70f9b18016da491598991052854659c03 SHA512 a986c012aa58a4764d3c4c4a5bf5d1e69edb156adf18d7e9ccae0508879da8b3e92a884d6dcfa80ec5b02d41e7784d8eb500128925ae5cee0ca948cf6bf50ba2
 AUX openssh-8.0_p1-hpn-glue.patch 7029 BLAKE2B cf6fb2c59b768aecf846f0d037ae6d48f750e742f93cdd00a62caf04dfafd993e05921f5d227014e9437d3cdfff4e1b9baa832997904bf398ba06e8f874f7ceb SHA512 63eb0b12763ab53946a9f6b9db44c428d9da8b781a6e1d3f5c4b0edfca85d986cf932461205cee84f9a9db7725c9e05eb1d366b357c787a95c561bdc6514d3d7
 AUX openssh-8.0_p1-hpn-version.patch 590 BLAKE2B 1ff20ab17e7e1a20f7a96ded56ff7c059fd509d7773d9abaeac83743102385d9713284c630dc932d40672a9bfc8a894b57c6b073e93a7b024de7490ea54a589c SHA512 37250881f17a44e4a4b0ac164d06961e0731528847d5cbbb263e3f9a286a192c8dae92250b85db3f2e1f280a464c7b3bfc8a7c9e85552375c013e16a6fcf28ed
 AUX openssh-8.0_p1-tests.patch 1493 BLAKE2B 2e28d9f27d6d9f7e1716cf5f85bbb92af96faf8842e0047d79262a36f5273cd9252bfc576a22e4fc5523942eb7dea80d968045fea317e523d430373c59160ed0 SHA512 1f191076d3199b33e4cfa66e901d086dba32d7ee620c6dfa3bdaa7c9cba8e98d36b7f27d2f2dca7eb8d2549da37dd4b3638e392d8dbd9c36cb4a9ba09a45043f
+AUX openssh-8.1_p1-GSSAPI-dns.patch 11639 BLAKE2B 2bc9e618c0acbf6b85496a33055894471235d01f20b76c9b75302dce58c7d6033984c8471789d2f8095d6231f5f271a4eb2f6099936b1631ec261464bc7a3ada SHA512 722a769da482876f0629e110109f02065e47848ff79395e9e64de39ae066d8c5a207f849c59d95b72e70b874f4bedf4e52a2f7ad1752d9c84b99ccdbfa19c73d
+AUX openssh-8.1_p1-hpn-glue.patch 7830 BLAKE2B 81c239f57d252b3a9bb1c7aed56ac67196ad11a316163db0cf6d4c75d73db1cbae038707ec788c5101f40ebf455257fa2cd1b9d7facab1081b5b856317543dd7 SHA512 2cf4e5da60e30932619c6915295b1659f53db3e784e87fcbbd25b8d167df8e29a1712235413bb2d485956494111aa682d086f9b5a36c3f55a286d40599df8b8c
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
 AUX sshd.confd 396 BLAKE2B 2fc146e83512d729e120cfe331441e8fe27eba804906cc0c463b938ddaf052e7392efbcda6699467afde22652c599e7d55b0ce18a344137263cd78647fea255f SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81
@@ -54,14 +60,15 @@ DIST openssh-7.9p1-sctp-1.2.patch.xz 7360 BLAKE2B 60e209371ecac24d0b60e48459d4d4
 DIST openssh-7.9p1.tar.gz 1565384 BLAKE2B de15795e03d33d4f9fe4792f6b14500123230b6c00c1e5bd7207bb6d6bf6df0b2e057c1b1de0fee709f58dd159203fdd69fe1473118a6baedebaa0c1c4c55b59 SHA512 0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e
 DIST openssh-7_8_P1-hpn-AES-CTR-14.16.diff 29231 BLAKE2B e25877c5e22f674e6db5a0bc107e5daa2509fe762fb14ce7bb2ce9a115e8177a93340c1d19247b6c2c854b7e1f9ae9af9fd932e5fa9c0a6b2ba438cd11a42991 SHA512 1867fb94c29a51294a71a3ec6a299757565a7cda5696118b0b346ed9c78f2c81bb1b888cff5e3418776b2fa277a8f070c5eb9327bb005453e2ffd72d35cdafa7
 DIST openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff 43356 BLAKE2B 776fa140d64a16c339b46a7c773258d2f4fe44e48b16abccad1a8757a51cb6362722fc5f42c39159af12849f5c88cf574de64815085c97157e16653f18d4909b SHA512 53f2752b7aa02719c8dfe0fe0ef16e874101ba2ba87924aa1122cd445ece218ca09c22abaa3377307f25d459579bc28d3854e2402c71b794db65d58cdd1ebc08
-DIST openssh-8.0p1+x509-12.0.diff.gz 623765 BLAKE2B b1c0d533a58c55b0f8451ce5aa8ee9b462afdc1eee44018f30962d3427c73b12a57c2c88bc8656c09c2b39a2ac72755539eeb29e7060ced5d3e8470647f88c0a SHA512 5f678fd303e39df7a2fb23af682c5a02b33f7fdcafe6171b9db2067098a2048677c415c3bee75225eb9fbaf308cfac7f37b0865951cdb6dda0577908499a8295
-DIST openssh-8.0p1+x509-12.1.diff.gz 680389 BLAKE2B b1e353c496dd6dbd104c32bc5e9a3f055673a7876944d39c80f185cdb589d09b8d509754f04f2e051ceef2b39a3d810ba00b8894a4b67c7a6a0170a4ed0518a5 SHA512 831988d636a19e89a881616e07e38bc6ca44e90443b2bbf290fab3f120877e2eef60f21ad6e0c64098d07e09379f9f73f0ce2e5df975aa1bd43944582f8b8b3e
+DIST openssh-8.0p1+x509-12.1-gentoo.diff.gz 680853 BLAKE2B b24ee61d6328bf2de8384d6ecbfc5ae0be4719a3c7a2d714be3a144d327bba5038e7e36ffcc313af2a8a94960ce1f56387654d2d21920af51826af61957aa4cc SHA512 178728139473b277fe50a03f37be50b3f8e539cea8f5937ddfe710082944e799d845cdb5994f585c13564c4a89b80ccf75e87753102aebacdb4c590f0b8a1482
 DIST openssh-8.0p1-sctp-1.2.patch.xz 7348 BLAKE2B bc3d3815f1ef5dbab605b93182a00c2fec258f49d56684defb6564d2b60886429c615a7ab076cc071a590f9df0908b1862ceb0961b7e6f6d1090237fec9035d3 SHA512 2f9f774286db75d0240e6fb01655a8a193fb2a5dc4596ad68ed22d64f97c9c46dad61a06478f2e972fd37cbad4d9aca5829bb91097cc56638601ff94a972b24f
 DIST openssh-8.0p1.tar.gz 1597697 BLAKE2B 5ba79872eabb3b3964d95a8cdd690bfe0323f018d7f944d4e1acb52576c9f6d7a1ddac15e88dc42eac6ecbfabfad1c228e303a2262588769e307c38107a4cd54 SHA512 e280fa2d56f550efd37c5d2477670326261aa8b94d991f9eb17aad90e0c6c9c939efa90fe87d33260d0f709485cb05c379f0fd1bd44fc0d5190298b6398c9982
+DIST openssh-8.1p1-sctp-1.2.patch.xz 7672 BLAKE2B f1aa0713fcb114d8774bd8d524d106401a9d7c2c73a05fbde200ccbdd2562b3636ddd2d0bc3eae9f04b4d7c729c3dafd814ae8c530a76c4a0190fae71d1edcd2 SHA512 2bffab0bbae5a4c1875e0cc229bfd83d8565bd831309158cd489d8b877556c69b936243888a181bd9ff302e19f2c174156781574294d260b6384c464d003d566
+DIST openssh-8.1p1.tar.gz 1625894 BLAKE2B d525be921a6f49420a58df5ac434d43a0c85e0f6bf8428ecebf04117c50f473185933e6e4485e506ac614f71887a513b9962d7b47969ba785da8e3a38f767322 SHA512 b987ea4ffd4ab0c94110723860273b06ed8ffb4d21cbd99ca144a4722dc55f4bf86f6253d500386b6bee7af50f066e2aa2dd095d50746509a10e11221d39d925
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
-EBUILD openssh-7.5_p1-r4.ebuild 11161 BLAKE2B e6276f34a75fbce06ebefa246786db15aff3bd9a59c77c41d96576b6aeb77c5e6fa17aceb573d4d1f0518aa703d298eb292d0d157fb843a702cbede1f42c0296 SHA512 446414c8961458b812b768d18afe46d60ef4dd54111d95b99654cfb3dfef592812b30527fdda352a595bba815e0ffea4a813e3291bcc96bacb368267ff837bdd
-EBUILD openssh-7.7_p1-r9.ebuild 15943 BLAKE2B 459a0f5920b3d5b4da2835e7f3c9f1edd185e48c509e5150a1306dbca3c2f17d0d9d3f41166c4263dd60c0218c11b278a4eaa6f53ae1429710fc749994f70d11 SHA512 3aa9018173cc53de22b1e4693daf4ca2716cd0bc0066f797b6b66926481aaabb3e82942beb305a95523ba64dc9ff95f54232c7538c1d30834f38d88dd94f18a2
-EBUILD openssh-7.9_p1-r4.ebuild 16314 BLAKE2B 4b78ac7c56c7aa5ab0225b07cc8d4f4739408221372064d17bd095dd440af3a9541713ab55de5bdb2347a373b9e267c0e3f38bb992f4ea3da893ff8a808970e0 SHA512 2f9ab98645c6d2ab67ee2e715719cdb868d02e8df19de85bc2556dfa62c26f946125a9fcdbbbdd34a596961272655947d6c6657dc1b477b646d4e42e8ad931af
-EBUILD openssh-8.0_p1-r2.ebuild 16221 BLAKE2B 57e648434d52495a68a444a1493e63f906afac08e06dbffff35ab6aa3a41e00b27ea27c975576934d2067ad77183795bf0c2c48e3e7d7951537d1f276005d445 SHA512 a4d21a237fb93b168f3f884923e23e4fb215f8725b076723cccefa1354dc98af11a8f8ed2448d93daa23b3c411b7ebb00c2c9013139be9c1444dd952812472b2
-EBUILD openssh-8.0_p1.ebuild 16146 BLAKE2B 613b780cdde9d39e9f1f67267c773dded920c511c6e8d1241c92c72d9957b39e870517c868d17c72db2ae68bfc2b2d64ba85b777331082d4011057ca87cdb59e SHA512 9358116310155833391140a586d4c375292a9eb68fe40bf7453e9ee547c74bbcb750e360fd43c7c585a222cb053804a413023c0dcc06ab824df964826476853e
+EBUILD openssh-7.5_p1-r4.ebuild 11137 BLAKE2B 371ae94d3f12874e8ee17416cd2c1b81059b4db2cef6cad7453aa85c2c192ebac644c3907d85d42df7729044a8cebb90ef19e35036a402be404a0841333eb653 SHA512 6655b250cbec41c4432b79a4699b15d73f246820d5f0f3c9fdfe5053388be3b0be7a26ec800055ad0824c92cb91bb1a5c9a939d15ff58af07164b9fce230a415
+EBUILD openssh-7.7_p1-r9.ebuild 15919 BLAKE2B be6c6ac296d5332805d9a90c72a23598d17ca02212f2309bbb9dbff5c0374a6ef1c7d346fdd365afc0b0b853c5744c98f2db0d66347313a173aad4942abefc23 SHA512 36357ad30be27388decd08db6ae580984363b4c98c53cb634e5164b2924887cac4d19ea941f686b2290f8ff93db8c4f506fb2f76b24a1790364677ef851f6ce3
+EBUILD openssh-7.9_p1-r4.ebuild 16293 BLAKE2B 1f96b90873bed0b45da2ba26c3b1b9fb170598e6f6bc3090b8edfc7274185291f7e351a0e945e1a04ccb4e2c8fde18ba50f7bf7cd145a98721092a7608991875 SHA512 ee4fc5f36febc96c188d30d2d46b6d14c3d80178c2801802160ffbbce2d019ba6e26f26ae41e752748dc6999e676a4b2dae9e27ab7a42500c3c386f578bc24e7
+EBUILD openssh-8.0_p1-r4.ebuild 16661 BLAKE2B 7b58c80723df0c0c8c7b2a0724b6cb7549211cd618b54bba53e769af0f29c4c887e454a29e06a9e95b30ccc23156e9cfbfc63801df3a224126c296ac43d1f277 SHA512 3d5fe15f2ae2dda9c9b42d153a4fb9efcd553a79b0c136c51f8ee5770679334580ecc062aba8c01119fe4795669b76284f1a051d58797284e0de1c0e1f296c7e
+EBUILD openssh-8.1_p1.ebuild 16352 BLAKE2B 2452ba7f2ee139860e648885d6abdecbfaa2fd829090c5176334280663376c3a732dc3458fc6c1645bf9668107172a75a0dc53659dae169913b348db64877b0f SHA512 b29c5431724f708722bd5b901b77a0390a607817ed52bf38f0558e99be53c29e93eb1d91124667ae8a7b0de25d85a28c9c3d5b7d35a1329f9c39791168f95575
 MISC metadata.xml 2291 BLAKE2B 9e12fbae3c37a48c3b04876a7247bf38c33d6cc5be210b382e35e45c9318b3c3e7c91a0ef32a9fda96ac7a68a00f9d703aacfc1c1f23e59511ea97d159527488 SHA512 8605c7aa2e4594a04006b3abfac3fad359e3e44182be53116e25159b7419d4429176617c10b50354d0d10c2be26af550e9a2b6e4c7085906558a569dddf5c8f3
diff --git a/net-misc/openssh/files/openssh-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch b/net-misc/openssh/files/openssh-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
new file mode 100644
index 000000000000..fe3be2409e2a
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
@@ -0,0 +1,31 @@
+From 3ef92a657444f172b61f92d5da66d94fa8265602 Mon Sep 17 00:00:00 2001
+From: Lonnie Abelbeck <lonnie@abelbeck.com>
+Date: Tue, 1 Oct 2019 09:05:09 -0500
+Subject: [PATCH] Deny (non-fatal) shmget/shmat/shmdt in preauth privsep child.
+
+New wait_random_seeded() function on OpenSSL 1.1.1d uses shmget, shmat, and shmdt
+in the preauth codepath, deny (non-fatal) in seccomp_filter sandbox.
+---
+ sandbox-seccomp-filter.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
+index 840c5232b..39dc289e3 100644
+--- a/sandbox-seccomp-filter.c
++++ b/sandbox-seccomp-filter.c
+@@ -168,6 +168,15 @@ static const struct sock_filter preauth_insns[] = {
+ #ifdef __NR_stat64
+ 	SC_DENY(__NR_stat64, EACCES),
+ #endif
++#ifdef __NR_shmget
++	SC_DENY(__NR_shmget, EACCES),
++#endif
++#ifdef __NR_shmat
++	SC_DENY(__NR_shmat, EACCES),
++#endif
++#ifdef __NR_shmdt
++	SC_DENY(__NR_shmdt, EACCES),
++#endif
+ 
+ 	/* Syscalls to permit */
+ #ifdef __NR_brk
diff --git a/net-misc/openssh/files/openssh-8.0_p1-fix-an-unreachable-integer-overflow-similar-to-the-XMSS-case.patch b/net-misc/openssh/files/openssh-8.0_p1-fix-an-unreachable-integer-overflow-similar-to-the-XMSS-case.patch
new file mode 100644
index 000000000000..bffc591ef667
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.0_p1-fix-an-unreachable-integer-overflow-similar-to-the-XMSS-case.patch
@@ -0,0 +1,76 @@
+https://github.com/openssh/openssh-portable/commit/29e0ecd9b4eb3b9f305e2240351f0c59cad9ef81
+
+--- a/sshkey.c
++++ b/sshkey.c
+@@ -3209,6 +3209,10 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
+ 		if ((r = sshkey_froms(buf, &k)) != 0 ||
+ 		    (r = sshbuf_get_bignum2(buf, &dsa_priv_key)) != 0)
+ 			goto out;
++		if (k->type != type) {
++			r = SSH_ERR_INVALID_FORMAT;
++			goto out;
++		}
+ 		if (!DSA_set0_key(k->dsa, NULL, dsa_priv_key)) {
+ 			r = SSH_ERR_LIBCRYPTO_ERROR;
+ 			goto out;
+@@ -3252,6 +3256,11 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
+ 		if ((r = sshkey_froms(buf, &k)) != 0 ||
+ 		    (r = sshbuf_get_bignum2(buf, &exponent)) != 0)
+ 			goto out;
++		if (k->type != type ||
++		    k->ecdsa_nid != sshkey_ecdsa_nid_from_name(tname)) {
++			r = SSH_ERR_INVALID_FORMAT;
++			goto out;
++		}
+ 		if (EC_KEY_set_private_key(k->ecdsa, exponent) != 1) {
+ 			r = SSH_ERR_LIBCRYPTO_ERROR;
+ 			goto out;
+@@ -3296,6 +3305,10 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
+ 		    (r = sshbuf_get_bignum2(buf, &rsa_p)) != 0 ||
+ 		    (r = sshbuf_get_bignum2(buf, &rsa_q)) != 0)
+ 			goto out;
++		if (k->type != type) {
++			r = SSH_ERR_INVALID_FORMAT;
++			goto out;
++		}
+ 		if (!RSA_set0_key(k->rsa, NULL, NULL, rsa_d)) {
+ 			r = SSH_ERR_LIBCRYPTO_ERROR;
+ 			goto out;
+@@ -3333,13 +3346,17 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
+ 		    (r = sshbuf_get_string(buf, &ed25519_pk, &pklen)) != 0 ||
+ 		    (r = sshbuf_get_string(buf, &ed25519_sk, &sklen)) != 0)
+ 			goto out;
++		if (k->type != type) {
++			r = SSH_ERR_INVALID_FORMAT;
++			goto out;
++		}
+ 		if (pklen != ED25519_PK_SZ || sklen != ED25519_SK_SZ) {
+ 			r = SSH_ERR_INVALID_FORMAT;
+ 			goto out;
+ 		}
+ 		k->ed25519_pk = ed25519_pk;
+ 		k->ed25519_sk = ed25519_sk;
+-		ed25519_pk = ed25519_sk = NULL;
++		ed25519_pk = ed25519_sk = NULL; /* transferred */
+ 		break;
+ #ifdef WITH_XMSS
+ 	case KEY_XMSS:
+@@ -3370,7 +3387,7 @@ sshkey_private_deserialize(struct sshbuf *buf, struct sshkey **kp)
+ 		    (r = sshbuf_get_string(buf, &xmss_pk, &pklen)) != 0 ||
+ 		    (r = sshbuf_get_string(buf, &xmss_sk, &sklen)) != 0)
+ 			goto out;
+-		if (strcmp(xmss_name, k->xmss_name)) {
++		if (k->type != type || strcmp(xmss_name, k->xmss_name) != 0) {
+ 			r = SSH_ERR_INVALID_FORMAT;
+ 			goto out;
+ 		}
+@@ -3877,7 +3894,8 @@ sshkey_parse_private2(struct sshbuf *blob, int type, const char *passphrase,
+ 	}
+ 
+ 	/* check that an appropriate amount of auth data is present */
+-	if (sshbuf_len(decoded) < encrypted_len + authlen) {
++	if (sshbuf_len(decoded) < authlen ||
++	    sshbuf_len(decoded) - authlen < encrypted_len) {
+ 		r = SSH_ERR_INVALID_FORMAT;
+ 		goto out;
+ 	}
diff --git a/net-misc/openssh/files/openssh-8.0_p1-fix-integer-overflow-in-XMSS-private-key-parsing.patch b/net-misc/openssh/files/openssh-8.0_p1-fix-integer-overflow-in-XMSS-private-key-parsing.patch
new file mode 100644
index 000000000000..ba0bd02371d4
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.0_p1-fix-integer-overflow-in-XMSS-private-key-parsing.patch
@@ -0,0 +1,14 @@
+https://github.com/openssh/openssh-portable/commit/a546b17bbaeb12beac4c9aeed56f74a42b18a93a
+
+--- a/sshkey-xmss.c
++++ b/sshkey-xmss.c
+@@ -977,7 +977,8 @@ sshkey_xmss_decrypt_state(const struct sshkey *k, struct sshbuf *encoded,
+ 		goto out;
+ 	}
+ 	/* check that an appropriate amount of auth data is present */
+-	if (sshbuf_len(encoded) < encrypted_len + authlen) {
++	if (sshbuf_len(encoded) < authlen ||
++	    sshbuf_len(encoded) - authlen < encrypted_len) {
+ 		r = SSH_ERR_INVALID_FORMAT;
+ 		goto out;
+ 	}
diff --git a/net-misc/openssh/files/openssh-8.0_p1-fix-putty-tests.patch b/net-misc/openssh/files/openssh-8.0_p1-fix-putty-tests.patch
new file mode 100644
index 000000000000..4310aa123fc8
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.0_p1-fix-putty-tests.patch
@@ -0,0 +1,57 @@
+Make sure that host keys are already accepted before
+running tests.
+
+https://bugs.gentoo.org/493866
+
+--- a/regress/putty-ciphers.sh
++++ b/regress/putty-ciphers.sh
+@@ -10,11 +10,17 @@ fi
+ 
+ for c in aes 3des aes128-ctr aes192-ctr aes256-ctr ; do
+ 	verbose "$tid: cipher $c"
++	rm -f ${COPY}
+ 	cp ${OBJ}/.putty/sessions/localhost_proxy \
+ 	    ${OBJ}/.putty/sessions/cipher_$c
+ 	echo "Cipher=$c" >> ${OBJ}/.putty/sessions/cipher_$c
+ 
+-	rm -f ${COPY}
++	env HOME=$PWD echo "y" | ${PLINK} -load cipher_$c \
++	    -i ${OBJ}/putty.rsa2 "exit"
++	if [ $? -ne 0 ]; then
++		fail "failed to pre-cache host key"
++	fi
++
+ 	env HOME=$PWD ${PLINK} -load cipher_$c -batch -i ${OBJ}/putty.rsa2 \
+ 	    cat ${DATA} > ${COPY}
+ 	if [ $? -ne 0 ]; then
+--- a/regress/putty-kex.sh
++++ b/regress/putty-kex.sh
+@@ -14,6 +14,12 @@ for k in dh-gex-sha1 dh-group1-sha1 dh-group14-sha1 ; do
+ 	    ${OBJ}/.putty/sessions/kex_$k
+ 	echo "KEX=$k" >> ${OBJ}/.putty/sessions/kex_$k
+ 
++	env HOME=$PWD echo "y" | ${PLINK} -load kex_$k \
++	    -i ${OBJ}/putty.rsa2 "exit"
++	if [ $? -ne 0 ]; then
++		fail "failed to pre-cache host key"
++	fi
++
+ 	env HOME=$PWD ${PLINK} -load kex_$k -batch -i ${OBJ}/putty.rsa2 true
+ 	if [ $? -ne 0 ]; then
+ 		fail "KEX $k failed"
+--- a/regress/putty-transfer.sh
++++ b/regress/putty-transfer.sh
+@@ -14,6 +14,13 @@ for c in 0 1 ; do
+ 	cp ${OBJ}/.putty/sessions/localhost_proxy \
+ 	    ${OBJ}/.putty/sessions/compression_$c
+ 	echo "Compression=$c" >> ${OBJ}/.putty/sessions/kex_$k
++
++	env HOME=$PWD echo "y" | ${PLINK} -load compression_$c \
++	    -i ${OBJ}/putty.rsa2 "exit"
++	if [ $? -ne 0 ]; then
++		fail "failed to pre-cache host key"
++	fi
++
+ 	env HOME=$PWD ${PLINK} -load compression_$c -batch \
+ 	    -i ${OBJ}/putty.rsa2 cat ${DATA} > ${COPY}
+ 	if [ $? -ne 0 ]; then
diff --git a/net-misc/openssh/files/openssh-8.1_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-8.1_p1-GSSAPI-dns.patch
new file mode 100644
index 000000000000..6aba6f266945
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.1_p1-GSSAPI-dns.patch
@@ -0,0 +1,359 @@
+diff --git a/auth.c b/auth.c
+index ca450f4e..2994a4e4 100644
+--- a/auth.c
++++ b/auth.c
+@@ -723,120 +723,6 @@ fakepw(void)
+ 	return (&fake);
+ }
+ 
+-/*
+- * Returns the remote DNS hostname as a string. The returned string must not
+- * be freed. NB. this will usually trigger a DNS query the first time it is
+- * called.
+- * This function does additional checks on the hostname to mitigate some
+- * attacks on legacy rhosts-style authentication.
+- * XXX is RhostsRSAAuthentication vulnerable to these?
+- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
+- */
+-
+-static char *
+-remote_hostname(struct ssh *ssh)
+-{
+-	struct sockaddr_storage from;
+-	socklen_t fromlen;
+-	struct addrinfo hints, *ai, *aitop;
+-	char name[NI_MAXHOST], ntop2[NI_MAXHOST];
+-	const char *ntop = ssh_remote_ipaddr(ssh);
+-
+-	/* Get IP address of client. */
+-	fromlen = sizeof(from);
+-	memset(&from, 0, sizeof(from));
+-	if (getpeername(ssh_packet_get_connection_in(ssh),
+-	    (struct sockaddr *)&from, &fromlen) == -1) {
+-		debug("getpeername failed: %.100s", strerror(errno));
+-		return strdup(ntop);
+-	}
+-
+-	ipv64_normalise_mapped(&from, &fromlen);
+-	if (from.ss_family == AF_INET6)
+-		fromlen = sizeof(struct sockaddr_in6);
+-
+-	debug3("Trying to reverse map address %.100s.", ntop);
+-	/* Map the IP address to a host name. */
+-	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
+-	    NULL, 0, NI_NAMEREQD) != 0) {
+-		/* Host name not found.  Use ip address. */
+-		return strdup(ntop);
+-	}
+-
+-	/*
+-	 * if reverse lookup result looks like a numeric hostname,
+-	 * someone is trying to trick us by PTR record like following:
+-	 *	1.1.1.10.in-addr.arpa.	IN PTR	2.3.4.5
+-	 */
+-	memset(&hints, 0, sizeof(hints));
+-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
+-	hints.ai_flags = AI_NUMERICHOST;
+-	if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
+-		logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
+-		    name, ntop);
+-		freeaddrinfo(ai);
+-		return strdup(ntop);
+-	}
+-
+-	/* Names are stored in lowercase. */
+-	lowercase(name);
+-
+-	/*
+-	 * Map it back to an IP address and check that the given
+-	 * address actually is an address of this host.  This is
+-	 * necessary because anyone with access to a name server can
+-	 * define arbitrary names for an IP address. Mapping from
+-	 * name to IP address can be trusted better (but can still be
+-	 * fooled if the intruder has access to the name server of
+-	 * the domain).
+-	 */
+-	memset(&hints, 0, sizeof(hints));
+-	hints.ai_family = from.ss_family;
+-	hints.ai_socktype = SOCK_STREAM;
+-	if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
+-		logit("reverse mapping checking getaddrinfo for %.700s "
+-		    "[%s] failed.", name, ntop);
+-		return strdup(ntop);
+-	}
+-	/* Look for the address from the list of addresses. */
+-	for (ai = aitop; ai; ai = ai->ai_next) {
+-		if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
+-		    sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
+-		    (strcmp(ntop, ntop2) == 0))
+-				break;
+-	}
+-	freeaddrinfo(aitop);
+-	/* If we reached the end of the list, the address was not there. */
+-	if (ai == NULL) {
+-		/* Address not found for the host name. */
+-		logit("Address %.100s maps to %.600s, but this does not "
+-		    "map back to the address.", ntop, name);
+-		return strdup(ntop);
+-	}
+-	return strdup(name);
+-}
+-
+-/*
+- * Return the canonical name of the host in the other side of the current
+- * connection.  The host name is cached, so it is efficient to call this
+- * several times.
+- */
+-
+-const char *
+-auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
+-{
+-	static char *dnsname;
+-
+-	if (!use_dns)
+-		return ssh_remote_ipaddr(ssh);
+-	else if (dnsname != NULL)
+-		return dnsname;
+-	else {
+-		dnsname = remote_hostname(ssh);
+-		return dnsname;
+-	}
+-}
+-
+ /*
+  * Runs command in a subprocess with a minimal environment.
+  * Returns pid on success, 0 on failure.
+diff --git a/canohost.c b/canohost.c
+index abea9c6e..4f4524d2 100644
+--- a/canohost.c
++++ b/canohost.c
+@@ -202,3 +202,117 @@ get_local_port(int sock)
+ {
+ 	return get_sock_port(sock, 1);
+ }
++
++/*
++ * Returns the remote DNS hostname as a string. The returned string must not
++ * be freed. NB. this will usually trigger a DNS query the first time it is
++ * called.
++ * This function does additional checks on the hostname to mitigate some
++ * attacks on legacy rhosts-style authentication.
++ * XXX is RhostsRSAAuthentication vulnerable to these?
++ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
++ */
++
++static char *
++remote_hostname(struct ssh *ssh)
++{
++	struct sockaddr_storage from;
++	socklen_t fromlen;
++	struct addrinfo hints, *ai, *aitop;
++	char name[NI_MAXHOST], ntop2[NI_MAXHOST];
++	const char *ntop = ssh_remote_ipaddr(ssh);
++
++	/* Get IP address of client. */
++	fromlen = sizeof(from);
++	memset(&from, 0, sizeof(from));
++	if (getpeername(ssh_packet_get_connection_in(ssh),
++	    (struct sockaddr *)&from, &fromlen) < 0) {
++		debug("getpeername failed: %.100s", strerror(errno));
++		return strdup(ntop);
++	}
++
++	ipv64_normalise_mapped(&from, &fromlen);
++	if (from.ss_family == AF_INET6)
++		fromlen = sizeof(struct sockaddr_in6);
++
++	debug3("Trying to reverse map address %.100s.", ntop);
++	/* Map the IP address to a host name. */
++	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
++	    NULL, 0, NI_NAMEREQD) != 0) {
++		/* Host name not found.  Use ip address. */
++		return strdup(ntop);
++	}
++
++	/*
++	 * if reverse lookup result looks like a numeric hostname,
++	 * someone is trying to trick us by PTR record like following:
++	 *	1.1.1.10.in-addr.arpa.	IN PTR	2.3.4.5
++	 */
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
++	hints.ai_flags = AI_NUMERICHOST;
++	if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
++		logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
++		    name, ntop);
++		freeaddrinfo(ai);
++		return strdup(ntop);
++	}
++
++	/* Names are stored in lowercase. */
++	lowercase(name);
++
++	/*
++	 * Map it back to an IP address and check that the given
++	 * address actually is an address of this host.  This is
++	 * necessary because anyone with access to a name server can
++	 * define arbitrary names for an IP address. Mapping from
++	 * name to IP address can be trusted better (but can still be
++	 * fooled if the intruder has access to the name server of
++	 * the domain).
++	 */
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_family = from.ss_family;
++	hints.ai_socktype = SOCK_STREAM;
++	if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
++		logit("reverse mapping checking getaddrinfo for %.700s "
++		    "[%s] failed.", name, ntop);
++		return strdup(ntop);
++	}
++	/* Look for the address from the list of addresses. */
++	for (ai = aitop; ai; ai = ai->ai_next) {
++		if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
++		    sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
++		    (strcmp(ntop, ntop2) == 0))
++				break;
++	}
++	freeaddrinfo(aitop);
++	/* If we reached the end of the list, the address was not there. */
++	if (ai == NULL) {
++		/* Address not found for the host name. */
++		logit("Address %.100s maps to %.600s, but this does not "
++		    "map back to the address.", ntop, name);
++		return strdup(ntop);
++	}
++	return strdup(name);
++}
++
++/*
++ * Return the canonical name of the host in the other side of the current
++ * connection.  The host name is cached, so it is efficient to call this
++ * several times.
++ */
++
++const char *
++auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
++{
++	static char *dnsname;
++
++	if (!use_dns)
++		return ssh_remote_ipaddr(ssh);
++	else if (dnsname != NULL)
++		return dnsname;
++	else {
++		dnsname = remote_hostname(ssh);
++		return dnsname;
++	}
++}
+diff --git a/readconf.c b/readconf.c
+index f78b4d6f..747287f7 100644
+--- a/readconf.c
++++ b/readconf.c
+@@ -162,6 +162,7 @@ typedef enum {
+ 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
+ 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
+ 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
++	oGssTrustDns,
+ 	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
+ 	oSendEnv, oSetEnv, oControlPath, oControlMaster, oControlPersist,
+ 	oHashKnownHosts,
+@@ -203,9 +204,11 @@ static struct {
+ #if defined(GSSAPI)
+ 	{ "gssapiauthentication", oGssAuthentication },
+ 	{ "gssapidelegatecredentials", oGssDelegateCreds },
++	{ "gssapitrustdns", oGssTrustDns },
+ # else
+ 	{ "gssapiauthentication", oUnsupported },
+ 	{ "gssapidelegatecredentials", oUnsupported },
++	{ "gssapitrustdns", oUnsupported },
+ #endif
+ #ifdef ENABLE_PKCS11
+ 	{ "pkcs11provider", oPKCS11Provider },
+@@ -992,6 +995,10 @@ parse_time:
+ 		intptr = &options->gss_deleg_creds;
+ 		goto parse_flag;
+ 
++	case oGssTrustDns:
++		intptr = &options->gss_trust_dns;
++		goto parse_flag;
++
+ 	case oBatchMode:
+ 		intptr = &options->batch_mode;
+ 		goto parse_flag;
+@@ -1864,6 +1871,7 @@ initialize_options(Options * options)
+ 	options->challenge_response_authentication = -1;
+ 	options->gss_authentication = -1;
+ 	options->gss_deleg_creds = -1;
++	options->gss_trust_dns = -1;
+ 	options->password_authentication = -1;
+ 	options->kbd_interactive_authentication = -1;
+ 	options->kbd_interactive_devices = NULL;
+@@ -2011,6 +2019,8 @@ fill_default_options(Options * options)
+ 		options->gss_authentication = 0;
+ 	if (options->gss_deleg_creds == -1)
+ 		options->gss_deleg_creds = 0;
++	if (options->gss_trust_dns == -1)
++		options->gss_trust_dns = 0;
+ 	if (options->password_authentication == -1)
+ 		options->password_authentication = 1;
+ 	if (options->kbd_interactive_authentication == -1)
+diff --git a/readconf.h b/readconf.h
+index 8e36bf32..c9e4718d 100644
+--- a/readconf.h
++++ b/readconf.h
+@@ -41,6 +41,7 @@ typedef struct {
+ 					/* Try S/Key or TIS, authentication. */
+ 	int     gss_authentication;	/* Try GSS authentication */
+ 	int     gss_deleg_creds;	/* Delegate GSS credentials */
++	int	gss_trust_dns;		/* Trust DNS for GSS canonicalization */
+ 	int     password_authentication;	/* Try password
+ 						 * authentication. */
+ 	int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
+diff --git a/ssh_config.5 b/ssh_config.5
+index 02a87892..95de538b 100644
+--- a/ssh_config.5
++++ b/ssh_config.5
+@@ -762,6 +762,16 @@ The default is
+ Forward (delegate) credentials to the server.
+ The default is
+ .Cm no .
++Note that this option applies to protocol version 2 connections using GSSAPI.
++.It Cm GSSAPITrustDns
++Set to
++.Dq yes to indicate that the DNS is trusted to securely canonicalize
++the name of the host being connected to. If
++.Dq no, the hostname entered on the
++command line will be passed untouched to the GSSAPI library.
++The default is
++.Dq no .
++This option only applies to protocol version 2 connections using GSSAPI.
+ .It Cm HashKnownHosts
+ Indicates that
+ .Xr ssh 1
+diff --git a/sshconnect2.c b/sshconnect2.c
+index 87fa70a4..a6ffdc96 100644
+--- a/sshconnect2.c
++++ b/sshconnect2.c
+@@ -697,6 +697,13 @@ userauth_gssapi(struct ssh *ssh)
+ 	OM_uint32 min;
+ 	int r, ok = 0;
+ 	gss_OID mech = NULL;
++	const char *gss_host;
++
++	if (options.gss_trust_dns) {
++		extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns);
++		gss_host = auth_get_canonical_hostname(ssh, 1);
++	} else
++		gss_host = authctxt->host;
+ 
+ 	/* Try one GSSAPI method at a time, rather than sending them all at
+ 	 * once. */
+@@ -711,7 +718,7 @@ userauth_gssapi(struct ssh *ssh)
+ 		    elements[authctxt->mech_tried];
+ 		/* My DER encoding requires length<128 */
+ 		if (mech->length < 128 && ssh_gssapi_check_mechanism(&gssctxt,
+-		    mech, authctxt->host)) {
++		    mech, gss_host)) {
+ 			ok = 1; /* Mechanism works */
+ 		} else {
+ 			authctxt->mech_tried++;
diff --git a/net-misc/openssh/files/openssh-8.1_p1-hpn-glue.patch b/net-misc/openssh/files/openssh-8.1_p1-hpn-glue.patch
new file mode 100644
index 000000000000..0ad814f95d87
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.1_p1-hpn-glue.patch
@@ -0,0 +1,216 @@
+Only in b: .openssh-7_8_P1-hpn-AES-CTR-14.16.diff.un~
+Only in b: .openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff.un~
+diff -ru a/openssh-7_8_P1-hpn-AES-CTR-14.16.diff b/openssh-7_8_P1-hpn-AES-CTR-14.16.diff
+--- a/openssh-7_8_P1-hpn-AES-CTR-14.16.diff	2019-10-10 13:48:31.513603947 -0700
++++ b/openssh-7_8_P1-hpn-AES-CTR-14.16.diff	2019-10-10 13:50:15.012495676 -0700
+@@ -17,8 +17,8 @@
+  	canohost.o channels.o cipher.o cipher-aes.o cipher-aesctr.o \
+ -	cipher-ctr.o cleanup.o \
+ +	cipher-ctr.o cleanup.o cipher-ctr-mt.o \
+- 	compat.o crc32.o fatal.o hostfile.o \
+- 	log.o match.o moduli.o nchan.o packet.o opacket.o \
++ 	compat.o fatal.o hostfile.o \
++ 	log.o match.o moduli.o nchan.o packet.o \
+  	readpass.o ttymodes.o xmalloc.o addrmatch.o \
+ diff --git a/cipher-ctr-mt.c b/cipher-ctr-mt.c
+ new file mode 100644
+@@ -998,7 +998,7 @@
+ +		 * so we repoint the define to the multithreaded evp. To start the threads we
+ +		 * then force a rekey
+ +		 */
+-+		const void *cc = ssh_packet_get_send_context(active_state);
+++		const void *cc = ssh_packet_get_send_context(ssh);
+ +		
+ +		/* only do this for the ctr cipher. otherwise gcm mode breaks. Don't know why though */
+ +		if (strstr(cipher_ctx_name(cc), "ctr")) {
+@@ -1028,7 +1028,7 @@
+ +		 * so we repoint the define to the multithreaded evp. To start the threads we
+ +		 * then force a rekey
+ +		 */
+-+		const void *cc = ssh_packet_get_send_context(active_state);
+++		const void *cc = ssh_packet_get_send_context(ssh);
+ +		
+ +		/* only rekey if necessary. If we don't do this gcm mode cipher breaks */
+ +		if (strstr(cipher_ctx_name(cc), "ctr")) {
+diff -ru a/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff b/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff
+--- a/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff	2019-10-10 13:47:54.801642144 -0700
++++ b/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff	2019-10-10 15:58:05.085803333 -0700
+@@ -162,24 +162,24 @@
+  }
+  
+ +static int
+-+channel_tcpwinsz(void)
+++channel_tcpwinsz(struct ssh *ssh)
+ +{
+ +	u_int32_t tcpwinsz = 0;
+ +	socklen_t optsz = sizeof(tcpwinsz);
+ +	int ret = -1;
+ +
+ +	/* if we aren't on a socket return 128KB */
+-+	if (!packet_connection_is_on_socket())
+++	if (!ssh_packet_connection_is_on_socket(ssh))
+ +		return 128 * 1024;
+ +
+-+	ret = getsockopt(packet_get_connection_in(),
+++	ret = getsockopt(ssh_packet_get_connection_in(ssh),
+ +			 SOL_SOCKET, SO_RCVBUF, &tcpwinsz, &optsz);
+ +	/* return no more than SSHBUF_SIZE_MAX (currently 256MB) */
+ +	if ((ret == 0) && tcpwinsz > SSHBUF_SIZE_MAX)
+ +		tcpwinsz = SSHBUF_SIZE_MAX;
+ +
+ +	debug2("tcpwinsz: tcp connection %d, Receive window: %d",
+-+	       packet_get_connection_in(), tcpwinsz);
+++	       ssh_packet_get_connection_in(ssh), tcpwinsz);
+ +	return tcpwinsz;
+ +}
+ +
+@@ -191,7 +191,7 @@
+  	    c->local_window < c->local_window_max/2) &&
+  	    c->local_consumed > 0) {
+ +		u_int addition = 0;
+-+		u_int32_t tcpwinsz = channel_tcpwinsz();
+++		u_int32_t tcpwinsz = channel_tcpwinsz(ssh);
+ +		/* adjust max window size if we are in a dynamic environment */
+ +		if (c->dynamic_window && (tcpwinsz > c->local_window_max)) {
+ +			/* grow the window somewhat aggressively to maintain pressure */
+@@ -409,18 +409,10 @@
+ index dcf35e6..da4ced0 100644
+ --- a/packet.c
+ +++ b/packet.c
+-@@ -920,6 +920,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
++@@ -920,6 +920,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
+  	return 0;
+  }
+  
+-+/* this supports the forced rekeying required for the NONE cipher */
+-+int rekey_requested = 0;
+-+void
+-+packet_request_rekeying(void)
+-+{
+-+	rekey_requested = 1;
+-+}
+-+
+ +/* used to determine if pre or post auth when rekeying for aes-ctr
+ + * and none cipher switch */
+ +int
+@@ -434,20 +426,6 @@
+  #define MAX_PACKETS	(1U<<31)
+  static int
+  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+-@@ -946,6 +964,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+- 	if (state->p_send.packets == 0 && state->p_read.packets == 0)
+- 		return 0;
+- 
+-+	/* used to force rekeying when called for by the none
+-+         * cipher switch methods -cjr */
+-+        if (rekey_requested == 1) {
+-+                rekey_requested = 0;
+-+                return 1;
+-+        }
+-+
+- 	/* Time-based rekeying */
+- 	if (state->rekey_interval != 0 &&
+- 	    (int64_t)state->rekey_time + state->rekey_interval <= monotime())
+ diff --git a/packet.h b/packet.h
+ index 170203c..f4d9df2 100644
+ --- a/packet.h
+@@ -476,9 +454,9 @@
+  /* Format of the configuration file:
+  
+ @@ -166,6 +167,8 @@ typedef enum {
+- 	oHashKnownHosts,
+  	oTunnel, oTunnelDevice,
+  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
++ 	oDisableMTAES,
+ +	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
+ +	oNoneEnabled, oNoneSwitch,
+  	oVisualHostKey,
+@@ -615,9 +593,9 @@
+  	int	ip_qos_bulk;		/* IP ToS/DSCP/class for bulk traffic */
+  	SyslogFacility log_facility;	/* Facility for system logging. */
+ @@ -111,7 +115,10 @@ typedef struct {
+- 
+  	int	enable_ssh_keysign;
+  	int64_t rekey_limit;
++ 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
+ +	int     none_switch;    /* Use none cipher */
+ +	int     none_enabled;   /* Allow none to be used */
+  	int	rekey_interval;
+@@ -633,7 +611,7 @@
+  	off_t i, statbytes;
+  	size_t amt, nr;
+  	int fd = -1, haderr, indx;
+--	char *last, *name, buf[2048], encname[PATH_MAX];
++-	char *last, *name, buf[PATH_MAX + 128], encname[PATH_MAX];
+ +	char *last, *name, buf[16384], encname[PATH_MAX];
+  	int len;
+  
+@@ -673,9 +651,9 @@
+  	/* Portable-specific options */
+  	if (options->use_pam == -1)
+ @@ -391,6 +400,43 @@ fill_default_server_options(ServerOptions *options)
+- 	}
+- 	if (options->permit_tun == -1)
+  		options->permit_tun = SSH_TUNMODE_NO;
++ 	if (options->disable_multithreaded == -1)
++ 		options->disable_multithreaded = 0;
+ +	if (options->none_enabled == -1)
+ +		options->none_enabled = 0;
+ +	if (options->hpn_disabled == -1)
+@@ -1092,7 +1070,7 @@
+  	xxx_host = host;
+  	xxx_hostaddr = hostaddr;
+  
+-@@ -412,6 +423,28 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
++@@ -412,6 +423,27 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
+  
+  	if (!authctxt.success)
+  		fatal("Authentication failed.");
+@@ -1108,7 +1086,7 @@
+ +			memcpy(&myproposal, &myproposal_default, sizeof(myproposal));
+ +			myproposal[PROPOSAL_ENC_ALGS_STOC] = "none";
+ +			myproposal[PROPOSAL_ENC_ALGS_CTOS] = "none";
+-+			kex_prop2buf(active_state->kex->my, myproposal);
+++			kex_prop2buf(ssh->kex->my, myproposal);
+ +			packet_request_rekeying();
+ +			fprintf(stderr, "WARNING: ENABLED NONE CIPHER\n");
+ +		} else {
+@@ -1117,23 +1095,13 @@
+ +			fprintf(stderr, "NONE cipher switch disabled when a TTY is allocated\n");
+ +		}
+ +	}
+-+
+- 	debug("Authentication succeeded (%s).", authctxt.method->name);
+- }
+  
++ #ifdef WITH_OPENSSL
++ 	if (options.disable_multithreaded == 0) {
+ diff --git a/sshd.c b/sshd.c
+ index a738c3a..b32dbe0 100644
+ --- a/sshd.c
+ +++ b/sshd.c
+-@@ -373,7 +373,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
+- 	char remote_version[256];	/* Must be at least as big as buf. */
+- 
+- 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
+--	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
+-+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
+- 	    *options.version_addendum == '\0' ? "" : " ",
+- 	    options.version_addendum);
+- 
+ @@ -1037,6 +1037,8 @@ listen_on_addrs(struct listenaddr *la)
+  	int ret, listen_sock;
+  	struct addrinfo *ai;
+@@ -1217,11 +1185,10 @@
+ index f1bbf00..21a70c2 100644
+ --- a/version.h
+ +++ b/version.h
+-@@ -3,4 +3,6 @@
++@@ -3,4 +3,5 @@
+  #define SSH_VERSION	"OpenSSH_7.8"
+  
+  #define SSH_PORTABLE	"p1"
+ -#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_HPN         "-hpn14v16"
+ +#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+ + 
diff --git a/net-misc/openssh/openssh-7.5_p1-r4.ebuild b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
index cbe425c4eeff..4b4ae5463ae3 100644
--- a/net-misc/openssh/openssh-7.5_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r4.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="5"
@@ -25,7 +25,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
 REQUIRED_USE="ldns? ( ssl )
@@ -56,7 +56,7 @@ LIB_DEPEND="
 	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
 RDEPEND="
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )"
 DEPEND="${RDEPEND}
diff --git a/net-misc/openssh/openssh-7.7_p1-r9.ebuild b/net-misc/openssh/openssh-7.7_p1-r9.ebuild
index 0a21486e685f..d949654c69e5 100644
--- a/net-misc/openssh/openssh-7.7_p1-r9.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -26,7 +26,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
 RESTRICT="!test? ( test )"
@@ -57,7 +57,7 @@ LIB_DEPEND="
 	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
 RDEPEND="
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
diff --git a/net-misc/openssh/openssh-7.9_p1-r4.ebuild b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
index de21ccc51cbe..6f95e59ac4ba 100644
--- a/net-misc/openssh/openssh-7.9_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
@@ -33,7 +33,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509"
 RESTRICT="!test? ( test )"
@@ -69,7 +69,7 @@ LIB_DEPEND="
 	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
 RDEPEND="
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
diff --git a/net-misc/openssh/openssh-8.0_p1.ebuild b/net-misc/openssh/openssh-8.0_p1-r4.ebuild
index c468c3f26f80..5393ca2b81d5 100644
--- a/net-misc/openssh/openssh-8.0_p1.ebuild
+++ b/net-misc/openssh/openssh-8.0_p1-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit user flag-o-matic multilib autotools pam systemd
+inherit user eapi7-ver flag-o-matic multilib autotools pam systemd
 
 # Make it more portable between straight releases
 # and _p? releases.
@@ -18,7 +18,7 @@ HPN_PATCHES=(
 )
 
 SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="12.0" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+X509_VER="12.1-gentoo" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
 
 PATCH_SET="openssh-7.9p1-patches-1.0"
 
@@ -27,14 +27,14 @@ HOMEPAGE="https://www.openssh.com/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )}
 	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
-	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	${X509_PATCH:+X509? ( https://dev.gentoo.org/~whissi/dist/openssh/${X509_PATCH} )}
 	"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509"
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509 xmss"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="ldns? ( ssl )
 	pie? ( !static )
@@ -68,7 +68,7 @@ LIB_DEPEND="
 	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
 RDEPEND="
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
@@ -119,20 +119,25 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-8.0_p1-GSSAPI-dns.patch #165444 integrated into gsskex
 	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
 	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
-	eapply "${FILESDIR}"/${PN}-8.0_p1-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-integer-overflow-in-XMSS-private-key-parsing.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-an-unreachable-integer-overflow-similar-to-the-XMSS-case.patch
+	use X509 || eapply "${FILESDIR}"/${PN}-8.0_p1-tests.patch
 
 	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
 
 	local PATCHSET_VERSION_MACROS=()
 
 	if use X509 ; then
-		pushd "${WORKDIR}" || die
-		eapply "${FILESDIR}/${P}-X509-glue-${X509_VER}.patch"
-		eapply "${FILESDIR}/${P}-X509-dont-make-piddir-${X509_VER}.patch"
-		popd || die
+		# X509 12.1-gentoo patch contains the changes from below
+		#pushd "${WORKDIR}" &>/dev/null || die
+		#eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch"
+		#eapply "${FILESDIR}/${P}-X509-dont-make-piddir-"${X509_VER}".patch"
+		#popd &>/dev/null || die
 
 		eapply "${WORKDIR}"/${X509_PATCH%.*}
-		eapply "${FILESDIR}"/${P}-X509-${X509_VER}-tests.patch
+		eapply "${FILESDIR}"/${P}-X509-$(ver_cut 1-2 ${X509_VER})-tests.patch
 
 		# We need to patch package version or any X.509 sshd will reject our ssh client
 		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
@@ -168,7 +173,7 @@ src_prepare() {
 		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
 		mkdir "${hpn_patchdir}"
 		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}"
-		pushd "${hpn_patchdir}"
+		pushd "${hpn_patchdir}" &>/dev/null || die
 		eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-glue.patch
 		if use X509; then
 			einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set"
@@ -177,7 +182,7 @@ src_prepare() {
 			eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-X509-glue.patch
 		fi
 		use sctp && eapply "${FILESDIR}"/${PN}-7.9_p1-hpn-sctp-glue.patch
-		popd
+		popd &>/dev/null || die
 
 		eapply "${hpn_patchdir}"
 
@@ -267,6 +272,7 @@ src_configure() {
 
 	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
 	use static && append-ldflags -static
+	use xmss && append-cflags -DWITH_XMSS
 
 	local myconf=(
 		--with-ldflags="${LDFLAGS}"
diff --git a/net-misc/openssh/openssh-8.0_p1-r2.ebuild b/net-misc/openssh/openssh-8.1_p1.ebuild
index c0a1abeb3597..b75fb6f1a88f 100644
--- a/net-misc/openssh/openssh-8.0_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.1_p1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit user eapi7-ver flag-o-matic multilib autotools pam systemd
+inherit user flag-o-matic multilib autotools pam systemd
 
 # Make it more portable between straight releases
 # and _p? releases.
@@ -18,21 +18,21 @@ HPN_PATCHES=(
 )
 
 SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="12.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+#X509_VER="12.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
 
 PATCH_SET="openssh-7.9p1-patches-1.0"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="https://www.openssh.com/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )}
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/${SCTP_PATCH} )}
 	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
 	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
 	"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509 xmss"
 RESTRICT="!test? ( test )"
@@ -68,7 +68,7 @@ LIB_DEPEND="
 	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
 RDEPEND="
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
@@ -101,9 +101,9 @@ pkg_pretend() {
 	fi
 
 	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT%/}"/etc/hosts.{allow,deny} ; then
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
 		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+		ewarn "you're trying to use it.  Update your ${EROOT}/etc/hosts.{allow,deny} please."
 	fi
 }
 
@@ -116,20 +116,21 @@ src_prepare() {
 	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
 
 	eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
-	eapply "${FILESDIR}"/${PN}-8.0_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-8.1_p1-GSSAPI-dns.patch #165444 integrated into gsskex
 	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
 	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
-	use X509 || eapply "${FILESDIR}"/${PN}-8.0_p1-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch
 
 	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
 
 	local PATCHSET_VERSION_MACROS=()
 
 	if use X509 ; then
-		pushd "${WORKDIR}" || die
+		pushd "${WORKDIR}" &>/dev/null || die
 		eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch"
 		eapply "${FILESDIR}/${P}-X509-dont-make-piddir-"${X509_VER}".patch"
-		popd || die
+		popd &>/dev/null || die
 
 		eapply "${WORKDIR}"/${X509_PATCH%.*}
 		eapply "${FILESDIR}"/${P}-X509-$(ver_cut 1-2 ${X509_VER})-tests.patch
@@ -168,8 +169,8 @@ src_prepare() {
 		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
 		mkdir "${hpn_patchdir}"
 		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}"
-		pushd "${hpn_patchdir}"
-		eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-glue.patch
+		pushd "${hpn_patchdir}" &>/dev/null || die
+		eapply "${FILESDIR}"/${PN}-8.1_p1-hpn-glue.patch
 		if use X509; then
 			einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set"
 			# X509 and AES-CTR-MT don't get along, let's just drop it
@@ -177,7 +178,7 @@ src_prepare() {
 			eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-X509-glue.patch
 		fi
 		use sctp && eapply "${FILESDIR}"/${PN}-7.9_p1-hpn-sctp-glue.patch
-		popd
+		popd &>/dev/null || die
 
 		eapply "${hpn_patchdir}"
 
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 4fb0e1692354..01301140e5d0 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,8 +1,10 @@
 AUX putty-0.71-no-gssapi.patch 10370 BLAKE2B 785e3710f175f01cde6c236b719d7e7b410036758980ad41e7703dcb169b0ea4518682ba8eb196800ebe04ac68c1ffa12febe407b447f1abf1469bfea226e655 SHA512 c2bd2480605e9a52fc429463eee53c5850cc2e81fbc486f059aa759aee22ba5f18e3e27d052c3b549aa0e6f2ce2a8ef8b4172d8e4d5bb4cde5ec74ef7fd9ddf5
 DIST putty-0.71.tar.gz 2423752 BLAKE2B fa4202d76d3b96e016a62c805db3835a6f61b05e7f63900919ffcd5bbec5159ef0e06b643398ed33aef5cd9ecf04eb9a981828683de7d565b88abbd4552237f6 SHA512 f8791210bd5925b26d51b13f0558eea15dbac40808051165b236d6436226f5c2b0aa7d69288ed9e2bddc1066455678cfd0af73ef6b715a136c42f3b6f754ac07
 DIST putty-0.72.tar.gz 2449516 BLAKE2B 8d5b2e812bb7bb0bfabf210b2bd6f9e0858cb80b9f7edc241a1426f4a520896c9acc214fb732cb169c88914c89461968afdf73a7b9392e85113e6653902f3221 SHA512 a963985e55dcd589c08ef51085808a6364629edd8ce6708ebdf516e0339a41b7f186f91d7d7f26b1fec03d60767f365246e6fa06e9ef042898355c2f90f355dd
+DIST putty-0.73.tar.gz 2459115 BLAKE2B 594ad1ebd66bdb27ac8d297525c0c5d846f8a15f7c9c5e750da8a57b08367b5c94a9d1439d6a42862e7e7b7a7d7c0dea285e9197fa45651d9eb12757b57e82a7 SHA512 4ada4b8c6d68be44afede2676bc661fedfd1ea0b574b8232ad9aaa6f3a48baa9f4f0ded2955b3f2677a14db85a508f53c965cb00fcd7538a1ed9844031f0c5e5
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.71-r2.ebuild 1708 BLAKE2B c7521ebc45c975bb5d739697c507aa5ffbcbdc84f1afbbc63dd86f4f6fb6e9489ef919439d6730c2eeef769874416b28f1dbdf20e6fadd2f2ab41f8865b94702 SHA512 82082ad7b56f404719468fe34aa6caf3774f323252d00bf87b437703e38061b33877519f01771641a954465f1ae0b1e23c1824bf3271bf40175b05e989a19525
 EBUILD putty-0.72.ebuild 1589 BLAKE2B eee910bf44a2c60ecfab2b7ca453d3c9dc67685341873efb28c25c80f19a21c0873625b82a85db42fb9937929fce8cd39e2d92c7b41080eb8589719f2c09cde8 SHA512 68d0b707f2af6c3efec730dd65f675d2eaaf95cfdbf9f7b1480e13b051acd326fade352ddfb31fcaad602b9af56136bcded04984348860a3ed5363aacb739925
+EBUILD putty-0.73.ebuild 1585 BLAKE2B 20bd2592ebcf6ab65e7a448be49b192f48e054db1d5c0190c54fab6e48e1696f05bc0958efed82b1fbcbccd26fb8ea48a3934fe63352f6092a44a211d917aa63 SHA512 268405b23671d841e82db78bdfd9fcd70e5d06a9f29b2a41588adc8f7ccebb9e21e9693ffdfc31d81c7b83de6420fd785a48a13295b0eea09439124f9cb7c70c
 EBUILD putty-9999.ebuild 1693 BLAKE2B 7f8e29cb9624afb649639374e42269c5e72dcb9eb329e1c40d0eac20bb7ca4a0d8bd903a2d71412eb81733167745fabe27f0699627f5f125a128fe1ade7107fa SHA512 16c7df06d0309f1d3c3df3119dcb72c842451e188203a67c2fcf7409e781f2faa9dcd76cfb31b40526b3d3a00ed8e6842d84727d264cac0374ac6aa036e9e505
 MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6
diff --git a/net-misc/putty/putty-0.73.ebuild b/net-misc/putty/putty-0.73.ebuild
new file mode 100644
index 000000000000..5d214b3163c0
--- /dev/null
+++ b/net-misc/putty/putty-0.73.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop toolchain-funcs xdg-utils
+
+DESCRIPTION="A Free Telnet/SSH Client"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+IUSE="doc +gtk gtk2 ipv6 gssapi"
+SRC_URI="
+	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
+	https://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
+"
+
+RDEPEND="
+	!net-misc/pssh
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/libX11
+		x11-libs/pango
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3[X] )
+	)
+	gssapi? ( virtual/krb5 )
+"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|-Werror||g' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	cd "${S}"/unix || die
+	econf \
+		$(use_with gssapi) \
+		$(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
+}
+
+src_compile() {
+	emake -C "${S}"/doc
+	emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
+}
+
+src_install() {
+	dodoc doc/puttydoc.txt
+
+	if use doc; then
+		docinto html
+		dodoc doc/*.html
+	fi
+
+	cd "${S}"/unix || die
+	default
+
+	if use gtk ; then
+		for i in 16 22 24 32 48 64 128 256; do
+			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
+		done
+
+		# install desktop file provided by Gustav Schaffter in #49577
+		make_desktop_entry ${PN} PuTTY ${PN} Network
+	fi
+}
+
+pkg_postinst() {
+	use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && xdg_icon_cache_update
+}
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 8cf4444eadf4..6759d16b97d0 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,20 +1,15 @@
 AUX rabbitmq-script-wrapper 1855 BLAKE2B ee6fe4ab1688edfdf4933754d192a851c2e585628a82954c9cabe2548a33dc5742e111a92335443332b705214bc908d7d1b15d89408f0ef585be92c6c522c736 SHA512 bd124a7291b146623b3491c9be2ba4f82420a54ef668fb26128dc153daf1ed2ba7555a1afc9181c68a30543aa397a0c042efd027c8836a5bbf76d1e8e1b036ab
 AUX rabbitmq-server.init-r3 638 BLAKE2B 56c9116898f480b08fcd8fbfa37af5d1e9d4f9d482aa91e63f2bb5eaeb2e0700566dfddd27e0463fb2162292a09ceb1c96fa16b9fda5389e39491214d2952d25 SHA512 fa6c7293c11190b1f59eef23c4a3de00666e32451f695f1a7f686f01bb92055a0c2afae565d9106e852e6b77a71661c364eacb36e2d39dfb8d175d8f0eab98b9
+AUX rabbitmq-server.init-r4 656 BLAKE2B 0ec16b0b5f7c17d4e12e08382ac12f1ec0f8c94b63b05bc2066b66ee46afc1e246f76833f75b6a9c56572ccd348a50bbab0416bac07f29784ceb84c7333fc907 SHA512 1d16de0cb21527b8ac4db54a2d4f4f9ef07d8fbd744370f0ee311a2cd77da63e17dc160796bfb99a4d95f4743fcd1ff9819a5a3d14e18cfe38b337fdd4b7b04e
 AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457
 DIST rabbitmq-server-3.6.14.tar.xz 1508216 BLAKE2B 1ca3f933e91ce204cc90df7df619742e6d42e211b6350c629015a15a0ea6cdad05ad1e0139db5b2f1f353f314d1709ba468112a4059c6894ef9fb454fd616cf2 SHA512 22874b81fcebfd954e5ee8f4701bd8743bbc9559c1a1c09f8de03e16039153aa6e6b0bea71067770913493299e57da6b3928ff0ade4ee9ffb5ea48a30a154d9f
 DIST rabbitmq-server-3.6.9.tar.xz 1422316 BLAKE2B 08f88cf3b592c2fecf3e2a9c7f9a4a2997f7bea6f14a2d72cb42ad8d3254b2bcd32b0605c7687eeae8e1c39a6d3ad1776f89e84292d508903b956ec05f6cd858 SHA512 a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662
-DIST rabbitmq-server-3.7.10.tar.xz 2569968 BLAKE2B 90a0162c9e573f1b99526c7a6cdec38061c3e6f355377b51b920a62b0d61c5f13a21b69d627b49c4c6702e517dfba4c856664e9741d9ad2d21171a3b46770799 SHA512 092df82ac00397fc90ecd69c712985f055ec25fd0ba427fce9330df75f5fe6d788aabc9e25ccbf63c8c3cbe111816a226fb63479a16d8530a53b23ab23b2598e
-DIST rabbitmq-server-3.7.11.tar.xz 2593632 BLAKE2B 4455b47a36ed4b642f0c30a34d018f76ade7153ec8eb872728f0b6baf6d431dbac71b3e27e2661924155950836be80faee23d4fd663d0f852740c143ac24658c SHA512 a54034ebc919be0c6f58832ea5d47f8e3964e30ca9185c59bf882c3dc17d1df5b6e1ab0460f75e8cf0cc325504cc3a674f7cb44a5d7613e16a5ad8b721a286a4
 DIST rabbitmq-server-3.7.13.tar.xz 2595904 BLAKE2B 3dce5af3b63d84e1ab8ee02ba3f55560087e5f72532e693b483e8083e25d540406d696873b291dd715c45aae1e15945e76fcc33bdd77503c6517860b45f7e7b9 SHA512 33cc3682214782152e4e1270d1011e94df79b454abf6fcf9d56b73be1f8cf42ce0a4a559f243b4721ae25b10897c756960c655909bee2b427395d0f0b63a2fb9
 DIST rabbitmq-server-3.7.17.tar.xz 2808260 BLAKE2B 45a77ebb81d1199219b3638f03698d147b5dd43160647f829163ee35607a3d7ada281b7156f555614b1eec7295e32d241410b8a691bccab2f40f1c548d2e0b51 SHA512 33af52a3f95854e7b3e067308181e37c7b9715b24e0ceb690d606f3e69a8be9cab258a18b68681350c31a01e4fa530825473bf652c7ac10894d36af4fa573a38
-DIST rabbitmq-server-3.7.3.tar.xz 7382708 BLAKE2B 66d4c2fcb80ba5a851fb5d2bee91d41b04a05e70e74ac2b3adae8aebcaaa01de7ca47772c38deb4e9c25c19f67c2bbd6c4fb3b71480d73986540c60ab6dac02c SHA512 337edddceb66c44b5cc3cec710918385306d9db97ae340752bc39a1be39229a58b3bb1c96763a2ce441a6d46135f2aac8cec09fc33591d0e14e7571c9507d79b
-DIST rabbitmq-server-3.7.9.tar.xz 2551456 BLAKE2B b64037481254f39300fecf53c1f8eda69df3fdc92bbacc6f6edc9d89e167e4cdd0708482b0daf680366986a28f4a3562d4af7dcf427604acc79145d24ca41bd2 SHA512 4a9fd452ad878f20c3a269d2dc0fa63ef7dcf99d2ee1ca46ff693df8d92ae0ef5a05453a6aaaeb00db643b2209770b15216fdff109f27d1e531e363a99bd4a2a
+DIST rabbitmq-server-3.8.0.tar.xz 3262332 BLAKE2B f72fc1e2b186ebd3e17fc17ab3d2ebe5186d59de3e6cf269b51977a2cec78b33ec9b95cf44b111b20f3f4d5227dc3829aebdac3044ad3a9e3f3e8e4a9cb7b740 SHA512 9d73cb81190ed3e473f18c21513a3e57fa53a0d3a38fa96f09c3282558421997b8d177195163053e845980f52297bf4e2716017de15abc2660daefdacea584e8
 EBUILD rabbitmq-server-3.6.14.ebuild 2866 BLAKE2B 0750fb1c6968b6c97471a940ab2010c44cf4cb831ae06effdec756df77e72fd1a9a0557de56e89daa0ae65097ee6a39ca3f779f9ad3c7b94175a6800ec6cdc06 SHA512 c5804a6938ae7d9f429e9bcfc0325ae276e3deecf9329a850111f099c1206587954a47daee906848dfa0569caa220fe9afd3e43b7823b4db65d353ffd7cd427a
 EBUILD rabbitmq-server-3.6.9.ebuild 2861 BLAKE2B efc0b3acca1f57d4116a18475c923502febd6ecb4a95030be05bdf94bd726c2cb90a8a95a7a47cc390da3c6c66f84af1eec14279f235b6547d247d2a8437e4c0 SHA512 ebabcbe717134e17d16a1623ff05a7700d7825de626c25c4b2ad8510f0ac42ede1a37ddbfd367c198d6cb4b550f30294c64fd7cbebe64bf6ac0244c9de4dee50
-EBUILD rabbitmq-server-3.7.10.ebuild 3005 BLAKE2B c6a3f5d0161ff227f8b76e130b690010df3710b2952795b55a19e3081a0e293113fd534f10bf598c93ae517631e9c5971fdfc79586d0536f0d6e5656f1a2c241 SHA512 f61267f217f0271f05519aefff7f04992f93532818282cb65c1d2e0a7132cd51a44ae56aa085931ddd620304268cd5cf99381cfb4e0279dad13b521bcbb1c583
-EBUILD rabbitmq-server-3.7.11.ebuild 3005 BLAKE2B 7a297aaac0f5a47a8f6dc18b07751d04c83155409dd89e8a749c5b07b4df8d45c30e13a598fb5ec9fd106577b976bf4b6619e05e4b8eddb32a11e6ed81c2c0b4 SHA512 c1c67b2d603d69735d0ac8cac4431f909dc014642875c498a4aa9cd833ba1e0b840aa9c9cad58a31ca7c7179c2f89f21d705e0d08eff4f787db74393fa30d05f
 EBUILD rabbitmq-server-3.7.13.ebuild 3105 BLAKE2B 61175864b1b7eab693fdfcf16ff1178c87d37e966a44ed29e08d01242d16af099ef492eeb527e8181b06ceb2222736c354df34cb510dbcce6a929eba63696b05 SHA512 5896fa3e7a2865e42a3f5c485c55504ead488115334e220b489db9dec55d2537d2e12266d8507f6b73ef76b1dadab6ba56a86a092c590e0627478207cbc7f6bf
 EBUILD rabbitmq-server-3.7.17.ebuild 3107 BLAKE2B 9addb1aa27f75285878de8689555b079fc9a603c93b22226aa06cb84d9b9185ef5ed26fe8740a5cd776526c68b96792bf338494b5dabd5f80d1b749359bc58e8 SHA512 5f1da605aca09ab102cf3343b96c6db5a2b9cbc2b54f5ffedd547db1ee581b297b3955e668d497e7dc6842e56753be6e96af6b09c368e4d8df8e0d6e852ea64c
-EBUILD rabbitmq-server-3.7.3-r1.ebuild 2978 BLAKE2B 6f240a3325c446277a3779721dde982daa2528697118290c48d2ab108369fb781c538b19029662e6de632ace9d00d9c2f0df4e9686064af4174617efe71c27e9 SHA512 63f9528982875d523b2ef4f9c5a064b647c0edba6385ffe27372989cc962bae4167c60ab647eea338bebc7e4fc52b9063d477c5db5c83ad757e8432dc883aee2
-EBUILD rabbitmq-server-3.7.9.ebuild 2998 BLAKE2B 7c77aa3c5bde60e8ba67529591a9883337b30691a08d8256e168b2dc3bb95eb7d87645db57f065f47ffbc34036c519250a5261cf5f7db1fd9b8667f0fd8bd640 SHA512 9d3b4f8c4256433dc69ea6f3ff0968640a810cad780cb8bb971f76615248374f20b5eac129e0ddafde845a97430f7a7676243d5f6fb43879560e56edfe14a53a
+EBUILD rabbitmq-server-3.8.0.ebuild 3002 BLAKE2B 88d17f6b0dc0ce19bdfa10ce5e8ad835e305a7432e369382b11bcbba51f6d598321ce5e3097899d26f237f6460855e5574a5c21d1d87328d4ff464d7fb6869f2 SHA512 99e9c605b42906748bc667989b0960397fc9a2910cd549f167912cc9b3721ceeab65ec4e9857e5505c0f660385f4370c7bbcaf81f244492bb7d162d96dc8c8e7
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r4 b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r4
new file mode 100644
index 000000000000..9e7dd9d5d6fd
--- /dev/null
+++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r4
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net epmd
+	use dns
+}
+
+start() {
+	ebegin "Starting RabbitMQ"
+	/sbin/start-stop-daemon \
+		--start --background \
+		--pidfile /var/run/rabbitmq.pid --make-pidfile \
+		--stdout /var/log/rabbitmq/startup.log \
+		--stderr /var/log/rabbitmq/startup.err \
+		--exec /usr/sbin/rabbitmq-server
+	/usr/sbin/rabbitmqctl -q wait /var/run/rabbitmq.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping RabbitMQ"
+	/usr/sbin/rabbitmqctl stop /var/run/rabbitmq.pid >> /var/log/rabbitmq/shutdown.log 2>> /var/log/rabbitmq/shutdown.err
+	eend $?
+}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild
deleted file mode 100644
index a6aca3854916..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 systemd user
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="https://www.rabbitmq.com/"
-SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/erlang-19.3[ssl,smp(+)]"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	>=dev-lang/elixir-1.6.6
-	<dev-lang/elixir-1.7.0
-	dev-libs/libxslt
-	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
-"
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-	python-any-r1_pkg_setup
-}
-
-src_compile() {
-	emake all docs dist
-}
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
-
-	einfo "Setting correct RABBITMQ_HOME in scripts"
-	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
-		-i deps/rabbit/scripts/rabbitmq-env || die
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins
-
-	einfo "Installing server scripts to /usr/sbin"
-	rm -v deps/rabbit/scripts/*.bat
-	exeinto /usr/libexec/rabbitmq
-	for script in deps/rabbit/scripts/*; do
-		doexe ${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
-	done
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	dodoc deps/rabbit/docs/*.example
-	dodoc deps/rabbit/README.md
-	doman deps/rabbit/docs/*.5
-	doman deps/rabbit/docs/*.8
-
-	# create the directory where our log file will go.
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/log/rabbitmq /etc/rabbitmq
-
-	# create the mnesia directory
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/lib/rabbitmq{,/mnesia}
-}
-
-pkg_preinst() {
-	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
-		elog "IMPORTANT UPGRADE NOTICE:"
-		elog
-		elog "RabbitMQ is now running as an unprivileged user instead of root."
-		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
-		elog "Please run the following commands as root:"
-		elog
-		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
-		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
-		elog
-	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
-		elog "IMPORTANT UPGRADE NOTICE:"
-		elog
-		elog "Please read release notes before upgrading:"
-		elog
-		elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
-	fi
-	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
-		elog
-		elog "This release changes the behaviour of the default guest user:"
-		elog
-		elog "https://www.rabbitmq.com/access-control.html"
-	fi
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild
deleted file mode 100644
index edaf30210192..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 systemd user
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="https://www.rabbitmq.com/"
-SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/erlang-20.3[ssl,smp(+)]"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	>=dev-lang/elixir-1.6.6
-	<dev-lang/elixir-1.7.0
-	dev-libs/libxslt
-	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
-"
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-	python-any-r1_pkg_setup
-}
-
-src_compile() {
-	emake all docs dist
-}
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
-
-	einfo "Setting correct RABBITMQ_HOME in scripts"
-	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
-		-i deps/rabbit/scripts/rabbitmq-env || die
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins
-
-	einfo "Installing server scripts to /usr/sbin"
-	rm -v deps/rabbit/scripts/*.bat
-	exeinto /usr/libexec/rabbitmq
-	for script in deps/rabbit/scripts/*; do
-		doexe ${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
-	done
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	dodoc deps/rabbit/docs/*.example
-	dodoc deps/rabbit/README.md
-	doman deps/rabbit/docs/*.5
-	doman deps/rabbit/docs/*.8
-
-	# create the directory where our log file will go.
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/log/rabbitmq /etc/rabbitmq
-
-	# create the mnesia directory
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/lib/rabbitmq{,/mnesia}
-}
-
-pkg_preinst() {
-	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
-		elog "IMPORTANT UPGRADE NOTICE:"
-		elog
-		elog "RabbitMQ is now running as an unprivileged user instead of root."
-		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
-		elog "Please run the following commands as root:"
-		elog
-		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
-		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
-		elog
-	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
-		elog "IMPORTANT UPGRADE NOTICE:"
-		elog
-		elog "Please read release notes before upgrading:"
-		elog
-		elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
-	fi
-	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
-		elog
-		elog "This release changes the behaviour of the default guest user:"
-		elog
-		elog "https://www.rabbitmq.com/access-control.html"
-	fi
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.3-r1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.3-r1.ebuild
deleted file mode 100644
index 7ea2f7df0ef7..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.3-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 systemd user
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="https://www.rabbitmq.com/"
-SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=dev-lang/erlang-19.3[ssl]"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	<dev-lang/elixir-1.6.0
-	dev-libs/libxslt
-	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
-"
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-	python-any-r1_pkg_setup
-}
-
-src_compile() {
-	emake all docs dist
-}
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
-
-	einfo "Setting correct RABBITMQ_HOME in scripts"
-	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
-		-i deps/rabbit/scripts/rabbitmq-env || die
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include deps/rabbit/priv plugins
-
-	einfo "Installing server scripts to /usr/sbin"
-	rm -v deps/rabbit/scripts/*.bat
-	exeinto /usr/libexec/rabbitmq
-	for script in deps/rabbit/scripts/*; do
-		doexe ${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper $(basename $script)
-	done
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	dodoc deps/rabbit/docs/*.example
-	dodoc deps/rabbit/README.md
-	doman deps/rabbit/docs/*.5
-	doman deps/rabbit/docs/*.8
-
-	# create the directory where our log file will go.
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/log/rabbitmq /etc/rabbitmq
-
-	# create the mnesia directory
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	dodir /var/lib/rabbitmq{,/mnesia}
-}
-
-pkg_preinst() {
-	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
-		elog "IMPORTANT UPGRADE NOTICE:"
-		elog
-		elog "RabbitMQ is now running as an unprivileged user instead of root."
-		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
-		elog "Please run the following commands as root:"
-		elog
-		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
-		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
-		elog
-	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
-		elog "IMPORTANT UPGRADE NOTICE:"
-		elog
-		elog "Please read release notes before upgrading:"
-		elog
-		elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
-	fi
-	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
-		elog
-		elog "This release changes the behaviour of the default guest user:"
-		elog
-		elog "https://www.rabbitmq.com/access-control.html"
-	fi
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.9.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.0.ebuild
index 29de58a41aa1..89c3839ec0da 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.9.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.0.ebuild
@@ -17,14 +17,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="test"
 
-RDEPEND=">=dev-lang/erlang-19.3[ssl]"
+RDEPEND=">=dev-lang/erlang-21.3[ssl]
+	<dev-lang/erlang-23.0[ssl]"
 DEPEND="${RDEPEND}
 	app-arch/zip
 	app-arch/unzip
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
 	>=dev-lang/elixir-1.6.6
-	<dev-lang/elixir-1.7.0
 	dev-libs/libxslt
 	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
 "
@@ -60,7 +60,7 @@ src_install() {
 	done
 
 	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
+	newinitd "${FILESDIR}"/rabbitmq-server.init-r4 rabbitmq
 	systemd_dounit "${FILESDIR}/rabbitmq.service"
 
 	# install documentation
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index a5dc6d84a8de..7285a33440d1 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -8,8 +8,8 @@ AUX radvd.tmpfilesd 30 BLAKE2B a1c207296debe31a4fb25c7ec52202b679e41fb9b73658d27
 DIST radvd-2.14.tar.gz 211461 BLAKE2B 0acdd23d1606d7dc5df3a8c8e2d3be7f6178bde866b9463b2a645a78b4ed710e8c60bcd32eff9456b80a993c3544a71721199298fccb184b357bc2ac51651f55 SHA512 8fdfd776f998b82e9dcbb29a13e44b1ba060f2e4b03bae0167549fb58731f16e80e980f9636e0d7614270b8e6457779ac044b433c5c5d26d9fb72ea9e2d3cb02
 DIST radvd-2.17.tar.gz 214937 BLAKE2B 1eec22e09607c0396f9539aef203b76d5beca18d1fdf5aa0ff202dcb2ff0e36ed8af74fc7900eb7b16012bfb0672f9660f17c88c222ac0269947d3cf4a270db3 SHA512 117a42c2c007d730b956cf999ac281f50a1a9b57c9428fe0f860cb211ac234ec62f59fead244a80191aaa15ef4ce96fb7dba9bd1a3cb6c3b29f1b6897d7a6132
 DIST radvd-2.18.tar.gz 224183 BLAKE2B 4bacf9e17b78286a032ca5e6b6424aa8742d2e42b3a00a67e5d8beeda139a70a574e69c0d8fde2c2754b6e9c9e92a97dfb6a2a67b4b3ce91740aa8edee994c5e SHA512 b66068ec40d4f228f679946039d7c696bf611eb55b88cb37bbea5e748cf7cdda796dc0b12e0f1e54b26a6af21750c8714ea18a152ef932741c0f0a6a7a9de59a
-EBUILD radvd-2.14.ebuild 1763 BLAKE2B ffe1ecff2d2fa70d7bfb9e8dd20fc7e15a017d8ce363ed3fe36780ee803676aa6ab3d650ba8d48bd8f5fd1f2207a86486916edb831d16c723511bc9d907d71ba SHA512 7f7e28f4d4b84e088fb60a50c26ce2a42eb3ddbcfce094f035d779a01aa235b27e24ed590646ab186f2faec854e6d13f5b2c32e0e580d76dfc6d08ba5e4f9550
-EBUILD radvd-2.17-r1.ebuild 1575 BLAKE2B 327a7eb2dc9a567145a14f556e4e4bb7d35e0184b83d7336d963f3754c96cfc4d1bd8db85b074c6ccf547cf4331b2260ace20a05ee085eea895fd5088cd16e2d SHA512 d4df95d439844c4be3dd7df39609c762acb27a8f3b6db1dba081c1961e03289cf0fdb795bf1d10f20053bac9e587995944a70efa5c9d6e53ab0e7cc88c1d86b8
-EBUILD radvd-2.17-r2.ebuild 1628 BLAKE2B caaaedd5d8d132165e080f1ad9888c629a2cc44f7a75a0213cbd1ffa32fd50725ded8366eeb5ecf08ce2d3d5a8873730dca7f7aff7931e3aa2ea67dbaab4ef9c SHA512 7b1ca29b1537e18c66dcd7e6bf764df08e350b9006e589de9e5388684d12ff7532e1d4b86c36d1981da8760b766916ae33a010a1052c52d51010a4e3dd3a6206
-EBUILD radvd-2.18.ebuild 1584 BLAKE2B d6e8e4e912e5ae7575a7c4cadce775d33e36b16ca6dd5c3609bbe245499f6df9c92e268bd9520030e84df729323143b1707e0c60cb0a00ab8a2c088f2eafbca6 SHA512 a18b943a3f8fb84b49a99f17bcedde0f54c045d99f925c38cf4a12d84dbf2625e64f3b290447255ffb73ee240274c681a86853cfef753bafa94e7b91e12caa6a
+EBUILD radvd-2.14.ebuild 1753 BLAKE2B 5fa3609a1d5defd9a0f5991d22ca7c38c5a9381181d448598d0f50e47a173e096f7d8a77e570e92a1f62b94be497729c299e9061038655757df253f9062d469e SHA512 b8ae5d96255b4a8ac0739ab94a086feffeb05cb555b6d431d8466b0e4d2150f4741d6b3e32b82f5137a04173579411e3abfd04171b6df707d4a552b4add62c7a
+EBUILD radvd-2.17-r1.ebuild 1565 BLAKE2B 0c0e880d7c32ca601e93b1d1e029b49dcea6b6c84825e7625697a0b9e0bd5cb935b384d551ce6a1c96c5fd0934eff0321e627b8f7e6dfee56b087edcaec49fbf SHA512 0cdb79b19e2a3a79f0247b0d863bbbc2dff5689134793e75e50a81cf8d0f87a5c5e98a0ad585a7292df544f92197a7876bfc41ec5f476b498597bda10ad69252
+EBUILD radvd-2.17-r2.ebuild 1618 BLAKE2B 182440a2884d176cc5bd32c00f8c6f75c8cf0f271959e159cba2567fff78bebde548b092a86a87e72864bd0aa9f3f284815a1f8d181ba487c6fd1b1ed18203ed SHA512 c14f3014f888d6af822bf684584580f96bdc81385a64950a48ad37a4a459ccf6a2f96382b61dba8abf9149e903a5e9bad7f223a9adfea85f16c6eecfb93caa54
+EBUILD radvd-2.18.ebuild 1574 BLAKE2B aa313976d6d69c2b6c13b04fc78643661862a8a5a092a5c993fee0951f34c55ab422b006f58e0a621b5f8af8332b259b474e42e139ec8e046ded4e67bd95fd54 SHA512 d5e15cd5024fcff8bc742cf79aa02ef35291f95354f170227d427d2209df1a2d5782b29ee21886229b6536822853830a2b64eb909b06f26c5e0cf80492e94c51
 MISC metadata.xml 357 BLAKE2B 7a671f4f2fc8439f4fb80a70b5e436e9002464600ce9ad0c9aacdc22d7c3d090e26ac30431d39107ab1081f6238528b91e67d3e1e59a7ba64a85e92c584bc4d8 SHA512 d81daf7b68978a8012b5c5de47074fa35bfcd457f99ef873f0ac46409022d93c41eac5bd7492f7af1b9f7b1bae94da7eb8e6fa537414b6371ca77ba13b70e1c1
diff --git a/net-misc/radvd/radvd-2.14.ebuild b/net-misc/radvd/radvd-2.14.ebuild
index 2dfcb3af875c..64c4a4c91346 100644
--- a/net-misc/radvd/radvd-2.14.ebuild
+++ b/net-misc/radvd/radvd-2.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 hppa ppc sparc x86"
 IUSE="kernel_FreeBSD selinux test"
 
 CDEPEND="dev-libs/libdaemon"
diff --git a/net-misc/radvd/radvd-2.17-r1.ebuild b/net-misc/radvd/radvd-2.17-r1.ebuild
index 1eef3b439b22..79f1e7f13898 100644
--- a/net-misc/radvd/radvd-2.17-r1.ebuild
+++ b/net-misc/radvd/radvd-2.17-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 hppa ppc sparc x86"
 IUSE="kernel_FreeBSD selinux test"
 
 CDEPEND="dev-libs/libdaemon"
diff --git a/net-misc/radvd/radvd-2.17-r2.ebuild b/net-misc/radvd/radvd-2.17-r2.ebuild
index aeaf39fdd2b1..7715570cbd92 100644
--- a/net-misc/radvd/radvd-2.17-r2.ebuild
+++ b/net-misc/radvd/radvd-2.17-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86"
 IUSE="kernel_FreeBSD selinux test"
 
 CDEPEND="dev-libs/libdaemon"
diff --git a/net-misc/radvd/radvd-2.18.ebuild b/net-misc/radvd/radvd-2.18.ebuild
index 7503085d0a1c..e9d632e6d082 100644
--- a/net-misc/radvd/radvd-2.18.ebuild
+++ b/net-misc/radvd/radvd-2.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm arm64 hppa ppc sparc x86"
 IUSE="kernel_FreeBSD selinux test"
 
 CDEPEND="dev-libs/libdaemon"
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
index 0c9429d06892..7e0b041c35ef 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -1,6 +1,5 @@
 AUX rdate-confd 509 BLAKE2B 92826ed23b867063c8cf1145e7a2f62fe6a904593eca1add05971f06773ae992f08e58bb4f5367660e93937baf7bf3d0fe35a508bdaea44bca104c0871cf6ba8 SHA512 1ebc27949cf5c68828e00cacb20644b6c6b0e833c23b4f9e31144f0e47c10daa06b82909198227cdc7018939cbae09f2fe53de69aa84c8b9a8ecb0ab9eaf1f8f
 AUX rdate-initd-1.4-r3 525 BLAKE2B 8533f2b589aa860d88a7cdf18931b2a5800a1d82a78db576dfb12189f4b3391535bff5896ef75d6b3ef7373e1ad86c86a82f7422f4c404af8b9b3e414aaad59c SHA512 8563dedff5b2188d5176a882e36d4c8cdab4709ca40e86eb9c76e30f91c3eb78d1da8f971d2c2f4189ef801413e173367d2a8a2b9b37608ef6a84a0e73e39157
 DIST rdate-1.4.tar.gz 11500 BLAKE2B 705324648f30685135d3ba3936b05a82bc6a027d3d1c407950cb7631858f6d9dba34f97f065482988caf4a68addc3ba122fe475cfd1684c526f5224113657ac3 SHA512 ea9d62af3aa58fb7bb2bdce257cc23758f103ac056e4d6a8b44be0e41c44dff49e78bdb03789e3bf2957e74997c2f1c0376fdc659b4f39d89e43ef139a51f996
-EBUILD rdate-1.4-r3.ebuild 760 BLAKE2B 8f4aec10b8a05fbd9255c7cc3a469aa2965229e959f63e7065d848f0580cee31dcdbaae6dee266d9e30118f147b2f6993102d68400978edd96c666734fc6c427 SHA512 02ef90d5ec1551a38be61aa5154f96e5ee507fd07ec6003c151022b2e9749031ecd727164511bc410ddfdf42d609c4359477cf96e7797cc58f1cb8b96afcfb7e
 EBUILD rdate-1.4-r4.ebuild 810 BLAKE2B 135987f057155983a85edacbe1abc6bcb0adad69da01040f7b55063327af7d8f3f7338f131a581e2bbcec066f98a14838360732d4853c35e806331bf5b18b317 SHA512 c3264347504d19461b7c653659791188fba0da4ef22c38d9249941aaa1442c94deb32e291a4f0d7ada90716886ea8f487ad03cb03c0944f4a1f93b6be058396b
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/rdate/rdate-1.4-r3.ebuild b/net-misc/rdate/rdate-1.4-r3.ebuild
deleted file mode 100644
index b773a09b8bd4..000000000000
--- a/net-misc/rdate/rdate-1.4-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="use TCP or UDP to retrieve the current time of another machine"
-HOMEPAGE="http://www.apps.ietf.org/rfc/rfc868.html"
-SRC_URI="ftp://people.redhat.com/sopwith/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="ipv6"
-
-DEPEND=""
-
-src_compile() {
-	use ipv6 && append-cppflags "-DINET6"
-	emake RCFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install(){
-	emake -j1 prefix="${D}/usr" install || die "make install failed"
-	newinitd "${FILESDIR}"/rdate-initd-1.4-r3 rdate
-	newconfd "${FILESDIR}"/rdate-confd rdate
-}
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 786c005646ff..dd739a1714b7 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -7,8 +7,8 @@ AUX rdesktop-1.8.5-use_standard_gssapi.patch 1909 BLAKE2B 5e9b2b4b7bde0c38ba3302
 AUX rdesktop-1.8.6-sec_decrypt.patch 1730 BLAKE2B 22b7c254b4fee01b72e51d28622795b622cc3ed495920780240afb153f14630b048d5e9592ec6eda1df7dd25e633c70c04d15aa286033397dc504d61826e7574 SHA512 a3a863afe18aea932a29b66f584d4beb7ceb8446522dccfde4251141ea56949b567711f69a849793e88bc12d65b8f93b659032478eebc2d8b5e61620e86044a3
 DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7ad0feb144746c904146c410c6456391eb3f2b7b9a6a40c2fb34515bb7518888c2c9da8dfcaf17c5309ff21cad3 SHA512 9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae
 DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee
-EBUILD rdesktop-1.8.4-r1.ebuild 1736 BLAKE2B 2683cb189864e5895da4d8252a96e6729bdf6484fab692c5b7922e9cfa4d66bbb2885fbcac7d7863d787d5ddd253faa05124bc712450b7a2d7a7f274242a39ae SHA512 16d5d030d96a6a27ef134e6d5f6b6a94a90034042f2dc02c587788f312403c1aaf9c71f0baf1001910053c703b96e009975d5fdc328a4114c0c511821117570c
-EBUILD rdesktop-1.8.4-r2.ebuild 1783 BLAKE2B 94a097e988cb19622eb8165830136f78f7ef6081914d64660974be4b97b861b4a01cd631a45009910cf27a2498c2e6f74e9be48ba0ccf8d4ea67a84eaba0fd93 SHA512 66a9fdc1e5c46fcf09879f482cb1b918614ed012373b776b05622dbc520d60d626a487422cf7ab0161886355fe17b392a64074da357e67a25c780cf625783679
-EBUILD rdesktop-1.8.6-r1.ebuild 1835 BLAKE2B b37022e869b06fddc2ff27f7b587c4cd105a58483b580be04e2fbf5a8568a491708d9db257ae88c16f5fe1960b17eb61705c94faffd4b65c1908a0b326ea10c8 SHA512 c089900c79fd165f66bb9c7d6d3706e41256b7360296fa644d594a1e62190ea007b406c1c057412b45b3b12cb50c46f5e63f3f7cbf18616c28ae1cc02c6c3a48
-EBUILD rdesktop-1.8.6.ebuild 1789 BLAKE2B a5981d395a82c55f364135084abf114b9dd620a8e6de31dd00f367a7adf56aa1d704472004448828160fcc855689abf8ce09f5b3081afb7871060d1cf1703ddd SHA512 1e868524b008638be1a472f9030bd11c1f6c744e7f40483d8233b5fbb58b734f48030e11c0b99b26049d06215fcd005377eb6e5bb6d5892007d111d67e716f48
+EBUILD rdesktop-1.8.4-r1.ebuild 1726 BLAKE2B 65ff5e4a01889704fdb899f540d27e5ba75b343f5d787e940f799204e2af8272c1e523567ad2166c24a8cd118bd418c636553d4b4df4399659dda3c00f26e1ec SHA512 89cdd9bda2dab478253134d1db0739f5051a8bc3d652a3ab73cdd9f287f56d47f49bfee8e29c3db680b2f03975c0bf5f681fc41461486bf004219931437a3094
+EBUILD rdesktop-1.8.4-r2.ebuild 1773 BLAKE2B 4c6f446911b8941b2133a0c75ede13028e8fdfbaa64aa9b36418639b3039f61efe88d8199578c5c82abdb46fdfceb3f8d6e108117b72f0c5157e64da7b917f3e SHA512 cf68883751ed8b113dd8d389dc32d59a9e43cedc89c29da29883cfcfbe7d5c9937ab83195bb83954641d03d8cb93517423711e9f472eb1105e7781048432b871
+EBUILD rdesktop-1.8.6-r1.ebuild 1825 BLAKE2B 719b968928addf924edddc9e4266b0130d820e69c63672fbc6e4b29c9deed82782ec3fbb7ad4965d732ba19b48a3d7a7089941189b99b19864145407a48fc0c0 SHA512 252c717a7d630ff951400b5fe9100c1ad277fdf957522d37fb4ebb9f89fd4e2df94349084275edd0e8360caca3a85ed9d2e8bd859bf0aa1d11650a0d36efaf09
+EBUILD rdesktop-1.8.6.ebuild 1779 BLAKE2B 7babb9b744d549177311e42829179047b79f54a852418fb41d93131185278be0cdf0a59851a99eaeab1b280ed2ebe7194819c119e76808467212cc6f786add1e SHA512 bfcaf2817c1a1e452ae33d8b25b9f144e29b19204aa1f02da34d69882f441b46eb57e8b4442eafba6b45d9910fa00d8165ba5690c36c18e5424903631807552f
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
index 393491006364..29441af60524 100644
--- a/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/rdesktop/rdesktop-1.8.4-r2.ebuild b/net-misc/rdesktop/rdesktop-1.8.4-r2.ebuild
index ea7ed235070d..1e02cb53258d 100644
--- a/net-misc/rdesktop/rdesktop-1.8.4-r2.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
index 023a23ca970d..27318a2bbac5 100644
--- a/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/rdesktop/rdesktop-1.8.6.ebuild b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
index 5fc45188d900..93f73008821d 100644
--- a/net-misc/rdesktop/rdesktop-1.8.6.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/redir/Manifest b/net-misc/redir/Manifest
index 9b870659f10d..e7236fd6323c 100644
--- a/net-misc/redir/Manifest
+++ b/net-misc/redir/Manifest
@@ -1,5 +1,5 @@
 DIST redir-3.2.tar.xz 84240 BLAKE2B d1b48a14ea83cdcd58b7b2449e340e5cc110e212f17ec2f56cb8a914bc2c880d009d102dcb2cb1ee723ec4e3ceb48cd396731863fdc9ae864fe4fbf15ed90eec SHA512 b379047e94f377847b15c4e4c94fa34be996fbf6b26a83670061d705791902b184e89270887a967b2aed993f9ca46c3d0a41cde6b162ff9b32dbb689c1384c6f
 DIST redir-3.3.tar.xz 84980 BLAKE2B 3275e8315dbcd4666adc5064af80848f3c41378c46880ef825bae4d5a6d5a4246b959596a6810f5484db033d3f27a1b1860e40c250b29c75defa600cdf48a5d1 SHA512 89d9b45bc62538751cc0d8baf8dc3dc5ed84888faf18125c4044bb813ca415607b4906e9f5ccd60484eb737ad44d5c3bd22458444dee58d6e3be31446a71c3f3
-EBUILD redir-3.2.ebuild 418 BLAKE2B 5029224479a247f22f095931f7ef54b549fd2bfd79fdfa0e61a0a8461686f5e9902c7d400e8c2c2da46b3ffee769df054141029ca6eccc3122f67dabc3e3fdcd SHA512 74671c09ad7a9f308edec0f464ece0d6ebe41b7f84f2286469ca220586ba9c4c29f7a67b7a42bc6a860b518b1d7b94dcffc4aade27fde128cdd9ea03b4defee4
-EBUILD redir-3.3.ebuild 417 BLAKE2B a3e9242b537575a739d16223a411020e0b28aad881e40b562346e05cbb8511d24baeaca18351c378ef24b910f464ec75648b5816ef60c273627500caebeeca65 SHA512 f85b540cdb15cafdafb60f7ee43ca7396118712f676767440f7b6e8a43a2dddae251424a2fe86d4f940f3ef9d4ee28f9cfd50bb6f92fb38de6e55a90951876e7
+EBUILD redir-3.2.ebuild 406 BLAKE2B f56fd6a4978b60bdee782f132345c2d1968a12edf922e88053341f2c9066887214b849b95f1341c9fcfe0aba2562c9e639d31a4cb7bfff43b66928bdab827152 SHA512 7b5e7f4a20b890d2ed80b4e74ff9ad099ca428b1b5f3a0edce1f579768cdb023e060553462c50a7171bbc63f366417e2cd0b2f9e7de41b95dab02d2359d58119
+EBUILD redir-3.3.ebuild 405 BLAKE2B a5fe2f4ace21232008540552c27db8c27bae9f678fa026e4db87a0374f8318521bab44cca0643d5b8a2db1da2e2de5925de15bfbb1906d3659f1ff512bb23721 SHA512 3435154a1deb64a1bc977f51476742ed7570b4e23b592bdfd103ec276a271a0206ad1a542336a43e19b3de22f1a4735ddbec09a8e96e447bf6e7311a60da8aa8
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/net-misc/redir/redir-3.2.ebuild b/net-misc/redir/redir-3.2.ebuild
index 617fdbb69991..7259b3b6f425 100644
--- a/net-misc/redir/redir-3.2.ebuild
+++ b/net-misc/redir/redir-3.2.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~sparc x86"
 
 DOCS=( ChangeLog.md README.md transproxy.txt )
diff --git a/net-misc/redir/redir-3.3.ebuild b/net-misc/redir/redir-3.3.ebuild
index 4e706162dccb..fdef86a0e2dd 100644
--- a/net-misc/redir/redir-3.3.ebuild
+++ b/net-misc/redir/redir-3.3.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
 
 DOCS=( ChangeLog.md README.md transproxy.txt )
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index a7c04f1deb23..367dcf25a657 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -5,5 +5,5 @@ AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968
 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
-EBUILD rsync-3.1.3.ebuild 2813 BLAKE2B 303593f4f796d56b32425375b0083b9e302d0ec7e80e234db7d2210557ccfda4c378a7ee841793f7740dc79a464daa4b052ebe688105d89be04c749ac5ed17b2 SHA512 0275900a429cb9ec97dfa4f6d73b39719137ed61bd8ec1f69ce8b1c31f29289958512152a62fb0a98f59cdea0f46cd5d5ef199c709b36e460c9318e1836ef6cb
+EBUILD rsync-3.1.3.ebuild 2791 BLAKE2B eaf92146d07cf6b23c9ae9a55bee990ca39548193c76b1648f9c3b71b1ce0adebbe93ad1fb0556ec9a127bfae7e0bdbd6507983e6b6d8a0f4f6241cd70d82e90 SHA512 fce20fb3688bf3f66b327c75766ac18e07392840c788bd3b28c8d0ce44807c7540ed4ef3def89b9245dd8815a26a7ebbd824ece0929639ab6c1ca159dece1884
 MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920
diff --git a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
index f995987634d6..942cf9c72ecd 100644
--- a/net-misc/rsync/rsync-3.1.3.ebuild
+++ b/net-misc/rsync/rsync-3.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} = *_pre* ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl examples iconv ipv6 static stunnel xattr"
 
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
diff --git a/net-misc/shmux/Manifest b/net-misc/shmux/Manifest
index 82cd1ab86830..6911f55b666d 100644
--- a/net-misc/shmux/Manifest
+++ b/net-misc/shmux/Manifest
@@ -1,7 +1,5 @@
 AUX shmux-1.0.2-tinfo.patch 317 BLAKE2B 9e1be87688701b1f980aae40ae500959179127ee03d099967fe8b1d0c64374cacf4fd6f46fe059c90a09e1d79e0814ec8fb8222eb9dde41604ea141709603b2d SHA512 9b94a75ca7ce2b6dce7f39dbbca47ffd6c90c6388623eb5e39ddffd4f9b2cf36f124031c4c50ea9ff46ad6174ff2c97804e2fdded5303c94088edd037f7275a3
 DIST shmux-1.0.2.tgz 110473 BLAKE2B 7dcd08c37d0d8d3ee2dfccc89ee9f2c187c97278ba7adfa8e30bd5b86981d3a4b3513dfc884926000cede0b813a922e121c49db75ca4e0ff4efde2b4b9e6480b SHA512 d114678827d4fc203f0d18b4a4e02f8b56efdf490df0aef32756a020c755b387468a88fea7266249445a862d7ed9374640432e5807fa57bca5a7d559d7e67a8a
-DIST shmux-1.0.tgz 81096 BLAKE2B 7f8e34c66ad705576cd76e5c88e5bc7c46122793c4b2366f4d081c5229bc93e16140afad56fa81b5a1b86721fb4cd3fa83a5536ca08dc6c96e3497ae7c75aa80 SHA512 970ba7972f90c99aa201ee9caae904c039da5084d870d621fcbe3b91a86fd979f35665400210105ebc712b6117f0640fc6c2702c901c467491cac860fa4d2181
 EBUILD shmux-1.0.2-r1.ebuild 685 BLAKE2B 26c273c9bd32f57bef34f3b1b67598f74863d3f868584d830a985ece9a1d9aa64281a2bc17e0350ce7c33c9a172cc63d439f1b5609a757216a193b76d026f481 SHA512 e4860d3ea08b44237177f8ec4164ce7486fb6d017eec96a678bcaa4d46c5ddbe267d150368af0e9bcb1b2ba8bcdc424f282563499f4f70fee03e4903ab824a78
 EBUILD shmux-1.0.2.ebuild 670 BLAKE2B 03db249286acd6ea82925bd62b52ada3b926bd837e0aa60794397f96ef61cf28a96c1a97bcc68854af95038b369de3ce5a1f5474322d5b1e7f5ddfb722bfb43f SHA512 3d43dcbc1a57e38ad72726cc3c4465c6265cad9aa53c6e75501fd704672d3ce94f2cef52d7b3f0174f6f8e6f2f744c58625a0b78c2cd830231985aaf035aec3c
-EBUILD shmux-1.0.ebuild 686 BLAKE2B 045e5708a5e6d839bb8e303bc4621808d0c8cc1aaed417dd30eeacfea8075f3a07f6933e7414c0eead8789b391158fd306f84cc35f525a2958a4cd1bbf930b39 SHA512 21eb396236a992abc2c1dbaac18fdbe149bcb96b6b3e3283b90474a013fe00f5c5d6bf2af303630fbfc270b8e28c1faf37ccc2e1ffaeaa584786142c96ec89cb
 MISC metadata.xml 746 BLAKE2B 39bc488911f39bdfe55dfcefc94bdac131cd0d1fcba0be0b20fae71b32df0033db63c10fedabbe1a6cda4753b14fa6fab1de9ec24ff90d0f0b9b1f3ada02269f SHA512 fbe14dee902994deaa7df5f5ff551f171437bea3cf1c772633023a534835e7c99bd714fed9bde6acaa5e6ba0321739323a0b6eb1579947be1f4eb4beec8f8915
diff --git a/net-misc/shmux/shmux-1.0.ebuild b/net-misc/shmux/shmux-1.0.ebuild
deleted file mode 100644
index 3d92be962273..000000000000
--- a/net-misc/shmux/shmux-1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Program for executing the same command on many hosts in parallel"
-HOMEPAGE="http://web.taranis.org/shmux/"
-SRC_URI="http://web.taranis.org/${PN}/dist/${P}.tgz"
-
-LICENSE="shmux"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="pcre"
-RESTRICT="test"
-
-RDEPEND="
-	pcre? ( dev-libs/libpcre )
-	sys-libs/ncurses
-"
-DEPEND="${RDEPEND}
-	virtual/awk"
-
-src_compile() {
-	econf $(use_with pcre) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin src/shmux || die "dobin failed"
-	doman shmux.1 || die "doman failed"
-	dodoc CHANGES || die "dodoc failed"
-}
diff --git a/net-misc/shout/Manifest b/net-misc/shout/Manifest
deleted file mode 100644
index 9d5b8691a404..000000000000
--- a/net-misc/shout/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX implicitdecls.patch 294 BLAKE2B 4be17814df8b496e2c282bf09bc058359afe22e23824f66629cea1acf1dd918865d900e41167580ee789c3fe8dc5d5608858f5174b27481a40c4cdfcf5ec38d6 SHA512 e2f18ef4dd46725d8d023121045c25214b777b6ad699027fda8d0af84e284cb53f72b877a562935d056e7321523e9e65ed3d1dddd9491160ca5c8ee68831a70a
-AUX ldflags.patch 653 BLAKE2B 13d07c256ccdc0dec3aa559e66febd4ffd9119ad225086ad445f0c27674df64c1f1592a01c2669bfbc9df2793bf03158d091d6c1e377fab232e3be9d3f5ece67 SHA512 33a91c02e2b8dd9c1f2e44e6dc6f9bf3264a159ffb33451a5f800a2b15ba47dac0744a73cf5a18be8fe33531ad4cecb2149a2c765a8d9abb8cd07be549855a2e
-AUX shout-0.8.0-overflow.patch 705 BLAKE2B 0624831f97db15aa9792c33d4e0ef57f1a524a267aa9ff9f451327721b6d8ac74b53874bbe8be4c39dfaf1963811bfe7af9a970277a7590310054d3bb7db04e6 SHA512 ab1dde236c3edd4b17550511277762dbdc6cce05830a67429d958176ac4e494c3c16f88f15bb897714f37bb4979295c27353fed8c11681616d027c6c40b1609b
-AUX variables.diff 1142 BLAKE2B 82be90bde24002cfc734723f54135d85abdf8d539bdd54f24c405ccdece0fd725ccbffc3dd1c114c0b8ae09f5db728e7d6fa27f5e903434654cc47a2ae405c91 SHA512 abe393346b791fcc4cdb57a17c4410bbc967777c1f6d5bf0339618b6592e615000f49262ac907e5d83ea7c0837074923f719089d5a35f4aa0a1bf90dab9b6e36
-DIST shout-0.8.0.tar.gz 66394 BLAKE2B 60f132f94fc666205af4c3a217949f6032d93e2c666dd500b2bec95f3fcf3de917cb33377e812bfd0161d21efe82de11913e8b1c7a85f84662de51ba484e4b0d SHA512 95ee62071ce4dc7f624213d4eaf10d029b0a2e3ff030e7236656fc5387045be34a6f08ee778c4e8e77fed9b4ee8f60c191a369921b3079c3183cc650b77b3565
-EBUILD shout-0.8.0-r2.ebuild 1009 BLAKE2B 2002eea4e50fcdeb8673f79b951bec607f73dcf242e43502f5ec3b8c71b76b44c38dbf93135043b23abb144748697018ffb814c5ca0888eb669ee6f068ce4564 SHA512 c5f8d9588d981484d5b43134a5fb5632016bd94ed636b2b8da76d29244233f5d1b5ccfe98468e255bf518fed923151584b25b92277644a7b5cc4a87cb599531d
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/net-misc/shout/files/implicitdecls.patch b/net-misc/shout/files/implicitdecls.patch
deleted file mode 100644
index b7a6999f121e..000000000000
--- a/net-misc/shout/files/implicitdecls.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: shout-0.8.0/sock.c
-===================================================================
---- shout-0.8.0.orig/sock.c
-+++ shout-0.8.0/sock.c
-@@ -25,6 +25,7 @@
- #include <arpa/inet.h>
- #include <sys/time.h>
- #include <unistd.h>
-+#include <string.h>
- #endif /* !win32 */
- 
- #include "sock.h"
diff --git a/net-misc/shout/files/ldflags.patch b/net-misc/shout/files/ldflags.patch
deleted file mode 100644
index 3d049d98d318..000000000000
--- a/net-misc/shout/files/ldflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: shout-0.8.0/Makefile.in
-===================================================================
---- shout-0.8.0.orig/Makefile.in
-+++ shout-0.8.0/Makefile.in
-@@ -2,7 +2,6 @@
- 
- CC = @CC@
- CFLAGS = @CFLAGS@
--LDFLAGS = @LIBS@
- 
- SHELL=/bin/sh
- 
-@@ -26,7 +25,7 @@ COMPILE_CFLAGS=$(CFLAGS) $(DEFS) 
- all: shout
- 
- shout: shout.c rand.o mpeg.o configfile.o sock.o util.o
--	$(CC) $(COMPILE_CFLAGS) -o shout shout.c rand.o mpeg.o configfile.o sock.o util.o $(LDFLAGS)
-+	$(CC) $(COMPILE_CFLAGS) $(LDFLAGS) -o shout shout.c rand.o mpeg.o configfile.o sock.o util.o @LIBS@
- 
- configfile.o: configfile.c
- 	$(CC) $(COMPILE_CFLAGS) -c -o configfile.o configfile.c
diff --git a/net-misc/shout/files/shout-0.8.0-overflow.patch b/net-misc/shout/files/shout-0.8.0-overflow.patch
deleted file mode 100644
index a1292423ce4b..000000000000
--- a/net-misc/shout/files/shout-0.8.0-overflow.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/shout.c b/shout.c
-index 0a1bded..00bae8d 100644
---- a/shout.c
-+++ b/shout.c
-@@ -441,7 +441,7 @@ post_config ()
- 			perror ("fopen");
- 			px_shutdown (44);
- 		}
--		my_snprintf (pid, BUFSIZE, "%d\n", (int) getpid ());
-+		my_snprintf (pid, 30, "%d\n", (int) getpid ());
- 		fputs (pid, fp);
- 		fclose (fp);
- 	}
-diff --git a/sock.c b/sock.c
-index 4a67c00..3b4e539 100644
---- a/sock.c
-+++ b/sock.c
-@@ -81,7 +81,7 @@ sock_connect (char *hostname, int port)
- 			sock_close (sockfd);
- 			return -1;
- 		}
--		memcpy (&server.sin_addr, &sin.sin_addr, sizeof (sin));
-+		memcpy (&server.sin_addr, &sin.sin_addr, sizeof (sin.sin_addr));
- 	} else {
- 		host = gethostbyname (hostname);
- 		if (host == NULL) {
diff --git a/net-misc/shout/files/variables.diff b/net-misc/shout/files/variables.diff
deleted file mode 100644
index afaefbcb2cad..000000000000
--- a/net-misc/shout/files/variables.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -urN shout-0.8.0/Makefile.in shout-0.8.0-modified/Makefile.in
---- shout-0.8.0/Makefile.in	Thu Apr 20 02:31:50 2000
-+++ shout-0.8.0-modified/Makefile.in	Tue Jul 23 19:14:36 2002
-@@ -9,11 +9,11 @@
- srcdir = @srcdir@
- VPATH = @srcdir@
- 
--prefix = @prefix@/icecast
--exec_prefix = @prefix@
--bindir = @BINDIR@
--etcdir = @ETCDIR@
--logdir = @LOGDIR@
-+prefix = /usr
-+exec_prefix = /usr
-+bindir = /usr/bin
-+etcdir = /etc/shout
-+logdir = /var/log/shout
- 
- DEFS = -I. @DEFS@
-
---- shout-0.8.0/configure	2000-04-20 09:41:45.000000000 +0200
-+++ shout-0.8.0/configure	2004-07-17 17:17:40.000000000 +0200
-@@ -532,20 +532,10 @@
-         prefix=$prefix
- fi
- 
--if test "x$enable_fsstd" = "xyes"; then
-         echo "FSSTD ENABLED"
-         BINDIR="/usr/bin"
--        ETCDIR="/etc/icecast"
--        LOGDIR="/var/log/icecast"
--else
--        echo "FSSTD DISABLED"
--        BINDIR="${prefix}/icecast/bin"
--        ETCDIR="${prefix}/icecast/etc"
--        LOGDIR="${prefix}/icecast/log"
--fi
--
--
--
-+        ETCDIR="/etc/shout"
-+        LOGDIR="/var/log/shout"
- 
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
diff --git a/net-misc/shout/metadata.xml b/net-misc/shout/metadata.xml
deleted file mode 100644
index c870d0eef0ab..000000000000
--- a/net-misc/shout/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="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-misc/shout/shout-0.8.0-r2.ebuild b/net-misc/shout/shout-0.8.0-r2.ebuild
deleted file mode 100644
index 0a6887cedef8..000000000000
--- a/net-misc/shout/shout-0.8.0-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Shout is a program for creating mp3 stream for use with icecast or shoutcast"
-HOMEPAGE="http://www.icecast.org"
-SRC_URI="http://icecast.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~ppc sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/variables.diff \
-		"${FILESDIR}"/ldflags.patch \
-		"${FILESDIR}"/implicitdecls.patch \
-		"${FILESDIR}"/${P}-overflow.patch
-	rm -f sock.o
-	sed -i -e "s/-ansi//" configure
-}
-
-src_compile() {
-	tc-export CC
-	econf --sysconfdir=/etc/shout \
-		--localstatedir=/var
-	emake || die "emake failed."
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	keepdir /var/log/shout
-	fowners root:audio /var/log/shout
-	fperms 775 /var/log/shout
-	fperms 755 /etc/shout
-	fperms 644 /etc/shout/shout.conf.dist
-	dodoc BUGS CREDITS README.shout TODO
-}
diff --git a/net-misc/sipsak/Manifest b/net-misc/sipsak/Manifest
index 66517434c1a9..d776f2ce514e 100644
--- a/net-misc/sipsak/Manifest
+++ b/net-misc/sipsak/Manifest
@@ -1,5 +1,5 @@
 AUX 0.9.6_p1-callback.patch 490 BLAKE2B 398728ea4fb79a0c8ab2e1920f08186df358bb7924674a38526432c487d453b4a679b731692cc06cff0e10b76b3558462901bf367993d0dbe90bb0d9dd8e739a SHA512 c10dec8410143ae5fee3b78fb65a83494e5b2539c41f2424455fdabce73a780e78ca159ce2e579db5e2344882e7472abd3f884f76863241218745451108fce4a
 DIST sipsak-0.9.6-1.tar.gz 158776 BLAKE2B c8bd37d63d55bc593a57455171ed2dd26c8a4e87746be7075af7c2912b400d49a44f25fad694e296c75ea9aa3e7b10cc81a457c448a3a9429a41d22b84fb794c SHA512 c2d62ddaf2ecc9616941cf002a0494d2f9c43747e6b527f8b1542e9b5ae143fc69b18fc140bd3f255896b0e8eb02f7d198cc1799a4041e2d0c95d90b653591fe
-EBUILD sipsak-0.9.6_p1-r1.ebuild 730 BLAKE2B 2964716bd52606ab73a032b4b1c48757f6dfd08a02eb8133783e84e9f55b34e1d9292901886dc81b637a184736b85f66b4922741a1e24ca19c14fe251d68c3b7 SHA512 840242bb19f70596a43c618d7eb66c965f9b50a38365a8d5aa173cc4535d2b21d01f1f7cfa5e2c286a4fb8db6289852220b1c20ab3aed8aae705affa77718552
-EBUILD sipsak-0.9.6_p1-r2.ebuild 775 BLAKE2B dc4ae84feb965cd0c121bf7f584e7b9c91a4ea7b5f027409dc978149b6e3612f5582d05bf3973aaaebc7109dab2d7ac1dc107b4da9945cca492b6ff25ae67964 SHA512 856e40a857f425fa8a023e65a0f4f22e10862e1fdfc6c8b14159cb8d653bcc38cd9b0818e15e35ee50934c70d25c8f81f456429898eae48400e3d63388ca6afb
+EBUILD sipsak-0.9.6_p1-r1.ebuild 720 BLAKE2B eb257a64e411f6faab8e1abb076e676edf78ab8dc6d2a10a7566c059725ef3df4dafadc289c7084e5d7fa86ba671e364128515897f409b745a19ac59861e09d8 SHA512 9444d5028ec13dda04675f30dbc3b7d203d9d449ed491f2008690506e15cb599c8a180a9a59d78c0725455211e294b334160e9fa3a0102b9dba2680d261bea1c
+EBUILD sipsak-0.9.6_p1-r2.ebuild 765 BLAKE2B 022df7063a9d8f1a97f96111a8a736b612489edc817f2465ae626f4554718cc52216ce56d85f7f735df7f822327f7d8ea8af7904c05f32f6fb36064ef247f6a4 SHA512 4ecab6db4dd1dd94bdf174ec96f7d306726f286135ebc4460372610ffd313ec2725278e70998b67361c25608e1cd51ac8034f168458b69bdfbcd6ab5676e566b
 MISC metadata.xml 303 BLAKE2B cc764a44b688e208776c7e99220318ff09e0cafc4b49a9b8e1d105766425f7c4fe59d85fdee39601ef066d59669eb8e6259cb755f997d400e1a8e13366a2bc55 SHA512 82474d39e280eff65aee9c5d4ccb9bb513d56bb2d55b10b8f49b161d505387ab351d3228d0253a40c01a9c4f5f2c5104bb7f2c41b227b0aa653350e6facf07d4
diff --git a/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild b/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
index 3623e28e87ae..8532201199aa 100644
--- a/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
+++ b/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sipsak.berlios/${P/_p/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="gnutls"
 
 RDEPEND="gnutls? ( net-libs/gnutls )
diff --git a/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild b/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild
index a4ee1948c371..6893d2605d39 100644
--- a/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild
+++ b/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sipsak.berlios/${P/_p/-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 IUSE="gnutls"
 
 RDEPEND="gnutls? ( net-libs/gnutls )
diff --git a/net-misc/ssh-askpass-fullscreen/Manifest b/net-misc/ssh-askpass-fullscreen/Manifest
index 52f1f043aaf9..964f0d19018b 100644
--- a/net-misc/ssh-askpass-fullscreen/Manifest
+++ b/net-misc/ssh-askpass-fullscreen/Manifest
@@ -1,5 +1,5 @@
 AUX ssh-askpass-fullscreen-1.0-libX11.patch 845 BLAKE2B d968d7f1abf69cc5c0fd3c72c690bca1e547b8f0a58424c59ce20c1570c5151b5313b18396f1462804ab0598672129ad31eb3036bb3590304eed733df69b18f9 SHA512 cbf89dba7398f735807f841f4df8534e8918c09e95bca43d4fcfe451e5697194712f723a081830eeccc01e5e389cb8ea319401e80d68365c3763c8294dbd69d7
 AUX ssh-askpass-fullscreen.1 2542 BLAKE2B 495c6ff6e90156962f697b4d4ac4a3a12e99eeee07f04a2d5420d08b3a65226b33cbdf5d16f3e80c720dd31dd0d284ee1c4c05e18d00ec896592ddfb89ec6f6b SHA512 84f28b5603a15a4d283b0980b4bc0dafd0c0eb3b889a579d51dab69577fe57eb0854c30adf358423731d2a2543647e28c1739bca04a77c8217299d6372f8d45e
 DIST ssh-askpass-fullscreen-1.0.tar.bz2 69301 BLAKE2B c47e3123f94504162cec237d6c2ff61825b655efaa9bff2710650cce3e2cb45b10ff842c4d88002461ab51c410dd9fc748ee4cdca7cea56e67bc22497b427e7b SHA512 272b7d8bcbfb997530afcb6c619180b625e6753e1dc86cba30f30fa594cd71ec8bfc522b0fb8aee5842cb7a4532a00fc1e0954def9ac81a1b521360d7140f52b
-EBUILD ssh-askpass-fullscreen-1.0-r1.ebuild 1012 BLAKE2B 6f1e495362a6c3a2b52061ff91e7bfb72abdedd7d13afd8ba453dedbec084bd0b2202dd1cf4531cc5931b4eccf31df2d9e095c9b278ad849a3f700ff039bd2ee SHA512 267bd258d0a481d3a32003c49a37a665e4ff34ea1def298e2caee474e8d9e7cfd6d2ac262317085d1119311fab29a92b61dab91758275c0aab88a1a54f041ec0
+EBUILD ssh-askpass-fullscreen-1.0-r1.ebuild 1002 BLAKE2B ad04539df5d8e3000750fab23586ee6a904b68ddd86653007561493a3310708f1674aee93e02c83fa0eda6fe40e72719960c6e8dc231b90c4d0fb6f53245f1c3 SHA512 52216707d7646f0ddb0ed6d2d73d10d02de2feb05460cfa012eb4239c6fe4b61780110fe6cbc58c741bdb450aebf014d9ed8b9af847e388ee6c49d7bc23f5319
 MISC metadata.xml 344 BLAKE2B 2059c989d9bd878eb050b6960dbe5444bd72eaecf4d6f532b2cfb26c830f65010cf7081e2e2a435d541f0b03f904697966ffbcdd7bc41281319689cc65b12163 SHA512 26eb499745d0f954b33834ebecef34ba44ad457837ea4c0b0a44e917513aabe6486887124ac5ce47d69c1756f2a00693ced7ed4dabcb35539d047f19deeb33f0
diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
index 7ab528bd27f6..dbd21787dcc2 100644
--- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
+++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/downloads/atj/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.10.0:2
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index be7596514368..c7157ed552fe 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -7,8 +7,11 @@ DIST teamviewer_14.4.2669_amd64.tar.xz 12237660 BLAKE2B d3c1638645720748fed6f8e5
 DIST teamviewer_14.4.2669_i386.tar.xz 12726704 BLAKE2B e8ab743646448488fc39ea9979e52a49c42e941cb173e89257dfcd3544dc2709a763d6c552c269c1559b3a7ccdf83265e30e06d06cebe8dcfca6dfe8a591791c SHA512 bbd6d48d1c70941d468c793bdede3b0a1aebbc7fd433c55be327f56cfd53435ffaebdd845ee595820dcce41d94f8a3fe9de00d2908901c4501ff61e34ad9349c
 DIST teamviewer_14.5.5819_amd64.tar.xz 12386480 BLAKE2B 2d5c11c811f10f3fd4a55e5ecbb010964b6317f9a813f73e543bf7c5be7cbd5b9c1e89a5f5ab1865a2e25eadc3e15c80485b725315019831b76ace3340df8dec SHA512 28a2733f8131fd9943ddc78166058939cf9a8682053153c3f7ccd64ff39feed8c9199adf93f5b96432d6e87f13067fdd649cce2a0af383d87f2adc0e223e20cb
 DIST teamviewer_14.5.5819_i386.tar.xz 12883512 BLAKE2B d7f5749a5e53ec3f6921c55c3d4256f00e9f8b67fddbae6d08fffc1f364850274c80df7578a90444cea092d553f535491a02d82fc21adaa850700ec2d60b2d70 SHA512 ed7e4be50c32fae14845317f59465c5052693e49cd32ed60f7106b718a3ab05df2a8a040d2daccffed45e05cf7f61553a9767e478b826f3e2895e8236f20d938
+DIST teamviewer_14.6.2452_amd64.tar.xz 12507160 BLAKE2B b84f085f3371877952680305808ae1201330a6402fb0e6e4812978801b8e888b6166a8f9f39bcea16ce60e2df039fdee6800a32612028f6d8237dd763f87383e SHA512 7d82356df572e19ffc1de6de5b94f1e95e511f986c4aa88ff2a80dc6dfd12c798f93e62d7886c66c57c51a432fd265cfadaf267a56dbccb029207e3ebd719c30
+DIST teamviewer_14.6.2452_i386.tar.xz 13055508 BLAKE2B b2adc4c98aecae2886a9fc51bdb9e233250985b7863ebc4376d7d0e8240e8ed2eafc878a9a522a2d5c2c0493b4e483cd70b2ea14f57c13892635f7756f398cd8 SHA512 0ed6d712c3df7ac13748f013bb9ad27d57dda0f0f5e29847a12529253e619a47c05806a209a3e20e7760f59c9feba5bb9d33de0a739adc6619a8e6e52dcec86d
 EBUILD teamviewer-14.2.2558.ebuild 3701 BLAKE2B 2413ca30f73a54cf75f69600d9928d8803b0d6c66a4ef0e40c37703573845984ab15f00dfdba33b9359676a1412828df84dafeb5649d68e71d4f8ce3e8331dd8 SHA512 871ded4d964787d875a4731fa6e44590df92746c855ec1e5d471ed8cea8b7d464c591b308df4ebfd9dcf29cfa5e6cedcc53a98d40547ee3725a54536f83fe65a
 EBUILD teamviewer-14.2.8352.ebuild 3701 BLAKE2B 2413ca30f73a54cf75f69600d9928d8803b0d6c66a4ef0e40c37703573845984ab15f00dfdba33b9359676a1412828df84dafeb5649d68e71d4f8ce3e8331dd8 SHA512 871ded4d964787d875a4731fa6e44590df92746c855ec1e5d471ed8cea8b7d464c591b308df4ebfd9dcf29cfa5e6cedcc53a98d40547ee3725a54536f83fe65a
 EBUILD teamviewer-14.4.2669.ebuild 4103 BLAKE2B 1c4b8bcf00e3e8d651c25e3e59f87757eaa7acde99578cc54eb6fa37535424234fe7d8943fb3b74343a385deb48d8801554bf43079f07dc3073cc3ce531946c1 SHA512 c2ffd27b0edc59c40de948f1169617db5495520caa12b4b633413a645537ca41b2e8f22a0e085f439c2376c0b6d6c67a7d189ad8cfa407ecead0bd24742363cc
 EBUILD teamviewer-14.5.5819.ebuild 4103 BLAKE2B 1c4b8bcf00e3e8d651c25e3e59f87757eaa7acde99578cc54eb6fa37535424234fe7d8943fb3b74343a385deb48d8801554bf43079f07dc3073cc3ce531946c1 SHA512 c2ffd27b0edc59c40de948f1169617db5495520caa12b4b633413a645537ca41b2e8f22a0e085f439c2376c0b6d6c67a7d189ad8cfa407ecead0bd24742363cc
+EBUILD teamviewer-14.6.2452.ebuild 4103 BLAKE2B 1c4b8bcf00e3e8d651c25e3e59f87757eaa7acde99578cc54eb6fa37535424234fe7d8943fb3b74343a385deb48d8801554bf43079f07dc3073cc3ce531946c1 SHA512 c2ffd27b0edc59c40de948f1169617db5495520caa12b4b633413a645537ca41b2e8f22a0e085f439c2376c0b6d6c67a7d189ad8cfa407ecead0bd24742363cc
 MISC metadata.xml 353 BLAKE2B 6b23f0ea5f9e3bc076641d6991535e7069dab3abd3f30e1d1052580223ec1f2ad94a8b0f6dfc6ee0019cdb3f1b3ea31edc5bbd04579da77f866291922f4c675a SHA512 bb21752978f1cf4c9cabf6b5fad33e0dbb820d27a5dd3ef40fd54f4a86893b77cd994dfe77395ff8fdd69f4e0f805bca622486538a4781b0f30b55ffdcf1540d
diff --git a/net-misc/teamviewer/teamviewer-14.6.2452.ebuild b/net-misc/teamviewer/teamviewer-14.6.2452.ebuild
new file mode 100644
index 000000000000..6650185440e6
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-14.6.2452.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=${PN}${PV/\.*}
+inherit desktop gnome2-utils systemd
+
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
+		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
+
+LICENSE="TeamViewer MIT"
+SLOT="${PV/\.*}"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/dbus
+	!sys-auth/consolekit
+"
+
+# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
+
+RESTRICT="bindist mirror"
+
+# Silence QA messages
+QA_PREBUILT="opt/${MY_PN}/*"
+
+S="${WORKDIR}"/teamviewer
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
+		-i tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_PN}" # install destination
+
+	# Quirk:
+	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
+	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
+	# when changing the ABI of one of its dependencies. According to the
+	# TeamViewer devs, this binary is an unused remnant of previous Wine-
+	# based builds and will be removed in future releases anyway
+	rm tv_bin/script/libdepend
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
+		fperms 755 ${dst}/${exe}
+	done
+
+	# No slotting here, binary expects this service path
+	newinitd "${FILESDIR}"/teamviewerd14.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
+	done
+
+	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
+	# have the undesired result of installing subdirectory 'doc' in /usr/
+	# share/doc/teamviewer-<version>)
+	for doc in $(find doc -type f); do
+		dodoc ${doc}
+	done
+
+	keepdir /etc/${MY_PN}
+	dosym ../../etc/${MY_PN} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_PN}
+	dosym ../../var/log/${MY_PN} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "Please note that parallel installation of multiple versions of"
+	elog "TeamViewer is currently not supported at runtime. Bug #621818"
+	elog ""
+	elog "Before using TeamViewer, you need to start its daemon:"
+	elog "OpenRC:"
+	elog "# /etc/init.d/teamviewerd start"
+	elog "# rc-update add teamviewerd default"
+	elog
+	elog "Systemd:"
+	elog "# systemctl start teamviewerd.service"
+	elog "# systemctl enable teamviewerd.service"
+	elog
+	elog "To display additional command line options simply run:"
+	elog "$ teamviewer help"
+	elog
+	elog "Most likely TeamViewer will work normally only on systems with systemd"
+	elog "or elogind. See this thread for additional info:"
+	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest
index 9b22b5a8fb2c..8ae79fb319fb 100644
--- a/net-misc/telnet-bsd/Manifest
+++ b/net-misc/telnet-bsd/Manifest
@@ -2,5 +2,5 @@ AUX telnet-bsd-1.2-fbsd.patch 2523 BLAKE2B dd8625ecb4d2d82d80ce3ec14c56fc979e76c
 AUX telnet-bsd-1.2-format-security.patch 1419 BLAKE2B c605a5e4b92d009221ef9d9e54533779a66a6cb4d4f51684f7c366a35738c8e6ea38c3b2d3cf58c5e808808e1d61cedbd18205f332637c40c91a67b595565fdd SHA512 f5f4b2b7e6f3ec641f5160ab41427ea46a8dd83a9a00d9e15bbe08ed3ab4b7190db05476666e20967b225e63bbf4b43ff59471be7e8f26c0eeed433503bfb081
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 DIST telnet-bsd-1.2.tar.bz2 194518 BLAKE2B 59b46a4717dfbf2dffebbab96446ec020da1fab4838bae053e5539f3f85834e11f304ad9f8cb143aefb73cb3c6c0734430a4317df6e8a9a236a122a1268f3bd8 SHA512 e3867362e1a2bc46779bcbc7631ccf08a0bfae84b71653e39099dc2db42995e5fcd39a978595006053e688430445db7ebb7a7bfbbb02a8e4dba209acbf66a69d
-EBUILD telnet-bsd-1.2-r1.ebuild 1171 BLAKE2B e72685cbb8971ee671c0854ddcfa75d139bb1a0c07d5eedb36938ed113c180918189e119ec26d5830c3047c26d77e5abc2e7c83385e4f45bd45f456a42b7a793 SHA512 bb7f019dc5863a77f8cd4291b371c725deae06dac89afa49c6ca0bb4f06e5f5b032cbe4434bbcf7ce73f36dbbb8489016dc46dc3384cfc51e7bede8a05e0ca6a
+EBUILD telnet-bsd-1.2-r1.ebuild 1149 BLAKE2B 238add8a0ac8e295c9c6b759ab9a505889ff503a3a0480bc4f2245337c591b9bc5b31d04ec2dd69a1572be81bba11e039fac1c1be06643cb6b91d92fae300d75 SHA512 6fc91a74c987fe5087c638786477a4eb7e95c2aed4b8fb4ec476bbb619a851670c4876e542569d57c536a44f793bf81c06518f1631b4990464b8e8f89d0ee2ad
 MISC metadata.xml 218 BLAKE2B 48f6dc072d599bb422bd1033c1b1ecc05aba8ac787c9a10425ecf89d08140c859a122f19502f1de050ea7341f4947aee0b88d10ee605b2a60ec4542ff29ac489 SHA512 c1894fa0ad03968827a0eb6410381bdaa9491a4b450f9a50959a93700f803ddc83f020040f4db06ed3ba68c12adb4a73b192525ef7e70c0bd10125e3da578c65
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
index 562cbb582529..0784cd5e90c0 100644
--- a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="nls xinetd"
 
 RDEPEND="sys-libs/ncurses:="
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index fcdc9620403b..8169ccebcec0 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -6,5 +6,5 @@ AUX xserver120-drmfourcc-header.patch 1300 BLAKE2B d1be2072020a4eff663e56e1210b8
 AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311bf8b37e8e1873046919fbecf1023f0178793e939ba33e834b55c6e8277f88bd2b145716badc8b4a5c4 SHA512 bf69a4b65742c5f2351b7d0f0b7ad44f44050dd8f54972d9545ea873f27f8fe88314b016b07746b31ac75bde6648b249f523a1f3d9948a9cb26001d6096d4f3d
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
-EBUILD tigervnc-1.9.0-r1.ebuild 4370 BLAKE2B e3149dbd4879f1a4b55ae1a4a08ec1414f6c9003757fae6ff53bc5f7c5fed55ad70ec59e6909d7931bd0864ec5ff214dad8947c82a2ccb0aa6e445def54882a9 SHA512 eaacd897edb96196039892ad0290856df0ba495d4d63bf32461e7540eec53aa6545e7a3912f0e8f7339a46ed07f24a14ec4b625e6a2e5dc05c1f5cf71d14250a
+EBUILD tigervnc-1.9.0-r1.ebuild 4371 BLAKE2B f1e3e5b24ad5f5b743ca1900197d0f2cb2191eb4852020e0a0068377d60c766186a72e17e06a73fc84bb0f1fb6ce72ac6ef58a1cd52da043e9a062ec8e770f9d SHA512 69311d243fa1542d5bc9ecd6d15000c1b5b7d3032b6c32f2cec788005168a4e478f4d7a8c2a4cb5de67866c3cb998f71453ab66ef3400591cc5de69f6a217333
 MISC metadata.xml 750 BLAKE2B 2a76715a23dd2d3797ae85c20ef7e08854ebfcd74f42969d10bc2605870dcd69a03806437483eceeebc3dfbd52006091609e7464a9278aec2d938295b230cab1 SHA512 768e087e274e83dc9347cf719e61db39597d2ab07aae24ab6158fe9851d93f9594e74ec66579b0da2abf9bc839d9d28d3a31f207d7274bc0a9e1e9c8bbee9997
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
index edbfb0053534..3585565e6360 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ CDEPEND="
 	>=x11-libs/fltk-1.3.1
 	gnutls? ( net-libs/gnutls:= )
 	nls? ( virtual/libiconv )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index 4bcb38852f67..7be800ef9efa 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -1,6 +1,6 @@
 AUX vino-return-error-if-X11-is-no-detected.patch 1102 BLAKE2B 145b468e06bfa8b7abb18c1209761a2ca2314ffc92f04fe419ef0722eaed6a30b5a2e8cbeb8923e1b0cf072ba988ea9c3031fe2816df8632c3e123f643c70221 SHA512 6342507c051d81fbcbf8d2f8ce5005b60da0ba6a1f725c3aabb164c310b7c17a92f1aaeedc69873b47ba35041ff5ab7d75b762d5f9bfa70d967864e3cafb2596
 AUX vino-segfaults-on-wayland.patch 1172 BLAKE2B c8e3b9316309f78975123cd3ac87fd53d8fd498be5927a2188dfbddf5ac5316febf71ff5297466e95d079e9dfe8bf4a034c1b45320000c683f5e264527a870dd SHA512 e1d9a489643ce46259ebd830ccd906dbe65675ff57cb2d405b584acbf6c67e3a3f34f051c6ab5bd5fb5d40bd873225b36801b87030c30c0c764d3d5a72095f23
 DIST vino-3.22.0.tar.xz 768716 BLAKE2B 5c3f6df059f129009bbc97527d1767bc8a29d8cbff5e6f9e89dabc4583ffdae2cf235eec66cbcb5f9e73c9a0a7c05a504e4e90221bf5adfc2ecbbbd518fdc84a SHA512 29b88e151b0b8c69bce1565ae3ec2e788f48c7645429984329fb2d3daaf03cc5ac100abbf70247bf0516c6d03a3b9aeb78d018c8f1bf35fd241919117fd1105f
-EBUILD vino-3.22.0-r1.ebuild 1833 BLAKE2B d9ebd597e4818b24017e3fb74579b30b82eaf06190fe2942748f30517d67d157e039de4910ddf964216a51f13ca5769c1d7ca14bcd8f41be032e602a2a53bdee SHA512 7adab9c71ee1bf5a4b064732008c54935c6565cdff3ad8a0fbf3da4914f5d60b0b154f28867b39a2a5bfbd136312b9ea9b8e28c119d89100a7c6d9c7c772ad93
-EBUILD vino-3.22.0.ebuild 1651 BLAKE2B 345994ec32582e2fd99fba1dd860557119976ab09dd34aff5ea8aa01c9cf6658181522178cc8818f39114452016c172331fe0055edebbf333d80732d8e9145e3 SHA512 5d2e83be516cde4164c4c5a5067ab789ebd95fcc0133680cf2714db10677728fca0ce70d2d3790e236315399098df532610a0a0f74b3ca7585b9daec09b4c1ae
+EBUILD vino-3.22.0-r1.ebuild 1823 BLAKE2B d0e21ef4a93b501f56b2c745a05c61cfb243ec7c2c5fd862225600b7645c8e69fe82f35cd52596fa137492377a42de92a66262258e680a1cf1f2c42eea55c943 SHA512 e11cc04c32c09ed6e98f23e9ed8b78f3501662b1a61d8e0f7019ce7fb8818dbbcdc881a968f48d4f1c3aae469b5a9e58ac0269216a1414cd67baf2874cf57528
+EBUILD vino-3.22.0.ebuild 1641 BLAKE2B cb05d5798cb4873e688bbe0e9c11b9648ae19400973599c854a243418aa25cb8381dc7aa761c31a11c4de5b7bf750df5850fbc3c1f8d94f64fdf2b9c035b61ef SHA512 e4f75abf8c4b63f7e7c2856cc6aaf1773fde72464d6f58277a922145676db3f634625c1448479d9ebe0d8fe7d946ceef1d094679dc498ad0368f326ab6e1a883
 MISC metadata.xml 343 BLAKE2B 92816370ecc7d4e3b9d3f4513ee7c437b98ea3ca798107beb1b4885ab778768e19a20dbf8a3c19dd1c6d2b812a2498a9d1e2b4f4211dad0f350f620420a523e2 SHA512 dc33b648174ba60a62212dd252f1d358ee7a05ddbd41ae2b31dbdf362f4f780207c5183c0b180d68c8df5a613e91c1336231f2d75100076a01517e4d70d8252d
diff --git a/net-misc/vino/vino-3.22.0-r1.ebuild b/net-misc/vino/vino-3.22.0-r1.ebuild
index a5f2d4aab9be..6fe08ad74800 100644
--- a/net-misc/vino/vino-3.22.0-r1.ebuild
+++ b/net-misc/vino/vino-3.22.0-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="crypt debug gnome-keyring ipv6 jpeg ssl systemd +telepathy zeroconf +zlib"
 # bug #394611; tight encoding requires zlib encoding
 REQUIRED_USE="jpeg? ( zlib )"
diff --git a/net-misc/vino/vino-3.22.0.ebuild b/net-misc/vino/vino-3.22.0.ebuild
index 5e5c68740d17..4a26312965d1 100644
--- a/net-misc/vino/vino-3.22.0.ebuild
+++ b/net-misc/vino/vino-3.22.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="crypt debug gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib"
 # bug #394611; tight encoding requires zlib encoding
 REQUIRED_USE="jpeg? ( zlib )"
diff --git a/net-misc/wakeonlan/Manifest b/net-misc/wakeonlan/Manifest
index 3cb8ee7bf1dd..31c3f68029d3 100644
--- a/net-misc/wakeonlan/Manifest
+++ b/net-misc/wakeonlan/Manifest
@@ -1,4 +1,4 @@
 AUX wakeonlan-0.41-ethers-lookup.patch 2284 BLAKE2B fa45175d623a3e4cfb5b79ec4f499401b798a8fc3e4dd10a8d580f02083334db32ff5f925defb72b71d6ceceee3017d3bf9a4c2ef2559c9eb8e9d92e6e25a63e SHA512 39cdee0f2732f4d09822cbb82e4674e966b1648fbdd84b4a8adaf3b734ea2e8e4b5f0d535f7d70dbf3608c23ddc0761de9c5892a5c6c73613f322dc4e71db3d2
 DIST wakeonlan-0.41.tar.gz 6028 BLAKE2B d560c7dd830daf596ffd7d797d1908d1fc90d20c6861a0e341b20eb38137b809fe1a78819f9ca729fa06f88285cfb22d0719092bed1d49d9763a7e2bb8a986bf SHA512 192ed2ad157e3f5af01632b8f2b727e232448e5a9bff6aec25298fa9913ec38f1036b665b141b5299994c88b1941d9896b6eaa92cfdb44d65db3628f50e3824f
-EBUILD wakeonlan-0.41-r2.ebuild 609 BLAKE2B a8616ca475614d081ea0b88e0827257c379793e415db0b9cb047235654d2b5f4fe662d1724087f4d0135a2c619ab18480049a860c38414e98e431d233246de77 SHA512 a3b9c3f1e9c25eaf65cdcb8d832f70d93afff920718694e544e528543137a4f66d658db80e0ecde08160e7e95210b3f7d7c77386ba7a6003b926d29adb6879f7
+EBUILD wakeonlan-0.41-r2.ebuild 656 BLAKE2B d54b3d423bdc9e563beb94b7ff7a8bd11e15c2db232125966ce2f3036efec681d521f230b71cb245503ad890a8b4c606c7e59357370009d04d5f335a8628e670 SHA512 f1d799b8372909276834149a272340471e8a97312d4c5821f53c2382159dc160f8d2b4ab8ae60f9764fddbb5ee88df0703452a532b76571a4b099241b62b93cb
 MISC metadata.xml 252 BLAKE2B d5ae1c6434a18a4052d21b9d34d573fceda4a6a37f4f0f1001fcd8c5d7d179d6f6d7df0f611b7129eddeb894dbcbf573d9c22f25dfc12fcd989900efe48b3512 SHA512 84cb947f6732467eb3137a917ea484aed7b45f56115790f8fb6595b73d0a558e03f379e239db903e4741934744c8eb10237382be10788787c684fafc854527d3
diff --git a/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild b/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild
index decf955126a0..6edc22e53535 100644
--- a/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild
+++ b/net-misc/wakeonlan/wakeonlan-0.41-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-
-inherit eutils perl-app
+GENTOO_DEPEND_ON_PERL_SUBSLOT=no
+inherit eutils perl-module
 
 DESCRIPTION="Client for Wake-On-LAN"
 HOMEPAGE="http://gsd.di.uminho.pt/jpo/software/wakeonlan/"
@@ -11,13 +11,14 @@ SRC_URI="http://gsd.di.uminho.pt/jpo/software/wakeonlan/downloads/${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
 
 src_prepare() {
 	epatch "${FILESDIR}"/"${P}"-ethers-lookup.patch
+	perl-module_src_prepare
 }
 
 src_install() {
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 74450f614455..590a189a93f1 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,4 +1,4 @@
 DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
-EBUILD wget-1.20.3-r1.ebuild 3214 BLAKE2B 1b910aac7b541f7412f253af9296bdcf3ebb3891004cefd8df2f0a28ccc9406768a910718cd21a12a4f3724fecc583bc41f671c76677ec441d1c3831dec2dd1f SHA512 eb0f81e9e0792137f01d9e7d783e0cfa2768acfdeaa36c3bb758e642607cb88950e9f3da1108c432ec1a09c021204519cd663fc6dd9da13ca9c27003b2dbab19
-EBUILD wget-1.20.3-r2.ebuild 3282 BLAKE2B ff7eeeaef719110f60e3686f9f25137c4aa59c3542cfdffdcefb4942e4cf1f19547a18e153a7bb6a0c666e48ebacbe409ec8729f389dc9abbba86d0cb4603dae SHA512 4e255cf3df386504a8040c1d9baf3bbd919f2239ca7e33aa560f7fdc9102e51e2621d8179393162ade6a19c10015e4db314c76260a05cd0a58f893321e7ab7f5
+EBUILD wget-1.20.3-r1.ebuild 3192 BLAKE2B 6752e9bc4448a2634eaf8674fa524898c348ebe3ce9ea2721be1ff515df79d1c5e8d5a63963d770fdfcce7811aea9e72805203ba80cfef9dbf671b76a1664d34 SHA512 6cc28cf552b46888cbbaad7ae6bb0dbe5fa87b582cad177a940f9cfa6bc15e01d6cdc4c8295a31f0e32b12b4ecb936c22dade35c788a2cd2d02d39d0310b5347
+EBUILD wget-1.20.3-r2.ebuild 3272 BLAKE2B 392499b16500fef79f19252115a807c038ff53f3070a43b7c4bce15a0d0ab9337284d91ddc0b7bffc8b894f035efe3fced5fe16152010eaa61af51580132df4b SHA512 c269c1c139438d6c1bc1bcff2c58c1ce0bdc09c5ac02a6eeeb25d35e4f97d5705260465a9963a030876f1372890ec079a1fa78b41462ac3d65152dc70e4ff4ca
 MISC metadata.xml 656 BLAKE2B 0616f06a26ee8dfa23132a9abf38e1a156da6365b9ac202ff1a0985c0f19b1965f156c68fea81958fb86d3282aa1b6732087060c781bfcc500efeb8bffcb5098 SHA512 9d0acbcaccf5107a6b98e460cd6dd848b2e1f4f7bae5963a65e36919ed062563854a5f4315bd1f0903f6fb7b37d7fc58bc63c05efdadbc5644f6916c8858d068
diff --git a/net-misc/wget/wget-1.20.3-r1.ebuild b/net-misc/wget/wget-1.20.3-r1.ebuild
index d71dbd3cf2a9..36f1872b43b8 100644
--- a/net-misc/wget/wget-1.20.3-r1.ebuild
+++ b/net-misc/wget/wget-1.20.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 
diff --git a/net-misc/wget/wget-1.20.3-r2.ebuild b/net-misc/wget/wget-1.20.3-r2.ebuild
index 59a3d90a05dd..2d73864ac716 100644
--- a/net-misc/wget/wget-1.20.3-r2.ebuild
+++ b/net-misc/wget/wget-1.20.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cookie_check debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
 
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 924292b8a27a..17f092db048b 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,10 +1,12 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
 DIST whois-5.5.1.tar.gz 103269 BLAKE2B c737c922b7ef5a8619e1778521da66b3507e96ed82b2fdde8fe61df22d7c40bd4494fa26b3de83e51cbeaf4811d912cbeff8de230f7bce9c0dbeb021567c2908 SHA512 bc32208e32f632b515792767c6c72a94cb66e7f42aed3dc5dc6ede3f5f28860cc279c5e6b1579db45b0f7dc6d55ec910b81cf1dfadb91354fb3833b1272b93fc
+DIST whois-5.5.2.tar.gz 103312 BLAKE2B a1b5c7ad0147dd5b9a63deed9433f31f46f141af88673e858f7316bd6ea72c632c9c804fc0691faabb992bf525d29e6c1e0106f98b6457933adab87d94f51a2d SHA512 39cb2a8eb105096d8905d9509b86750e4850808e74d5a3640c0e57185255e2ae18b322b7cfe98f2e00ad13638e5403d93c78280b0ae2477e6e7ae8a0f0b8c234
 DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084
 DIST whois_5.5.0.tar.xz 85600 BLAKE2B 37c90324e1b7c773793e1eaff70816f90a6429ab91bafcff36dfa02ea09b4eb5e83b8cd36e1ca0bc5eb3a043f1973f4479037de38cf41a7b7ac646845697636f SHA512 a26730613b8019385e48c7432bcc9871984a7035e53e56188a876e70e255a1adf23d546dfeb1706879af5c4a8f2231976fe89d2571b3d2cb6d615a7834a2d876
-EBUILD whois-5.4.3.ebuild 1583 BLAKE2B a143d22a2f6f7e91122449ee15947fad9d28cb57a7995af6068f36b2d06ee82090f501a86b3d5185b3471edad319f064c0b8c485a6cd80f5beb186d3fae38b6b SHA512 b6b2d2d1e38cfc198859c969de3c870e6624b2746cfb197726cc554b8036035a6bdc09f453997c9b49b8d7ba9cc523cb8fe62d4ed3332c6e573566f62be8458e
-EBUILD whois-5.5.0.ebuild 1624 BLAKE2B 5b6225e917c0746a4db7390d3a2871eb5701604d80747a1fab174beecc82bb08c6776f958bb907ffbfc78077b9035214716f6c7ae8babedb7808c4d49a1d5f76 SHA512 81be69cb9c3a681e371aa44080aa1fc8c89d718a5474072d472c99204a0ac2c78362f1e4a5d242912196ebfe7338c148adf1ab27c79cbaf4e401946639be9b2f
-EBUILD whois-5.5.1.ebuild 1790 BLAKE2B 35e07b65f4ae1ad45a8210e65956ec75568c638b91527d87e9c9ca49ed96667414eaafa4f91c4a2dffa388e6f75bfa3621286b08fa07dfd8ee3f0fcfb4cfffd8 SHA512 386833c1f4dababde9f75d8885828c84c0fdbe2697bef7418eb8784444b1b9719ce52171e9890b6ad5b95ea2008af766093756232f4774885c61b729ae70ab88
-EBUILD whois-9999.ebuild 1790 BLAKE2B 35e07b65f4ae1ad45a8210e65956ec75568c638b91527d87e9c9ca49ed96667414eaafa4f91c4a2dffa388e6f75bfa3621286b08fa07dfd8ee3f0fcfb4cfffd8 SHA512 386833c1f4dababde9f75d8885828c84c0fdbe2697bef7418eb8784444b1b9719ce52171e9890b6ad5b95ea2008af766093756232f4774885c61b729ae70ab88
+EBUILD whois-5.4.3.ebuild 1573 BLAKE2B 9308d736931da85ca666b44725576371eba07b91e8db65c22e1ff5394b5a09cff13b25c856fd2b7e53c57cb7a1a2263d3ee5b865f4432749c7ace193e375ab00 SHA512 be379cd50b6b169809d04e451420068802cfbd5ab2821f353ce318cf94b03217f5e072118153a6d516b30c4427e2d6ba041f6ccdd88bcee7e1945d91412de6c0
+EBUILD whois-5.5.0.ebuild 1614 BLAKE2B e0cba205cc21bab7adde1030ad3afd5161d5002f9b85bbad8df8195c196dd88e82155b257db8ecb4525ad07b1a8b7ddee78f5f975880459b9c35ed9f9e8cc9b1 SHA512 0b5a1d9c8375cb58c6a5569b53a70320b7b794e605d328b644627fd6b100a65f4dd291bc0d7bd215475c7c76b5482d6ef7f660f4086a9dd791cee3d06b9befb1
+EBUILD whois-5.5.1.ebuild 1780 BLAKE2B 31fb99160417ba67d2f2e5867f22d558bf53ac1222ac00b3161a83e770eda8cfe9fd9fc5ad269d4982ae8d7696d9bbc3ccaaf43517a07924b7f32d7350746293 SHA512 e067181f4cdfce4e0640181349b673a4217bba36470dcc1390645bbb79d078ea83e3d8f10cfb2a1d78963e320b9ee8f628ca3fcbb38f0478a62985df785545b1
+EBUILD whois-5.5.2.ebuild 1780 BLAKE2B 31fb99160417ba67d2f2e5867f22d558bf53ac1222ac00b3161a83e770eda8cfe9fd9fc5ad269d4982ae8d7696d9bbc3ccaaf43517a07924b7f32d7350746293 SHA512 e067181f4cdfce4e0640181349b673a4217bba36470dcc1390645bbb79d078ea83e3d8f10cfb2a1d78963e320b9ee8f628ca3fcbb38f0478a62985df785545b1
+EBUILD whois-9999.ebuild 1780 BLAKE2B 31fb99160417ba67d2f2e5867f22d558bf53ac1222ac00b3161a83e770eda8cfe9fd9fc5ad269d4982ae8d7696d9bbc3ccaaf43517a07924b7f32d7350746293 SHA512 e067181f4cdfce4e0640181349b673a4217bba36470dcc1390645bbb79d078ea83e3d8f10cfb2a1d78963e320b9ee8f628ca3fcbb38f0478a62985df785545b1
 MISC metadata.xml 335 BLAKE2B 105a64d3c2f98d051101083c04232489e806ea86a66e27bbd33ebaf00cd7ce3cde1e4cce051adf86c6b61201973f9aec9c10f5b49f11586208260b7d7b40b292 SHA512 81d7c5fe370408b1cd3470c7e6b46127a8de700db07da3b0c7416263d7f0f7558da56dd2256cb4120a2fd398765d8a295436a517fbd0e9313d6abe9f5358d51d
diff --git a/net-misc/whois/whois-5.4.3.ebuild b/net-misc/whois/whois-5.4.3.ebuild
index f4696e127de9..8520516f71bb 100644
--- a/net-misc/whois/whois-5.4.3.ebuild
+++ b/net-misc/whois/whois-5.4.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
diff --git a/net-misc/whois/whois-5.5.0.ebuild b/net-misc/whois/whois-5.5.0.ebuild
index d118bdf63855..8281aeeca5bf 100644
--- a/net-misc/whois/whois-5.5.0.ebuild
+++ b/net-misc/whois/whois-5.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="iconv idn nls"
 RESTRICT="test" #59327
 
diff --git a/net-misc/whois/whois-5.5.1.ebuild b/net-misc/whois/whois-5.5.1.ebuild
index f4e5388d3fd4..8b649d81bce7 100644
--- a/net-misc/whois/whois-5.5.1.ebuild
+++ b/net-misc/whois/whois-5.5.1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/whois/whois-5.5.2.ebuild b/net-misc/whois/whois-5.5.2.ebuild
new file mode 100644
index 000000000000..8b649d81bce7
--- /dev/null
+++ b/net-misc/whois/whois-5.5.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${P/-/_}"
+DESCRIPTION="improved Whois Client"
+HOMEPAGE="https://github.com/rfc1036/whois"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
+else
+	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
+	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="iconv idn nls"
+RESTRICT="test" #59327
+
+RDEPEND="iconv? ( virtual/libiconv )
+	idn? ( net-dns/libidn2:= )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	>=dev-lang/perl-5
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
+	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
+)
+
+src_prepare() {
+	default
+	if use nls ; then
+		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
+	else
+		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
+
+		# don't generate po files when nls is disabled (bug #419889)
+		sed -i -e '/^all:/s/ pos//' \
+			-e '/^install:/s/ install-pos//' Makefile || die
+	fi
+}
+
+src_configure() { :; } # expected no-op
+
+src_compile() {
+	unset HAVE_ICONV HAVE_LIBIDN
+	use iconv && export HAVE_ICONV=1
+	use idn && export HAVE_LIBIDN=1
+	tc-export CC
+	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_install() {
+	emake BASEDIR="${ED}" prefix=/usr install
+	insinto /etc
+	doins whois.conf
+	dodoc README debian/changelog
+
+	if [[ ${USERLAND} != "GNU" ]]; then
+		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
+		mv "${ED}"/usr/bin/{whois,mdwhois} || die
+	fi
+}
diff --git a/net-misc/whois/whois-9999.ebuild b/net-misc/whois/whois-9999.ebuild
index f4e5388d3fd4..8b649d81bce7 100644
--- a/net-misc/whois/whois-9999.ebuild
+++ b/net-misc/whois/whois-9999.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
 	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index 5e9652122e0c..31a656034f98 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 483 BLAKE2B 6b4de653582a5ae031b656172f7c12f3a8d84c5f2423c7fda12d08b5d14ef46b40b7c2bc76cba052b5aa6bced9ae483f3b95f180d0b0aa6bf2a3bd554af23a9c SHA512 c48b48262ca61fe6bcc9ef5905edda43c30bd50137f21f11c9e9286152c182680f19682a261aecba92dcad4875695ff92d28cf2345ac7e18a6329a71b8056231
+EBUILD wol-0.7.1-r1.ebuild 391 BLAKE2B b52ef1bcb4732b58edd4a0c6bc8d8de51eff4238e9714d9df05d1e38c3d97fffdb057c805278bf48568bf2a5665e6c848daf900800054e7a475b8cc3f3ab5a53 SHA512 afd52d0860c638bf12f4a659598f61b504d0cb0a3d59e3346dc53f70ce1ae8e5c1c0222eb5a07bbe94b9d5c94895a3e00126f375ab2ef17db64241e735a81959
+EBUILD wol-0.7.1-r2.ebuild 471 BLAKE2B fbe9ade399105163772079e0a4972125dddbb4df2cdfdeec87aa4f1137576024ed73c1717af5a73b78732c51ffeb979887e572a19fc0de098af79bc2343b7dfb SHA512 b55886cb62902f399ba2c47af738eec49fec4626c7b53ea8bedb3def11644a00a653bf5d915d51c87b494566ce42594a39849c0bbced4867525834d0dda3b206
 MISC metadata.xml 735 BLAKE2B 6c3b6199ccb776a5ad5b817d70e72da0416207f98fd3b7bcf082f98088e592535da06571fe4f77c82d40b456e55271f3084ccff2f64e4c5cd610c31cd24c44e8 SHA512 0cff2c4127942f5dc455beeb78c63a271451a7ae38e03e53dace85c64353fc9214e803f67d39996289096b19e60ec2ae5ff3a4be61dd7a2570d9c9864182fcb7
diff --git a/net-misc/wol/wol-0.7.1-r1.ebuild b/net-misc/wol/wol-0.7.1-r1.ebuild
index 7b4fd2794d93..ddb2e8ea3fd3 100644
--- a/net-misc/wol/wol-0.7.1-r1.ebuild
+++ b/net-misc/wol/wol-0.7.1-r1.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"
 IUSE="nls"
 
 src_configure() {
diff --git a/net-misc/wol/wol-0.7.1-r2.ebuild b/net-misc/wol/wol-0.7.1-r2.ebuild
index d6279676502c..5e38e31fd64a 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"
 IUSE="nls"
 
 src_configure() {
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 3e60c83bc82a..fdaca2cfaa5b 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,4 @@
-DIST youtube-dl-2019.09.12.1.tar.gz 3180312 BLAKE2B 0fb4f6fdba490407c655645823ebdabff443e8bc0490a0c54865cc4e0d2da0fe27a9eb297e521084a412b1dacd6afb988f5c167f3643a6783bf9d4f52a49b980 SHA512 8177165cab21e83d1e1012c3d56e5182816f2367322eeea526c6d18aa74d35271a4625c6663204c0a5206976dbe32c97cdcd22b000e4e8e23a1073b474345eb3
-EBUILD youtube-dl-2019.09.12.1.ebuild 2124 BLAKE2B 608cd130bf27ff5253236fea27c22981fd804fa73e49ee6d0e67173d1840bd266349334f041307b4fe82c7a0708ae1a032d8f3d113dda7e0931197267f4b1246 SHA512 7ff84adcc79769d2acd9f9baa88e6f4222c65e8c892de335200e0f27d2aa15dc839241363bd2f58a6fe37e0af1345b072c5147a2205a927caeb9b9540dc17f72
+DIST youtube-dl-2019.09.28.tar.gz 3181163 BLAKE2B e3e7b166f07cbbbe8f77c7116254000d5c864efcc2701533a7f7aa296450323a27072509acabd5a1be27c5aab208037e5545aa21e152b14ea0374e1c629c3ef5 SHA512 b5d5034f9ace17ee18b550b825431797b49d1f916963d483c95a737a3f2842c4c916f6d24f2056efbb786ed3c2ddf269f28f736a650a47b7ff0f94256aba4e94
+EBUILD youtube-dl-2019.09.28.ebuild 2124 BLAKE2B 608cd130bf27ff5253236fea27c22981fd804fa73e49ee6d0e67173d1840bd266349334f041307b4fe82c7a0708ae1a032d8f3d113dda7e0931197267f4b1246 SHA512 7ff84adcc79769d2acd9f9baa88e6f4222c65e8c892de335200e0f27d2aa15dc839241363bd2f58a6fe37e0af1345b072c5147a2205a927caeb9b9540dc17f72
 EBUILD youtube-dl-99999999.ebuild 1997 BLAKE2B 7b5974dc4df22cbb2fb7d87f60e73b2fddc7117331a6a81e8e9f0efef84788211d5fdefb1c96e9d4df0677fda2d264ef2846f36e60a890233fa79b06722b2abb SHA512 71019b536d5301dfbd5e9cb8085d1a001854f5bf204c0e76866c16a9553516a55081c17396bcc89c0128e44116b6e2dc451541b7e89d677822f3d541b316d5c5
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.09.12.1.ebuild b/net-misc/youtube-dl/youtube-dl-2019.09.28.ebuild
index 8b7913f66a7d..8b7913f66a7d 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.09.12.1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.09.28.ebuild
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index a233f69810f8..76fe5c2811be 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -2,11 +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
-<<<<<<< HEAD
-EBUILD youtube-viewer-3.5.5.ebuild 2079 BLAKE2B 7757729231aff1136e15af651df558b62f015d0da273111ead2085461e52b65e3f5fb70df8fe132231ae4f1e80d99ac48e5f64191d9695c85985b58b23d16648 SHA512 72ac6fe280939c42eeaf44c6e2d2827db79eda151d88dd212ac6d378f70607e1e816e74429acd2d241a967fbb9d4e2376b3706965df8bb5bfda471a02d976d5c
-=======
-EBUILD youtube-viewer-3.5.5.ebuild 2078 BLAKE2B 1837ac6173adf5ef912ee24629aab1ed60bd4b517afdb837bed91c116db388b781420ed8090922e4e382b9b8a0e5b3f8e8285bc4cb50e30562eb0b704236006b SHA512 0de363b4f06f55e7f474140984cefcc3fe0c279fd0733841ce2b200aa4d10b1324b7018c869b71210b4e0b4d93bdb70439c766338bfca88c7dd090d77215dac9
->>>>>>> next
+EBUILD youtube-viewer-3.5.5.ebuild 2077 BLAKE2B aeccdf3f4c52ef9c7c1d87fcf73abbaae60ed073379e8d49296555cefa04a8a4a35377a5813701de4434473efd9b7f93122b4432aab38f713b5840a16c28533e SHA512 e643fd7e4b39e992619b4c16acc4fbd23ff5227348a3d0379a67cb4608164c7115bcd5737db3e3be4075182ed963aa646e194715ea19162ad3698a4701e55181
 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 49098eec05de..c3fb66845352 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="
author	V3n3RiX <venerix@redcorelinux.org>	2019-10-13 22:19:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-10-14 23:22:23 +0100
commit	4b19be30aa626b327c885dae62c559ec0e9fb935 (patch)
tree	76e74807bc479502e13866b581b6bf86734ec634 /net-misc
parent	30d6f67c98d149508509d5e86f176d558793acc0 (diff)