gentoo resync : 05.04.2019

84 files changed, 1860 insertions, 630 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b51d29db4de0..6311d6ebd1dd 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index ef61941075c5..5734e8f6a2b5 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,4 +1,6 @@
 AUX aria2-1.34.0-make_unique.patch 1403 BLAKE2B 115ba6241c92d622e49a7059aabec6925b7c8a1a0ef1ccd1a17f812d6289b2aa62a0cac5e12daeff442124a8eae7ceaafcaa9ea6420873d1fef060ae4263e3a0 SHA512 f49ae23e698acbc13c4455efa6edff4fb7f467b94711ed10ad34e8898d96985f401295d5402d66a410ad8e946a39d586f6d082f5393884963ddaf8fa10601af0
+AUX aria2-1.34.0-mask-headers.patch 1972 BLAKE2B 8efec9b9beeee5c763db29287931869cd69fde9883a7fab1f5f7fe48948ee62ef25df10fe855230fd082ce6a442f3eb00da8bf16b1f443573140868656f21969 SHA512 e81d6cf69652b4a2adb67a13434d3e37f1c69ce2a99a8d4b12f3e056c6c530218d6593aaeb1ca8b2691e4f28a0d53b29319d067c4f89eb0e4b2e8368f1c38319
 DIST aria2-1.34.0.tar.xz 1525908 BLAKE2B 479145af229f5fe864e54c511197bedb306199dbda608416aa295930a8392c7a118993b5a1634db20b380ab448cc8a397a351b6b64560ca263a0818d47a1ae64 SHA512 80bc43e242c06acc95030021cb347b4ec230729f3d7e512ca1932941b34ef95c312a34007a226869e5d720839a400e66cdb072ccab5d42228d8cf3d828723dcc
+EBUILD aria2-1.34.0-r1.ebuild 4420 BLAKE2B 9863ef347931ea57fc9286961d8baecd19ac7b0c51daf3bdad20c755f256dbc6162fde58ea75712cddd06822545e339fcffefac6ce01b5d0648a3ceeda49ff07 SHA512 658133f76ad988ed3cd1e247efd17b26f719c6a927e15958dac62b506e472447ac8ad0756c54902b2c6d532089198bf47efe5839e1b7db4d35cee716d8ae46a2
 EBUILD aria2-1.34.0.ebuild 4322 BLAKE2B 8348642130cd7dc2707a417a90385ee4c3c292a6375acd89f37aa698c6d146982316c74d8286ad5eb715fb9d0330f60ba2f4ae4c59d6bc7a768750de9bbac192 SHA512 cffd85573414498aa96533c4b04d033330dfd5b573ab60abebb8ff93d141c5f715e9d6083ef5f888c3581a188d076b7401a06207f9d023766e321833cefed9f2
 MISC metadata.xml 1195 BLAKE2B 393ba5f1d8bc975cbf2a7f4a7deef2929e5f8f3220895628535d5c9e78bb154c2b41a11628d4bfc30475936051c8b6975d6e1146dd4af612e10307572e6c361f SHA512 54ffe27c3c623befb40e1b66df8b4a6cfe9bc1101f65d6641ddc27de686cc0df600e72650f92c89402fdc30f535462ed1f0a6561967771a8e5c0d648890a9208
diff --git a/net-misc/aria2/aria2-1.34.0-r1.ebuild b/net-misc/aria2/aria2-1.34.0-r1.ebuild
new file mode 100644
index 000000000000..1522945364e2
--- /dev/null
+++ b/net-misc/aria2/aria2-1.34.0-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit bash-completion-r1
+
+DESCRIPTION="A download utility with segmented downloading with BitTorrent support"
+HOMEPAGE="https://aria2.github.io/"
+SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
+
+CDEPEND="sys-libs/zlib:0=
+	ssl? (
+		app-misc/ca-certificates
+		gnutls? ( >=net-libs/gnutls-1.2.9:0= )
+		!gnutls? ( dev-libs/openssl:0= ) )
+	adns? ( >=net-dns/c-ares-1.5.0:0= )
+	bittorrent? (
+		ssl? (
+			gnutls? (
+				nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
+				!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
+		!ssl? (
+			nettle? ( >=dev-libs/nettle-2.4:0=[gmp] >=dev-libs/gmp-6:0= )
+			!nettle? ( >=dev-libs/libgcrypt-1.2.2:0= ) ) )
+	jemalloc? ( dev-libs/jemalloc )
+	libuv? ( >=dev-libs/libuv-1.13:0= )
+	metalink? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )
+	sqlite? ( dev-db/sqlite:3= )
+	ssh? ( net-libs/libssh2:= )
+	tcmalloc? ( dev-util/google-perftools )
+	xmlrpc? (
+		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
+		!libxml2? ( dev-libs/expat:0= ) )"
+
+DEPEND="${CDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-util/cppunit-1.12.0:0 )"
+RDEPEND="${CDEPEND}
+	nls? ( virtual/libiconv virtual/libintl )
+	scripts? ( dev-lang/ruby )"
+
+# xmlrpc has no explicit switch, it's turned out by any XML library
+# so metalink implicitly forces it on
+REQUIRED_USE="?? ( jemalloc tcmalloc )
+	metalink? ( xmlrpc )"
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	if use scripts && ! use xmlrpc; then
+		ewarn "Please note that you may need to enable USE=xmlrpc to run the aria2rpc"
+		ewarn "and aria2mon scripts against the local aria2."
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-make_unique.patch
+	# https://bugs.gentoo.org/674622 (CVE-2019-3500)
+	eapply "${FILESDIR}"/${P}-mask-headers.patch
+	default
+	sed -i -e "s|/tmp|${T}|" test/*.cc test/*.txt || die "sed failed"
+}
+
+src_configure() {
+	local myconf=(
+		# threads, epoll: check for best portability
+
+		# do not try to compile and run a test LIBXML program
+		--disable-xmltest
+		# enable the shared library
+		--enable-libaria2
+		# zlib should always be available anyway
+		--with-libz
+		--with-ca-bundle="${EPREFIX}/etc/ssl/certs/ca-certificates.crt"
+
+		# optional features
+		$(use_enable bittorrent)
+		$(use_enable metalink)
+		$(use_enable nls)
+		$(use_with adns libcares)
+		$(use_with jemalloc)
+		$(use_with libuv)
+		$(use_with sqlite sqlite3)
+		$(use_with ssh libssh2)
+		$(use_with tcmalloc)
+	)
+
+	# SSL := gnutls / openssl
+	# USE=ssl
+	#  + USE=gnutls -> gnutls
+	#  + USE=-gnutls -> openssl
+
+	if use ssl; then
+		myconf+=( $(use_with gnutls) $(use_with !gnutls openssl) )
+	else
+		myconf+=( --without-gnutls --without-openssl )
+	fi
+
+	# message-digest := nettle / gcrypt / openssl
+	# bignum := nettle+gmp / gcrypt / openssl
+	# bittorrent := message-digest + bignum
+	# USE=bittorrent
+	#  + USE=(ssl -gnutls) -> openssl
+	#  + USE=nettle -> nettle+gmp
+	#  + USE=-nettle -> gcrypt
+
+	if use !bittorrent || use ssl && use !gnutls; then
+		myconf+=( --without-libgcrypt --without-libnettle --without-libgmp )
+	else
+		myconf+=( $(use_with !nettle libgcrypt)
+			$(use_with nettle libnettle) $(use_with nettle libgmp) )
+	fi
+
+	# metalink+xmlrpc := libxml2 / expat
+	# USE=(metalink || xmlrpc)
+	#  + USE=libxml2 -> libxml2
+	#  + USE=-libxml2 -> expat
+
+	if use metalink || use xmlrpc; then
+		myconf+=( $(use_with !libxml2 libexpat) $(use_with libxml2) )
+	else
+		myconf+=( --without-libexpat --without-libxml2 )
+	fi
+
+	# Note:
+	# - always enable gzip/http compression since zlib should always be available anyway
+	# - always enable epoll since we can assume kernel 2.6.x
+	# - other options for threads: solaris, pth, win32
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -rf "${D}"/usr/share/doc/aria2 \
+		"${D}"/usr/share/doc/${PF}/README{,.html}
+
+	dobashcomp doc/bash_completion/aria2c
+	use scripts && dobin doc/xmlrpc/aria2{mon,rpc}
+}
+
+pkg_postinst() {
+	if use xmlrpc; then
+		elog "If you would like to use the additional aria2mon and aria2rpc tools,"
+		elog "you need to have \033[1mdev-lang/ruby\033[0m installed."
+	fi
+}
diff --git a/net-misc/aria2/files/aria2-1.34.0-mask-headers.patch b/net-misc/aria2/files/aria2-1.34.0-mask-headers.patch
new file mode 100644
index 000000000000..694681d88859
--- /dev/null
+++ b/net-misc/aria2/files/aria2-1.34.0-mask-headers.patch
@@ -0,0 +1,46 @@
+From 37368130ca7de5491a75fd18a20c5c5cc641824a Mon Sep 17 00:00:00 2001
+From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
+Date: Sat, 5 Jan 2019 09:32:40 +0900
+Subject: [PATCH] Mask headers
+
+---
+ src/HttpConnection.cc | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc
+index 77cb9d27a..be5b97723 100644
+--- a/src/HttpConnection.cc
++++ b/src/HttpConnection.cc
+@@ -102,11 +102,17 @@ std::string HttpConnection::eraseConfidentialInfo(const std::string& request)
+   std::string result;
+   std::string line;
+   while (getline(istr, line)) {
+-    if (util::startsWith(line, "Authorization: Basic")) {
+-      result += "Authorization: Basic ********\n";
++    if (util::istartsWith(line, "Authorization: ")) {
++      result += "Authorization: <snip>\n";
+     }
+-    else if (util::startsWith(line, "Proxy-Authorization: Basic")) {
+-      result += "Proxy-Authorization: Basic ********\n";
++    else if (util::istartsWith(line, "Proxy-Authorization: ")) {
++      result += "Proxy-Authorization: <snip>\n";
++    }
++    else if (util::istartsWith(line, "Cookie: ")) {
++      result += "Cookie: <snip>\n";
++    }
++    else if (util::istartsWith(line, "Set-Cookie: ")) {
++      result += "Set-Cookie: <snip>\n";
+     }
+     else {
+       result += line;
+@@ -154,8 +160,8 @@ std::unique_ptr<HttpResponse> HttpConnection::receiveResponse()
+   const auto& proc = outstandingHttpRequests_.front()->getHttpHeaderProcessor();
+   if (proc->parse(socketRecvBuffer_->getBuffer(),
+                   socketRecvBuffer_->getBufferLength())) {
+-    A2_LOG_INFO(
+-        fmt(MSG_RECEIVE_RESPONSE, cuid_, proc->getHeaderString().c_str()));
++    A2_LOG_INFO(fmt(MSG_RECEIVE_RESPONSE, cuid_,
++                    eraseConfidentialInfo(proc->getHeaderString()).c_str()));
+     auto result = proc->getResult();
+     if (result->getStatusCode() / 100 == 1) {
+       socketRecvBuffer_->drain(proc->getLastBytesProcessed());
diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
index 12ce33132e73..e61dac1aa809 100644
--- a/net-misc/cgminer/Manifest
+++ b/net-misc/cgminer/Manifest
@@ -1,5 +1,5 @@
 DIST cgminer-4.10.0.tar.bz2 1306225 BLAKE2B 29d34e5d9246fc5b0409a1647e4ddf291f1e7610888110c1917ddbc1c30a9d0301bb70dba187690f2685b2fd476d5c0b0cd65e87fafa56b62a7f3a0202a374de SHA512 ed39bffa51715756875c101f4aaf984cab566fc1c8b657f6da37d0cdf921faee752c3efadf97c98ca6e749175457fbc2c37e9332cd26d2ff1675752250ac21db
 DIST cgminer-4.9.2.tar.bz2 1476371 BLAKE2B 01ff700cb5dc2fb12709da41aeaa22c6fc6b9dc6fb1e12116eef3a382ad328961b8d6ddd6ac6fce47ab8084c96e1a7be74a697b3d885c7e78dfadf07b678ad24 SHA512 48371657c84f09ad8c500a29ca85f35af70eb8720d9d97b565cd8c5356289d889ee60c06f37c0507a53c8f50ae827a77fa0c41609bac6b1e8849ad26b55d67d4
-EBUILD cgminer-4.10.0.ebuild 2472 BLAKE2B a115a700eed1cf043865c4cc83ca0bfee50feaad74e90d42ac70d1decf8b40a4de6bf8d8834d75021754872e0d16be4547a7d1f326a04734b874b966389c3d83 SHA512 23f365350fa8fec10adb922674fc1f4f6aa41cfeb9687df55a05593d19fdfc256b75ec2a960b4d5a2fd691349a58a6af53d4cd00cfb9394f15c4d172d2897f3f
-EBUILD cgminer-4.9.2.ebuild 2394 BLAKE2B 6ce5b161deb01d273c92b90bbc3f33cff3eec09df2ecabd00ca34540f76b433150e9e8f99180d2063fbcd112929e95a15cac84daa7c4b887958e5b58663e41c4 SHA512 b696ca5383154324826cb2aec76b8ba8db973001cd9dafd1a782edeb02ff65425c10161f8ba70d3a9033b7ce2727dd3b39bb68601a1e82207a112bc5ae4693e2
+EBUILD cgminer-4.10.0.ebuild 2535 BLAKE2B 209b11cdd7ea3dea70747378e290ddf89e1d346c67865c68d3f4c280c24464e53af95e8e7fee26753665f764695413d41e3e82ad17669efca3a095a2fe38f2cf SHA512 8c118c370b87d5305b017978c6f2109c1686220408c654815c37bce3889e40c67c1efe04fb19d388bf238e3aeda3b759d1a9f801cb110095e36dc2358d7ec58a
+EBUILD cgminer-4.9.2.ebuild 2392 BLAKE2B 7579e4fd7d03d4dfeb6ad364ee14f64e6aff87cc5736ccaf6f005abd76d669e54b5e5ed1675a1e5b40c6f03a63d5ada7d3b063474007937518a7d8ebc1547216 SHA512 916b5e886acd4643624417b51678913615c5cb05bcdbb735e543a92653e10948720d9cd7e5f7f16b1ffe544e50aaed6115d850460f77f13cc024d3ac10bb47f4
 MISC metadata.xml 2137 BLAKE2B 8bb2fd05a390c5c5ec5ca3dde384ab611311d50256668208184dfb978ac5a0debd75ec63cd35159dcde36b2a964d0bedf6aaf3422261f998f2262c1007c3ab29 SHA512 6cf1454188266ffdab67a7caa27ece041cfc4c3cb4fc76b7fe5fa24bed30002df717afe4e8693532a4f78b077374200cb2a9e91b460372193f1b623238d50b38
diff --git a/net-misc/cgminer/cgminer-4.10.0.ebuild b/net-misc/cgminer/cgminer-4.10.0.ebuild
index c635781c2f25..1ac87f413dbc 100644
--- a/net-misc/cgminer/cgminer-4.10.0.ebuild
+++ b/net-misc/cgminer/cgminer-4.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Bitcoin CPU/GPU/FPGA/ASIC miner in C"
 HOMEPAGE="https://bitcointalk.org/?topic=28402.msg357369 https://github.com/ckolivas/cgminer"
@@ -24,46 +24,50 @@ RDEPEND="net-misc/curl
 	virtual/libusb:1[udev]
 	ncurses? ( sys-libs/ncurses:0= )
 	udev? ( virtual/libudev )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
-	use hardened && append-cflags "-nopie"
+	use hardened && append-cflags "-no-pie"
 
 	# PKG_CHECK_MODULES needs PKG_CONFIG for --with-system-jansson.
-	export PKG_CONFIG=/usr/bin/pkg-config
-	econf $(use_with ncurses curses) \
-		$(use_enable ants1) \
-		$(use_enable ants2) \
-		$(use_enable ants3) \
-		$(use_enable avalon) \
-		$(use_enable avalon2) \
-		$(use_enable avalon4) \
-		$(use_enable avalon7) \
-		$(use_enable avalon-miner) \
-		$(use_enable bab) \
-		$(use_enable bitmine_A1) \
-		$(use_enable bflsc) \
-		$(use_enable bitforce) \
-		$(use_enable bitfury) \
-		$(use_enable blockerupter) \
-		$(use_enable cointerra) \
-		$(use_enable drillbit) \
-		$(use_enable hashfast) \
-		$(use_enable hashratio) \
-		$(use_enable icarus) \
-		$(use_enable klondike) \
-		$(use_enable knc) \
-		$(use_enable minion) \
-		$(use_enable modminer) \
-		$(use_enable sp10) \
-		$(use_enable sp30) \
-		$(use_enable udev) \
-		--disable-forcecombo \
-		--with-system-libusb \
+	export PKG_CONFIG="$(tc-getPKG_CONFIG)"
+	local myeconfargs=(
+		$(use_with ncurses curses)
+		$(use_enable ants1)
+		$(use_enable ants2)
+		$(use_enable ants3)
+		$(use_enable avalon)
+		$(use_enable avalon2)
+		$(use_enable avalon4)
+		$(use_enable avalon7)
+		$(use_enable avalon-miner)
+		$(use_enable bab)
+		$(use_enable bitmine_A1)
+		$(use_enable bflsc)
+		$(use_enable bitforce)
+		$(use_enable bitfury)
+		$(use_enable blockerupter)
+		$(use_enable cointerra)
+		$(use_enable drillbit)
+		$(use_enable hashfast)
+		$(use_enable hashratio)
+		$(use_enable icarus)
+		$(use_enable klondike)
+		$(use_enable knc)
+		$(use_enable minion)
+		$(use_enable modminer)
+		$(use_enable sp10)
+		$(use_enable sp30)
+		$(use_enable udev)
+		--disable-forcecombo
+		--with-system-libusb
 		--with-system-jansson
+	)
+	econf "${myeconfargs[@]}" \
+	NCURSES_LIBS="$(${PKG_CONFIG} --libs ncurses)"
 	# sanitize directories (is this still needed?)
-	sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer"'"~' config.h
+	sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer"'"~' config.h || die
 }
 
 src_install() { # How about using some make install?
diff --git a/net-misc/cgminer/cgminer-4.9.2.ebuild b/net-misc/cgminer/cgminer-4.9.2.ebuild
index 68b775d5d850..6cf544e6b085 100644
--- a/net-misc/cgminer/cgminer-4.9.2.ebuild
+++ b/net-misc/cgminer/cgminer-4.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ DEPEND="virtual/pkgconfig
 	${RDEPEND}"
 
 src_configure() {
-	use hardened && append-cflags "-nopie"
+	use hardened && append-cflags "-no-pie"
 
 	# PKG_CHECK_MODULES needs PKG_CONFIG for --with-system-jansson.
 	export PKG_CONFIG=/usr/bin/pkg-config
diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest
index ab7d9d283252..93d7c04d43b9 100644
--- a/net-misc/cmst/Manifest
+++ b/net-misc/cmst/Manifest
@@ -1,3 +1,5 @@
 DIST cmst-2018.01.06.tar.gz 2556728 BLAKE2B f718c85467bac2d7a42b478f1d51ba71b1453c5f00fa574884bf33d4efe669fd4558394b6132208f708f34ee7be2b7458dd5e8967edb557cb54c846914ca9e0f SHA512 abf6b4cb81c91e2432e0891bd9e5481d2752833a1c7eda1abbbe1bf456b35d422d3f02e6f2db328aec888d9a92cbd41862faab46b8814f3efca843f0a1d4e02a
+DIST cmst-2019.01.13.tar.gz 2576200 BLAKE2B 4b1c75c479651887a14d5b4266a99a36667c1d02f114c4a9886b5aaec445e320fc684d42793312d68e4eb3386ea8516aef3cecb705e37f8b9a88ea8bf5bcf512 SHA512 ba7cf94263b4908dc2a609216f82bd758ad727f623d65b2e876a02c1fd956b7090a8222e953a0cd2da9527eddaab918e9c735381c705b9943e9e8aaeeb00d835
 EBUILD cmst-2018.01.06.ebuild 799 BLAKE2B 2a52a592e02eeace72ba02f736f744245c4f52bcd51936bef9e2a4a675ea3071b2b1e5a926f3cd3ed246e1880c9c3ac13ac68b873b719acf525d33a9e395b95e SHA512 b68bce9a10fdfece2c8eb7e63d2b094380a5f3148f0db4a2d16a5ec1f8da9ae6270b5eb5e943f25601a7e2363b50587e42a137302283379d6ac9d1248defaac8
-MISC metadata.xml 392 BLAKE2B 01f7ec078f6ca194bcb70be8417514a679b8c507ffcf78742249148e12d1425873c76e90e922d0831b8bd99c8226943d18352bf0df36984fdceb88edbc7bc2c0 SHA512 c6858ace643af313f0d47a863cbf117261f7ef419b02c874c34b3a8c64269570f6a9d4f004ee4645cc6eb673d2f5448f5fdbb291d51c322eaf806e28227ff2cd
+EBUILD cmst-2019.01.13.ebuild 796 BLAKE2B 86413d2ec6be45ecd3fa84ad988dc0065aac1d70acced16d238e01a47782e23074e1593f09a5fe4e0cb5e0c9526a23888cd83c12fe0a66df08f4f76230b4ecf3 SHA512 064c36a0af8671e115730c6dba0f22537295d75e4755ad78442c3933c44d08f8a6588073671ff62e3c16368a1becb938f11b3642b3df9bf4e93d8ca022494550
+MISC metadata.xml 389 BLAKE2B fa4bcb790a8e29dcfb5d87f3b675824dbd909a148253470189db24b6bd9b4282d1ddbd1dbedaec31f4d0dbe07cfdff0cc7331d6863842f5db7e597e7614698ee SHA512 b589825d436c4ad3b0781acc5b64cf044f056a70ca72f52cb0341b05e87bf8b269049dcef4e7a6acb8bd76c3a909eaa7c8a0bd77794e7266eb8e7cb7f6fbf7ad
diff --git a/net-misc/cmst/cmst-2019.01.13.ebuild b/net-misc/cmst/cmst-2019.01.13.ebuild
new file mode 100644
index 000000000000..d1d49322c148
--- /dev/null
+++ b/net-misc/cmst/cmst-2019.01.13.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="Qt GUI for Connman with system tray icon"
+HOMEPAGE="https://github.com/andrew-bibb/cmst"
+SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	net-misc/connman
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	eqmake5 DISTRO=gentoo
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	rm -r "${D}"/usr/share/licenses || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/cmst/metadata.xml b/net-misc/cmst/metadata.xml
index 9bea61da3108..bffb5a3e1299 100644
--- a/net-misc/cmst/metadata.xml
+++ b/net-misc/cmst/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
 	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/andrew-bibb/cmst/issues</bugs-to>
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index 9f2d027d51ea..976b8a50d666 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -1,9 +1,5 @@
-DIST cni-plugins-0.7.1.tar.gz 862546 BLAKE2B 9d13c616396017e3cb54dfdd5bde2c06d2ad572e55009b883d82757c173119694a40157f28fce5818bb8bd33325f2edb0ec197ff77aa2ab08615bfc55ce2bbe8 SHA512 23d3b35c22fdc85d087922fb59c63622a9283ff11d34d1a1043c323f9b07b3837418f333d2f2ab9c6a22514351d71aeeab6a57234b14f53ba29847cffa382ea0
-DIST cni-plugins-0.7.2.tar.gz 862552 BLAKE2B 6dfa8842fb86a50610d1d4b512a0d6199ac8c4981dfe609b0be544e1a37b696f15dec2431b6030a4238926685a5f0153840345093e34b1efe218c58a410dd9d5 SHA512 d73a0ffb8e5977781a3f9fa93c1615633f74dfbcfeb78eb4c877992ed30d62b782714620667f14b133348d3c253df3e4219dc7ed5f353c7ec6df6c11c25905dd
-DIST cni-plugins-0.7.3.tar.gz 863596 BLAKE2B 8a4eda2b4ac9b6f53fda5a83cdeab4da862f5e48ddc9ae7c08f8ffa4c65c600543fcb968fa42182051a21a7233ea4e3a613aa6ff60d0e971284703de634e90d0 SHA512 d5c9744de2075270dd2a3e87ddf183c12e9f77b2d9df954d266105285042475b2f1f068f0024671f855c3aecc1269e49d6a146dd2f7647df0208aa8a9ec5195f
 DIST cni-plugins-0.7.4.tar.gz 862510 BLAKE2B 7ec9ec84614caecaca1583430552bd93606ae1f178f92cb4f7047ab47292084c5102437fbc9fdfe0ebf7043c94bb1b9fbb9d2ac0bc78abadb40da11cdd62b512 SHA512 2ffe18353b525d90679eca4950e96afcaadd7c387956ef5baaf4ce97c0550315fda63403161ab8f23df086955dc2a47da612fb8d0cdd30ccfe12649393e2242c
-EBUILD cni-plugins-0.7.1.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
-EBUILD cni-plugins-0.7.2.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
-EBUILD cni-plugins-0.7.3.ebuild 1067 BLAKE2B a463d4f1d2bde3b99eeb7805650d4140995d56253c4bfeac4ae49e8127133743edbec78b3f52488921a1a5f535145d37d80fbc978615157d480ffd8790381ee3 SHA512 20a1564de6e08b278d4847c28c8955b3c975b1b2cb95ad1c43ee7134c869352ed528b4fe8f6d66d68c6549bee44075bae7719c2cec75734dc12202be65da615d
+DIST cni-plugins-0.7.5.tar.gz 862670 BLAKE2B 17734beabde562cfd52efd479cb24805681a3d8a8abd4fd9fdcf9dbd891b2d5b3026b84a880355388c893db147fd0952786a86716438e140a46cc9a2dfffe0c2 SHA512 7ab43f88b4763907f56ff26d684385e5a3f6314ffb4bcbe356ec33a014fc15207392bd26e2d3041e117c604a386d21841a37d093b04e003303554b03721b32c6
 EBUILD cni-plugins-0.7.4.ebuild 1063 BLAKE2B 5d07a8eb1acd7a42f5d24a309725d7a8df3192e7aa85f05f694024b4e65b7cdab3841796cc960bc13b5f615524de532fe81a4c08a5cc5930f3d6122339730298 SHA512 fd4fdbe92167dc99fed41991477d4a8cb52ace90525ea185ee86c37c75c2b5cf509f63dfe7c0b900f56ed8194f6c337779e57491c82277fae314a88fc5184a77
+EBUILD cni-plugins-0.7.5.ebuild 1070 BLAKE2B 752d58ce8af422059a73dba9dcf25c3695f63fc12b66ceca111c16b0a82b4c419256e454f6ef2618d2b2766d9419ab8fcd8b18c2115542e8c07be98cbc6f7d9f SHA512 da1505026c64b785ea08445748b5f262a4b1a078a220781f367ade8d7b61774829b6c0beb277cb9a6a53a9ad946c1538cd2d6c7e6b23de29c222bca03e7d9364
 MISC metadata.xml 347 BLAKE2B 3028c057ca5c58bc39b10c01e9989088f0a2498a5a95a1ada88517dffe62daba52c8e6ead2fc8a7245ae06a95ffbc9306de03eecc82464ae0a6d2fbb4cdfb99b SHA512 b977f4287446648ff730c36e71002f524ae9a96c3fb104ee8542da90f6f996926a9b9809007f285e930d79842d9663cf4e462e8ee50da8319dcd3e07cf6dee05
diff --git a/net-misc/cni-plugins/cni-plugins-0.7.2.ebuild b/net-misc/cni-plugins/cni-plugins-0.7.2.ebuild
deleted file mode 100644
index b07a467bf91d..000000000000
--- a/net-misc/cni-plugins/cni-plugins-0.7.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="Standard networking plugins for container networking"
-EGO_PN="github.com/containernetworking/plugins"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-src_compile() {
-	pushd src || die
-	local i
-	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}"
-	done
-	popd || die
-}
-
-src_install() {
-	exeinto /opt/cni/bin
-	doexe bin/*
-	pushd src/${EGO_PN} || die
-	dodoc README.md
-	local i
-	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		newdoc README.md ${i##*/}.README.md
-	done
-	popd || die
-}
diff --git a/net-misc/cni-plugins/cni-plugins-0.7.3.ebuild b/net-misc/cni-plugins/cni-plugins-0.7.3.ebuild
deleted file mode 100644
index b07a467bf91d..000000000000
--- a/net-misc/cni-plugins/cni-plugins-0.7.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="Standard networking plugins for container networking"
-EGO_PN="github.com/containernetworking/plugins"
-HOMEPAGE="https://github.com/containernetworking/plugins"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-src_compile() {
-	pushd src || die
-	local i
-	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}"
-	done
-	popd || die
-}
-
-src_install() {
-	exeinto /opt/cni/bin
-	doexe bin/*
-	pushd src/${EGO_PN} || die
-	dodoc README.md
-	local i
-	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		newdoc README.md ${i##*/}.README.md
-	done
-	popd || die
-}
diff --git a/net-misc/cni-plugins/cni-plugins-0.7.1.ebuild b/net-misc/cni-plugins/cni-plugins-0.7.5.ebuild
index b07a467bf91d..9f9b42fe7ec0 100644
--- a/net-misc/cni-plugins/cni-plugins-0.7.1.ebuild
+++ b/net-misc/cni-plugins/cni-plugins-0.7.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit 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"
@@ -18,7 +18,7 @@ src_compile() {
 	pushd src || die
 	local i
 	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
-		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}"
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}" || die
 	done
 	popd || die
 }
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index ca788c7ae005..455357922349 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -2,10 +2,12 @@ AUX connman-1.33-polkit-configure-check-fix.patch 665 BLAKE2B ffe1a6ae19fe163ad8
 AUX connman-1.33-resolv-conf-overwrite.patch 354 BLAKE2B e72099b97477c3549d3a9082c06419f736ebb79bc12d37d3dd0acdd39a0454d62a9d5053b9fa349534be5171426a8fbca6aeed30e017404baf21f32d77a04948 SHA512 1998d0d2923f8dca3706c7c75ad87ffa2570a785ed3e5ec1c85cc539bbfb7ea9173dae5320c3f95fbeee9c9c72870607b8eb4b3fd2c36a1962ad8925d72e24e2
 AUX connman-1.35-include-ifbridge-before-netinet.patch 259 BLAKE2B a6c5ae9bfb61e2c4180d88229b809eb11081bd7e74425d9c1b565ba20b140d15eb810898abe34e2429e87ca3b7ab9f2062d092f1018595f3e57e0b8f82e194fd SHA512 6398c7e4b7d47eb27c8d962bf2c8e9d5bd9bfc1b0a8182a13d05bed3931bfd9750bdae8bcc47ba3e1f93e2391b65b16ddcf2a0c005a08d4626f2c0d2cb855180
 AUX connman.confd 728 BLAKE2B c4ee3b02bddaaa99af6aab2ecb0300cc7d67cfc73114d948638c783fe8b1ce5b63edb32c387f96444e793939d64888550b37839c29147fc2b0f0c4208a363f7b SHA512 820511a1fa04ff2c07a26dd3c74c846e3a710e6d6b44c4adaa782f55c9818afd3b935ed30bf2dc287e54e924128c2c1d02b6c4c89b5b5b7d07a7f590d9963969
-AUX connman.initd2 483 BLAKE2B 946dcb53fbadba4b2ddea95450f779680a8a00356489480f6ade122b8b2450fae90db0be76320d3666b991d09c766fba9a7037fb16b7b18db07bcbe4cfe83080 SHA512 a9999849f1e9b7c8c44db5aebbc5d2e615ff191da582333c3a575f594b99a6324469525a2937a98ccc444fcb42cf0131b2067263451273c6e093b22cb746306b
+AUX connman.initd2 479 BLAKE2B 4ef210f405b196fe2fe0fa2e95188cded69d3da37e9f368f500f95db48e1e51e881a5f04479e501283c70712f99a20569b9bf2c6793dc36fb37c68bafb9ff8c3 SHA512 6b636b53f1bede22f04d7107c0e5032dbd425032f317692b2ba39f810371eb89a840ced5f8988d26d384eb6e61ea967d1088c4f0ba6cff42782d9d39300b2a40
 DIST connman-1.35.tar.xz 686092 BLAKE2B 706d8333dc2fcbee8d0ef3849325c4975dfe312a7a542ee96859a1724e05b1302c244a0108ab70033b398301c235fb13cb9509e9147dc2bb049e900f3799cd98 SHA512 2234b4d18b038f9a33939035cddebd31c74ce962e5616c2c30b2912476612ef3f7d5b9edca64bf6e69fa358252ed432124e036ac3516b291b86695cb9a96c6a8
 DIST connman-1.36.tar.xz 692616 BLAKE2B 7d8cea55365fbfe78cd897b5b65d8edf475a737220732c46c95dda4c6b12badddca38150dbedddcc95c29bce486d86fe130a9d65043c6e18ed6b1eba3fe5aec0 SHA512 c0b9e924a28d58539d44c314168ae7aa46dfea8ce9d125198f525a6d6ef95ca77fd0357c4c4c7548b362b9de8e6f85c7915b1a4cf89b65116c4cbc4df75318e1
+DIST connman-1.37.tar.xz 707752 BLAKE2B ad8993764a444d205b0a8cf1ad38acc249a1a28014e6f4e5a89c8662194ad2e2ee6091b51445b88a885808461413b3aaf88eeb7b75a32f417b578d2da80a2e9f SHA512 5d5363105aedd0c9d609dd5c64eb832d9ff80923a944d9d3738337a61f180ded227f2ae1ff7912bed8826b35f0cfd20488e3ffd3801f0e53e90f98498e19efb6
 EBUILD connman-1.35-r1.ebuild 2555 BLAKE2B 7369ceafa9bd072bd8020da45453bd07ddacb10606bb3d61ceddfd3367b15bdbf890a00aa579536d548b52fd6c6656d79cdb31d290d2ac6301a6f04ffbd0724d SHA512 640be0029a8c6568a47973743f968cc641a579523f4288cc5ac0347b72721f547f608729c2865b2a31e15394e2c85a18b360936e082ac3f7069296e9977870b8
 EBUILD connman-1.36-r1.ebuild 2587 BLAKE2B ed3365fca807716a3e51e4ec9dc6b24baa144bd9f48d72e5d68b30a512663e9ba0d3497d1f8532a3b3d260d546df37f489b1c7fdb7f1d70931bd3043a9a881ea SHA512 4ba0e07568052cea00aeb6ccb8dbccc4e339712ddbb8c2b22716659298afd09863de1a2b3f1f3325b0ff40e24d8345fe1fc408085874a8ee5897be861df3bfdd
 EBUILD connman-1.36.ebuild 2568 BLAKE2B 902e767beeeb20850f0387485444905ac4b607dbdcca5fe73b4db808df7534829d2a2ccec1636c1ecaf8cbcc0c60bea9dc8b8865d8da13b1d748fd778a62d551 SHA512 f9c93a7263ce7d683dcfb6e1fc2d6798a222159bdcaf432ab75fb37d5c8a37e200ad6ad2ba5efef8438eff2eaa486545d4593817aa9ff3532833c1a15f9acb27
+EBUILD connman-1.37.ebuild 2590 BLAKE2B f3aece41f15003280467b2cb8a9457b88198c30a7454ce521ae4197042ba2975623bf68d3c832b135275b45812777f9771c0ecf9a01fc6ccaf621dce846365b4 SHA512 e7c353ec3c1ba0cef969ca9e0997340d6c8e9ffadcf64c726973c3e449cb0755b6e706c2bee6bc556bf236d3cd722ff7f26facb8d3e831c98d52fe231d71e874
 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
new file mode 100644
index 000000000000..3114fde34651
--- /dev/null
+++ b/net-misc/connman/connman-1.37.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+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 )"
+RDEPEND=">=dev-libs/glib-2.16
+	>=sys-apps/dbus-1.2.24
+	sys-libs/readline:0=
+	iptables? ( >=net-firewall/iptables-1.4.8 )
+	bluetooth? ( net-wireless/bluez )
+	iwd? ( net-wireless/iwd )
+	l2tp? ( net-dialup/xl2tpd )
+	nftables? (
+		>=net-libs/libnftnl-1.0.4:0=
+		>=net-libs/libmnl-1.0.0:0= )
+	ofono? ( net-misc/ofono )
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	policykit? ( sys-auth/polkit )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
+	wispr? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.39
+	virtual/pkgconfig"
+
+#PATCHES=(
+#	"${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
+#)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--with-systemdunitdir=$(systemd_get_systemunitdir) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--enable-client \
+		--enable-datafiles \
+		--enable-loopback=builtin \
+		$(use_enable examples test) \
+		$(use_enable ethernet ethernet builtin) \
+		$(use_enable wifi wifi builtin) \
+		$(use_enable iwd) \
+		$(use_enable bluetooth bluetooth builtin) \
+		$(use_enable l2tp l2tp builtin) \
+		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
+		$(use_enable openvpn openvpn builtin) \
+		$(use_enable policykit polkit builtin) \
+		$(use_enable pptp pptp builtin) \
+		$(use_enable vpnc vpnc builtin) \
+		$(use_enable wispr wispr builtin) \
+		$(use_enable debug) \
+		$(use_enable tools) \
+		$(use_enable networkmanager nmcompat) \
+		--with-firewall=$(usex iptables "iptables" "nftables" ) \
+		--disable-iospm \
+		--disable-hh2serial-gps
+}
+
+src_install() {
+	default
+	dobin client/connmanctl
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /usr/lib/${PN}/scripts
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf
+}
diff --git a/net-misc/connman/files/connman.initd2 b/net-misc/connman/files/connman.initd2
index 428245d7f6e2..8fb98821e425 100644
--- a/net-misc/connman/files/connman.initd2
+++ b/net-misc/connman/files/connman.initd2
@@ -1,6 +1,6 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Purpose License v2
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 depend() {
    need dbus
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 35fab1c01204..01201ff2955d 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -2,5 +2,7 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.64.0.tar.bz2 3012077 BLAKE2B 512edeaa7a4ff3a998903771307070b08f1dc53bf45b4f0c98edd78daa309877e1856e1253a3582b3db35d2ae877af5aeedf2fb2741bfd8faed3bc4525880581 SHA512 058da4c63a05f704de475271f37fb99ca90a67a919b168e07958ed45d10cb3d03898ea6e3452ffb1a1f1e5dd5915f08a2993024b12233919f3c46c036b9c07e3
+DIST curl-7.64.1.tar.bz2 3000536 BLAKE2B 787b9f9662dad4e3497357dc3f9cff0fb2c997e2603cf3c621633d9983fd011c346640be5227ddc4b363bdb7e1a64532a44ae9d5ccc27e405275e08f150d63fa SHA512 e04532d68896b79f28aea3b30aec2d5b53076d0d27c8f6404769618300828eed96633e7bd5945125bca76241bb1e169f5002ac9566108bcaddc8c51b513106b6
 EBUILD curl-7.64.0.ebuild 6857 BLAKE2B 768a2b4559ba419b7211ae44edb63eca018f2bb98a078c05c9eae2f5be74c76501dbe78eee0372e64bcbb5a462a698959533b57d944cf83d40c8140e59b07b02 SHA512 2aa729057a5fca87b89cc412a157c67a02fefc172b374592ffdf832cc8fe88f9648958abb7534bf57e96fab8f14c5f3034688c242d5c660d8d7841112d727cda
+EBUILD curl-7.64.1.ebuild 6977 BLAKE2B 5dcde6ed067f204c12e58697f11c5b9a9bd4812cba3ed28d1b3ec9fff22936e895e2920e6e9ccdadc6e341ce16ac6f7d72e2989fe84da3a0275f7a5c2c197c5d SHA512 6dabb559e8f3cfc779ce16ee346f7541a487685827ece84cb4a62978b0a97b2c99b5e87c666c376d11bec227928bfed84ab76c13c99cc3703791f34fddf73e0d
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.64.1.ebuild b/net-misc/curl/curl-7.64.1.ebuild
new file mode 100644
index 000000000000..226a0104a18d
--- /dev/null
+++ b/net-misc/curl/curl-7.64.1.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+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"
+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"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-alt-svc \
+		--enable-crypto-auth \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-amissl \
+		--without-cyassl \
+		--without-darwinssl \
+		--without-fish-functions-dir \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-schannel \
+		--without-secure-transport \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 3de0766db8de..978776eab893 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -10,6 +10,6 @@ EBUILD dhcpcd-6.11.3.ebuild 3267 BLAKE2B 439fae2ecd18b8c32319fbda22fa419f288bc97
 EBUILD dhcpcd-7.0.1.ebuild 4437 BLAKE2B c27f5d78441c62e481f4439fbebe8454838e6e1e577b239848d6d484754e12da270674ec15ed0de27645508687160077155f0e639254b8fa2da6a92578bd619b SHA512 93e79e9148afd868ec9d0c8134d538b19d2f894056beda42bacc9a6d2ae57989e862e109fd3525e78149a6f7a83e6898972af9c2b0e21892d33aac01079946e7
 EBUILD dhcpcd-7.0.8.ebuild 4472 BLAKE2B 30ae32d7990eee683eae3e7c5a88499f46251935c3b95bbcd3309b0f18fdd522eda8cf82425bb7609669ee250be1e3f61bca8b560c6650a5e2f0e5420ef42404 SHA512 c7e575473851b1205bab968a57ebe6a4d16872fdef66a2f837c7a1521c191f803aa491b0f99d7b51d5ded8db2901ddccdb10d97ffb23dd0ab81c5d44c3c43ae1
 EBUILD dhcpcd-7.1.0.ebuild 4469 BLAKE2B 584d2050407bb0bf6bf6e20ca29213dd0305ea774eb6b67afec190dd111890848fe8376cd73b1c956ec50360c85325be5d01e2f32139394fa5b5fbc057eb2fd5 SHA512 356e8dac57a1f8229dd7c68d7cc7164b21178592400170251a11c3a52098e78ba1c24d36e5c5bd672d7c550a2be86d355efb5e757c07e0617ac194f511011014
-EBUILD dhcpcd-7.1.1-r1.ebuild 4558 BLAKE2B 491a2f48dc8df25daef5984f892a2c87ce55053a4084f99ef5a226c46f9879dbde1ec40adf89a7089a2a5edf5d38fed31c699da949b32e096dd000466d025cf2 SHA512 2b932437d3590f69b4de9813b9f9f7ee6e93a47470fa3da323f6f0f290231066becf1f5afe9b440b1a4ebb25a614bb4a95191511d227136a2ad199887e69b69a
+EBUILD dhcpcd-7.1.1-r1.ebuild 4556 BLAKE2B 1709406335981be840a2d88f173514f62e8e5c020c5ff1b85cc0d629a4bd92597268327cd07f85364d09a35ec3eb2ce70b42ae9b990d0f18b73fc34b918ba0e6 SHA512 368b40840f0ae970a62b451335b8951e1e4de4665ad3c41c2ac65dade56a429c27ab27dd17b29e1415bef73f7ee6c64c737d3587baa3cae5d79f92eb80d7cb79
 EBUILD dhcpcd-9999.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild b/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild
index c8f7876e7813..3e592d1c3cd5 100644
--- a/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.1.1-r1.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 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/endlessh/Manifest b/net-misc/endlessh/Manifest
new file mode 100644
index 000000000000..f9f159c14552
--- /dev/null
+++ b/net-misc/endlessh/Manifest
@@ -0,0 +1,7 @@
+AUX endlessh.confd 822 BLAKE2B d7f7810d80dfdf6d7f71119304b161d82ddc1852e76084a5bff494111c0a7b53aae34cbc9eb63300ff7eb02aa01da393e50b5b38551d8e355527e687a3a3d941 SHA512 d8e83846e7adff478c4cb2f238a8363cec54c43cb6fb25445f88fdba256b35c60cce71b546354667d411cb8b08421533f2e3b35a9136243d09bd66c2b7e1d0f3
+AUX endlessh.initd 467 BLAKE2B 008886697a897f0ed3ea6a58c5d3b805364cbfa7084e7b871e5acfe27d3078434254c3da95ae31398598662521ad456377fc31160a2e00f3afbd7c0308a8948d SHA512 c0e2133d4edaf09af46fb739b89ae066c773300e48f9de82ec54eeec116e239c568342200cf250773eefb69765c8fe6ae508ff7643f3a15a26a6a7ec6ccdada6
+AUX logrotated 133 BLAKE2B 56d8c2e32bdae751326a8cf22f5369abda80df8478001398fcb8675fb5ac257beed06a13894ffd713606ca4697068becd36916bbe058e2c45c5b70c724d30673 SHA512 4ac4c0bbaf7658a844ace9727cfa459716f67c6f5705f5ee3b21c01fe5a21ed4083ed4b40966c3ec5392cb5d6491b0e3480bef18b1b4afd1dd10fd9e1052411a
+DIST endlessh-0.1.tar.gz 8566 BLAKE2B e8fefd6ef80d26c25f57ffe1cef502af05322e348d63ca17c0bb626e35d5c1d35cb98384b35c86c579f2876573f4c13468605c3f44325a48d19e27c499657853 SHA512 0d11c82a708a26bd77ca85f7f3bd0eda2807ded9de88e3e518da09a38b3e94fc2658ea6f210e4f1493d38ca5948968c5488c8f2f09ff2adf22b799622b4952b8
+EBUILD endlessh-0.1.ebuild 1316 BLAKE2B 8363adff4cd74f9d4dad3b767da1740d6d4a899e574e9aeb44302a9362f42d4d5f84246dc7b631a563bad75030c8971800b31b4c78553eb3e64574b26e5c9e86 SHA512 040568eff0cb04c7a5158aa8c8dd0e653cfff19bb69f43649cbc0efc7017260bd0335794a94b1094f8dc9e363bedf6ef09f2184ea014cbd7565f566ba7da66e3
+EBUILD endlessh-9999.ebuild 1316 BLAKE2B 8363adff4cd74f9d4dad3b767da1740d6d4a899e574e9aeb44302a9362f42d4d5f84246dc7b631a563bad75030c8971800b31b4c78553eb3e64574b26e5c9e86 SHA512 040568eff0cb04c7a5158aa8c8dd0e653cfff19bb69f43649cbc0efc7017260bd0335794a94b1094f8dc9e363bedf6ef09f2184ea014cbd7565f566ba7da66e3
+MISC metadata.xml 1075 BLAKE2B 5ec84e340815f31671568a185d52e217d4b5818f3a1a1f64860c35e484ca5f8d08d714d8eea5111c6eb8067845a537a8271864e68713c889fc22d7c4024fee30 SHA512 1d63706f79e1eea43482dd83d9b0e11cb2b0693fd9ebf39f9d3f2427ecf8d081800d9861965b4eb6428f54f35c6d58c9eeeba952edb610c10f842ce5bb326ada
diff --git a/net-misc/endlessh/endlessh-0.1.ebuild b/net-misc/endlessh/endlessh-0.1.ebuild
new file mode 100644
index 000000000000..105c786b1013
--- /dev/null
+++ b/net-misc/endlessh/endlessh-0.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit python-single-r1 systemd toolchain-funcs
+
+DESCRIPTION="SSH tarpit that slowly sends and endless banner"
+HOMEPAGE="https://github.com/skeeto/endlessh"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
+else
+	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Unlicense"
+SLOT="0"
+IUSE="tools"
+REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND=""
+
+RDEPEND="${DEPEND}
+	tools? (
+		${PYTHON_DEPS}
+		dev-db/sqlite
+		dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND=""
+
+pkg_setup() {
+	use tools && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	tc-export CC
+
+	sed -i \
+		-e 's/^CC/CC?/' \
+		-e 's/^CFLAGS  =/CFLAGS  +=/' \
+		-e 's/ -Os//' \
+		-e 's/^LDFLAGS/LDFLAGS?/' \
+		Makefile || die
+
+	sed -i -e "/^ExecStart=/ s:=/opt/endlessh:=${EPREFIX}/usr/bin:" \
+		util/endlessh.service || die
+}
+
+src_install() {
+	dobin endlessh
+
+	newinitd "${FILESDIR}"/endlessh.initd endlessh
+	newconfd "${FILESDIR}"/endlessh.confd endlessh
+
+	systemd_dounit util/endlessh.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotated" endlessh
+
+	einstalldocs
+}
diff --git a/net-misc/endlessh/endlessh-9999.ebuild b/net-misc/endlessh/endlessh-9999.ebuild
new file mode 100644
index 000000000000..105c786b1013
--- /dev/null
+++ b/net-misc/endlessh/endlessh-9999.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 )
+
+inherit python-single-r1 systemd toolchain-funcs
+
+DESCRIPTION="SSH tarpit that slowly sends and endless banner"
+HOMEPAGE="https://github.com/skeeto/endlessh"
+
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/skeeto/${PN}.git"
+else
+	SRC_URI="https://github.com/skeeto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Unlicense"
+SLOT="0"
+IUSE="tools"
+REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND=""
+
+RDEPEND="${DEPEND}
+	tools? (
+		${PYTHON_DEPS}
+		dev-db/sqlite
+		dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND=""
+
+pkg_setup() {
+	use tools && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	tc-export CC
+
+	sed -i \
+		-e 's/^CC/CC?/' \
+		-e 's/^CFLAGS  =/CFLAGS  +=/' \
+		-e 's/ -Os//' \
+		-e 's/^LDFLAGS/LDFLAGS?/' \
+		Makefile || die
+
+	sed -i -e "/^ExecStart=/ s:=/opt/endlessh:=${EPREFIX}/usr/bin:" \
+		util/endlessh.service || die
+}
+
+src_install() {
+	dobin endlessh
+
+	newinitd "${FILESDIR}"/endlessh.initd endlessh
+	newconfd "${FILESDIR}"/endlessh.confd endlessh
+
+	systemd_dounit util/endlessh.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotated" endlessh
+
+	einstalldocs
+}
diff --git a/net-misc/endlessh/files/endlessh.confd b/net-misc/endlessh/files/endlessh.confd
new file mode 100644
index 000000000000..a114889c8cac
--- /dev/null
+++ b/net-misc/endlessh/files/endlessh.confd
@@ -0,0 +1,22 @@
+# /etc/conf.d/endlessh: config file for /etc/init.d/endlessh
+#
+#ENDLESSH_ARGS=""
+#
+#  -d INT    Message millisecond delay [10000]
+#  -f        Set and load config file [/etc/endlessh/config]
+#  -l INT    Maximum banner line length (3-255) [32]
+#  -m INT    Maximum number of clients [4096]
+#  -p INT    Listening port [2222]
+#  -v        Print diagnostics to standard output (repeatable)
+
+# EXAMPLE: listen on port 22, log all queries and errors in very verbose mode
+
+#ENDLESSH_ARGS="-p 22 -vv"
+
+# plain file (preferred), change logrotate file as well if you change this.
+#output_log=/var/log/"${RC_SVCNAME}.log"
+#error_log=/var/log/"${RC_SVCNAME}.error.log"
+
+# syslog support via LOGGER(1). Note this spawns logger processes per io stream
+#output_logger="logger -p daemon.none --"
+#error_logger="logger -p daemon.err --"
diff --git a/net-misc/endlessh/files/endlessh.initd b/net-misc/endlessh/files/endlessh.initd
new file mode 100755
index 000000000000..a88fd9c34c90
--- /dev/null
+++ b/net-misc/endlessh/files/endlessh.initd
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+	use net
+}
+
+description="Starts endlessh tarpit"
+
+command="/usr/bin/endlessh"
+command_args="${ENDLESSH_ARGS}"
+command_background="true"
+extra_started_commands="reload"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME} configuration"
+	start-stop-daemon --exec $command --signal HUP
+	eend $?
+}
diff --git a/net-misc/endlessh/files/logrotated b/net-misc/endlessh/files/logrotated
new file mode 100644
index 000000000000..53c9efbfe873
--- /dev/null
+++ b/net-misc/endlessh/files/logrotated
@@ -0,0 +1,7 @@
+/var/log/endlessh.log /var/log/endlessh.error.log {
+	missingok
+	notifempty
+	postrotate
+		/etc/init.d/endlessh -q reload
+	endscript
+}
diff --git a/net-misc/endlessh/metadata.xml b/net-misc/endlessh/metadata.xml
new file mode 100644
index 000000000000..10db1a22fbfe
--- /dev/null
+++ b/net-misc/endlessh/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<longdescription lang="en">
+		Endlessh is an SSH tarpit that very slowly sends an endless, random SSH banner.
+		It keeps SSH clients locked up for hours or even days at a time.
+		The purpose is to put your real SSH server on another port and then let the script kiddies get stuck in this tarpit instead of bothering a real server.
+
+		Since the tarpit is in the banner before any cryptographic exchange occurs, this program doesn't depend on any cryptographic libraries.
+		It's a simple, single-threaded, standalone C program.
+		It uses poll() to trap multiple clients at a time.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">skeeto/endlessh</remote-id>
+	</upstream>
+	<use>
+		<flag name="tools">Install additional python script which can be used to parse logs and save summary to sqlite database</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index c36a023e59d5..827dbe6695d0 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -1,5 +1,7 @@
 DIST exabgp-3.2.17.tar.gz 596373 BLAKE2B 410b77af542160334d32e3e3ea54b25f45c990c56fe2dbef0714576eb9e728cebe6d1463c0f22b1240aaf8e99ccabc5f7334cd6c2b3c77426c94b2c048c8783c SHA512 69dbff75caf287e9e0f6ab3707a2bbd576b0b4c8a8c318217cf88c8a1c417d47915b038bc7d64be3bbce9771caa550275703e5543fb5799afc7149dc9f054416
 DIST exabgp-3.4.26.tar.gz 544456 BLAKE2B 75f62ce8a68588f711e86208f00cc6de9ae51a5c82f833b91459bc05974c8eff06fec080823adfecea7b75a43caa3310f6395bd22ab4e6a696f230787bbaae23 SHA512 6cfcc8a40e1e05dfa76df46d8b5e13ce85e73f078d6ab4d2e23dd85035c1ed52bbbaaaade81602ea7572841e6e20d7d7183a7e968599f9e8314e1b89e3a6341f
+DIST exabgp-4.0.10.tar.gz 2907852 BLAKE2B 2fad6c853aa7a6f136da3334df4b3bdcaaacd03d3fbf849510bcd40b0639bbcc521726797a196418f0ecd47047c65356ee047d30b009ee01b9d498e354ea3bfd SHA512 a21f49e5e99e28cc848cddfd3992dc18ba57d879d0964da0b906d16dca37aa05a00892d643d6cdeea80d4e629fc55a014d9bc50764d520fda77e94145297832e
 EBUILD exabgp-3.2.17.ebuild 435 BLAKE2B f9075fca0cc83f4ab693453fd434538fa72f7b7efe0f2702b9fd7fbc40fced273dac906be1d24fd2ebb58b350df862a95e0dd22859123703871546062e8f6806 SHA512 200dbcc99913a28bd69a7ebde17b729efb280fd1c79e7cd99196c1648f60f771ddac734dbd56d5c4ecc182fd00e9d9d7d89e7b46ed09e9c67bd9c35d544f8359
 EBUILD exabgp-3.4.26-r1.ebuild 400 BLAKE2B 0be76cb073e639dc6bc3a4dc61da8dd3da7c63c407af1af08c3e18a4d224ca87092f91d647dd3a8eecd1595680c0521898f7c378679c6816a430eb47422e01b6 SHA512 50fc08f265c6f5025426257d4ad5c6039137450654a2cc9116c29d61c6f07a16379be4adfb6b62f746bcfaa1e00e92b3b56ed2cde070df9e549a2807f89ad71b
+EBUILD exabgp-4.0.10.ebuild 402 BLAKE2B b297b469d107ee4f255e5af4a5ba408ae546548dd60ca9dcedb1b7671590083982d89515676f03efdf67ba3d00dd397ca57acb9bac8885638fd462b9e39668bb SHA512 af25d306a9b55c659b78ad629bd5cac55b183e2ed8976cb7abe8bf6477efc958a77f623bd5c9e46086e53d0b0ee6cbe03b6fcbcb2ade58af5f71c8180fc0dcdf
 MISC metadata.xml 339 BLAKE2B 863e3a5221b0dc3ef29b27b0d27a0941adc634d0287881bc586005ac6ed60e33e7a1dd48d63b237a78581b7a9890347a8ecc5346ad90cae732763235e486f8ae SHA512 81c99b9e586b1873b2949359be5147e2651e1b7a7e81aed124f54248f2c5f96ffe68f19f153d7029ec8a16e04b1a71b0c6c79c4c747d5901079a536d716acdc8
diff --git a/net-misc/exabgp/exabgp-4.0.10.ebuild b/net-misc/exabgp/exabgp-4.0.10.ebuild
new file mode 100644
index 000000000000..e55824effab4
--- /dev/null
+++ b/net-misc/exabgp/exabgp-4.0.10.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="The BGP swiss army knife of networking"
+HOMEPAGE="https://github.com/Exa-Networks/exabgp"
+SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 268e77b478ab..f783367c485d 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -3,8 +3,8 @@ AUX gerbera-1.0.0.config 6164 BLAKE2B f16c1e32be600b778e6818267b76bff34a26653d8a
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
 DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
-DIST gerbera-1.3.0.tar.gz 2799974 BLAKE2B b062b554552a58e3c71b18d189e4c1e6a59be4150ab3f2c22ba1e2186ca55a181a4037694e79803ebd5e877f3c75e55fe09665b06ec64374fe418082dc22fa7d SHA512 1afebd865a226ac13f82fb97381015d7875c1bebd9186e793acd8d715ac049e0502e60e4696a53b9d23d9dbccb4758889e1b3638fb53aeede3796c3264a01434
+DIST gerbera-1.3.1.tar.gz 2803481 BLAKE2B b6fef9b2f5904eb778279e2e8ff1f9b3cc53713142390c67d68d86d80893957aa55309c23df878766a188c2917bc33b2788d153317d9ef1ce60e96a452039e18 SHA512 dbac60300d2f3e0b7eb520c9cb3026be3a4e1e4a3e1f5a1c6ddb2279ffe7c30ed5c1a59373f0d9e43de2cec751a5ff6644c3af53f866fc6a54f549ae934a26e1
 EBUILD gerbera-1.2.0-r1.ebuild 2558 BLAKE2B c5f81e11241cb74d63428c263cd0141d61a90f595f8c42ad4f2987d73f885ff6275b85f9ad772b8ff8862847119dd953206972ebe8461e659cf5bc9476b3da89 SHA512 57b790ea36d49c2ecff0116d0aa2e583a8a6bc9847e79396d93061156c06d2b9380f9725a543e4f1cd6f91574b6cd77c26fec65b77552308998b886f6f993495
-EBUILD gerbera-1.3.0-r1.ebuild 2551 BLAKE2B 9ca7199ed286be5bcbcc6cf5f32b51966423d274f105854a76da68d06fbeb1f85b4bfc70eaaee7cdf2ae0b6e83e501aa374fb7a3fe231e99f06e9e4f1be6bf82 SHA512 f834b15ed8fd8d10bf331cefbd984cd06c5b890a97c0b2a95f49ba46ce707311d8b8e2bef9387699c29b650b4c4490d04bebd0590b96a43fb692ea219ae3c5dd
+EBUILD gerbera-1.3.1.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 EBUILD gerbera-9999.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 MISC metadata.xml 1209 BLAKE2B b724abc66f5a3111c66a94331e61f9a50ae67344dab4695e7fc68154ddc9843e0295c7a12438e342be409b9429a4f9c60abce02422594df708d7933521bf9673 SHA512 c91dddacee6beab0a3cec3ab317810f77d3715a84384ceeafd3bdc872fff6d352d6bd4312d8194b59a159604794b0197780db6c27b20a327afa1e7bb9cba6a26
diff --git a/net-misc/gerbera/gerbera-1.3.0-r1.ebuild b/net-misc/gerbera/gerbera-1.3.1.ebuild
index fcdb0195c5e0..1b1129c47251 100644
--- a/net-misc/gerbera/gerbera-1.3.0-r1.ebuild
+++ b/net-misc/gerbera/gerbera-1.3.1.ebuild
@@ -84,7 +84,7 @@ src_install() {
 	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
 
 	insinto /etc/${PN}
-	newins "${FILESDIR}/${P}.config" config.xml
+	newins "${FILESDIR}/${PN}-1.3.0.config" config.xml
 	fperms 0640 /etc/${PN}/config.xml
 	fowners root:gerbera /etc/${PN}/config.xml
 
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 7b8ef4cea95e..9c155b350b45 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
-MISC metadata.xml 443 BLAKE2B 1e83612a7652925818567405599823dbd78cba9a7307882e8bef5809383f73c6af71c8040ded1ad19372ced17d21554203e65e4818cdcd0b00e1f94fbed62b0d SHA512 ea6f890ed660697d4eb67b42e9ede99161850a40441953ed15bc88c6281fa9d0840ac458f9be1c3c9446f6937957b5775db28bc0df9736c979f7effad1d89b0c
+MISC metadata.xml 370 BLAKE2B cb234f93a667fd37ab122fbb8ae0926fd0bacda2d9e4f1e50de9e8793d6ed01f0165e16dd73931114aead2e408b2f019c06cdca7aa41d9e60c9d60cf9f7e9955 SHA512 c528d4a5f51ebcbc5917268964716d667b71e825815bdc0dbd627f1ef676b21312caf442de31e7912ad57f5c908471a7fad1617e129a2902134a081e91bcc4c0
diff --git a/net-misc/gsasl/metadata.xml b/net-misc/gsasl/metadata.xml
index 2b6cd86af0a4..5627e4c17225 100644
--- a/net-misc/gsasl/metadata.xml
+++ b/net-misc/gsasl/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-<email>net-mail@gentoo.org</email>
-<name>Net-Mail</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 <use>
 <flag name="gcrypt">
 	Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto
diff --git a/net-misc/hath/Manifest b/net-misc/hath/Manifest
index d5981c10789d..5823d2cad6b0 100644
--- a/net-misc/hath/Manifest
+++ b/net-misc/hath/Manifest
@@ -1,7 +1,3 @@
-DIST hath-0.3.0.tar.gz 27747 BLAKE2B 2563ec0d8ae308f5262c401575722468a10eb9fbd309adbd9294b44203c8dc1b2f872b43a839b72590681f2c85cd2b04589509ab18a6c0df9f4aa99cd7ae993a SHA512 424c1f95301160fe17d5358082a52ede90ceac14bf2a57d9e481bfb8c727c8314e47c0e871f4049c051d6f7112aee2c71ca256904fd9203cec9fce0bafcfe740
-DIST hath-0.4.2.tar.gz 30482 BLAKE2B d65b45c8be85f231fbdbb398c4d4225a0c79ae6a46334fa3dc8de840c95129a1d0a235202b7696abf2f672f7d7bba9c6787063a4bd9d3b8dcf2292d0f31c4baf SHA512 54770dcd211a288f2a8ed02ec709d2bf535b912a776ca9dd8acfe01beccf6ce0a68c7e18a1117c656be989084ebde1dc6506c17e5e3c930be2a45178654b0627
 DIST hath-0.5.0.tar.gz 31258 BLAKE2B 496832d35cf88ccda3a8ce394a1b4b17f673d1873c44d6ee112881e1da0431a069feb3612a3d1c00b14005690f4a71898d3755635b4bc444f23fbe23fe6f95b5 SHA512 877b95f3b608315f2dd393097747918f20499ae9ffaf69d26f7113639458cb30425a63ecb358cb2cab7f543c658aa7297f3f54b0f500dffe3bda3c9e63647a99
-EBUILD hath-0.3.0.ebuild 808 BLAKE2B 4751fa496ce3daa7d777d8ac7054c19008c143536b6ad01ba55fa21f1bea18deb80f2aa15f40cc2c26291a26cabce5f0c29d4b73b13fd5daf7b67daddb737619 SHA512 63947dfa8ecfa3639fbde80fc0d273aba5007fbfe480b10b512a79900a1524c554ddd4bf495745d5a173dd24616ad3889ddeda163e3a665cb509719c2908b18e
-EBUILD hath-0.4.2.ebuild 798 BLAKE2B 752a491ca38648e88abca37f535dc2c5d6b09b7c704a395727f95975d4f1458afc9f2283ea06f01b7a2d19ffa1bc7ff1e8f855418ccd765a59784c8780ce10bb SHA512 370e10b39a59e149ee3dde27e9c426f5fbd9794efe637f2d37774393c6ab7fbeb5f243f778de1d7f01b0ba213f5dc464636e62b5e421e5a32b881396957964f3
-EBUILD hath-0.5.0.ebuild 791 BLAKE2B cbcd281555642c2a31bf655be3f143ece5aad2ab12bba0d9e28789e5762d9e07272b40791b59c432f9247dad56d9148a8e63e7e72707bfc9fa0e01bd7a641531 SHA512 8820f6d1f7d387613fe9b2d4e0292d12a4880bb19643e87775accf755be8ddc92a2b1bc7cfe53d21eb852314a6838fca2b15878247fc32478227a20295b00840
+EBUILD hath-0.5.0.ebuild 790 BLAKE2B b0faf40b2037080e36f4703d48d07b5495087f2eb9047872646e6b1d7def85712c253630bad3cd6d1c4fb1db57bb33c1d3209d98fd28163f5cd55ad967ac8a6a SHA512 2691c660d3a0e466130d44239aabd1801614b5eb7567b372c036680b650c200c5ff45d66e6df87c93707dfe2d0a04dbe7b78797433990387b324162221f2cbbd
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-misc/hath/hath-0.3.0.ebuild b/net-misc/hath/hath-0.3.0.ebuild
deleted file mode 100644
index 4142638aaf6f..000000000000
--- a/net-misc/hath/hath-0.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.3
-
-CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hath manipulates network blocks in CIDR notation"
-HOMEPAGE="http://hackage.haskell.org/package/hath"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cmdargs-0.10
-	>=dev-haskell/missingh-1.2
-	>=dev-haskell/split-0.2
-	>=dev-haskell/tasty-0.8
-	>=dev-haskell/tasty-hunit-0.8
-	>=dev-haskell/tasty-quickcheck-0.8.1
-	>=dev-lang/ghc-7.6.1"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-util/shelltestrunner )
-"
-
-src_install() {
-	cabal_src_install
-	doman "${S}/doc/man1/${PN}.1"
-}
diff --git a/net-misc/hath/hath-0.4.2.ebuild b/net-misc/hath/hath-0.4.2.ebuild
deleted file mode 100644
index 7756a3672235..000000000000
--- a/net-misc/hath/hath-0.4.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.2.9999
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Hath manipulates network blocks in CIDR notation"
-HOMEPAGE="http://michael.orlitzky.com/code/hath.xhtml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cmdargs-0.10:=
-	>=dev-haskell/split-0.2:=
-	>=dev-haskell/tasty-0.8:=
-	>=dev-haskell/tasty-hunit-0.8:=
-	>=dev-haskell/tasty-quickcheck-0.8.1:=
-	>=dev-lang/ghc-8.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.0.0
-	test? ( dev-util/shelltestrunner )
-"
-
-src_install() {
-	cabal_src_install
-	doman "${S}/doc/man1/${PN}.1"
-}
diff --git a/net-misc/hath/hath-0.5.0.ebuild b/net-misc/hath/hath-0.5.0.ebuild
index fe89595f889f..9c801092097d 100644
--- a/net-misc/hath/hath-0.5.0.ebuild
+++ b/net-misc/hath/hath-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cmdargs-0.10:=
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index c5a48509fdf8..d8e7d6635608 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -4,10 +4,10 @@ AUX conncenter.desktop 194 BLAKE2B 96fdae8892ec9cef05a92e129bba42efb666874a2a218
 AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
-DIST linuxx64-18.10.0.11.tar.gz 21976273 BLAKE2B 4d673f40a04e31bba94b2e0dda744f8e3bb1ac489bfbbf846da3ae700d8fbd2504d22aa8fe1b703ceee9536699ea7fee288ce21306771f5c8806930cf54e2ffd SHA512 c14cfb2d10738c888dd2f56f840b0446d8952fe2adb76e1fac0c75d135a4c785cbfd8ccefed6d66f917eb4ebe3d27d151da738706b137abe26dcc3963dd78a1d
 DIST linuxx64-19.1.0.9.tar.gz 22074792 BLAKE2B aeeb8df5a63d08c94718d069c2f3e259d22309cab8ba3f046e9b1d6ecadbb9ddc7a7049bd6837944e42cfc9f625146218208802a2bf0f3bdc32f1f7d162a8700 SHA512 21539546fd24f7781e6a114e345392ee85e0f27f0f4b8a641e8b94f9a96c4a0e14f3d81838a3735c6098c251b022b3e30ce0c530b686f7587029cd2983516cfc
-DIST linuxx86-18.10.0.11.tar.gz 24095176 BLAKE2B 5e7b9bba57661216b0194ccca292a9e663fdca65439c86ea68c1857352f1ed7c5247e41eeb976bc306148cd78c71b069da3e65042331a0e601637db1fee2d6c6 SHA512 8e073b436454472799df283266ccd68652b519336bf74b558b1d0345147331c5e8f4c8900b8d94a13bd6b08b94298c9dbcc5a3a06edbe53722304de5b117f239
+DIST linuxx64-19.3.0.5.tar.gz 22254035 BLAKE2B 7ed276f0096a39a9089c02fba4c2a62f4cf7de524b24210c979c272105f40294a7773e14ecb6a6e6f65f07e9a7400a83d5c5c0dd306cf7dd1cbea4f39f489d73 SHA512 5331ec70771016ef01cb99eed9ea058e1c318b119c245318803a0f72aeaf14fd00a90150fe59b03342894f7a627affa9a383d5bd783fee424f55978db6136489
 DIST linuxx86-19.1.0.9.tar.gz 24175639 BLAKE2B d73d3d438ef272f9571587cd66e357bca4698d797ea813dafb47b6c61a86606b2021b5659908d160e3baec7b668265d4dccbf8f009c4c77c99e1258fec28c22f SHA512 110d1f160f6f4538bb589682bcbb8414b816d0669dc1fb4559243ee335a6e6129af8e50d47feadd7688808affef7bcaa300fc6c01fb05b84938fe449f7e9d05d
-EBUILD icaclient-18.10.0.11-r1.ebuild 4999 BLAKE2B 72cea895bcfa9e8713d1cd740422838e5900a7bcf3c8a171acd7ccc2c14e80e4076dc51193b97295b71dd3ceaa96f9914f4227fbe887aa4f22ffbd3f0eb4af7e SHA512 1262b73337b7bd68d187c0d5aae8c84450633a2a5b8844f7358dee753504ed132bd27e290b38471f74e67dfe1b0d45af4335393a14a73ab8b644b396456d7038
-EBUILD icaclient-19.1.0.9.ebuild 5001 BLAKE2B 29a15d96b01be75869fddb51f7905bd19cfc8bc9f92f90fd8e53c507ca5ce5229563c0573304d6256da351531d56a642daf1a1d852fafdc0d30030be5e017af2 SHA512 8caf0fb0bef83be86a90ccdf6d3395895ffffed69c7a22c018886eda55b5da363a80722f20a2d1746dee6a6b235ac20382f30c8ccd9cee4a60d559ba2e423837
+DIST linuxx86-19.3.0.5.tar.gz 24360452 BLAKE2B 823a26f23fd4979b633baa2d47034bfb6c71cad9568853dad12d857dd4a3df0e1f885d79d69e440ed01f2f9ec0af4f64a0ab9cd1460aead5cd3d2c36e7436897 SHA512 253d11f2d46928eda958036d398a58d33239beb9f754a381244ed5333277435c7d1f5bff77e8b79ec9066cb2f7e8b67b71b6609d12e8faa869a79d3109d7261f
+EBUILD icaclient-19.1.0.9.ebuild 4989 BLAKE2B c26e3af515365fab7ce09ac1938ab4e4379996075396d86004b7268502497ffaf2f75461f341c2252bfd91ae4a9ed437d7d66479f76f0c80e942d7938a78bcf6 SHA512 28e8147c102fb7a24cc47c2410aa8a863902a5525c741d756f919ff7cd4b7b7d2e8fcc0e2a1e642a00a7001dda75e9f18eedff459f24f1fca055083b6409eb6c
+EBUILD icaclient-19.3.0.5.ebuild 4991 BLAKE2B c54a0bebdce6b4d633315c3305a9bd6cd7f7423211e8254b92c0254230f732c6014aa68a76560ef346251590919bb5e7738afc000ba43a20240decb1f6f25514 SHA512 64ec9b3170350fd13f5046f84d650efa11dd41b9b4f41418757a483ef2e0f6fbe890947010706cd00311f92484572520ff8bc82baa0305fb3ffe473376fce2a7
 MISC metadata.xml 678 BLAKE2B 7ca853d90b1492bd1c15b9e0109430afbedae032ef56a035cf75de74796f694b2ab955dca5f3ef93a97a1c61686ead93b1bd1579802b35e0bd381d0d0c35d5ff SHA512 a838a68c22e2f1585960a7699399285c0c9b47b79734a22adc5d74599380c7c7792428dd7287f1e62d1194a4f97c79e902910f4c1569fc227f0f7e1c39afc8d0
diff --git a/net-misc/icaclient/icaclient-19.1.0.9.ebuild b/net-misc/icaclient/icaclient-19.1.0.9.ebuild
index a54c5cd45c39..e74facfe0cc5 100644
--- a/net-misc/icaclient/icaclient-19.1.0.9.ebuild
+++ b/net-misc/icaclient/icaclient-19.1.0.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="nsplugin l10n_de l10n_es l10n_fr l10n_ja l10n_zh_CN"
 RESTRICT="mirror strip userpriv fetch"
 
@@ -64,7 +64,7 @@ DEPEND=""
 pkg_nofetch() {
 	elog "Download the client file ${A} from
 	https://www.citrix.com/downloads/workspace-app/"
-	elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
+	elog "and place it into your DISTDIR directory."
 }
 
 pkg_setup() {
diff --git a/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild b/net-misc/icaclient/icaclient-19.3.0.5.ebuild
index bf40a7fc05de..2d9d98b6226e 100644
--- a/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild
+++ b/net-misc/icaclient/icaclient-19.3.0.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="nsplugin l10n_de l10n_es l10n_fr l10n_ja l10n_zh_CN"
 RESTRICT="mirror strip userpriv fetch"
 
@@ -64,7 +64,7 @@ DEPEND=""
 pkg_nofetch() {
 	elog "Download the client file ${A} from
 	https://www.citrix.com/downloads/workspace-app/"
-	elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
+	elog "and place it into your DISTDIR directory."
 }
 
 pkg_setup() {
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 440f75f23c6d..56690952f9ec 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -5,11 +5,8 @@ AUX iputils-99999999-musl.patch 1799 BLAKE2B d178697fd3f3dad9977b15d5a48f3742408
 AUX iputils-99999999-tracepath46.patch 824 BLAKE2B c964390aad46b75bda363ca77a87f90856a5a7f23e7b66bacd640034e09b07620f413bde16c1879659d2f01ea9d99ace664141907406239e58841e0ffcda3097 SHA512 65638246a73334640b02a136aa55a4a709d7c4639c57b7634d5595ec40d4bc9c41068a1469a76d22d0a216e9a2c8a52f7840432c435f40ee7035981494d0a443
 AUX rarpd.conf.d 250 BLAKE2B 5370ad1151911132ffff03952bc74ba2727eb71fb824b0d3f6ccd6dfad3aafd9c6ab2e0a4171ce2b34fd716d982362778c88154e5028db48836d4cc6c62b7c69 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338
 AUX rarpd.init.d 583 BLAKE2B 527579b7cc8211af9910702ff730b0911cd84dc2efe8c5272b78e8be5bf656ee7a938a3c3cdaa6a1b8e51fa221f6ff71f3cef4e48b932995b0e66a35a5d7a838 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada
-DIST iputils-20171016_pre.tar.gz 195254 BLAKE2B 1170db29d53dd8285b11d4df7b7da2ea3bd2be3599a3f0df85ca7e64247f2a534d03e43a2b6267ba4b9c0b65fcc58045151833ae2c1035a839ed728a389804af SHA512 570896fc58d945e08032134701ab6ea02bbf6fff420437bc5f89687cdcce6f3c1c64418a4c5ff54ca3cdc582bae2c95e196b2c8368eba2b163ebf88490aabf99
 DIST iputils-20180629.tar.gz 195094 BLAKE2B 81bf6ef427eac0769ea3f95c20294b46c81f9c619551234eb265b3a428998a96cf3df0cdc7499f9eea280c1999e899e87c3f4a863141de251a9c509840bc83b3 SHA512 16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476
-DIST iputils-manpages-20171016_pre.tar.xz 29764 BLAKE2B 47def1413b2cdcfba7f924dd7a045063c289c244ba8fb4dc43caf2a8d52032b57ee6d86ee4dffd5351faa3124d4c83a33ca3365866568c2164b374eed9d70ec0 SHA512 31b4b0b4e46d7c98530577392c636e4397917cbe415762145a119e68e3223bc85b9d5afcfe61ae01584a35f6a1a772adffc52deeedc722c474179fa1d208d8d9
 DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a
-EBUILD iputils-20171016_pre.ebuild 4082 BLAKE2B 8c9aedbe404bd31ddcb466b93eb6272eebba0e3fa18f7a0de285dd7aa007894614a47a9cab018f6c5546a172ca3ae240b7fdcf6196eb3cdd7a6fcfc6d34cd652 SHA512 08f92d29d3baeb0eadac360b5a7f81e550d264fda70945b416d38ae39239e75ef201587d7466d6a9431df1a4be28c62e59d11b685fc811f40f1c755bbae2637d
-EBUILD iputils-20180629.ebuild 3957 BLAKE2B ba1c3f2756dbbfc6a597757faac29b5c6f0764fb0b2033f2696c4261e5247dd281dcb86f95794e0ef89e3d07683242a08daab3acedccf5911219417b5b569f2c SHA512 a36103a6be134a2d8fd1d7469ecf061b423088a8241715066074aeafacd0ab613ac3cef4689b1c2aae21d12b0ebeb39354f0205c63aef6dbd797b64542e0c6ca
-EBUILD iputils-99999999.ebuild 3939 BLAKE2B 9b6d7d78854369cba6255685f634ed526bf97d4a195a0bec0271f8f40a63aa671f26168dd33e99bf9c1db8398acee79205a025b04edf7865d67a76fd1190b756 SHA512 22ba0bcb65f8b13800f2a14f901fc0140c02f4d22c2e96624a381b59d3ba9fe5f385cf6e4bb6d3a32659d6b3aa9dc2bfb8f26b67e3c9f50ffe41094cf4712734
-MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc
+EBUILD iputils-20180629.ebuild 3961 BLAKE2B e0b5f36700a92f1f726ad6f90f940c4aca7794eba84876fadc1a8ba0b845da2f6a8481c51176a15a0a422d0016b3976aa186b64ac264c33903adad770758806d SHA512 7d2eaf95e383649321de12fcd6570f481c33ca0c806a9d25a0465ff4ea924e2f56d767a4e95bc0b19ad5d27102f7f4f87954de38143eef2656b4a3d6115db9a1
+EBUILD iputils-99999999.ebuild 3942 BLAKE2B 5c5a4245c40fb6a140a63213d84dc23dae7edd44804606ae2bddf4d7083fa8d988e2a88ab35559a1ceb0c4b5cdabee02348c0d6d264bf46128ed974c42b86e81 SHA512 1b7f88def1b6b3f42e1f81c9a2b2daff7c72ea7c67f348b011103b846b2de6cced4caf94b956e0e5e3d830430450f9aaf9795b7aa4d53fae75b1ed3a1446c899
+MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e
diff --git a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild
deleted file mode 100644
index 8d1bbffafa10..000000000000
--- a/net-misc/iputils/iputils-20171016_pre.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and reduces depedencies.
-# To regenerate man/html pages emerge iputils-99999999[doc] with
-# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
-
-EAPI="6"
-
-inherit flag-o-matic toolchain-funcs fcaps
-
-MY_COMMIT="67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-99999999-tracepath46.patch
-	"${FILESDIR}"/${PN}-99999999-musl.patch
-)
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/iputils/iputils/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
-
-LICENSE="BSD GPL-2+ rdisc"
-SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
-
-LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
-	idn? ( net-dns/libidn:=[static-libs(+)] )
-	ipv6? ( ssl? (
-		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-		nettle? ( dev-libs/nettle[static-libs(+)] )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-		)
-	) )"
-RDEPEND="arping? ( !net-misc/arping )
-	rarpd? ( !net-misc/rarpd )
-	traceroute? ( !net-analyzer/traceroute )
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/os-headers
-"
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt:0
-	"
-fi
-
-REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
-
-[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-src_prepare() {
-	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
-
-	default
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	TARGETS=(
-		ping
-		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
-	)
-	if use ipv6 ; then
-		TARGETS+=(
-			$(usex traceroute 'traceroute6' '')
-		)
-	fi
-
-	myconf=(
-		USE_CRYPTO=no
-		USE_GCRYPT=no
-		USE_NETTLE=no
-	)
-
-	if use ipv6 && use ssl ; then
-		myconf=(
-			USE_CRYPTO=$(usex openssl)
-			USE_GCRYPT=$(usex gcrypt)
-			USE_NETTLE=$(usex nettle)
-		)
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_IDN=$(usex idn) \
-		IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
-		TARGETS="${TARGETS[*]}" \
-		${myconf[@]}
-
-	if [[ ${PV} == "99999999" ]] ; then
-		emake man
-
-		use doc && emake html
-	fi
-}
-
-src_install() {
-	into /
-	dobin ping
-	dosym ping /bin/ping4
-	if use ipv6 ; then
-		dosym ping /bin/ping6
-		dosym ping.8 /usr/share/man/man8/ping6.8
-	fi
-	doman doc/ping.8
-
-	if use arping ; then
-		dobin arping
-		doman doc/arping.8
-	fi
-
-	into /usr
-
-	if use tracepath ; then
-		dosbin tracepath
-		doman doc/tracepath.8
-		dosym tracepath /usr/sbin/tracepath4
-	fi
-
-	local u
-	for u in clockdiff rarpd rdisc tftpd ; do
-		if use ${u} ; then
-			case ${u} in
-			clockdiff) dobin ${u};;
-			*) dosbin ${u};;
-			esac
-			doman doc/${u}.8
-		fi
-	done
-
-	if use tracepath && use ipv6 ; then
-		dosym tracepath /usr/sbin/tracepath6
-		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
-	fi
-
-	if use traceroute && use ipv6 ; then
-		dosbin traceroute6
-		doman doc/traceroute6.8
-	fi
-
-	if use rarpd ; then
-		newinitd "${FILESDIR}"/rarpd.init.d rarpd
-		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
-	fi
-
-	dodoc INSTALL.md
-
-	use doc && dodoc doc/*.html
-}
-
-pkg_postinst() {
-	fcaps cap_net_raw \
-		bin/ping \
-		$(usex arping 'bin/arping' '') \
-		$(usex clockdiff 'usr/bin/clockdiff' '')
-}
diff --git a/net-misc/iputils/iputils-20180629.ebuild b/net-misc/iputils/iputils-20180629.ebuild
index a667ae038ad9..9624d0deee75 100644
--- a/net-misc/iputils/iputils-20180629.ebuild
+++ b/net-misc/iputils/iputils-20180629.ebuild
@@ -32,7 +32,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
 
 LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn2:=[static-libs(+)] )
@@ -51,7 +51,7 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
 "
 RDEPEND="arping? ( !net-misc/arping )
 	rarpd? ( !net-misc/rarpd )
-	traceroute? ( !net-analyzer/traceroute )
+	traceroute6? ( !net-analyzer/traceroute )
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
@@ -82,7 +82,7 @@ src_configure() {
 	)
 	if use ipv6 ; then
 		TARGETS+=(
-			$(usex traceroute 'traceroute6' '')
+			$(usex traceroute6 'traceroute6' '')
 		)
 	fi
 
@@ -156,7 +156,7 @@ src_install() {
 		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
 	fi
 
-	if use traceroute && use ipv6 ; then
+	if use traceroute6 && use ipv6 ; then
 		dosbin traceroute6
 		doman doc/traceroute6.8
 	fi
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index ccc540e0855c..848259357631 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.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
 
 # For released versions, we precompile the man/html pages and store
@@ -25,7 +25,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
 
 LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
 
 LIB_DEPEND="
 	caps? ( sys-libs/libcap[static-libs(+)] )
@@ -46,7 +46,7 @@ LIB_DEPEND="
 RDEPEND="
 	arping? ( !net-misc/arping )
 	rarpd? ( !net-misc/rarpd )
-	traceroute? ( !net-analyzer/traceroute )
+	traceroute6? ( !net-analyzer/traceroute )
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 "
 DEPEND="
@@ -88,7 +88,7 @@ src_configure() {
 		-DENABLE_RDISC_SERVER="$(usex rdisc true false)"
 		-DBUILD_TFTPD="$(usex tftpd true false)"
 		-DBUILD_TRACEPATH="$(usex tracepath true false)"
-		-DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute true false) false)"
+		-DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)"
 		-DBUILD_NINFOD="false"
 		-DNINFOD_MESSAGES="false"
 		-DBUILD_HTML_MANS="$(usex doc true false)"
diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
index 8fb0527115b6..6d135dfdb422 100644
--- a/net-misc/iputils/metadata.xml
+++ b/net-misc/iputils/metadata.xml
@@ -10,12 +10,11 @@
     <flag name="clockdiff">Build and install clockdiff -- tool for comparing clocks via ICMP packets</flag>
     <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for md5 support</flag>
     <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for md5 support</flag>
-    <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for md5 support</flag>
     <flag name="rarpd">Build and install rarpd -- server for handling RARP (reverse ARP) requests; generally only used by old systems</flag>
     <flag name="rdisc">Build and install rdisc -- server for the client side of the ICMP router discover protocol</flag>
     <flag name="tftpd">Build and install tftpd -- server for the Trivial File Transfer Protocol (see also <pkg>net-ftp/tftp-hpa</pkg>)</flag>
     <flag name="tracepath">Build and install tracepath -- tool for tracing network paths for discovering MTU values</flag>
-    <flag name="traceroute">Build and install traceroute -- tool for tracing network paths (see also <pkg>net-analyzer/traceroute</pkg>)</flag>
+    <flag name="traceroute6">Build and install deprecated traceroute6 tool. It's recommended to use <pkg>net-analyzer/traceroute</pkg> instead.</flag>
     <flag name="SECURITY_HAZARD">Allow non-root users to flood (ping -f). This is generally a very bad idea.</flag>
   </use>
   <upstream>
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index a3f01250403c..43cde5b616e6 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,5 +1,7 @@
 AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c5d8ba66756349af8e7b9e1d8dc1b1ec585e32c3c783d9d9ecc456383375527f14c1d48bebfb170eabacd SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b
 AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771
 DIST miniupnpd-2.1.20190210.tar.gz 235093 BLAKE2B d86b4a73ebfe6b5f3665b92624e7eac36718fffea058c0e7d2cb4af2c0871534c7f7ec56ade6c3cb2e13215a77971173259f912efd61a37e41d0f2f0a4596e5c SHA512 d664d5f61a0e2e71086aa520cb91af9f7f9b8b34268a76d570bbca271d86eab4976655a1fec1d21be80a93e357a0cb185281037604a0cfc00e4944d8e8b6f664
+DIST miniupnpd-2.1.20190403.tar.gz 235909 BLAKE2B 121aa74d1337dbdaec280edd13a688c42c7af49e1f6d44cac94701e878fe554adb8b878ac2c075391124cee14b5c01d57987024fadf95e4508ed3b3047bad543 SHA512 63fbd09d769c7a8ffba92cd5724bc04e4553085b95405daa905ac77f95d2fbcf1852fd8ff7171e2fe39aac7ac76ebae87142fe5dc2e57932c89d8d98d472034b
 EBUILD miniupnpd-2.1.20190210.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722
+EBUILD miniupnpd-2.1.20190403.ebuild 1468 BLAKE2B d87f2996fd275ffd8b07fe1d499b5eb20904e62eb8f9314301c0c795fe320849704753ed2d97f7d99e55ccfcdb4ba532a98e58c8973a7eeff9277495f923609d SHA512 3dc192b52abcf760418086ca69c92a1170211a1f50d75e6739661ba20bcde6f590b87f2e36c6de81e3b262f5259b61b232f1b66111f583fd53c7eeea44edc722
 MISC metadata.xml 923 BLAKE2B e7b26fae1c4f3f67ae6a3a7da57607cdca2c2999174c35ddf9db972d4871eacac116a4c0f068e4be467c9670294de7ec797a64b06106a54f986336bb111b0c38 SHA512 8e6c396f3601ccbba09e16cd48b0432616d692700b4b402484d4c592101f71a4434772efe63a4e9a2887d00e39eda9865173d74930aa6f792c61eb24b847af69
diff --git a/net-misc/miniupnpd/miniupnpd-2.1.20190403.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190403.ebuild
new file mode 100644
index 000000000000..673b340fb090
--- /dev/null
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20190403.ebuild
@@ -0,0 +1,65 @@
+# 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 pcp-peer portinuse strict"
+
+RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
+	net-libs/libnfnetlink:=
+	net-libs/libmnl:=
+	dev-libs/gmp:0=
+	sys-apps/util-linux:=
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	sys-apps/lsb-release"
+
+src_prepare() {
+	default
+	mv Makefile.linux 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' '')
+	)
+
+	emake CONFIG_OPTIONS="${opts[*]}" 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
+
+	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
+}
+
+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/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 6005de57641d..66456d9cf418 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,4 +1,7 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
+DIST ModemManager-1.10.0.tar.xz 2201468 BLAKE2B 4a572feba7d62269ed9d6066565e1b7d41db3bece5d450796ee18f43a9a91a886f76dfe0db4887c9ca13643f72f4460c93b3dd2ae7643eb4c37b01905a3ff3c4 SHA512 676b11892b284c2da587895e71903f80ec96978c66eafae5e2d90e5c0f1dae18e50efc68b704c7907f01f208d585f5a8140316cf83e093df3f782c80949c33bc
 DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5
+EBUILD modemmanager-1.10.0.ebuild 3651 BLAKE2B c60944e83a7d6066957eea5bdec781575d546bb163debc0cdfda317e21bf2625aa588e636fe8b0dc13f511605e95c6f742f335958f325733b7faa2e1bd8982db SHA512 cfafb4251886b39bc10eac948f7686bc3540740737624abfc0e469a20e3f74e523b15ce76a159b3216926015fcf6ae1bce9783f7498e8db9899c0b8cea264699
+EBUILD modemmanager-1.8.2-r1.ebuild 3649 BLAKE2B a3e656d2733f02ddea48854a1f2e19496e41fa048cfaf3522a1427557364d9e329a63a390d184976015cdd53c830d4fe4d1b59212b17eb7eee6a3693df6e34ea SHA512 204c643a8fe180032500e3f2639288163925e2799a486fa407019ea2c24e61b467304449159a6b3b4f2cb55f2b1f71840dca6fdc3831918745d094bdde58f933
 EBUILD modemmanager-1.8.2.ebuild 3354 BLAKE2B 46f7e3a076cecd6608f2d0c066029533ff0c4ed6afec43380ba3960f6b6077c90bcd5e660e7b65ebe2da8e427fef669c4af16cb269ad6033d804e1d4fb485dd8 SHA512 04ab770e46d2107985b0149f5aa1b86de5cefe0c47785f844bbc8e3cd1893187d04f7de328ec72b68e2b9d42aac8b1c6ecaa0fdedd8152807af3574840374a37
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.10.0.ebuild b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
new file mode 100644
index 000000000000..f7ea0d8471dc
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 user readme.gentoo-r1 systemd udev vala
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
+SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
+REQUIRED_USE="
+	?? ( elogind systemd )
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.36.0:2
+	udev? ( >=virtual/libgudev-230:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	mbim? ( >=net-libs/libmbim-1.18.0 )
+	policykit? ( >=sys-auth/polkit-0.106[introspection] )
+	qmi? ( >=net-libs/libqmi-1.22.0:= )
+	elogind? ( sys-auth/elogind )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/ModemManager-${PV}"
+
+src_prepare() {
+	DOC_CONTENTS="
+		If your USB modem shows up only as a storage device when you plug it in,
+		then you should install sys-apps/usb_modeswitch, which will automatically
+		switch it over to USB modem mode whenever you plug it in.\n"
+
+	if use policykit; then
+		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
+			add your user account to the 'plugdev' group."
+	fi
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--with-dist-version=${PVR}
+		--with-udev-base-dir="$(get_udevdir)"
+		$(use_with udev)
+		$(use_enable introspection)
+		$(use_with mbim)
+		$(use_with policykit polkit)
+		$(use_with systemd systemd-suspend-resume)
+		$(use_with systemd systemd-journal)
+		$(use_with qmi)
+		$(use_enable vala)
+	)
+	if use elogind; then
+		myconf+=(
+			--with-systemd-suspend-resume
+			LIBSYSTEMD_LOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
+			LIBSYSTEMD_LOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+		)
+	fi
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	use policykit && enewgroup plugdev
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	if ! use udev; then
+		ewarn "You have built ModemManager without udev support. You may have to teach it"
+		ewarn "about your modem port manually."
+	fi
+
+	systemd_reenable ModemManager.service
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..3be876945d80
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 user readme.gentoo-r1 systemd udev vala
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
+SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+
+IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
+REQUIRED_USE="
+	?? ( elogind systemd )
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.36.0:2
+	udev? ( >=virtual/libgudev-230:= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	mbim? ( >=net-libs/libmbim-1.16.0 )
+	policykit? ( >=sys-auth/polkit-0.106[introspection] )
+	qmi? ( >=net-libs/libqmi-1.20.0:= )
+	elogind? ( sys-auth/elogind )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/ModemManager-${PV}"
+
+src_prepare() {
+	DOC_CONTENTS="
+		If your USB modem shows up only as a storage device when you plug it in,
+		then you should install sys-apps/usb_modeswitch, which will automatically
+		switch it over to USB modem mode whenever you plug it in.\n"
+
+	if use policykit; then
+		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
+			add your user account to the 'plugdev' group."
+	fi
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--with-dist-version=${PVR}
+		--with-udev-base-dir="$(get_udevdir)"
+		$(use_with udev)
+		$(use_enable introspection)
+		$(use_with mbim)
+		$(use_with policykit polkit)
+		$(use_with systemd systemd-suspend-resume)
+		$(use_with systemd systemd-journal)
+		$(use_with qmi)
+		$(use_enable vala)
+	)
+	if use elogind; then
+		myconf+=(
+			--with-systemd-suspend-resume
+			LIBSYSTEMD_LOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
+			LIBSYSTEMD_LOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+		)
+	fi
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	use policykit && enewgroup plugdev
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	if ! use udev; then
+		ewarn "You have built ModemManager without udev support. You may have to teach it"
+		ewarn "about your modem port manually."
+	fi
+
+	systemd_reenable ModemManager.service
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 564bd82b4094..72dfa499d39a 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -7,5 +7,5 @@ DIST NetworkManager-1.14.6.tar.xz 4426540 BLAKE2B 29709005f4143bb4a9ef2348c2da06
 DIST NetworkManager-1.16.0.tar.xz 4793620 BLAKE2B 554559eefbfa489cf01067bd2c32e4b06fed076d38920b41f2d0005873ff913c0af2babcc3d9b463a4b636ca82e5c27ee20ab5768fcfb2c6b79e003d7fdc224d SHA512 e9d8365d8e59e5bc7c0bc13482139fb96b1d87183c8884e71e84eaf05fe121f2bcac519edd916bd242be4e9a9e2d2140a1065f529a9a02bda87b6d2bd4192584
 EBUILD networkmanager-1.14.4.ebuild 10965 BLAKE2B 833dd376a914bf626e0cdfc90449ee04f39039106948604a479548269b47d9dbed3ac30d7349cd724899b5185d2c24e38d0288a9c17daccd23892b1dc4f0351a SHA512 b3757b6bdbf99d94a4683eb4293d0588c16f6380d11e48ae52e5541dfee3ed44bb1560078822532c99353cb7f06da09dfb98a2cde7569fd3aa0b402fa96fb19d
 EBUILD networkmanager-1.14.6.ebuild 10967 BLAKE2B 60149db8fb3e9953e41dadaa6648ea8bb366dfd125592cd01e22d205aa0ab1f4971d53b7866338652bbeedb84cc995d86dcdab239906d16ea0b150091e9b2b4f SHA512 e7576a39e48be55a0dee111ae3be9a8d43b128a2ebb5983bd00971e98e615eb03aa9f077eb4ed87dd3c8622651b3e30f1a7fc992910df603c32b8cb8c532547c
-EBUILD networkmanager-1.16.0.ebuild 10992 BLAKE2B 6409943a55771e12dcb3ff05d81a7f163b5796b748117bc50c221ff8da7de3058ab84fa53ca2316b72f9945e08af4a39d78cb7a4bc34d77a80fb899fe1253738 SHA512 ddc01e9b4b65deef3b7885b4876133c53e0c990b780e7586e3fea90376c03b1131d3888e67e9917923a08d28db5160bcc0c5aaf0562733d6ebd705cb0fd3b489
+EBUILD networkmanager-1.16.0.ebuild 11126 BLAKE2B 6a87159301d369bfb66372c0f6c727f43a2d13bc4994467da365e42901cff26c7066a7c93dec6cfa8216cbeead0297dd603c685f76a637dad4a5ad19c9de904f SHA512 4fa88351f92efdaad305c9430c8b3325d39a756c9c5dda87c63bdf5c8cb2f00874e057cfbca2fb9f8c02c3e400bde24a873cef6f3e9f4a6dbd98f4eee7b1e2f3
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.16.0.ebuild b/net-misc/networkmanager/networkmanager-1.16.0.ebuild
index 7193fe03f25f..4e450bdaba30 100644
--- a/net-misc/networkmanager/networkmanager-1.16.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.16.0.ebuild
@@ -177,6 +177,8 @@ multilib_src_configure() {
 		$(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)
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index f2eed2b7dcac..08e1d04b72df 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,4 +1,3 @@
-AUX nextcloud-client-2.5.1-missing_qt_include.patch 714 BLAKE2B 293838a7c40d19dabe68f566d8051b406ac4de3c6bf0de1da39fefba0c8539e10ce324df6b48ccf6d803c76021d03613d7eaa89d18f4f2382f61a19601b619eb SHA512 654f31d8545bc306a76105bbaaf7f13b0d95ba0e33c72b0c04c41f61d5bb8ce97c4ac6d8e04515397f7422a857102ad4ed5a6eb50054d36202c9c84c3ffa1157
-DIST nextcloud-client-2.5.1.tar.gz 18916053 BLAKE2B 98daa5abde8aa82e2d30be7c340f808c4cb7a1986bbb7e9e5208174b268ddacfaf08e91b54d6bce5039fd19f6729716285e2a45f913c0d0eb473bf753031678f SHA512 04301f4b6283c4003ec4fed7926e11e2a627903a1b20e0b7cb4bb24b522e133d41001f48c633cad4fe3b100496d3a7826893b78074c2e3985a4c9c90122e3108
-EBUILD nextcloud-client-2.5.1-r1.ebuild 2065 BLAKE2B 925f57b30f22ad41a3ad291f3be4dff34cd050bf96b170d136434a013886410c02c4f3a53072d292208a77ece73ef70c7bb40f0c327300abbfc8a77a159758a1 SHA512 82a896b06f3e6d9f54ed2b0aadb62791a501ce1585c895159fa408b4c0bb46671ef9691558410b19460100d86642df77a190d5691dfd06e7f0addb75c3062d2b
+DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
+EBUILD nextcloud-client-2.5.2.ebuild 2006 BLAKE2B 2e5da149dd376fef452c36eb7279ce4a0e7832219d5edc25f823bc691b2d5c37c838b148c2affef9854532625292a99282cfdfe073cc6e6ea3e0f9d67a7a6bfc SHA512 cdc60ee671e822eef98ec463382afe43997a0f220f7bde50cb0a20940131c4262384ccc767db2e5dcb86c7ba86eed1b7f80508764530569a122a648a9c0f83a7
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch
deleted file mode 100644
index a5d6f03581b0..000000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 129588442041c32b0d98f2361a69e0e350592f70 Mon Sep 17 00:00:00 2001
-From: Oskar Kruschitz <okr@huemer-it.com>
-Date: Thu, 13 Dec 2018 16:13:01 +0100
-Subject: [PATCH] Added missing Include
-
-Fixing an error during Build with Qt5.12:
-error: member access into incomplete type 'const QWebEngineCertificateError'
----
- src/gui/wizard/webview.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gui/wizard/webview.cpp b/src/gui/wizard/webview.cpp
-index 15c1f314e..73e671b8f 100644
---- a/src/gui/wizard/webview.cpp
-+++ b/src/gui/wizard/webview.cpp
-@@ -10,6 +10,7 @@
- #include <QProgressBar>
- #include <QLoggingCategory>
- #include <QLocale>
-+#include <QWebEngineCertificateError>
- 
- #include "common/utility.h"
- 
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.1-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
index 28db8da07422..fed415b280bb 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.5.1-r1.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
@@ -49,10 +49,6 @@ DEPEND="${COMMON_DEPEND}
 		dev-qt/qttest:5
 	)"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-missing_qt_include.patch
-	)
-
 S=${WORKDIR}/desktop-${PV/_/-}
 
 src_prepare() {
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 91784dccf8b6..22cf9df58c1f 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -46,5 +46,5 @@ DIST openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff 43356 BLAKE2B 776fa140d64a16
 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 16288 BLAKE2B 14f5c4fd26e95abcc68f0c91592b45214048fb1fe78924380d77806696712d512efa6a14a3172d6f6cf3a5c9e0c638779d058f1e790eef51d9e86f2672c67644 SHA512 e30e04d553eab14ed526650ee6e174d482aa03bb83fee55be567efa3ce77603dfc0c4b4c1abacf3f20ef84452a2b00f2576f4395d7abd61f77b93b3d94230506
+EBUILD openssh-7.9_p1-r4.ebuild 16291 BLAKE2B 2a766c87f8c9b696a6453e0e84b7cb2dd2d86c15d1e7bbe20bff2ce2725aa39977df1d70be9efcb45a2e39a37fee784b9a71064fa21528b2635d4fadb2952814 SHA512 d46aab38c2f426a03eb6b4f01ceb63baeffc587145100500c615999da1a88a19d359533de796f0e0357a42edaa80d8306447f28f6f2b0fcd0ea86c7ce3e5a036
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.9_p1-r4.ebuild b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
index 13f4df87840c..22614b8fc651 100644
--- a/net-misc/openssh/openssh-7.9_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="https://www.openssh.com/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
 	${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/_}/%s\n" "${HPN_PATCHES[@]}") )}
+	${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} )}
 	"
 
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 6f90554d9c95..dfa34197cdb0 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -17,6 +17,7 @@ DIST openvswitch-2.10.0.tar.gz 7528705 BLAKE2B a04e6e823a40e9a3a2d2ffd79a881b1f1
 DIST openvswitch-2.10.1.tar.gz 7522058 BLAKE2B 0f4eef6bf376cc23de4061c04787663f31458d98ac9ffb76627d5a7bb9422ee5f1d99e5c6024ad078c1b6128fb1b9ac99ea9e7107803fd2fdf6cb09bff6b0ef3 SHA512 3634bd3e978110cb9e11191a88e4232a7af152a6ddf46e8a32e50e07de866be782b7e753d26b81183ec107816e5af4109badf8f2067a61fd9506ccf81e748e44
 DIST openvswitch-2.8.1.tar.gz 6746474 BLAKE2B b41c77e7653a621c4954a8d752d569971f67db7e09a586da5e57ca4b6882ba3c478437ba8ac47b151c08068fa9c1cdb0f74f8630821e5d721ceb2accef75a3a1 SHA512 b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a3a739bcb01a926b3b3874c7e4312de02965738a1536a342ab95f935d92f7
 EBUILD openvswitch-2.10.0-r1.ebuild 4703 BLAKE2B 9d233873e2184567ef3f94a41e54269b8af673e48b1daf2b45bd7a57fb4838e3a700b68cf4a41ad57a6898b85d54877acfdae469c8010f597b7c7cdfaca3be25 SHA512 9e97056a512bba79cdf33226f8e9e4b5a124d740833b3d3ee5c373361979b0b473036b5fda8decfa2e52bf89b390c443aa5f6a27c3c89be7f6791126431e79d7
+EBUILD openvswitch-2.10.1-r1.ebuild 4294 BLAKE2B ad8ad773984a891c7265548186b8b885f96a02f12b28503abbc7b19fd3d4fa18c4d4e48ce882864c40686cb7ca35f39a2b7acf2d4d02cc178316e4339c544e55 SHA512 ca3311b7dd91cf54d559d4216d7f3412cfb9c91a506a6880856f849296f6b17f19432a5c99890200be19e92daf23cf40d6888957f472ee348c7f2e7bcf199b29
 EBUILD openvswitch-2.10.1.ebuild 4267 BLAKE2B 2e595b2abafc339f14622976517177b2dc73b715592ceb0a2d7a28d71f4d17bf0fc1f1a211e025ab0b2ead4e35273d8d3e1c7a570c031ee23fecb4e9e2c50835 SHA512 48005f3a8151f3cae2ff93e0959b162a7c671d87d69a99a20f12ddde4f6a4178f1dba076790d22dcad5d9c5ab00677dec3c9cb34db50e408ab27aceaaaeef1a9
 EBUILD openvswitch-2.8.1.ebuild 4453 BLAKE2B cb74b2daedaabcb207cbbd728cdd14ce692e90bcacbd42a826bd71840104fe54f0acdb550c1fe6bd7c7ef372a879b2c4ffad8f8f19a676afe68a1a5047c28de8 SHA512 cca708a57ee51bfa50da1684d2cc28194a293c4dbf7fa366f53b598592197bced2e471fabb8e00dad60cede01c33430080f17dc78bf3fc262b05ae5730ac41b4
 MISC metadata.xml 538 BLAKE2B c5bb1d88b9923e4df32eebb70ddbe96fc7ba60ac17e2a84515a69ab9c3f90b73dc429797a23d1a13ebec9ae4def24a04b4cb0e8685159a7ec01fb905c2ab0cca SHA512 79f8fecddfb657298b4c261eb8c6d502cf5e320764acdc92fb97ac6f67379ec10faf553e8a3a0a37d4d650b52c0fa827e485655dbaa126f97d19fbf7b8fbeffd
diff --git a/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild
new file mode 100644
index 000000000000..f74b7fd5ea74
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools eutils linux-info linux-mod python-r1 systemd
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="https://www.openvswitch.org"
+SRC_URI="https://www.openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug modules monitor +ssl"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	ssl? ( dev-libs/openssl:0= )
+	${PYTHON_DEPS}
+	~dev-python/ovs-2.10.0[${PYTHON_USEDEP}]
+	|| (
+		dev-python/twisted[conch,${PYTHON_USEDEP}]
+		dev-python/twisted-web[${PYTHON_USEDEP}]
+	)
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	sys-apps/util-linux[caps]
+	virtual/pkgconfig"
+
+PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		# docs state 4.17.x code states 4.15.x
+		kernel_is le 4 15 999 || die "Linux >= 3.10.0 and <= 4.12 required for userspace modules"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+	eautoreconf
+	default
+}
+
+src_configure() {
+	set_arch_to_kernel
+	# monitor is statically enabled for bug 596206
+	# use monitor || export ovs_cv_python="no"
+	# pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+	econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	local SCRIPT
+	if use monitor; then
+		for SCRIPT in ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpdump,tcpundump,test,vlan-test} bugtool/ovs-bugtool; do
+			sed -e '1s|^.*$|#!/usr/bin/python|' -i utilities/"${SCRIPT}"
+			python_foreach_impl python_doscript utilities/"${SCRIPT}"
+		done
+		rm -r "${ED%/}"/usr/share/openvswitch/python || die
+	fi
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED%/}"/var/run || die
+
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd.confd-r2" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_newunit "${FILESDIR}/ovsdb-server-r3.service" ovsdb-server.service
+	systemd_newunit "${FILESDIR}/ovs-vswitchd-r3.service" ovs-vswitchd.service
+	systemd_newunit rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service ovs-delete-transient-ports.service
+	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	# only needed on non-systemd, but helps anyway
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EROOT%/}"/var/lib/openvswitch/conf.db
+	if [[ -e "${db}" ]] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		ovsdb-tool convert "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		ovsdb-tool create "${db}" \
+			"${EROOT%/}"/usr/share/openvswitch/vswitch.ovsschema || die "creating database failed"
+	fi
+}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 1ef06b4a3f7a..ae51520f5830 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,3 +1,5 @@
 DIST owncloudclient-2.5.3.11470.tar.xz 16719780 BLAKE2B 0c10d95ef2d851ba3f728dfe1c55c4143cf9d1542c1f9e77904324f598ecbfa29e54119d12ebef78b8eafa1188e7359ce11d01034ff34a55a80d31d1d3b1db35 SHA512 331d8e8e71d64cf9c958f9391001c6fdff45795e7caad2ce7bf6802c4f0959adf694712cd298fb8702cd4e93577282957cabc61ccc5f4f3a57edc9ddf1c7c2a0
+DIST owncloudclient-2.5.4.11654.tar.xz 16720764 BLAKE2B f970e3ed5fbe465f93e9c4f4c2106604a08ada765f8692e1287878b7deb44ac92c53608f34b24a9c913510a5625c4e980c9ac2646689700e38e78822d3e98d21 SHA512 70b687d7ace4d1335388ebf60bf65137943ff0cadfefdcaffb09539c656889233100033f28db7d03f3d48f4b956aeed476bb458f8ef16ac5461287cf02e226d9
 EBUILD owncloud-client-2.5.3.11470-r1.ebuild 1915 BLAKE2B 7f1927b02f1726ef0052b3ea1a981d9cb7e8def3dca2ceca810c15812c9496ab3e1376032e49ee2105820ee9b467476ac5859661d4209832b84bd1405f578f05 SHA512 3f8868e83c006325135b7a9887747a36cffb6b4b4c93d26a0064f5e15683f7dce443c92470be3ba25127d1d4983a30b900200e996781d4a17c60ccb0b445c6fb
+EBUILD owncloud-client-2.5.4.11654.ebuild 1915 BLAKE2B 7f1927b02f1726ef0052b3ea1a981d9cb7e8def3dca2ceca810c15812c9496ab3e1376032e49ee2105820ee9b467476ac5859661d4209832b84bd1405f578f05 SHA512 3f8868e83c006325135b7a9887747a36cffb6b4b4c93d26a0064f5e15683f7dce443c92470be3ba25127d1d4983a30b900200e996781d4a17c60ccb0b445c6fb
 MISC metadata.xml 508 BLAKE2B cbba1d7edcfe92d38f2f0d959695cac4f2c1eef8949e9816a995b18432a5c372185094cfa2548787ee63d58175b2110792f5e51688bc456c6376d86a7e8d9864 SHA512 1e757d6db30a7d5d90f317325fa96a1bdf46029e79846d17637f699d07ffa9f489f2d66855c647896a7b932e545b91242cc9df1dbb4bcce83e266c13c8fcf6c1
diff --git a/net-misc/owncloud-client/owncloud-client-2.5.4.11654.ebuild b/net-misc/owncloud-client/owncloud-client-2.5.4.11654.ebuild
new file mode 100644
index 000000000000..37f3df0acddb
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.5.4.11654.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="https://owncloud.org/"
+SRC_URI="https://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	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/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}/${P/-}
+
+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
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 09ee1ee4a037..2954ab9bb4f6 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,8 +1,8 @@
-AUX putty-0.71-no-gssapi.patch 8533 BLAKE2B 8877d15eb81d846343ff7bd198bbf67ebf82145ff149f4844fd3625c4a4b025374e30c450f49bb6c044c9b096c37018f96e2014247f1181fc80a1241e344b04a SHA512 d82647f6c212502a710c47536b61ed152c53ccbcbe6792142d831f62601ff8377b927b26a0bc364bc48ad033732088afd3bff2926d5cb8da83a4ed2d1f9cbfab
+AUX putty-0.71-no-gssapi.patch 10370 BLAKE2B 785e3710f175f01cde6c236b719d7e7b410036758980ad41e7703dcb169b0ea4518682ba8eb196800ebe04ac68c1ffa12febe407b447f1abf1469bfea226e655 SHA512 c2bd2480605e9a52fc429463eee53c5850cc2e81fbc486f059aa759aee22ba5f18e3e27d052c3b549aa0e6f2ce2a8ef8b4172d8e4d5bb4cde5ec74ef7fd9ddf5
 DIST putty-0.68.tar.gz 2114499 BLAKE2B b7f2f216bbeaea3fa175810defd546b3b94bb7f2e182b46d05a11db1e4841266674a71f6ce2d30edeefe98e3e0093e379abf736a34fb742d60dcdfd20593afec SHA512 e3a6e4f45e1fce70d4cbb6d4769ab72b23c10920e48a88bba95b3f4c225b0193ddc1444e69d572bdec5e505d2c56fed365f07d990c156b35f272b56f978ef5d3
 DIST putty-0.71.tar.gz 2423752 BLAKE2B fa4202d76d3b96e016a62c805db3835a6f61b05e7f63900919ffcd5bbec5159ef0e06b643398ed33aef5cd9ecf04eb9a981828683de7d565b88abbd4552237f6 SHA512 f8791210bd5925b26d51b13f0558eea15dbac40808051165b236d6436226f5c2b0aa7d69288ed9e2bddc1066455678cfd0af73ef6b715a136c42f3b6f754ac07
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.68.ebuild 1585 BLAKE2B c5cf6d298348b950e62eaad33054fef6d2740aa148afd3d0b9f1411dfc38162c22919f71829ebb5bdc77a3e758045aad5fa751f8f084dcd8bbdc7f6afee781fc SHA512 2d4188d5cd77f4335990b5e67d516b6cd6b5c34efc1d8253e5c3ac28f03995f24646b29a6de180d9a8957d10d30d76ec60b185cbda5bb889edad83894b1ecfd4
-EBUILD putty-0.71-r1.ebuild 1715 BLAKE2B 2d06f04e11ae6cec185097d874d9221bf970bd71f28fdbc158bd5989db0578d9892b9cd48d59fdb3ab17e900e95e7c1f48b3a8fecefd558eb07c2e830d3e58ab SHA512 f13898e24aca15efdd68372e49c78984c26859d1262ba0e3967c81c14417b716f099bb2a2f6c8e1e70fc8e3a161bcafeb370292e2d5cca0747d66511c604fdbe
+EBUILD putty-0.71-r2.ebuild 1712 BLAKE2B 1027379f8e23ec3132c89e3fee5251b1b4a2407e034794b5ccb24f58a6bab3b205c92277cc55d7625ad31b3912ac2845ab32fcf817c5a9c4db67b584318a65c5 SHA512 d1e13059b70667a936f2e336dce81bd5921e34d9a64638dc046312cf0762715a11e39c0c4a28a00ca11ea7cb5883f80caeaa3928be50729114b19ff86c56cb2f
 EBUILD putty-9999.ebuild 1778 BLAKE2B d84806c66abe03ce824f8d7c9dc54cf07f49da77d4bd29ac590465e85cc4019cef2a4af8f4d39c81443c0b0c4c643afc17ce45897e6855aa0677f295b71baba5 SHA512 8d702ecce91b4a8e98171e97424cde8eac4a54144ca9c39d178490950c66a300889690eb0c19c35af5faf5b63e3c18ee93525cd3b1c670e6307aedf2128d5ede
 MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6
diff --git a/net-misc/putty/files/putty-0.71-no-gssapi.patch b/net-misc/putty/files/putty-0.71-no-gssapi.patch
index 75add0687d28..33a3f226851f 100644
--- a/net-misc/putty/files/putty-0.71-no-gssapi.patch
+++ b/net-misc/putty/files/putty-0.71-no-gssapi.patch
@@ -1,6 +1,27 @@
+From 7ad08649a223a4cd61e67d8334a147f55c79399d Mon Sep 17 00:00:00 2001
+From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
+Date: Mon, 25 Mar 2019 23:46:59 +0000
+Subject: [PATCH] Fix compilation with NO_GSSAPI.
+
+This is a fairly shallow patch, which removes the UI and interactions
+with external libraries. Some other machinery (which is dead code in
+this configuration) is left in place.
+
+Adapted by me from a patch by Jeroen Roovers.
+---
+ config.c        |  4 ++++
+ settings.c      | 12 ++++++++++--
+ ssh.c           | 16 +++++++++++++++-
+ ssh2transport.c |  3 +--
+ ssh2userauth.c  |  8 ++++++--
+ sshserver.c     | 13 ++++++++++++-
+ 6 files changed, 48 insertions(+), 8 deletions(-)
+
+diff --git a/config.c b/config.c
+index 9c299fee..6528a969 100644
 --- a/config.c
 +++ b/config.c
-@@ -2442,10 +2442,12 @@
+@@ -2442,10 +2442,12 @@ void setup_config_box(struct controlbox *b, bool midsession,
  			      HELPCTX(ssh_kexlist),
  			      kexlist_handler, P(NULL));
              c->listbox.height = KEX_MAX;
@@ -13,7 +34,7 @@
  
  	    s = ctrl_getset(b, "Connection/SSH/Kex", "repeat",
  			    "Options controlling key re-exchange");
-@@ -2455,11 +2457,13 @@
+@@ -2455,11 +2457,13 @@ void setup_config_box(struct controlbox *b, bool midsession,
  			 conf_editbox_handler,
  			 I(CONF_ssh_rekey_time),
  			 I(-1));
@@ -27,9 +48,11 @@
  	    ctrl_editbox(s, "Max data before rekey (0 for no limit)", 'x', 20,
  			 HELPCTX(ssh_kex_repeat),
  			 conf_editbox_handler,
+diff --git a/settings.c b/settings.c
+index 8d563026..54f5ab7b 100644
 --- a/settings.c
 +++ b/settings.c
-@@ -592,21 +592,25 @@
+@@ -592,21 +592,25 @@ void save_open_settings(settings_w *sesskey, Conf *conf)
      write_setting_b(sesskey, "Compression", conf_get_bool(conf, CONF_compression));
      write_setting_b(sesskey, "TryAgent", conf_get_bool(conf, CONF_tryagent));
      write_setting_b(sesskey, "AgentFwd", conf_get_bool(conf, CONF_agentfwd));
@@ -56,7 +79,7 @@
      wprefs(sesskey, "GSSLibs", gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist);
      write_setting_filename(sesskey, "GSSCustom", conf_get_filename(conf, CONF_ssh_gss_custom));
  #endif
-@@ -937,7 +941,9 @@
+@@ -937,7 +941,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
      gppb(sesskey, "TryAgent", true, conf, CONF_tryagent);
      gppb(sesskey, "AgentFwd", false, conf, CONF_agentfwd);
      gppb(sesskey, "ChangeUsername", false, conf, CONF_change_username);
@@ -66,7 +89,7 @@
      gprefs(sesskey, "Cipher", "\0",
  	   ciphernames, CIPHER_MAX, conf, CONF_ssh_cipherlist);
      {
-@@ -990,7 +996,9 @@
+@@ -990,7 +996,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
      gprefs(sesskey, "HostKey", "ed25519,ecdsa,rsa,dsa,WARN",
             hknames, HK_MAX, conf, CONF_ssh_hklist);
      gppi(sesskey, "RekeyTime", 60, conf, CONF_ssh_rekey_time);
@@ -76,7 +99,7 @@
      gpps(sesskey, "RekeyBytes", "1G", conf, CONF_ssh_rekey_data);
      {
  	/* SSH-2 only by default */
-@@ -1007,9 +1015,9 @@
+@@ -1007,9 +1015,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
      gppb(sesskey, "SshBanner", true, conf, CONF_ssh_show_banner);
      gppb(sesskey, "AuthTIS", false, conf, CONF_try_tis_auth);
      gppb(sesskey, "AuthKI", true, conf, CONF_try_ki_auth);
@@ -87,9 +110,11 @@
      gprefs(sesskey, "GSSLibs", "\0",
  	   gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist);
      gppfile(sesskey, "GSSCustom", conf, CONF_ssh_gss_custom);
+diff --git a/ssh.c b/ssh.c
+index e35ebc64..e8ad61b8 100644
 --- a/ssh.c
 +++ b/ssh.c
-@@ -50,7 +50,9 @@
+@@ -50,7 +50,9 @@ struct Ssh {
      ssh_sharing_state *connshare;
      bool attempting_connshare;
  
@@ -99,7 +124,7 @@
  
      char *savedhost;
      int savedport;
-@@ -252,10 +254,17 @@
+@@ -252,10 +254,18 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv,
                      conf_get_bool(ssh->conf, CONF_tryagent), username,
                      conf_get_bool(ssh->conf, CONF_change_username),
                      conf_get_bool(ssh->conf, CONF_try_ki_auth),
@@ -107,31 +132,86 @@
                      conf_get_bool(ssh->conf, CONF_try_gssapi_auth),
                      conf_get_bool(ssh->conf, CONF_try_gssapi_kex),
                      conf_get_bool(ssh->conf, CONF_gssapifwd),
-                     &ssh->gss_state);
+-                    &ssh->gss_state);
++                    &ssh->gss_state
 +#else
-+                    NULL,
-+                    NULL,
-+                    NULL,
-+                    NULL);
++                    false,
++                    false,
++                    false,
++                    NULL
 +#endif
++                    );
                  ssh_connect_ppl(ssh, userauth_layer);
                  transport_child_layer = userauth_layer;
  
-@@ -267,7 +276,11 @@
+@@ -267,7 +277,11 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv,
                  ssh->fullhostname,
                  ssh_verstring_get_local(old_bpp),
                  ssh_verstring_get_remote(old_bpp),
 +#ifndef NO_GSSAPI
                  &ssh->gss_state,
 +#else
-+				NULL,
++                NULL,
 +#endif
                  &ssh->stats, transport_child_layer, false);
              ssh_connect_ppl(ssh, ssh->base_layer);
  
+diff --git a/ssh2transport.c b/ssh2transport.c
+index 8640d89d..5e8955a0 100644
+--- a/ssh2transport.c
++++ b/ssh2transport.c
+@@ -1781,6 +1781,7 @@ static void ssh2_transport_gss_update(struct ssh2_transport_state *s,
+     if (mins > 0 && s->gss_ctxt_lifetime <= mins * 60)
+         s->gss_status |= GSS_CTXT_EXPIRES;
+ }
++#endif /* NO_GSSAPI */
+ 
+ ptrlen ssh2_transport_get_session_id(PacketProtocolLayer *ppl)
+ {
+@@ -1805,8 +1806,6 @@ void ssh2_transport_notify_auth_done(PacketProtocolLayer *ppl)
+     queue_idempotent_callback(&s->ppl.ic_process_queue);
+ }
+ 
+-#endif /* NO_GSSAPI */
+-
+ static bool ssh2_transport_get_specials(
+     PacketProtocolLayer *ppl, add_special_fn_t add_special, void *ctx)
+ {
+diff --git a/ssh2userauth.c b/ssh2userauth.c
+index fc413923..7f5a1292 100644
+--- a/ssh2userauth.c
++++ b/ssh2userauth.c
+@@ -613,8 +613,10 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl)
+                  * Scan it for method identifiers we know about.
+                  */
+                 bool srv_pubkey = false, srv_passwd = false;
+-                bool srv_keyb_inter = false, srv_gssapi = false;
+-                bool srv_gssapi_keyex_auth = false;
++                bool srv_keyb_inter = false;
++#ifndef NO_GSSAPI
++                bool srv_gssapi = false, srv_gssapi_keyex_auth = false;
++#endif
+ 
+                 for (ptrlen method; get_commasep_word(&methods, &method) ;) {
+                     if (ptrlen_eq_string(method, "publickey"))
+@@ -623,10 +625,12 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl)
+                         srv_passwd = true;
+                     else if (ptrlen_eq_string(method, "keyboard-interactive"))
+                         srv_keyb_inter = true;
++#ifndef NO_GSSAPI
+                     else if (ptrlen_eq_string(method, "gssapi-with-mic"))
+                         srv_gssapi = true;
+                     else if (ptrlen_eq_string(method, "gssapi-keyex"))
+                         srv_gssapi_keyex_auth = true;
++#endif
+                 }
+ 
+                 /*
+diff --git a/sshserver.c b/sshserver.c
+index 5f6e7dde..5c34bb35 100644
 --- a/sshserver.c
 +++ b/sshserver.c
-@@ -50,7 +50,9 @@
+@@ -50,7 +50,9 @@ struct server {
      PacketProtocolLayer *base_layer;
      ConnectionLayer *cl;
  
@@ -141,18 +221,19 @@
  };
  
  static void ssh_server_free_callback(void *vsrv);
-@@ -246,8 +248,10 @@
+@@ -245,9 +247,11 @@ Plug *ssh_server_plug(
+     bufchain_init(&srv->out_raw);
      bufchain_init(&srv->dummy_user_input);
  
-     /* FIXME: replace with sensible */
 +#ifndef NO_GSSAPI
+     /* FIXME: replace with sensible */
      srv->gss_state.libs = snew(struct ssh_gss_liblist);
      srv->gss_state.libs->nlibraries = 0;
 +#endif
  
      return &srv->plug;
  }
-@@ -297,7 +301,9 @@
+@@ -297,7 +301,9 @@ static void ssh_server_free_callback(void *vsrv)
      conf_free(srv->conf);
      log_free(srv->logctx);
  
@@ -162,75 +243,20 @@
  
      sfree(srv);
  
-@@ -442,7 +448,11 @@
+@@ -442,7 +448,12 @@ static void server_got_ssh_version(struct ssh_version_receiver *rcv,
              srv->conf, NULL, 0, NULL,
              ssh_verstring_get_remote(old_bpp),
              ssh_verstring_get_local(old_bpp),
+-            &srv->gss_state, &srv->stats, transport_child_layer, true);
 +#ifndef NO_GSSAPI
-             &srv->gss_state, &srv->stats, transport_child_layer, true);
++            &srv->gss_state,
 +#else
-+            NULL, &srv->stats, transport_child_layer, true);
++            NULL,
 +#endif
++            &srv->stats, transport_child_layer, true);
          ssh2_transport_provide_hostkeys(
              srv->base_layer, srv->hostkeys, srv->nhostkeys);
          if (userauth_layer)
---- a/ssh2userauth.c
-+++ b/ssh2userauth.c
-@@ -241,7 +241,9 @@
-      * Misc one-time setup for authentication.
-      */
-     s->publickey_blob = NULL;
-+#ifndef NO_GSSAPI
-     s->session_id = ssh2_transport_get_session_id(s->transport_layer);
-+#endif
- 
-     /*
-      * Load the public half of any configured public key file for
-@@ -613,8 +615,12 @@
-                  * Scan it for method identifiers we know about.
-                  */
-                 bool srv_pubkey = false, srv_passwd = false;
-+#ifndef NO_GSSAPI
-                 bool srv_keyb_inter = false, srv_gssapi = false;
-                 bool srv_gssapi_keyex_auth = false;
-+#else
-+                bool srv_keyb_inter = false;
-+#endif
- 
-                 for (ptrlen method; get_commasep_word(&methods, &method) ;) {
-                     if (ptrlen_eq_string(method, "publickey"))
-@@ -623,10 +629,12 @@
-                         srv_passwd = true;
-                     else if (ptrlen_eq_string(method, "keyboard-interactive"))
-                         srv_keyb_inter = true;
-+#ifndef NO_GSSAPI
-                     else if (ptrlen_eq_string(method, "gssapi-with-mic"))
-                         srv_gssapi = true;
-                     else if (ptrlen_eq_string(method, "gssapi-keyex"))
-                         srv_gssapi_keyex_auth = true;
-+#endif
-                 }
- 
-                 /*
-@@ -1640,7 +1648,9 @@
-      * any packets since. Signal the transport layer to consider
-      * doing an immediate rekey, if it has any reason to want to.
-      */
-+#ifndef NO_GSSAPI
-     ssh2_transport_notify_auth_done(s->transport_layer);
-+#endif
- 
-     /*
-      * Finally, hand over to our successor layer, and return
---- a/ssh2userauth-server.c
-+++ b/ssh2userauth-server.c
-@@ -122,7 +122,9 @@
- 
-     crBegin(s->crState);
- 
-+#ifndef NO_GSSAPI
-     s->session_id = ssh2_transport_get_session_id(s->transport_layer);
-+#endif
- 
-     while (1) {
-         crMaybeWaitUntilV((pktin = ssh2_userauth_server_pop(s)) != NULL);
+-- 
+2.11.0
+
diff --git a/net-misc/putty/putty-0.71-r1.ebuild b/net-misc/putty/putty-0.71-r2.ebuild
index 3cb7948531d8..e8860e799793 100644
--- a/net-misc/putty/putty-0.71-r1.ebuild
+++ b/net-misc/putty/putty-0.71-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+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
diff --git a/net-misc/shigofumi/Manifest b/net-misc/shigofumi/Manifest
index 26984009950d..827afc267fda 100644
--- a/net-misc/shigofumi/Manifest
+++ b/net-misc/shigofumi/Manifest
@@ -1,4 +1,4 @@
 DIST shigofumi-0.3.tar.bz2 312184 BLAKE2B ebf8c0c4a7a347bd1b2c11fae9e8f0da46cad21e2b25e875e94a60a7be00a79c1737ac39754a8a230705a44a812e5f00268b528480f5e33e734e4ce5dfdbea34 SHA512 ef7b2894cfa217b713865c4fe24cc985b4ff963df4a5005bda06f03b3c7f358b318e68a136328787fe2dfbb8b1623fe2b2ceb9fbbd20be7f243fa79ace1b0210
-EBUILD shigofumi-0.3-r1.ebuild 951 BLAKE2B c94f051a5d38e0cf5f50e603ab8d990dfbcb5c1d1b2281372363309fd86c3a4e07f0d7578b61bd85216fd0a6b05d567c19d419d956b1f78d2f1b96bae801b55e SHA512 b28c1b2b0989c6ca5d124b5cc01e967ea078a9fc402e1fd586d20ad9b4aab0d7931fcf0d812ad2a354002ef96aeb6932c5d64c101393c82b0e639705b3c9b143
-EBUILD shigofumi-9999.ebuild 951 BLAKE2B c94f051a5d38e0cf5f50e603ab8d990dfbcb5c1d1b2281372363309fd86c3a4e07f0d7578b61bd85216fd0a6b05d567c19d419d956b1f78d2f1b96bae801b55e SHA512 b28c1b2b0989c6ca5d124b5cc01e967ea078a9fc402e1fd586d20ad9b4aab0d7931fcf0d812ad2a354002ef96aeb6932c5d64c101393c82b0e639705b3c9b143
+EBUILD shigofumi-0.3-r1.ebuild 950 BLAKE2B ea253d16ffdc9299b509e94b82d704b8f7ac0215a4d7a6b1cf70f30b174cb4ee65c23e98af28a0ea00f1201136d5f2632362232a9ecd561c96d6c1ef190afba9 SHA512 edd2141c636497ac23d702adb0c1a06454eb2e51602144fc4682c03d276d05554dae422f07c7bf73de714c1dd4acee96bb1a269b6ce10a14ce9ecb23ec87fa10
+EBUILD shigofumi-9999.ebuild 950 BLAKE2B ea253d16ffdc9299b509e94b82d704b8f7ac0215a4d7a6b1cf70f30b174cb4ee65c23e98af28a0ea00f1201136d5f2632362232a9ecd561c96d6c1ef190afba9 SHA512 edd2141c636497ac23d702adb0c1a06454eb2e51602144fc4682c03d276d05554dae422f07c7bf73de714c1dd4acee96bb1a269b6ce10a14ce9ecb23ec87fa10
 MISC metadata.xml 350 BLAKE2B ddf2f81b2030cfe858cff49c0605390ef0f4b7542118a1d91801978537b00e40554ba0311cf6dd0495433ba879f810e4408b53d051f6d8e1b61c3fdf1570f5d5 SHA512 6e0cfef97580b12bf5fa6ccf822b9983fd0ec4170f4b25a011a9a17e7398bdeb1aa9726351dc4fd0bb0d3f981a76aa644d316ab5c01d302639d6ba144394b59c
diff --git a/net-misc/shigofumi/shigofumi-0.3-r1.ebuild b/net-misc/shigofumi/shigofumi-0.3-r1.ebuild
index 1c7d25f0f8bd..8667bb035c0c 100644
--- a/net-misc/shigofumi/shigofumi-0.3-r1.ebuild
+++ b/net-misc/shigofumi/shigofumi-0.3-r1.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
@@ -9,7 +9,7 @@ inherit autotools
 DESCRIPTION="Command line client for ISDS"
 HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
 if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI='git://repo.or.cz/shigofumi.git'
+	EGIT_REPO_URI='https://repo.or.cz/shigofumi.git'
 	inherit git-r3
 else
 	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
diff --git a/net-misc/shigofumi/shigofumi-9999.ebuild b/net-misc/shigofumi/shigofumi-9999.ebuild
index 1c7d25f0f8bd..8667bb035c0c 100644
--- a/net-misc/shigofumi/shigofumi-9999.ebuild
+++ b/net-misc/shigofumi/shigofumi-9999.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
@@ -9,7 +9,7 @@ inherit autotools
 DESCRIPTION="Command line client for ISDS"
 HOMEPAGE="http://xpisar.wz.cz/shigofumi/"
 if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI='git://repo.or.cz/shigofumi.git'
+	EGIT_REPO_URI='https://repo.or.cz/shigofumi.git'
 	inherit git-r3
 else
 	SRC_URI="http://xpisar.wz.cz/${PN}/dist/${P}.tar.bz2"
diff --git a/net-misc/sjphone/Manifest b/net-misc/sjphone/Manifest
index e232fd335bd7..15e2fe7dd6ab 100644
--- a/net-misc/sjphone/Manifest
+++ b/net-misc/sjphone/Manifest
@@ -1,3 +1,3 @@
 DIST SJphoneLnx-1.60.2235.tar.gz 4390024 BLAKE2B ee9eeb4b358b258d962238bfc89ac64f767f00eaae577abc1c89bb9a01e625ab01b93eb1ec4ce362efad1f8df5bc7cfa446718fa18397e037540554ffd67b7d4 SHA512 f1c824c51cc4edfec2baf7c31c8afb71930851a96563b50ab8f7219f49b03a4233549e0a1bb4b53a55bd2b72cc3454e2f50625d2ba63491015fcbef27726b567
-EBUILD sjphone-1.60.2235.ebuild 810 BLAKE2B 6be5ff203a980081420f04c2e76c4d2a621edb61127bf5688f04131390996b4ec6bf12e77f2546f3ddf752a08119c64a4a54640dc09f032491b1945fa11db5f8 SHA512 e998d1978819b7c0c0e4402b50c190c06272c3648e92fbd31ea5f5c6c6dbad14206bf1091acd73a24c1b38d55bef43f0e3c07e2af1f4fba1a75094695a4c8451
+EBUILD sjphone-1.60.2235.ebuild 821 BLAKE2B a9d6c03c85b375df8b7fba1c993181150f8d6791ed1b3ea1da4cdbec407339c8e3f08380bb67094f00013495ee4c5a059badb8c7d7f9d7399fd877b985265b52 SHA512 8436275de670d5456f39c60b700daa7a2acc531c1b76b93493849346f35127956f3bf2f32baff0bfac4411ec2be43279b37f0592a64a1364883f3164c9c0f51d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/sjphone/sjphone-1.60.2235.ebuild b/net-misc/sjphone/sjphone-1.60.2235.ebuild
index 9b44f78549e5..fa22405afa4d 100644
--- a/net-misc/sjphone/sjphone-1.60.2235.ebuild
+++ b/net-misc/sjphone/sjphone-1.60.2235.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=0
@@ -14,6 +14,7 @@ LICENSE="SJ-Labs IJG libpng ZLIB RSA W3C BSD"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
+RESTRICT="strip mirror bindist"
 
 RDEPEND="x11-libs/libSM
 	x11-libs/libICE
@@ -23,8 +24,6 @@ RDEPEND="x11-libs/libSM
 	x11-libs/libXdmcp"
 S=${WORKDIR}/${MY_P}
 
-RESTRICT="strip"
-
 src_install() {
 	insinto /opt/sjphone
 	doins -r lib/*
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 46009febdb0c..78aabe6d333e 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,5 +1,5 @@
 DIST smb4k-2.1.1.tar.xz 3718220 BLAKE2B 99258ac57d3b8ff2861b8635b6a0799a347f3934c8d070d41c09f49b69caa7b59f502db9041d1bc4f875ae15544254faaafaae6429200ddf5526a06812983e1f SHA512 d69cb9f4c22e2afdd111e73c3d99d6868f959aa5476ffe10620862d3659b5a4f3b814856b17a9dced7bf6dde524f5bcf224e62d413d2aa92b0bcc2272ddf22b7
-DIST smb4k-2.9.80.tar.xz 4156356 BLAKE2B c32f4287c542f9da4d6168c0832f1816c00b69ec092df5dd3efbbada672add4f674bd475fedc9dd0b53dc7bee6d30515ca7a7e9cf17b0c6aef6e1cdd3e1bd1b8 SHA512 944aa7ecda0391cf08d198c693071af747572d07dddc1728c0ebbae1874206e75dc3fb8ad5c34c74fa7d243f17995b5576079962fe80d23f10ad7925314df8ec
+DIST smb4k-2.9.81.tar.xz 4183860 BLAKE2B 380382fce8b543ce05fe99084b9cff9cf205a572e862a86d3393f06b6c2aae8e51fe119271d97fe2157da3d946ffa2fdd7c172e3bcf0b8e47c78ddb41da7cc85 SHA512 9bf052e83fac5a1be8fd1f85b69d16e170a61586fa5ebe0ea5e5af8303db0ab06a8ca7a2496ec1677c6299b82d1f05718fb8e80b62c4d4b1adc2d989630fc863
 EBUILD smb4k-2.1.1.ebuild 1352 BLAKE2B 98f727608542565fb7d3ea95feb5519dbc4c14ca6545ac332e5cf41495bb73f592303cb20f9d9d8a6466674aac6ee79f8f1c9be35fed91fc0b1639b7d2e38959 SHA512 fadf1efd2d4ceb8fc733397435d4ca39d8d336dfd47b6430cfa3009e02169450f47f06a651313056db1bc3e3f119ea375a0340a1727b4961e54da6ce373c45db
-EBUILD smb4k-2.9.80.ebuild 1360 BLAKE2B 0100fc6dad643df05d01a270aeeb62c7d4b798fc154fd8ba916b36718a8306834e8e2f9434b501ec665cbae8591f4086131979e5dfa998f180c9c383633b3690 SHA512 1dec88f0346b8737a2e3834c60a1b55c61d45b02bd95746dc8c34ddc853cc29c57c39363630ee098efbaffd67ee4937da4a196bf04a4dafc46acc8c7c6414066
+EBUILD smb4k-2.9.81.ebuild 1360 BLAKE2B 0100fc6dad643df05d01a270aeeb62c7d4b798fc154fd8ba916b36718a8306834e8e2f9434b501ec665cbae8591f4086131979e5dfa998f180c9c383633b3690 SHA512 1dec88f0346b8737a2e3834c60a1b55c61d45b02bd95746dc8c34ddc853cc29c57c39363630ee098efbaffd67ee4937da4a196bf04a4dafc46acc8c7c6414066
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/smb4k-2.9.80.ebuild b/net-misc/smb4k/smb4k-2.9.81.ebuild
index 578795e8d724..578795e8d724 100644
--- a/net-misc/smb4k/smb4k-2.9.80.ebuild
+++ b/net-misc/smb4k/smb4k-2.9.81.ebuild
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 9ee375815daf..897791dcb103 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -5,5 +5,5 @@ DIST socat-1.7.3.2.tar.bz2 493324 BLAKE2B 8f30a47be52fcbaf9715435c7848e0d86bb816
 DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
 EBUILD socat-1.7.3.2.ebuild 1525 BLAKE2B 8ade6fec17362a75b0e56798dc9496058e39cbec99df447668b0eff67d82eaa1cb513c74e6f58d927969f110baa38b5055c2015e6dc837064e3e2f1dbb63b214 SHA512 9c60d66cf7b190cb41d2d2afb2bba5bb3982c301df5f8e989013d4d7e32a2b15ddccbb26a4d2ef84f65412e24efbe85530e7178d03b2ad86d78d7addec9a8c63
 EBUILD socat-2.0.0_beta9.ebuild 1512 BLAKE2B 7f8c902a4637d6fb404c8dfc5e06b31c1e7235ed7e0d174f61d961a50b68b1cdb1b5d74bf93834a1595a794776f989a277b66a4b9da3598145b6fa9c311025df SHA512 859b4a4732bf418f5e517e6345b484c6fcb2ff2e4b42f59824dbfe51943c5432ba7fdce610501bc673c7b51399115b3b60af78441c5932739c5597219fed8705
-EBUILD socat-9999.ebuild 1430 BLAKE2B 469a907b8192fdd96917be4aa71c0cf0aadc6853dc5db6b2f78cc98c979ec41bda06dd5575fd9426029ecd12fc151c3fad736c50807ae44931a009676dc886c0 SHA512 b4d6de5f62b6131efcfede03b81357abcc8201c609fad8b28b3527e0a5a956cb4e495493918005816bb83ab6cf1c07ac45fcddd770f0b4579624cd41d2fe5802
+EBUILD socat-9999.ebuild 1387 BLAKE2B a0493a52e072941134d4673eded87efa4cf717778e30f61da0d81bc5737b584766955fa8edeec772ccd9ca4cae260e1904cff92dd43f27e94cbd2b8aecf35bf7 SHA512 e08b74b67d94b9997665465f5cd8b77f53e268b3dc5e83c6aba27cbbb9c97cbd4f3cf577b8bf865f36c9cd3719fd2dbd7ec7f6a4084601b88a9dce222bc583fe
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/socat/socat-9999.ebuild b/net-misc/socat/socat-9999.ebuild
index 52fde25ab3f0..dab9093e8760 100644
--- a/net-misc/socat/socat-9999.ebuild
+++ b/net-misc/socat/socat-9999.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit autotools flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="Multipurpose relay (SOcket CAT)"
 HOMEPAGE="http://www.dest-unreach.org/socat/"
-MY_P=${P/_beta/-b}
-S="${WORKDIR}/${MY_P}"
-EGIT_REPO_URI="git://repo.or.cz/${PN}.git"
+EGIT_REPO_URI="https://repo.or.cz/${PN}.git"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,10 +25,10 @@ DEPEND="
 	${RDEPEND}
 	app-text/yodl
 "
-
-RESTRICT="test
-	ssl? ( readline? ( bindist ) )"
-
+RESTRICT="
+	test
+	ssl? ( readline? ( bindist ) )
+"
 DOCS=(
 	BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
 )
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index 8ff80ec108fd..813fe84ce124 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -1,4 +1,4 @@
-AUX sslh.conf.d-2 297 BLAKE2B c59d4eb8dfd4c2ed6f3a952cd2764c11aea21c1c62e5a4ffc584500cc29d62867d6852e700eb3e6c339f3456d39bcdff16a476dfdbe5705dea5934460769fa22 SHA512 580114cef9356d66ec1e6c306837d44dc3098e8f3f805eda20c5d8f81f087bf295b25801ee64ee2bc667ce7324f510ff6f4fc7e222d1431ec3d4e82bbcfb160f
+AUX sslh.conf.d-2 621 BLAKE2B 095522c582be245f1e49018848be738a33eb722cd9be4bd8a0830bbfaa1c2e4018ff480b625349372cc35ec47a1b10069cb5fd6a3c22d7e957e782c888c70b55 SHA512 31d482af0b3626f4b2f669f74a08fa6b6dfc310a40ab332cc3907306bd2fa5321f92e0e76af72c2ea185142f0d485578817e738737917b9c1764079070297e67
 AUX sslh.init.d-3 273 BLAKE2B 01ba7f4347989a6bcf829139ce3a51e7b14265eaae2e32617933c29c5d195a6a3bbe0674a13d52f02e2c418787ed3976987dc79d9c9045b0c7ca6285aa86fb55 SHA512 1508a137c5bc962e1dfa780334c015fb63701867261fc335920fa1847e2ed2093cd02657fc9d2f633382db15bbfd87bfb65f698f5f76aa777aa947ddf39ca10a
 DIST sslh-v1.19c.tar.gz 57418 BLAKE2B 97af9d8f79c54f1ba11476a142c762c69a16b6fdd48ead167c56c217a556183e3fda777f217c09d3bf6a5705d5cf491b68c282b626f70d42512d147d98b6f87c SHA512 14529f1fc1488b10e660fa85f5d8bb642a0e119a15ca44d492793153447c9414ade5a1925fbbedd19c5d26662aa1bafd9743ab5ca11324632269110406fa8ce9
 DIST sslh-v1.20.tar.gz 60459 BLAKE2B fafb1876df54edce99473db9305eaad77e2b726904724c9c74b3eb2fe8666c219c48b49888b05cc52f993104b69a263ba3c8a271efd1217ba6f73258caa83249 SHA512 eccaddd5a4299206f195c2f7a78840b2f76f8a0cf10a715b5c72f959ed5d3259fc5ea3db8d398b33f0d556d71268b15c870999d742f83383a9d49120e476770a
diff --git a/net-misc/sslh/files/sslh.conf.d-2 b/net-misc/sslh/files/sslh.conf.d-2
index 73d08d5f4484..460a56b1183b 100644
--- a/net-misc/sslh/files/sslh.conf.d-2
+++ b/net-misc/sslh/files/sslh.conf.d-2
@@ -5,4 +5,10 @@
 
 # Multiplexing example
 # Port 44 can be used for ssh, http, and https. Drop privileges after starting.
+# Note that this example is not compatible with systemd, as privilege dropping
+# is now handled by systemd.
 #DAEMON_OPTS="-p localhost:44 --ssh 127.0.0.1:22 --http 127.0.0.1:80 --ssl 127.0.0.1:443 --user nobody"
+#
+# Port 44 can be used for ssh, http, and https. This is the same configuration
+# as the above, but compatible with systemd.
+#DAEMON_OPTS="-p localhost:44 --ssh 127.0.0.1:22 --http 127.0.0.1:80 --ssl 127.0.0.1:443"
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 5dc99873bebd..ececd5f0ba88 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,3 +1,7 @@
 DIST wget-1.20.1.tar.gz 4392853 BLAKE2B 5740fa70064e24a699ba5fc0b6262b372fc877e86fc74bede07bcfe7dcdf6d4a15db7686fc900d8ec90ad3adce8c4af1c00460601c1845da7907f929d8d48447 SHA512 855c7e3c45f9020a9fdb30e286ee6a0bdcaa780be3d0dda9ffdae73b562ae1012d4550242f66240407a28076a7054328d4f08a469a0da227a9e3410b8d5f46dc
+DIST wget-1.20.2.tar.gz 4486237 BLAKE2B 7392e445cb801ac5fafee804e6b0459d0a001b91b5b413f1a5592da6bea690a2d6b864b64a1add1c4114085def7a73312a88cd1cf1c12434c6535f79de222d9a SHA512 42d59ddb3abec6ff30e2be890ceeec35fc144acd8e2def25f5280c2f8c21e6fd54dc71217e9ca7fb1d4f0470716bf288e90501e8e6e39b09938e3f5710a3016a
+DIST wget-1.20.3.tar.gz 4489249 BLAKE2B 89fa7997a02be6fb1a869d1bf359ce4e43b41f8069d1520e6d0b48739b9b6030b1dec7b7e8cbe833ea1070b30f551b1a9d72c6f4a43bb58df20b680b42a68805 SHA512 e8b82b40e270296228094a78d47f81580bdbdea9e6b93fd61b37dccb39430aeb9bda5397dc53a31c952a61629383c7e2a8c8abf414c8a4dd369af6ecf2717e6c
 EBUILD wget-1.20.1.ebuild 3188 BLAKE2B a341244ebf21c99c63082e3fa47fb7c146be73ebafaa8d8a2b5210da7c2dd339873456a9b3e5b4560d7459a6e72259b6e7663486412a365af9c9d81d8e47a704 SHA512 8fa5048e8dd8a42ca12c86aa7f09e3268a35d165c51fd7081a3ca85c3e127674a1f66983b9eb9375a06db74db7e45d73b8e2af5979e75ee7d6846339763b3ad5
+EBUILD wget-1.20.2.ebuild 3199 BLAKE2B b3bdf8e617b23ce92b23e9f958c5f3523666832760f5d4341067dcde3489d7d5c3cf10149b187181ffc08c55b67b5ea89b58009c66529407b18a25e01eda256e SHA512 10ba5b18809aed13e07d4e71cf2f0b3073d0f5ece4c2401b3d5e8dbd07f42d62d6776d163ed2daee39fc2bb1bf90bcdae712b3a1d491b94b45ea35ee9d05e5ee
+EBUILD wget-1.20.3.ebuild 3199 BLAKE2B b3bdf8e617b23ce92b23e9f958c5f3523666832760f5d4341067dcde3489d7d5c3cf10149b187181ffc08c55b67b5ea89b58009c66529407b18a25e01eda256e SHA512 10ba5b18809aed13e07d4e71cf2f0b3073d0f5ece4c2401b3d5e8dbd07f42d62d6776d163ed2daee39fc2bb1bf90bcdae712b3a1d491b94b45ea35ee9d05e5ee
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/wget-1.20.2.ebuild b/net-misc/wget/wget-1.20.2.ebuild
new file mode 100644
index 000000000000..b9c1aa3290a5
--- /dev/null
+++ b/net-misc/wget/wget-1.20.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.gz"
+
+LICENSE="GPL-3"
+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"
+IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+
+# Force a newer libidn2 to avoid libunistring deps. #612498
+LIB_DEPEND="
+	idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] )
+	pcre? ( dev-libs/libpcre2[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+		)
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# revert some hack that breaks linking, bug #585924
+	if [[ ${CHOST} == *-darwin* ]] \
+	|| [[ ${CHOST} == *-solaris* ]] \
+	|| [[ ${CHOST} == *-uclibc* ]] \
+	|| [[ ${CHOST} == *-cygwin* ]] \
+	; then
+		sed -i \
+			-e 's/^  LIBICONV=$/:/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+
+	# There is no flag that controls this.  libunistring-prefix only
+	# controls the search path (which is why we turn it off below).
+	# Further, libunistring is only needed w/older libidn2 installs,
+	# and since we force the latest, we can force off libunistring. #612498
+	local myeconfargs=(
+		--disable-assert
+		--disable-pcre
+		--disable-rpath
+		--without-included-libunistring
+		--without-libunistring-prefix
+		$(use_enable debug)
+		$(use_enable idn iri)
+		$(use_enable ipv6)
+		$(use_enable nls)
+		$(use_enable ntlm)
+		$(use_enable pcre pcre2)
+		$(use_enable ssl digest)
+		$(use_enable ssl opie)
+		$(use_with idn libidn)
+		$(use_with ssl ssl $(usex gnutls gnutls openssl))
+		$(use_with uuid libuuid)
+		$(use_with zlib)
+	)
+	ac_cv_libunistring=no \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED%/}"/etc/wgetrc \
+		"${ED%/}"/usr/share/man/man1/wget.1 \
+		"${ED%/}"/usr/share/info/wget.info \
+		|| die
+}
diff --git a/net-misc/wget/wget-1.20.3.ebuild b/net-misc/wget/wget-1.20.3.ebuild
new file mode 100644
index 000000000000..b9c1aa3290a5
--- /dev/null
+++ b/net-misc/wget/wget-1.20.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.gz"
+
+LICENSE="GPL-3"
+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"
+IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+
+# Force a newer libidn2 to avoid libunistring deps. #612498
+LIB_DEPEND="
+	idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] )
+	pcre? ( dev-libs/libpcre2[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+			libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+		)
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )
+"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# revert some hack that breaks linking, bug #585924
+	if [[ ${CHOST} == *-darwin* ]] \
+	|| [[ ${CHOST} == *-solaris* ]] \
+	|| [[ ${CHOST} == *-uclibc* ]] \
+	|| [[ ${CHOST} == *-cygwin* ]] \
+	; then
+		sed -i \
+			-e 's/^  LIBICONV=$/:/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+
+	# There is no flag that controls this.  libunistring-prefix only
+	# controls the search path (which is why we turn it off below).
+	# Further, libunistring is only needed w/older libidn2 installs,
+	# and since we force the latest, we can force off libunistring. #612498
+	local myeconfargs=(
+		--disable-assert
+		--disable-pcre
+		--disable-rpath
+		--without-included-libunistring
+		--without-libunistring-prefix
+		$(use_enable debug)
+		$(use_enable idn iri)
+		$(use_enable ipv6)
+		$(use_enable nls)
+		$(use_enable ntlm)
+		$(use_enable pcre pcre2)
+		$(use_enable ssl digest)
+		$(use_enable ssl opie)
+		$(use_with idn libidn)
+		$(use_with ssl ssl $(usex gnutls gnutls openssl))
+		$(use_with uuid libuuid)
+		$(use_with zlib)
+	)
+	ac_cv_libunistring=no \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED%/}"/etc/wgetrc \
+		"${ED%/}"/usr/share/man/man1/wget.1 \
+		"${ED%/}"/usr/share/info/wget.info \
+		|| die
+}
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index edac7ac9432e..4221120f69b6 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,9 +1,9 @@
 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.3.2.tar.xz 82984 BLAKE2B 2e2d9ebf2e93831a1fa3e98a2f8922e531592b95175c9280358a37160a9033ee805baa6519304350399c112e619e293a2746df527ef5c580afbdde1542cbef06 SHA512 27d9576ee7b701778cac0dd7d4df2c4ae2d152fa5dfb3f84d7d5d592314e45872b2f3d6eca0754923ec3a0741e5365bf2238b2c0b366403c35e8a5b046e59434
-DIST whois_5.4.0.tar.xz 83576 BLAKE2B fb21094227bc254e7901d0af667206f742657093b2dc25dc066ccb727d07fbc9cef7443f29d0bd22e307d2127689f9fe33e55282e0311f968039bb0fbe48417f SHA512 d6b8f097eaaab216d862503c96aff32777caec3597b357fb2589b86e98c6ff52f35b18ea5f33d1ece23250c61f849daf9943a2895fe563b05fcbd26718b3b80e
 DIST whois_5.4.1.tar.xz 83748 BLAKE2B acc3267a78c22937967cea92b542d92e99dc135a70550f242b098e0a459193564514c6b28c0290a82b9321a6a081793f64d51157c75cbe852fbb91a7cd353310 SHA512 8036679be4b5cd7ab67903ca1c949e0261bd2589f5a4efa18b10ecab8a1e13d99e5e8b839a4974af22c6afcfff74f7bd1c4361ef1aa3ebf7621a7c8a6bc98c25
+DIST whois_5.4.2.tar.xz 83832 BLAKE2B ea217d44c87fd92b6e005f344b31424a3a9481f6a892b911dcbe7794ab6e28229bb74bdea02be05ece9b18a5bd4802a4c7ab0433eaa3edcd18bb5bdd06cfe3d6 SHA512 09b10529a4cc1305802a4dcaa5090e05a4abb20863a622dcad3d1f0759d56c0604280fea703a1522af1e2ddf42e5dc34710c411f306debb420cda9e1956b3cde
 EBUILD whois-5.3.2.ebuild 1577 BLAKE2B fcafe5e78eaa79b02d6ee03ffc964307687eaccae5bda1959c63542389697c016372c3718e02478d2bf70aa91d9e4a7b3b7a1df35f5aed02acec48c85af74965 SHA512 0d524bc8e5ac35c3034b34f402ffca1e2004ea03f7b75986fc09f1c8ce5354a08834871767b2d9e5a6063ff2fde258c90d22778cf9ef66811c84ddaa7618a5a3
-EBUILD whois-5.4.0.ebuild 1590 BLAKE2B b832b7c82c05efff9136bd6f4ca02c9b482f141fdeff38aa6b72ec5ef5b3cefe74b9a8711f4f358bac380d0c34f2ecd0bb92203c40f0912aecbdfedbd64834cc SHA512 6251dd887631db7394f43ab322d733b4da29f5c012c8398de2f79c83ba57bde18dea0ead4fd6eef8005e48373946ac6ebe88e468173c59d6735175eec65be37e
 EBUILD whois-5.4.1.ebuild 1590 BLAKE2B 210332c4a24726612faa28d07d33079c949821614725351fa6d4a72aeab39f373230fa84cd69cda09065bc068fd9a5b007bbaff361ec0fd4bbc91ad25d4f10cd SHA512 ea9ba736f4e5e1870dbaa6852a6d40e16ba5c23c8442c0c8166c17f84d3314ad0c990cbdbb0260f3fa3668e093831d8e4373f0a2161bc5eb31efb24c45a66aa5
+EBUILD whois-5.4.2.ebuild 1590 BLAKE2B 210332c4a24726612faa28d07d33079c949821614725351fa6d4a72aeab39f373230fa84cd69cda09065bc068fd9a5b007bbaff361ec0fd4bbc91ad25d4f10cd SHA512 ea9ba736f4e5e1870dbaa6852a6d40e16ba5c23c8442c0c8166c17f84d3314ad0c990cbdbb0260f3fa3668e093831d8e4373f0a2161bc5eb31efb24c45a66aa5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/whois/whois-5.4.0.ebuild b/net-misc/whois/whois-5.4.2.ebuild
index ae4f333c28e5..05fc6a779ed0 100644
--- a/net-misc/whois/whois-5.4.0.ebuild
+++ b/net-misc/whois/whois-5.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 8c6c3e7f98f8..9169f8d57cde 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,6 @@
-DIST youtube-dl-2019.03.01.tar.gz 3117441 BLAKE2B 92beb16920b6d9c3ead89d5ff930b73635f74d7aeba62a4ee8159e28b448931810f340857bc223ab587610704405083768137a62d7c92814a7525825adc60919 SHA512 ff037b2288b937ebc70bfa880a4c0cd10cb4a615725e25f8db998c828d4b505461088b5aaa926aa47f148189496275f1a70e03e187325c15d6ff425ed4da2dc7
-DIST youtube-dl-2019.03.09.tar.gz 3120854 BLAKE2B 83c9dd22636dec34be497d28e28dcf8e68ad3566603acb5902dc422672aa73e27811bf27779da093e54fcee8068f9a3377eb21e8810f1a3cad95d4bdc920c8a7 SHA512 a827d481057ff502064acd4c170c5320c63e0abb1048ef9d3563083478dc518f0755ecdc3179fe75a1a949aa162f9bebdd96a59f913b34f0b7ed54b168fc2903
 DIST youtube-dl-2019.03.18.tar.gz 3122206 BLAKE2B 8a94cf92ebce960fe9b074d5cc23047fbf326fe4511c55f0a1c4843386e4e3c65da4f89a2401243dbaf73882f68aadc768e653e8ed9e5c91244172c24e55d8bb SHA512 0a683631da7d67aa2f23eb6326664e483b71ef776b3ff63c732bdef54f58c7f615733023f8c4b948078f59d136414bd059bdc753d89aec630126bbe826db58ce
-EBUILD youtube-dl-2019.03.01.ebuild 2025 BLAKE2B b6a2160f963618319a13803e39385f2a0811103ae2a5c88882ba600d68125f7b3b862b3676d5fcfad823d51864d6fc301ea71903ff3c5d631fe393d8bb44caa9 SHA512 3aa94e29d976d5fbab4835ef6e5327a72a7bb99cc5b36fffb1ac637fb48ba8d13ecad633b4e159d3c6da9ddd1e6d2b1109e1e7bb6f1553bbab7068574a68f2f1
-EBUILD youtube-dl-2019.03.09-r1.ebuild 2123 BLAKE2B 30c7bf09ce71e92554aa3149fd27be0dbb3608bb35303a496dc4b1388be8a5e67bee450d6d1ca185637c2409f74f52e0aeaee3dcaac30a3f3c57de092c4e2d17 SHA512 d86d5fe4dcef4cd09f200ebc9ff39a9eecc578522c1bfe8914f41fb16ebf525897511ed9114688c9b2172421f728f6608effa3521c75d2b1d11c47972b481139
+DIST youtube-dl-2019.04.01.tar.gz 3129663 BLAKE2B 0ab60ad7acad323cfc2f62a5066e4c58405302813abf21ff020a94ca23a72995930e76cad9f91cea28db6014a42a7ed8c9380db8dfe8dde846c8d951997c2bc7 SHA512 656fb3bc88648db72a88657d0b6fa104bb463ee8f5eb1cdc969c5869c83ab83cf192883912e091e98abd308151a6e0ba12ad0c9b356988744041850bc6b31cef
 EBUILD youtube-dl-2019.03.18.ebuild 2117 BLAKE2B 5083bf39fb89c96f03b9d4b68353e30716c2649a502024e3116ead883c4007fdf291eee380b94259df2fa319baf78905288288278ef4b91a1629ad7e51d73616 SHA512 d8adef117e465905f79aed2ae691e136a3bae7c8f530f771750a98e661a018852ab499f71baebd39047213813ed382ecd88c46efc0f592264713e18c893d5ea6
+EBUILD youtube-dl-2019.04.01.ebuild 2123 BLAKE2B 30c7bf09ce71e92554aa3149fd27be0dbb3608bb35303a496dc4b1388be8a5e67bee450d6d1ca185637c2409f74f52e0aeaee3dcaac30a3f3c57de092c4e2d17 SHA512 d86d5fe4dcef4cd09f200ebc9ff39a9eecc578522c1bfe8914f41fb16ebf525897511ed9114688c9b2172421f728f6608effa3521c75d2b1d11c47972b481139
 EBUILD youtube-dl-99999999.ebuild 2012 BLAKE2B 7ad819e850d30622c7b7e4c6ab21a5f3a0e3a5cbf9ab8f3c12f7e6c93ff8074a63f4b69ac1fd7ccb5bc9453cf298853756778e841a3f8988ee5c24e4a79f5c62 SHA512 2e5bfc2fa48edd888371b396bb09ba84a239ee0cc89ea80c39a5dd05bde5177935f5744dd2d1f7e9c0a18eca9a2014253a4fb9485129bbc68875f0fa030e92f0
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.03.01.ebuild b/net-misc/youtube-dl/youtube-dl-2019.03.01.ebuild
deleted file mode 100644
index 51dcb55b9d9f..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2019.03.01.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-LICENSE="public-domain"
-
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-RESTRICT="test"
-SLOT="0"
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2019.03.09-r1.ebuild b/net-misc/youtube-dl/youtube-dl-2019.04.01.ebuild
index 8249fc9c0e19..8249fc9c0e19 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.03.09-r1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.04.01.ebuild