gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /net-misc
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
239 files changed, 3341 insertions, 4493 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6311d6ebd1dd..b290384793c8 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/aggregate-flim/Manifest b/net-misc/aggregate-flim/Manifest
index 37257e5a988a..4798dc9b8d44 100644
--- a/net-misc/aggregate-flim/Manifest
+++ b/net-misc/aggregate-flim/Manifest
@@ -1,3 +1,3 @@
 DIST aggregate-1.0.2.tar.gz 51074 BLAKE2B f1b34e3aa805db329ff8839fa0a083edecb2a7af93d37ed08b49509858bea8d44bf11c5d99d1e20fe645965f34de4a59a71020183e16076c1fa2a333d1d0e520 SHA512 1d85f4457402e6cdcf9f68d58cf66401f6f9530930d3bba3005e1ae82e6c8283c720d2c1d88da906b83fccae47cb9128ae6b8f4781388d651ee206cea887e14e
-EBUILD aggregate-flim-1.0.2.ebuild 612 BLAKE2B 0c0e1c0e9c5d0d0c687f541d73a3f24f4766205b44406b20b70946b7daa400eba1cbfc89ac0063a0d99d5456aa047d390231446a4b114aaf835630701e693e10 SHA512 17974580da6ca37d8da4c65d2d846739610e03572e6e48b3ef08190dfc6884856bee0f47229532d84adba9fefc386b575364a3ddeb277c96d7d9bc13ed7b1989
+EBUILD aggregate-flim-1.0.2.ebuild 562 BLAKE2B dd3dc815702efb7237e9c642b9bdfc7dc998ddcf84c67a4c8894d549ff951ca15425dceb088404ca387b70144b58359f8c07f5076293d38bf1e51b8529a0cf28 SHA512 b2d2540793104f0fdb617db8a6b0af71e18383fc298250fb29ea9b5eb334193182c15223bddd27d297eaf4b4ad7ba64956671f495b57d97769d93878b8ac1757
 MISC metadata.xml 568 BLAKE2B db7e2338ae58117e2fbc9ef2e43cfcec1691f2ee88db5118a4f06b4df2086312f63f9904dc05f1eb74000e68a2212efaa31c1a95274d9d9d8cbe4762d3fe41c1 SHA512 ad6ad45f4bb48fdec0354105bf4ff3f1034c71e39d9ca98638249b69dc9e8c5105f6099494aff1e1214a506a75251b6123c5aa9744afec1936506f2c0b21268d
diff --git a/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild b/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild
index 818d9b767147..d2ab83b20b5f 100644
--- a/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild
+++ b/net-misc/aggregate-flim/aggregate-flim-1.0.2.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
-MY_PN="${PN/-flim}"
-MY_P="${MY_PN}-${PV}"
+MY_P="${PN/-flim}-${PV}"
 DESCRIPTION="aggregate is a tool for aggregating CIDR networks"
-HOMEPAGE="http://www.vergenet.net/linux/aggregate-flim/"
-SRC_URI="http://www.vergenet.net/linux/aggregate-flim/download/${MY_P}.tar.gz"
+HOMEPAGE="http://horms.net/projects/aggregate/"
+SRC_URI="http://horms.net/projects/aggregate/download/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 DEPEND="dev-libs/vanessa-logger"
-#RDEPEND=""
 S=${WORKDIR}/${MY_P}
 
 src_install() {
diff --git a/net-misc/aggregate/Manifest b/net-misc/aggregate/Manifest
index ed68fd908fcf..40e4728c9031 100644
--- a/net-misc/aggregate/Manifest
+++ b/net-misc/aggregate/Manifest
@@ -1,4 +1,4 @@
 AUX aggregate-1.6-build-fixup.patch 193 BLAKE2B 99a4266726eb7ef36cb58c5f3ace8c36bc1f923f453acb003f3f59af179ab88e5ef641b387c03912f476a8bb29a46fada6ce5b4b6382d7328fd06752134ba186 SHA512 6c7508f88da5f287b5dbf7e12bf5891722300d11d0c167659c816a28dd38e2cf46de928b4cda48ee8ff6b6201b01cc6a41bc22345eb478ab255b5c1dc2713b11
 DIST aggregate-1.6.tar.gz 20566 BLAKE2B 8d7c9b16063da1481a1be57e1de8e73d5ee54ab8fe539b116263582b951bc84396b174388ce6ea1ee8126a1b1ac49e4e69dcfad8ded37f32edd429d620c4971f SHA512 b6c48540a6905c5b0c2195c91c6b19fa537f1a746adb7e173642c3f0bd894cbbd8f4ab7203f1c6b904538c4b0f1ce13138c5e00e6f05567992bfc51b8b459f84
-EBUILD aggregate-1.6.ebuild 616 BLAKE2B 88fd060b446858374ffc23b39e1593a8a71f78cfa389364256fb7518c7e4481721952736b3188ac4a0204822420d31a5d63569ecbea20580e0443f34c7f1b77f SHA512 9c75a996a410ce1db0d75d996df706bf8a0034918f8a338cc1d046bea1b4431bbf594523d874d01d38b044f5e7e73884f95d4a1a7e63b5e9ce0eea34cb3ef7f6
+EBUILD aggregate-1.6.ebuild 607 BLAKE2B f39cc7a9c10de657424362965169389b5e059808371d7f1dfd5239fb0d3ff436932eb81908d6c349aadf847ea0cbb70795ab0eecdbc96e174d46a2b7fa9cfa19 SHA512 31704e2ba7bfc05369e68d5a502ba9b2f59f666800dcb8f8fd7786a75f1bc43dc1a959e9e6e1d2c5eecb5d932dc8f5b00fec10b4cb5331770aa100fec7a3049a
 MISC metadata.xml 975 BLAKE2B 5478f76eb90bbdb4daee5ccc930312d6b1e6fa162e20824b1c6ee7c9371183ca3436fe000ba9b7c66d4b991ace6109b5ff4d0bd0453a7c055105e2d3007fc124 SHA512 f192380066542eb7a770edc78e4804f06b41bdc65dcd70a9a69618789220c220c7d97e9ba979e3cebb2d9813bf26664bfb7536d4c51e01071964561d72dac054
diff --git a/net-misc/aggregate/aggregate-1.6.ebuild b/net-misc/aggregate/aggregate-1.6.ebuild
index 8df22ac51199..91a91c8a61c0 100644
--- a/net-misc/aggregate/aggregate-1.6.ebuild
+++ b/net-misc/aggregate/aggregate-1.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit toolchain-funcs
 
-DESCRIPTION="Take a list of prefixes and perform two optimisations to reduce the length of the prefix list"
-HOMEPAGE="http://dist.automagic.org/"
+DESCRIPTION="Perform two optimisations on a list of prefixes to reduce the length of the list"
+HOMEPAGE="https://ftp.isc.org/isc/aggregate"
 SRC_URI="${HOMEPAGE}/${P}.tar.gz"
 
 LICENSE="ISC"
diff --git a/net-misc/aria2/Manifest b/net-misc/aria2/Manifest
index 5734e8f6a2b5..0993603c335a 100644
--- a/net-misc/aria2/Manifest
+++ b/net-misc/aria2/Manifest
@@ -1,6 +1,5 @@
 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
+EBUILD aria2-1.34.0-r1.ebuild 4415 BLAKE2B fe9c3e485d7ece90ad6c4691ad31298fbfce7709738a69e0b78e6b222168417c91eee1a4bc86e96f75ddfea607d5a5245689772e19a664a47002e0509e975a3e SHA512 1a2050c5e8ddf1da9cc24440024a1099df92788e6413dfff6359f3cc3a7b8acbe8e256d78b6c3cb7522bb5f6dd2a5437b4814a0a7ee7206b646f3f3546c1cd0e
 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
index 1522945364e2..b12d839f52e1 100644
--- a/net-misc/aria2/aria2-1.34.0-r1.ebuild
+++ b/net-misc/aria2/aria2-1.34.0-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"
@@ -10,7 +10,7 @@ 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"
+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"
 
diff --git a/net-misc/aria2/aria2-1.34.0.ebuild b/net-misc/aria2/aria2-1.34.0.ebuild
deleted file mode 100644
index 8da582d6b7be..000000000000
--- a/net-misc/aria2/aria2-1.34.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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
-	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/axel/Manifest b/net-misc/axel/Manifest
index 2ab9e3b4f76e..88af285e1af5 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -5,9 +5,9 @@ DIST axel-2.12.tar.gz 82995 BLAKE2B da6e00cb577ffd9ab55c3b5b4362f0bdbc08ae89572a
 DIST axel-2.14.1.tar.gz 89356 BLAKE2B 43e278f09304ed9f872c9348fb2113758a046819c6c8667bd6bff65824a8a55c3d0ac647027947f76b9c4f334495284f30066fa3bd60bc0eaab4f4b5b5059620 SHA512 72c37fc6def0c765ed8220c27efe22255073b1e3cf1c8f6bda5ee2ce9cd36ac46263ac602a185efd40ca8f197a268612f2dcda69bcb49891c2538b910d971e8b
 DIST axel-2.15.tar.gz 96474 BLAKE2B 73b35b0c234bf2c21b5c6038979061c908de7520d923ecf6d84d7d6cee348c3e17b8f8d3771909ed74cf20899e3d8ece2cba44764ce625755e0ff44563c0fc43 SHA512 b0a516850b56b74fe763df3320b98e47f9977dda208cff9a98a87bdc63e37f5e0fd31d30c240a375f9d992320674983ced8201ee631187149e62b42804c48eb6
 DIST axel-2.4.tar.bz2 44995 BLAKE2B 03218c6243029695deae1a2d96b4e0cce719cf23602faf2d2fb4422f06ae313f5a1ed6759e7bc59a1ce756a732873ca5faed636742b608b6a66240b694b7189a SHA512 34d73cea19f2bf393aa8d3e4b6c24296f8b1d4e6177da6f4728763e013d5d9d073aa5dae31d0ff175126e8fcbd973daf94674a70f100afc9e7d00b92b78b8ec9
-EBUILD axel-2.12.ebuild 1155 BLAKE2B b298c263913d80fe59afc27b4097c97aeebec09d7806573abb7e200001b8c6b10e2ec9bc437c1839fe6d6563ceec61abccca75a37c7f46803bf07b993993ca65 SHA512 5070aeaefbc1649011db1791fd3594adc79f39aa530207324e73fafbffb3496da83302dfe3c994dae87d90bf28c7ecebd327458882629061f0255d61ac6bb1f2
-EBUILD axel-2.14.1.ebuild 1353 BLAKE2B e8a27f84e41facfb49f2656b62df80c594ffd41bec36f8b419fb60017f050ed509d0bb1d4df1064a541398fcbe358023e1028cdec2664878d2e670dd5f5e6d32 SHA512 9a112722dea3a9c143dcf30dd761ded084193f26df326353533f51b3100746a7a3a8e7bd9144bd057344b725806c639e15889947133b90b690d31dc8a23633e1
-EBUILD axel-2.15.ebuild 1353 BLAKE2B e8a27f84e41facfb49f2656b62df80c594ffd41bec36f8b419fb60017f050ed509d0bb1d4df1064a541398fcbe358023e1028cdec2664878d2e670dd5f5e6d32 SHA512 9a112722dea3a9c143dcf30dd761ded084193f26df326353533f51b3100746a7a3a8e7bd9144bd057344b725806c639e15889947133b90b690d31dc8a23633e1
+EBUILD axel-2.12.ebuild 1118 BLAKE2B ad98b888508b865d055384096d9f45e94b7744eb1f58fdfe8e2c2deecb7b97813c0696c07644aeeaef4a3b1c54a8441cca53e53a8e5710d82e9a112f5ddc141d SHA512 4b2a6bb604306f25f69214e605abf391e0309266f908a6947b554ce8443382695dc845cc35de36e970e8a74a2c2304b3cc578c668056628d0ed3854124e50e24
+EBUILD axel-2.14.1.ebuild 1316 BLAKE2B b66b70cf8ac8a1bb9aaef9372b559d265f642dc29f1c1203f7a7aeeea4b7820d521d20b84f51159d91f12ea4494892ac5f4f7def3f7b4cba66b54443f41f3d2c SHA512 d3d304957df1bf5051689339de29df312c28ca22d104a615372a670bcb01b18062c7178622008686d118c1a738cdb8a0fd7c2323fa08309f3cc53d81598aa59d
+EBUILD axel-2.15.ebuild 1316 BLAKE2B b66b70cf8ac8a1bb9aaef9372b559d265f642dc29f1c1203f7a7aeeea4b7820d521d20b84f51159d91f12ea4494892ac5f4f7def3f7b4cba66b54443f41f3d2c SHA512 d3d304957df1bf5051689339de29df312c28ca22d104a615372a670bcb01b18062c7178622008686d118c1a738cdb8a0fd7c2323fa08309f3cc53d81598aa59d
 EBUILD axel-2.4-r3.ebuild 1247 BLAKE2B 618f8537f2042873859c850abb21c2275b108e8d31a7d7b23c9fda15c350328b4f6d76ab382ba99cf3e342ad641ee2889f3151121b517b20c5daae1fbd400a96 SHA512 faa5ee4628df473cef38395d5e458743697ee03cca323a690796d21ea26427e052b25a42b3362fa289a716fb12b600eeb19ef2fa833448aa150d9afe41221b08
-EBUILD axel-9999.ebuild 1224 BLAKE2B 26def22c2c72016c0e2b8e35c6517729d26ded1b1d677134f5e161faa8f462599e4318d71a6a6c500b4782d3c5081e4abdbe0352dceca67cc31ebe1037acb315 SHA512 0b08a3fdbce4297c749d35a3e490bc2f2581058fe385a6e326d10fb052af93af1c7646fef76d133b14c5f67b828f0de973c385a49a55dd65fec50fd50e50f0e7
+EBUILD axel-9999.ebuild 1187 BLAKE2B fa2b8d7b7ee68e682a54c4aa559d70ceb5ae9599aa4be96d3b1f9d72ef90a6b575472ad7fdd4c86a3fbede653b192b8eabbc661b5f66f2ec9e25b8d25549cf83 SHA512 490e1f2f403ae3dcfe9566daf27137a2ddd71bfb7646e8a80ec2ea842f9d4f5f37169330e2b9fcfc3a16047b2ac24efa02a72fe71ff24cb04671b28494171c3e
 MISC metadata.xml 297 BLAKE2B 9f26dea03e49f186ad556d820c49e2cce7a033c0d6afb0097371ee89cb645c77e997a774787bf45f1a579ec17b1535cd3d5c23599f0d872c197385881a00bdb8 SHA512 8d005244ca7b5f8dd30f9a158e4a53880d8a395bf11c73f8a3c7a3c668153a4c126b0a88942d3bd895a0e5ddc1f672eb770858356d0e12af75a098d36a80d56d
diff --git a/net-misc/axel/axel-2.12.ebuild b/net-misc/axel/axel-2.12.ebuild
index 1ab2acc7f251..5a8faece5f25 100644
--- a/net-misc/axel/axel-2.12.ebuild
+++ b/net-misc/axel/axel-2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,8 +14,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
 IUSE="debug libressl nls ssl"
 
-REQUIRED_USE="libressl? ( ssl )"
-
 CDEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/net-misc/axel/axel-2.14.1.ebuild b/net-misc/axel/axel-2.14.1.ebuild
index 778e289857a0..0b7470e5d7b7 100644
--- a/net-misc/axel/axel-2.14.1.ebuild
+++ b/net-misc/axel/axel-2.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,8 +14,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
 IUSE="debug libressl nls ssl"
 
-REQUIRED_USE="libressl? ( ssl )"
-
 CDEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/net-misc/axel/axel-2.15.ebuild b/net-misc/axel/axel-2.15.ebuild
index 778e289857a0..0b7470e5d7b7 100644
--- a/net-misc/axel/axel-2.15.ebuild
+++ b/net-misc/axel/axel-2.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,8 +14,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
 IUSE="debug libressl nls ssl"
 
-REQUIRED_USE="libressl? ( ssl )"
-
 CDEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/net-misc/axel/axel-9999.ebuild b/net-misc/axel/axel-9999.ebuild
index d4a43d0094fd..2788479a5801 100644
--- a/net-misc/axel/axel-9999.ebuild
+++ b/net-misc/axel/axel-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,8 +15,6 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug libressl nls ssl"
 
-REQUIRED_USE="libressl? ( ssl )"
-
 CDEPEND="
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/net-misc/batman-adv/Manifest b/net-misc/batman-adv/Manifest
deleted file mode 100644
index 6e2090bf311a..000000000000
--- a/net-misc/batman-adv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST batman-adv-2017.4.tar.gz 249968 BLAKE2B 60386dedccc8e1cc1f59eedf69ecddb1180a3c9383132a3b85ed329bf372d08766311dd8fb1980dbe5dd35f5d10bc421257967f429da6151b497c6074924ea5f SHA512 08c99e726ddac99b619846808a1328603d6b40bce4fea8ba2ec955b4866f983b0c6af74a13172c75f040c9dc5eb4aa3a46404a5d1a6a20cbe7ec331a1441dc30
-EBUILD batman-adv-2017.4.ebuild 1047 BLAKE2B 65f7ef87146399598b413d2c9c9b06ab3bdf2e623030e151af8bf1b128052093d70be4f2bb23bdf84b79694fc0f450850a1084d7597adf0d061ba25d670e6f56 SHA512 5330d65778613b993fdf6a2288f81ab53afb228ce49c33596d37fdf1a5d62c9d63473484725810967f3c45de8deb2edf83637347f1923b42956cef88ecd6693c
-MISC metadata.xml 415 BLAKE2B b630aeeddd4168d8d026588d1daba489a3b3ab16e30ba0ee00be8f778c03c106dd64b83eafbb768435fc0cda46c711f12f9933c41b68bad559bff30a626ee31f SHA512 fd6841ff2409e06d91761456b5c9df49bc6e25f4e2c5f61527f5d7eb16516e750bb8bc8661ce282d8fd770e1c05e43f40e7d33fb962e3534520b89f3b9993184
diff --git a/net-misc/batman-adv/batman-adv-2017.4.ebuild b/net-misc/batman-adv/batman-adv-2017.4.ebuild
deleted file mode 100644
index af99959ea89e..000000000000
--- a/net-misc/batman-adv/batman-adv-2017.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CONFIG_CHECK="~!BATMAN_ADV ~LIBCRC32C ~CRC16"
-MODULE_NAMES="${PN}(net:${S}/build/net/${PN}:${S}/build/net/${PN})"
-BUILD_TARGETS="all"
-
-inherit eutils linux-mod
-
-DESCRIPTION="Better approach to mobile Ad-Hoc networking on layer 2 kernel module"
-HOMEPAGE="https://www.open-mesh.org/"
-SRC_URI="https://downloads.open-mesh.org/batman/releases/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bla dat debug nc mcast"
-
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	BUILD_PARAMS="CONFIG_BATMAN_ADV_DEBUG=$(usex debug y n)"
-	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_BLA=$(usex bla y n)"
-	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_DAT=$(usex dat y n)"
-	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_NC=$(usex nc y n)"
-	BUILD_PARAMS+=" CONFIG_BATMAN_ADV_NC=$(usex mcast y n)"
-	export BUILD_PARAMS
-	export KERNELPATH="${KERNEL_DIR}"
-	linux-mod_src_compile
-}
-
-src_install() {
-	echo ${MODULE_NAMES}
-	linux-mod_src_install
-	dodoc {README,CHANGELOG}.rst
-}
diff --git a/net-misc/batman-adv/metadata.xml b/net-misc/batman-adv/metadata.xml
deleted file mode 100644
index 399595c26211..000000000000
--- a/net-misc/batman-adv/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="bla">B.A.T.M.A.N. bridge loop avoidance</flag>
-	<flag name="dat">B.A.T.M.A.N. distributed arp table</flag>
-	<flag name="nc">B.A.T.M.A.N. network coding</flag>
-	<flag name="mcast">B.A.T.M.A.N. multicast optimizations</flag>
-</use>
-</pkgmetadata>
diff --git a/net-misc/casync/Manifest b/net-misc/casync/Manifest
index edf92b8834ef..dbc8496fd5c4 100644
--- a/net-misc/casync/Manifest
+++ b/net-misc/casync/Manifest
@@ -1,3 +1,3 @@
-DIST casync-2_p20180321.tar.gz 1306314 BLAKE2B 9fa9238a9677ede6a218c27929f0990fe26ad0afeeb2f736a6a665d301bde6c016e6fc0f3120266707d3c12cd765667f8a8cd231bb49b5cf8bedfc4ab812b481 SHA512 c8fd61e56dc3e0aec02656e28f8cec8d873498635bdaf96c0576ab3867a0e2ef0fb69206f3a476b0515a284ba35a2d746985056e522f5d396e35bc13fd81ae58
-EBUILD casync-2_p20180321-r1.ebuild 1061 BLAKE2B 3bc98db028264a9783fb5c39a55af2912ea976b5046347923c327fedd43accfbcc9f5f87451128ded5402d48e4f6659c80ccac4ccb1808ede30c008566d6c2ee SHA512 8fb5c62084afb7d209325e9b2356f2cb76be908a0e639817cd68f787268f591b3a9ae5a51508e5b4f99600d08047bc1898c46bd25cf2b4051d27ee79c3aff275
-MISC metadata.xml 360 BLAKE2B 6e944cbef9dcb071939d09f725b5c0a0fae9693e5d4b405da1a669667e25811455bbcc823e2d35c5a6132ef508bb0d6ea6a5e4287b12f83c028d1eee6f502670 SHA512 2f08ddbaefcd45c10f646b38b0e094162dd55b1478c0874a6e06419443cfc9858aeaa2fc24ba2a992d56a52ac05a492e09092d17c790c9382aaf69ec03fbd0cb
+DIST casync-2_p20190407.tar.gz 1315643 BLAKE2B 2cb52682d14a06844bb6d08d9c20d3e356fc40f464463151adee7c0446b64ba106ed29873d71d757452b3dd81095efb1b5d1014b294d58724e4c70bf404b47c2 SHA512 973b4cec8289e1223eced5794d5f6e7af25c60bd52d3c8932005ad0b55aebbebba78d5514ef7be4b3b92a76915d6e3f56bd53d797c2d72ffde2bba98f926bd3a
+EBUILD casync-2_p20190407.ebuild 995 BLAKE2B ca87f5cb5977c4501534e62ee14caa606ebe55c0c5e962d9704479c3802c70add18676b024351fd1126e77550e50e119819f9924cc8dae6a85229f2696478df2 SHA512 3339d37c9b73a11250fd0201f62e95433360244c426c49088bf4480b6e5744dcca2d5339d499d0fa06ba6c7d2d87347e5707412d29a4a9f7d1b8834a2750bc21
+MISC metadata.xml 673 BLAKE2B 7e68de16fb965f49e96df59d7c52062759e021dec76904a64d829aed80578847b268e2c948df7cd1fc8c674789f4671a344e5f91ab36ed10b9fc49b41a5a9e75 SHA512 36681a585c036c549e1c71019ee179eea6dfa921ac68b219b7aa55da1e677d0aeb8082f6e5866fef831d5d8c77626e700a0c75a1a7984a6cb2aea7089ac26e89
diff --git a/net-misc/casync/casync-2_p20180321-r1.ebuild b/net-misc/casync/casync-2_p20180321-r1.ebuild
deleted file mode 100644
index 2e1338a68f79..000000000000
--- a/net-misc/casync/casync-2_p20180321-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit vcs-snapshot meson
-
-COMMIT="a755da21d3ba5d9cbb002dfc86a3ab0d46b82176"
-DESCRIPTION=" Content-Addressable Data Synchronization Tool"
-HOMEPAGE="https://github.com/systemd/casync"
-SRC_URI="https://github.com/systemd/casync/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fuse +udev man selinux test"
-
-RDEPEND="
-	app-arch/xz-utils
-	app-arch/zstd
-	dev-libs/openssl:0
-	net-misc/curl
-	virtual/acl
-	fuse? ( sys-fs/fuse:0 )
-	selinux? ( sys-libs/libselinux )
-	udev? ( virtual/libudev )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	man? ( dev-python/sphinx )
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dfuse="$(usex fuse true false)"
-		-Dman="$(usex man true false)"
-		-Dselinux="$(usex selinux true false)"
-		-Dtests="$(usex test true false)"
-		-Dudev="$(usex udev true false)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-misc/casync/casync-2_p20190407.ebuild b/net-misc/casync/casync-2_p20190407.ebuild
new file mode 100644
index 000000000000..853ece213c86
--- /dev/null
+++ b/net-misc/casync/casync-2_p20190407.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson
+
+EGIT_COMMIT="6d185a540c54195a919d4b44f9bf28c341da3bf1"
+DESCRIPTION="Content-Addressable Data Synchronization Tool"
+HOMEPAGE="https://github.com/systemd/casync"
+SRC_URI="https://github.com/systemd/casync/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+fuse +udev man selinux test"
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+RDEPEND="
+	app-arch/xz-utils:=
+	app-arch/zstd:=
+	dev-libs/openssl:0=
+	net-misc/curl:=
+	virtual/acl:=
+	fuse? ( sys-fs/fuse:0= )
+	selinux? ( sys-libs/libselinux:= )
+	udev? ( virtual/libudev:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	man? ( dev-python/sphinx )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dfuse="$(usex fuse true false)"
+		-Dman="$(usex man true false)"
+		-Dselinux="$(usex selinux true false)"
+		-Dudev="$(usex udev true false)"
+	)
+	meson_src_configure
+}
diff --git a/net-misc/casync/metadata.xml b/net-misc/casync/metadata.xml
index 5a566fd24bed..0a6e55e76e12 100644
--- a/net-misc/casync/metadata.xml
+++ b/net-misc/casync/metadata.xml
@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>hurikhan77+bgo@gmail.com</email>
+		<name>Kai Krakow</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
-	<flag name="fuse">Enable fuse support</flag>
-	<flag name="man">Build and install man pages</flag>
+		<flag name="fuse">Enable fuse support</flag>
+		<flag name="man">Build and install man pages</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">systemd/casync</remote-id>
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index 976b8a50d666..ae643dfb8298 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -1,5 +1,3 @@
-DIST cni-plugins-0.7.4.tar.gz 862510 BLAKE2B 7ec9ec84614caecaca1583430552bd93606ae1f178f92cb4f7047ab47292084c5102437fbc9fdfe0ebf7043c94bb1b9fbb9d2ac0bc78abadb40da11cdd62b512 SHA512 2ffe18353b525d90679eca4950e96afcaadd7c387956ef5baaf4ce97c0550315fda63403161ab8f23df086955dc2a47da612fb8d0cdd30ccfe12649393e2242c
 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.4.ebuild b/net-misc/cni-plugins/cni-plugins-0.7.4.ebuild
deleted file mode 100644
index 0fbcda6f9546..000000000000
--- a/net-misc/cni-plugins/cni-plugins-0.7.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/crossbar/Manifest b/net-misc/crossbar/Manifest
index 6ce9152d6f5c..8137e7fc3f89 100644
--- a/net-misc/crossbar/Manifest
+++ b/net-misc/crossbar/Manifest
@@ -8,9 +8,9 @@ DIST crossbar-17.6.1.post3.tar.gz 725054 BLAKE2B 1c60ae9a29f9d2831dd219c30751c65
 DIST crossbar-17.8.1.tar.gz 1545668 BLAKE2B 812a4b423bf663386255332de2ab90afb4f0a44d205a193d71523e7fa0aba2bf1644b2136200c6ae4b1639de2764b7139ee6081a5167b21abc2bdec6400c5a60 SHA512 21ed2031ddebe93fcd4fcd01243b2aa8979444e833386db83b10d032cfc3c3f9d47cf638d4cf26eb2801e91892c85115fec91e0a6f071a619f014132663f6c32
 DIST crossbar-17.9.1.tar.gz 730753 BLAKE2B 8fb93b017b6af8264aa828a6353d1c6f5fd7f224797504f67f77b5cf2759ada5f9609eb6815da96afadfc2bae90acb2837be19ed0896e1a8ce37ff384fcea367 SHA512 fee96e1c900c756536dc9bf6088c512a50accbae0e8010b7e058de8ed2ebb2f366e5d5051ab2f07517dd642f4d65c65e9b701b00d7bca1b9352c58f38f892563
 DIST crossbar-18.3.1.tar.gz 736736 BLAKE2B 546a7d4ff173928179eeff86aef50e3517067e6aede145a5185e891fe749e0e2c507b577ea3be8f416c5894e8c43db42d8ceaabbdc64823b305219c2f6277ff4 SHA512 cb85ba44054c59eecb751896c5f0d793ccc8990c9d00733de546512b7e500a90ef4042d49ec6f648ec3677687950fbee62208c9bbb6692de65df4f238a2414dc
-EBUILD crossbar-17.12.1.ebuild 6393 BLAKE2B 157f5cfabedac9db56ae223d66b11b56efe671413c93a9897f5f7533e9bc7c42a6df6997bad4a8394fa1983a44ee65bbfa9b6454d4768a2a445349388ea3fb82 SHA512 8047d272ebd3d1e9b617295967c2f02847338a4ad193161545c4f5f075f98fcad908a4f81b51cf4ef5f54689cb0307dc8bdd190cc9a374a160678afe212e0d21
+EBUILD crossbar-17.12.1.ebuild 6388 BLAKE2B 77a8608edce04cf5e19be47d91acda53faaa1741851974c04cad1c3cfead7623515512b95249e45795bfb321aec158f439ab6fb8e5785a37001f576da0ccb18d SHA512 837dec030c9ebf45d3a5f521f9a477fc24f1b91340ca052c938b7ba54a31d0529569d3c7026775a0018cfc6e0332585e62255f4b5074749b1b53ee8c46c18732
 EBUILD crossbar-17.6.1_p3-r1.ebuild 6033 BLAKE2B f4ac47903acc228320c224a18c832f9c15c42d5c721ff4da8f8e4c38a3174d6662996c51c4b423f64fd68961a4eda931058ca842982e34b6b4f2b3db73c566da SHA512 cbb1ad06f854d34194aee8f46f313a1d0f976fd6e2540c4749df26f4c81b9178357152c9ceeaf5317f31208e976b8b5e1b01edc7a5ca0af80c8054c85ca1faa6
-EBUILD crossbar-17.8.1.ebuild 6440 BLAKE2B e1cc79874d06f8d44f364715939465d562c4f94e851d79069c13f35aa49a70adb5a043037765d8ca388d1f27f4c0d83b33bdde28e323e4a91415d069ae115514 SHA512 360e05f0b85199c1f32a6d91b5fd3732dcd1017ef794f46b8e36b7cbd894f43f6416ab873f2cb34f5d46196a6f72e53d12dbff8823a8f6da2caa4e9223f7f6a3
-EBUILD crossbar-17.9.1.ebuild 6390 BLAKE2B b211030d200e6e631054758cbe2ee430dd12a829b95dd6f097614600be59bbffd60108374bc722274bbe585e74811e7a57648cd330357c9fdbd9b7167ced9234 SHA512 51593f193d6fe2bf175fa06cc55b4f0700e5d28dd1e24586ad2b903f70c7f194b5952a0f7ed45eed995222bbb97a1902056280c1c943289c5eb59d5c380c01c4
-EBUILD crossbar-18.3.1.ebuild 6335 BLAKE2B 9328fc990724993b0fbfeb995a1e55682af0001d243a788f80b2016846027bcc2f936a2df4bd8a2827ee2a6a7c5dd2263fb5c347c911b000fe3744fc6c88cba1 SHA512 5412bcb4c937a4a1f8bebbde628f2fbaa28664d5575c22c3119c394d615b659229ae1be7f0439e320dc11441ba6aa37693a733539ad189a4877820974b1a2771
+EBUILD crossbar-17.8.1.ebuild 6435 BLAKE2B d2e41ff6f90579d152334152cb42cf50e3e48dd9b198642aa0a36f738797edec812f4fe51b311871e207022e4b2897c48bb958483f2d4f17c895468a8e287eef SHA512 b440f74d45b22312f5a97304d40dc4c2d36a534202de19e15a20698f8be5faaea85c31b05309a45116820c9d26f25819135e5613483486ec73567f51e5772364
+EBUILD crossbar-17.9.1.ebuild 6385 BLAKE2B 5e6e26cc376fe091a5ad2fced8cb2ccdcc8ef30a2581816468744325e616ed7c6847bbb905457b9ee811689385a79e2313a68bd11db0a1071b107b318a616339 SHA512 0dcb2623777b352e0f168a0c59fef1b50d441c7fa486ba1bbe81a2152e39e68d5a633b3fdf6948985d95b4579068ef0e062ea99f269ca546312593f622d464ac
+EBUILD crossbar-18.3.1.ebuild 6330 BLAKE2B 12b8cf4e5a507be6573a5a338651da633b470ca3bdf92ee986786fe90513d95c777802a812fc8829664cf0bda9d24a689eb146c9d1228f8b017a45abd952873b SHA512 50bc482f6a22ceb59573233d4d3954f525b6d6387411649a0480bfa2412059d8215d9240c45788a23754401f5c53036fbe70e1caf5bc7c81c054583d3348d98d
 MISC metadata.xml 861 BLAKE2B acef636c9c51de3530425dcf3ab31afe8300c3fcbe1615d374c52610647086324887e2fb97b7a2fc9aeae73c48f5742b67ee9190abab5b01f3f7e762ae286851 SHA512 90ce37e4764583a09f90e99c7010de5c1f2abff6837cef4255eee5d83f7d9de2f641812700fa180cdb0e0511d401cb1e160a721600efabc787fc2a32ac0b83bc
diff --git a/net-misc/crossbar/crossbar-17.12.1.ebuild b/net-misc/crossbar/crossbar-17.12.1.ebuild
index e38428c2e98a..f583671c1506 100644
--- a/net-misc/crossbar/crossbar-17.12.1.ebuild
+++ b/net-misc/crossbar/crossbar-17.12.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit  user systemd distutils-r1
 
diff --git a/net-misc/crossbar/crossbar-17.8.1.ebuild b/net-misc/crossbar/crossbar-17.8.1.ebuild
index 1d8c8afe7e8b..3d83b60f86ef 100644
--- a/net-misc/crossbar/crossbar-17.8.1.ebuild
+++ b/net-misc/crossbar/crossbar-17.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit  user systemd distutils-r1
 
diff --git a/net-misc/crossbar/crossbar-17.9.1.ebuild b/net-misc/crossbar/crossbar-17.9.1.ebuild
index 46406d71181b..393fe4e08568 100644
--- a/net-misc/crossbar/crossbar-17.9.1.ebuild
+++ b/net-misc/crossbar/crossbar-17.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit  user systemd distutils-r1
 
diff --git a/net-misc/crossbar/crossbar-18.3.1.ebuild b/net-misc/crossbar/crossbar-18.3.1.ebuild
index 43edd8acf44c..9fa6267f2b5d 100644
--- a/net-misc/crossbar/crossbar-18.3.1.ebuild
+++ b/net-misc/crossbar/crossbar-18.3.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit  user systemd distutils-r1
 
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 01201ff2955d..b0eb165c2107 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -4,5 +4,5 @@ AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8
 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
+EBUILD curl-7.64.1.ebuild 6969 BLAKE2B 102222792a2cd61662ad50830d3f4b01da5abae9cdf477bebbf5ce8ad5923ba512ed6910bc95732343a9163411d5a2a65a8dae89dd606f089b62ac533b624f73 SHA512 24a3a59616b31d7f444198efd618110ff4ebd80ed11a2138460edf2b9f6aa3c9603fc29af6b1e32f09b79769f43df700428070e64fa190de3bd1cb9df453a22b
 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
index 226a0104a18d..14b0cf97e97c 100644
--- a/net-misc/curl/curl-7.64.1.ebuild
+++ b/net-misc/curl/curl-7.64.1.ebuild
@@ -11,7 +11,7 @@ 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"
+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"
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 978776eab893..f092272a7910 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,15 +1,11 @@
 AUX dhcpcd-7.1.1-disable_inet6_fix.patch 609 BLAKE2B f69a5465f8750cba0a57b151b70c178e11576d4645d6fdc6c3f943cd2c98131af0742c48505624fb24d9a940dd523f98cb66bae51e38820c49aa9fdc6084bbfc SHA512 66fcf76affa35f2174e7bc0dd9964a67fde07144aedea30dfcd4f7280b841db344872da56a10d7d2474542c840e75d5323f994989bb96b803076e7e3d37d228d
+AUX dhcpcd-7.1.1-overflows.patch 5390 BLAKE2B 4c06a34b2cc5c1753b643987818a1e5d8b2deedacf90e80d9822a03bcf67d25d9f25adcdf6342792073811a428786789edc2b11c97f03df8fd48b697581b4b90 SHA512 2ea96d9faf1abd35345cf10c84f772a2fc56da33e0f0df93346536b1487d840c1d692a7c5118ebb504c30c8ffc0ac9c7792da0287e31584c10f0e9d11c5ffb1a
 AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
-DIST dhcpcd-6.11.3.tar.xz 194892 BLAKE2B 08253879221f2cbccf69caf06ccbde960103fdf4de194f746572f4fa10497ab23dc1a41b6a849fe75f68a1d7a653e5358a7976581da0a92c8f19e2627b921440 SHA512 249185532cb239124f847c28e6bfb3e8a85e818e05a07eb0c6ac6843fbbab8afa8d6ebce4032b3537ccfb7fafb306dd0dc51c0e97f337f12f5071ba499686a70
-DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34
-DIST dhcpcd-7.0.8.tar.xz 210752 BLAKE2B ad8ba622589cc1c8c4bb332470c59527e03c817729f43a5b55b4f53f8ed60f35faaffbff24416f8596e78df8deb304f0598e27d890e9601d36c81250fda99942 SHA512 82cd845eb35670788b8f31b973945460f4c5f1a0a3025e3a452b79230dc30704e129d97140e6aec6d0281e0c89c333c0ce0af03c4767b2e5e66547ed3e071953
-DIST dhcpcd-7.1.0.tar.xz 211496 BLAKE2B ca919723f8f205ad24e28751024ff68cb4d1e86d056d47b1390a8e81cbb62d61e6a09d50d95756968d43383420e479846a4527095532d2761e26c6f4d780988b SHA512 28d2b5ff8cb372df6432becdbfeedaea945608b14374b6af8938936efdaa73d8d8f1cb3f37d2f440137c2f6988f72ed8de6d1bda43d65d4fe22efdd0a1662c24
 DIST dhcpcd-7.1.1.tar.xz 211788 BLAKE2B 984ec97ffdcb15883f57f9e2a699a7c8f006b2630e7651ab9d55e7a980045f8891f09d9f7be420969203a59671d097a1ed76621fe4a62ff26a5020fc8becfe69 SHA512 8791e718d65ef8ae23a16b98e82824860fa91914e6eb0a42cdbbca28236c1c38005ada44214bde33aac57152fe675debebdb5d141b67dcfc82012996d8337bb4
-EBUILD dhcpcd-6.11.3.ebuild 3267 BLAKE2B 439fae2ecd18b8c32319fbda22fa419f288bc977b8541f07a27c43f908bfe0867addf4b949c8e9f9e4163ca6f366f2083949f9b4d895d4e4bfc858d23cc3f514 SHA512 8c650ccff0f4ffb6ee9a17046b18c7f4c0e849e25b73d3d3abea66cd423a77e1c80c830f639d2ce74bc9c7566f8d6cea968feeb52ccdd6e20a5975f08f6a4b75
-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 4556 BLAKE2B 1709406335981be840a2d88f173514f62e8e5c020c5ff1b85cc0d629a4bd92597268327cd07f85364d09a35ec3eb2ce70b42ae9b990d0f18b73fc34b918ba0e6 SHA512 368b40840f0ae970a62b451335b8951e1e4de4665ad3c41c2ac65dade56a429c27ab27dd17b29e1415bef73f7ee6c64c737d3587baa3cae5d79f92eb80d7cb79
+DIST dhcpcd-7.2.1.tar.xz 213652 BLAKE2B cae5a68ecf285825e6376c8b5bef5f3aba3bb8a393ba4298d8e990d665dd948369f24f688cdb85006df535b7f9b412c795d8eb7817a92e8d9992bdc7b7757a1e SHA512 11c3ef6d3ee49e147aa44725aa1ac0cddff70a268908439fe91990e135175d063e3d65ab587e1780e4f6f0739cf33873a58ffea0a3130d1bfb5598f9f11ec5a3
+EBUILD dhcpcd-7.1.1-r1.ebuild 4546 BLAKE2B 25c5c3e6d7e711b616bb5a9027d92a9606c5e91ccc42fe7494cefe8abc30bdca7387171f3c09a44cfb863a304e9bf64f9afb203d7194b59ef32f6aca5a0a8543 SHA512 2ec21f7e6dfc864d11c90ef2ef99509311823eeae91008a3f10c34fa193c4d06cd7fe370403a1eb0eeb06bd75fdc1966abb54e2ee759b0648af683db5bdc16db
+EBUILD dhcpcd-7.1.1-r2.ebuild 4596 BLAKE2B b111c89b4d71b3142aeb86b58798f14107c1587190a74e904bef20f45a3eb79ee79561a1cbc60b13beaf0d62da97787db0c282b924e2b48c2ba1c3202ee8c393 SHA512 fbcea64846212f3c79557a6a4d4b5db513295a18065742aafd6b11c18b33e7df9a0934c4158485cbf46fd8da88bff7d5aea44abc274be11587a3e3efe5554532
+EBUILD dhcpcd-7.2.1.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5
 EBUILD dhcpcd-9999.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild b/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
deleted file mode 100644
index c355512e259f..000000000000
--- a/net-misc/dhcpcd/dhcpcd-6.11.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]]; then
-	FOSSIL_URI="http://roy.marples.name/projects/dhcpcd"
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-if [[ ${PV} == "9999" ]]; then
-	DEPEND+=" dev-vcs/fossil"
-
-	src_unpack()
-	{
-		local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
-		local repo=${distdir}/fossil/${PN}.fossil
-
-		addwrite "${distdir}"
-
-		if [[ -e "${repo}" ]]; then
-			fossil pull "${FOSSIL_URI}" -R "${repo}" || die
-		else
-			mkdir -p "${distdir}/fossil" || die
-			fossil clone "${FOSSIL_URI}" "${repo}" || die
-		fi
-
-		mkdir -p "${S}" || die
-		cd "${S}" || die
-		fossil open "${repo}" || die
-	}
-fi
-
-src_configure()
-{
-	local dev hooks rundir
-	use udev || dev="--without-dev --without-udev"
-	hooks="--with-hook=ntp.conf"
-	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
-	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	econf \
-		--prefix="${EPREFIX}" \
-		--libexecdir="${EPREFIX}/lib/dhcpcd" \
-		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
-		--localstatedir="${EPREFIX}/var" \
-		${rundir} \
-		$(use_enable embedded) \
-		$(use_enable ipv6) \
-		${dev} \
-		CC="$(tc-getCC)" \
-		${hooks}
-}
-
-src_install()
-{
-	default
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst()
-{
-	# Upgrade the duid file to the new format if needed
-	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local new_duid="${ROOT}"/etc/dhcpcd.duid
-	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
-		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
-	fi
-
-	# Move the duid to /etc, a more sensible location
-	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
-		cp -p "${old_duid}" "${new_duid}"
-	fi
-
-	if [ -z "$REPLACING_VERSIONS" ]; then
-		elog
-	 elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
deleted file mode 100644
index b7938c558521..000000000000
--- a/net-misc/dhcpcd/dhcpcd-7.0.1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
-	inherit git-r3
-else
-	MY_P="${P/_alpha/-alpha}"
-	MY_P="${MY_P/_beta/-beta}"
-	MY_P="${MY_P/_rc/-rc}"
-	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure()
-{
-	local dev hooks rundir
-	use udev || dev="--without-dev --without-udev"
-	hooks="--with-hook=ntp.conf"
-	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
-	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	econf \
-		--prefix="${EPREFIX}" \
-		--libexecdir="${EPREFIX}/lib/dhcpcd" \
-		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
-		--localstatedir="${EPREFIX}/var" \
-		${rundir} \
-		$(use_enable embedded) \
-		$(use_enable ipv6) \
-		${dev} \
-		CC="$(tc-getCC)" \
-		${hooks}
-}
-
-src_install()
-{
-	default
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst()
-{
-	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
-
-	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [ -e "${old_old_duid}" ]; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [ ! -e "${old_duid}" ]; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files="${old_files} ${old_old_duid}"
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [ -e "${old_duid}" ]; then
-		if [ ! -e "${new_duid}" ]; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files="${old_files} ${old_duid}"
-	fi
-	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [ -e "${old_secret}" ]; then
-		if [ ! -e "${new_secret}" ]; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files="${old_files} ${old_secret}"
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [ -e "${old_rdm}" ]; then
-		if [ ! -e "${new_rdm}" ]; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files="${old_files} ${old_rdm}"
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[ -f "$lease" ] || continue
-		old_files="${old_files} ${lease}"
-		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
-		[ -e "${dbdir}/${new_lease}" ] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [ -n "${old_files}" ]; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT%/}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "$REPLACING_VERSIONS" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild b/net-misc/dhcpcd/dhcpcd-7.1.1-r1.ebuild
index 3e592d1c3cd5..9c02a7a0ea5a 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/dhcpcd/dhcpcd-7.0.8.ebuild b/net-misc/dhcpcd/dhcpcd-7.1.1-r2.ebuild
index a146481fe88b..2421095333a1 100644
--- a/net-misc/dhcpcd/dhcpcd-7.0.8.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.1.1-r2.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
+inherit systemd toolchain-funcs
+
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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
 
-inherit eutils systemd toolchain-funcs
-
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
 HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
@@ -27,90 +27,94 @@ COMMON_DEPEND="udev? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
-src_configure()
-{
-	local dev hooks rundir
+PATCHES=(
+	"${FILESDIR}"/${P}-disable_inet6_fix.patch #677508
+	"${FILESDIR}"/${PN}-7.1.1-overflows.patch
+)
+
+src_configure() {
+	local dev hooks=() rundir
 	use udev || dev="--without-dev --without-udev"
-	hooks="--with-hook=ntp.conf"
-	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	hooks=( --with-hook=ntp.conf )
+	use elibc_glibc && hooks+=( --with-hook=yp.conf )
 	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	econf \
-		--prefix="${EPREFIX}" \
-		--libexecdir="${EPREFIX}/lib/dhcpcd" \
-		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
-		--localstatedir="${EPREFIX}/var" \
-		${rundir} \
-		$(use_enable embedded) \
-		$(use_enable ipv6) \
-		${dev} \
-		CC="$(tc-getCC)" \
-		${hooks}
+	local myeconfargs=(
+		--prefix="${EPREFIX}"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		${rundir}
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		${dev}
+		CC="$(tc-getCC)"
+		${hooks[@]}
+	)
+	econf "${myeconfargs[@]}"
 }
 
-src_install()
-{
+src_install() {
 	default
 	keepdir /var/lib/dhcpcd
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
 }
 
-pkg_postinst()
-{
-	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+pkg_postinst() {
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=()
 
 	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
 	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
 	local new_duid="${dbdir}"/duid
-	if [ -e "${old_old_duid}" ]; then
+	if [[ -e "${old_old_duid}" ]] ; then
 		# Upgrade the duid file to the new format if needed
 		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
 			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
 		fi
 
 		# Move the duid to /etc, a more sensible location
-		if [ ! -e "${old_duid}" ]; then
+		if [[ ! -e "${old_duid}" ]] ; then
 			cp -p "${old_old_duid}" "${new_duid}"
 		fi
-		old_files="${old_files} ${old_old_duid}"
+		old_files+=( "${old_old_duid}" )
 	fi
 
 	# dhcpcd-7 moves the files out of /etc
-	if [ -e "${old_duid}" ]; then
-		if [ ! -e "${new_duid}" ]; then
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
 			cp -p "${old_duid}" "${new_duid}"
 		fi
-		old_files="${old_files} ${old_duid}"
+		old_files+=( "${old_duid}" )
 	fi
 	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
 	local new_secret="${dbdir}"/secret
-	if [ -e "${old_secret}" ]; then
-		if [ ! -e "${new_secret}" ]; then
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
 			cp -p "${old_secret}" "${new_secret}"
 		fi
-		old_files="${old_files} ${old_secret}"
+		old_files+=( "${old_secret}" )
 	fi
 
 	# dhcpcd-7 renames some files in /var/lib/dhcpcd
 	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
 	local new_rdm="${dbdir}"/rdm_monotonic
-	if [ -e "${old_rdm}" ]; then
-		if [ ! -e "${new_rdm}" ]; then
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
 			cp -p "${old_rdm}" "${new_rdm}"
 		fi
-		old_files="${old_files} ${old_rdm}"
+		old_files+=( "${old_rdm}" )
 	fi
 	local lease=
 	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[ -f "$lease" ] || continue
-		old_files="${old_files} ${lease}"
-		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
-		[ -e "${dbdir}/${new_lease}" ] && continue
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
 		cp "${lease}" "${dbdir}/${new_lease}"
 	done
 
 	# Warn about removing stale files
-	if [ -n "${old_files}" ]; then
+	if [[ -n "${old_files[@]}" ]] ; then
 		elog
 		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
 		elog "${EROOT%/}/etc to ${dbdir}"
@@ -120,12 +124,12 @@ pkg_postinst()
 		elog "You should remove these files if you don't plan on reverting"
 		elog "to an older version:"
 		local old_file=
-		for old_file in ${old_files}; do
+		for old_file in ${old_files[@]}; do
 			elog "	${old_file}"
 		done
 	fi
 
-	if [ -z "$REPLACING_VERSIONS" ]; then
+	if [ -z "${REPLACING_VERSIONS}" ]; then
 		elog
 		elog "dhcpcd has zeroconf support active by default."
 		elog "This means it will always obtain an IP address even if no"
diff --git a/net-misc/dhcpcd/dhcpcd-7.1.0.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.1.ebuild
index a1f2efc1cab5..48ba26275d0c 100644
--- a/net-misc/dhcpcd/dhcpcd-7.1.0.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-7.2.1.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=6
 
+inherit systemd toolchain-funcs
+
 if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 	inherit git-r3
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
 else
 	MY_P="${P/_alpha/-alpha}"
 	MY_P="${MY_P/_beta/-beta}"
@@ -15,8 +17,6 @@ else
 	S="${WORKDIR}/${MY_P}"
 fi
 
-inherit eutils systemd toolchain-funcs
-
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
 HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
 LICENSE="BSD-2"
@@ -27,90 +27,89 @@ COMMON_DEPEND="udev? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
-src_configure()
-{
-	local dev hooks rundir
+src_configure() {
+	local dev hooks=() rundir
 	use udev || dev="--without-dev --without-udev"
-	hooks="--with-hook=ntp.conf"
-	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	hooks=( --with-hook=ntp.conf )
+	use elibc_glibc && hooks+=( --with-hook=yp.conf )
 	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
-	econf \
-		--prefix="${EPREFIX}" \
-		--libexecdir="${EPREFIX}/lib/dhcpcd" \
-		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
-		--localstatedir="${EPREFIX}/var" \
-		${rundir} \
-		$(use_enable embedded) \
-		$(use_enable ipv6) \
-		${dev} \
-		CC="$(tc-getCC)" \
-		${hooks}
+	local myeconfargs=(
+		--prefix="${EPREFIX}"
+		--libexecdir="${EPREFIX}/lib/dhcpcd"
+		--dbdir="${EPREFIX}/var/lib/dhcpcd"
+		--localstatedir="${EPREFIX}/var"
+		${rundir}
+		$(use_enable embedded)
+		$(use_enable ipv6)
+		${dev}
+		CC="$(tc-getCC)"
+		${hooks[@]}
+	)
+	econf "${myeconfargs[@]}"
 }
 
-src_install()
-{
+src_install() {
 	default
 	keepdir /var/lib/dhcpcd
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
 }
 
-pkg_postinst()
-{
-	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+pkg_postinst() {
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=()
 
 	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
 	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
 	local new_duid="${dbdir}"/duid
-	if [ -e "${old_old_duid}" ]; then
+	if [[ -e "${old_old_duid}" ]] ; then
 		# Upgrade the duid file to the new format if needed
 		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
 			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
 		fi
 
 		# Move the duid to /etc, a more sensible location
-		if [ ! -e "${old_duid}" ]; then
+		if [[ ! -e "${old_duid}" ]] ; then
 			cp -p "${old_old_duid}" "${new_duid}"
 		fi
-		old_files="${old_files} ${old_old_duid}"
+		old_files+=( "${old_old_duid}" )
 	fi
 
 	# dhcpcd-7 moves the files out of /etc
-	if [ -e "${old_duid}" ]; then
-		if [ ! -e "${new_duid}" ]; then
+	if [[ -e "${old_duid}" ]] ; then
+		if [[ ! -e "${new_duid}" ]] ; then
 			cp -p "${old_duid}" "${new_duid}"
 		fi
-		old_files="${old_files} ${old_duid}"
+		old_files+=( "${old_duid}" )
 	fi
 	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
 	local new_secret="${dbdir}"/secret
-	if [ -e "${old_secret}" ]; then
-		if [ ! -e "${new_secret}" ]; then
+	if [[ -e "${old_secret}" ]] ; then
+		if [[ ! -e "${new_secret}" ]] ; then
 			cp -p "${old_secret}" "${new_secret}"
 		fi
-		old_files="${old_files} ${old_secret}"
+		old_files+=( "${old_secret}" )
 	fi
 
 	# dhcpcd-7 renames some files in /var/lib/dhcpcd
 	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
 	local new_rdm="${dbdir}"/rdm_monotonic
-	if [ -e "${old_rdm}" ]; then
-		if [ ! -e "${new_rdm}" ]; then
+	if [[ -e "${old_rdm}" ]] ; then
+		if [[ ! -e "${new_rdm}" ]] ; then
 			cp -p "${old_rdm}" "${new_rdm}"
 		fi
-		old_files="${old_files} ${old_rdm}"
+		old_files+=( "${old_rdm}" )
 	fi
 	local lease=
 	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[ -f "$lease" ] || continue
-		old_files="${old_files} ${lease}"
-		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
-		[ -e "${dbdir}/${new_lease}" ] && continue
+		[[ -f "${lease}" ]] || continue
+		old_files+=( "${lease}" )
+		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+		[[ -e "${dbdir}/${new_lease}" ]] && continue
 		cp "${lease}" "${dbdir}/${new_lease}"
 	done
 
 	# Warn about removing stale files
-	if [ -n "${old_files}" ]; then
+	if [[ -n "${old_files[@]}" ]] ; then
 		elog
 		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
 		elog "${EROOT%/}/etc to ${dbdir}"
@@ -120,12 +119,12 @@ pkg_postinst()
 		elog "You should remove these files if you don't plan on reverting"
 		elog "to an older version:"
 		local old_file=
-		for old_file in ${old_files}; do
+		for old_file in ${old_files[@]}; do
 			elog "	${old_file}"
 		done
 	fi
 
-	if [ -z "$REPLACING_VERSIONS" ]; then
+	if [ -z "${REPLACING_VERSIONS}" ]; then
 		elog
 		elog "dhcpcd has zeroconf support active by default."
 		elog "This means it will always obtain an IP address even if no"
diff --git a/net-misc/dhcpcd/files/dhcpcd-7.1.1-overflows.patch b/net-misc/dhcpcd/files/dhcpcd-7.1.1-overflows.patch
new file mode 100644
index 000000000000..6ec780936a83
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-7.1.1-overflows.patch
@@ -0,0 +1,213 @@
+https://roy.marples.name/git/dhcpcd.git/patch/?id=23525884a346ed81c808c1ed90e3c56a8bf0cc68
+
+From 8d11b33f6c60e2db257130fa383ba76b6018bcf6 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 19 Apr 2019 09:45:02 +0100
+Subject: DHCPv6: Fix a potential buffer overflow reading NA/TA addresses
+
+Only copy upto the size of the address option rather than the
+option length.
+
+Found by Maxime Villard <max@m00nbsd.net>
+---
+ src/dhcp6.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/dhcp6.c b/src/dhcp6.c
+index 99a452b..8fc4f00 100644
+--- a/src/dhcp6.c
++++ b/src/dhcp6.c
+@@ -2029,12 +2029,12 @@ dhcp6_findna(struct interface *ifp, uint16_t ot, const uint8_t *iaid,
+ 		nd = o + ol;
+ 		l -= (size_t)(nd - d);
+ 		d = nd;
+-		if (ol < 24) {
++		if (ol < sizeof(ia)) {
+ 			errno = EINVAL;
+ 			logerrx("%s: IA Address option truncated", ifp->name);
+ 			continue;
+ 		}
+-		memcpy(&ia, o, ol);
++		memcpy(&ia, o, sizeof(ia));
+ 		ia.pltime = ntohl(ia.pltime);
+ 		ia.vltime = ntohl(ia.vltime);
+ 		/* RFC 3315 22.6 */
+-- 
+cgit v1.1
+
+
+From 4b67f6f1038fd4ad5ca7734eaaeba1b2ec4816b8 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 19 Apr 2019 21:00:19 +0100
+Subject: DHCP: Fix a potential 1 byte read overflow with DHO_OPTSOVERLOADED
+
+This fix basically moves the option length check up and also
+corrects an off by one error with it.
+
+Thanks to Maxime Villard <max@m00nbsd.net>
+---
+ src/dhcp.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/dhcp.c b/src/dhcp.c
+index f7cdefc..e13d1b4 100644
+--- a/src/dhcp.c
++++ b/src/dhcp.c
+@@ -215,6 +215,12 @@ get_option(struct dhcpcd_ctx *ctx,
+ 		}
+ 		l = *p++;
+ 
++		/* Check we can read the option data, if present */
++		if (p + l > e) {
++			errno = EINVAL;
++			return NULL;
++		}
++
+ 		if (o == DHO_OPTSOVERLOADED) {
+ 			/* Ensure we only get this option once by setting
+ 			 * the last bit as well as the value.
+@@ -249,10 +255,6 @@ get_option(struct dhcpcd_ctx *ctx,
+ 				bp += ol;
+ 			}
+ 			ol = l;
+-			if (p + ol >= e) {
+-				errno = EINVAL;
+-				return NULL;
+-			}
+ 			op = p;
+ 			bl += ol;
+ 		}
+-- 
+cgit v1.1
+
+
+From 7121040790b611ca3fbc400a1bbcd4364ef57233 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 19 Apr 2019 21:40:14 +0100
+Subject: auth: Use consttime_memequal(3) to compare hashes
+
+This stops any attacker from trying to infer secrets from latency.
+
+Thanks to Maxime Villard <max@m00nbsd.net>
+---
+ src/auth.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/auth.c b/src/auth.c
+index 9e24998..ce97051 100644
+--- a/src/auth.c
++++ b/src/auth.c
+@@ -354,7 +354,7 @@ gottoken:
+ 	}
+ 
+ 	free(mm);
+-	if (memcmp(d, &hmac_code, dlen)) {
++	if (!consttime_memequal(d, &hmac_code, dlen)) {
+ 		errno = EPERM;
+ 		return NULL;
+ 	}
+-- 
+cgit v1.1
+
+
+From cfde89ab66cb4e5957b1c4b68ad6a9449e2784da Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 19 Apr 2019 21:42:07 +0100
+Subject: compat: Provide consttime_memequal if not in libc
+
+Public domain version by Matthias Drochner <drochner@netbsd.org>
+---
+ configure | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/configure b/configure
+index 570e65f..4f58f0f 100755
+--- a/configure
++++ b/configure
+@@ -13,6 +13,7 @@ IPV4LL=
+ INET6=
+ ARC4RANDOM=
+ CLOSEFROM=
++CONSTTIME_MEMEQUAL=
+ STRLCPY=
+ UDEV=
+ OS=
+@@ -846,6 +847,27 @@ if [ "$STRTOI" = no ]; then
+ 	echo "#include			\"compat/strtoi.h\"" >>$CONFIG_H
+ fi
+ 
++if [ -z "$CONSTTIME_MEMEQUAL" ]; then
++	printf "Testing for consttime_memequal ... "
++	cat <<EOF >_consttime_memequal.c
++#include <string.h>
++int main(void) {
++	return consttime_memequal("deadbeef", "deadbeef", 8);
++}
++EOF
++	if $XCC _consttime_memequal.c -o _consttime_memequal 2>&3; then
++		CONSTTIME_MEMEQUAL=yes
++	else
++		CONSTTIME_MEMEQUAL=no
++	fi
++	echo "$CONSTTIME_MEMEQUAL"
++	rm -f _consttime_memequal.c _consttime_memequal
++fi
++if [ "$CONSTTIME_MEMEQUAL" = no ]; then
++	echo "#include			\"compat/consttime_memequal.h\"" \
++	    >>$CONFIG_H
++fi
++
+ if [ -z "$DPRINTF" ]; then
+ 	printf "Testing for dprintf ... "
+ 	cat <<EOF >_dprintf.c
+-- 
+cgit v1.1
+
+
+From aee631aadeef4283c8a749c1caf77823304acf5e Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 19 Apr 2019 21:47:37 +0100
+Subject: Really add consttime_memequal
+
+---
+ compat/consttime_memequal.h | 28 ++++++++++++++++++++++++++++
+ 1 file changed, 28 insertions(+)
+ create mode 100644 compat/consttime_memequal.h
+
+diff --git a/compat/consttime_memequal.h b/compat/consttime_memequal.h
+new file mode 100644
+index 0000000..9830648
+--- /dev/null
++++ b/compat/consttime_memequal.h
+@@ -0,0 +1,28 @@
++/*
++ * Written by Matthias Drochner <drochner@NetBSD.org>.
++ * Public domain.
++ */
++
++#ifndef CONSTTIME_MEMEQUAL_H
++#define CONSTTIME_MEMEQUAL_H
++inline static int
++consttime_memequal(const void *b1, const void *b2, size_t len)
++{
++	const unsigned char *c1 = b1, *c2 = b2;
++	unsigned int res = 0;
++
++	while (len--)
++		res |= *c1++ ^ *c2++;
++
++	/*
++	 * Map 0 to 1 and [1, 256) to 0 using only constant-time
++	 * arithmetic.
++	 *
++	 * This is not simply `!res' because although many CPUs support
++	 * branchless conditional moves and many compilers will take
++	 * advantage of them, certain compilers generate branches on
++	 * certain CPUs for `!res'.
++	 */
++	return (1 & ((res - 1) >> 8));
++}
++#endif /* CONSTTIME_MEMEQUAL_H */
+-- 
+cgit v1.1
+
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index ae113bb22b60..95ce621cd46e 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -6,5 +6,5 @@ DIST dropbox-cli-19.py.xz 13960 BLAKE2B 16d33155cbe5449434ff9fc5a9fddca9a7cd20bd
 EBUILD dropbox-cli-1-r1.ebuild 558 BLAKE2B cc8d5071ae4c78a71532c2d614ba557ac1f3356a6bc3290f089dfdc2c3485641621045f06e7b6a626e69d423ab25af7f237f78d5ddb639bc299d325085d5d7d1 SHA512 f5e55ab6913334f11f28b41ad9387bb56d47d6a8636b85850630f2da40de83cbd9092ab5de265556491df73fd28ce700aab417c996a079c074d003ecb4613ef8
 EBUILD dropbox-cli-1.6.0-r1.ebuild 721 BLAKE2B 63464febf1675553135fa92bc0df4821015d924a26ffeb8d788057109c494340eba160bb24c96da991443772c8d9d73fce89b7852a64880be414f53c4c123ef1 SHA512 317e442fbdb8f78ff63a77ebcda2a33700ea1aa187c4d2c5fdb1d7e206153af32258d15411256eb74f4f96714e0e7011281cf039953086ea32cf4983c2177047
 EBUILD dropbox-cli-1.6.0.ebuild 577 BLAKE2B 39b17d38b78589ef96c5b0d488270ac3c872e97c402fb608681e1ef15eae835845c15e19e7c8bad4617028f456e8787a3dfe99f07602038e7af459b75847122b SHA512 fbceaac61478cc262a136c136d6f59bac4d12a7ac4bc245fc9f288fe2c17e552d664d24f3fab649de177d30dd3eeeae2e848d34ee9e84653ac7a1a1a1df008fe
-EBUILD dropbox-cli-19.ebuild 718 BLAKE2B 36ba98f05728b0b275e7434ab9b1516c43d0be78979b1563f32f3a4c12d047acdffe1ec8c7633448183471fd7718517a5e70f7815b8d62f7d9f45ba33e1aef60 SHA512 622e42fceb822be3e2df42848bccd8aaf76361b4959d75fe54e055b0641046a8ef469137b625c79578340ae9b99046ec6e02066cb293651427415a1862e30ae8
+EBUILD dropbox-cli-19.ebuild 716 BLAKE2B 8120e0cd8b63e36804f160bb4442816f6c634f4178f3bb79c8468b8f0a51a82e4f184b1dbd43e6c5dcdaa1bbc90c495ac1fd48a9ab77145ec2b287ab0377c349 SHA512 c451c679b825a58391f4a550800972f377fbe93eef41a947b417ca5604e7cfcc2e300844e68955ccb26d2ff3210fd9f579bfae60d9cfbe815aedde53f5de7074
 MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/net-misc/dropbox-cli/dropbox-cli-19.ebuild b/net-misc/dropbox-cli/dropbox-cli-19.ebuild
index a8ca71ef1800..068db8441b76 100644
--- a/net-misc/dropbox-cli/dropbox-cli-19.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit python-r1 bash-completion-r1
 
diff --git a/net-misc/econnman/Manifest b/net-misc/econnman/Manifest
index f94775b7b907..11ac5372df16 100644
--- a/net-misc/econnman/Manifest
+++ b/net-misc/econnman/Manifest
@@ -1,3 +1,3 @@
 DIST econnman-1.1.tar.xz 108100 BLAKE2B 85a0a38847955c5338f95ae8b1144231d4d2b05b10cc3056af798a7a49658b1e042acad2570d5d0fea181a6bacfc565ac974fd2af78a057c95939292a288c8ce SHA512 8a20d2d5387f9a2eae552178eb2c399ff0c0952c1591f63ca0865f016240ebec6608795c4a722b84c0d703434f70d97d561b95174ed9c08d3a855cd0e9d0929b
-EBUILD econnman-1.1.ebuild 669 BLAKE2B b5d11ac819269b010ad40cf2b188c01e8b03bd3dfbd9d9e704aa675a426fc41a42cdad3cdf90c41f809b9f281dbfaf862427ef0170e35be2f329a972d31df90c SHA512 f4410904df3f23f575bdcb9539b22a2d6fda4a050ee7cb394c05fa09acd187ca607fdb8f8f237fd2c909a3591c0c431649013101245c9c6a532be0648f9b2b7f
+EBUILD econnman-1.1.ebuild 669 BLAKE2B 67f4294d07535d80c2cab9355fe933e0ddef5261b120ff2ae624f7b9f2541649abc6196d73c7cd892087f7c53047bb6b6259b595a18adc38dc1d88156938582f SHA512 279f4dc4688fc1888b45ba87e6b9981aa56f279b886c9915bd4fc3bcc7a6879d7af187466872b8a83f7d75a0a51784b86ac473a0e76ea13bcccbfe8a3bb943ee
 MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/net-misc/econnman/econnman-1.1.ebuild b/net-misc/econnman/econnman-1.1.ebuild
index c8d70fe25a94..d014d49e35c3 100644
--- a/net-misc/econnman/econnman-1.1.ebuild
+++ b/net-misc/econnman/econnman-1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4..7} )
+PYTHON_COMPAT=( python3_{5..7} )
 
 inherit python-single-r1
 
diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest
index a1524d366637..320fe6171a75 100644
--- a/net-misc/electron-cash/Manifest
+++ b/net-misc/electron-cash/Manifest
@@ -1,4 +1,6 @@
-AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
-DIST electron-cash-3.1.3.tar.gz 1643903 BLAKE2B ff7c4f8d10b680c9fe3fcb949349cdbc84acb49939b33af2816f8154c3675241e3637bc326af9c2a662588571aeab37de86eb89a627e934b824114c3907a8158 SHA512 267f434ef09bea23b79a9ad8cb8e734a7e1ece7d17d2e2cc91496af3d0fcb035256ec3977c2fbeff4c7ac16193a0a185041fd526c46129fcea62bcdfe043a208
-EBUILD electron-cash-3.1.3.ebuild 3573 BLAKE2B ddc223792ea38b6f671fb2383aeb44cd29eddef18588aa46a686de3b76d0a8a9bd89f0de8adca5e5585a8bed5d09a408fa6998c96d5c826d40bf3a3af2b63590 SHA512 367b18d0e8e8a9e73922af342947cef9e8c330bf86330371c062c7b9e502b155a360e6b5fa7955cfab353b64e7b7d8d45ff69bd30a803502cd152de1a4da2d85
+AUX 3.3.6-no-user-root.patch 1261 BLAKE2B 6035a47b73ce13a92ef66177d6131f5744a498bb4360aa289aca6a09c6ef3e7b663914590f4c9be635078fed0bc82ae706f0cb4c7280acab88bbb1f5211d6473 SHA512 bed6b2108b3a8c8960b43eff854b8292d5e6fbd0fdd8383e43e020cac51767cbd70a1c371a3dffe1bc51145f97f930cb966fd4eee1ecc3ca021cbcfac0ea1a81
+DIST electron-cash-3.3.6.tar.gz 8506610 BLAKE2B 85f61ec0c95e41c5fc170c3419317e077c3e871ee90db7f4e7ebbf6e931950746798efe9b4b6e7c6e0992a52165772a699d8220e1a21ff597f024084929afddc SHA512 993829ce29013e26f219bbd41d13c8d399920ee4c1e5fcae3c4fb298c766228766e93b559db1de3c14bd5add6f651c83655afb32bf173bacdaddf83a8a941f18
+DIST electron-cash-4.0.2.tar.gz 8967992 BLAKE2B 081546d148dbc7da5e192154818831e125437c00093e1fe434ef0a67f8c06ceb1d2b1f44de9e71aac5786f995aeffd8fb6b74c64f6aa249f5cc9c06c9a276845 SHA512 dad17906f1dc2e53d4c6bff15a38d3276d16377f71b4d4e260b7b667f2b045da49f504483606d4515cdf71300b67108301b6cce971d1cca16c3856023b3e3f3a
+EBUILD electron-cash-3.3.6.ebuild 3569 BLAKE2B 4d8ee7e498037ffb9e57cbf5456781c6708040af484a4cffc1b43918cfd3e48948f22c4b2385ebb42c3a962617785bdc8d5c9b9ff15da371f90e203e05951d68 SHA512 5605efc03b31a503be0d69299864615e5d153812180349ca594664933466c1878f006670e0860ae1b4277d2646c14cb99c2a9bb8e458bd05020041f5302e45ab
+EBUILD electron-cash-4.0.2.ebuild 3592 BLAKE2B 4512d46848d34b71e3f39767c189bccb39850c7dff5e794baca27ed14129a25ba71f82c3770cee979c50001b5d78efc475f26a776daf2d84571a3143ab49b69b SHA512 41a547787a5c428e458c6549e8530c7b1a12f2c034750fbfe8f7888ff2c2c351f5a32e5bfb128e286cf142a3fcedc9d423cbc3ecfaff4ae0a75e91bf2569a5bc
 MISC metadata.xml 976 BLAKE2B 991083b0233c11e6e5bbb3d7d560b20587332344fca7d3fad40cde8bc4bce1f3455172b7131451e034d0ab9722913667eb9739fe1bbd214354bf7cde974cecf6 SHA512 38383f6b7809ee97e33a777b5eab2593b22ce99d78442c40e9ff4654f350b6ad17da0c2e309b43fed517e2b384ab5f806a5ef60a71f887d72a4dcf06c9bbdede
diff --git a/net-misc/electron-cash/electron-cash-3.1.3.ebuild b/net-misc/electron-cash/electron-cash-3.3.6.ebuild
index cf6422809dd7..7c1417f11660 100644
--- a/net-misc/electron-cash/electron-cash-3.1.3.ebuild
+++ b/net-misc/electron-cash/electron-cash-3.3.6.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="ncurses?"
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
-MY_P="electrum-${PV}"
+MY_P="Electron-Cash-${PV}"
 DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
 HOMEPAGE="https://github.com/fyookball/electrum/"
 SRC_URI="https://github.com/fyookball/electrum/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -55,7 +55,7 @@ S="${WORKDIR}/${MY_P}"
 DOCS="RELEASE-NOTES"
 
 src_prepare() {
-	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
+	eapply "${FILESDIR}/3.3.6-no-user-root.patch"
 
 	# Prevent icon from being installed in the wrong location
 	sed -i '/icons/d' setup.py || die
diff --git a/net-misc/electrum-ltc/electrum-ltc-3.0.6.2.ebuild b/net-misc/electron-cash/electron-cash-4.0.2.ebuild
index 02f697349d2d..3b33abcf4173 100644
--- a/net-misc/electrum-ltc/electrum-ltc-3.0.6.2.ebuild
+++ b/net-misc/electron-cash/electron-cash-4.0.2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="ncurses?"
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
-EGIT_COMMIT="${PV}"
-DESCRIPTION="Litecoin thin client"
-HOMEPAGE="https://electrum-ltc.org/"
-SRC_URI="https://github.com/pooler/electrum-ltc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+MY_P="Electron-Cash-${PV}"
+DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
+HOMEPAGE="https://github.com/fyookball/electrum/"
+SRC_URI="https://github.com/fyookball/electrum/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -31,7 +31,6 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	dev-python/scrypt[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -49,14 +48,15 @@ RDEPEND="
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 	)
 	ncurses? ( dev-lang/python )
+	dev-libs/libsecp256k1
 "
 
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+S="${WORKDIR}/${MY_P}"
 
-DOCS=( RELEASE-NOTES )
+DOCS="RELEASE-NOTES"
 
 src_prepare() {
-	eapply "${FILESDIR}/2.8.0-no-user-root.patch"
+	eapply "${FILESDIR}/3.3.6-no-user-root.patch"
 
 	# Prevent icon from being installed in the wrong location
 	sed -i '/icons/d' setup.py || die
@@ -64,7 +64,7 @@ src_prepare() {
 	if use qt5; then
 		pyrcc5 icons.qrc -o gui/qt/icons_rc.py || die
 	else
-		sed "s|'electrum_ltc_gui.qt',||" -i setup.py || die
+		sed "s|'electroncash_gui.qt',||" -i setup.py || die
 	fi
 
 	local wordlist=
@@ -106,7 +106,7 @@ src_prepare() {
 	else
 		bestgui=stdio
 	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum-ltc || die
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' "${PN}" || die
 
 	local plugin
 	# trezor requires python trezorlib module
diff --git a/net-misc/electron-cash/files/2.8.0-no-user-root.patch b/net-misc/electron-cash/files/2.8.0-no-user-root.patch
deleted file mode 100644
index 2ca5363effe7..000000000000
--- a/net-misc/electron-cash/files/2.8.0-no-user-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./setup.py.orig	2017-01-06 19:17:44.294137848 +0000
-+++ ./setup.py	2017-01-06 19:17:50.093161327 +0000
-@@ -21,12 +21,6 @@
-     parser.add_argument('--root=', dest='root_path', metavar='dir', default='/')
-     opts, _ = parser.parse_known_args(sys.argv[1:])
-     usr_share = os.path.join(sys.prefix, "share")
--    if not os.access(opts.root_path + usr_share, os.W_OK) and \
--       not os.access(opts.root_path, os.W_OK):
--        if 'XDG_DATA_HOME' in os.environ.keys():
--            usr_share = os.environ['XDG_DATA_HOME']
--        else:
--            usr_share = os.path.expanduser('~/.local/share')
-     data_files += [
-         (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
-     ]
diff --git a/net-misc/electron-cash/files/3.3.6-no-user-root.patch b/net-misc/electron-cash/files/3.3.6-no-user-root.patch
new file mode 100644
index 000000000000..f5f0aecf382f
--- /dev/null
+++ b/net-misc/electron-cash/files/3.3.6-no-user-root.patch
@@ -0,0 +1,27 @@
+--- a/setup.py
++++ b/setup.py
+@@ -33,23 +33,7 @@
+     # Use per-user */share directory if the global one is not writable or if a per-user installation
+     # is attempted
+     user_share   = os.environ.get('XDG_DATA_HOME', os.path.expanduser('~/.local/share'))
+-    system_share = os.path.join(opts.prefix_path, "share")
+-    if not opts.is_user:
+-        # Not neccarily a per-user installation try system directories
+-        if os.access(opts.root_path + system_share, os.W_OK):
+-            # Global /usr/share is writable for us – so just use that
+-            share_dir = system_share
+-        elif not os.path.exists(opts.root_path + system_share) and os.access(opts.root_path, os.W_OK):
+-            # Global /usr/share does not exist, but / is writable – keep using the global directory
+-            # (happens during packaging)
+-            share_dir = system_share
+-        else:
+-            # Neither /usr/share (nor / if /usr/share doesn't exist) is writable, use the
+-            # per-user */share directory
+-            share_dir = user_share
+-    else:
+-        # Per-user installation
+-        share_dir = user_share
++    share_dir = os.path.join(opts.prefix_path, "share")
+     data_files += [
+         # Menu icon
+         # Menu entry
diff --git a/net-misc/electrum-ltc/Manifest b/net-misc/electrum-ltc/Manifest
index 9b01b63b35b4..099205d9d54c 100644
--- a/net-misc/electrum-ltc/Manifest
+++ b/net-misc/electrum-ltc/Manifest
@@ -1,4 +1,6 @@
-AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
-DIST electrum-ltc-3.0.6.2.tar.gz 2387515 BLAKE2B 3093aad114dd96d0a0ecac48adfe45c9b7be37d831f67fd8a230617bb45131b5045e70433c0ed0fe87a3028356de3884e78c3eb2c1bda38e5804e97952dcd13f SHA512 c9de8f490eddbf269fb5a034fc4bf5712173a09df8fe4ea01dafe516cd1b684dce253278c4c4128e4284c89bd7f8fbd51e0633710abbb22720b53507ecbd102c
-EBUILD electrum-ltc-3.0.6.2.ebuild 3591 BLAKE2B 9920de9c5005faf651c79f78b0492b8c2c1973e310c88e0e8232fead6bc4439b8012acd2d3c2653d6d3556302da65ed1f6c054f8b9be5003e2c1b1f4961c87a2 SHA512 eaf2e8b680bf7a067f594bbe790b409245c421db6e92e04893d9f8e709721b27f667961c6ea354a98ebc9aed4fc637b34178775743d8905ab664b52929589bf3
+AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
+AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd
+AUX 3.3.2-desktop.patch 530 BLAKE2B fbf901cfc9133ed45afc1a7859c02926fbb8ad52db9429c10b29a4a5dd75d9e4b1387077ea21f075d6cf176e7b167127a9f344b24b126bde5d9445257ffe5780 SHA512 981f57845811ff3d528fe4ab69d75f547dc0189ebb842260d448407645e19fb16be6ceeb6d4a76e3d491fc98a8773588fbddf9b96b270365da48ed2eb82f8e36
+DIST electrum-ltc-3.3.4.1.tar.gz 3897254 BLAKE2B 113e4175adad0d404f9677913bd24cbda569f20183de75d341d60b954f0423ff13042e0b05f66f7953729368412fc181d2c8da7caee15899f6810cb77c4be241 SHA512 cab85edbe9189fffd2a4b8d57dd89dc55f68cf3f02cd4a7427c53de852ab2001b82b1484126699c8eee36d765a8ca58936eba82e3c153f654bf5629b9cd50745
+EBUILD electrum-ltc-3.3.4.1.ebuild 3810 BLAKE2B c94b29a5314d053d5a6f49a2f8637d434e8787a8c00798fd340cda50edc4fa62a2e939de64302c72e8ab290dfa586afe4af0cd65d4f769272124bf381276f096 SHA512 4263d9f4b3d2267296cfe69d68ed8490b577653bc5012ca3290196de5437bc26a727d742e7b2c07e479a28b26dd40a0d4b9a4cbe0f9c9586a037e3442128d8fe
 MISC metadata.xml 893 BLAKE2B 285448da111f6431d8fb440fcf040ee2e22a5fb1fdc8b4b93c75ea2165f6d53a7a7b746add11300c06bc43a3243e423ea57aaa4186dc0dbb91ff8d734216c6c5 SHA512 7881df99b246a3f323270790c2d3c789aa402810418662ef35590d03ea5d82f3877ab465b66e2fe52c4be268ea5965735f5de513ea8d41f260a63a40f3dd3dd9
diff --git a/net-misc/electrum-ltc/electrum-ltc-3.3.4.1.ebuild b/net-misc/electrum-ltc/electrum-ltc-3.3.4.1.ebuild
new file mode 100644
index 000000000000..1e6465700a4a
--- /dev/null
+++ b/net-misc/electrum-ltc/electrum-ltc-3.3.4.1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 gnome2-utils xdg-utils
+
+EGIT_COMMIT="${PV}"
+DESCRIPTION="Litecoin thin client"
+HOMEPAGE="https://electrum-ltc.org/"
+SRC_URI="https://github.com/pooler/electrum-ltc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
+	l10n_es l10n_ja l10n_pt-BR l10n_pt-PT l10n_zh-CN"
+
+REQUIRED_USE="
+	|| ( cli ncurses qt5 )
+	audio_modem? ( qt5 )
+	cosign? ( qt5 )
+	digitalbitbox? ( qt5 )
+	email? ( qt5 )
+	qrcode? ( qt5 )
+	sync? ( qt5 )
+	vkb? ( qt5 )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
+	dev-python/aiorpcX[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tlslite[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+	eapply "${FILESDIR}/3.2.3-pip-optional-pkgs.patch"
+	eapply "${FILESDIR}/3.3.2-desktop.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons_dirname/d' setup.py || die
+
+	if ! use qt5; then
+		sed "/'electrum_ltc.gui.qt',/d" -i setup.py || die
+	fi
+
+	local wordlist=
+	for wordlist in  \
+		$(usex l10n_ja    '' japanese) \
+		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
+		$(usex l10n_es    '' spanish) \
+		$(usex l10n_zh-CN '' chinese_simplified) \
+	; do
+		rm -f "${PN}/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" ${PN/-/_}/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		kivy \
+		$(usex qt5      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm ${PN/-/_}/gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt5      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN/-/_}/${PN} || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex audio_modem     '' audio_modem          ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex sync            '' labels               ) \
+		trezor  \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r ${PN/-/_}/plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 ${PN/-/_}/gui/icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/electrum-ltc/files/2.8.0-no-user-root.patch b/net-misc/electrum-ltc/files/3.1.2-no-user-root.patch
index 2ca5363effe7..0d4781717714 100644
--- a/net-misc/electrum-ltc/files/2.8.0-no-user-root.patch
+++ b/net-misc/electrum-ltc/files/3.1.2-no-user-root.patch
@@ -1,15 +1,17 @@
---- ./setup.py.orig	2017-01-06 19:17:44.294137848 +0000
-+++ ./setup.py	2017-01-06 19:17:50.093161327 +0000
-@@ -21,12 +21,6 @@
-     parser.add_argument('--root=', dest='root_path', metavar='dir', default='/')
+diff -Naur Electrum-3.1.2.orig/setup.py Electrum-3.1.2/setup.py
+--- Electrum-3.1.2.orig/setup.py	2018-03-28 04:51:11.000000000 -0400
++++ Electrum-3.1.2/setup.py	2018-03-31 15:05:45.540757981 -0400
+@@ -28,13 +28,6 @@
      opts, _ = parser.parse_known_args(sys.argv[1:])
      usr_share = os.path.join(sys.prefix, "share")
+     icons_dirname = 'pixmaps'
 -    if not os.access(opts.root_path + usr_share, os.W_OK) and \
 -       not os.access(opts.root_path, os.W_OK):
+-        icons_dirname = 'icons'
 -        if 'XDG_DATA_HOME' in os.environ.keys():
 -            usr_share = os.environ['XDG_DATA_HOME']
 -        else:
 -            usr_share = os.path.expanduser('~/.local/share')
      data_files += [
          (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
-     ]
+         (os.path.join(usr_share, icons_dirname), ['icons/electrum.png'])
diff --git a/net-misc/electrum-ltc/files/3.2.3-pip-optional-pkgs.patch b/net-misc/electrum-ltc/files/3.2.3-pip-optional-pkgs.patch
new file mode 100644
index 000000000000..6d62f5675764
--- /dev/null
+++ b/net-misc/electrum-ltc/files/3.2.3-pip-optional-pkgs.patch
@@ -0,0 +1,11 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py	2018-09-17 12:56:34.000000000 +0100
++++ b/setup.py	2018-10-14 14:46:16.524385198 +0100
+@@ -72,7 +72,6 @@
+     name="Electrum",
+     version=version.ELECTRUM_VERSION,
+     install_requires=requirements,
+-    extras_require=extras_require,
+     packages=[
+         'electrum',
+         'electrum.gui',
diff --git a/net-misc/electrum-ltc/files/3.3.2-desktop.patch b/net-misc/electrum-ltc/files/3.3.2-desktop.patch
new file mode 100644
index 000000000000..c75f282182e7
--- /dev/null
+++ b/net-misc/electrum-ltc/files/3.3.2-desktop.patch
@@ -0,0 +1,20 @@
+--- a/electrum-ltc.desktop
++++ b/electrum-ltc.desktop
+@@ -3,7 +3,7 @@
+ 
+ [Desktop Entry]
+ Comment=Lightweight Litecoin Client
+-Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum-ltc %u"
++Exec=electrum-ltc %u
+ GenericName[en_US]=Litecoin Wallet
+ GenericName=Litecoin Wallet
+ Icon=electrum-ltc
+@@ -15,8 +15,3 @@
+ Terminal=false
+ Type=Application
+ MimeType=x-scheme-handler/litecoin;
+-Actions=Testnet;
+-
+-[Desktop Action Testnet]
+-Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum-ltc --testnet %u"
+-Name=Testnet mode
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index f54e235d78ac..6b3f1ad8c92a 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -7,8 +7,8 @@ DIST Electrum-3.1.3.tar.gz 2806178 BLAKE2B e03a6ee8d7b211b26d99adfbaf42a9d43317e
 DIST Electrum-3.2.3.tar.gz 8311398 BLAKE2B 389f2ce2982d40f69c1fe3bfcac3ffb70d4fa09265f1a0567ecbdad21b53ebfdd2473e8e56e024add8cd52d24f690467441ffd33509cb0ef20c4f30bfcbba2a7 SHA512 a1620d2a0f28ee8c61e0ddd985f9e2a219f2b9fe0316042fbc88533332fd95709a9f4e60a40494a9cc5c2fad08c6f318f38bcbe91bbb88d20811953d514682f7
 DIST Electrum-3.3.3.tar.gz 9192110 BLAKE2B c4884125f5309c18d324b2bdcc9afee05b3beeb124ca45a0c6f3207b19cf9431f5ed15fbd066c854f8f7bfa89e347df5578eda825ab43e69c502fc7ced00e8ec SHA512 a30287794b87f3e3ad02be4c32281c22dcfec801ff0d4602e6adcb85e532c34e69b60e2aec65f5d6ef8ae68c21b068fff87ca685ef8caca4c785b56cb400e23f
 DIST Electrum-3.3.4.tar.gz 8606286 BLAKE2B a815a577509cc7d31f02347b5ce52d0fe9fd52ddbe4b60200a02423f8e6bf43a6c24d3c1db6ab265a69f6f3891db63886fe6c138d601bc48c0c8fdb66191e941 SHA512 297eb757dccb166d40a652be2c1c058e42f16416b586b69f32223966ff1e92a34e5d01822d71bd063bfa72b7bbbcae4251a63f7373600d0eeb139e923d17a2b3
-EBUILD electrum-3.1.3.ebuild 4329 BLAKE2B 250c545a93aa26f86dad7d87049a9e407e124041fd46a07083368bf528bce23d4c0031123dfc8b05ede465a47da6290202d8fc4fd1026aeafbfc338eddd8365f SHA512 0412d8a4252480c6cc903353f3a6fb912e79967db24c75f4be12c55b0db4d3eae1ad8b5a7b6201a6a39ae1eb19d3c5df40e613d33280c357ea6ac0e6c29ef036
-EBUILD electrum-3.2.3.ebuild 4431 BLAKE2B 73632ec671f7a2b95b39bf068f727fbc5d2007a58531fc827d1375a569b7a92d4cd99f3ec0be7984436b7160ea951de618bd21384e0aed437ece99435c911e6c SHA512 dd37f22a0462612f3723597815150a8516c822b5e45e89382355815fcca2c5fa0be02227dca8a6532e330a3c088a28af819d44bba7eb422293512194ca29e587
+EBUILD electrum-3.1.3.ebuild 4324 BLAKE2B 982bf508f73e8dba14667d04e49c3af84e04c2c84624bfae7698ce265d3b09246db987e1da9e8887266c1d77e0a575104d489de97719ddf71cd3d390f359768a SHA512 8620a4eb41aedc875f3315fad410489b96d9ffbf1477cd91d6ca34385c12719e4fefb56eb9a5d1700d5c99001340a080af96fd3ddfffa3970bd9ff311934c39b
+EBUILD electrum-3.2.3.ebuild 4429 BLAKE2B ce1d204868a4011cc67d16e9626886986562316ccf796217548bcd53f9a567a1cf7ae478918f654c0e08117649feb16e98469a31b4825fe7045605650882bcb1 SHA512 174851b0615a21239e4ffce92003be1a1a36e9cf08809b164ec27ea5cb616c43c7646adfe5b39956c650d064ac9935c10743afa461f85d4e71a515502380e04e
 EBUILD electrum-3.3.3.ebuild 4629 BLAKE2B aeecbe400dc123f9e363a0730beebda4c092f324eb38f9a891101bb548ee0ff904c7e503f6c487695fa72f4264816b1acc64292304110582e49d6300b73c46ab SHA512 f70bb7dbc876302be045bba03dc5d5e77ea17798c2052739bb26736151bbe9f1d17d8d11beaa7e3406d2d897bbe9299e93f7f4e1a76ceb1bd1416f549cda919f
 EBUILD electrum-3.3.4.ebuild 4642 BLAKE2B 02a2f998591557da446f1d9be0db24742764ddb3e22af518460281fde6f6cd8ce1ab0308aaae9f4d6247705e5aa05c21ec7067d7ca8548cf8461da47445b9706 SHA512 770bc4dff7fee5bf2508ab2c58f346f0bdb767fde0d26d8de61ede13b617b96a2d7cf8859925acaf84270dfd00cfe8811adb455519717e35b31f03be4ca48048
 MISC metadata.xml 1464 BLAKE2B 702ecb52f960766ab9cfbf48af6bdec84ffe6374bc0bc7684aefd47aa36b569c2730205bd6bca9ebfbee168abf5478d263be5724e99c896c3a296d85bf3d2075 SHA512 e6142f8a9bb951a6dae009c542597ab47ef2398b8c119824e8e14575f02de2d776b3463035973e2da5f90d896417f00c3fe8533e2894e162e262def472531f02
diff --git a/net-misc/electrum/electrum-3.1.3.ebuild b/net-misc/electrum/electrum-3.1.3.ebuild
index 0fcbe61a3dbb..93c690ce8a8d 100644
--- a/net-misc/electrum/electrum-3.1.3.ebuild
+++ b/net-misc/electrum/electrum-3.1.3.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"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="ncurses?"
 
 inherit desktop distutils-r1 gnome2-utils xdg-utils
diff --git a/net-misc/electrum/electrum-3.2.3.ebuild b/net-misc/electrum/electrum-3.2.3.ebuild
index 39ebfd7e733f..a107aca5a3f7 100644
--- a/net-misc/electrum/electrum-3.2.3.ebuild
+++ b/net-misc/electrum/electrum-3.2.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="ncurses?"
 
 inherit desktop distutils-r1 gnome2-utils xdg-utils
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index 11254f8bb91c..8be8dcbfb944 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -1,7 +1,5 @@
-DIST gnome-online-miners-3.24.0.tar.xz 272572 BLAKE2B 6331e72f65510041cc278670df328ab6ec5336bb76ec1c6681136c6731c70b9d343ef296062da6de302cfea195d1b99c0040e1e016394b2fe3bbbe077915cd76 SHA512 96c6aa99b99553c399ecef754d10a918d8ef3bdf6369a77357241091edc9c2ff7a8350f8a064bb011deddac75b25bdde8006e8d72b6562f9cdcf3b373e693253
 DIST gnome-online-miners-3.26.0.tar.xz 272576 BLAKE2B d87a83489be58f3f78a9245bcb08c28afafab47008fc1d042d8c4964cc8451e7c257055768db88f384c75546d48ea90c477223987e0add757a1a5c614ef5a2b7 SHA512 a116a16c1f8a56bddd3cbb238cfb007d776695446c516dd12811145853553c293a9c8880465238571f6081fc7b05e3e69c14c406cd8e6fa6ee570b4aa4b22435
 DIST gnome-online-miners-3.30.0.tar.xz 273700 BLAKE2B 146777d6fcdbb2e17ca360e515de6f373bf74063240c579a1e39c0083aad9b0d908754c78046713b027b1b062cf279e0dbe58d211d0341a0179b1d179aa77a2b SHA512 de1d9281978b985d777c1b4900128c6a3b83ef9d0c905b4441f9683a6a03de992ce921e8094d43b903e8547436db51aced91d93bd0cf74f7a385a1d5a5e8b726
-EBUILD gnome-online-miners-3.24.0.ebuild 894 BLAKE2B a6de18d767e2edfccaf829f1c5c422a65fc1ead85f15da115a6e978a53061c5719a40b09f341c5042d31dcd296c21516bb6f29725e274a20d061d9aa1cdeaf47 SHA512 a0f03e3ddae3d889835d0733b79022cb62ea1ae03f863edfab53e8d0904e7cef5628979891cf2d8217c112afd43755d297e0ffba9ee8ee1e4de53364e3547cd1
-EBUILD gnome-online-miners-3.26.0.ebuild 892 BLAKE2B ec1b95d5a167917587efde2ae1f498b68aa767c204f06d6d0f02ef47d5e924c120bd96cbca656892fe08f0e0d8b164509d001affc201bc3d6c909225009a2d44 SHA512 2bb1e5d1b86dda67f25bdc157c0b80faff10b3c646fa8076953bac5bd4024cb104091e39a4589497da12f5227db04a8c8083ceec1c347fe705ff3ce57c8aee51
+EBUILD gnome-online-miners-3.26.0.ebuild 890 BLAKE2B 332268c34efc89e625d3585979720050ff6a7f6e315dd862f57a15947bf3cae11341f6f43197b7a5bbe315874d31f793b63b2531e7cfec94b4de0fedf4a10dbc SHA512 ab77d6dbaeba6a2e9405d22f339da291710ad9bddf46b7b9f224c00ee66a16b5d8c38179d2b968b48e4f6f1e96182a84c472a4e23c27003e4df37283e98b664b
 EBUILD gnome-online-miners-3.30.0.ebuild 892 BLAKE2B ec1b95d5a167917587efde2ae1f498b68aa767c204f06d6d0f02ef47d5e924c120bd96cbca656892fe08f0e0d8b164509d001affc201bc3d6c909225009a2d44 SHA512 2bb1e5d1b86dda67f25bdc157c0b80faff10b3c646fa8076953bac5bd4024cb104091e39a4589497da12f5227db04a8c8083ceec1c347fe705ff3ce57c8aee51
 MISC metadata.xml 312 BLAKE2B 4529eb2ea76ee2c88700e8d551c726424ce4338361eb87c39599d1ee263914d9861cc8f93e1d8e667bdba186c40afbf1376bd9b530edbdab32ec4f961a60f00b SHA512 483189736c04729c1497b3bd6321a1d86241835c22df7c06658fda2af4f06d56f614499bcb8ab7eac76a3619fbaac81cfb430aedf3d4f78592ef3c8fd73746dd
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild
deleted file mode 100644
index ced494b6a8b7..000000000000
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Crawls through your online content"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="flickr"
-KEYWORDS="amd64 x86"
-
-# libgdata[gnome] needed for goa support
-RDEPEND="
-	>=app-misc/tracker-1:0/100
-	>=dev-libs/glib-2.35.1:2
-	>=dev-libs/libgdata-0.15.2:0=[crypt,gnome-online-accounts]
-	media-libs/grilo:0.3
-	>=net-libs/gnome-online-accounts-3.13.3:=
-	>=net-libs/libgfbgraph-0.2.2:0.2
-	>=net-libs/libzapojit-0.0.2
-	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable flickr) \
-		--disable-static \
-		--enable-facebook \
-		--enable-google \
-		--enable-media-server \
-		--enable-owncloud \
-		--enable-windows-live
-}
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.26.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.26.0.ebuild
index e174d047e6a9..ffbf58bb9240 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.26.0.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.26.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="flickr"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # libgdata[gnome] needed for goa support
 RDEPEND="
diff --git a/net-misc/gns3-converter/Manifest b/net-misc/gns3-converter/Manifest
index 914e8fe34596..b86bfbc39f44 100644
--- a/net-misc/gns3-converter/Manifest
+++ b/net-misc/gns3-converter/Manifest
@@ -1,3 +1,3 @@
 DIST gns3-converter-1.3.0.tar.gz 45837 BLAKE2B 9265773c941a0b3a364d912498fb1c7188259c4ebd244d688fe6a7f3a3110892adfb6e045d1f11938aa0f79c72721020a74e9a0bc297f93e44fee2bd7a3e3526 SHA512 ac2e44b3f02c8f0429158e11c964bf342973809139dcf34863071905400964006d7adbc3ddb80efe57a5ecc5eaf59e228bf7d07a7e5776dd6bcf51b4e1d3fe57
-EBUILD gns3-converter-1.3.0.ebuild 516 BLAKE2B 2b21190cf241f4f39343516b3362800fc9af60480e05dcb1e3adfb57d0ad1d52e2bf1a8352974dddfc7dcabebfbe2a0ab983af76bbd00d0795d728c7a1b9bd5f SHA512 8f4190388d2f28cfb48060a38dec966dc95920508f60fa79d30145f9f220f121d2f3dc0bd92ea1a32298603ab0da0cfeaeebb595403c79c655ed71f81039467e
+EBUILD gns3-converter-1.3.0.ebuild 511 BLAKE2B d36fbc6e190d0ba30aec3de1ee39ad745d5492016503f0d01ffad114f86c3676666c2532e673b8d4a887bf665fde8bcfd1f32fd960d1700d401024af5e92a7f4 SHA512 2cb36d55add5a3830456eae477bd1e7669105b5c2085bd7aac9af1925931b28e210622b2c24911489c65579e181b41f3f4d28174ab90ba66ef379acf210227e2
 MISC metadata.xml 241 BLAKE2B 2cc47e12ef61022b2dbc00904091b1e35dbbeb5c4ab35dc697ae06adfc7e78782065e35b1ebebe2779f180b2b573dad22ba516a393f47c3e26e1be2ad6a3d65c SHA512 edc53eaf933b709bb0a2e8507209a85cc3901ce6e4db3bf40e061a01ece0e4b0f83d30b93b2131316c802def4a08081a5ac3b3606624271184680421b7f0323b
diff --git a/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild b/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild
index 353f6052dbec..79b809e247b7 100644
--- a/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild
+++ b/net-misc/gns3-converter/gns3-converter-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 1f6e52edcce2..0728597bfdc1 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,3 +1,3 @@
 DIST gns3-gui-2.1.3.tar.gz 4792762 BLAKE2B 577381bdee06f967e4fddec3b0885920e8a25380d834ab1c983e010d40a14f63c69912f745bb72b4605e49cdf7192fe52ac57380d5f65f03d067a2f1dd03f7d6 SHA512 da90eea0920f9fc10bb5ea7e0039ca11bfaf36870e182a6b97ffdbab9f12da0d13b58c4a13ca747add675426324f3c1cde5eedbd858a68ee4bbefdcdff193904
-EBUILD gns3-gui-2.1.3-r1.ebuild 1132 BLAKE2B 9ea73ce3b39d4fedf55e82555c5024efa465ff9d738fa362e0d764c5255e64f536fb3e4a633fdfafc950208c1780830c51dd31b6e9c44648a7a2996efcc0acd2 SHA512 16e3ebb36a594864f5e174977f4f7406b0ed2cd391f2c801f52b73783cb492ab4819ce96e034726130347a0bb6aac79b8db8a0bb8aec64e28ac971132feedbf2
+EBUILD gns3-gui-2.1.3-r1.ebuild 1127 BLAKE2B 09e3f3a922044a9aa6fa4fce926e24995ac70eafd78efaa3f06e579be3010b3ad1b41525e50e8a4cb0a36ea5aa5d927c25649f9318bc695901d685369acf3550 SHA512 7d4cba288d958ccd204362ebf7df0ada7bf70099369114fcf191ae9f1d3fe6e0c98c39a56a50f1b138c905ef9f18ba3cd1be1d42cd4ab7673319b7eb3b04c700
 MISC metadata.xml 241 BLAKE2B 2cc47e12ef61022b2dbc00904091b1e35dbbeb5c4ab35dc697ae06adfc7e78782065e35b1ebebe2779f180b2b573dad22ba516a393f47c3e26e1be2ad6a3d65c SHA512 edc53eaf933b709bb0a2e8507209a85cc3901ce6e4db3bf40e061a01ece0e4b0f83d30b93b2131316c802def4a08081a5ac3b3606624271184680421b7f0323b
diff --git a/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild b/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild
index f9cc17a23bd1..30e07906ba51 100644
--- a/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.1.3-r1.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
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1 eutils
 
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 0304fa78b222..6c1c41f44ded 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,4 +1,4 @@
 AUX gns3-server-2.1.3-typing.patch 259 BLAKE2B 5950ecf364b86f472bab5d5a8c59982086be7b3c541b841f0b6c31e3b4b585d88c4a8e3e013939635cb5c89e8cadf65a428521429ec166879d1a5f90e776b92d SHA512 02a7cafb1c0c306be8177c8c206800511953dd115b428810baa6711ba2e8bba9ae5be7bd9768a87fceb1bf75618fc59c31349e5bf3d55eebe1636a3c71e7fb00
 DIST gns3-server-2.1.3.tar.gz 1658657 BLAKE2B 4ce83aceff8f70f93032b2baafb0dd5c94062b8c431a73b9a83401266ae77f18a4e318651ecd05b789b71c512fc3549d0d1fb95b26fe1fdd23b2953b3367f04c SHA512 df6a98943f893f3d10c16b2a4242869a1407adad56e6c127e6525fe49acefbac9329bf76bc2b16904997985843fdb2b94d03c58f658034ec44763e6d69f7ddaf
-EBUILD gns3-server-2.1.3-r4.ebuild 1889 BLAKE2B b6203b65418462d4eb1f1b74306afc626b884da93e967807215a8ab7bb3d9db3830d492eb0de8506a38c62781b4847fa438e4086d042cb3d5e6d96b65ab8d6bc SHA512 32b2abd246d424b8be859e5e4551da367db4d3921e3388bf969d3e5f922b62eb9228f8bc12270195fef84cc72bc8cbbc6dca7c01c45635c76ae65a5f971dfb2d
+EBUILD gns3-server-2.1.3-r4.ebuild 1887 BLAKE2B 794e2d3dfbb51b15c07d726b443a00cce7b313a6f994c194ed7e1de0688f21ccc11b3921d56fb4a3a08eba23e40ab9350fd8477776c84af0e94b8e5e6522ed69 SHA512 efb46c9b0cf5d68814880ccf5b2e54d7a49504c3ded206c857395ec05cb5f7b1b55eabac036fecdab2ec898054cb0da50e7482f4787455c975e6bb8a2be838de
 MISC metadata.xml 361 BLAKE2B 52549a2862a4e5aaf855909c27ce68640e52549b8e56a2284081cc1eedfe5b5e6e95c3f957f2d34022c43ce541ebd9c6cf94ff723d2843fc85732b76d6358d7a SHA512 10af38136367903504fcc02e0e3cce154283979bcf4c3398d4fde8fb48fc6716448fdece6a74bb240dd74f37487ef07e1ca0209f4c2b567b4f5f3c67c8ed7a4d
diff --git a/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild b/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild
index 204bff3696be..f1d6d0ec699a 100644
--- a/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1 eutils
 
diff --git a/net-misc/httpie/Manifest b/net-misc/httpie/Manifest
index 6a6edea6f060..85f8505724d7 100644
--- a/net-misc/httpie/Manifest
+++ b/net-misc/httpie/Manifest
@@ -4,10 +4,10 @@ DIST httpie-0.9.4.tar.gz 79889 BLAKE2B 13053cb3389a03ecbd90caba85801772cba9f09a0
 DIST httpie-0.9.9.tar.gz 85006 BLAKE2B c5412348b3add127a5d5dfc04fdc13a47f82ec65634eedefb55a0cf1ce182a49f81a3a68c0cbb5e8c90b53efb165c89b7444d23328e545bdbf92d69d1de9c921 SHA512 e9adb1ecf9a25b57c634f35199bf1f8fbe4136179c0ba0d6032a41ae786da9344f54436f91d89e624c154bdca325f94c637364a934fc2d5742b83056434f7e4c
 DIST httpie-1.0.0.tar.gz 268982 BLAKE2B 36ae23876c995f450ac4d814a56a79db7aee175f3b6b060bf08049cd2ea5ec5000c91bf49a12eae8a2dff2c91e5d5200d3febc4cdd50d0488db35eb96777ed14 SHA512 9a68746636e367d1131069787f4a4a199b6434b828fe58fecef70e810c1d63c662c790fc45fd955a390113920a29d0116cf29d1167d638debe6b9419a4ae2d48
 DIST httpie-1.0.2.tar.gz 765210 BLAKE2B 6eb6975aa8f9d2c27762ead5d49db25ba26ba82e21d696c3e5bfa19710ef2a7efbce9d74cd39a22282018ca4f9573c92d99b465c470adf5f04bed75f0416c693 SHA512 2b57164f4b20ef2033d527a3dfb9191b68fa95f419cde2c7e52ec47cf74540d0a2356aeee8669d4b43ab6feca80840be6ad6a8481930ddf3acf9ac3ef0b2c569
-EBUILD httpie-0.9.2.ebuild 513 BLAKE2B 0ef3f7c0982b62a15c03d68c4faa8c07ffb7e963dc168de7df85dd81611d24ab5a024fefbfc2c472ffdaf37ef9a6010f390fcd189cc29c86210e279a61fc8c41 SHA512 e165ab8295fcf1fbce4a4d96bdf17bae10c8e03aa2dd7f86c480b6f6305dbb298dc5f951bcd8eea2121944bcfb675228a57439d277b57bbb103e1663269c2350
-EBUILD httpie-0.9.3.ebuild 513 BLAKE2B 99f82860ce3d48cded0741a60a36aad1e0d1ace53e70ab4ba747612a482b8c5ccc3a554461ed17f69213441933dd91b1e976c32c897a7c85530daab0862f2af7 SHA512 a09ba2e049fe6d86db465913264fdf6cb41ba0efcbd228a5f9441429b796ec46401c29500490934a56d96e0eb231b30e491e75286a9b2b5faf22fd90592f3918
-EBUILD httpie-0.9.4.ebuild 513 BLAKE2B 99f82860ce3d48cded0741a60a36aad1e0d1ace53e70ab4ba747612a482b8c5ccc3a554461ed17f69213441933dd91b1e976c32c897a7c85530daab0862f2af7 SHA512 a09ba2e049fe6d86db465913264fdf6cb41ba0efcbd228a5f9441429b796ec46401c29500490934a56d96e0eb231b30e491e75286a9b2b5faf22fd90592f3918
-EBUILD httpie-0.9.9.ebuild 528 BLAKE2B a4ac87148c52f7ef3e7791dcb2020d5e62709c6dddb9e0a5bd40eb4f4dc771f95dfc9464aea36a3b2de47f119de1429645e2f2837cd510bf0b7ece38c84065db SHA512 50a576fec9d8d50315d47182113de5ce003fa1e7fe8302f72e5193b54ac2a7c8be183d881254a7010adb2fee2139f60758ef1f63fe8c6d987bc9e3aaaa9573d7
-EBUILD httpie-1.0.0.ebuild 799 BLAKE2B f111df6110cac99f4a9527e0b93a7e0fd8d1d71aa8ad819842fb15391297653434d8ccb27a8a93d46e34084938fd7e1166aa759f518988baa65f7af4532c5174 SHA512 6587b20b20e029585ea87dd76efe063cdd65ffad8e619e26a29eb0c5123f048c0d95e3470bed65eecbf76cde0a9e1ed733d5b716b9ad4f8b8fdf128efa46d786
-EBUILD httpie-1.0.2.ebuild 1044 BLAKE2B fe6a14736fa78a5e6cf3ccdb5220655566c4784c71f098e2eca6c23f5346507fb3822e529eacd56152be318d4ac129a8ba364f80832534e097aba2b144724ac1 SHA512 52aeb058f5a92e71828a782199f3f5c65a2283ec82f2e61010eee146961e81c7a157c94b61c41a50eee84ff460ad739caaf94b3046f4b03e77fd38769693b07b
+EBUILD httpie-0.9.2.ebuild 504 BLAKE2B ba11a120a2fefd4a7cd216280a36bf06f2a60b81abd6fb18f9148a5448b42dce6e3432ba30b5d503acebb3b106a51e3a347aee00dfad4dcb65f28518b4a27164 SHA512 7ea93c3300d0b614babf04ddaab3ff0e8636224d6ff99f8756cc1f7a4eebf4e21494e8afbb920218e1846f71316a212e47e763be7173796ab2528e1334553cf8
+EBUILD httpie-0.9.3.ebuild 504 BLAKE2B ba11a120a2fefd4a7cd216280a36bf06f2a60b81abd6fb18f9148a5448b42dce6e3432ba30b5d503acebb3b106a51e3a347aee00dfad4dcb65f28518b4a27164 SHA512 7ea93c3300d0b614babf04ddaab3ff0e8636224d6ff99f8756cc1f7a4eebf4e21494e8afbb920218e1846f71316a212e47e763be7173796ab2528e1334553cf8
+EBUILD httpie-0.9.4.ebuild 504 BLAKE2B ba11a120a2fefd4a7cd216280a36bf06f2a60b81abd6fb18f9148a5448b42dce6e3432ba30b5d503acebb3b106a51e3a347aee00dfad4dcb65f28518b4a27164 SHA512 7ea93c3300d0b614babf04ddaab3ff0e8636224d6ff99f8756cc1f7a4eebf4e21494e8afbb920218e1846f71316a212e47e763be7173796ab2528e1334553cf8
+EBUILD httpie-0.9.9.ebuild 517 BLAKE2B d0b2031926effcd24b8d23b1dbf3ea311294dc439f56cefdb30359d82c0e727bae8cc19f37bc6681b4c61b3b715e00a7f20c8245464aefb46899395b5c9a29ad SHA512 880dfc9565f7f3791e97ebd946178e0dfcd2896e00813725f2b726d06091201b055fd759107459524c4d7ff35e6af1cc4cdf18cef2a94e23d11181a51f0fb0b9
+EBUILD httpie-1.0.0.ebuild 797 BLAKE2B 8964804fd47ee2543d5bfd7557a020a5103a4f0cc1534653786baab8d2073421c6ad2ee839ac85a7e39cd2161d3008f49b6e89d32663a6232ea6c3409f30880e SHA512 51b519746529294e151c982c8b45270223310796472b91e3b42ec88decc1daa8b39ec6af34b50319176c9245aa2eadd6010913ef5800c711f9e7efb909454f70
+EBUILD httpie-1.0.2.ebuild 1042 BLAKE2B 54222b437a055f9c3f89a09cc7c14a907db25014556760e2406b9c4bc187d085f791e96e4ac96de761029f6a0be68b296e41a4c2543cd462c815824e34959a81 SHA512 e89cdafdf8e9102447a32e3a6e2eaf635e80aa1f325b70e94730b901cb0491bdbf55cc0ad2ea867fac4e233f9050fb1304d5618a25cf95eba265a362fa5fa602
 MISC metadata.xml 947 BLAKE2B 09a29d45dec43196bd3f7e10ee318f35272f73fa4a6de170ad6287630ad6b36842e06992fa79d681746784292a95d5b0c6c750ddecaecf5da0246b4c0b9610e6 SHA512 6060535898a5d8ea8d0f6e95b170dbd18c7701e8722d55e57f07bbd7b9ab77559ea5b79c3e7df34b4cf07018eae0f3d8ac76e7a5352fd3f6289cc6723de7f7cb
diff --git a/net-misc/httpie/httpie-0.9.2.ebuild b/net-misc/httpie/httpie-0.9.2.ebuild
index 6fd93ee77e06..ba28c4a4c03c 100644
--- a/net-misc/httpie/httpie-0.9.2.ebuild
+++ b/net-misc/httpie/httpie-0.9.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/net-misc/httpie/httpie-0.9.3.ebuild b/net-misc/httpie/httpie-0.9.3.ebuild
index 4fd70d833558..ba28c4a4c03c 100644
--- a/net-misc/httpie/httpie-0.9.3.ebuild
+++ b/net-misc/httpie/httpie-0.9.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/net-misc/httpie/httpie-0.9.4.ebuild b/net-misc/httpie/httpie-0.9.4.ebuild
index 4fd70d833558..ba28c4a4c03c 100644
--- a/net-misc/httpie/httpie-0.9.4.ebuild
+++ b/net-misc/httpie/httpie-0.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/net-misc/httpie/httpie-0.9.9.ebuild b/net-misc/httpie/httpie-0.9.9.ebuild
index 5e64c28901d0..6a5fc06e7b2e 100644
--- a/net-misc/httpie/httpie-0.9.9.ebuild
+++ b/net-misc/httpie/httpie-0.9.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/net-misc/httpie/httpie-1.0.0.ebuild b/net-misc/httpie/httpie-1.0.0.ebuild
index 64a41d2bfb6d..f25019e3c61a 100644
--- a/net-misc/httpie/httpie-1.0.0.ebuild
+++ b/net-misc/httpie/httpie-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit bash-completion-r1 distutils-r1
 
diff --git a/net-misc/httpie/httpie-1.0.2.ebuild b/net-misc/httpie/httpie-1.0.2.ebuild
index af224843dd8c..07866281b6e7 100644
--- a/net-misc/httpie/httpie-1.0.2.ebuild
+++ b/net-misc/httpie/httpie-1.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit bash-completion-r1 distutils-r1
diff --git a/net-misc/ices/Manifest b/net-misc/ices/Manifest
index 1b26b1b00264..5cec39b83bf7 100644
--- a/net-misc/ices/Manifest
+++ b/net-misc/ices/Manifest
@@ -3,5 +3,5 @@ AUX ices.initd-r1 307 BLAKE2B 3dc8638cb74d79ab772c3618812fac27ab856f74e39c8e5b6a
 DIST ices-2.0.1.tar.bz2 273805 BLAKE2B 9001a37e6b0536575019c15fb5ecf63abf9bfefa2acdef3de29fd9a639e930fc904f50a8654f38c0a9b2f716f5d01732ec3c0542224bd17c83e8c6732e214315 SHA512 324a50c01513221617921805e0d2d37170751a7bbfc331c988eeedbddebc2dcc62aaa1ac75c3ebec253589ba7be7dc6580c0c57689450730a68f99e6bc1abcf8
 DIST ices-2.0.2.tar.bz2 293818 BLAKE2B d037c6ce6e5d009a12fd9d8efba321b87562a0d492a5191a93b3ff991c1252af1aaa21c41b8171d6eaa9f518712d893b187765cab5a7a9de3560231ec4315b67 SHA512 ff257b478a7237886ba59bf7d1a494ebd4c7c12fd74e8e10c00ea65710249ead1b5b1ae8d9540fab05f2e4486949c6e350f3da59a1d1bf261397ca257806b2c7
 EBUILD ices-2.0.1-r1.ebuild 1011 BLAKE2B b763f054f1a86bff645c4518af413d80259db90e8c94fbb79fcee9c6bb64607ee55558f5a7ec435179b4dfc26de35ea9c9caae8ea4f54bd7b839c92a0062d338 SHA512 6233805e0aa9245fc6ea061b4c3cc4ff131e5fab5d618dd226c6e3e0bbf6d28af30e7da4e12e7fdfe9436cb50fb523107b5fc83cf6a6c01ca1f949984a8d41f8
-EBUILD ices-2.0.2.ebuild 881 BLAKE2B 1c88109b847003ed1d7387b03785477513da70316dccafcdd1368e7abb5d64faebc560fa06ade8da68c8dce617b210ff515040ba80877c2ad9fa4bb35d98d427 SHA512 008621d193fbaaa968053da1f86d9d60438d52222841b28d7614d900a20b1b620ef3eaf7a36ef2d66eb80107399591aa36487bfa6fe8b5f0e8f716320d0d8bda
+EBUILD ices-2.0.2.ebuild 875 BLAKE2B f97aa4f3e18f8c43755140fa60eef43d6cd171cacc2279473e30d414d457c029222b7a6b65c0eabd6c879ede833fc4474a580099558a1cdf518513f6489a58b7 SHA512 d639be1d54b8f1813adc1d10ddafcfbed7f12ff5cbddeffab346a44a539d1c4429b6fab15df9fb72b94f0c7496c29cf066f69f557bdac8d97f382cba16c2b265
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/net-misc/ices/ices-2.0.2.ebuild b/net-misc/ices/ices-2.0.2.ebuild
index 48cd3cf6e018..f4104ba1d73a 100644
--- a/net-misc/ices/ices-2.0.2.ebuild
+++ b/net-misc/ices/ices-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/libxml2
diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest
index 7a6761e3351c..9a5e94fa13ad 100644
--- a/net-misc/igmpproxy/Manifest
+++ b/net-misc/igmpproxy/Manifest
@@ -8,6 +8,6 @@ DIST igmpproxy-0.1.tar.gz 140159 BLAKE2B d4a0fb0f69f1e8c7221ecd2842e95cfa390f548
 DIST igmpproxy-0.2.1.tar.gz 166951 BLAKE2B d47a2b236679c7d05cf453fb5d6dc3a9e4174776845e2a1f71ca28e02c6e6270b5db09eaf5a48581dd85ecca8ff198a3e4b7f84fd61e455fe33c4f60ec079c15 SHA512 17f6891bf49d3e70cdf3930ab1abe6a0ad7b9f12ff2d1cdde3761771988585301f459995ba5ea956c742597de4ce13fbf0ba3c1ae37d13b2eee2a09f16f51ae2
 EBUILD igmpproxy-0.1-r2.ebuild 587 BLAKE2B d96e2871845a21ddbab6a481915a82f5de977ff0e36d2c9c72cfc1d55a5bbf706349079151ada0f7b44a348a3a137c902dce9b4d88ffdfd96f3a1a8936ccf79c SHA512 75036b6de777dd630a89c6d08f729cb6c51c591c9ec9b206f492e081914f6c49ecb93bc9dd6e7026703a72b8adb1a4596d7c9aa326ab72b7e5cf72aa29ab3b86
 EBUILD igmpproxy-0.2.1-r1.ebuild 601 BLAKE2B 5b54a6d5950b0fb740d992eeaf0cea15716025b04b0459f6fc5aa1123cd39b1f107ee4b41d72da48039c48332f5772299351a3e9a7fee2f79959ba5160772ac0 SHA512 0b967134c5d086a82f02e52c51906894dda755fc60d6f34a763696b5212e4aa6d2fdd322f70125bc6fc402e3fc21275fd26cdb94e69c033215a83ab322b6ddfc
-EBUILD igmpproxy-0.2.1-r2.ebuild 604 BLAKE2B 912e3442cb61a583e2683213f1bef520d5029227b6fe61141011e23bb44aa95f0f532587f734c1bcd8ebe5727903da5b382841ab6035d369d531fac7ee881d53 SHA512 a05fb606035f88318ad73339576838dd4ca3b843a9112c682ccfe0542805629477edf7f2a287b2b1b40149500e2106ab24229ab220720b8270d16bb5ebe9fb6d
+EBUILD igmpproxy-0.2.1-r2.ebuild 603 BLAKE2B 33261ea46bf66cd1f36b5cb15754e9e2a346b6af65258a03a7b636d78fcfc7d2ba943a56c939af3e1d279fda5b2c81bec9671935666024298c2d8962860fe595 SHA512 4fea1b43e96725b4aeab26a409ef0d89ec4c0f3e4e7c2189a87be39d69b5c516f7990148b9fcf3ea17d15877282e7da74bfc27146fb6047a6684477c2b3bf021
 EBUILD igmpproxy-0.2.1.ebuild 597 BLAKE2B 1ddba0a3cd604825d5f751986de268a9b26cfb1dde3f0ec03672c0c0452f7a5f3799e097dde6268e1095ec3d92ca7d0c1e31c1783713ae8bf02d66c5ccf0e610 SHA512 b01483610c5cc085a99cb1d1e554745fc71d9cf0b2599a1a9973d90f20547c02c5c7553ac0e9df715ee7194fe750cefbfb284bc6f261a8f559dd490a8e266479
 MISC metadata.xml 712 BLAKE2B 265497a27d79fceb3e2ea9cb44c1ec4b5dfc29876e5816041840c91cd1af9f3302eef4acb5b6499667f0a60c6758e56eb64725553bbbc524906c3796c6703748 SHA512 fde844efe66aef823179827b96541c8242f132bec2b58504848d332872c95b0007133f76806121a6285f305f9d7e773b166e7e4c634681a29d1c17576a843e40
diff --git a/net-misc/igmpproxy/igmpproxy-0.2.1-r2.ebuild b/net-misc/igmpproxy/igmpproxy-0.2.1-r2.ebuild
index 5583e140a41d..710dccb81ba8 100644
--- a/net-misc/igmpproxy/igmpproxy-0.2.1-r2.ebuild
+++ b/net-misc/igmpproxy/igmpproxy-0.2.1-r2.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=7
@@ -9,7 +9,7 @@ DESCRIPTION="A multicast routing daemon which uses IGMP forwarding"
 HOMEPAGE="https://github.com/pali/igmpproxy"
 SRC_URI="https://github.com/pali/igmpproxy/releases/download/${PV}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="GPL-2+"
 SLOT="0"
 
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 56690952f9ec..f71f53e241ca 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,8 +1,6 @@
 AUX iputils-20150815-nonroot-floodping.patch 406 BLAKE2B 18c9adf92bb64ddae4a62aaf280a858e1ade2d34938f29026bc62c6b0b43919c26a909f2997d7caaaa5e9c82f139c8bc2aefc752aceeff6fe5f15f0c7b53618c SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34
 AUX iputils-20180629-fix-ping-on-musl.patch 1514 BLAKE2B 32085fa6a7b21a6d5d0d5bba9ca59931f01489dd69ef57f1422e95d3fb2cac151fbfd437b933feb00753a6d3f3eaa0c63ed7eea81021e8a1bb8b26ec7dd6584d SHA512 d78aeaf4c746412855344b248c518218570103c082afd6fe8ee0c38ae2bf9a33d34c85ce5a846accd6442f8ec0f7a8727b5b747bd8a5adada53e1188e6e770df
 AUX iputils-20180629-musl.patch 1718 BLAKE2B cd701f102a57743ba5494645c78b5c70004623530d8c82f20b2dc6b7d006c422fc23ac9493040ab9eccbcf87874b8db6ab394620a4ea61a7eb2e33e32761290f SHA512 0f623a1644592211b8935b6a7556a2a2c95151ac9b291e574bb1e9a5371fd72f27994867f8d599bca22a402627213807338d6cac17d17e7d175eab847658398d
-AUX iputils-99999999-musl.patch 1799 BLAKE2B d178697fd3f3dad9977b15d5a48f3742408f8d3d72fd3883ad512b11a16a719ce56c81ca00281bf754d934192dc3d980998f9947d66974dd3993ba0ed8760be0 SHA512 d3e4cd51591d1c1bb96b58aedd131bbadf6c4f523ce6ec0aebd991d4396fcd516a1aa3af180510efd8484852caf5301cfe4b0936a449b62caffb251d78794c54
-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-20180629.tar.gz 195094 BLAKE2B 81bf6ef427eac0769ea3f95c20294b46c81f9c619551234eb265b3a428998a96cf3df0cdc7499f9eea280c1999e899e87c3f4a863141de251a9c509840bc83b3 SHA512 16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476
diff --git a/net-misc/iputils/files/iputils-99999999-musl.patch b/net-misc/iputils/files/iputils-99999999-musl.patch
deleted file mode 100644
index 167e7fabca70..000000000000
--- a/net-misc/iputils/files/iputils-99999999-musl.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 58ed671d1003caf32f3c35260531e8e1cd7efb80 Mon Sep 17 00:00:00 2001
-From: Aric Belsito <lluixhi@gmail.com>
-Date: Sun, 29 Oct 2017 23:17:03 +0100
-Subject: [PATCH] Fix build on MUSL
-
-Add missing AI_IDN and NI_IDN declarations.
-
-Bug: https://bugs.gentoo.org/503914
----
- arping.c      |  7 +++++++
- ping.h        | 11 +++++++++++
- tracepath.c   |  8 ++++++++
- traceroute6.c |  4 ++++
- 4 files changed, 30 insertions(+)
-
-diff --git a/arping.c b/arping.c
-index 0ac18cd..5d2145e 100644
---- a/arping.c
-+++ b/arping.c
-@@ -45,6 +45,13 @@
- #ifdef USE_IDN
- #include <idna.h>
- #include <locale.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef AI_CANONIDN
-+#define AI_CANONIDN 0x0080
-+#endif
- #endif
- 
- #include "SNAPSHOT.h"
-diff --git a/ping.h b/ping.h
-index c5f0321..0391de0 100644
---- a/ping.h
-+++ b/ping.h
-@@ -38,6 +38,17 @@
- #include <locale.h>
- #include <idna.h>
- #include <stringprep.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef AI_CANONIDN
-+#define AI_CANONIDN 0x0080
-+#endif
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
- #define getnameinfo_flags NI_IDN
- #else
-diff --git a/tracepath.c b/tracepath.c
-index b0eb911..c50e3ec 100644
---- a/tracepath.c
-+++ b/tracepath.c
-@@ -30,6 +30,14 @@
- #ifdef USE_IDN
- #include <idna.h>
- #include <locale.h>
-+
-+#ifndef AI_IDN
-+#define AI_IDN 0x0040
-+#endif
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define getnameinfo_flags	NI_IDN
- #else
- #define getnameinfo_flags	0
-diff --git a/traceroute6.c b/traceroute6.c
-index 7807956..c6d868a 100644
---- a/traceroute6.c
-+++ b/traceroute6.c
-@@ -247,6 +247,10 @@
- #include <idna.h>
- #include <locale.h>
- 
-+#ifndef NI_IDN
-+#define NI_IDN 32
-+#endif
-+
- #define getnameinfo_flags	NI_IDN
- #else
- #define getnameinfo_flags	0
--- 
-2.14.3
-
diff --git a/net-misc/iputils/files/iputils-99999999-tracepath46.patch b/net-misc/iputils/files/iputils-99999999-tracepath46.patch
deleted file mode 100644
index 20d017b34ee9..000000000000
--- a/net-misc/iputils/files/iputils-99999999-tracepath46.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2c4d0838dda90515d4971881d86e8b969baebe01 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Thu, 19 Oct 2017 17:38:20 +0200
-Subject: [PATCH] tracepath: Support calling `tracepath` as `tracepath4` or
- `tracepath6`
-
----
- tracepath.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/tracepath.c b/tracepath.c
-index b0eb911..d2a6edf 100644
---- a/tracepath.c
-+++ b/tracepath.c
-@@ -394,6 +394,12 @@ int main(int argc, char **argv)
- 	setlocale(LC_ALL, "");
- #endif
- 
-+	/* Support being called using `tracepath4` or `tracepath6` symlinks */
-+	if (argv[0][strlen(argv[0])-1] == '4')
-+		hints.ai_family = AF_INET;
-+	else if (argv[0][strlen(argv[0])-1] == '6')
-+		hints.ai_family = AF_INET6;
-+
- 	while ((ch = getopt(argc, argv, "46nbh?l:m:p:")) != EOF) {
- 		switch(ch) {
- 		case '4':
--- 
-2.14.3
-
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 03fc38918904..83e0120b5d81 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -3,9 +3,11 @@ DIST ipv6calc-0.99.2.tar.gz 1287951 BLAKE2B 14de353f5883e1aa538c9fd1b66dbc9d9b48
 DIST ipv6calc-1.0.0.tar.gz 1342987 BLAKE2B 0c5a28b8431a82669870c475c5a73c239368f3486c9d16e66918a110937ec134d79f9b3ce79edffe65ab2789b36b7ac9ecd90e57f891759ba4542d608bcc5380 SHA512 46e33697551c4bf0a472c7f2dd51c11ae21d49c7d78fe5213bce60c1d11f9230491c328e425f36733c7262a369644bcedb8392ffe2279031eb2552092a5ac209
 DIST ipv6calc-1.1.0.tar.gz 1396498 BLAKE2B 67b95057ea75f7c26ab1f9fc8b8e869ef027594e71800c4f8f1c442f34bce31340f1e7160d4f48033b8bc080738051418be48e3913ccd62594256ab64eaef919 SHA512 8fe2a4717f2be4ceae051b635d4329b8c438d9741e9a99a3c12cc1c0d0daef89325cc9beb7ca65da3c671586ce2a596191962118005aeaaf7cfe33a1d4549101
 DIST ipv6calc-2.0.0.tar.gz 1436990 BLAKE2B c445db7583f39b5084adcf756f383d888f1ac75c15702215bbd320c4a54222dfba8ab7b75582d43fb48fa89db1b6e186594f9028d0b30b843e0e7d033baaf6e7 SHA512 6763c27399529b1cc22bdffd84e1fb412d8fe7e20fa7c120fa9a231c0d24e2dde5c285856166ed71e498c93574baaf9d87c4ffb50b2a8511d71b7af4f35c3f25
+DIST ipv6calc-2.1.0.tar.gz 1452903 BLAKE2B 52221e0ff08f6cffbf37900a750359b3e89fc7711ec0fc15b1dd974aa06a4e093ca53fb59e8d75e12824c60079bcefd9df5092365a375825fa9e2e583f0af6dd SHA512 b2ff8557a4af99e1d08b617b2d0a20652d23d80fb532104aefe3708c90fd42ed1309dc9697c7f405715140a2efdb460f4915b797fddf4a7966d165e74224695e
 EBUILD ipv6calc-0.97.4.ebuild 1261 BLAKE2B 685a6981839b68a33c680812c5d4307a5d41ac580db6d08394134b000f9b0045eaadaf85491a6fecd4ee91b5540ab155354d3feeb0bb30271bc1671986fe118a SHA512 d80802c0164be4d04daf115945b0addf1e2821f8c6af49371378f39bc2df09b0431300ca76657b4149fa8865304074e07d63fb3d7e557d2acd3cb38a756b65bb
 EBUILD ipv6calc-0.99.2.ebuild 1509 BLAKE2B 9f5bfc6e3dea8ec9d1659a44b8e646f7fa41278db028d99c3451a201dbbd51d24d27117ecdd1a41cc1d16603a39115db093736cafe399eceef90593ddcb41135 SHA512 b0a1cd648acece998390e55d6ee38659f0352d1f82599e17c2761c9f384079c2eec4e371673f1566cb1d4baf61a97f3b0857f79f0c4ca6980b402c33ebcf0756
 EBUILD ipv6calc-1.0.0.ebuild 1506 BLAKE2B e1c0db4b5904351ba98a0b141dcd906836cce9eac0f81d20ab86bafe52b9101f9cef108dc6fb08b948d940e42001b74533cd2c9e0fbe7ca0c7aa02eac12211fe SHA512 4dd8479d8738b0ba7c0cb31462981715dec73f820c4c6fb2829693359944b32babbba53315d019d37290c7722da1f4b941927c6baefd8bbd927f200d72fea78f
 EBUILD ipv6calc-1.1.0.ebuild 1514 BLAKE2B 1b520e08975817482c85dccf0ba9ff118a2f976dae4c83ee35f155277862969562ca8c880ef4d215ed92c9fc2f304d42d5f68b070f24a585c617c47e742d60d1 SHA512 34ce1a7e1ceecac75e0758078a72a7b9e319b2050eebc0b2f56497436744b1e7e9c74e44b36ec2457ef8658ff20aab560302a7c4037c9bff5d6e263a62209227
 EBUILD ipv6calc-2.0.0.ebuild 1511 BLAKE2B 4ad3e6d1f76eb345a2d61a9bd140980296706177e4d682a03e7c312ea6bbaf2555dc092263311df3f4b68fec3ee0f1d08226776c6b77ec4b7ed3c23b8ce705dc SHA512 4a2861424be22075c9e561a170711bdb7f2addde58b1c51f8dc8b9aaf9aec4e257174b4d4976d78eadc107256b965982cb1835bde3ed33c73194454071dd76b4
+EBUILD ipv6calc-2.1.0.ebuild 1586 BLAKE2B 7fdbd28d864908340aaff783cfa04db513623eb4f2a79909a1d408aeab3af85368604f051cae0fa715f66698546492b3a569d34e0cec5390724c5293f7b1d69d SHA512 ca93fa84ffa87517429b198e2defa105853e31c7e4e5826f2cf01f75cde0cfff1ad59fab09f8212906990252015ac1ccf279fcd7cd3b22243616f22cc7b27593
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
new file mode 100644
index 000000000000..12762462078f
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="IPv6 address calculator"
+HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="geoip libressl test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	geoip? ( >=dev-libs/geoip-1.4.7 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Digest-SHA1 )
+"
+
+#dev-perl/URI is needed for web interface, that is not installed now
+
+src_configure() {
+	# These options are broken.  You can't disable them.  That's
+	# okay because we want then force enabled.
+	# --disable-db-as-registry
+	# --disable-db-cc-registry
+	if use geoip; then
+		myconf=$(use_enable geoip)
+		myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
+	fi
+	econf \
+		--disable-bundled-getopt \
+		--disable-bundled-md5 \
+		--enable-shared \
+		--enable-dynamic-load \
+		--enable-db-ieee \
+		--enable-db-ipv4 \
+		--enable-db-ipv6 \
+		--disable-dbip \
+		--disable-dbip2 \
+		--disable-external \
+		--disable-ip2location \
+		--disable-mod_ipv6calc \
+		${myconf}
+}
+
+src_compile() {
+	emake distclean
+	# Disable default CFLAGS (-O2 and -g)
+	emake DEFAULT_CFLAGS=""
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		# Disable tests that fail as root
+		echo true > ipv6logstats/test_ipv6logstats.sh
+	fi
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog CREDITS README TODO USAGE
+}
diff --git a/net-misc/istioctl/Manifest b/net-misc/istioctl/Manifest
index 171521589b20..86266c1851c9 100644
--- a/net-misc/istioctl/Manifest
+++ b/net-misc/istioctl/Manifest
@@ -1,3 +1,7 @@
 DIST istioctl-1.0.2.tar.gz 18828091 BLAKE2B 064e9ad8b2629809c7b55514ad0a537bae8785bfebabea610a54ead0a0e665cdc718218376e07dcf5e235f8674bdd9e2eaa7a79bfd5d5485a5ddc841e1c52527 SHA512 d444dd8e0676ac9b36dc3901595f15d6504991619a82057f924141f752d2a45866df9ca388d6c63e1fbe43be4d4156f3efc748be59b565f865a0c5b3d02bda07
+DIST istioctl-1.1.2.tar.gz 20682375 BLAKE2B bf0da863cade30baeceddcdaa358bce561a1848d018bd31890b2f0fb01e4ac908ca5da8d09a433fefae43c959c1aecba198ffd341c2c1f31de7a575abca973bb SHA512 6f9533f76b1847742198d48bed8fc2b0e288180d4033faf89857eb525c4d956f279a823c13196dd23fd9e46ab4261f9ff31746ac232e19530268d43cfdbaa083
+DIST istioctl-1.1.4.tar.gz 20705247 BLAKE2B d3727dafcfa8a630a02040fe452a3a2b6c89d4dc2ede4128b9906adf21d97e68f8b126783d248239416a459357bee72ca0f2af19a6d34039ad59b3ade6f3b6d1 SHA512 e866fcad482ef605e4126fffe421eff7fbc1733e5d949e2ebe846f790d8825bb79d5360fe48d29913f0b015c15bc1aac224ac9f39e4e7d5948f2dcd5042570a8
 EBUILD istioctl-1.0.2.ebuild 881 BLAKE2B 00a7f516e13770c040062a00ed69f81978dd417bc99110642ae0be829db843f3102702d66dfffe25c0dd47cece882b0a32b1bfce7156e7f6f90d4e90722597db SHA512 4d97bd6fc977531321d9ad406b39e13546eabd2029887422acae435de2fc6c0e0c6d805ca8de15cde59392750a7862a561266b27cc7ad1ef0418816a104946d6
+EBUILD istioctl-1.1.2.ebuild 881 BLAKE2B 6c6dd07075fe58b1f8406ae71e0e7c0b9791f3a7728233ebe231f66410732fb42fc2171a4531e89f472a6d3dc4290aa3ea26d0ec910b05a440124d004040d62a SHA512 a99dd243544b5f981d737e7d30cd5967030d111d58229768e6347e7724c1947ccbb2e188673045b46c685ada2413e384cfa7a360dcbca6ced3560e9d27ecfdc3
+EBUILD istioctl-1.1.4.ebuild 881 BLAKE2B 2469a8a5e01cfd03c46dd36ccea76f55245d0f5c6f4138dd091344d78e6e6bc3012b1865bc8b3544b50e20d2d90b256ea50e49631d5bccea32feaad198e77673 SHA512 42e2248f54be2b555c8b3fb5b889edbb999979b97b75feb0595c9974345c04fab4475d60fc0f237701af8d4001a6c8099db5a0364c684739c891331528b65c5d
 MISC metadata.xml 321 BLAKE2B 46078d652e4352893c239c5e6b7d30a160f48b370f932357a5c2940c67ddae2f6c932ca6dd1b0b784b0e2a03a7649936ebe317dc95da5ad7a9acbd2e497a01d1 SHA512 cb45dda3fe092fbc1d18cdd21f44ad5cd89c51fee4e10aee6140bd66b25e46c9253672b8f36fe0ae6a83ff9a76c9b1bd35de59846abb9054b1f5095e33858d88
diff --git a/net-misc/istioctl/istioctl-1.1.2.ebuild b/net-misc/istioctl/istioctl-1.1.2.ebuild
new file mode 100644
index 000000000000..9ed0c95c5eea
--- /dev/null
+++ b/net-misc/istioctl/istioctl-1.1.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+GIT_COMMIT="2b1331886076df103179e3da5dc9077fed59c989"
+
+KEYWORDS="~amd64"
+DESCRIPTION="Istio configuration command line utility"
+EGO_PN="istio.io/istio"
+HOMEPAGE="https://github.com/istio/istio"
+MY_PV=${PV/_/-}
+SRC_URI="https://github.com/istio/istio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	BUILDINFO="istio.io/istio/pkg/version.buildVersion=${PV}
+		istio.io/istio/pkg/version.buildGitRevision=${GIT_COMMIT}
+		istio.io/istio/pkg/version.buildStatus=Clean" \
+	VERBOSE=1 GOPATH="${WORKDIR}/${P}" TAG=${PV} emake istioctl
+	popd || die
+}
+
+src_install() {
+	dobin out/linux_amd64/release/${PN}
+	pushd "src/${EGO_PN}" || die
+	dodoc README.md
+}
diff --git a/net-misc/istioctl/istioctl-1.1.4.ebuild b/net-misc/istioctl/istioctl-1.1.4.ebuild
new file mode 100644
index 000000000000..6ca50e797a3b
--- /dev/null
+++ b/net-misc/istioctl/istioctl-1.1.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+GIT_COMMIT="bc7465793cbff4c4189639b3f404e21c517cbdc6"
+
+KEYWORDS="~amd64"
+DESCRIPTION="Istio configuration command line utility"
+EGO_PN="istio.io/istio"
+HOMEPAGE="https://github.com/istio/istio"
+MY_PV=${PV/_/-}
+SRC_URI="https://github.com/istio/istio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	BUILDINFO="istio.io/istio/pkg/version.buildVersion=${PV}
+		istio.io/istio/pkg/version.buildGitRevision=${GIT_COMMIT}
+		istio.io/istio/pkg/version.buildStatus=Clean" \
+	VERBOSE=1 GOPATH="${WORKDIR}/${P}" TAG=${PV} emake istioctl
+	popd || die
+}
+
+src_install() {
+	dobin out/linux_amd64/release/${PN}
+	pushd "src/${EGO_PN}" || die
+	dodoc README.md
+}
diff --git a/net-misc/mcproxy/Manifest b/net-misc/mcproxy/Manifest
index 97315a333f46..1247f1c275e2 100644
--- a/net-misc/mcproxy/Manifest
+++ b/net-misc/mcproxy/Manifest
@@ -3,5 +3,5 @@ AUX mcproxy.confd 160 BLAKE2B 5c2e387bbcb5de69412b1b08b63bedab8346363c4d303336c5
 AUX mcproxy.initd 580 BLAKE2B aff88e8962c7861140f4a11568cab5aaa17df153bcd88b6057f3f17cbad2ee46693db681f1307daa569d4c67e258ab7ab8123c18bffd39fc924b34dd483ab2af SHA512 9f5eaeb39ef5a5cbd8af70f23f17e609f783204ee2dc458128f41a4327eb9f5b8f7f77ae1d642121e7a4af4f6778e65bc97bf0c0b800606c0ce2d6ec79c18f95
 AUX mcproxy.service 161 BLAKE2B c218284289627ae733746263662c16579a617b740825e8b6e0032e9531e17c4c4f0d6bc88d6db2fd6ebbc4a9dcb6bb3dc181fea859e152eef8c53978944a6c0c SHA512 a8298d9278ee934289832d360e502268739e415681c8ecf1c69b93d80ec75094ef32e7f9618ed243a6c05a8facd7aee0b5be591aa6dfce0fcf4658bed845b830
 DIST mcproxy-1.1.1.tar.gz 3373209 BLAKE2B 0b54f7c20b9d6d66c5b88daeaa00901918057b449b932656355303a83c4e4f1feb370de0c55e55484b9bafc63bfd82b8ef8179144529f3074e3d94e147cc8ff5 SHA512 408bc27169c9c90080c7842aaeaf260d5349b735e017d1750118f190124f48743fbf15fc05eee16290e38cc2f752e27b28548714a3d0cd2366dfc53dafcda0bb
-EBUILD mcproxy-1.1.1-r1.ebuild 1070 BLAKE2B 31d974cbd89b8dc3d47ea69cd6f19f8fd2ffea8fe32cfb92207e9417adeb9ed8372851843e6fbeead14a8f3b05657062448e8e19003a97d83dea50242aa256ff SHA512 d638516485e41c0c7355c840bc414de7f0db87a27bf036b1c58a3d7a0c0c49d7bf5117abedd7dfab43cd9d966edb0032cabaf9a7c229846ffaf30b54e89396b5
+EBUILD mcproxy-1.1.1-r1.ebuild 1069 BLAKE2B 38926653eee568743e0f9af4cd36820f006eca1691effbb61c744d93f298501f5986cbe439d9986bd4eab9ddb2716b30ff0b9a3091116e6bd4fcc78dcda792da SHA512 c03f8145bf487175b9a19073eec249613f28c3fbd7aa4982a5ff530b6be53e4af5f45c7847f20e90a0b8437770f7573ab37bafb3f28ab4c971127a4b5c72cb6d
 MISC metadata.xml 1382 BLAKE2B 5c7f722ba8c8886c41ee6cd5fb894e60d259718cc33b1898049f71cff039872272b6120faae28378c4f3722e5cc97154577899141caf2c6c0792443a67dbaad0 SHA512 99b20c4f17439db3e04cb85c2355a2944353adb3015b627f9f91836d9ae49efa54d044e153ec73980cab04ee78bbf1c1a9e38bb132284b46fce31859a7c9a3f8
diff --git a/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild b/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
index 5ba92c33d17c..303cfb244d93 100644
--- a/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
+++ b/net-misc/mcproxy/mcproxy-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ DESCRIPTION="A multicast proxy for IGMP/MLD"
 HOMEPAGE="https://mcproxy.realmv6.org/ https://github.com/mcproxy/mcproxy"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="doc"
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 2ee8dafffe5d..1d03a39eb951 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -9,10 +9,12 @@ DIST memcached-1.4.39.tar.gz 403751 BLAKE2B fc6082eb9b6dc5ee41c42ded9bcde03ebfe8
 DIST memcached-1.5.10.tar.gz 465169 BLAKE2B cfdd4cba4baf3c628b6cb655bbc91fc493b7183c2b403516cd68f7d7deff3ce2f9ba6bce2c92d9b1f0863d2da593f7f51def50afd7827996c109641efa71eaf1 SHA512 5b6217ab90492cb4b3f6597c935a4028697f1d071516d647a70f6ba9353db16184ef229935733e669d4120d34d72f6f2415edcfd3ec899e06eab9d3f494f11f1
 DIST memcached-1.5.11.tar.gz 457692 BLAKE2B 248e1b1e6aa54db06d18086add51964b8fc6b9966875de35fcdc322631e276becbc9bd694e1c7ea04822ccabd5796422f1f505bc046a08b3b69b76bf9fef1b42 SHA512 1d641383a9d5c6a1f074a1f30493d50fb3384f29d07078dc827fcb1f9e70f6c07f12a3c6c2a128905ffddf2c414998afbbe3456d8cd4fe43e43606bf9933d822
 DIST memcached-1.5.12.tar.gz 457719 BLAKE2B 6ad223cc62b3514f42eb91851cb906aa6c22f1bed65aed8b9bd5f11d8201bd1e946ddf980e26f4a2a8380f1da03ad7a4e9ad68f2c830bbfa948fe117b2689c3c SHA512 95927fcc06e83e46a050dd50c85e50faf41e6d1f6901b757f7a842b7727a596054082a512a3b830729171556e8a995f037d39d991df2198a80a4e61a6efa1fd8
+DIST memcached-1.5.13.tar.gz 483697 BLAKE2B fb4f58cbeb518941a92dc213ce2d30dda501bc84c61ae5fa520c1a3a5cfd58ed92128ea098430d57b2a3db69f0d8e8a77dd38ea7edf4440b3f6c484d3b3fb966 SHA512 77ea80135f572ff49d030ea1da01b31aa6513589e75c370ef306a986a79129358062730dfebe6801487eeb20b1367aed4096514e882ef35425c764434493fa7b
 DIST memcached-1.5.2.tar.gz 407715 BLAKE2B d9d6bc3fde4ca47954dbcec520af73a823ff33cd21149cf4a8fd234c383382b83a089196fd168f178aaaa7f764ac4b0b72a4bf8f50867bdc377e95a622f399a1 SHA512 439e1dbf3b15fd014446abb5fd130eb914a72b7372f65a00388da83f30486e8658de75b87626b0c512397457aca9b60057fcedb83d84c628b53137d2a2167c0d
 EBUILD memcached-1.4.39.ebuild 2873 BLAKE2B 1862c2434c8b711d22d97d827a79a484c1e0f682e92f282d61c10d78d6c6bb62af86519a59d3e3f715f9eae6fb8af2ee92b7705f9c987ca01f35f64ec87c08bd SHA512 2980ce757bbeb1cc401cd91473dbb4a76bce44407f0253aba2f05353426e87022cf40fcb2d584eae9d8bbd930f901e65030b86842936cd48b7425ce7163d78d9
 EBUILD memcached-1.5.10.ebuild 2933 BLAKE2B 53ed1e26ad2f3d60088b0f0eb4020d8338fcf27bca4a72224ecf61f3c9b31421ee1d6480f1aba03c7dfe07948fc0b7112f3442655ec27762d4dcc543b7d3c630 SHA512 450b27248f092e78827d95e7fab3276112b2da4b907339519e5afaaf3ce3902f2a5ac082db187d68fbd1c26874450596d5d2b42df4d6e96bcbf442b56e08f0b4
 EBUILD memcached-1.5.11.ebuild 2932 BLAKE2B 694ee35427d6009183f94e438b3ca51d2cb4bfda1c1bc0e93fa7e18b823c9291440698ffa364fe40fea6621248bfe87c6d789cb943dab9ca634550613e26fb4a SHA512 db18f156d71c8d7f31228669109ee1448ac6df8722b9f11ac02dcdcb0c33d4b367d1540c4cc5b3d1f036118c482a6e61a8672b3cde0c27c6f091a94d8a864475
 EBUILD memcached-1.5.12.ebuild 2923 BLAKE2B db692987cbde108325f1a634338339a33cc05994a3dbc9d5ee30a096b5fac6bf91779874257a217b95ae6266a29c6c821798deb20821f42be92b71c6945dfc04 SHA512 f32c20794b3385d881abdcd109c1569d725af77e4d08ce384e1ff10c55ca330f9fb200a5c9a8f1353f36d650633a8e110a1af3ddc54d7c6a446ab181caacef29
+EBUILD memcached-1.5.13.ebuild 2921 BLAKE2B 2b1c3a401a1709575ed32394830c0e8c155962ed8762d5645983437aaf55eb97ecc04c29dc8bb4d85601a019034e7187ad8cfc0ffe50531c9303969e4f103d62 SHA512 d2aa1b965e03d0242265b151dd29c0fd1dab9858c650eace0a1a931a24b6ecb5e5adda22993d738eb8bf06c62a8db3ca6f2e002aa0378f5847ecd4010e756129
 EBUILD memcached-1.5.2.ebuild 2882 BLAKE2B e92dbd6cde47898797b2225a09a560651dbb3a9fb9cf603d2b5aadecf25472a02ac33771369855deca687e80fd38c53a263f4affeb92ffb60719d5a64f381deb SHA512 187509aef05b0c47ca2f8ef26bcf9ec813d5fd2a859482a2ce95907b1dba05d4c7d0091542c9e85cc4605e679600bfe7a2260cc3a3b150d3a5a608729d75251d
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.13.ebuild b/net-misc/memcached/memcached-1.5.13.ebuild
new file mode 100644
index 000000000000..be11449af3c5
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.13.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 eutils flag-o-matic systemd user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index 3ad3ac0fe40f..8a579a9444f0 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -1,7 +1,8 @@
 AUX mikutter 136 BLAKE2B ba1a252d63dc3a190f61ad3f0489ac7222a90d48dc01cdaadb24f02d870ef64d0fd20b5c913f8469b590ab4b961accfcb14b7b7d7fa1542fbf0b938dac35024d SHA512 bae3b58b6983c7ad6e0c10f006f4338eb0923b1056b6f74f518a1b3caeeef7c414f8de8dd927420611ae8542dde8507f1c25ca0529e7cd3a17f6ac8fc25e16b0
-DIST mikutter.3.4.2.tar.gz 3684733 BLAKE2B 37bf96e06fd22af2979ba7e3cb76fa8267a051d93e5e143111ef1107596a84533435d2ff596322c246601fc4de46a066c131f8a1e0a881bc35e2c7f19c02469f SHA512 bbdde61324825e9c7d4ffa6b6dc004f74c512391c1b1a538d7c72672f6aa68c3b68c579d1a2a3db13d25b909dc497195fcd7f0d66c88c8d1b2856508e965418d
 DIST mikutter.3.5.4.tar.gz 3743674 BLAKE2B af166219af2a36e84c4e13209830d12be6e085e6c76fa101c265c40bc85d465f50f56311783b647f10ec0021450fd45ca411643e7612e8225df6c9e75ac83be1 SHA512 adb7a1902026ee01737840d0b7f9004ab363e874e01f7c497bd9252fccb3cc16f86f1959bb2eff3d309cb7ba1fa93376d9a1e46d5226859a1279069de7f2ba8e
-EBUILD mikutter-3.4.2-r1.ebuild 1629 BLAKE2B fb2035377a631b85ff4a946a1ad2f93e518878209bc6a6a3077b3128321985b2c8b049e07acf5d4a35d650dc657232a665e1540521a3c24c6339463af780b920 SHA512 2f2edc68199ae0a8a8c5a359ed556cda531296f1583a8df7f58600aeaa6f37c780bc4186642733de8a95dd0826e8b7b718d85f8f1cbc9c06c62ed35fe58a2a97
+DIST mikutter.3.8.6.tar.gz 3174454 BLAKE2B 3fc3802ae840fc310f1b9abd51c560fb804b57aad6bf78bd1e3b8046a42dc785c8a454de722a5e57d499bda15884a255da50d3919a1c5bbcd9e5753948d45f46 SHA512 102c25263df804fd005928ac8605ca4d115040c0e3bd13a09e73bac5b1a4ddedff92b45ac38c54692bf388b5ac8ea422a0b5c42851bb3616c74991943f1cd98f
+DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4
 EBUILD mikutter-3.5.4-r1.ebuild 1629 BLAKE2B 1fefca3c2d9e10e7e6df2e8bb557a3aa1df3bf2834a0ba9658a93f09409a636d5c6b778e8dff230e79134f17e019dd4931c2cc42de313ef3cac5545a77595a9b SHA512 99bf96b72853df0af06cc3fcb445fe12d7cc836764dcbac960ee0ab992f6a772378c791ce5d6f7baf0d7a595365b2cbbc0c949d632a0bc13ad528b3259a84403
-EBUILD mikutter-9999.ebuild 1623 BLAKE2B b458e44c51fa3b1cd1ea153702d06b0d3a8349c8449f2cce01aae953331066920e31cda48238d402b2914054da0f4794f4bc5ca45bc7ab226f542cb573334348 SHA512 fd7f856bab0e839fdaefba6ed4ff74d42c7d823fb71af3a9ffd8cd25a1c7790764049fff77002a16f91eab1537662bd0b19b3cc95cc1d62109483ac3879c099d
+EBUILD mikutter-3.8.6.ebuild 2838 BLAKE2B b683e9128ea872a2768e771f85163bda44dfdfdee45f56fb7eaf1c7ed962b3139df8c2447e6271566c82a0461a7457e8b67f2631554cabd7bf47ed8a451fb00f SHA512 633ea75970bd249bad849ecbab1efdce6e2494aad74dd54c2bf9964a157208b088161f00b08af7f5b4ee50bb17f772b266ab86d166c9b2d7393efe436f6474a4
+EBUILD mikutter-9999.ebuild 2838 BLAKE2B b683e9128ea872a2768e771f85163bda44dfdfdee45f56fb7eaf1c7ed962b3139df8c2447e6271566c82a0461a7457e8b67f2631554cabd7bf47ed8a451fb00f SHA512 633ea75970bd249bad849ecbab1efdce6e2494aad74dd54c2bf9964a157208b088161f00b08af7f5b4ee50bb17f772b266ab86d166c9b2d7393efe436f6474a4
 MISC metadata.xml 214 BLAKE2B 8c736c7fcedf2d2c712e43cb3a7850254057fca17f9ec3647598d76e726cd4eea542ce40b339abb3f96a56b17a3f355d9508a5980dd7c7e243bbc19b68a6a5b7 SHA512 3950e95b95a325c58612d9c601ee4c59714d0387574f31bc8ac8eb35305082413aebe00435aeca391fe8dc72a0901aef3ee68ee0da10a14e88908ae766d637c3
diff --git a/net-misc/mikutter/mikutter-3.4.2-r1.ebuild b/net-misc/mikutter/mikutter-3.4.2-r1.ebuild
deleted file mode 100644
index 62e5fdcfc3b9..000000000000
--- a/net-misc/mikutter/mikutter-3.4.2-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23"
-
-inherit eutils ruby-ng
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git"
-	inherit git-2
-	KEYWORDS=""
-	EGIT_SOURCEDIR="${WORKDIR}/all"
-else
-	MY_P="${PN}.${PV}"
-	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz"
-	KEYWORDS="~amd64"
-	RUBY_S="${PN}"
-fi
-
-DESCRIPTION="Simple, powerful and moeful twitter client"
-HOMEPAGE="http://mikutter.hachune.net/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+libnotify"
-
-DEPEND=""
-RDEPEND="
-	libnotify? ( x11-libs/libnotify )
-	media-sound/alsa-utils"
-
-ruby_add_rdepend "dev-ruby/addressable
-	dev-ruby/delayer
-	dev-ruby/delayer-deferred
-	dev-ruby/httpclient
-	dev-ruby/json:0
-	dev-ruby/instance_storage
-	<dev-ruby/memoist-0.16
-	>=dev-ruby/moneta-0.7
-	dev-ruby/nokogiri
-	>=dev-ruby/oauth-0.4.7
-	dev-ruby/pluggaloid
-	dev-ruby/rcairo
-	>=dev-ruby/ruby-gettext-3.0.1
-	>=dev-ruby/ruby-gtk2-2.2.0
-	dev-ruby/ruby-hmac
-	dev-ruby/totoridipjp
-	dev-ruby/twitter-text
-	dev-ruby/typed-array
-	virtual/ruby-ssl"
-
-all_ruby_unpack() {
-	if [ "${PV}" = "9999" ];then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-each_ruby_install() {
-	local rubyversion
-
-	if use ruby_targets_ruby23; then
-		rubyversion=ruby23
-	elif use ruby_targets_ruby22; then
-		rubyversion=ruby22
-	fi
-
-	exeinto /usr/share/mikutter
-	doexe mikutter.rb
-	insinto /usr/share/mikutter
-	doins -r core plugin
-	sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \
-		| newbin - mikutter
-	dodoc README
-	make_desktop_entry mikutter Mikutter \
-		/usr/share/mikutter/core/skin/data/icon.png
-}
diff --git a/net-misc/mikutter/mikutter-3.8.6.ebuild b/net-misc/mikutter/mikutter-3.8.6.ebuild
new file mode 100644
index 000000000000..06d5346485a6
--- /dev/null
+++ b/net-misc/mikutter/mikutter-3.8.6.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby24 ruby25"
+
+inherit eutils ruby-ng
+
+PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git
+		https://github.com/toshia/twitter_api_keys.git"
+	inherit git-r3
+	SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
+	KEYWORDS=""
+	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
+else
+	MY_P="${PN}.${PV}"
+	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz
+		https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
+	KEYWORDS="~amd64"
+	RUBY_S="${PN}"
+fi
+
+DESCRIPTION="Simple, powerful and moeful twitter client"
+HOMEPAGE="http://mikutter.hachune.net/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+libnotify"
+
+DEPEND=""
+RDEPEND="
+	libnotify? ( x11-libs/libnotify )
+	media-sound/alsa-utils"
+
+ruby_add_rdepend "<dev-ruby/addressable-2.6
+	dev-ruby/delayer
+	>=dev-ruby/delayer-deferred-2.0
+	>=dev-ruby/diva-0.3.2
+	dev-ruby/httpclient
+	dev-ruby/json:0
+	dev-ruby/instance_storage
+	dev-ruby/memoist
+	dev-ruby/moneta
+	dev-ruby/nokogiri
+	>=dev-ruby/oauth-0.5.1
+	>=dev-ruby/pluggaloid-1.1.1
+	dev-ruby/rcairo
+	>=dev-ruby/ruby-gettext-3.2.9
+	>=dev-ruby/ruby-gtk2-3.3.0
+	>dev-ruby/ruby-hmac-0.4
+	dev-ruby/totoridipjp
+	dev-ruby/twitter-text:=
+	>dev-ruby/typed-array-0.1
+	virtual/ruby-ssl"
+
+all_ruby_unpack() {
+	if [ "${PV}" = "9999" ];then
+		git-3_src_unpack
+	else
+		default
+	fi
+}
+
+all_ruby_install() {
+	local rubyversion
+
+	if use ruby_targets_ruby25; then
+		rubyversion=ruby25
+	elif use ruby_targets_ruby24; then
+		rubyversion=ruby24
+	fi
+
+	exeinto /usr/share/mikutter
+	doexe mikutter.rb
+	insinto /usr/share/mikutter
+	doins -r core plugin
+	sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \
+		| newbin - mikutter
+	dodoc README
+	make_desktop_entry mikutter Mikutter \
+		/usr/share/mikutter/core/skin/data/icon.png
+
+	insinto /usr/share/mikutter/plugin/twitter_api_keys
+	newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in
+}
+
+pkg_postinst() {
+	echo
+	elog "To use Twitter, you need to setup your Consumer Key/Consumer Secret by running"
+	elog "  emerge --config =${PF}"
+}
+
+pkg_config() {
+	local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin
+	local CK CS
+
+	echo
+	einfon "Please input your Consumer Key for Twitter: "
+	read -r CK
+
+	echo
+	einfon "Please input your Consumer Secret for Twitter: "
+	read -r CS
+
+	if [ -z "${CK}" -o -z "${CS}" ]; then
+		eerror "Consumer Key or Consumer Secret is missing."
+		return
+	fi
+
+	sed -e "/consumer_key = /s!''!'${CK}'!" \
+		-e "/consumer_secret = /s!''!'${CS}'!" \
+		${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \
+			${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb
+
+	echo
+	einfo "Consuker Key/Consumer secret is set."
+}
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild
index 04d1acc69b11..06d5346485a6 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -1,20 +1,25 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby24 ruby25"
 
 inherit eutils ruby-ng
 
+PLUGIN_HASH="30071c3008e4616e723cf4e734fc79254019af09"
+
 if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git"
-	inherit git-2
+	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git
+		https://github.com/toshia/twitter_api_keys.git"
+	inherit git-r3
+	SRC_URI="https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
 	KEYWORDS=""
-	EGIT_SOURCEDIR="${WORKDIR}/all"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/all"
 else
 	MY_P="${PN}.${PV}"
-	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz"
+	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz
+		https://raw.githubusercontent.com/toshia/twitter_api_keys/${PLUGIN_HASH}/twitter_api_keys.rb"
 	KEYWORDS="~amd64"
 	RUBY_S="${PN}"
 fi
@@ -31,41 +36,42 @@ RDEPEND="
 	libnotify? ( x11-libs/libnotify )
 	media-sound/alsa-utils"
 
-ruby_add_rdepend "dev-ruby/addressable
+ruby_add_rdepend "<dev-ruby/addressable-2.6
 	dev-ruby/delayer
-	dev-ruby/delayer-deferred
+	>=dev-ruby/delayer-deferred-2.0
+	>=dev-ruby/diva-0.3.2
 	dev-ruby/httpclient
 	dev-ruby/json:0
 	dev-ruby/instance_storage
 	dev-ruby/memoist
-	>=dev-ruby/moneta-0.7
+	dev-ruby/moneta
 	dev-ruby/nokogiri
-	>=dev-ruby/oauth-0.4.7
-	dev-ruby/pluggaloid
+	>=dev-ruby/oauth-0.5.1
+	>=dev-ruby/pluggaloid-1.1.1
 	dev-ruby/rcairo
-	>=dev-ruby/ruby-gettext-3.0.1
-	>=dev-ruby/ruby-gtk2-2.2.0
-	dev-ruby/ruby-hmac
+	>=dev-ruby/ruby-gettext-3.2.9
+	>=dev-ruby/ruby-gtk2-3.3.0
+	>dev-ruby/ruby-hmac-0.4
 	dev-ruby/totoridipjp
-	dev-ruby/twitter-text
-	dev-ruby/typed-array
+	dev-ruby/twitter-text:=
+	>dev-ruby/typed-array-0.1
 	virtual/ruby-ssl"
 
 all_ruby_unpack() {
 	if [ "${PV}" = "9999" ];then
-		git-2_src_unpack
+		git-3_src_unpack
 	else
 		default
 	fi
 }
 
-each_ruby_install() {
+all_ruby_install() {
 	local rubyversion
 
-	if use ruby_targets_ruby23; then
-		rubyversion=ruby23
-	elif use ruby_targets_ruby22; then
-		rubyversion=ruby22
+	if use ruby_targets_ruby25; then
+		rubyversion=ruby25
+	elif use ruby_targets_ruby24; then
+		rubyversion=ruby24
 	fi
 
 	exeinto /usr/share/mikutter
@@ -77,4 +83,39 @@ each_ruby_install() {
 	dodoc README
 	make_desktop_entry mikutter Mikutter \
 		/usr/share/mikutter/core/skin/data/icon.png
+
+	insinto /usr/share/mikutter/plugin/twitter_api_keys
+	newins "${DISTDIR}"/twitter_api_keys.rb twitter_api_keys.rb.in
+}
+
+pkg_postinst() {
+	echo
+	elog "To use Twitter, you need to setup your Consumer Key/Consumer Secret by running"
+	elog "  emerge --config =${PF}"
+}
+
+pkg_config() {
+	local PLUGIN_DIR="${EROOT}"/usr/share/mikutter/plugin
+	local CK CS
+
+	echo
+	einfon "Please input your Consumer Key for Twitter: "
+	read -r CK
+
+	echo
+	einfon "Please input your Consumer Secret for Twitter: "
+	read -r CS
+
+	if [ -z "${CK}" -o -z "${CS}" ]; then
+		eerror "Consumer Key or Consumer Secret is missing."
+		return
+	fi
+
+	sed -e "/consumer_key = /s!''!'${CK}'!" \
+		-e "/consumer_secret = /s!''!'${CS}'!" \
+		${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb.in > \
+			${PLUGIN_DIR}/twitter_api_keys/twitter_api_keys.rb
+
+	echo
+	einfo "Consuker Key/Consumer secret is set."
 }
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 683285d3eb13..13d5d558ef2a 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -1,11 +1,7 @@
 AUX minidlna-1.0.25.confd 313 BLAKE2B f08adcd103be5fcffa02d2c62ca85537cb5803336bb70ba3457b3b61790e1800d453168aaed981c15776fa92353149d17c6c5eeafb70033727fb0aa838e4422d SHA512 e209848af0d79069ac989ad61d3be610b4c0c2783a207a50463a25ec3811b04d1da3a2acde54749878bec44e1567874ede827b978d5472c00f6a855663e5cbf8
 AUX minidlna-1.1.2.service 230 BLAKE2B 13db2b522a5c27143106f7d45410f94c657133440a5e352794cc4fc48c818865b28087c666911c905efd3fb9c00b6aa9f79f9d0b014eae9130db0d40b5a0ec20 SHA512 0cfa770c43097007dce2c440512e4ca27e02678a08299c8343c91d2e9f70d4756bfd9527c6747a484c639e0e8467cad3d5f2f5a216684ce75495be084e6ac5df
 AUX minidlna-1.1.5.initd 682 BLAKE2B ea0522de80f8525c5db7a4cb70ac72fd68db9c2beb263d87ef4ab18a128f55117929c6d244de72e5e663e06579a551ff1aa9df385afd277135aa1a2ed0201bbb SHA512 918e282b91434c29d7510e3c04749cd5b2d11aa623fada13d60749793cd7635e4b671e74dc6b1c4e45de0c96b56a271f017a17438651f9d24c03a16df26e09d2
-AUX minidlna-1.2.1-buildsystem.patch 758 BLAKE2B e9fd6e2ad4dbeee65b73c65a5537990cc9038ecb30b99d1d73e631dd6b46fef3691e509a90f6325b2be5ea5204da7906fd25128df290cad49d7985510ec2ea1d SHA512 63b625ca9bb163ed8b7532e5af03c3b3ca45c519c72bd4b6c4d1421de5e115cec4d3b510d03ea44ad050eada0b275fcb3da3d0e622dd3a2e53531222f229006b
-DIST minidlna-1.1.5.tar.gz 488191 BLAKE2B bda7d9099a11578919387f6d4f0e04c162556fb3557352446f0e7c69ee7dfe8f2c19d002b3fde1af2e6ff9c8b1436177f0b47dcc5c86a96e4dfd35de57610d60 SHA512 2a8eaa42fcda6f98648f1726af5cdba6d2358c386440dd0de933364cfbd1ced2fee5f883033e1a5a692b760749beb2c12798020a3591ddcea22663102d4f3dfa
 DIST minidlna-1.2.1.tar.gz 459549 BLAKE2B db757b31945cb6cdb8449847f845777cc4a3962ffd53305777f0cfb78c9ff68d2f7531bce63093c339914fb51039f75758056c69703db38220425eb36e7863ac SHA512 17827155bfbfd2b51939bc86080e8724dcded138af8fede9c7715c225524e86d3c21bfd8d40dbf201861ef154189d9c5e223b719bf7695251212b26ec290462b
 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
-EBUILD minidlna-1.1.5-r1.ebuild 2438 BLAKE2B 6d6207e1fd6b38f9153f82ea99c790bd481d5ffe396dd651d5b8264f8ce5905bf07aadca43bb63388d98c48aa12c32eb3caa9b45ed444d08368821d9acdd469a SHA512 55b9aa3ce385f56ef0047af899bd3eb3029553ea9b1c33e9bd354a8f55169e9ccb34f1cb0fca78a14b76f887ce93388d334237f2e6bc765338db7363e6466b4d
 EBUILD minidlna-1.2.1-r1.ebuild 2716 BLAKE2B 5d970b7e2e159534157c55bb0aac2b6167aff75e5d628f88805b667608a7e0198611b1bf226ec5d4350cd96a4c1593a5adfb1a4477bbd6c811f11fcef20e4f88 SHA512 ff8d42e6a9b89f5df2f048e6be02117e42cdbe134c705c1ef26d3a6b31ad5da4d57090a7504828a1f06b6c96730bcd7b8e83bfb6b7bf0d72358c9dc8c5d2ae49
-EBUILD minidlna-1.2.1.ebuild 2560 BLAKE2B 0c519c5c1e41df2391385d1b94228d208a9d82697bdc3198392c1167fc0bd0174ae0b1c02750641cf07e822a9e3b1576bf9fc3fae2c94da28c2550f76e22d3d4 SHA512 4b0d0b171c48b2854f8819402b6e87e47ba76fe2a496bf3acd57f4220d1fed551c5eac0e65a62c6cbe9ced1863ed5422c852a4492854ffe08a41c1132396fdb9
 MISC metadata.xml 512 BLAKE2B 4f4f646b79a65b8563381b6534b8cc51d3731f529b3eb2352ed19032123a9e3801c23fde576dab0467e04f9eef4ffa8bf89171ed3929fc808c9a4b08122bfaad SHA512 571087e06e7d8d32ea6923043738b5f36eadd60880a49260ada78416bb8b2c56a3756408bea161d0292ccfa92acad6322a1f5c960afd0930fc2187f941d9dfc4
diff --git a/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch b/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch
deleted file mode 100644
index 10154dd5165e..000000000000
--- a/net-misc/minidlna/files/minidlna-1.2.1-buildsystem.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- minidlna-1.2.1/configure.ac
-+++ minidlna-1.2.1/configure.ac
-@@ -477,6 +477,9 @@
-         AM_CONDITIONAL(NEED_VORBIS, true),
-         -logg)
- 
-+AC_ARG_ENABLE([avahi], AS_HELP_STRING([--enable-avahi], [Enable search for avahi]))
-+
-+AS_IF([test "x$enable_avahi" = "xyes"], [
- AC_CHECK_LIB(avahi-client, avahi_threaded_poll_new,
-         [AC_CHECK_HEADERS([avahi-common/thread-watch.h],
-          AM_CONDITIONAL(HAVE_AVAHI, true)
-@@ -484,6 +487,7 @@
-          AM_CONDITIONAL(HAVE_AVAHI, false))],
-          AM_CONDITIONAL(HAVE_AVAHI, false),
-         -lavahi-client -lavahi-common)
-+], [AM_CONDITIONAL(HAVE_AVAHI, false)])
- 
- ################################################################################################################
- ### Header checks
diff --git a/net-misc/minidlna/minidlna-1.1.5-r1.ebuild b/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
deleted file mode 100644
index c964214a45e0..000000000000
--- a/net-misc/minidlna/minidlna-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info systemd toolchain-funcs user
-
-DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="https://sourceforge.net/projects/minidlna/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="netgear readynas"
-
-RDEPEND="dev-db/sqlite:3
-	media-libs/flac
-	media-libs/libexif
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libvorbis
-	virtual/ffmpeg
-	virtual/jpeg:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup() {
-	local my_is_new="yes"
-	[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
-		# created by above enewuser command w/ wrong group and permissions
-		chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
-		chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
-		# if user already exists, but /var/lib/minidlna is missing
-		# rely on ${D}/var/lib/minidlna created in src_install
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
-		-e "/db_dir/s:/var/cache/:/var/lib/:" \
-		-i ${PN}.conf || die
-
-	epatch "${WORKDIR}"/${PN}-gentoo-artwork.patch
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-db-path=/var/lib/${PN} \
-		--with-log-path=/var/log/${PN} \
-		--enable-tivo \
-		$(use_enable netgear) \
-		$(use_enable readynas)
-}
-
-src_install() {
-	default
-
-	#bug 536532
-	dosym /usr/sbin/${PN}d /usr/bin/${PN}
-
-	insinto /etc
-	doins ${PN}.conf
-
-	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}-1.1.5.initd ${PN}
-	systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
-	echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
-	systemd_dotmpfilesd "${T}"/${PN}.conf
-
-	dodir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-
-	dodoc AUTHORS NEWS README TODO
-	doman ${PN}d.8 ${PN}.conf.5
-}
-
-pkg_postinst() {
-	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
-	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
-	elog "cache is moved to /var/lib/minidlna."
-	elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
-}
diff --git a/net-misc/minidlna/minidlna-1.2.1.ebuild b/net-misc/minidlna/minidlna-1.2.1.ebuild
deleted file mode 100644
index 40ee4bd7a8c7..000000000000
--- a/net-misc/minidlna/minidlna-1.2.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils linux-info systemd toolchain-funcs user
-
-DESCRIPTION="DLNA/UPnP-AV compliant media server"
-HOMEPAGE="https://sourceforge.net/projects/minidlna/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
-	https://dev.gentoo.org/~xmw/${PN}-gentoo-artwork.patch.xz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="avahi netgear readynas"
-
-RDEPEND="dev-db/sqlite:3
-	media-libs/flac
-	media-libs/libexif
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libvorbis
-	virtual/ffmpeg
-	virtual/jpeg:0
-	avahi? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-PATCHES=( "${WORKDIR}"/${PN}-gentoo-artwork.patch
-	"${FILESDIR}"/${P}-buildsystem.patch )
-
-pkg_setup() {
-	local my_is_new="yes"
-	[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
-		# created by above enewuser command w/ wrong group and permissions
-		chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
-		chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
-		# if user already exists, but /var/lib/minidlna is missing
-		# rely on ${D}/var/lib/minidlna created in src_install
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
-		-e "/db_dir/s:/var/cache/:/var/lib/:" \
-		-i ${PN}.conf || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-db-path=/var/lib/${PN} \
-		--with-log-path=/var/log/${PN} \
-		--enable-tivo \
-		$(use_enable avahi ) \
-		$(use_enable netgear) \
-		$(use_enable readynas)
-}
-
-src_install() {
-	default
-
-	#bug 536532
-	dosym /usr/sbin/${PN}d /usr/bin/${PN}
-
-	insinto /etc
-	doins ${PN}.conf
-
-	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}-1.1.5.initd ${PN}
-	systemd_newunit "${FILESDIR}"/${PN}-1.1.2.service ${PN}.service
-	echo "d /run/${PN} 0755 ${PN} ${PN} -" > "${T}"/${PN}.conf
-	systemd_dotmpfilesd "${T}"/${PN}.conf
-
-	dodir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-
-	dodoc AUTHORS NEWS README TODO
-	doman ${PN}d.8 ${PN}.conf.5
-}
-
-pkg_postinst() {
-	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
-	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
-	elog "cache is moved to /var/lib/minidlna."
-	elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
-}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 43cde5b616e6..e9d5c9a4ab42 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,7 +1,5 @@
 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
+DIST miniupnpd-2.1.20190408.tar.gz 235989 BLAKE2B cdfb4fe23a136d9a3e0cc91c174fc4f0ee0a3e136305a2ea6d21c358287f67d34009b37ba8870bef86e53d056e441b45e19a89939e72485051245b5d40b384ff SHA512 f812660c1f626f1fdbcaabd6636125cc18f1306bb4a3a29dae45c06017c97c681e3e056d602fe5444962ecc1aec4d39d9c203621bb11a3aa1f57cda6dc4f19de
+EBUILD miniupnpd-2.1.20190408.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
deleted file mode 100644
index 673b340fb090..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190403.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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/miniupnpd/miniupnpd-2.1.20190210.ebuild b/net-misc/miniupnpd/miniupnpd-2.1.20190408.ebuild
index 673b340fb090..673b340fb090 100644
--- a/net-misc/miniupnpd/miniupnpd-2.1.20190210.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.1.20190408.ebuild
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 66456d9cf418..0689366b8373 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -2,6 +2,6 @@ AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f56962
 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-r1.ebuild 3646 BLAKE2B 60a6a68622061f6c9e3bbdd4d4ef2af42fecac6b2dcb02e3abb692608c6418d7f551f07d01854f0d0c0b04d0b7b4ac77ab494f5ff06380dc7cb68a13f8b61f6c SHA512 cacd9f4e00e5fe6ec6631a984bdce57fd6fefdf800260e095ed33e58b0408e2c060e180ada88e35ab7bb362f0438e2cd2e9cc17a8712787fdea280dac2c3c797
 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.8.2-r1.ebuild b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
index 3be876945d80..80aac4f17fce 100644
--- a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
 REQUIRED_USE="
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 72dfa499d39a..d5fa3cd011df 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -5,7 +5,7 @@ AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11
 DIST NetworkManager-1.14.4.tar.xz 4414196 BLAKE2B 31b236ee143892725cccccfe26a83bc75f938e19f52c5d09fb6ea3635f517feb5bab428eec4ee5e617920a8a8dd6bfe72bf9b760ecf16dec0bac4bb8663c58e4 SHA512 4199d6d7bbbee318b0f69cf2c1bf46cc3721c764121634751753c3cc833c4c5ac0856467896536e3d403ba8783fe452aaa79bfcd71a5ec324a4274989fb656c7
 DIST NetworkManager-1.14.6.tar.xz 4426540 BLAKE2B 29709005f4143bb4a9ef2348c2da062ea741111bdd54400f199e057317dff12fe9b0d3ab7795b21e93217076a0b338a18d99c7d2c2514d138aaf5bf41aa71c5a SHA512 e5e11eed6366eb185691102c89732a458f3a01aa979e724f7415d237e0ba1a811ac78bb17d9cf1b11181ec6e3f82cb5f1c86b624d3c2b2c7c1b72549653309c9
 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 11126 BLAKE2B 6a87159301d369bfb66372c0f6c727f43a2d13bc4994467da365e42901cff26c7066a7c93dec6cfa8216cbeead0297dd603c685f76a637dad4a5ad19c9de904f SHA512 4fa88351f92efdaad305c9430c8b3325d39a756c9c5dda87c63bdf5c8cb2f00874e057cfbca2fb9f8c02c3e400bde24a873cef6f3e9f4a6dbd98f4eee7b1e2f3
+EBUILD networkmanager-1.14.4.ebuild 10961 BLAKE2B 8b80e2ef690c5ad568207e4a979929b83dec81e2b842f0c480f0ed2c93f15f2e46f66833c6f6368b1514a0b6b4bdd05cffd268ca0bb9c238971100cb4039a546 SHA512 33f60cd12c1d582c5153ebd5df9d0ceeb1b24f318091307085ee058c44bb17fca280b45f8e4af0759c54b813436a88468419a607d14f53406487d642c42cc6e7
+EBUILD networkmanager-1.14.6.ebuild 10962 BLAKE2B 451a738b84a61d29539925cabbd6b6ce452c0cfb7ad3108879bcf00dc4ab3461c38df20ff81282ef8f3ddf2ea79e8ce87e557300e3fe82c5f79908a46c6e4326 SHA512 7de4542451ed42b23d81e724ed4840350d0df0151667f0e6239437d85c1eb42a64dfea2411262dca1be2d61d58a111b3afcd3c6885d44417df47256579eaa98c
+EBUILD networkmanager-1.16.0.ebuild 11118 BLAKE2B 66cfd9975554f7d151d824ff2434837d83cc4d0bc53b1010a27cd93c33d5c8b0ae110007a0ab74e098ebec36d244fcda7b956ae1c5ab7187696f1e58b9313b07 SHA512 29aa818a18eb39fab1ed7abffe5951bf57d5affdbb6f58998a44d9a6e8fe96b2a12a5d082f109681e22c1554fa9bf874ebae8ed181f550054a13e9e1df32c110
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.14.4.ebuild b/net-misc/networkmanager/networkmanager-1.14.4.ebuild
index f23ac591aa4f..e613de346121 100644
--- a/net-misc/networkmanager/networkmanager-1.14.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.14.4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME_ORG_MODULE="NetworkManager"
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
 	user readme.gentoo-r1 vala virtualx udev multilib-minimal
diff --git a/net-misc/networkmanager/networkmanager-1.14.6.ebuild b/net-misc/networkmanager/networkmanager-1.14.6.ebuild
index 9ebefce82102..d04bc3811935 100644
--- a/net-misc/networkmanager/networkmanager-1.14.6.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.14.6.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME_ORG_MODULE="NetworkManager"
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
 	user readme.gentoo-r1 vala virtualx udev multilib-minimal
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 ~sparc x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/networkmanager/networkmanager-1.16.0.ebuild b/net-misc/networkmanager/networkmanager-1.16.0.ebuild
index 4e450bdaba30..c4d8b313b97e 100644
--- a/net-misc/networkmanager/networkmanager-1.16.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.16.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 GNOME_ORG_MODULE="NetworkManager"
 GNOME2_LA_PUNT="yes"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
 	user readme.gentoo-r1 vala virtualx udev multilib-minimal
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/ntpclient/Manifest b/net-misc/ntpclient/Manifest
index 3e4972763d41..f8542b979971 100644
--- a/net-misc/ntpclient/Manifest
+++ b/net-misc/ntpclient/Manifest
@@ -1,3 +1,3 @@
 DIST ntpclient-2018_244.tar.xz 108056 BLAKE2B 52c554fe238521e8820111a19220a532406137b2e21c67558fd8252ea2e4d60a7827f4acd1a2868f7a7f6f09c7b25c4267f4cd28773088a12132fa580b02bb4c SHA512 4c1c7e1088365679182507e21386bcf670713aed4b636687fbbe226219fdcbc25e27e2369912a78c662058cba9b6b409fb90978315806a3ed5ea59c70133e4bc
-EBUILD ntpclient-2018.244.ebuild 765 BLAKE2B e09055ccd0a2ecfa73a0483bd3d69fd15112564562ecdaaa67b22aaca72e56680afd57d6907b63fb36fbfbbc84ef1263fae2aff35dad170047004e12ac89b357 SHA512 f8135e6e64bf44e9d7bbc9a2d258c691c8477147002f286bff961ec6828d479d3c84577639d033c71a303c344d93619b9677f0929a0d44edca60423913cfd3a0
+EBUILD ntpclient-2018.244.ebuild 772 BLAKE2B 8e0972d3e6c71a5f9378c842eb5021b8c769922e2a4774157741fff1db1efcb7347fa7bab932ab8289e3ac045de95b0ddde7b8e0f5cce3b848716de8f510ec09 SHA512 586bd3a631505608342bb6e10094d178433c7dc35e1fe7876c641dd7544817449aa3e2b0a5565efd6bda5807e85aebe86b296a6c2899cc775c9ce1dad23bba76
 MISC metadata.xml 1258 BLAKE2B 60a9f7c14c15b49d19acb728c55a2a695311d50232e6bb143315a81400cdc990af3b5e1f3699c7b225fd76f6c0725a6e7cd62f0c49091ccd47222bf6e96f0ea1 SHA512 dc7d72c25206360f89ac0b8cd210a6b13346a6a183a92eb4a279059cc07b372d49d7a64808d4db5fb638781d9c16fc33aca21dd02ee2fc40894f2ce6195e4a64
diff --git a/net-misc/ntpclient/ntpclient-2018.244.ebuild b/net-misc/ntpclient/ntpclient-2018.244.ebuild
index 250810343f15..d08492748a1d 100644
--- a/net-misc/ntpclient/ntpclient-2018.244.ebuild
+++ b/net-misc/ntpclient/ntpclient-2018.244.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="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/troglobit/${PN}/releases/download/${MY_PV}/${MY_P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="debug embedded obsolete +syslog"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 7558dcd3a17b..852edb32f78c 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -6,8 +6,8 @@ AUX ntpsec-1.0.0-fix-seccomp.patch 587 BLAKE2B c937a12ed548a4d825964c66e37faebb3
 DIST ntpsec-1.0.0.tar.gz 2405862 BLAKE2B b1631491500cafa5d41761fe6cb2db523450ed7801d06678048d6b8878d93dbd1e9d7cb2081a8400421213cf78a6724220236149a7f719896d1e8e48f5337d85 SHA512 9fb06310508b30d2ae2d66212d7d87b00e8eea294cebc27eb70435d764bd639fcec234b66e78deafb700476c88e47afe2d1b463563008c32efbb0644dd611f43
 DIST ntpsec-1.1.1.tar.gz 2451415 BLAKE2B 516c87f0710ecacfde27f801a5fc4a492e7871eb35cc3afb8a107e0c381cd9787a4af2d0b01e2cf5d4f43043afe042321e5bbd2299578723e870b2fa502646d2 SHA512 838ed81c94e14a3d8588670ce63a1c4f6216d2f79be5149ad6a845cec00bdf6d7fe77310ce9c33c4675d3db54e59c3d9d02ae4351913ffbd9a3883716c443f83
 DIST ntpsec-1.1.2.tar.gz 2458805 BLAKE2B e9ab493f60179ce94a5995287423c3a0038298b622b0dcffd5a299261a7b42fc8d0d04256726e049c625c0789882f601615eaa7169047e984a274f62e0cf40d2 SHA512 83d2d3bc59202f1e5f3e76eeb6810e575e24c6f392f20c25732a6881a0a0a9f72453b76b294399351ec4baf88bc64da089dc1340aee38576021659f81bcd0e19
-EBUILD ntpsec-1.0.0-r6.ebuild 3984 BLAKE2B d1752c19aedecd7cb4a7522ab4f4adbc6c86daf0a3d33a45aa81f501142b0daab5e66785362f751d3603f21fdab66c17a22304365db99af5dd808ae6beccc95a SHA512 fecd7e354283d83be97445a4d7dd36e103f56e123519bbfacfd2983d8e94953dcafc461d97a628be7b019e06a989ef1778afa1af63a41d2e42b61023debc92a9
-EBUILD ntpsec-1.1.1.ebuild 3943 BLAKE2B 9285726a6f69db99dcaaf094d70dc7cdef2094312622409726b8efd079e4d25b461c582d05a38bfd8446a3ddafe48a97adb3db0d1ba7cc60dba57a25de508784 SHA512 fffa219833786776ddc3af23fea0f1a3b7bd9a189b8072829039560b4324c11a0d885e16b93c187bf972163ed654a82cdd819498125ed097b8bd79b03456b40e
-EBUILD ntpsec-1.1.2.ebuild 3943 BLAKE2B 9285726a6f69db99dcaaf094d70dc7cdef2094312622409726b8efd079e4d25b461c582d05a38bfd8446a3ddafe48a97adb3db0d1ba7cc60dba57a25de508784 SHA512 fffa219833786776ddc3af23fea0f1a3b7bd9a189b8072829039560b4324c11a0d885e16b93c187bf972163ed654a82cdd819498125ed097b8bd79b03456b40e
-EBUILD ntpsec-9999.ebuild 3943 BLAKE2B 9285726a6f69db99dcaaf094d70dc7cdef2094312622409726b8efd079e4d25b461c582d05a38bfd8446a3ddafe48a97adb3db0d1ba7cc60dba57a25de508784 SHA512 fffa219833786776ddc3af23fea0f1a3b7bd9a189b8072829039560b4324c11a0d885e16b93c187bf972163ed654a82cdd819498125ed097b8bd79b03456b40e
+EBUILD ntpsec-1.0.0-r6.ebuild 3979 BLAKE2B b1333fab50369c29a4912e72148f304a89f35fdbec7d61bcd236fd8ad07d791202f676921876ab4650a0ec63b3bae7042f4963eb22da301b6abf02c392cc6ff2 SHA512 4ee90ef0c4f0111cd05baead4fb79cd461e44e42e6915259ebf9d1d9e1c1fa07f79d47dbe4c9ff4c7042959d1c3ae94b9a7d8751376c162f6cb7791719fe6e7c
+EBUILD ntpsec-1.1.1.ebuild 3938 BLAKE2B 9970361b96e50918581964845df8b504c442cf01fa907692c68915a2d126573df054126987ab3d2690c8c7c7fd4b60579050bdb1f7a803986dbb957dda5cd745 SHA512 18929aa55a1ad09103ad4cffa9f06e60a9ef1ba0542729f9af5c3012a64f02557a3b90494fe39a3a9b6140a225794508f0f1de6f38bab0b9d990791708d69526
+EBUILD ntpsec-1.1.2.ebuild 3938 BLAKE2B 9970361b96e50918581964845df8b504c442cf01fa907692c68915a2d126573df054126987ab3d2690c8c7c7fd4b60579050bdb1f7a803986dbb957dda5cd745 SHA512 18929aa55a1ad09103ad4cffa9f06e60a9ef1ba0542729f9af5c3012a64f02557a3b90494fe39a3a9b6140a225794508f0f1de6f38bab0b9d990791708d69526
+EBUILD ntpsec-9999.ebuild 3938 BLAKE2B 9970361b96e50918581964845df8b504c442cf01fa907692c68915a2d126573df054126987ab3d2690c8c7c7fd4b60579050bdb1f7a803986dbb957dda5cd745 SHA512 18929aa55a1ad09103ad4cffa9f06e60a9ef1ba0542729f9af5c3012a64f02557a3b90494fe39a3a9b6140a225794508f0f1de6f38bab0b9d990791708d69526
 MISC metadata.xml 2008 BLAKE2B e4f1a7e79fbaf5011ba2b26143c138f39663be73664ec9f1270e9b6cbcb553c245201c9a5bd0771435a24e1f342907861e8a2b6808cc2e3f6d6a7a10ad6ed021 SHA512 5c8fc24233d577ebc254a6d92d93734bfb10ef287217ef61f4f6e8b28f059ee7e92bc5e18326d61a9e80fa7504f79c820d831cdad489321a9f45bae0a4d54a16
diff --git a/net-misc/ntpsec/ntpsec-1.0.0-r6.ebuild b/net-misc/ntpsec/ntpsec-1.0.0-r6.ebuild
index 890ec4f7ebf4..8a60622902ea 100644
--- a/net-misc/ntpsec/ntpsec-1.0.0-r6.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.0.0-r6.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-r1 waf-utils systemd user
diff --git a/net-misc/ntpsec/ntpsec-1.1.1.ebuild b/net-misc/ntpsec/ntpsec-1.1.1.ebuild
index 46234cf71a8b..446753553564 100644
--- a/net-misc/ntpsec/ntpsec-1.1.1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.1.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-r1 waf-utils systemd user
diff --git a/net-misc/ntpsec/ntpsec-1.1.2.ebuild b/net-misc/ntpsec/ntpsec-1.1.2.ebuild
index 46234cf71a8b..446753553564 100644
--- a/net-misc/ntpsec/ntpsec-1.1.2.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.2.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-r1 waf-utils systemd user
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 46234cf71a8b..446753553564 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.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
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit flag-o-matic python-r1 waf-utils systemd user
diff --git a/net-misc/nyx/Manifest b/net-misc/nyx/Manifest
index a430548bc086..89d99394a17c 100644
--- a/net-misc/nyx/Manifest
+++ b/net-misc/nyx/Manifest
@@ -1,5 +1,5 @@
 DIST nyx-2.0.4.tar.gz 4074259 BLAKE2B 92296a319947803195a6ae3991f1991c9ee5dc8293144b31d143995a0b897e89812d4b012c330cb2d9e7ee2d2dbbc0ab0bbeb49135ec7e302aefde2dbe8159de SHA512 bb64b6c38bbfc9837215503a69b4a6b7a11b8a1e230f42c51a405472689a3d46d74dd06b2417c90512b63e9605b33198c5132b660f9eca037016a39c5e4f0ecf
 DIST nyx-2.1.0.tar.gz 6908817 BLAKE2B e67305c0e2a066976cc828235bb364a238af2842251b466cc70bf8ad79138ffb5d6c598cf5900b777caf03ffefd0566e9eccfb65131ca0dc26670d71d8f9a756 SHA512 69a645cc811a1b1fbd9cf0501d8f23f1a52e0e92a0598097bb0c9efb040e1895e1dd431bad93be36db0e85ca7ac32ee5c866d50d2812069a39e5160b44575a37
-EBUILD nyx-2.0.4.ebuild 638 BLAKE2B b1e8e29f6c828e0542f46ea48ed2bb43ccfb422555813af9f9d6074489e19f3f939d81a37bb3d4c79f297c7299414294d35d4cc1fd84d9ff6c5211d1ffb4137c SHA512 06f90b0cb50d4ff5c8be27002c21eea2919230c911b1aee10f69f2fe78a4db866967044a9e94f9289ffbae486a0698f8addd5d42bb2bea3382a159b0aafa9611
-EBUILD nyx-2.1.0.ebuild 638 BLAKE2B 926733e64c1526f4015861973d913c97dfc8031416cb8762f5caaf6a6f88a2ee2920515daf666f8335b696bb3472d897e569eac7874aa054173a6b57e93cb9f8 SHA512 f83040a8ad770ec7e26b7595e9246882681a9ec18c6906ac9827a6eb9c10d3b1f83a9f49c8ccb7a03efc0ba00981b0c58c2c168f3189f0558f30f3ccf1604c9e
+EBUILD nyx-2.0.4.ebuild 634 BLAKE2B 4216513d1e985e055c845282ac97be85e930d17ed6e1bdb0f7b57b16f2809f446b22fa6bfdd7b426f60a944773ad23a5b23f2fb0c8f54c5e7b2a3f6f39956515 SHA512 9d5c569a53a70de0a2274743f843b6895d11501f4953c8ed1e325fe4ce6ecc10064902c4d104813494594096fd69cbcb9704efee3702cc8e04b21b2b4405d066
+EBUILD nyx-2.1.0.ebuild 634 BLAKE2B 4216513d1e985e055c845282ac97be85e930d17ed6e1bdb0f7b57b16f2809f446b22fa6bfdd7b426f60a944773ad23a5b23f2fb0c8f54c5e7b2a3f6f39956515 SHA512 9d5c569a53a70de0a2274743f843b6895d11501f4953c8ed1e325fe4ce6ecc10064902c4d104813494594096fd69cbcb9704efee3702cc8e04b21b2b4405d066
 MISC metadata.xml 328 BLAKE2B 388fd17862250e1c6df6dbcd5c29030fa6dd4ed70b8ba4e844fd9d1411f1f777bc5b448a7b52c177d5cb163e0e68976bbae55375da3c41c8e1a1719fd0fd96a0 SHA512 65455e32f59242a36f241e854624f0c38bcbe69cc70eafe39e8df6fbd6e000faf58d04a0310d018377d3440ad55a282f1bc8dbf83fa411221f13068675944737
diff --git a/net-misc/nyx/nyx-2.0.4.ebuild b/net-misc/nyx/nyx-2.0.4.ebuild
index a27cb04c7b15..3dcf66f5f51f 100644
--- a/net-misc/nyx/nyx-2.0.4.ebuild
+++ b/net-misc/nyx/nyx-2.0.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 inherit vcs-snapshot distutils-r1
 
diff --git a/net-misc/nyx/nyx-2.1.0.ebuild b/net-misc/nyx/nyx-2.1.0.ebuild
index 32e8fbd725b6..3dcf66f5f51f 100644
--- a/net-misc/nyx/nyx-2.1.0.ebuild
+++ b/net-misc/nyx/nyx-2.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_5,3_6})
 
 inherit vcs-snapshot distutils-r1
 
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index 9814492a9dc4..d3988ca28721 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -1,12 +1,8 @@
 AUX ofono.initd 418 BLAKE2B 0a0f8894ec52b7213e46c8a1474f1a6061324f6e31842910e241e40e88fdb92c15560f9a8744922fea9cf83114a242315de910fe849918e9e26f7b8ce63831ad SHA512 ef86f8e4d3b30d98eee5849c85fd8fd1bed0d8ac9c76bcce91440483439dbaea36e1ff3529fe8f5c1b0255a91917ab67d98513cafcae8f0031cce1bf3f133704
 DIST ofono-1.16.tar.xz 854296 BLAKE2B 4ee8f895e21903b8181fe14f5a91fea466eb3a2f66c8a5ab270a8dd81c601dc5e2a1beae368cf0f14b556f0dfb8301439d40d93bfd1d058d43ce864cdd1f0788 SHA512 21887e1bc3b8af18881f9456f950b97885b567164e28ebe2ab6fc5a3042c439891a20b5034a8fa0c7a78567286ac53c1b8a72122f428fbcf5da8bf139423b913
-DIST ofono-1.20.tar.xz 935448 BLAKE2B 751f6c340cf95dd4ab6f3d17f81a967406b3f6cc4d6024435aba1e663a220a47d14f04d62b765205bf04f11a9b5b0075501dbbaaa22f9380ffb0ef3a78fce5ec SHA512 8dc86654ae8a1dc1761c95df5f0de55566db20012e523f11bcd5ab5e1540f4cd9fc7bd6bf1665dcbeb31f2925f9322c21fd05fb00034e408b5d85b265e2fe840
-DIST ofono-1.23.tar.xz 978472 BLAKE2B 0bd0b7921df075f0ea35d61d4ea852dad0bc752802263f8525e697f3b23e555488116918fed8f143c95ae6fc919515cbb06d0644f7119225076d1fe7c5be1f52 SHA512 103dc28f9a6c583804884bdb891424eb53323b5edf764edd6c64e0b6c76ee6ea063c6a1d1d36a35d4ae6740e00479e2fc0abc6fca1dc92b916e166d48a1642fd
-DIST ofono-1.24.tar.xz 980644 BLAKE2B 74974ab104cc31a67ec04c62149e282de5295573e1b236b39da8005721c8277a0636fd290aaa3c6380eb117364d2098af856f22ce9f6d41af599c5bf78bf98b1 SHA512 d3148df4bcac60c0f12bc4665e170e92d35473a7ff9fc516bd6a3c35c3e9b6f9beadc624ac9bbdfb9de2876e4ab417d857bd52b27a634f433f3607a7e11381c3
 DIST ofono-1.28.tar.xz 1016308 BLAKE2B 0aec5bc6c845c0906548f62bda95bfee5ca5ef17bc2defd60fe4b0967b9f58fcbbbfeb9593aa33f6852360266ea4ea025a87a07ac95ef50829b592accfb5bc72 SHA512 963471fac89db746d0e99fee805413342203be0d200bc14f0e56c5ec3053e25ea8112943657c88c57c539ae485ac11eb5f80052aad12443c248888f6e6a4114e
+DIST ofono-1.29.tar.xz 1019512 BLAKE2B e073f324c58fee1beac31ba685d92ee85814ccb072aaedc0fa2d0d25419d60449557fcabd0e1b3e5aad6c349582a2abe6fb69094f36b61dbea0f94ed0f8dff4e SHA512 14c3cd3a7ee134dd85f286e3ce47914a10c48a9a2bbbebd0d2715334f233a9b7e4e01bae5a151e4f4b3fb3e98eab96ba345f3fb2c2960d2f9c0645f36c218a99
 EBUILD ofono-1.16.ebuild 1610 BLAKE2B 4da501cec1347a1a745732f2ad1a8db28234eab5c828be18a1d493ee83a18dac95dbb0588fd9b56b7d06e54054d8e5134ca3dcdd123d959038955b6327c86ad1 SHA512 b3bd40291d278fe831a1aa4d50ca7c6a79ab32f61f6b54a961e80b4929b620b17344c76c4d1e555a110f51036231c5b4d1af2a7e1c77736e06129b1909c8de24
-EBUILD ofono-1.20.ebuild 1668 BLAKE2B 45171e8d0582a35853b59a39eee4e42471d83ad0416144695442ed3a5a4ed766d87caaf6fcac2b529a2579dd178c9f63baa9dca86db083aeaccd066915c1296e SHA512 7bc146aa1ca4fe35a1899ea724c1e44cc42badc9e9e91c69e3a7ef01fbbf8e47be69a9b1e5e1074c5327d2e807a33f4388ca2d43dd0bf56164be55b402607a75
-EBUILD ofono-1.23.ebuild 1668 BLAKE2B 45171e8d0582a35853b59a39eee4e42471d83ad0416144695442ed3a5a4ed766d87caaf6fcac2b529a2579dd178c9f63baa9dca86db083aeaccd066915c1296e SHA512 7bc146aa1ca4fe35a1899ea724c1e44cc42badc9e9e91c69e3a7ef01fbbf8e47be69a9b1e5e1074c5327d2e807a33f4388ca2d43dd0bf56164be55b402607a75
-EBUILD ofono-1.24.ebuild 1668 BLAKE2B 45171e8d0582a35853b59a39eee4e42471d83ad0416144695442ed3a5a4ed766d87caaf6fcac2b529a2579dd178c9f63baa9dca86db083aeaccd066915c1296e SHA512 7bc146aa1ca4fe35a1899ea724c1e44cc42badc9e9e91c69e3a7ef01fbbf8e47be69a9b1e5e1074c5327d2e807a33f4388ca2d43dd0bf56164be55b402607a75
 EBUILD ofono-1.28.ebuild 1631 BLAKE2B e26874eb6c985a5086848b05f1fe1b5a74e0ea57eeea9ca154a7fd2b2977bb0e0b400399f6809e9817eb45182f9b51560bbdc1bf74759b6ec798280cb56b76c2 SHA512 9b1876aff74fda25f6f61842e7a97e97ca06530c759e2ef00e88632db6f88738d0540993866445bd09910eb6953b055469a2dca635c7a536c4fdea723e1b3953
+EBUILD ofono-1.29.ebuild 1631 BLAKE2B e26874eb6c985a5086848b05f1fe1b5a74e0ea57eeea9ca154a7fd2b2977bb0e0b400399f6809e9817eb45182f9b51560bbdc1bf74759b6ec798280cb56b76c2 SHA512 9b1876aff74fda25f6f61842e7a97e97ca06530c759e2ef00e88632db6f88738d0540993866445bd09910eb6953b055469a2dca635c7a536c4fdea723e1b3953
 MISC metadata.xml 951 BLAKE2B fd63ccff3b96dea1e770b7ec50c1a9e5e583fe81bcb2ca9c1915386a4fbd85a30c806f9ac3e163b1110e93b44f6714c555cee9273ecf90d5a9f9e209f0774897 SHA512 26f8b8b3ac43991d14534b4b1257a5c4dc1dd0eaca83c9f30aab74bbc721d9573e93e8f245a4ac2d0805ea9325aa759ca144951fef1b158b0b68f54df4df3e7e
diff --git a/net-misc/ofono/ofono-1.20.ebuild b/net-misc/ofono/ofono-1.20.ebuild
deleted file mode 100644
index 2978ac9372eb..000000000000
--- a/net-misc/ofono/ofono-1.20.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib systemd
-
-DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
-HOMEPAGE="https://01.org/ofono"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem threads tools +udev upower"
-
-REQUIRED_USE="dundee? ( bluetooth )"
-
-RDEPEND=">=sys-apps/dbus-1.4
-	>=dev-libs/glib-2.32
-	net-misc/mobile-broadband-provider-info
-	bluetooth? ( >=net-wireless/bluez-4.99 )
-	udev? ( virtual/udev )
-	examples? ( dev-python/dbus-python )
-	tools? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS )
-
-src_configure() {
-	econf \
-		$(use_enable threads) \
-		$(use_enable udev) \
-		$(use_enable isimodem) \
-		$(use_enable atmodem) \
-		$(use_enable cdmamodem) \
-		$(use_enable datafiles) \
-		$(use_enable dundee) \
-		$(use_enable bluetooth) \
-		$(use_enable phonesim) \
-		$(use_enable provision) \
-		$(use_enable qmimodem) \
-		$(use_enable tools) \
-		$(use_enable examples test) \
-		$(use_enable upower) \
-		--disable-maintainer-mode \
-		--disable-rilmodem
-		--localstatedir=/var \
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-
-	if use tools ; then
-		dobin tools/auto-enable \
-			tools/huawei-audio \
-			tools/lookup-provider-name \
-			tools/lookup-apn \
-			tools/get-location \
-			tools/tty-redirector
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use doc && dodoc doc/*.txt
-}
diff --git a/net-misc/ofono/ofono-1.23.ebuild b/net-misc/ofono/ofono-1.23.ebuild
deleted file mode 100644
index 2978ac9372eb..000000000000
--- a/net-misc/ofono/ofono-1.23.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib systemd
-
-DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
-HOMEPAGE="https://01.org/ofono"
-SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem threads tools +udev upower"
-
-REQUIRED_USE="dundee? ( bluetooth )"
-
-RDEPEND=">=sys-apps/dbus-1.4
-	>=dev-libs/glib-2.32
-	net-misc/mobile-broadband-provider-info
-	bluetooth? ( >=net-wireless/bluez-4.99 )
-	udev? ( virtual/udev )
-	examples? ( dev-python/dbus-python )
-	tools? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS )
-
-src_configure() {
-	econf \
-		$(use_enable threads) \
-		$(use_enable udev) \
-		$(use_enable isimodem) \
-		$(use_enable atmodem) \
-		$(use_enable cdmamodem) \
-		$(use_enable datafiles) \
-		$(use_enable dundee) \
-		$(use_enable bluetooth) \
-		$(use_enable phonesim) \
-		$(use_enable provision) \
-		$(use_enable qmimodem) \
-		$(use_enable tools) \
-		$(use_enable examples test) \
-		$(use_enable upower) \
-		--disable-maintainer-mode \
-		--disable-rilmodem
-		--localstatedir=/var \
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-
-	if use tools ; then
-		dobin tools/auto-enable \
-			tools/huawei-audio \
-			tools/lookup-provider-name \
-			tools/lookup-apn \
-			tools/get-location \
-			tools/tty-redirector
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use doc && dodoc doc/*.txt
-}
diff --git a/net-misc/ofono/ofono-1.24.ebuild b/net-misc/ofono/ofono-1.29.ebuild
index 2978ac9372eb..ca819ad691d5 100644
--- a/net-misc/ofono/ofono-1.24.ebuild
+++ b/net-misc/ofono/ofono-1.29.ebuild
@@ -1,7 +1,7 @@
-# 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 multilib systemd
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem threads tools +udev upower"
+IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
 
 REQUIRED_USE="dundee? ( bluetooth )"
 
@@ -30,7 +30,6 @@ DOCS=( ChangeLog AUTHORS )
 
 src_configure() {
 	econf \
-		$(use_enable threads) \
 		$(use_enable udev) \
 		$(use_enable isimodem) \
 		$(use_enable atmodem) \
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 22cf9df58c1f..9a2fb38632f2 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -19,6 +19,14 @@ AUX openssh-7.9_p1-hpn-openssl-1.1.patch 3160 BLAKE2B fdf063bfd7855879a3cc8765d8
 AUX openssh-7.9_p1-hpn-sctp-glue.patch 597 BLAKE2B d7ac82653c48467ebdc59e1444eead84d3de8cdd93acda6361cedd0cc1e2969e52610c10075463ade71e4c1bb1fcb243bd34d11d6c21cd4c500b6743dc628770 SHA512 4742112e3d0e7463d9194a5ab068d3b6cae6bc4a9b5755599d49a13db514014c7d406c16c7ff59197917b5c152b2a54d15323d88de942215fced4c628cacf2c0
 AUX openssh-7.9_p1-include-stdlib.patch 914 BLAKE2B 9c7eb79f87ecd657a80821dfa979d8b0cc12a08d385ec085724f20aa6f5332593ffc7481bb9f816e91df3eb4d75d8f7b66383ff473d271270de128c3b2bf92e5 SHA512 7dade73bdafb0da484cbd396b4a644442f8ea12fef54c07e6308ae2e73a587fa4ddf401e8a0c467469b46fe7f00585e047462545182924c157b4d3894c707a70
 AUX openssh-7.9_p1-openssl-1.0.2-compat.patch 514 BLAKE2B e3859c2bed0e4116e558e7ea8c4679a8666316c26a650acd93ea023444bf69fafad6eba47a6faef7c017d812da76fe93a291e51c427ddecc1fe89bd362758403 SHA512 dde28496df7ee74a2bbcf0aba389abefade3dc41f7d10dc6d3c1a0aca087478bafe10d31ec5e61e758084fa0a2a7c64314502091d900d9cee487c1bdc92722a6
+AUX openssh-8.0_p1-GSSAPI-dns.patch 11634 BLAKE2B 80c304f2a8df328b77a4531bc499bbc83c378007bfd01412a3c879d8a45aa26a68d3fb2b9469f037ec37e5d54fa22aa87c5f963329fb67a16690dcb30407eec9 SHA512 075e0734a15f593a641e3fbc49c7502dc75722501ce6762f0df7a5b5fafb3cceaff05ad9e0bdcb3636b4bb20cf6e680cc20e8d242b6de9b7cec972ba12118ecd
+AUX openssh-8.0_p1-X509-12.0-tests.patch 531 BLAKE2B cfb14747ed4e39d11d7727b779753ddf5f7e94be56d1dbe0a76131d8434dd4453c253467ec1eb7cac49a50f5a3f81c82b804926f46dc79ed09c252397ac9d349 SHA512 7f1322a94aa79c822a8bede36a92fe48dc6b9bf7ceca3068450877b543a1d186031060d642c7d689c02e06ef3e038eae9739deda53c6401439ed20808e82ff10
+AUX openssh-8.0_p1-X509-dont-make-piddir-12.0.patch 814 BLAKE2B 596967e4b13d59b1fedff8fbdde7b824bf495c10d4386510b04d38cc518ea18b4dba90ec0b26692634858b39ae964865791f829a52350a9f122e7104ca4a32c1 SHA512 68b8e9235626594eb022f4bb67f11fbcc2a0236377dc26900be17d22b9aa33f1e72bf8aed868ef9f98f8a45d1a2e626411ae08dfb12575015368350a2511fda9
+AUX openssh-8.0_p1-X509-glue-12.0.patch 825 BLAKE2B 9fc0b5b291551d55770bddcf23d44601d15cbc23a6d8f0795cd064f53e1bc2e49056b23b2d7db0aa25e31e8b68c71ef476cb926a7efa765edf81440489711225 SHA512 edd8c0bdc3b90f7afce8eb5d91ec1344b6e22fc9d16787f63eaee9a576178f5e0b4937fb0dc2640779c049a9102ece63360fef4f690b09894ec46995e0f5ebe2
+AUX openssh-8.0_p1-hpn-X509-glue.patch 3814 BLAKE2B 9a0071d13bb602f9b0660dd74d0ae59611a0d8b8c13fab7def2ea840d1ea42bb4c0999ef44e86db2e8246c6e803797a70f9b18016da491598991052854659c03 SHA512 a986c012aa58a4764d3c4c4a5bf5d1e69edb156adf18d7e9ccae0508879da8b3e92a884d6dcfa80ec5b02d41e7784d8eb500128925ae5cee0ca948cf6bf50ba2
+AUX openssh-8.0_p1-hpn-glue.patch 7029 BLAKE2B cf6fb2c59b768aecf846f0d037ae6d48f750e742f93cdd00a62caf04dfafd993e05921f5d227014e9437d3cdfff4e1b9baa832997904bf398ba06e8f874f7ceb SHA512 63eb0b12763ab53946a9f6b9db44c428d9da8b781a6e1d3f5c4b0edfca85d986cf932461205cee84f9a9db7725c9e05eb1d366b357c787a95c561bdc6514d3d7
+AUX openssh-8.0_p1-hpn-version.patch 590 BLAKE2B 1ff20ab17e7e1a20f7a96ded56ff7c059fd509d7773d9abaeac83743102385d9713284c630dc932d40672a9bfc8a894b57c6b073e93a7b024de7490ea54a589c SHA512 37250881f17a44e4a4b0ac164d06961e0731528847d5cbbb263e3f9a286a192c8dae92250b85db3f2e1f280a464c7b3bfc8a7c9e85552375c013e16a6fcf28ed
+AUX openssh-8.0_p1-tests.patch 1493 BLAKE2B 2e28d9f27d6d9f7e1716cf5f85bbb92af96faf8842e0047d79262a36f5273cd9252bfc576a22e4fc5523942eb7dea80d968045fea317e523d430373c59160ed0 SHA512 1f191076d3199b33e4cfa66e901d086dba32d7ee620c6dfa3bdaa7c9cba8e98d36b7f27d2f2dca7eb8d2549da37dd4b3638e392d8dbd9c36cb4a9ba09a45043f
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
 AUX sshd.confd 396 BLAKE2B 2fc146e83512d729e120cfe331441e8fe27eba804906cc0c463b938ddaf052e7392efbcda6699467afde22652c599e7d55b0ce18a344137263cd78647fea255f SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81
@@ -43,8 +51,12 @@ DIST openssh-7.9p1-sctp-1.2.patch.xz 7360 BLAKE2B 60e209371ecac24d0b60e48459d4d4
 DIST openssh-7.9p1.tar.gz 1565384 BLAKE2B de15795e03d33d4f9fe4792f6b14500123230b6c00c1e5bd7207bb6d6bf6df0b2e057c1b1de0fee709f58dd159203fdd69fe1473118a6baedebaa0c1c4c55b59 SHA512 0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e
 DIST openssh-7_8_P1-hpn-AES-CTR-14.16.diff 29231 BLAKE2B e25877c5e22f674e6db5a0bc107e5daa2509fe762fb14ce7bb2ce9a115e8177a93340c1d19247b6c2c854b7e1f9ae9af9fd932e5fa9c0a6b2ba438cd11a42991 SHA512 1867fb94c29a51294a71a3ec6a299757565a7cda5696118b0b346ed9c78f2c81bb1b888cff5e3418776b2fa277a8f070c5eb9327bb005453e2ffd72d35cdafa7
 DIST openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff 43356 BLAKE2B 776fa140d64a16c339b46a7c773258d2f4fe44e48b16abccad1a8757a51cb6362722fc5f42c39159af12849f5c88cf574de64815085c97157e16653f18d4909b SHA512 53f2752b7aa02719c8dfe0fe0ef16e874101ba2ba87924aa1122cd445ece218ca09c22abaa3377307f25d459579bc28d3854e2402c71b794db65d58cdd1ebc08
+DIST openssh-8.0p1+x509-12.0.diff.gz 623765 BLAKE2B b1c0d533a58c55b0f8451ce5aa8ee9b462afdc1eee44018f30962d3427c73b12a57c2c88bc8656c09c2b39a2ac72755539eeb29e7060ced5d3e8470647f88c0a SHA512 5f678fd303e39df7a2fb23af682c5a02b33f7fdcafe6171b9db2067098a2048677c415c3bee75225eb9fbaf308cfac7f37b0865951cdb6dda0577908499a8295
+DIST openssh-8.0p1-sctp-1.2.patch.xz 7348 BLAKE2B bc3d3815f1ef5dbab605b93182a00c2fec258f49d56684defb6564d2b60886429c615a7ab076cc071a590f9df0908b1862ceb0961b7e6f6d1090237fec9035d3 SHA512 2f9f774286db75d0240e6fb01655a8a193fb2a5dc4596ad68ed22d64f97c9c46dad61a06478f2e972fd37cbad4d9aca5829bb91097cc56638601ff94a972b24f
+DIST openssh-8.0p1.tar.gz 1597697 BLAKE2B 5ba79872eabb3b3964d95a8cdd690bfe0323f018d7f944d4e1acb52576c9f6d7a1ddac15e88dc42eac6ecbfabfad1c228e303a2262588769e307c38107a4cd54 SHA512 e280fa2d56f550efd37c5d2477670326261aa8b94d991f9eb17aad90e0c6c9c939efa90fe87d33260d0f709485cb05c379f0fd1bd44fc0d5190298b6398c9982
 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 16291 BLAKE2B 2a766c87f8c9b696a6453e0e84b7cb2dd2d86c15d1e7bbe20bff2ce2725aa39977df1d70be9efcb45a2e39a37fee784b9a71064fa21528b2635d4fadb2952814 SHA512 d46aab38c2f426a03eb6b4f01ceb63baeffc587145100500c615999da1a88a19d359533de796f0e0357a42edaa80d8306447f28f6f2b0fcd0ea86c7ce3e5a036
+EBUILD openssh-8.0_p1.ebuild 16116 BLAKE2B 7e98c38ad62d00c7e2155412ee992c07eea7d62bc60ebe51d897a5079a41f2cc86d871696e5e47ae4c618ce8a170f165a1cf0544b48afebd73b2514b4729b738 SHA512 bf6a0b010f0b511718c29f825f4f8c17223117be550ce9c78895e35986cd2ea4c1fa352e71c259a808ff4cf41ef9a43e9b2ace26ad423ce1288465c4cf0bcb9d
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/files/openssh-8.0_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-8.0_p1-GSSAPI-dns.patch
new file mode 100644
index 000000000000..04d622191fa6
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.0_p1-GSSAPI-dns.patch
@@ -0,0 +1,359 @@
+diff --git a/auth.c b/auth.c
+index 8696f258..f4cd70a3 100644
+--- a/auth.c
++++ b/auth.c
+@@ -723,120 +723,6 @@ fakepw(void)
+ 	return (&fake);
+ }
+
+-/*
+- * Returns the remote DNS hostname as a string. The returned string must not
+- * be freed. NB. this will usually trigger a DNS query the first time it is
+- * called.
+- * This function does additional checks on the hostname to mitigate some
+- * attacks on legacy rhosts-style authentication.
+- * XXX is RhostsRSAAuthentication vulnerable to these?
+- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
+- */
+-
+-static char *
+-remote_hostname(struct ssh *ssh)
+-{
+-	struct sockaddr_storage from;
+-	socklen_t fromlen;
+-	struct addrinfo hints, *ai, *aitop;
+-	char name[NI_MAXHOST], ntop2[NI_MAXHOST];
+-	const char *ntop = ssh_remote_ipaddr(ssh);
+-
+-	/* Get IP address of client. */
+-	fromlen = sizeof(from);
+-	memset(&from, 0, sizeof(from));
+-	if (getpeername(ssh_packet_get_connection_in(ssh),
+-	    (struct sockaddr *)&from, &fromlen) < 0) {
+-		debug("getpeername failed: %.100s", strerror(errno));
+-		return strdup(ntop);
+-	}
+-
+-	ipv64_normalise_mapped(&from, &fromlen);
+-	if (from.ss_family == AF_INET6)
+-		fromlen = sizeof(struct sockaddr_in6);
+-
+-	debug3("Trying to reverse map address %.100s.", ntop);
+-	/* Map the IP address to a host name. */
+-	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
+-	    NULL, 0, NI_NAMEREQD) != 0) {
+-		/* Host name not found.  Use ip address. */
+-		return strdup(ntop);
+-	}
+-
+-	/*
+-	 * if reverse lookup result looks like a numeric hostname,
+-	 * someone is trying to trick us by PTR record like following:
+-	 *	1.1.1.10.in-addr.arpa.	IN PTR	2.3.4.5
+-	 */
+-	memset(&hints, 0, sizeof(hints));
+-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
+-	hints.ai_flags = AI_NUMERICHOST;
+-	if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
+-		logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
+-		    name, ntop);
+-		freeaddrinfo(ai);
+-		return strdup(ntop);
+-	}
+-
+-	/* Names are stored in lowercase. */
+-	lowercase(name);
+-
+-	/*
+-	 * Map it back to an IP address and check that the given
+-	 * address actually is an address of this host.  This is
+-	 * necessary because anyone with access to a name server can
+-	 * define arbitrary names for an IP address. Mapping from
+-	 * name to IP address can be trusted better (but can still be
+-	 * fooled if the intruder has access to the name server of
+-	 * the domain).
+-	 */
+-	memset(&hints, 0, sizeof(hints));
+-	hints.ai_family = from.ss_family;
+-	hints.ai_socktype = SOCK_STREAM;
+-	if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
+-		logit("reverse mapping checking getaddrinfo for %.700s "
+-		    "[%s] failed.", name, ntop);
+-		return strdup(ntop);
+-	}
+-	/* Look for the address from the list of addresses. */
+-	for (ai = aitop; ai; ai = ai->ai_next) {
+-		if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
+-		    sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
+-		    (strcmp(ntop, ntop2) == 0))
+-				break;
+-	}
+-	freeaddrinfo(aitop);
+-	/* If we reached the end of the list, the address was not there. */
+-	if (ai == NULL) {
+-		/* Address not found for the host name. */
+-		logit("Address %.100s maps to %.600s, but this does not "
+-		    "map back to the address.", ntop, name);
+-		return strdup(ntop);
+-	}
+-	return strdup(name);
+-}
+-
+-/*
+- * Return the canonical name of the host in the other side of the current
+- * connection.  The host name is cached, so it is efficient to call this
+- * several times.
+- */
+-
+-const char *
+-auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
+-{
+-	static char *dnsname;
+-
+-	if (!use_dns)
+-		return ssh_remote_ipaddr(ssh);
+-	else if (dnsname != NULL)
+-		return dnsname;
+-	else {
+-		dnsname = remote_hostname(ssh);
+-		return dnsname;
+-	}
+-}
+-
+ /*
+  * Runs command in a subprocess with a minimal environment.
+  * Returns pid on success, 0 on failure.
+diff --git a/canohost.c b/canohost.c
+index f71a0856..3e162d8c 100644
+--- a/canohost.c
++++ b/canohost.c
+@@ -202,3 +202,117 @@ get_local_port(int sock)
+ {
+ 	return get_sock_port(sock, 1);
+ }
++
++/*
++ * Returns the remote DNS hostname as a string. The returned string must not
++ * be freed. NB. this will usually trigger a DNS query the first time it is
++ * called.
++ * This function does additional checks on the hostname to mitigate some
++ * attacks on legacy rhosts-style authentication.
++ * XXX is RhostsRSAAuthentication vulnerable to these?
++ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
++ */
++
++static char *
++remote_hostname(struct ssh *ssh)
++{
++	struct sockaddr_storage from;
++	socklen_t fromlen;
++	struct addrinfo hints, *ai, *aitop;
++	char name[NI_MAXHOST], ntop2[NI_MAXHOST];
++	const char *ntop = ssh_remote_ipaddr(ssh);
++
++	/* Get IP address of client. */
++	fromlen = sizeof(from);
++	memset(&from, 0, sizeof(from));
++	if (getpeername(ssh_packet_get_connection_in(ssh),
++	    (struct sockaddr *)&from, &fromlen) < 0) {
++		debug("getpeername failed: %.100s", strerror(errno));
++		return strdup(ntop);
++	}
++
++	ipv64_normalise_mapped(&from, &fromlen);
++	if (from.ss_family == AF_INET6)
++		fromlen = sizeof(struct sockaddr_in6);
++
++	debug3("Trying to reverse map address %.100s.", ntop);
++	/* Map the IP address to a host name. */
++	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
++	    NULL, 0, NI_NAMEREQD) != 0) {
++		/* Host name not found.  Use ip address. */
++		return strdup(ntop);
++	}
++
++	/*
++	 * if reverse lookup result looks like a numeric hostname,
++	 * someone is trying to trick us by PTR record like following:
++	 *	1.1.1.10.in-addr.arpa.	IN PTR	2.3.4.5
++	 */
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
++	hints.ai_flags = AI_NUMERICHOST;
++	if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
++		logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
++		    name, ntop);
++		freeaddrinfo(ai);
++		return strdup(ntop);
++	}
++
++	/* Names are stored in lowercase. */
++	lowercase(name);
++
++	/*
++	 * Map it back to an IP address and check that the given
++	 * address actually is an address of this host.  This is
++	 * necessary because anyone with access to a name server can
++	 * define arbitrary names for an IP address. Mapping from
++	 * name to IP address can be trusted better (but can still be
++	 * fooled if the intruder has access to the name server of
++	 * the domain).
++	 */
++	memset(&hints, 0, sizeof(hints));
++	hints.ai_family = from.ss_family;
++	hints.ai_socktype = SOCK_STREAM;
++	if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
++		logit("reverse mapping checking getaddrinfo for %.700s "
++		    "[%s] failed.", name, ntop);
++		return strdup(ntop);
++	}
++	/* Look for the address from the list of addresses. */
++	for (ai = aitop; ai; ai = ai->ai_next) {
++		if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
++		    sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
++		    (strcmp(ntop, ntop2) == 0))
++				break;
++	}
++	freeaddrinfo(aitop);
++	/* If we reached the end of the list, the address was not there. */
++	if (ai == NULL) {
++		/* Address not found for the host name. */
++		logit("Address %.100s maps to %.600s, but this does not "
++		    "map back to the address.", ntop, name);
++		return strdup(ntop);
++	}
++	return strdup(name);
++}
++
++/*
++ * Return the canonical name of the host in the other side of the current
++ * connection.  The host name is cached, so it is efficient to call this
++ * several times.
++ */
++
++const char *
++auth_get_canonical_hostname(struct ssh *ssh, int use_dns)
++{
++	static char *dnsname;
++
++	if (!use_dns)
++		return ssh_remote_ipaddr(ssh);
++	else if (dnsname != NULL)
++		return dnsname;
++	else {
++		dnsname = remote_hostname(ssh);
++		return dnsname;
++	}
++}
+diff --git a/readconf.c b/readconf.c
+index 71a5c795..2a8c6990 100644
+--- a/readconf.c
++++ b/readconf.c
+@@ -163,6 +163,7 @@ typedef enum {
+ 	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
+ 	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
+ 	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
++	oGssTrustDns,
+ 	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
+ 	oSendEnv, oSetEnv, oControlPath, oControlMaster, oControlPersist,
+ 	oHashKnownHosts,
+@@ -204,9 +205,11 @@ static struct {
+ #if defined(GSSAPI)
+ 	{ "gssapiauthentication", oGssAuthentication },
+ 	{ "gssapidelegatecredentials", oGssDelegateCreds },
++	{ "gssapitrustdns", oGssTrustDns },
+ # else
+ 	{ "gssapiauthentication", oUnsupported },
+ 	{ "gssapidelegatecredentials", oUnsupported },
++	{ "gssapitrustdns", oUnsupported },
+ #endif
+ #ifdef ENABLE_PKCS11
+ 	{ "pkcs11provider", oPKCS11Provider },
+@@ -993,6 +996,10 @@ parse_time:
+ 		intptr = &options->gss_deleg_creds;
+ 		goto parse_flag;
+
++	case oGssTrustDns:
++		intptr = &options->gss_trust_dns;
++		goto parse_flag;
++
+ 	case oBatchMode:
+ 		intptr = &options->batch_mode;
+ 		goto parse_flag;
+@@ -1875,6 +1882,7 @@ initialize_options(Options * options)
+ 	options->challenge_response_authentication = -1;
+ 	options->gss_authentication = -1;
+ 	options->gss_deleg_creds = -1;
++	options->gss_trust_dns = -1;
+ 	options->password_authentication = -1;
+ 	options->kbd_interactive_authentication = -1;
+ 	options->kbd_interactive_devices = NULL;
+@@ -2023,6 +2031,8 @@ fill_default_options(Options * options)
+ 		options->gss_authentication = 0;
+ 	if (options->gss_deleg_creds == -1)
+ 		options->gss_deleg_creds = 0;
++	if (options->gss_trust_dns == -1)
++		options->gss_trust_dns = 0;
+ 	if (options->password_authentication == -1)
+ 		options->password_authentication = 1;
+ 	if (options->kbd_interactive_authentication == -1)
+diff --git a/readconf.h b/readconf.h
+index 69c24700..2758b633 100644
+--- a/readconf.h
++++ b/readconf.h
+@@ -45,6 +45,7 @@ typedef struct {
+ 					/* Try S/Key or TIS, authentication. */
+ 	int     gss_authentication;	/* Try GSS authentication */
+ 	int     gss_deleg_creds;	/* Delegate GSS credentials */
++	int	gss_trust_dns;		/* Trust DNS for GSS canonicalization */
+ 	int     password_authentication;	/* Try password
+ 						 * authentication. */
+ 	int     kbd_interactive_authentication; /* Try keyboard-interactive auth. */
+diff --git a/ssh_config.5 b/ssh_config.5
+index b7566782..64897e4e 100644
+--- a/ssh_config.5
++++ b/ssh_config.5
+@@ -758,6 +758,16 @@ The default is
+ Forward (delegate) credentials to the server.
+ The default is
+ .Cm no .
++Note that this option applies to protocol version 2 connections using GSSAPI.
++.It Cm GSSAPITrustDns
++Set to
++.Dq yes to indicate that the DNS is trusted to securely canonicalize
++the name of the host being connected to. If
++.Dq no, the hostname entered on the
++command line will be passed untouched to the GSSAPI library.
++The default is
++.Dq no .
++This option only applies to protocol version 2 connections using GSSAPI.
+ .It Cm HashKnownHosts
+ Indicates that
+ .Xr ssh 1
+diff --git a/sshconnect2.c b/sshconnect2.c
+index dffee90b..a25a32b9 100644
+--- a/sshconnect2.c
++++ b/sshconnect2.c
+@@ -698,6 +698,13 @@ userauth_gssapi(struct ssh *ssh)
+ 	OM_uint32 min;
+ 	int r, ok = 0;
+ 	gss_OID mech = NULL;
++	const char *gss_host;
++
++	if (options.gss_trust_dns) {
++		extern const char *auth_get_canonical_hostname(struct ssh *ssh, int use_dns);
++		gss_host = auth_get_canonical_hostname(ssh, 1);
++	} else
++		gss_host = authctxt->host;
+
+ 	/* Try one GSSAPI method at a time, rather than sending them all at
+ 	 * once. */
+@@ -712,7 +719,7 @@ userauth_gssapi(struct ssh *ssh)
+ 		    elements[authctxt->mech_tried];
+ 		/* My DER encoding requires length<128 */
+ 		if (mech->length < 128 && ssh_gssapi_check_mechanism(&gssctxt,
+-		    mech, authctxt->host)) {
++		    mech, gss_host)) {
+ 			ok = 1; /* Mechanism works */
+ 		} else {
+ 			authctxt->mech_tried++;
diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch
new file mode 100644
index 000000000000..9766b1594ea0
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch
@@ -0,0 +1,12 @@
+diff -ur openssh-7.9p1.orig/openbsd-compat/regress/Makefile.in openssh-7.9p1/openbsd-compat/regress/Makefile.in
+--- openssh-7.9p1.orig/openbsd-compat/regress/Makefile.in	2018-10-16 17:01:20.000000000 -0700
++++ openssh-7.9p1/openbsd-compat/regress/Makefile.in	2018-12-19 11:03:14.421028691 -0800
+@@ -7,7 +7,7 @@
+ CC=@CC@
+ LD=@LD@
+ CFLAGS=@CFLAGS@
+-CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
++CPPFLAGS=-I. -I.. -I$(srcdir) -I../.. @CPPFLAGS@ @DEFS@
+ EXEEXT=@EXEEXT@
+ LIBCOMPAT=../libopenbsd-compat.a
+ LIBS=@LIBS@
diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch
new file mode 100644
index 000000000000..aac98fef35df
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch
@@ -0,0 +1,16 @@
+--- a/openssh-8.0p1+x509-12.0.diff	2019-04-18 14:53:26.850768799 -0700
++++ b/openssh-8.0p1+x509-12.0.diff	2019-04-18 14:56:48.870364519 -0700
+@@ -33578,12 +33578,11 @@
+  
+  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
+  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
+-@@ -334,6 +352,8 @@
++@@ -334,6 +352,7 @@
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
+ +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
+-+	$(MKDIR_P) $(DESTDIR)$(piddir)
+  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.patch
new file mode 100644
index 000000000000..1667e13850cf
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.patch
@@ -0,0 +1,19 @@
+--- a/openssh-8.0p1+x509-12.0.diff	2019-04-18 14:53:02.804935946 -0700
++++ b/openssh-8.0p1+x509-12.0.diff	2019-04-18 14:53:26.850768799 -0700
+@@ -75925,16 +75925,6 @@
+ +	return mbtowc(NULL, s, n);
+ +}
+ +#endif
+-diff -ruN openssh-8.0p1/version.h openssh-8.0p1+x509-12.0/version.h
+---- openssh-8.0p1/version.h	2019-04-18 01:52:57.000000000 +0300
+-+++ openssh-8.0p1+x509-12.0/version.h	2019-04-18 19:07:00.000000000 +0300
+-@@ -2,5 +2,4 @@
+- 
+- #define SSH_VERSION	"OpenSSH_8.0"
+- 
+--#define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+ diff -ruN openssh-8.0p1/version.m4 openssh-8.0p1+x509-12.0/version.m4
+ --- openssh-8.0p1/version.m4	1970-01-01 02:00:00.000000000 +0200
+ +++ openssh-8.0p1+x509-12.0/version.m4	2019-04-18 19:07:00.000000000 +0300
diff --git a/net-misc/openssh/files/openssh-8.0_p1-hpn-X509-glue.patch b/net-misc/openssh/files/openssh-8.0_p1-hpn-X509-glue.patch
new file mode 100644
index 000000000000..2a9d3bd2f331
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.0_p1-hpn-X509-glue.patch
@@ -0,0 +1,114 @@
+--- a/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff	2019-04-18 17:07:59.413376785 -0700
++++ b/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff	2019-04-18 20:05:12.622588051 -0700
+@@ -382,7 +382,7 @@
+ @@ -822,6 +822,10 @@ kex_choose_conf(struct ssh *ssh)
+  	int nenc, nmac, ncomp;
+  	u_int mode, ctos, need, dh_need, authlen;
+- 	int r, first_kex_follows;
++ 	int r, first_kex_follows = 0;
+ +	int auth_flag;
+ +
+ +	auth_flag = packet_authentication_state(ssh);
+@@ -441,6 +441,39 @@
+  int	 ssh_packet_get_state(struct ssh *, struct sshbuf *);
+  int	 ssh_packet_set_state(struct ssh *, struct sshbuf *);
+  
++diff --git a/packet.c b/packet.c
++index dcf35e6..9433f08 100644
++--- a/packet.c
+++++ b/packet.c
++@@ -920,6 +920,14 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
++ 	return 0;
++ }
++ 
+++/* this supports the forced rekeying required for the NONE cipher */
+++int rekey_requested = 0;
+++void
+++packet_request_rekeying(void)
+++{
+++        rekey_requested = 1;
+++}
+++
++ #define MAX_PACKETS	(1U<<31)
++ static int
++ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
++@@ -946,6 +954,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
++ 	if (state->p_send.packets == 0 && state->p_read.packets == 0)
++ 		return 0;
++ 
+++        /* used to force rekeying when called for by the none
+++         * cipher switch and aes-mt-ctr methods -cjr */
+++        if (rekey_requested == 1) {
+++                rekey_requested = 0;
+++                return 1;
+++        }
+++	
++ 	/* Time-based rekeying */
++ 	if (state->rekey_interval != 0 &&
++ 	    (int64_t)state->rekey_time + state->rekey_interval <= monotime())
+ diff --git a/readconf.c b/readconf.c
+ index db5f2d5..33f18c9 100644
+ --- a/readconf.c
+@@ -453,10 +486,9 @@
+  
+  /* Format of the configuration file:
+  
+-@@ -166,6 +167,8 @@ typedef enum {
++@@ -166,5 +167,7 @@ typedef enum {
+  	oTunnel, oTunnelDevice,
+  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
+- 	oDisableMTAES,
+ +	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
+ +	oNoneEnabled, oNoneSwitch,
+  	oVisualHostKey,
+@@ -592,10 +624,9 @@
+  	int	ip_qos_interactive;	/* IP ToS/DSCP/class for interactive */
+  	int	ip_qos_bulk;		/* IP ToS/DSCP/class for bulk traffic */
+  	SyslogFacility log_facility;	/* Facility for system logging. */
+-@@ -111,7 +115,10 @@ typedef struct {
++@@ -111,6 +115,9 @@ typedef struct {
+  	int	enable_ssh_keysign;
+  	int64_t rekey_limit;
+- 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
+ +	int     none_switch;    /* Use none cipher */
+ +	int     none_enabled;   /* Allow none to be used */
+  	int	rekey_interval;
+@@ -650,10 +681,8 @@
+  
+  	/* Portable-specific options */
+  	if (options->use_pam == -1)
+-@@ -391,6 +400,43 @@ fill_default_server_options(ServerOptions *options)
++@@ -391,4 +400,41 @@ fill_default_server_options(ServerOptions *options)
+  		options->permit_tun = SSH_TUNMODE_NO;
+- 	if (options->disable_multithreaded == -1)
+- 		options->disable_multithreaded = 0;
+ +	if (options->none_enabled == -1)
+ +		options->none_enabled = 0;
+ +	if (options->hpn_disabled == -1)
+@@ -1095,9 +1124,9 @@
+ +			fprintf(stderr, "NONE cipher switch disabled when a TTY is allocated\n");
+ +		}
+ +	}
++ 	debug("Authentication succeeded (%s).", authctxt.method->name);
++ }
+  
+- #ifdef WITH_OPENSSL
+- 	if (options.disable_multithreaded == 0) {
+ diff --git a/sshd.c b/sshd.c
+ index a738c3a..b32dbe0 100644
+ --- a/sshd.c
+@@ -1181,14 +1210,3 @@
+  # Example of overriding settings on a per-user basis
+  #Match User anoncvs
+  #	X11Forwarding no
+-diff --git a/version.h b/version.h
+-index f1bbf00..21a70c2 100644
+---- a/version.h
+-+++ b/version.h
+-@@ -3,4 +3,5 @@
+- #define SSH_VERSION	"OpenSSH_7.8"
+- 
+- #define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+-+ 
diff --git a/net-misc/openssh/files/openssh-8.0_p1-hpn-glue.patch b/net-misc/openssh/files/openssh-8.0_p1-hpn-glue.patch
new file mode 100644
index 000000000000..adbfa87af68b
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.0_p1-hpn-glue.patch
@@ -0,0 +1,194 @@
+diff -ur --exclude '.*.un*' a/openssh-7_8_P1-hpn-AES-CTR-14.16.diff b/openssh-7_8_P1-hpn-AES-CTR-14.16.diff
+--- a/openssh-7_8_P1-hpn-AES-CTR-14.16.diff	2019-04-18 15:07:06.748067368 -0700
++++ b/openssh-7_8_P1-hpn-AES-CTR-14.16.diff	2019-04-18 19:42:26.689298696 -0700
+@@ -998,7 +998,7 @@
+ +		 * so we repoint the define to the multithreaded evp. To start the threads we
+ +		 * then force a rekey
+ +		 */
+-+		const void *cc = ssh_packet_get_send_context(active_state);
+++		const void *cc = ssh_packet_get_send_context(ssh);
+ +		
+ +		/* only do this for the ctr cipher. otherwise gcm mode breaks. Don't know why though */
+ +		if (strstr(cipher_ctx_name(cc), "ctr")) {
+@@ -1028,7 +1028,7 @@
+ +		 * so we repoint the define to the multithreaded evp. To start the threads we
+ +		 * then force a rekey
+ +		 */
+-+		const void *cc = ssh_packet_get_send_context(active_state);
+++		const void *cc = ssh_packet_get_send_context(ssh);
+ +		
+ +		/* only rekey if necessary. If we don't do this gcm mode cipher breaks */
+ +		if (strstr(cipher_ctx_name(cc), "ctr")) {
+diff -ur --exclude '.*.un*' a/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff b/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff
+--- a/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff	2019-04-18 15:07:11.289035776 -0700
++++ b/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff	2019-04-18 17:07:59.413376785 -0700
+@@ -162,24 +162,24 @@
+  }
+  
+ +static int
+-+channel_tcpwinsz(void)
+++channel_tcpwinsz(struct ssh *ssh)
+ +{
+ +	u_int32_t tcpwinsz = 0;
+ +	socklen_t optsz = sizeof(tcpwinsz);
+ +	int ret = -1;
+ +
+ +	/* if we aren't on a socket return 128KB */
+-+	if (!packet_connection_is_on_socket())
+++	if (!ssh_packet_connection_is_on_socket(ssh))
+ +		return 128 * 1024;
+ +
+-+	ret = getsockopt(packet_get_connection_in(),
+++	ret = getsockopt(ssh_packet_get_connection_in(ssh),
+ +			 SOL_SOCKET, SO_RCVBUF, &tcpwinsz, &optsz);
+ +	/* return no more than SSHBUF_SIZE_MAX (currently 256MB) */
+ +	if ((ret == 0) && tcpwinsz > SSHBUF_SIZE_MAX)
+ +		tcpwinsz = SSHBUF_SIZE_MAX;
+ +
+ +	debug2("tcpwinsz: tcp connection %d, Receive window: %d",
+-+	       packet_get_connection_in(), tcpwinsz);
+++	       ssh_packet_get_connection_in(ssh), tcpwinsz);
+ +	return tcpwinsz;
+ +}
+ +
+@@ -191,7 +191,7 @@
+  	    c->local_window < c->local_window_max/2) &&
+  	    c->local_consumed > 0) {
+ +		u_int addition = 0;
+-+		u_int32_t tcpwinsz = channel_tcpwinsz();
+++		u_int32_t tcpwinsz = channel_tcpwinsz(ssh);
+ +		/* adjust max window size if we are in a dynamic environment */
+ +		if (c->dynamic_window && (tcpwinsz > c->local_window_max)) {
+ +			/* grow the window somewhat aggressively to maintain pressure */
+@@ -409,18 +409,10 @@
+ index dcf35e6..da4ced0 100644
+ --- a/packet.c
+ +++ b/packet.c
+-@@ -920,6 +920,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
++@@ -920,6 +920,16 @@ ssh_set_newkeys(struct ssh *ssh, int mode)
+  	return 0;
+  }
+  
+-+/* this supports the forced rekeying required for the NONE cipher */
+-+int rekey_requested = 0;
+-+void
+-+packet_request_rekeying(void)
+-+{
+-+	rekey_requested = 1;
+-+}
+-+
+ +/* used to determine if pre or post auth when rekeying for aes-ctr
+ + * and none cipher switch */
+ +int
+@@ -434,20 +426,6 @@
+  #define MAX_PACKETS	(1U<<31)
+  static int
+  ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+-@@ -946,6 +964,13 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len)
+- 	if (state->p_send.packets == 0 && state->p_read.packets == 0)
+- 		return 0;
+- 
+-+	/* used to force rekeying when called for by the none
+-+         * cipher switch methods -cjr */
+-+        if (rekey_requested == 1) {
+-+                rekey_requested = 0;
+-+                return 1;
+-+        }
+-+
+- 	/* Time-based rekeying */
+- 	if (state->rekey_interval != 0 &&
+- 	    (int64_t)state->rekey_time + state->rekey_interval <= monotime())
+ diff --git a/packet.h b/packet.h
+ index 170203c..f4d9df2 100644
+ --- a/packet.h
+@@ -476,9 +454,9 @@
+  /* Format of the configuration file:
+  
+ @@ -166,6 +167,8 @@ typedef enum {
+- 	oHashKnownHosts,
+  	oTunnel, oTunnelDevice,
+  	oLocalCommand, oPermitLocalCommand, oRemoteCommand,
++ 	oDisableMTAES,
+ +	oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize,
+ +	oNoneEnabled, oNoneSwitch,
+  	oVisualHostKey,
+@@ -615,9 +593,9 @@
+  	int	ip_qos_bulk;		/* IP ToS/DSCP/class for bulk traffic */
+  	SyslogFacility log_facility;	/* Facility for system logging. */
+ @@ -111,7 +115,10 @@ typedef struct {
+- 
+  	int	enable_ssh_keysign;
+  	int64_t rekey_limit;
++ 	int     disable_multithreaded; /*disable multithreaded aes-ctr*/
+ +	int     none_switch;    /* Use none cipher */
+ +	int     none_enabled;   /* Allow none to be used */
+  	int	rekey_interval;
+@@ -673,9 +651,9 @@
+  	/* Portable-specific options */
+  	if (options->use_pam == -1)
+ @@ -391,6 +400,43 @@ fill_default_server_options(ServerOptions *options)
+- 	}
+- 	if (options->permit_tun == -1)
+  		options->permit_tun = SSH_TUNMODE_NO;
++ 	if (options->disable_multithreaded == -1)
++ 		options->disable_multithreaded = 0;
+ +	if (options->none_enabled == -1)
+ +		options->none_enabled = 0;
+ +	if (options->hpn_disabled == -1)
+@@ -1092,7 +1070,7 @@
+  	xxx_host = host;
+  	xxx_hostaddr = hostaddr;
+  
+-@@ -412,6 +423,28 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
++@@ -412,6 +423,27 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host,
+  
+  	if (!authctxt.success)
+  		fatal("Authentication failed.");
+@@ -1108,7 +1086,7 @@
+ +			memcpy(&myproposal, &myproposal_default, sizeof(myproposal));
+ +			myproposal[PROPOSAL_ENC_ALGS_STOC] = "none";
+ +			myproposal[PROPOSAL_ENC_ALGS_CTOS] = "none";
+-+			kex_prop2buf(active_state->kex->my, myproposal);
+++			kex_prop2buf(ssh->kex->my, myproposal);
+ +			packet_request_rekeying();
+ +			fprintf(stderr, "WARNING: ENABLED NONE CIPHER\n");
+ +		} else {
+@@ -1117,23 +1095,13 @@
+ +			fprintf(stderr, "NONE cipher switch disabled when a TTY is allocated\n");
+ +		}
+ +	}
+-+
+- 	debug("Authentication succeeded (%s).", authctxt.method->name);
+- }
+  
++ #ifdef WITH_OPENSSL
++ 	if (options.disable_multithreaded == 0) {
+ diff --git a/sshd.c b/sshd.c
+ index a738c3a..b32dbe0 100644
+ --- a/sshd.c
+ +++ b/sshd.c
+-@@ -373,7 +373,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
+- 	char remote_version[256];	/* Must be at least as big as buf. */
+- 
+- 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
+--	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
+-+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
+- 	    *options.version_addendum == '\0' ? "" : " ",
+- 	    options.version_addendum);
+- 
+ @@ -1037,6 +1037,8 @@ listen_on_addrs(struct listenaddr *la)
+  	int ret, listen_sock;
+  	struct addrinfo *ai;
+@@ -1217,11 +1185,10 @@
+ index f1bbf00..21a70c2 100644
+ --- a/version.h
+ +++ b/version.h
+-@@ -3,4 +3,6 @@
++@@ -3,4 +3,5 @@
+  #define SSH_VERSION	"OpenSSH_7.8"
+  
+  #define SSH_PORTABLE	"p1"
+ -#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_HPN         "-hpn14v16"
+ +#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
+ + 
diff --git a/net-misc/openssh/files/openssh-8.0_p1-hpn-version.patch b/net-misc/openssh/files/openssh-8.0_p1-hpn-version.patch
new file mode 100644
index 000000000000..37905ce6afca
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.0_p1-hpn-version.patch
@@ -0,0 +1,13 @@
+diff --git a/kex.c b/kex.c
+index 34808b5c..88d7ccac 100644
+--- a/kex.c
++++ b/kex.c
+@@ -1126,7 +1126,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
+ 	if (version_addendum != NULL && *version_addendum == '\0')
+ 		version_addendum = NULL;
+ 	if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n",
+-	   PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
++	   PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
+ 	    version_addendum == NULL ? "" : " ",
+ 	    version_addendum == NULL ? "" : version_addendum)) != 0) {
+ 		error("%s: sshbuf_putf: %s", __func__, ssh_err(r));
diff --git a/net-misc/openssh/files/openssh-8.0_p1-tests.patch b/net-misc/openssh/files/openssh-8.0_p1-tests.patch
new file mode 100644
index 000000000000..6b2ae489d0e8
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.0_p1-tests.patch
@@ -0,0 +1,43 @@
+diff --git a/openbsd-compat/regress/utimensattest.c b/openbsd-compat/regress/utimensattest.c
+index a7bc7634..46f79db2 100644
+--- a/openbsd-compat/regress/utimensattest.c
++++ b/openbsd-compat/regress/utimensattest.c
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <time.h>
+ 
+ #define TMPFILE "utimensat.tmp"
+ #define TMPFILE2 "utimensat.tmp2"
+@@ -88,8 +89,30 @@ main(void)
+ 	if (symlink(TMPFILE2, TMPFILE) == -1)
+ 		fail("symlink", 0, 0);
+ 
++#ifdef __linux__
++	/*
++	 * The semantics of the original test are wrong on Linux
++	 * From the man page for utimensat():
++	 *   AT_SYMLINK_NOFOLLOW
++	 *        If pathname specifies a symbolic link, then update the
++	 *        timestamps of the link, rather than the file to which it refers.
++	 *
++	 *  So the call will succeed, and update the times on the symlink.
++	 */
++	if (utimensat(AT_FDCWD, TMPFILE, ts, AT_SYMLINK_NOFOLLOW) != -1) {
++		if (fstatat(AT_FDCWD, TMPFILE, &sb, 0) == -1)
++			fail("could not follow and stat symlink", 0, 0);
++
++		if (sb.st_atim.tv_sec == ts[0].tv_sec
++				&& sb.st_atim.tv_nsec == ts[0].tv_nsec
++				&& sb.st_mtim.tv_nsec == ts[1].tv_sec
++				&& sb.st_mtim.tv_nsec == ts[1].tv_nsec)
++		fail("utimensat followed symlink", 0, 0);
++	}
++#else /* __linux__ */
+ 	if (utimensat(AT_FDCWD, TMPFILE, ts, AT_SYMLINK_NOFOLLOW) != -1)
+ 		fail("utimensat followed symlink", 0, 0);
++#endif /* __linux__ */
+ 
+ 	if (!(unlink(TMPFILE) == 0 && unlink(TMPFILE2) == 0))
+ 		fail("unlink", 0, 0);
diff --git a/net-misc/openssh/openssh-8.0_p1.ebuild b/net-misc/openssh/openssh-8.0_p1.ebuild
new file mode 100644
index 000000000000..20540fe239f0
--- /dev/null
+++ b/net-misc/openssh/openssh-8.0_p1.ebuild
@@ -0,0 +1,461 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user flag-o-matic multilib autotools pam systemd
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+#HPN_PV="${PV^^}"
+HPN_PV="7.8_P1"
+
+HPN_VER="14.16"
+HPN_PATCHES=(
+	${PN}-${HPN_PV/./_}-hpn-DynWinNoneSwitch-${HPN_VER}.diff
+	${PN}-${HPN_PV/./_}-hpn-AES-CTR-${HPN_VER}.diff
+)
+
+SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
+X509_VER="12.0" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+
+PATCH_SET="openssh-7.9p1-patches-1.0"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )}
+	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
+	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	X509? ( !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			|| (
+				(
+					>=dev-libs/openssl-1.0.1:0[bindist=]
+					<dev-libs/openssl-1.1.0:0[bindist=]
+				)
+				>=dev-libs/openssl-1.1.0g:0[bindist=]
+			)
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S="${WORKDIR}/${PARCH}"
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use hpn && maybe_fail hpn HPN_VER)
+		$(use sctp && maybe_fail sctp SCTP_PATCH)
+		$(use X509 && maybe_fail X509 X509_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT%/}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply "${FILESDIR}"/${PN}-7.9_p1-include-stdlib.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
+	eapply "${FILESDIR}"/${PN}-8.0_p1-tests.patch
+
+	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
+
+	local PATCHSET_VERSION_MACROS=()
+
+	if use X509 ; then
+		pushd "${WORKDIR}" || die
+		eapply "${FILESDIR}/${P}-X509-glue-${X509_VER}.patch"
+		eapply "${FILESDIR}/${P}-X509-dont-make-piddir-${X509_VER}.patch"
+		popd || die
+
+		eapply "${WORKDIR}"/${X509_PATCH%.*}
+		eapply "${FILESDIR}"/${P}-X509-${X509_VER}-tests.patch
+
+		# We need to patch package version or any X.509 sshd will reject our ssh client
+		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
+		# error
+		einfo "Patching package version for X.509 patch set ..."
+		sed -i \
+			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
+			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
+
+		einfo "Patching version.h to expose X.509 patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
+	fi
+
+	if use sctp ; then
+		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
+
+		einfo "Patching version.h to expose SCTP patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
+			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
+
+		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
+		sed -i \
+			-e "/\t\tcfgparse \\\/d" \
+			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
+	fi
+
+	if use hpn ; then
+		local hpn_patchdir="${T}/${P}-hpn${HPN_VER}"
+		mkdir "${hpn_patchdir}"
+		cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}"
+		pushd "${hpn_patchdir}"
+		eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-glue.patch
+		if use X509; then
+			einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set"
+			# X509 and AES-CTR-MT don't get along, let's just drop it
+			rm openssh-${HPN_PV//./_}-hpn-AES-CTR-${HPN_VER}.diff || die
+			eapply "${FILESDIR}"/${PN}-8.0_p1-hpn-X509-glue.patch
+		fi
+		use sctp && eapply "${FILESDIR}"/${PN}-7.9_p1-hpn-sctp-glue.patch
+		popd
+
+		eapply "${hpn_patchdir}"
+
+		if ! use X509; then
+			eapply "${FILESDIR}/openssh-7.9_p1-hpn-openssl-1.1.patch"
+			eapply "${FILESDIR}/openssh-8.0_p1-hpn-version.patch"
+		fi
+
+		einfo "Patching Makefile.in for HPN patch set ..."
+		sed -i \
+			-e "/^LIBS=/ s/\$/ -lpthread/" \
+			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
+
+		einfo "Patching version.h to expose HPN patch set ..."
+		sed -i \
+			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER//./v}\"" \
+			"${S}"/version.h || die "Failed to sed-in HPN patch version"
+		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
+
+		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+			einfo "Disabling known non-working MT AES cipher per default ..."
+
+			cat > "${T}"/disable_mtaes.conf <<- EOF
+
+			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
+			# and therefore disabled per default.
+			DisableMTAES yes
+			EOF
+			sed -i \
+				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
+				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
+
+			sed -i \
+				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
+				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
+		fi
+	fi
+
+	if use X509 || use sctp || use hpn ; then
+		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
+
+		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
+		sed -i \
+			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
+			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
+
+		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
+		sed -i \
+			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
+			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
+	fi
+
+	sed -i \
+		-e "/#UseLogin no/d" \
+		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
+
+	eapply_user #473004
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX%/}"/etc/ssh
+		--libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX%/}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX%/}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX%/}"/usr)
+		# We apply the sctp patch conditionally, so can't pass --without-sctp
+		# unconditionally else we get unknown flag warnings.
+		$(use sctp && use_with sctp)
+		$(use_with ldns ldns "${EPREFIX%/}"/usr)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+		$(use_with !elibc_Cygwin hardening) #659210
+	)
+
+	# stackprotect is broken on musl x86
+	use elibc_musl && use x86 && myconf+=( --without-stackprotect )
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" SUDO="" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+	local locale_vars=(
+		# These are language variables that POSIX defines.
+		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
+		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+		# These are the GNU extensions.
+		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
+		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+	)
+
+	# First the server config.
+	cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables. #367017
+	AcceptEnv ${locale_vars[*]}
+
+	# Allow client to pass COLORTERM to match TERM. #658540
+	AcceptEnv COLORTERM
+	EOF
+
+	# Then the client config.
+	cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
+
+	# Send locale environment variables. #367017
+	SendEnv ${locale_vars[*]}
+
+	# Send COLORTERM to match TERM. #658540
+	SendEnv COLORTERM
+	EOF
+
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED%/}"/etc/ssh/sshd_config || die
+	fi
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED%/}"/etc/ssh/sshd_config || die
+	fi
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd-r1.initd sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+
+	tweak_ssh_configs
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use hpn && dodoc HPN-README
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	keepdir /var/empty
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
+		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.7_p1" ; then
+		elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
+		elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
+		elog "if you need to authenticate against LDAP."
+		elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+
+	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
+		elog ""
+		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
+		elog "and therefore disabled at runtime per default."
+		elog "Make sure your sshd_config is up to date and contains"
+		elog ""
+		elog "  DisableMTAES yes"
+		elog ""
+		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
+		elog ""
+	fi
+}
diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index dfa34197cdb0..bab34ef0d8c2 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -16,8 +16,8 @@ AUX xcp-interface-reconfigure-2.3.2.patch 920 BLAKE2B a0cf230e9793484309ec38a6fa
 DIST openvswitch-2.10.0.tar.gz 7528705 BLAKE2B a04e6e823a40e9a3a2d2ffd79a881b1f1e2063333a911b9b213eb1ae10d35c4716778e9897f264216889fd7db75b4f89c3e05b34040ce01ab29f0844b4b0cbb2 SHA512 f118c1c4ab4e126c3343023b03007ca9819c3c5a5ea42eaffaabdc7c50ecddede3e258574dbe0de95ed3be2e3d101612f5bdb423a7adb679987f4e501183a216
 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
+EBUILD openvswitch-2.10.0-r1.ebuild 4699 BLAKE2B c9de21a5bba881e69a2741419ea0435fe74e8080407bbd31b0dbddc80c406c3329d925f7dfb641896982adcbd6140f32fb097386f46b82e5afc0838ac9b62a59 SHA512 12e6e28f65c7d69acfe7d881c1c1ca38d506e50d28428f15606f776649cc7c2e32dccdceeecd46e13c6af8f85f0797cf929915c4a8c8050e9e59e8def729fe66
+EBUILD openvswitch-2.10.1-r1.ebuild 4461 BLAKE2B 9d229b86adf3261b3761f0c92e3a41839dbaec4fdf6c35939fcb5915b0232c87dd2a25bc78b04b37729a2a9d3adfae7195a6666d5b043d77f418f31af76add62 SHA512 c660b92275b577385952c24f817fdb8dfe110158f49dd2cd62506a8252cc5181f0f43c76236287a7c8f53601e33fe5d3d5eb0e46f95fc0ee7d00f7a92d598a75
+EBUILD openvswitch-2.10.1.ebuild 4263 BLAKE2B a6e844947f481d7beaf79172d90f09f52770514d5e203b10548783efccfcc791465a75a4d4796889f8f0ba53f74a6beb21a9d8478dc7f4ec25f2ec6e8a5ae09d SHA512 3cbc185a839a30d48262552b7d2ab8604353a3c2c12fdf42b3f558c1521d58dadb2e465494a0babd03fe0a7c435215916c30df996842e5ac15e63d0188d50270
+EBUILD openvswitch-2.8.1.ebuild 4446 BLAKE2B 68da5d17271fe0c59d7a6820836c56f39a35d7c151a84108f594eaaef3edf7838d80d3dd6c7d521cea09d692cfb89c00ad9eb2d58045167a21b22cacfac54724 SHA512 21edf1a60d31999eff602af6ec6fc8141a55c266d2076f8dc2a4aacb632dad0ea47375834048084642989b02a0f2f1dbce4ab4baef7e4afc37844f88528e1cd9
 MISC metadata.xml 538 BLAKE2B c5bb1d88b9923e4df32eebb70ddbe96fc7ba60ac17e2a84515a69ab9c3f90b73dc429797a23d1a13ebec9ae4def24a04b4cb0e8685159a7ec01fb905c2ab0cca SHA512 79f8fecddfb657298b4c261eb8c6d502cf5e320764acdc92fb97ac6f67379ec10faf553e8a3a0a37d4d650b52c0fa827e485655dbaa126f97d19fbf7b8fbeffd
diff --git a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild
index 8b7c0be030c7..7d1e0be6561a 100644
--- a/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.10.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit autotools eutils linux-info linux-mod python-r1 systemd versionator
 
diff --git a/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild b/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild
index f74b7fd5ea74..35f6bd871b8f 100644
--- a/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.10.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit autotools eutils linux-info linux-mod python-r1 systemd
 
@@ -66,6 +66,10 @@ src_configure() {
 	# pyside is staticly disabled
 	export ovs_cv_pyuic4="no"
 
+	# flake8 is primarily a style guide tool, running it as part of the tests
+	# in Gentoo does not make much sense, only breaks them: bug 607280
+	export ovs_cv_flake8="no"
+
 	local linux_config
 	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
 
diff --git a/net-misc/openvswitch/openvswitch-2.10.1.ebuild b/net-misc/openvswitch/openvswitch-2.10.1.ebuild
index 1f5b61810944..103c6c1bafb5 100644
--- a/net-misc/openvswitch/openvswitch-2.10.1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit autotools eutils linux-info linux-mod python-r1 systemd
 
diff --git a/net-misc/openvswitch/openvswitch-2.8.1.ebuild b/net-misc/openvswitch/openvswitch-2.8.1.ebuild
index b46ba3bd0409..2e0d26d9fb98 100644
--- a/net-misc/openvswitch/openvswitch-2.8.1.ebuild
+++ b/net-misc/openvswitch/openvswitch-2.8.1.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
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit autotools eutils linux-info linux-mod python-r1 systemd versionator
 
diff --git a/net-misc/pcapfix/Manifest b/net-misc/pcapfix/Manifest
index c7325baf3715..16c446d3afdf 100644
--- a/net-misc/pcapfix/Manifest
+++ b/net-misc/pcapfix/Manifest
@@ -1,3 +1,5 @@
 DIST pcapfix-0.7.tar.gz 25753 BLAKE2B 75a8bca8e5c0f7b6604a9c2202116f3fd18917bb98797b401618d32861a14e2bc7f7a1fe684d2e057c4314de72bbbb825dc3142ea93bd8dea0b1bc4716e240e0 SHA512 254eb5803bbcff4249f20af4cd1afa5b300eefb3448e3650899fa94329f38e298e4e7b1033836aa04434b1eadc67611204e3f67d41917c761d5cba424d789298
+DIST pcapfix-1.1.4.tar.gz 52184 BLAKE2B 4def04cebc9144af86d43c28892575627ed98bf14fa99e5e4fe5181a406871ceeac1f431c73d90daae151bb8b6e5315e8bc47c430d2ed55f9e0c3de1decbe0e9 SHA512 6203e9032d2f24fe5d4aaefd9cfd57ece97a318af3ecd8da7171307a59c2a10b2e92206d5cf96e2dd9bfafc239dd9bc95a224bf5fef9e0c0432a6e76ff10d1da
 EBUILD pcapfix-0.7.ebuild 471 BLAKE2B cfa77f05f1b78c54b56487430ca864779c973564baef93f84cb394c5823260baf107035e75084111eeed08c874cd2582f157f41883244e54a7dcd3b06fb0d31c SHA512 15f97ba4b4f1c1cb5e50c3d15a5f340b3a23cb1ed0c505f0c244941b6964c9c891e43a59f8c188273ac0f3b1474d9d1a39e2d3d4d48627c3b28caf923a113b54
+EBUILD pcapfix-1.1.4.ebuild 550 BLAKE2B f772b0e00db6e31efd7626ce918e32065783a15c844fde801b504275c79a150b98eb0c5e999814a3a9451539694c7eeadc5c2af827a045e3860d2bf22b16454b SHA512 3072edc7108cb41c016b16b4fe4a05386c87bed96eeba1dff0312bf2609c500a13b3d79f245218c53428de3ceb58bae670f11d56c81e046ec3a4a775882f7264
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/pcapfix/pcapfix-1.1.4.ebuild b/net-misc/pcapfix/pcapfix-1.1.4.ebuild
new file mode 100644
index 000000000000..9f2ecbc9c679
--- /dev/null
+++ b/net-misc/pcapfix/pcapfix-1.1.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Repair and fix broken pcap files"
+HOMEPAGE="http://f00l.de/pcapfix/"
+SRC_URI="http://f00l.de/pcapfix/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DOCS=( Changelog README )
+
+src_prepare() {
+	default
+	sed -e 's/gcc/$(CC) $(CFLAGS)/g' -i Makefile || die
+	use debug || sed -e 's/DEBUGFLAGS = -g/DEBUGFLAGS =/g' -i Makefile || die
+}
+
+src_install() {
+	doman pcapfix.1
+	dobin pcapfix
+	einstalldocs
+}
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 2954ab9bb4f6..74e711cc09ce 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,8 +1,6 @@
 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-r2.ebuild 1712 BLAKE2B 1027379f8e23ec3132c89e3fee5251b1b4a2407e034794b5ccb24f58a6bab3b205c92277cc55d7625ad31b3912ac2845ab32fcf817c5a9c4db67b584318a65c5 SHA512 d1e13059b70667a936f2e336dce81bd5921e34d9a64638dc046312cf0762715a11e39c0c4a28a00ca11ea7cb5883f80caeaa3928be50729114b19ff86c56cb2f
+EBUILD putty-0.71-r2.ebuild 1708 BLAKE2B c7521ebc45c975bb5d739697c507aa5ffbcbdc84f1afbbc63dd86f4f6fb6e9489ef919439d6730c2eeef769874416b28f1dbdf20e6fadd2f2ab41f8865b94702 SHA512 82082ad7b56f404719468fe34aa6caf3774f323252d00bf87b437703e38061b33877519f01771641a954465f1ae0b1e23c1824bf3271bf40175b05e989a19525
 EBUILD putty-9999.ebuild 1778 BLAKE2B d84806c66abe03ce824f8d7c9dc54cf07f49da77d4bd29ac590465e85cc4019cef2a4af8f4d39c81443c0b0c4c643afc17ce45897e6855aa0677f295b71baba5 SHA512 8d702ecce91b4a8e98171e97424cde8eac4a54144ca9c39d178490950c66a300889690eb0c19c35af5faf5b63e3c18ee93525cd3b1c670e6307aedf2128d5ede
 MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6
diff --git a/net-misc/putty/putty-0.68.ebuild b/net-misc/putty/putty-0.68.ebuild
deleted file mode 100644
index f0ff385a5003..000000000000
--- a/net-misc/putty/putty-0.68.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2-utils toolchain-funcs
-
-DESCRIPTION="A Free Telnet/SSH Client"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc +gtk ipv6 kerberos"
-SRC_URI="
-	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
-	https://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
-"
-
-RDEPEND="
-	!net-misc/pssh
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		x11-libs/gtk+:3[X]
-		x11-libs/libX11
-		x11-libs/pango
-	)
-	kerberos? ( virtual/krb5 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/AM_PATH_GTK(/d' \
-		-e 's|-Werror||g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	cd "${S}"/unix || die
-	econf \
-		$(use_with kerberos gssapi) \
-		$(use_with gtk)
-}
-
-src_compile() {
-	cd "${S}"/unix || die
-	emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
-}
-
-src_install() {
-	dodoc doc/puttydoc.txt
-
-	if use doc; then
-		docinto html
-		dodoc doc/*.html
-	fi
-
-	cd "${S}"/unix || die
-	default
-
-	if use gtk ; then
-		for i in 16 22 24 32 48 64 128 256; do
-			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
-		done
-
-		# install desktop file provided by Gustav Schaffter in #49577
-		make_desktop_entry ${PN} PuTTY ${PN} Network
-	fi
-}
-
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
-}
diff --git a/net-misc/putty/putty-0.71-r2.ebuild b/net-misc/putty/putty-0.71-r2.ebuild
index e8860e799793..1974742b0e61 100644
--- a/net-misc/putty/putty-0.71-r2.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/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index cfdf281505dc..75ab6b0d7029 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -8,11 +8,11 @@ DIST rabbitmq-server-3.7.11.tar.xz 2593632 BLAKE2B 4455b47a36ed4b642f0c30a34d018
 DIST rabbitmq-server-3.7.13.tar.xz 2595904 BLAKE2B 3dce5af3b63d84e1ab8ee02ba3f55560087e5f72532e693b483e8083e25d540406d696873b291dd715c45aae1e15945e76fcc33bdd77503c6517860b45f7e7b9 SHA512 33cc3682214782152e4e1270d1011e94df79b454abf6fcf9d56b73be1f8cf42ce0a4a559f243b4721ae25b10897c756960c655909bee2b427395d0f0b63a2fb9
 DIST rabbitmq-server-3.7.3.tar.xz 7382708 BLAKE2B 66d4c2fcb80ba5a851fb5d2bee91d41b04a05e70e74ac2b3adae8aebcaaa01de7ca47772c38deb4e9c25c19f67c2bbd6c4fb3b71480d73986540c60ab6dac02c SHA512 337edddceb66c44b5cc3cec710918385306d9db97ae340752bc39a1be39229a58b3bb1c96763a2ce441a6d46135f2aac8cec09fc33591d0e14e7571c9507d79b
 DIST rabbitmq-server-3.7.9.tar.xz 2551456 BLAKE2B b64037481254f39300fecf53c1f8eda69df3fdc92bbacc6f6edc9d89e167e4cdd0708482b0daf680366986a28f4a3562d4af7dcf427604acc79145d24ca41bd2 SHA512 4a9fd452ad878f20c3a269d2dc0fa63ef7dcf99d2ee1ca46ff693df8d92ae0ef5a05453a6aaaeb00db643b2209770b15216fdff109f27d1e531e363a99bd4a2a
-EBUILD rabbitmq-server-3.6.14.ebuild 2865 BLAKE2B 64a85b0d626e222182a167c5edff69e55802c4a2261a4507a6164dc57cf0d36dddc4db58d3c3aa47152557cbc3bec84fe6701a438ed735ab4b4597ed0f25519c SHA512 bd84518cdee06f69be05ef141ff6d10ffaca2312410621ed35508315878ae7dcbd5ae17f654dd539b6dbd7e0a46850fdbbb3c444564357a352e175107f814ffd
-EBUILD rabbitmq-server-3.6.9.ebuild 2860 BLAKE2B 51d41a29be6986157954f3b675e31b9d813baeff9023c6f6c31ec104039ee2544bd1216ffbed27e0b69437dbe5f396a864fa18b789d33d5f9d8702a32aed4cdd SHA512 17951e227b45b1230bae2992b3f4530e7c2e7dabd62cfd8c9950254cdf0633dace11b45da1ff34934adac1a365032d72e87adf3ad64051e3942d1077b9b59303
-EBUILD rabbitmq-server-3.7.10.ebuild 2999 BLAKE2B 3f7d5a6d6aab697c89b1c36d787f1946bb1a847e5a4301929c945b1c233a8e6b810cae0105563f5c9bdd2a7be3d35936ae7466f80d817e75abccc72471b3372d SHA512 6dc7e5e2e7943f223c0582f837b76a57e9fde6efc9e42e5e40f78d6a29bfeb26d4993793779d10806d67bc1822a5856e5a844e7a4bdca8e1445a3ae54ec7c494
-EBUILD rabbitmq-server-3.7.11.ebuild 2999 BLAKE2B 980260cd0d5f3a86641da078cc3bdad1a7d33a12b201395ddb6742558d849d5d974117c2e0802064d5b64aed93c13ae200e52fa01c7991a3d03b8b8589fa463e SHA512 2e3ffe2ac09747b4c352263d692342d6c4f8dbe1f3a7e88f5808afc4fa7fbaec34bc1723fcd51ffebaa05f48ce5aff54400d142bbf794d33a02e58e652bf9fd5
-EBUILD rabbitmq-server-3.7.13.ebuild 3104 BLAKE2B 7eaea6f67b2a781587f45252abb79889d7503bd8adb0c73b17275b43bebc18de704a63fb80cf9f6b076ca9e1bade4414607fb365a22ca10ee95fb22792d549b4 SHA512 5dbefbffaf02ba930b8a9e83cf2176fa5d2fc5fe5e8ba203cc27192bdd8b4f7d92381cc755c568a91a5a2225275ba360f33e0be9fdf7bcccc2997160230f6018
-EBUILD rabbitmq-server-3.7.3-r1.ebuild 2978 BLAKE2B 1e52884869bea88c8128249c395226fa4b67ffa574b23ee0dd336d6c59f0af050139617a0688e4875cb0633d9032898a7b754f57be37f6977ffccfd8e9d5d3a1 SHA512 5d2d9fe18a2a4a03521b47ede6209791871d361dd00448a2c668a9740dfca834246d4af1b01bf4dd35d1198a3c7359ff911cbdad9c0a4a77e39a2e560d900704
-EBUILD rabbitmq-server-3.7.9.ebuild 2995 BLAKE2B 78f3dab75df9ac4c5f7ca74920678e841cacc5633163e4e2a6478a7a53337417dccae86784132cdeaf922cb6d4bdc4c2de683a966aef4ab7615350aecb67f2aa SHA512 c42215c89935baaf78cb0fcc6c438b8e6552317b9af0f13e4f3daee581f25a3ff346f7027fb5469ae751dac0d10094c0298345c07bf91282463b6fce1b5f96f2
+EBUILD rabbitmq-server-3.6.14.ebuild 2866 BLAKE2B 0750fb1c6968b6c97471a940ab2010c44cf4cb831ae06effdec756df77e72fd1a9a0557de56e89daa0ae65097ee6a39ca3f779f9ad3c7b94175a6800ec6cdc06 SHA512 c5804a6938ae7d9f429e9bcfc0325ae276e3deecf9329a850111f099c1206587954a47daee906848dfa0569caa220fe9afd3e43b7823b4db65d353ffd7cd427a
+EBUILD rabbitmq-server-3.6.9.ebuild 2861 BLAKE2B efc0b3acca1f57d4116a18475c923502febd6ecb4a95030be05bdf94bd726c2cb90a8a95a7a47cc390da3c6c66f84af1eec14279f235b6547d247d2a8437e4c0 SHA512 ebabcbe717134e17d16a1623ff05a7700d7825de626c25c4b2ad8510f0ac42ede1a37ddbfd367c198d6cb4b550f30294c64fd7cbebe64bf6ac0244c9de4dee50
+EBUILD rabbitmq-server-3.7.10.ebuild 3002 BLAKE2B 79711c2a8713661373d6bb34c91a5580255676d067c770073c77eb99ee3bf441a1416e64daff3acccdbec839864d694e6c9aba246bdc18529c65b203c6a91610 SHA512 8e4e02f70bd52215fc8d3a46510c2293607d9badc4f0e1ec9ca04a5825de84c7eafca5647cb63ea2d66fda615ddfb91654ad7948aacccd800ffd82380e1a9043
+EBUILD rabbitmq-server-3.7.11.ebuild 3002 BLAKE2B acf516d61dcf314336818dc5773e3248622e8a242afe65d48d075ecd25e3627d5f6aca7fac34f372fb66d08ce1c1d7874b1e06b9e7b183ff1e2dbeed2a17c27e SHA512 e5045a138bb87d96cffbf39b82baec2865f326ccb2b77d19cddf7e5b36378c67eeaeb31d09dad99aa5887c591aa67c7ceb8a53424f98fdc463991ca11a4bc4d6
+EBUILD rabbitmq-server-3.7.13.ebuild 3105 BLAKE2B 61175864b1b7eab693fdfcf16ff1178c87d37e966a44ed29e08d01242d16af099ef492eeb527e8181b06ceb2222736c354df34cb510dbcce6a929eba63696b05 SHA512 5896fa3e7a2865e42a3f5c485c55504ead488115334e220b489db9dec55d2537d2e12266d8507f6b73ef76b1dadab6ba56a86a092c590e0627478207cbc7f6bf
+EBUILD rabbitmq-server-3.7.3-r1.ebuild 2978 BLAKE2B 6f240a3325c446277a3779721dde982daa2528697118290c48d2ab108369fb781c538b19029662e6de632ace9d00d9c2f0df4e9686064af4174617efe71c27e9 SHA512 63f9528982875d523b2ef4f9c5a064b647c0edba6385ffe27372989cc962bae4167c60ab647eea338bebc7e4fc52b9063d477c5db5c83ad757e8432dc883aee2
+EBUILD rabbitmq-server-3.7.9.ebuild 2998 BLAKE2B 7c77aa3c5bde60e8ba67529591a9883337b30691a08d8256e168b2dc3bb95eb7d87645db57f065f47ffbc34036c519250a5261cf5f7db1fd9b8667f0fd8bd640 SHA512 9d3b4f8c4256433dc69ea6f3ff0968640a810cad780cb8bb971f76615248374f20b5eac129e0ddafde845a97430f7a7676243d5f6fb43879560e56edfe14a53a
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild
index dbb8168aa3c4..d6fd89e8e0e4 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils python-any-r1 systemd user
 
 DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="http://www.rabbitmq.com/"
-SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.xz"
+HOMEPAGE="https://www.rabbitmq.com/"
+SRC_URI="https://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.xz"
 
 LICENSE="GPL-2 MPL-1.1"
 SLOT="0"
@@ -88,12 +88,12 @@ pkg_preinst() {
 		elog
 		elog "Please read release notes before upgrading:"
 		elog
-		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+		elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
 	fi
 	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
 		elog
 		elog "This release changes the behaviour of the default guest user:"
 		elog
-		elog "http://www.rabbitmq.com/access-control.html"
+		elog "https://www.rabbitmq.com/access-control.html"
 	fi
 }
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild
index 669fedafa631..60b7628d197a 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.6.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils python-any-r1 systemd user
 
 DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="http://www.rabbitmq.com/"
-SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.xz"
+HOMEPAGE="https://www.rabbitmq.com/"
+SRC_URI="https://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.xz"
 
 LICENSE="GPL-2 MPL-1.1"
 SLOT="0"
@@ -88,12 +88,12 @@ pkg_preinst() {
 		elog
 		elog "Please read release notes before upgrading:"
 		elog
-		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+		elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
 	fi
 	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
 		elog
 		elog "This release changes the behaviour of the default guest user:"
 		elog
-		elog "http://www.rabbitmq.com/access-control.html"
+		elog "https://www.rabbitmq.com/access-control.html"
 	fi
 }
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild
index e412841b290d..7fd02de44fd3 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1 systemd user
 
 DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="http://www.rabbitmq.com/"
+HOMEPAGE="https://www.rabbitmq.com/"
 SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
 
 LICENSE="GPL-2 MPL-1.1"
@@ -94,12 +94,12 @@ pkg_preinst() {
 		elog
 		elog "Please read release notes before upgrading:"
 		elog
-		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+		elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
 	fi
 	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
 		elog
 		elog "This release changes the behaviour of the default guest user:"
 		elog
-		elog "http://www.rabbitmq.com/access-control.html"
+		elog "https://www.rabbitmq.com/access-control.html"
 	fi
 }
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild
index 55f6a5f7e57c..d1d04cce6ec2 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.11.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1 systemd user
 
 DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="http://www.rabbitmq.com/"
+HOMEPAGE="https://www.rabbitmq.com/"
 SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
 
 LICENSE="GPL-2 MPL-1.1"
@@ -94,12 +94,12 @@ pkg_preinst() {
 		elog
 		elog "Please read release notes before upgrading:"
 		elog
-		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+		elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
 	fi
 	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
 		elog
 		elog "This release changes the behaviour of the default guest user:"
 		elog
-		elog "http://www.rabbitmq.com/access-control.html"
+		elog "https://www.rabbitmq.com/access-control.html"
 	fi
 }
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.13.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.13.ebuild
index fa7777dc07b3..dfbcc2c75b34 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.13.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.13.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1 systemd user
 
 DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="http://www.rabbitmq.com/"
+HOMEPAGE="https://www.rabbitmq.com/"
 SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
 
 LICENSE="GPL-2 MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="test"
 
@@ -95,12 +95,12 @@ pkg_preinst() {
 		elog
 		elog "Please read release notes before upgrading:"
 		elog
-		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+		elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
 	fi
 	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
 		elog
 		elog "This release changes the behaviour of the default guest user:"
 		elog
-		elog "http://www.rabbitmq.com/access-control.html"
+		elog "https://www.rabbitmq.com/access-control.html"
 	fi
 }
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.3-r1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.3-r1.ebuild
index cbf7de3d046c..7ea2f7df0ef7 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.3-r1.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.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"
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils python-any-r1 systemd user
 
 DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="http://www.rabbitmq.com/"
+HOMEPAGE="https://www.rabbitmq.com/"
 SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
 
 LICENSE="GPL-2 MPL-1.1"
@@ -93,12 +93,12 @@ pkg_preinst() {
 		elog
 		elog "Please read release notes before upgrading:"
 		elog
-		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+		elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
 	fi
 	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
 		elog
 		elog "This release changes the behaviour of the default guest user:"
 		elog
-		elog "http://www.rabbitmq.com/access-control.html"
+		elog "https://www.rabbitmq.com/access-control.html"
 	fi
 }
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.9.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.9.ebuild
index 06a77b030f39..29de58a41aa1 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.9.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.9.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="7"
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1 systemd user
 
 DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="http://www.rabbitmq.com/"
+HOMEPAGE="https://www.rabbitmq.com/"
 SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
 
 LICENSE="GPL-2 MPL-1.1"
@@ -94,12 +94,12 @@ pkg_preinst() {
 		elog
 		elog "Please read release notes before upgrading:"
 		elog
-		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+		elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
 	fi
 	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
 		elog
 		elog "This release changes the behaviour of the default guest user:"
 		elog
-		elog "http://www.rabbitmq.com/access-control.html"
+		elog "https://www.rabbitmq.com/access-control.html"
 	fi
 }
diff --git a/net-misc/rancid-git/Manifest b/net-misc/rancid-git/Manifest
deleted file mode 100644
index 74935dbb1077..000000000000
--- a/net-misc/rancid-git/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX rancid-2.3.8-buildsystem.patch 1741 BLAKE2B 03056e70631b0bae0b8501df70b38ebcbc148ba98a2811b74c79f90d909f8996c1c75649d8c511f117861a8a1da34c12dc952b8e673599286b62c9fb99837e3a SHA512 2ce1befcd4898654958e8a961156a6eda95da319d98ca66c9cb216ab46b80166571146b631a699be5702d5bb7baa8301b570fe82fb89ba8096a941807005f9ab
-AUX rancid-2.3.8-config.patch 1241 BLAKE2B 8d03211285ecd05d277cb5d1e60f3ba3f91eaec3e2bf35cbad4976907aa952438714447da66994784d39c1ea15448883c3b2f3ed4264d30939a39bfbecf09592 SHA512 abad6758dbe89eacf566b5cc931749ed9667ec7f7e824a8091f5a02edfeacb4497b1dfc5444ae41f5652a479791c585e4625b8877e710f460698a8bb2cccce9c
-AUX rancid-2.3.8-mailprefix.patch 5878 BLAKE2B 87d5ef27a2194eb746006e0330b562a22d7801ec9954e248b41417defddc2ccdaa92a7c9b220edb6f1aba312e43e8e5cfe16b4ff47893538e781e3aa9a896abe SHA512 c01cdaafd599c8b1559b158ba0999c1e79c40dc4c8f6c0f5aa284225a5903ba967b742cee7d81f2edeb07c6e7e344c1208c018421c023a7f678204c647f3e8bd
-DIST rancid-git-2.3.8.tar.gz 388121 BLAKE2B b485688efdbc7b2ab2e8d9dd5f3b3ca6acfe5e443140be46962c9e36fe8632f0df9457b20719d46aed08d50f1ccc1a7f56898c2d3373dc2e66400bde566f6867 SHA512 14a4fa097a31e2772d83e72cdcfb5488bf3e1c69e8065286c52eb554a392eb4257a0dc38fad5d79819fb417e699fb4e2c265ef5cfbf018418d9550eb653fa551
-EBUILD rancid-git-2.3.8.ebuild 3164 BLAKE2B ed234b18c4e30ba98c5230b9f29cfce931768a77ba063a9b29996de3ba8100f46b05db7e7a7bf8c9e346ba05ca418a922d77a415a9e368ecdf47c9712580539b SHA512 8f87a0a3b17b45caaa993f34c10c01872bffab07370f04d5b352d06842f263e335c338d02da32113f8e1237b303ebae92798bd9beced96bb0b15d3e24588c7ae
-MISC metadata.xml 337 BLAKE2B a9da9ae98a2b21fda7585b3d839d7f7e213dfea4dda145a76632195fd49351f9d22ae9c81dccaf6f1f5444e3db49b7cddb29b6185cb8d135fc32fce234ca1c13 SHA512 b370676f1152d07705974bb833ee38ce51b0b563b8b3e942ac893469242b8c41fa5588362a0c908597491e2ec3774a771eecd9d72fa893e7077084b4c8fa76fc
diff --git a/net-misc/rancid-git/files/rancid-2.3.8-buildsystem.patch b/net-misc/rancid-git/files/rancid-2.3.8-buildsystem.patch
deleted file mode 100644
index 4a06b5c63723..000000000000
--- a/net-misc/rancid-git/files/rancid-2.3.8-buildsystem.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- rancid-2.3.8/configure.in
-+++ rancid-2.3.8/configure.in
-@@ -17,7 +17,7 @@
- dnl default install location
- AC_PREFIX_DEFAULT(/usr/local/rancid)
- 
--dnl AM_MAINTAINER_MODE()
-+AM_MAINTAINER_MODE()
- 
- dnl AC_CONFIG_SUBDIRS(util)
- 
-@@ -35,7 +35,6 @@
- 
- # compiler specifics
- AC_PROG_CC
--AM_C_PROTOTYPES
- AC_PROG_CPP
- AC_C_CONST
- AC_C_INLINE
-@@ -212,7 +212,7 @@
- # is good enough -- if we can't find GNU tar, we don't really care.
- AC_CHECK_PROGS(TAR, gnutar gtar tar)
- 
--AC_CHECK_PROGS(AUTOMAKE, automake)
-+dnl AC_CHECK_PROGS(AUTOMAKE, automake)
- 
- dnl locate perl 5 and expect.
- AC_PROG_INSTALL
---- rancid-2.3.8/Makefile.am
-+++ rancid-2.3.8/Makefile.am
-@@ -24,7 +24,7 @@
- 
- @SET_MAKE@
- 
--pkgdata_DATA = COPYING CHANGES FAQ README README.lg UPGRADING cloginrc.sample
-+dist_doc_DATA = COPYING CHANGES FAQ README README.lg UPGRADING cloginrc.sample
- EXTRA_DIST = BUGS Todo configure install-sh \
- 	mkinstalldirs Makefile.in Todo $(pkgdata_DATA)
- #DIST_COMMON = 
---- rancid-2.3.8/share/Makefile.am
-+++ rancid-2.3.8/share/Makefile.am
-@@ -50,8 +50,9 @@
- 
- pkgdata_SCRIPTS= rancid-cvspurge rtrfilter downreport
- dist_pkgdata_SCRIPTS=getipacctg
--dist_pkgdata_DATA=README.misc cisco-load.exp cisco-reload.exp \
--	index.html lgnotes.html
-+dist_pkgdata_DATA=cisco-load.exp cisco-reload.exp
-+dist_doc_DATA=README.misc
-+dist_html_DATA=index.html lgnotes.html
- 
- EXTRA_DIST = rancid-cvspurge.in rancid.spec rtrfilter.in downreport.in
- 
---- rancid-2.3.8/etc/Makefile.am
-+++ rancid-2.3.8/etc/Makefile.am
-@@ -48,7 +48,7 @@
- #AUTOMAKE_OPTIONS=foreign no-dependencies
- AUTOMAKE_OPTIONS=foreign
- 
--pkgdata_DATA= lg.conf.sample rancid.conf.sample
-+dist_doc_DATA= lg.conf.sample rancid.conf.sample
- EXTRA_DIST= $(pkgdata_DATA:%=%.in)
- 
- CLEANFILES= $(pkgdata_DATA)
diff --git a/net-misc/rancid-git/files/rancid-2.3.8-config.patch b/net-misc/rancid-git/files/rancid-2.3.8-config.patch
deleted file mode 100644
index f39f28382da8..000000000000
--- a/net-misc/rancid-git/files/rancid-2.3.8-config.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- etc/rancid.conf.sample.in
-+++ etc/rancid.conf.sample.in
-@@ -42,7 +42,10 @@
- RCSSYS=@RCSSYS@; export RCSSYS
- #
- # if ACLSORT is NO, access-lists will NOT be sorted.
--#ACLSORT=YES; export ACLSORT
-+#
-+#Gentoo - changing default to NO because access-list order matters in most instances
-+#and many people expect to use rancid as a backup system
-+ACLSORT=NO; export ACLSORT
- #
- # if NOPIPE is set, temp files will be used instead of a cmd pipe during
- # collection from the router(s).
-@@ -50,10 +53,16 @@
- #
- # FILTER_PWDS determines which passwords are filtered from configs by the
- # value set (NO | YES | ALL).  see rancid.conf(5).
--#FILTER_PWDS=YES; export FILTER_PWDS
-+#
-+#Gentoo - changing default to ALL; diffs are emailed and even the most secure
-+#password hashes on most routers are easily brute-forceable with modern systems
-+FILTER_PWDS=ALL; export FILTER_PWDS
- #
- # if NOCOMMSTR is set, snmp community strings will be stripped from the configs
--#NOCOMMSTR=YES; export NOCOMMSTR
-+#
-+#Gentoo - changing default to YES; diffs are emailed and SNMP communities
-+#can be just as dangerous as passwords
-+NOCOMMSTR=YES; export NOCOMMSTR
- #
- # How many times failed collections are retried (for each run) before
- # giving up.  Minimum: 1
diff --git a/net-misc/rancid-git/files/rancid-2.3.8-mailprefix.patch b/net-misc/rancid-git/files/rancid-2.3.8-mailprefix.patch
deleted file mode 100644
index 171a380679dc..000000000000
--- a/net-misc/rancid-git/files/rancid-2.3.8-mailprefix.patch
+++ /dev/null
@@ -1,178 +0,0 @@
---- rancid-2.3.8/bin/Makefile.am
-+++ rancid-2.3.8/bin/Makefile.am
-@@ -96,8 +96,6 @@
- 	-e 's,@PERLV\@,$(PERLV),g' \
- 	-e 's,@PERLV_PATH\@,$(PERLV_PATH),g' \
- 	-e 's,@LG_PING_CMD\@,$(LG_PING_CMD),g' \
--	-e 's,@ADMINMAILPLUS\@,$(ADMINMAILPLUS),g' \
--	-e 's,@MAILPLUS\@,$(MAILPLUS),g' \
- 	-e 's,@PACKAGE\@,$(PACKAGE),g' \
- 	-e 's,@SVN_FSTYPE\@,$(SVN_FSTYPE),g' \
- 	-e 's,@VERSION\@,$(VERSION),g' \
---- rancid-2.3.8/bin/control_rancid.in
-+++ rancid-2.3.8/bin/control_rancid.in
-@@ -118,8 +118,8 @@
- fi
- 
- # the receipient(s) of diffs & mail options
--mailrcpt=${mailrcpt:-"@MAILPLUS@${GROUP}${MAILDOMAIN}"}; export mailrcpt
--adminmailrcpt=${adminmailrcpt:-"@ADMINMAILPLUS@${GROUP}${MAILDOMAIN}"};
-+mailrcpt=${mailrcpt:-"${MAILPREFIX}${GROUP}${MAILDOMAIN}"}; export mailrcpt
-+adminmailrcpt=${adminmailrcpt:-"${ADMINMAILPREFIX}${GROUP}${MAILDOMAIN}"};
- export adminmailrcpt
- set | grep MAILHEADERS= > /dev/null 2>&1
- if [ $? -ne 0 ] ; then
---- rancid-2.3.8/bin/rancid-run.in
-+++ rancid-2.3.8/bin/rancid-run.in
-@@ -147,7 +147,7 @@
- 	    if [ -s $TMPDIR/.$GROUP.old ]
- 	    then
- 		(
--		  echo "To: @ADMINMAILPLUS@${GROUP}${MAILDOMAIN}"
-+		  echo "To: ${ADMINMAILPREFIX}${GROUP}${MAILDOMAIN}"
- 		  echo "Subject: rancid hung - $GROUP"
- 		  echo "Precedence: bulk"
- 		  echo ""
---- rancid-2.3.8/configure.in
-+++ rancid-2.3.8/configure.in
-@@ -163,46 +163,6 @@
- AC_SUBST(SVN_FSTYPE)
- rd_cv_RCSSYS=$RCSSYS
- 
--# Check for a preference for using mail addresses like rancid+group
--# instead of the standard rancid-group
--AC_MSG_CHECKING([whether mail addresses should be in the rancid+ form])
--AC_ARG_ENABLE(mail-plus,
--	AS_HELP_STRING([--enable-mail-plus], [enable mail to rancid+ addresses, instead of rancid-]),
--[if test "$enable_mail_plus" = yes; then
--    AC_MSG_RESULT(yes)
--    MAILPLUS="rancid+"
--    AC_SUBST(MAILPLUS)
--else
--    AC_MSG_RESULT(no)
--    MAILPLUS="rancid-"
--    AC_SUBST(MAILPLUS)
--fi],
--[AC_MSG_RESULT(no)
--    MAILPLUS="rancid-"
--    AC_SUBST(MAILPLUS)
--])
--rd_cv_MAILPLUS=$MAILPLUS
--
--# Check for a preference for using mail addresses like rancid+admin-group
--# instead of the standard rancid-admin-group
--AC_MSG_CHECKING([whether admin mail addresses should be in the rancid-admin+ form])
--AC_ARG_ENABLE(adminmail-plus,
--	AS_HELP_STRING([--enable-adminmail-plus], [enable mail to rancid-admin+ addresses, instead of rancid-admin-]),
--[if test "$enable_adminmail_plus" = yes; then
--    AC_MSG_RESULT([rancid-admin+])
--    ADMINMAILPLUS="rancid-admin+"
--    AC_SUBST(ADMINMAILPLUS)
--else
--    AC_MSG_RESULT([${MAILPLUS}admin-])
--    ADMINMAILPLUS="${MAILPLUS}admin-"
--    AC_SUBST(ADMINMAILPLUS)
--fi],
--[AC_MSG_RESULT([${MAILPLUS}admin-])
--    ADMINMAILPLUS="${MAILPLUS}admin-"
--    AC_SUBST(ADMINMAILPLUS)
--])
--rd_cv_ADMINMAILPLUS=$ADMINMAILPLUS
--
- AC_PATH_PROG(DIRNAME,dirname,no)
- 
- # locate GNU diff (one supporting the -u option)
---- rancid-2.3.8/etc/rancid.conf.sample.in
-+++ rancid-2.3.8/etc/rancid.conf.sample.in
-@@ -71,6 +71,21 @@
- # The number of devices to collect simultaneously.
- #PAR_COUNT=5; export PAR_COUNT
- #
-+# Define the prefixes for regular and administrative email groups
-+# configuration diffs will be emailed to {MAILPREFIX}{GROUPNAME}
-+# eg. rancid-routers
-+# problems/errors will be emailed to {ADMINMAILPREFIX}{GROUPNAME}
-+# eg. rancid-admin-routers
-+# 
-+MAILPREFIX="rancid-"; export MAILPREFIX
-+ADMINMAILPREFIX="rancid-admin-"; export ADMINMAILPREFIX
-+#
-+# To use a delimiter-based system instead of email aliases,
-+# comment the above 2 lines and uncomment the following two lines:
-+#MAILPREFIX="rancid+"; export MAILPREFIX
-+#ADMINMAILPREFIX="rancid-admin+"; export ADMINMAILPREFIX
-+#
-+#
- # list of rancid groups
- #LIST_OF_GROUPS="sl joebobisp"
- # more groups...
---- rancid-2.3.8/man/Makefile.am
-+++ rancid-2.3.8/man/Makefile.am
-@@ -79,9 +79,7 @@
- 	-e 's,@bindir\@,$(bindir),g' \
- 	-e 's,@localstatedir\@,$(localstatedir),g' \
- 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
--	-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
--	-e 's,@ADMINMAILPLUS\@,$(ADMINMAILPLUS),g' \
--	-e 's,@MAILPLUS\@,$(MAILPLUS),g'
-+	-e 's,@pkgdatadir\@,$(pkgdatadir),g'
- 
- lg.conf.5: Makefile $(srcdir)/lg.conf.5.in
- 	rm -f lg.conf.5 lg.conf.5.tmp; \
---- rancid-2.3.8/man/rancid.conf.5.in
-+++ rancid-2.3.8/man/rancid.conf.5.in
-@@ -81,6 +81,19 @@
- are always filtered (e.g.: Alteon passwords).
- .\"
- .TP
-+.B MAILPREFIX
-+Sets the mail prefix that is used to generate group emails. Configuration 
-+diffs are emailed to an address of the form {MAILPREFIX}{GROUPNAME}
-+eg. rancid-routers
-+.sp
-+Default: rancid-
-+.B ADMINMAILPREFIX
-+Sets the mail prefix that is used to generate admin group emails.
-+problems/errors are emailed to an address of the form 
-+{ADMINMAILPREFIX}{GROUPNAME}
-+eg. rancid-admin-routers
-+.sp
-+Default: rancid-admin-
- .B LIST_OF_GROUPS
- Defines a list of group names of routers separated by white-space.  These
- names become the directory names in $BASEDIR which contain the data
-@@ -104,10 +117,10 @@
- .sp
- .in +1i
- .nf
--@MAILPLUS@uofo:            frank
--@ADMINMAILPLUS@uofo:      joe,bob
--@MAILPLUS@usfs:            frank
--@ADMINMAILPLUS@usfs:      joe,bob
-+rancid-uofo:            frank
-+rancid-admin-uofo:      joe,bob
-+randid-usfs:            frank
-+rancid-admin-usfs:      joe,bob
- .fi
- .sp
- .in -1i
-@@ -129,7 +142,7 @@
- .B MAILDOMAIN
- Define the domain part of addresses for administrative and diff e-mail.
- The value of this variable is simply appended to the normal mail addresses.
--For example @MAILPLUS@usfs@example.com, if
-+For example rancid-usfs@example.com, if
- .B MAILDOMAIN
- had been set to "@example.com".
- .\"
---- rancid-2.3.8/share/downreport.in
-+++ rancid-2.3.8/share/downreport.in
-@@ -73,7 +73,7 @@
- 
- for GROUP in $LIST_OF_GROUPS; do
-   (
--    echo "To: @MAILPLUS@admin-$GROUP"
-+    echo "To: ${ADMINMAILPREFIX}$GROUP"
-     echo "Subject: Down router report - $GROUP"
-     echo "$MAILHEADERS" | awk '{gsub(/\\n/,"\n");print;}'
-     echo ""
diff --git a/net-misc/rancid-git/metadata.xml b/net-misc/rancid-git/metadata.xml
deleted file mode 100644
index 08681bd3b2be..000000000000
--- a/net-misc/rancid-git/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="git">Enable git (version control system) support</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">dotwaffle/rancid-git</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/rancid-git/rancid-git-2.3.8.ebuild b/net-misc/rancid-git/rancid-git-2.3.8.ebuild
deleted file mode 100644
index 5e09d068be48..000000000000
--- a/net-misc/rancid-git/rancid-git-2.3.8.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils readme.gentoo user
-
-DESCRIPTION="New Cisco confIg Differ with git extensions and support for colorized emails!"
-HOMEPAGE="https://dotwaffle.github.com/rancid-git"
-#SRC_URI="ftp://ftp.shrubbery.net/pub/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/dotwaffle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD-4"
-
-SLOT="0"
-RESTRICT="mirror"
-KEYWORDS="~amd64 ~x86"
-IUSE="+git cvs subversion"
-REQUIRED_USE="^^ ( git cvs subversion )"
-
-# app-arch/par is blocker, due to bug #455838
-DEPEND="!app-arch/par
-	dev-lang/perl
-	dev-lang/tcl:0=
-	dev-tcltk/expect
-	sys-apps/diffutils
-	git? ( dev-vcs/git )
-	cvs? ( dev-vcs/cvs )
-	subversion? ( dev-vcs/subversion )
-	|| (
-		net-misc/netkit-telnetd
-		net-misc/telnet-bsd
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P/-git}-mailprefix.patch
-	epatch "${FILESDIR}"/${P/-git}-config.patch
-	epatch "${FILESDIR}"/${P/-git}-buildsystem.patch
-
-	# respect CFLAGS, bug #455840
-	sed -i -e '/^CFLAGS/d' bin/Makefile.am || die 'sed on bin/Makefile.am failed'
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var/${PN} \
-		--enable-conf-install \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		$(use_with subversion svn fsfs) \
-		$(use_with git)
-}
-
-src_install() {
-	default
-
-	if use subversion ; then
-		sed -e 's/^RCSSYS=cvs/RCSSYS=svn/' \
-			-i "${D}"/etc/rancid.conf || die
-	fi
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}/var/rancid/.cloginrc\"" > "${T}"/99${PN}
-	doenvd "${T}"/99${PN}
-
-	readme.gentoo_src_install
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash "${EPREFIX}"/var/rancid ${PN}
-
-	keepdir /var/${PN}{,/logs}
-	touch 	"${ED}"/var/${PN}/.cloginrc
-
-	fperms ug=rwX,o= /var/${PN}/{,logs,.cloginrc}
-	fowners ${PN}:${PN} /var/${PN}/{,logs,.cloginrc}
-}
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Micro-HOWTO on how to get running:
-
-1) Modify MAILPREFIX, ADMINMAILPREFIX, and LIST_OF_GROUPS
-in /etc/rancid.conf:
-MAILPREFIX=\"rancid-\"
-ADMINMAILPREFIX=\"rancid-admin-\"
-LIST_OF_GROUPS=\"routers switches\"
-
-2) Setup email aliases for rancid:
-you will need to define mail aliases for {MAILPREFIX}{GROUP}
-and {ADMINMAILPREFIX}{GROUP} for each group you defined above
-How to do this depends on your mailserver
-
-3) Run rancid-cvs as the rancid user to initialise directories and
-repositories; eg. su -c /usr/bin/rancid-cvs - rancid
-Note the command is the same even if you are using subversion
-
-4) Populate /var/rancid/{GROUPNAME}/router.db with nodes
-see man 5 router.db for detailed formatting information
-
-5) Populate /var/rancid/.cloginrc with credentials
-see /usr/share/rancid/cloginrc.sample for an example
-
-6) Test clogin access with: clogin -f /var/rancid/.clogin hostname
-
-7) Add a cronjob for the rancid user to regularly call rancid-run
-eg: run crontab -u rancid -e and add the lines below
-# run rancid once an hour
-0 * * * *	/usr/bin/rancid-run
-# cleanup old logfiles generated by rancid once a day
-50 23 * * *	/usr/bin/find /var/rancid/logs -type f -mtime +2 -exec rm {} \;
-"
diff --git a/net-misc/rancid/Manifest b/net-misc/rancid/Manifest
deleted file mode 100644
index 8e4d7ebb84a7..000000000000
--- a/net-misc/rancid/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX rancid-2.3.8-buildsystem.patch 1741 BLAKE2B 03056e70631b0bae0b8501df70b38ebcbc148ba98a2811b74c79f90d909f8996c1c75649d8c511f117861a8a1da34c12dc952b8e673599286b62c9fb99837e3a SHA512 2ce1befcd4898654958e8a961156a6eda95da319d98ca66c9cb216ab46b80166571146b631a699be5702d5bb7baa8301b570fe82fb89ba8096a941807005f9ab
-AUX rancid-2.3.8-config.patch 1241 BLAKE2B 8d03211285ecd05d277cb5d1e60f3ba3f91eaec3e2bf35cbad4976907aa952438714447da66994784d39c1ea15448883c3b2f3ed4264d30939a39bfbecf09592 SHA512 abad6758dbe89eacf566b5cc931749ed9667ec7f7e824a8091f5a02edfeacb4497b1dfc5444ae41f5652a479791c585e4625b8877e710f460698a8bb2cccce9c
-AUX rancid-2.3.8-mailprefix.patch 5878 BLAKE2B 87d5ef27a2194eb746006e0330b562a22d7801ec9954e248b41417defddc2ccdaa92a7c9b220edb6f1aba312e43e8e5cfe16b4ff47893538e781e3aa9a896abe SHA512 c01cdaafd599c8b1559b158ba0999c1e79c40dc4c8f6c0f5aa284225a5903ba967b742cee7d81f2edeb07c6e7e344c1208c018421c023a7f678204c647f3e8bd
-DIST rancid-2.3.8.tar.gz 379908 BLAKE2B eea909cd486086d436bf9bf8d7eb287471fa0af2a2a257ba9974adbcc01fa946cbc0173e7d6e93842eaf3dac321abaad2db2ec33a0e625b50b401e9373715b23 SHA512 cd071670e160f2e8268e676ae92b0d982719a2bc306aef3ef8fdbbaae398854178613eee2a139f206e799eba6c0b49dce2094db69ea57ef938e5d0c2c294a3cc
-EBUILD rancid-2.3.8.ebuild 3035 BLAKE2B b0632e2847e5f3a452367d428d5af48278973365f67401ba02dd0043cff532f953a2a97ae78984dfc77ce19e53c7a885c281f6e1ea2030f46edda395504b4d11 SHA512 b5d74ea75f21903bf77cbec3fbc81afc3e61ddf41e6c5342967dc21387f398bd8fb5dbd6856d5f557635a8e8997149a1b0e60fa15a3e2e512581dfe86bdbdbbe
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/rancid/files/rancid-2.3.8-buildsystem.patch b/net-misc/rancid/files/rancid-2.3.8-buildsystem.patch
deleted file mode 100644
index 4a06b5c63723..000000000000
--- a/net-misc/rancid/files/rancid-2.3.8-buildsystem.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- rancid-2.3.8/configure.in
-+++ rancid-2.3.8/configure.in
-@@ -17,7 +17,7 @@
- dnl default install location
- AC_PREFIX_DEFAULT(/usr/local/rancid)
- 
--dnl AM_MAINTAINER_MODE()
-+AM_MAINTAINER_MODE()
- 
- dnl AC_CONFIG_SUBDIRS(util)
- 
-@@ -35,7 +35,6 @@
- 
- # compiler specifics
- AC_PROG_CC
--AM_C_PROTOTYPES
- AC_PROG_CPP
- AC_C_CONST
- AC_C_INLINE
-@@ -212,7 +212,7 @@
- # is good enough -- if we can't find GNU tar, we don't really care.
- AC_CHECK_PROGS(TAR, gnutar gtar tar)
- 
--AC_CHECK_PROGS(AUTOMAKE, automake)
-+dnl AC_CHECK_PROGS(AUTOMAKE, automake)
- 
- dnl locate perl 5 and expect.
- AC_PROG_INSTALL
---- rancid-2.3.8/Makefile.am
-+++ rancid-2.3.8/Makefile.am
-@@ -24,7 +24,7 @@
- 
- @SET_MAKE@
- 
--pkgdata_DATA = COPYING CHANGES FAQ README README.lg UPGRADING cloginrc.sample
-+dist_doc_DATA = COPYING CHANGES FAQ README README.lg UPGRADING cloginrc.sample
- EXTRA_DIST = BUGS Todo configure install-sh \
- 	mkinstalldirs Makefile.in Todo $(pkgdata_DATA)
- #DIST_COMMON = 
---- rancid-2.3.8/share/Makefile.am
-+++ rancid-2.3.8/share/Makefile.am
-@@ -50,8 +50,9 @@
- 
- pkgdata_SCRIPTS= rancid-cvspurge rtrfilter downreport
- dist_pkgdata_SCRIPTS=getipacctg
--dist_pkgdata_DATA=README.misc cisco-load.exp cisco-reload.exp \
--	index.html lgnotes.html
-+dist_pkgdata_DATA=cisco-load.exp cisco-reload.exp
-+dist_doc_DATA=README.misc
-+dist_html_DATA=index.html lgnotes.html
- 
- EXTRA_DIST = rancid-cvspurge.in rancid.spec rtrfilter.in downreport.in
- 
---- rancid-2.3.8/etc/Makefile.am
-+++ rancid-2.3.8/etc/Makefile.am
-@@ -48,7 +48,7 @@
- #AUTOMAKE_OPTIONS=foreign no-dependencies
- AUTOMAKE_OPTIONS=foreign
- 
--pkgdata_DATA= lg.conf.sample rancid.conf.sample
-+dist_doc_DATA= lg.conf.sample rancid.conf.sample
- EXTRA_DIST= $(pkgdata_DATA:%=%.in)
- 
- CLEANFILES= $(pkgdata_DATA)
diff --git a/net-misc/rancid/files/rancid-2.3.8-config.patch b/net-misc/rancid/files/rancid-2.3.8-config.patch
deleted file mode 100644
index f39f28382da8..000000000000
--- a/net-misc/rancid/files/rancid-2.3.8-config.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- etc/rancid.conf.sample.in
-+++ etc/rancid.conf.sample.in
-@@ -42,7 +42,10 @@
- RCSSYS=@RCSSYS@; export RCSSYS
- #
- # if ACLSORT is NO, access-lists will NOT be sorted.
--#ACLSORT=YES; export ACLSORT
-+#
-+#Gentoo - changing default to NO because access-list order matters in most instances
-+#and many people expect to use rancid as a backup system
-+ACLSORT=NO; export ACLSORT
- #
- # if NOPIPE is set, temp files will be used instead of a cmd pipe during
- # collection from the router(s).
-@@ -50,10 +53,16 @@
- #
- # FILTER_PWDS determines which passwords are filtered from configs by the
- # value set (NO | YES | ALL).  see rancid.conf(5).
--#FILTER_PWDS=YES; export FILTER_PWDS
-+#
-+#Gentoo - changing default to ALL; diffs are emailed and even the most secure
-+#password hashes on most routers are easily brute-forceable with modern systems
-+FILTER_PWDS=ALL; export FILTER_PWDS
- #
- # if NOCOMMSTR is set, snmp community strings will be stripped from the configs
--#NOCOMMSTR=YES; export NOCOMMSTR
-+#
-+#Gentoo - changing default to YES; diffs are emailed and SNMP communities
-+#can be just as dangerous as passwords
-+NOCOMMSTR=YES; export NOCOMMSTR
- #
- # How many times failed collections are retried (for each run) before
- # giving up.  Minimum: 1
diff --git a/net-misc/rancid/files/rancid-2.3.8-mailprefix.patch b/net-misc/rancid/files/rancid-2.3.8-mailprefix.patch
deleted file mode 100644
index 171a380679dc..000000000000
--- a/net-misc/rancid/files/rancid-2.3.8-mailprefix.patch
+++ /dev/null
@@ -1,178 +0,0 @@
---- rancid-2.3.8/bin/Makefile.am
-+++ rancid-2.3.8/bin/Makefile.am
-@@ -96,8 +96,6 @@
- 	-e 's,@PERLV\@,$(PERLV),g' \
- 	-e 's,@PERLV_PATH\@,$(PERLV_PATH),g' \
- 	-e 's,@LG_PING_CMD\@,$(LG_PING_CMD),g' \
--	-e 's,@ADMINMAILPLUS\@,$(ADMINMAILPLUS),g' \
--	-e 's,@MAILPLUS\@,$(MAILPLUS),g' \
- 	-e 's,@PACKAGE\@,$(PACKAGE),g' \
- 	-e 's,@SVN_FSTYPE\@,$(SVN_FSTYPE),g' \
- 	-e 's,@VERSION\@,$(VERSION),g' \
---- rancid-2.3.8/bin/control_rancid.in
-+++ rancid-2.3.8/bin/control_rancid.in
-@@ -118,8 +118,8 @@
- fi
- 
- # the receipient(s) of diffs & mail options
--mailrcpt=${mailrcpt:-"@MAILPLUS@${GROUP}${MAILDOMAIN}"}; export mailrcpt
--adminmailrcpt=${adminmailrcpt:-"@ADMINMAILPLUS@${GROUP}${MAILDOMAIN}"};
-+mailrcpt=${mailrcpt:-"${MAILPREFIX}${GROUP}${MAILDOMAIN}"}; export mailrcpt
-+adminmailrcpt=${adminmailrcpt:-"${ADMINMAILPREFIX}${GROUP}${MAILDOMAIN}"};
- export adminmailrcpt
- set | grep MAILHEADERS= > /dev/null 2>&1
- if [ $? -ne 0 ] ; then
---- rancid-2.3.8/bin/rancid-run.in
-+++ rancid-2.3.8/bin/rancid-run.in
-@@ -147,7 +147,7 @@
- 	    if [ -s $TMPDIR/.$GROUP.old ]
- 	    then
- 		(
--		  echo "To: @ADMINMAILPLUS@${GROUP}${MAILDOMAIN}"
-+		  echo "To: ${ADMINMAILPREFIX}${GROUP}${MAILDOMAIN}"
- 		  echo "Subject: rancid hung - $GROUP"
- 		  echo "Precedence: bulk"
- 		  echo ""
---- rancid-2.3.8/configure.in
-+++ rancid-2.3.8/configure.in
-@@ -163,46 +163,6 @@
- AC_SUBST(SVN_FSTYPE)
- rd_cv_RCSSYS=$RCSSYS
- 
--# Check for a preference for using mail addresses like rancid+group
--# instead of the standard rancid-group
--AC_MSG_CHECKING([whether mail addresses should be in the rancid+ form])
--AC_ARG_ENABLE(mail-plus,
--	AS_HELP_STRING([--enable-mail-plus], [enable mail to rancid+ addresses, instead of rancid-]),
--[if test "$enable_mail_plus" = yes; then
--    AC_MSG_RESULT(yes)
--    MAILPLUS="rancid+"
--    AC_SUBST(MAILPLUS)
--else
--    AC_MSG_RESULT(no)
--    MAILPLUS="rancid-"
--    AC_SUBST(MAILPLUS)
--fi],
--[AC_MSG_RESULT(no)
--    MAILPLUS="rancid-"
--    AC_SUBST(MAILPLUS)
--])
--rd_cv_MAILPLUS=$MAILPLUS
--
--# Check for a preference for using mail addresses like rancid+admin-group
--# instead of the standard rancid-admin-group
--AC_MSG_CHECKING([whether admin mail addresses should be in the rancid-admin+ form])
--AC_ARG_ENABLE(adminmail-plus,
--	AS_HELP_STRING([--enable-adminmail-plus], [enable mail to rancid-admin+ addresses, instead of rancid-admin-]),
--[if test "$enable_adminmail_plus" = yes; then
--    AC_MSG_RESULT([rancid-admin+])
--    ADMINMAILPLUS="rancid-admin+"
--    AC_SUBST(ADMINMAILPLUS)
--else
--    AC_MSG_RESULT([${MAILPLUS}admin-])
--    ADMINMAILPLUS="${MAILPLUS}admin-"
--    AC_SUBST(ADMINMAILPLUS)
--fi],
--[AC_MSG_RESULT([${MAILPLUS}admin-])
--    ADMINMAILPLUS="${MAILPLUS}admin-"
--    AC_SUBST(ADMINMAILPLUS)
--])
--rd_cv_ADMINMAILPLUS=$ADMINMAILPLUS
--
- AC_PATH_PROG(DIRNAME,dirname,no)
- 
- # locate GNU diff (one supporting the -u option)
---- rancid-2.3.8/etc/rancid.conf.sample.in
-+++ rancid-2.3.8/etc/rancid.conf.sample.in
-@@ -71,6 +71,21 @@
- # The number of devices to collect simultaneously.
- #PAR_COUNT=5; export PAR_COUNT
- #
-+# Define the prefixes for regular and administrative email groups
-+# configuration diffs will be emailed to {MAILPREFIX}{GROUPNAME}
-+# eg. rancid-routers
-+# problems/errors will be emailed to {ADMINMAILPREFIX}{GROUPNAME}
-+# eg. rancid-admin-routers
-+# 
-+MAILPREFIX="rancid-"; export MAILPREFIX
-+ADMINMAILPREFIX="rancid-admin-"; export ADMINMAILPREFIX
-+#
-+# To use a delimiter-based system instead of email aliases,
-+# comment the above 2 lines and uncomment the following two lines:
-+#MAILPREFIX="rancid+"; export MAILPREFIX
-+#ADMINMAILPREFIX="rancid-admin+"; export ADMINMAILPREFIX
-+#
-+#
- # list of rancid groups
- #LIST_OF_GROUPS="sl joebobisp"
- # more groups...
---- rancid-2.3.8/man/Makefile.am
-+++ rancid-2.3.8/man/Makefile.am
-@@ -79,9 +79,7 @@
- 	-e 's,@bindir\@,$(bindir),g' \
- 	-e 's,@localstatedir\@,$(localstatedir),g' \
- 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
--	-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
--	-e 's,@ADMINMAILPLUS\@,$(ADMINMAILPLUS),g' \
--	-e 's,@MAILPLUS\@,$(MAILPLUS),g'
-+	-e 's,@pkgdatadir\@,$(pkgdatadir),g'
- 
- lg.conf.5: Makefile $(srcdir)/lg.conf.5.in
- 	rm -f lg.conf.5 lg.conf.5.tmp; \
---- rancid-2.3.8/man/rancid.conf.5.in
-+++ rancid-2.3.8/man/rancid.conf.5.in
-@@ -81,6 +81,19 @@
- are always filtered (e.g.: Alteon passwords).
- .\"
- .TP
-+.B MAILPREFIX
-+Sets the mail prefix that is used to generate group emails. Configuration 
-+diffs are emailed to an address of the form {MAILPREFIX}{GROUPNAME}
-+eg. rancid-routers
-+.sp
-+Default: rancid-
-+.B ADMINMAILPREFIX
-+Sets the mail prefix that is used to generate admin group emails.
-+problems/errors are emailed to an address of the form 
-+{ADMINMAILPREFIX}{GROUPNAME}
-+eg. rancid-admin-routers
-+.sp
-+Default: rancid-admin-
- .B LIST_OF_GROUPS
- Defines a list of group names of routers separated by white-space.  These
- names become the directory names in $BASEDIR which contain the data
-@@ -104,10 +117,10 @@
- .sp
- .in +1i
- .nf
--@MAILPLUS@uofo:            frank
--@ADMINMAILPLUS@uofo:      joe,bob
--@MAILPLUS@usfs:            frank
--@ADMINMAILPLUS@usfs:      joe,bob
-+rancid-uofo:            frank
-+rancid-admin-uofo:      joe,bob
-+randid-usfs:            frank
-+rancid-admin-usfs:      joe,bob
- .fi
- .sp
- .in -1i
-@@ -129,7 +142,7 @@
- .B MAILDOMAIN
- Define the domain part of addresses for administrative and diff e-mail.
- The value of this variable is simply appended to the normal mail addresses.
--For example @MAILPLUS@usfs@example.com, if
-+For example rancid-usfs@example.com, if
- .B MAILDOMAIN
- had been set to "@example.com".
- .\"
---- rancid-2.3.8/share/downreport.in
-+++ rancid-2.3.8/share/downreport.in
-@@ -73,7 +73,7 @@
- 
- for GROUP in $LIST_OF_GROUPS; do
-   (
--    echo "To: @MAILPLUS@admin-$GROUP"
-+    echo "To: ${ADMINMAILPREFIX}$GROUP"
-     echo "Subject: Down router report - $GROUP"
-     echo "$MAILHEADERS" | awk '{gsub(/\\n/,"\n");print;}'
-     echo ""
diff --git a/net-misc/rancid/metadata.xml b/net-misc/rancid/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-misc/rancid/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-misc/rancid/rancid-2.3.8.ebuild b/net-misc/rancid/rancid-2.3.8.ebuild
deleted file mode 100644
index 300c3ef0e190..000000000000
--- a/net-misc/rancid/rancid-2.3.8.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils readme.gentoo user
-
-DESCRIPTION="Really Awesome New Cisco confIg Differ"
-HOMEPAGE="http://www.shrubbery.net/rancid/"
-SRC_URI="http://http.debian.net/debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD-4"
-
-SLOT="0"
-RESTRICT="mirror"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cvs subversion"
-
-REQUIRED_USE="^^ ( cvs subversion )"
-
-# app-arch/par is blocker, due to bug #455838
-DEPEND="
-	!app-arch/par
-	dev-lang/perl
-	dev-lang/tcl:0=
-	dev-tcltk/expect
-	sys-apps/diffutils
-	cvs? ( dev-vcs/cvs )
-	subversion? ( dev-vcs/subversion )
-	|| (
-		net-misc/netkit-telnetd
-		net-misc/telnet-bsd
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-mailprefix.patch
-	epatch "${FILESDIR}"/${P}-config.patch
-	epatch "${FILESDIR}"/${P}-buildsystem.patch
-
-	# respect CFLAGS, bug #455840
-	sed -i -e '/^CFLAGS/d' bin/Makefile.am || die 'sed on bin/Makefile.am failed'
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var/${PN} \
-		--enable-conf-install \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		$(use subversion && echo "--with-svn=fsfs")
-}
-
-src_install() {
-	default
-
-	if use subversion ; then
-		sed -e 's/^RCSSYS=cvs/RCSSYS=svn/' \
-			-i "${D}"/etc/rancid.conf || die
-	fi
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}/var/rancid/.cloginrc\"" > "${T}"/99${PN}
-	doenvd "${T}"/99${PN}
-
-	readme.gentoo_src_install
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash "${EPREFIX}"/var/rancid ${PN}
-
-	keepdir /var/${PN}{,/logs}
-	touch 	"${ED}"/var/${PN}/.cloginrc
-
-	fperms ug=rwX,o= /var/${PN}/{,logs,.cloginrc}
-	fowners ${PN}:${PN} /var/${PN}/{,logs,.cloginrc}
-}
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Micro-HOWTO on how to get running:
-
-1) Modify MAILPREFIX, ADMINMAILPREFIX, and LIST_OF_GROUPS
-in /etc/rancid.conf:
-MAILPREFIX=\"rancid-\"
-ADMINMAILPREFIX=\"rancid-admin-\"
-LIST_OF_GROUPS=\"routers switches\"
-
-2) Setup email aliases for rancid:
-you will need to define mail aliases for {MAILPREFIX}{GROUP}
-and {ADMINMAILPREFIX}{GROUP} for each group you defined above
-How to do this depends on your mailserver
-
-3) Run rancid-cvs as the rancid user to initialise directories and
-repositories; eg. su -c /usr/bin/rancid-cvs - rancid
-Note the command is the same even if you are using subversion
-
-4) Populate /var/rancid/{GROUPNAME}/router.db with nodes
-see man 5 router.db for detailed formatting information
-
-5) Populate /var/rancid/.cloginrc with credentials
-see /usr/share/rancid/cloginrc.sample for an example
-
-6) Test clogin access with: clogin -f /var/rancid/.clogin hostname
-
-7) Add a cronjob for the rancid user to regularly call rancid-run
-eg: run crontab -u rancid -e and add the lines below
-# run rancid once an hour
-0 * * * *	/usr/bin/rancid-run
-# cleanup old logfiles generated by rancid once a day
-50 23 * * *	/usr/bin/find /var/rancid/logs -type f -mtime +2 -exec rm {} \;
-"
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
index c4f24128418c..0c9429d06892 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -1,6 +1,6 @@
 AUX rdate-confd 509 BLAKE2B 92826ed23b867063c8cf1145e7a2f62fe6a904593eca1add05971f06773ae992f08e58bb4f5367660e93937baf7bf3d0fe35a508bdaea44bca104c0871cf6ba8 SHA512 1ebc27949cf5c68828e00cacb20644b6c6b0e833c23b4f9e31144f0e47c10daa06b82909198227cdc7018939cbae09f2fe53de69aa84c8b9a8ecb0ab9eaf1f8f
 AUX rdate-initd-1.4-r3 525 BLAKE2B 8533f2b589aa860d88a7cdf18931b2a5800a1d82a78db576dfb12189f4b3391535bff5896ef75d6b3ef7373e1ad86c86a82f7422f4c404af8b9b3e414aaad59c SHA512 8563dedff5b2188d5176a882e36d4c8cdab4709ca40e86eb9c76e30f91c3eb78d1da8f971d2c2f4189ef801413e173367d2a8a2b9b37608ef6a84a0e73e39157
 DIST rdate-1.4.tar.gz 11500 BLAKE2B 705324648f30685135d3ba3936b05a82bc6a027d3d1c407950cb7631858f6d9dba34f97f065482988caf4a68addc3ba122fe475cfd1684c526f5224113657ac3 SHA512 ea9d62af3aa58fb7bb2bdce257cc23758f103ac056e4d6a8b44be0e41c44dff49e78bdb03789e3bf2957e74997c2f1c0376fdc659b4f39d89e43ef139a51f996
-EBUILD rdate-1.4-r3.ebuild 756 BLAKE2B 3c7ef54634728d88ad39f365da2041a94232aa4babb7f742df9181dd63cf9add4983b6971c2f5586b66c8144251577682e09ef20223044db5b05952bf0e2cb99 SHA512 25303a725b89e93eb7d82c0f80548fbb57680f17d106b0b1f83c7926e5d33c23570117b2b84cc99293dbdaf10c98797f93ef6fc6f46b36424ee87976dc120256
-EBUILD rdate-1.4-r4.ebuild 806 BLAKE2B 679e6a3a7102ec17cf51e507b2f015dbfa2cad83e3e0914548f7bc3dbf6c7f1ef40ae62562faa2b1f9ec9c86ac6facec96be9a003869d2fc4b223b5d6b860022 SHA512 1b917278e3874586f7d94b702da7fc9d9f85e5354e5e30f9216f876644b326402ec36d719e4cc6b7e3bf6a2f1ac1fafaab682d6fbe01378969ff2206a5b037e3
+EBUILD rdate-1.4-r3.ebuild 760 BLAKE2B 8f4aec10b8a05fbd9255c7cc3a469aa2965229e959f63e7065d848f0580cee31dcdbaae6dee266d9e30118f147b2f6993102d68400978edd96c666734fc6c427 SHA512 02ef90d5ec1551a38be61aa5154f96e5ee507fd07ec6003c151022b2e9749031ecd727164511bc410ddfdf42d609c4359477cf96e7797cc58f1cb8b96afcfb7e
+EBUILD rdate-1.4-r4.ebuild 810 BLAKE2B 135987f057155983a85edacbe1abc6bcb0adad69da01040f7b55063327af7d8f3f7338f131a581e2bbcec066f98a14838360732d4853c35e806331bf5b18b317 SHA512 c3264347504d19461b7c653659791188fba0da4ef22c38d9249941aaa1442c94deb32e291a4f0d7ada90716886ea8f487ad03cb03c0944f4a1f93b6be058396b
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/rdate/rdate-1.4-r3.ebuild b/net-misc/rdate/rdate-1.4-r3.ebuild
index 2120355afb6e..b773a09b8bd4 100644
--- a/net-misc/rdate/rdate-1.4-r3.ebuild
+++ b/net-misc/rdate/rdate-1.4-r3.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
@@ -11,7 +11,7 @@ SRC_URI="ftp://people.redhat.com/sopwith/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="ipv6"
 
 DEPEND=""
diff --git a/net-misc/rdate/rdate-1.4-r4.ebuild b/net-misc/rdate/rdate-1.4-r4.ebuild
index 3a0fc636df3e..7c0aae4ea09c 100644
--- a/net-misc/rdate/rdate-1.4-r4.ebuild
+++ b/net-misc/rdate/rdate-1.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="ftp://people.redhat.com/sopwith/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="ipv6"
 
 DEPEND=""
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 3cb54bcc71ab..65bdcf0936d5 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -2,6 +2,8 @@ AUX rdesktop-1.6.0-sound_configure.patch 818 BLAKE2B 131a59e1e403982d269acf9e0eb
 AUX rdesktop-1.8.3-no_strip.patch 428 BLAKE2B 86249bbebd944fc5d3f8e79978f712ab3633b199ce907017656c79a3be4a5e85cdc76b5e11d49cd6fa83c248c34244177eecc7d1e5bbcc4456044765ba34f16c SHA512 bdf1c4e89f14cc87cf5acc657b5998947c37e3e3103254a3dd4dea0a544f61d9e1b421bddaecca339d993dcd367ef836c328f6782152072fb755aba1662bff03
 AUX rdesktop-1.8.3-xrandr_configure.patch 666 BLAKE2B 1d2b0b57069b4e8a4eeed2d3d81628ebd9f4770bf70c3e88a123d636778240de37cec9c7fa6e5131fc9e019b9d7d6e22b5c8dbd39059ffe1b121c8c800777111 SHA512 f887b2499f71992501485061b047905dbd38445fc45a24e65f5b7e22b83aa14a80b339346ecfc5c185f5fd77e15daeeb5361f009ef02a2858f55cd1a34c56c3d
 AUX rdesktop-1.8.4-libressl.patch 395 BLAKE2B d7ae01de041bcba333c6c72348c28665a8b1cab12ace786848515b6455f189121c8e87a393255ac25b116d5027d0756a35b1de60007f37426e82f32c9cdc2f5e SHA512 dfc8b4af9d22d587846f5d18d3063c4932b3add419b60a01ff391e3ac5f7b1d6b40614e54cdff61c66b2690a879550d7ffad38c71188d62e598a8f63d347dd98
+AUX rdesktop-1.8.4-use_standard_gssapi.patch 2696 BLAKE2B 01f5542dc294d51f6d2fccf7141fc02ed199042cc25000bbc90d3387d6cd0b93ebce1a3ebbcaa1a8817bdd660dedd09d115f979fabb561b3ccc9e56e126bbd60 SHA512 ae91f4e0eb1e2c3141aedef660eb89628b334155c8c0559805cc4ac75274fff94101daf665052b27fe5074ce7468ff854fab865e7efd377d08d525319c7aa150
 DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7ad0feb144746c904146c410c6456391eb3f2b7b9a6a40c2fb34515bb7518888c2c9da8dfcaf17c5309ff21cad3 SHA512 9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae
 EBUILD rdesktop-1.8.4-r1.ebuild 1736 BLAKE2B 2683cb189864e5895da4d8252a96e6729bdf6484fab692c5b7922e9cfa4d66bbb2885fbcac7d7863d787d5ddd253faa05124bc712450b7a2d7a7f274242a39ae SHA512 16d5d030d96a6a27ef134e6d5f6b6a94a90034042f2dc02c587788f312403c1aaf9c71f0baf1001910053c703b96e009975d5fdc328a4114c0c511821117570c
+EBUILD rdesktop-1.8.4-r2.ebuild 1783 BLAKE2B 94a097e988cb19622eb8165830136f78f7ef6081914d64660974be4b97b861b4a01cd631a45009910cf27a2498c2e6f74e9be48ba0ccf8d4ea67a84eaba0fd93 SHA512 66a9fdc1e5c46fcf09879f482cb1b918614ed012373b776b05622dbc520d60d626a487422cf7ab0161886355fe17b392a64074da357e67a25c780cf625783679
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.4-use_standard_gssapi.patch b/net-misc/rdesktop/files/rdesktop-1.8.4-use_standard_gssapi.patch
new file mode 100644
index 000000000000..5befcf02e55b
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.8.4-use_standard_gssapi.patch
@@ -0,0 +1,82 @@
+From 71f1cfb909c0a955632001cf9fad80a321a43372 Mon Sep 17 00:00:00 2001
+From: Pierre Ossman <ossman@cendio.se>
+Date: Mon, 10 Jul 2017 15:12:26 +0200
+Subject: [PATCH 1/2] Fix pointer types for gss_wrap()/gss_unrap()
+
+We were using the incorrect type for the context for these two calls.
+No practical effects, but some noise from the compiler about the wrong
+pointer type.
+---
+ cssp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cssp.c b/cssp.c
+index 9f4c0829..6ac37746 100644
+--- a/cssp.c
++++ b/cssp.c
+@@ -173,7 +173,7 @@ cssp_gss_get_service_name(char *server, gss_name_t * name)
+ }
+ 
+ static RD_BOOL
+-cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in, STREAM out)
++cssp_gss_wrap(gss_ctx_id_t ctx, STREAM in, STREAM out)
+ {
+ 	int conf_state;
+ 	OM_uint32 major_status;
+@@ -212,7 +212,7 @@ cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in, STREAM out)
+ }
+ 
+ static RD_BOOL
+-cssp_gss_unwrap(gss_ctx_id_t * ctx, STREAM in, STREAM out)
++cssp_gss_unwrap(gss_ctx_id_t ctx, STREAM in, STREAM out)
+ {
+ 	OM_uint32 major_status;
+ 	OM_uint32 minor_status;
+
+From b556651fe109c8802a0c798b8a680e5ff883bf4e Mon Sep 17 00:00:00 2001
+From: Pierre Ossman <ossman@cendio.se>
+Date: Mon, 10 Jul 2017 15:14:01 +0200
+Subject: [PATCH 2/2] Use standard GSSAPI rather than libgssglue
+
+That project is abandoned and the distributions aren't including
+it anymore.
+---
+ configure.ac | 15 ++++-----------
+ 1 file changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e045c409..a969ad5d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -122,27 +122,20 @@ fi
+ 
+ dnl CredSSP feature
+ AC_ARG_ENABLE([credssp], AS_HELP_STRING([--disable-credssp], [disable support for CredSSP]))
+-AC_ARG_ENABLE([static-gssglue], AS_HELP_STRING([--enable-static-gssglue]), 
+-	      [static_gssglue=yes], [static_gssglue=no])
+ AS_IF([test "x$enable_credssp" != "xno"], [
+ 	  if test -n "$PKG_CONFIG"; then
+-	    PKG_CHECK_MODULES(GSSGLUE, libgssglue, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
++	    PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
+ 	  fi
+ 
+ 	  if test x"$WITH_CREDSSP" = "x1"; then
+ 	      CREDSSPOBJ="cssp.o"
+-	      CFLAGS="$CFLAGS $GSSGLUE_CFLAGS"
+-
+-	      AS_IF([test "x$static_gssglue" != "xno"], [
+-	          LIBS="$LIBS -Wl,-Bstatic -lgssglue -Wl,-Bdynamic"
+-	      ], [
+-	          LIBS="$LIBS -lgssglue"
+-	      ])
++	      CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
++	      LIBS="$LIBS $GSSAPI_LIBS"
+ 
+ 	      AC_DEFINE(WITH_CREDSSP)
+ 	  else
+ 		echo
+-		echo "CredSSP support requires libgssglue, install the dependency"
++		echo "CredSSP support requires GSSAPI, install the dependency"
+ 		echo "or disable the feature using --disable-credssp."
+ 		echo
+ 		exit 1
diff --git a/net-misc/rdesktop/rdesktop-1.8.4-r2.ebuild b/net-misc/rdesktop/rdesktop-1.8.4-r2.ebuild
new file mode 100644
index 000000000000..ea7ed235070d
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.4-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://www.rdesktop.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.6 )
+	kerberos? ( virtual/krb5 )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+BDEPEND=virtual/pkgconfig
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
+	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
+	"${FILESDIR}"/${P}-libressl.patch
+	"${FILESDIR}"/${P}-use_standard_gssapi.patch
+)
+
+DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use ao; then
+		sound_conf=$(use_with ao sound libao)
+	else if use alsa; then
+			sound_conf=$(use_with alsa sound alsa)
+		else
+			sound_conf=$(use_with oss sound oss)
+		fi
+	fi
+
+	econf \
+		--with-openssl="${EPREFIX}"/usr \
+		$(use_with debug) \
+		$(use_with ipv6) \
+		$(use_with libsamplerate) \
+		$(use_with xrandr) \
+		$(use_enable kerberos credssp) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}
diff --git a/net-misc/redir/Manifest b/net-misc/redir/Manifest
index 102717c4f741..9b870659f10d 100644
--- a/net-misc/redir/Manifest
+++ b/net-misc/redir/Manifest
@@ -1,3 +1,5 @@
 DIST redir-3.2.tar.xz 84240 BLAKE2B d1b48a14ea83cdcd58b7b2449e340e5cc110e212f17ec2f56cb8a914bc2c880d009d102dcb2cb1ee723ec4e3ceb48cd396731863fdc9ae864fe4fbf15ed90eec SHA512 b379047e94f377847b15c4e4c94fa34be996fbf6b26a83670061d705791902b184e89270887a967b2aed993f9ca46c3d0a41cde6b162ff9b32dbb689c1384c6f
+DIST redir-3.3.tar.xz 84980 BLAKE2B 3275e8315dbcd4666adc5064af80848f3c41378c46880ef825bae4d5a6d5a4246b959596a6810f5484db033d3f27a1b1860e40c250b29c75defa600cdf48a5d1 SHA512 89d9b45bc62538751cc0d8baf8dc3dc5ed84888faf18125c4044bb813ca415607b4906e9f5ccd60484eb737ad44d5c3bd22458444dee58d6e3be31446a71c3f3
 EBUILD redir-3.2.ebuild 418 BLAKE2B 5029224479a247f22f095931f7ef54b549fd2bfd79fdfa0e61a0a8461686f5e9902c7d400e8c2c2da46b3ffee769df054141029ca6eccc3122f67dabc3e3fdcd SHA512 74671c09ad7a9f308edec0f464ece0d6ebe41b7f84f2286469ca220586ba9c4c29f7a67b7a42bc6a860b518b1d7b94dcffc4aade27fde128cdd9ea03b4defee4
+EBUILD redir-3.3.ebuild 417 BLAKE2B a3e9242b537575a739d16223a411020e0b28aad881e40b562346e05cbb8511d24baeaca18351c378ef24b910f464ec75648b5816ef60c273627500caebeeca65 SHA512 f85b540cdb15cafdafb60f7ee43ca7396118712f676767440f7b6e8a43a2dddae251424a2fe86d4f940f3ef9d4ee28f9cfd50bb6f92fb38de6e55a90951876e7
 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da
diff --git a/net-misc/redir/redir-3.3.ebuild b/net-misc/redir/redir-3.3.ebuild
new file mode 100644
index 000000000000..4e706162dccb
--- /dev/null
+++ b/net-misc/redir/redir-3.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Redir is a port redirector"
+HOMEPAGE="https://github.com/troglobit/redir"
+SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86 ~amd64-fbsd"
+
+DOCS=( ChangeLog.md README.md transproxy.txt )
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index bc7be3ef8313..ae94a7bed8af 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,3 @@
-DIST rygel-0.34.0.tar.xz 3997364 BLAKE2B 2906bcdea61caddd93a7fa0363c7957ce3c0443581a625b40712d2c75f25d05c693b745f72392c917190f754533c03c524fefa80799a5e8163f44eb22c1d33da SHA512 90e582f42e73376bbe6b06f33d44c6a70969961728dc512523bcc578b5b7c3f826cb425b469ade87d3fdf82117309f8589c30b1cdd8ba74cc14424c7f2efdb21
 DIST rygel-0.36.2.tar.xz 4057356 BLAKE2B 3ff1a0df12cdda694ded3a9a5c6d1495eaf0dff7133cbc84b73ad6bc767cd3a5e31ff8b579aff9c0de455f149e49dc972f7d93d64424d25501b02f2a02f66552 SHA512 8c079f83a00c9ad237b634e6274d27acc94a91adfa2829f0336b2485aa801e6898c30ec7268352247f1d12232d9ab3cb7a6f8215370f03aaff5323c4a8fdff7f
-EBUILD rygel-0.34.0.ebuild 2651 BLAKE2B 518b3e3e465bcfaa3e4cbe9db9b6b28cd57493b49c1d3e4fd5bc5fb793b1f4801632111c7cb05fd43ca81949ed134ad200202d7d090f2def68fcdeb24dcd4c97 SHA512 392b4fe250733a535fa6b6a0c35e92fe1d4798a5f7cee6f4fdc6a62b02c2196397a857ca5ad0850b122ed59bb75e6b49a04a173bf95f1140d922631fd184f3cf
-EBUILD rygel-0.36.2.ebuild 2174 BLAKE2B d05e08bbb01e95b0b292b198d729271143167022536baff1e19fff3ddb6d77d91c2831df7f5d2409071e8c0f7e904d903efeb9b2eb060c746590fff8193a7097 SHA512 6c8f06c1cea8f43aae53f3e9bf8874af0b24a791863ddc841206f22abed566762ff3d8901ef0b73bcf97ccb0a4e90c504e3c7f063beab6cf5dd0288a56f8d151
+EBUILD rygel-0.36.2.ebuild 2172 BLAKE2B 2ba08491b403ac96e2d66bd7374bfec6dbb599821de4f954d098bb9251c3c3eab10518df93837f6be7632e045acba251f3bdd805023d17a5ea276873f774d6f2 SHA512 511b19f3e10ac9f66624a13e6a2f37f4e87416ebf47109399ddc9aefbbdbd71d0678fe55bceda17397c4c1fc83469de3e7d8c0f25a30caa2aa3a5a900a4d5232
 MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce
diff --git a/net-misc/rygel/rygel-0.34.0.ebuild b/net-misc/rygel/rygel-0.34.0.ebuild
deleted file mode 100644
index 67c693981748..000000000000
--- a/net-misc/rygel/rygel-0.34.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 systemd versionator virtualx
-
-DESCRIPTION="Rygel is an open source UPnP/DLNA MediaServer"
-HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="X +introspection +sqlite tracker test transcode"
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=dev-libs/libgee-0.8:0.8
-	>=dev-libs/libxml2-2.7:2
-	>=media-libs/gupnp-dlna-0.9.4:2.0
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmediaart-0.7:2.0
-	media-plugins/gst-plugins-soup:1.0
-	>=net-libs/gssdp-0.13
-	>=net-libs/gupnp-0.20.14
-	>=net-libs/gupnp-av-0.12.8
-	>=net-libs/libsoup-2.44:2.4
-	>=sys-apps/util-linux-2.20
-	x11-misc/shared-mime-info
-	introspection? ( >=dev-libs/gobject-introspection-1.33.4:= )
-	sqlite? (
-		>=dev-db/sqlite-3.5:3
-		dev-libs/libunistring:=
-		x11-libs/gdk-pixbuf:2
-	)
-	tracker? ( app-misc/tracker:0/100 )
-	transcode? (
-		media-libs/gst-plugins-bad:1.0
-		media-plugins/gst-plugins-twolame:1.0
-		media-plugins/gst-plugins-libav:1.0
-	)
-	X? ( >=x11-libs/gtk+-3:3 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-# Maintainer only
-#   app-text/docbook-xsl-stylesheets
-#	>=dev-lang/vala-0.22
-#   dev-libs/libxslt
-
-src_prepare() {
-	# Disable test triggering call to gst-plugins-scanner which causes
-	# sandbox issues when plugins such as clutter are installed
-	sed -e 's/return rygel_playbin_renderer_test_main (argv, argc);/return 0;/' \
-		-i tests/rygel-playbin-renderer-test.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# We set xsltproc because man pages are provided by upstream
-	# and we do not want to regenerate them automagically.
-	gnome2_src_configure \
-		XSLTPROC=$(type -P false) \
-		--enable-gst-launch-plugin \
-		--with-media-engine=gstreamer \
-		--enable-nls \
-		--with-systemduserunitdir=$(systemd_get_userunitdir) \
-		$(use_enable introspection) \
-		$(use_enable sqlite media-export-plugin) \
-		$(use_enable sqlite lms-plugin) \
-		$(use_enable test tests) \
-		$(use_enable tracker tracker-plugin) \
-		$(use_with X ui)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 0.28.2-r1 ${v}; then
-			elog "This version stops forcing the automatical starting of"
-			elog "rygel as upstream pretends. This way, it will honor the"
-			elog "user settings at Sharing section in gnome-control-center."
-			elog "If you desire to keep getting rygel autostarting always"
-			elog "you will need to configure your desktop to do it."
-			break
-		fi
-	done
-}
diff --git a/net-misc/rygel/rygel-0.36.2.ebuild b/net-misc/rygel/rygel-0.36.2.ebuild
index 7b6f937be849..9872de3d9e4f 100644
--- a/net-misc/rygel/rygel-0.36.2.ebuild
+++ b/net-misc/rygel/rygel-0.36.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X +introspection +sqlite tracker test transcode"
 
 RDEPEND="
diff --git a/net-misc/s3cmd/Manifest b/net-misc/s3cmd/Manifest
index 70e6bf762dc4..55c67db36721 100644
--- a/net-misc/s3cmd/Manifest
+++ b/net-misc/s3cmd/Manifest
@@ -2,6 +2,6 @@ DIST s3cmd-1.6.1.tar.gz 102431 BLAKE2B a470417c790f60acd60cb23ad45d8d274b3f849f6
 DIST s3cmd-2.0.0.tar.gz 115290 BLAKE2B 1dfc2498c2b89f6f94049b180049a2812c9fcee9e519d8ffdfddecb1c157fc39fe8b26f39cf698cedd83ddf2649abd8e509c97b6e3073f7baa29a229a9958a1c SHA512 77723c5fb20792b5202f689dcbd73025e3c8abdb4e2d773d4e653fb04935057bd49928d3ec40f3e3bab4b13af481ff7979d429dfff94f0cc10e5e3ba3ba1a0d9
 DIST s3cmd-2.0.2.tar.gz 124266 BLAKE2B ab5921f22af05007c57df84ab4df559f31a8b7f05427fa06fa7428d41de788e4824b6285b69de592ed84d72733d3ae455a20c017dd9cecf2e4e073bff5016fb0 SHA512 4cd155f4e24e462fcab009b5ae0844718b728134cf436a4c43a9380c178c2172bb5bccc780f0f174cb43793554cb4f9b5ca432c757c9e5a4a8eaa4efe656133d
 EBUILD s3cmd-1.6.1.ebuild 565 BLAKE2B 71458aa49a354e23c1f30edb6df5a14206a28ed933ccd91b35a46c4485a3a3e8e9745df589e59a3223f20e045c46b452e3d56d3012246313f0834b4b0cfa7891 SHA512 f0e4d0bc0d292d40b4733fccf197a046e69621fc30cab7c068a0622f28e3ec27dae99765663f037cd0c6c51780cd33e476f980f172437a2783dafb3d6d468050
-EBUILD s3cmd-2.0.0.ebuild 585 BLAKE2B e5893a2407d2068cc8e7d7e1e1c9490eb485a7104a42ef3c671afc4575221bf58c90fc4a7b0453f04c269695c29ccd1e5c970dc1382733ff8573169c91388e76 SHA512 aa9bda77e77a242e4438f24d020a246d2fc104c3ec40b439cbf8375f45d8f2cd7faeced7f1994fed77b84a90389c07796069e4f04fa23e30f10a574a58e61267
-EBUILD s3cmd-2.0.2.ebuild 595 BLAKE2B 47b999ff34c111b119b5ae534a2494e5e31f1051015604ee2af6281daabc32648fa64dd7330d6be2a70fbda821721be98783e57a41431f115b3fa45b133f1b8c SHA512 cbd4561826b36740b82944deb94698da0ce1088491b2bbe9a317d743b30f446b83c977c3091236e77858651e6eba2a51a1971b5bd9ac27eef273c9f85d852f3e
+EBUILD s3cmd-2.0.0.ebuild 578 BLAKE2B e4993d884f0d55282bfb13c6faeb59c7386d169e0ee72b1323791b645ec41cb93bdeb11eafc567c6c9321fdf9d088953654e6f923559300f41b701d23f494b9e SHA512 d47c44fbd2ab0ce4831f56e631f1e9d0c5b480354f19d8f20829ce34aef99dc09ba9f4d4f79c06ee93a8472659bb64b902bca68dfee0337ff7abfd6dcff7ca95
+EBUILD s3cmd-2.0.2.ebuild 591 BLAKE2B 792ac4375fb31a93569a1f756c90e5881e77c5ca95d672313b9926fb4be2face5c8cbceacc2e1f542381539044e7e47f39c48f136491faf7d2914ba4b391d089 SHA512 a59e652a147522b813ec57aaccadb7b4f838b15a2c34332cc3d6ff128118d3897f62e18b3196ec806fc0680fe50d22f9e2cf63a4c7df59c495b30777081436fd
 MISC metadata.xml 653 BLAKE2B 917a644773bed192fb8223b7d4b83685ad70ef09cc0ba3afff7a86b5b238623b01501c7e2c5f7f6515374e4a0cb8a4b09f892638be6e71682536777583f1cb52 SHA512 8f60fecfd5bb15e38d76a37df6ea221b31492a6bc21679e8e327ccdc0f4450d874689948a3acf2b69b4067b8b2201531a844a4e52fddfb1eede3ac10783824ca
diff --git a/net-misc/s3cmd/s3cmd-2.0.0.ebuild b/net-misc/s3cmd/s3cmd-2.0.0.ebuild
index 507d12fbeb1d..bc6cf82929aa 100644
--- a/net-misc/s3cmd/s3cmd-2.0.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.0.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
 
-PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}}  )
+PYTHON_COMPAT=( python{2_7,3_{5,6}}  )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
diff --git a/net-misc/s3cmd/s3cmd-2.0.2.ebuild b/net-misc/s3cmd/s3cmd-2.0.2.ebuild
index 6d8a1feb42a4..ad3819f0ab0a 100644
--- a/net-misc/s3cmd/s3cmd-2.0.2.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{3,4,5,6}}  )
+PYTHON_COMPAT=( python{2_7,3_{5,6}}  )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
diff --git a/net-misc/sjphone/Manifest b/net-misc/sjphone/Manifest
deleted file mode 100644
index 15e2fe7dd6ab..000000000000
--- a/net-misc/sjphone/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SJphoneLnx-1.60.2235.tar.gz 4390024 BLAKE2B ee9eeb4b358b258d962238bfc89ac64f767f00eaae577abc1c89bb9a01e625ab01b93eb1ec4ce362efad1f8df5bc7cfa446718fa18397e037540554ffd67b7d4 SHA512 f1c824c51cc4edfec2baf7c31c8afb71930851a96563b50ab8f7219f49b03a4233549e0a1bb4b53a55bd2b72cc3454e2f50625d2ba63491015fcbef27726b567
-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/metadata.xml b/net-misc/sjphone/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-misc/sjphone/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-misc/sjphone/sjphone-1.60.2235.ebuild b/net-misc/sjphone/sjphone-1.60.2235.ebuild
deleted file mode 100644
index fa22405afa4d..000000000000
--- a/net-misc/sjphone/sjphone-1.60.2235.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_P="SJphoneLnx-${PV}"
-DESCRIPTION=" VOIP softphone supports both SIP and H.323 standards "
-HOMEPAGE="http://www.sjlabs.com/sjp.html"
-SRC_URI="http://www.sjlabs.com/preview/linux/${MY_P}.tar.gz"
-
-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
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp"
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /opt/sjphone
-	doins -r lib/*
-	fperms a+x /opt/sjphone/sjphone
-
-	sed -i -e 's:$(dirname "$0"):/opt/sjphone:' \
-		-e 's:$WD/lib:$WD:' sjphone
-	dobin sjphone
-	dodoc README
-	doicon lib/sjphone.png
-	make_desktop_entry sjphone
-}
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 78aabe6d333e..9da15f489081 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.81.tar.xz 4183860 BLAKE2B 380382fce8b543ce05fe99084b9cff9cf205a572e862a86d3393f06b6c2aae8e51fe119271d97fe2157da3d946ffa2fdd7c172e3bcf0b8e47c78ddb41da7cc85 SHA512 9bf052e83fac5a1be8fd1f85b69d16e170a61586fa5ebe0ea5e5af8303db0ab06a8ca7a2496ec1677c6299b82d1f05718fb8e80b62c4d4b1adc2d989630fc863
+DIST smb4k-2.9.82.tar.xz 4312764 BLAKE2B 08051d6c64b0111cb20ef379b0194db01e798ccdc8ec3353dd418bab22f7ce11b310ac95ca26db4290b1e5dae2952e9bf0e9fab6b215e08f2045044344d3492b SHA512 cf805b8f9b032dbe7be511209b7f6b3cc829dc99258251ba240f27025d74d93a3cda8d1fd9b342f451a4066ecc644c73747c7f353379e0836b004dd4298b4e14
 EBUILD smb4k-2.1.1.ebuild 1352 BLAKE2B 98f727608542565fb7d3ea95feb5519dbc4c14ca6545ac332e5cf41495bb73f592303cb20f9d9d8a6466674aac6ee79f8f1c9be35fed91fc0b1639b7d2e38959 SHA512 fadf1efd2d4ceb8fc733397435d4ca39d8d336dfd47b6430cfa3009e02169450f47f06a651313056db1bc3e3f119ea375a0340a1727b4961e54da6ce373c45db
-EBUILD smb4k-2.9.81.ebuild 1360 BLAKE2B 0100fc6dad643df05d01a270aeeb62c7d4b798fc154fd8ba916b36718a8306834e8e2f9434b501ec665cbae8591f4086131979e5dfa998f180c9c383633b3690 SHA512 1dec88f0346b8737a2e3834c60a1b55c61d45b02bd95746dc8c34ddc853cc29c57c39363630ee098efbaffd67ee4937da4a196bf04a4dafc46acc8c7c6414066
+EBUILD smb4k-2.9.82.ebuild 1360 BLAKE2B 0100fc6dad643df05d01a270aeeb62c7d4b798fc154fd8ba916b36718a8306834e8e2f9434b501ec665cbae8591f4086131979e5dfa998f180c9c383633b3690 SHA512 1dec88f0346b8737a2e3834c60a1b55c61d45b02bd95746dc8c34ddc853cc29c57c39363630ee098efbaffd67ee4937da4a196bf04a4dafc46acc8c7c6414066
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/smb4k-2.9.81.ebuild b/net-misc/smb4k/smb4k-2.9.82.ebuild
index 578795e8d724..578795e8d724 100644
--- a/net-misc/smb4k/smb4k-2.9.81.ebuild
+++ b/net-misc/smb4k/smb4k-2.9.82.ebuild
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 897791dcb103..601c953fda61 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,9 +1,12 @@
 AUX socat-1.7.3.0-filan-build.patch 1164 BLAKE2B ea158041a421fdfbbcfb14f050920f9f6ea9d99097d74c9c81c63c5816595f2ef8475b3add04d9efd8d19498382520a4f686d73c85b1df1879d5997b2f4da635 SHA512 479a189bbc0546e8838f40e770902c0c82d5fd042e1d94731d0036f66448810dd5ffcd5297b3ad4e474db8e037d211e65648a5f35f41827d7a320d6b2b8208bf
 AUX socat-1.7.3.1-stddef_h.patch 1272 BLAKE2B 1693a96be8fc27c102ef48fd16a1c719ff240b7330800ee26876f2b9a0b21671d79da3244f87894ee2f65ca833f34e9636ed7ace4f19951fa4443abe26a2bb9c SHA512 294acc9f05526eb47bc2cc01603b1c5bc553c4a2ffaaf63b87b66eb653930c0f8139fb8c4d72ddec10482e35ae3a6ba144a6555c8ba64066c30cc4132f10f2bf
 AUX socat-2.0.0_beta9-libressl.patch 9738 BLAKE2B c790d2e6486ace62f410680d93679177dacdda1dc03700711163bf66d73bd728ccc3c0e4ad45c7a8c65eaf47239c7558044e0683a80fdf75eab51e09df36ee63 SHA512 183972f5354872557a6ad131f1c8276b0250729aaa6659cd202dcf534d8b4bc41dd19cc6525bc888c325c670922ba382c684103ecdd8a385e5d27f52f321c7ed
+AUX socat-9999-stddef_h.patch 1272 BLAKE2B c6ab67b4aba676387b3d1584b03741ff829d5455991e67a5a0262cb529b965545e2935fa733a7c9a01a8c36cb2378d6d3e443a978a8993cab55bdf06d724d260 SHA512 b951fbc1d8fe26babe69fde1acc779907e00866c1a6bba85e37a4e173948ad2ade9aa7835a0e9ea1ec8902d0b181ebb11ace57ff0f8ab570301d8d35849e939d
 DIST socat-1.7.3.2.tar.bz2 493324 BLAKE2B 8f30a47be52fcbaf9715435c7848e0d86bb8166fd7aa2de5ba2c7a297696ad1ebc6315acfb87fb8777f87645575fbc015c9e4b1a664fa6602bdf6cf2bc4481e5 SHA512 9ed4911deb09c36955b62a2efbcdfdff0e9d963fa30110e32396e49133d395afd7e61a19ca6a1a23e6e98ded4f603bcbb68c8eb3da4ce870f1450b8b6f7dd293
+DIST socat-1.7.3.3.tar.bz2 489901 BLAKE2B 5bd919dbef2efb64b4674ea072375d2b4e7c14629c2a48cd2f0233f31163c5aadd02f99d98a54b5f1375bbe7291d8134d4bb59d74a674d99d95714720b482cce SHA512 6073facb3db7cd24b9380f400876d73537b52b8e53ff6aac080388c2b1fc4a2decdfac7ce23bff6ab680fb2751251cda7fc67be9b09954edc46f449e0a7d0c7e
 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-1.7.3.3.ebuild 1475 BLAKE2B 38a503d4a6d738e70a61f4643951426ccd70ea80d08135500560563bc18b7c55fa5c7aef45aaa66ac2bf1a90151535b9aa208253b3d10367125a326cc5387578 SHA512 01874d51215e91181226e8ff8586a3e2ab398e39b8c46191d7f44bb3a3a92b98d7462ae9e6703f4cf2a01a509fc62aa6326423788dfd5c4467553e1e9825718f
 EBUILD socat-2.0.0_beta9.ebuild 1512 BLAKE2B 7f8c902a4637d6fb404c8dfc5e06b31c1e7235ed7e0d174f61d961a50b68b1cdb1b5d74bf93834a1595a794776f989a277b66a4b9da3598145b6fa9c311025df SHA512 859b4a4732bf418f5e517e6345b484c6fcb2ff2e4b42f59824dbfe51943c5432ba7fdce610501bc673c7b51399115b3b60af78441c5932739c5597219fed8705
-EBUILD socat-9999.ebuild 1387 BLAKE2B a0493a52e072941134d4673eded87efa4cf717778e30f61da0d81bc5737b584766955fa8edeec772ccd9ca4cae260e1904cff92dd43f27e94cbd2b8aecf35bf7 SHA512 e08b74b67d94b9997665465f5cd8b77f53e268b3dc5e83c6aba27cbbb9c97cbd4f3cf577b8bf865f36c9cd3719fd2dbd7ec7f6a4084601b88a9dce222bc583fe
+EBUILD socat-9999.ebuild 1337 BLAKE2B 63b3a50ba7f79887bd0769cde62604b61322c8f8ff0ec14dddc6cd6a7e271600914f6ef17ba37f68677f247e4567343b0f18ca4ffe757416f190ba703ea1dbd0 SHA512 d3153b16916abff983b91525eea488945585a6817561aa5471528741af6ef0cbdc440ddbce3086ef238f7056d053e209b451daab098299b98d185b6df3037c8c
 MISC metadata.xml 280 BLAKE2B e048698c920b118e9a29ec8558620cbd87f8cd4a3f9b4db4fe77f9ebf399b827cbb190d792c6ddcfc810bc09b51f233e5cce4c29c8b98d4130a3473c1ba82882 SHA512 8b56802e5524808b11ab857779ce04fb2d07cae87376f67490178601a9aecf7ad9f95743709b46048a425598d4cf8dcf01ef78cc97009d78e26a7728453150ef
diff --git a/net-misc/socat/files/socat-9999-stddef_h.patch b/net-misc/socat/files/socat-9999-stddef_h.patch
new file mode 100644
index 000000000000..802b578d4a29
--- /dev/null
+++ b/net-misc/socat/files/socat-9999-stddef_h.patch
@@ -0,0 +1,38 @@
+When disabling OpenSSL support, nestlex.c still needs stddef.h which is
+magically included through the OpenSSL headers otherwise.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,7 +61,7 @@
+ AC_CHECK_HEADERS(inttypes.h)
+ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h sys/time.h syslog.h unistd.h)
+-AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
++AC_CHECK_HEADERS(pwd.h grp.h stddef.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
+ AC_CHECK_HEADERS(pty.h)
+ AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h)
+ AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT
+--- a/config.h.in
++++ b/config.h.in
+@@ -189,6 +189,9 @@
+ /* Define if you have the <grp.h> header file.  */
+ #undef HAVE_GRP_H
+ 
++/* Define if you have the <stddef.h> header file.  */
++#undef HAVE_STDDEF_H
++
+ /* Define if you have the <stdint.h> header file.  */
+ #undef HAVE_STDINT_H
+ 
+--- a/sysincludes.h
++++ b/sysincludes.h
+@@ -51,6 +51,9 @@
+ #if HAVE_SYS_TIME_H
+ #include <sys/time.h>	/* select(); OpenBSD: struct timespec */
+ #endif
++#if HAVE_STDDEF_H
++#include <stddef.h>
++#endif
+ #if HAVE_STDINT_H
+ #include <stdint.h>	/* uint8_t */
+ #endif
diff --git a/net-misc/socat/socat-1.7.3.3.ebuild b/net-misc/socat/socat-1.7.3.3.ebuild
new file mode 100644
index 000000000000..5d48079d56cc
--- /dev/null
+++ b/net-misc/socat/socat-1.7.3.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/"
+MY_P=${P/_beta/-b}
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="bindist libressl ssl readline ipv6 tcpd"
+
+DEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	readline? ( sys-libs/readline:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="
+	${DEPEND}
+"
+RESTRICT="
+	test
+	ssl? ( readline? ( bindist ) )
+"
+DOCS=(
+	BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
+)
+
+pkg_setup() {
+	# bug #587740
+	if use readline && use ssl; then
+		elog "You are enabling both readline and openssl USE flags, the licenses"
+		elog "for these packages conflict. You may not be able to legally"
+		elog "redistribute the resulting binary."
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags '-Wno-error*' #293324
+	tc-export AR
+	econf \
+		$(use_enable ssl openssl) \
+		$(use_enable readline) \
+		$(use_enable ipv6 ip6) \
+		$(use_enable tcpd libwrap)
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc doc/*.html doc/*.css
+}
diff --git a/net-misc/socat/socat-9999.ebuild b/net-misc/socat/socat-9999.ebuild
index dab9093e8760..dfc7752ca396 100644
--- a/net-misc/socat/socat-9999.ebuild
+++ b/net-misc/socat/socat-9999.ebuild
@@ -34,8 +34,7 @@ DOCS=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
-	"${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
+	"${FILESDIR}"/${PN}-9999-stddef_h.patch
 )
 
 pkg_setup() {
diff --git a/net-misc/socket-burst-dampener/Manifest b/net-misc/socket-burst-dampener/Manifest
index b1aba8ffc103..f4ae2b79230d 100644
--- a/net-misc/socket-burst-dampener/Manifest
+++ b/net-misc/socket-burst-dampener/Manifest
@@ -1,5 +1,5 @@
 DIST socket-burst-dampener-1.1.0.tar.gz 3188 BLAKE2B f9a13844aaff9961c52fbb3bbc2c44a6756a4586151f2fa2e25abe352d3407fd2588dc5cb69c050aedcf920ebc8b76d55316a7ecdf93451772fc0372da329718 SHA512 f77e3e0cb26655c1c4477309f358f3d167e6ac89cfbd1e21c12aff7f33a22a956a8d2c77c28c888360f03b9aff4c9b1fa7174e4830e874bfc515285189c36cb9
 DIST socket-burst-dampener-1.2.0.tar.gz 3823 BLAKE2B 44a24eb357647873e328bad302e89cb08ec48389deb0e2abb9b7cfcba32001805929b3e5df0045ca38e64d51fce0784e9bafd17b9f840d65e0114c25a4228592 SHA512 e2130abf33c95255dc4249fb82a628b2569a0db8582f4b42b07b0c2c88d7f3968634062a4befc9ab4a257c750e31dbc5ffc5512a9b1ab2e34c8f660f598da080
-EBUILD socket-burst-dampener-1.1.0.ebuild 652 BLAKE2B 2dbc38dbb3ae31cb910ce298742e73e34f9c8a4b865e515d0f812a7827fe9d409b799b9c61fab4cb762af016a81bc00590377af4ac063c979b913e34f6125276 SHA512 cd4fb995af5c8b4c6dc6ca361b7680f017013997ef80c2f2e9c3fcb20e6bf946f888384c74c35c4b875b6c229840a0ee27d2587615fe36449f984db3552b238e
-EBUILD socket-burst-dampener-1.2.0.ebuild 654 BLAKE2B bfbbc8d6f874f6490e5bddf0feb4d1ab4f3b80492a9a9bb21b730e7224e856cd7dc62ff64e101ce8318688c4d120c2ba50f0905bf5a102fbd29f71af663f03bd SHA512 7425146c93f6fae56e73a8250a48153c1b160261976120f7f07393373467f60dd6b148534c3adac718508596e68b196bc2af02939f30ee74016f4d678367777d
+EBUILD socket-burst-dampener-1.1.0.ebuild 645 BLAKE2B 7e658044e5f233c7c4a553d857e0cc721edfbbadc92b90a65982acf0dd2745e578673514509f0fc7c20ecc42664dfafb1475e92e0a819fbda2ad279c86fff35a SHA512 0e435ff229bc91dc06fc8ee2045b6516f4e055a5791db64ccb2d2711d0393dcf43b2f9583541c65eba421893da57ca6b4392384df56255ad21879292fcca65a3
+EBUILD socket-burst-dampener-1.2.0.ebuild 649 BLAKE2B 4126e418c3acff83b83380ce715e4d415fdb08e0242f06508acbd6bca4cbe661c2399ec3f96ed4a0075527a41e224836932f9186f6936415edc712872a497a57 SHA512 ad1d4988a37530ce289d94e2a55dba3771e307202f4256e0b398147c23e0489cbae1295699f48088ac0fed001febfa4702ae019eeb778401163d5c9ade091573
 MISC metadata.xml 312 BLAKE2B af48a35f7fa9f645522293faddb615bea586daf209350d9697863ddc979f489863cbad923786c8dde79284d103110347f095ca0dfe8913ea328dbd9d142255bc SHA512 ba8571dd5e13df29810fdc4fc852da5bc40fc5e4c6b58fe94b85801b678c768ed2c0a7908303a46307351ee282705fd547e4b0e92b3ab8fd18338d819a0cf4b1
diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.1.0.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.1.0.ebuild
index 1fbe27ec7f16..eac3307a4109 100644
--- a/net-misc/socket-burst-dampener/socket-burst-dampener-1.1.0.ebuild
+++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_5 )
 
 inherit distutils-r1
 
diff --git a/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild b/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild
index 717d3e2470e6..c9e0e36c5d90 100644
--- a/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild
+++ b/net-misc/socket-burst-dampener/socket-burst-dampener-1.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest
index 06673aea52ab..ea8a442e9930 100644
--- a/net-misc/sshpass/Manifest
+++ b/net-misc/sshpass/Manifest
@@ -1,5 +1,5 @@
 DIST sshpass-1.05.tar.gz 98362 BLAKE2B 59a48391cd41e467b7ef2fdd14dc1ba4aa769868955326bc26ce603ce4a71780a431c6900ef67ef2d5a5940450b06605da46cfb1f5b6782aad92f2cbe8f67964 SHA512 92ff3428a3cbc2b517e8ee0a6676b409bac3ec0900bfb370cf3882ccc62017edb695ce00e025f73680e9718e1b0213b2ac1bbd2a2558fe43f0f5a7b0d690c810
 DIST sshpass-1.06.tar.gz 112205 BLAKE2B 9bae7ba60ca627664d12bcccb9a9bb76bc92752490458e4d4fdde27cdb14a0d71c94eeeefe83d95810c1cbe0fff0c9ac8a9d6fb8a90e2cd834c387ac2527875b SHA512 fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8
-EBUILD sshpass-1.05.ebuild 408 BLAKE2B ad99bb2fb89dfd18afeb1e28ee9583a695dc08b7f73a22a171e712aab623635563ee6242c185f093879e75f6b7d257880a650a7d913aa729e2406098c16b422f SHA512 cc073ce58bca4f7191c878912e6198acfcd75f49bc49d59089014e2f5fc47cfbc1e5041f142cb9a6e923cdbe989826d051d8c2483565a6c0881eaeace9157871
-EBUILD sshpass-1.06.ebuild 393 BLAKE2B 2f711281e9a5d5f4ad82b1662b7a2282ba60b47643287e8e6146ea820608620986e2c199fb5d5f293d2c18b8ea2fd2f0c5c3e90b36b234ff6afab516e40d811b SHA512 9c91cdf7e0c3aa397a4284d1f2c327819d329378c793da73bd2270c49ea3cddaec8b1faecfa429499627cfce49f64304c21e894a3fbe4aa4174f6623ae02c833
+EBUILD sshpass-1.05.ebuild 412 BLAKE2B ca5fb0b4473ff91a6698e7465db9fb0aab6be4d36a2a95eb424e18f8cb0d5aaba2908e9a90610c6642341c4367ee2132d97ac4264275b20356b6fe845848da93 SHA512 fb0f31b88c7cc637c475bcf1834cebdb9930036b01f52718ccf0454eddd9eb24470e2d0c5a845268ab92549ef75a4c8df646511a745a4ad01df5acf710eb7948
+EBUILD sshpass-1.06.ebuild 400 BLAKE2B 9fa468f10e3bed856be325f369ae3f2050f3dbeb68c92056b599c9eaa56376ca2b01c6e573a870cdf371b138783d24cf11afe585b92aba6e8c7370ffa4e9a5f2 SHA512 2abba4fc6da22ce3766c0ebffcef1ff922c16667b3df7f70a276f91b55c5386f0bf3c0d56238bd05e23a378275b3aa9434d9a899b9ff420430037607cc203c8d
 MISC metadata.xml 322 BLAKE2B c05a742c8ed098102d51af6f02b578c0d53d26772a99fcd5ef16e58fcce6aaf2b2ff6bfdb2752e1c3f0ecc697bfb1f091bfb294e5ea7e385a3eef506ef3d9d56 SHA512 8cdaa25021136f87ed8c6197def5901ff101fd43b3938baf75f0246699711a8b8d7ad2bdcf4a8f8f5e1183c7e6f151a9496b1b0109690206958b521de15fd8f6
diff --git a/net-misc/sshpass/sshpass-1.05.ebuild b/net-misc/sshpass/sshpass-1.05.ebuild
index b7bcea5622ea..0e949b82869e 100644
--- a/net-misc/sshpass/sshpass-1.05.ebuild
+++ b/net-misc/sshpass/sshpass-1.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE=""
 
 RDEPEND="net-misc/openssh"
diff --git a/net-misc/sshpass/sshpass-1.06.ebuild b/net-misc/sshpass/sshpass-1.06.ebuild
index d611b4f7c453..4bb6e7ad9c11 100644
--- a/net-misc/sshpass/sshpass-1.06.ebuild
+++ b/net-misc/sshpass/sshpass-1.06.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=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 IUSE=""
 
 RDEPEND="net-misc/openssh"
diff --git a/net-misc/sslwrap/Manifest b/net-misc/sslwrap/Manifest
deleted file mode 100644
index fc289151dfe3..000000000000
--- a/net-misc/sslwrap/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX sslwrap-2.0.6-build.patch 3008 BLAKE2B 9b858f90983798dd800a3813ca7edd70a6fd8f9634ec6f8b5568912ffed1ba12cfc56fb353f09a994cd4d562cddde8245a8bb212fed31a6d386228aef72966bb SHA512 fa6fe2bd63c37d772eb7a943558f1d1ef1db4376532467d6c6f6483f94098df8143868d01c16271c4672e6736b627c969eed001da6d492df780c7e6ba41fe937
-DIST sslwrap-2.0.6.tar.gz 21170 BLAKE2B ccebd7e10ba54eee80fca77da07864694ba4c087393420b310b51dae772df8165032d86562a3f68b1be471ae7e34e186ee35e67423a09e6b57e83c8787608cc8 SHA512 627c25bdf45245f9b3e8d03272fc46a0ef8d1c356e2b7990898b07267c2bbb28efd13d5ca97d330ce7369eedd2d20b5fa781f2e1a00ac732407e06d0b3a8890d
-EBUILD sslwrap-2.0.6-r2.ebuild 602 BLAKE2B b11d3f72544023b2f6a4172797c684d8895b43cc3312e2d3a61b2973e03caebaaa7d2e6fd626a7b164fbc3f0748959a27dc1e520a7f258ca62d85c3578d81c41 SHA512 42ec94d0a1a8dfaa181ace4c9319f0bdd5bbe35ee205734d06a5bcda9dfbe2eb6d39948897bdc14731f5677badaa8a93e530f80b388e18522337ff7470fad123
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch b/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch
deleted file mode 100644
index a797c00b152c..000000000000
--- a/net-misc/sslwrap/files/sslwrap-2.0.6-build.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-http://bugs.gentoo.org/34151
-http://bugs.gentoo.org/146828
-http://bugs.gentoo.org/335001
-
---- apps.h
-+++ apps.h
-@@ -65,9 +65,9 @@
- #include "../e_os.h"
- #endif
- 
--#include OPENSSL"buffer.h"
--#include OPENSSL"bio.h"
--#include OPENSSL"crypto.h"
-+#include "openssl/buffer.h"
-+#include "openssl/bio.h"
-+#include "openssl/crypto.h"
- /*#include "progs.h"*/
- 
- #ifdef WIN16
---- Makefile
-+++ Makefile
-@@ -1,28 +1,9 @@
--
- SRC = s_server.c s_socket.c s_cb.c
--
--# For Solaris2.6
--#EXTLIBS = -lxnet
--
--# Debug/Optimizations
--#OPT = -g
--OPT = -O2
--
--# Define 
-+LIBS = `pkg-config --libs openssl`
- OPENSSL="\"openssl/\""
--#OPENSSL=""
- 
--all :
--	gcc -o sslwrap ${SRC} ${OPT} -DFLAT_INC -DOPENSSL=${OPENSSL} \
--		-L/usr/local/ssl/lib -lssl -lcrypto \
--		-I/usr/local/ssl/include \
--		${EXTLIBS}
-+all:
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o sslwrap ${SRC} -DFLAT_INC -DOPENSSL=${OPENSSL} ${LIBS}
- 
- clean:
- 	rm -f sslwrap *.o *~
--
--
--
--
--
--
---- s_cb.c
-+++ s_cb.c
-@@ -63,9 +63,9 @@
- #include "apps.h"
- #undef NON_MAIN
- #undef USE_SOCKETS
--#include OPENSSL"err.h"
--#include OPENSSL"x509.h"
--#include OPENSSL"ssl.h"
-+#include "openssl/err.h"
-+#include "openssl/x509.h"
-+#include "openssl/ssl.h"
- #include "s_apps.h"
- 
- int verify_depth=0;
---- s_server.c
-+++ s_server.c
-@@ -121,14 +117,14 @@
- #ifdef WIN16
- #define APPS_WIN16
- #endif
--#include OPENSSL"lhash.h"
--#include OPENSSL"bn.h"
-+#include "openssl/lhash.h"
-+#include "openssl/bn.h"
- #define USE_SOCKETS
- #include "apps.h"
--#include OPENSSL"err.h"
--#include OPENSSL"pem.h"
--#include OPENSSL"x509.h"
--#include OPENSSL"ssl.h"
-+#include "err.h"
-+#include "openssl/pem.h"
-+#include "openssl/x509.h"
-+#include "openssl/ssl.h"
- #include "s_apps.h"
- 
- #ifndef NOPROTO
-@@ -468,7 +464,7 @@
- 
- 	if (bugs) SSL_CTX_set_options(ctx,SSL_OP_ALL);
- 	if (hack) SSL_CTX_set_options(ctx,SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);
--	if (hack) SSL_CTX_set_options(ctx,SSL_OP_NON_EXPORT_FIRST);
-+	if (hack) SSL_CTX_set_options(ctx,SSL_OP_CIPHER_SERVER_PREFERENCE);
- 
- 	if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback);
- 
-@@ -622,7 +618,7 @@
- #endif /*NO_EXEC*/
- 	}
- 
--	if ((buf=malloc(BUFSIZZ)) == NULL)
-+	if ((buf=CRYPTO_malloc(BUFSIZZ,__FILE__,__LINE__)) == NULL)
- 		{
- 		BIO_printf(bio_err,"out of memory\n");
- 		goto err;
-@@ -729,7 +725,7 @@
- 	if (buf != NULL)
- 		{
- 		memset(buf,0,BUFSIZZ);
--		free(buf);
-+		CRYPTO_free(buf);
- 		}
- 
- 	return(ret);
---- s_socket.c
-+++ s_socket.c
-@@ -67,7 +67,7 @@
- #undef USE_SOCKETS
- #undef NON_MAIN
- #include "s_apps.h"
--#include OPENSSL"ssl.h"
-+#include "openssl/ssl.h"
- 
- #ifndef NOPROTO
- static struct hostent *GetHostByName(char *name);
-@@ -305,7 +305,7 @@
- 			return(0);
- 			}
- 		i=(*cb)(name,sock, sock);
--		if (name != NULL) free(name);
-+		if (name != NULL) CRYPTO_free(name);
- 		SHUTDOWN(sock);
- 		if (i < 0)
- 			{
-@@ -410,7 +410,7 @@
- 		}
- 	else
- 		{
--		if ((*host=(char *)malloc(strlen(h1->h_name)+1)) == NULL)
-+		if ((*host=(char *)CRYPTO_malloc(strlen(h1->h_name)+1,__FILE__,__LINE__)) == NULL)
- 			{
- 			perror("Malloc");
- 			return(0);
diff --git a/net-misc/sslwrap/metadata.xml b/net-misc/sslwrap/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-misc/sslwrap/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild b/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild
deleted file mode 100644
index 609997604369..000000000000
--- a/net-misc/sslwrap/sslwrap-2.0.6-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="TSL/SSL - Port Wrapper"
-HOMEPAGE="http://www.rickk.com/sslwrap/index.htm"
-SRC_URI="http://www.rickk.com/${PN}/${PN}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="SSLeay"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}${PV//.}
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_install() {
-	dosbin ${PN}
-	dodoc README
-	dohtml -r .
-}
diff --git a/net-misc/stone/Manifest b/net-misc/stone/Manifest
deleted file mode 100644
index c94826dac7d8..000000000000
--- a/net-misc/stone/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX stone-2.3e-makefile.patch 551 BLAKE2B 479638dc6b4f54611a59b7e429125b933e2b3c57710b2ea74abe18b054c4f3c99236eb2a2652a89f5bdd7823056c4df06bada5ef4f49acd8be81344a85393375 SHA512 ab9051fc87046484c755830f1803b1ac9ceca5c0fdc00e09f690eae538d7cd7611049fcad4100c43cf996dacea2eb57360778eb91aa40b76b697a217e105c18c
-AUX stone.man 15094 BLAKE2B 74fcd490fa55aa041ce4700248f0c7757ccc5457a22ad13eabf2193dbdd6e254db3f732402116b90632ccbe5c83d0e0a5eaae20d4b484133388f361b74d648e2 SHA512 9ee8f9c95d6dffcd15b872bc40f1b58f3bd476ba93a61e404d2204b14d72f986683b98375aa195b4d3da8f31000d4c3c5b1c6e35a55ffbf3bda3a0f2b346d806
-DIST stone-2.3e.tar.gz 92587 BLAKE2B 3e87bb38ac111803bc8a3157be27b6645d8876033ae4c8b62a0167c2fc57f051b1deb2589387a8da1c5d68b0377fc2c120237d9d552ab8d693c41e842539bb0d SHA512 a0cccc123222c4fb4c1b2f031fc4d039f39e77691adc9f1df367d99bef8524738265350d1056c926c5f216236d2db25f31d14e9bec297b1bb4ea17e217c4983b
-EBUILD stone-2.3e-r1.ebuild 845 BLAKE2B a191fd19679dda5f3aa4e9c1190998ae8c1a1030081ef07d6cb796d1a920b93e66fa2cd2b19cf81e176a7c4c2dd7da7f62607c3f321d7ada9473bffb2f906047 SHA512 fdd8c255e1f846fa3bfe4fe940e06fa4c54f6e02da8749b39781032aa0f0029576ca2827fd3929871d4b749e66190db774026213b08040db4a05173b9f01f6cf
-MISC metadata.xml 358 BLAKE2B b9f3a304e4202d8b7d0a6eb91175a460196f12aaf4f6a5491d85588583fdc99887da9427db111a13321788e5b8f5c48c4fdd15d9ab14ba7ea71ee548edd83594 SHA512 25b8605a017689b08da8641f389cbb5c5c43908a71614382576c3adce13325edd4d550bc0216c48de625d117a011a5d2c7276c8edb59057affd42ab0af8ce148
diff --git a/net-misc/stone/files/stone-2.3e-makefile.patch b/net-misc/stone/files/stone-2.3e-makefile.patch
deleted file mode 100644
index 5df2b6868a24..000000000000
--- a/net-misc/stone/files/stone-2.3e-makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	2013-02-20 17:45:36.000000000 +0400
-+++ Makefile	2013-02-20 17:47:19.323650328 +0400
-@@ -19,8 +19,6 @@
- # -DWINDOWS	Windows95/98/NT
- # -DNT_SERVICE	WindowsNT/2000 native service
- 
--CFLAGS=		# -g
--
- SSL=		/usr/local/ssl
- SSL_FLAGS=	-DUSE_SSL
- SSL_LIBS=	-lssl -lcrypto
-@@ -60,7 +58,7 @@
- 	@echo "*** md5c.c is contained in RFC1321"
- 
- stone: stone.c
--	$(CC) $(CFLAGS) $(FLAGS) -o $@ $? $(LIBS)
-+	$(CC) $(CFLAGS) $(FLAGS) ${LDFLAGS} -o $@ $? $(LIBS)
- 
- pop_stone: $(POP_LIBS)
- 	$(MAKE) FLAGS="$(POP_FLAGS)" LIBS="$(POP_LIBS)" $(TARGET)
diff --git a/net-misc/stone/files/stone.man b/net-misc/stone/files/stone.man
deleted file mode 100644
index fa10c6eef18f..000000000000
--- a/net-misc/stone/files/stone.man
+++ /dev/null
@@ -1,464 +0,0 @@
-.\" Roff format skeleton provided by Taketo Kabe <kabe@sra-tohoku.co.jp>
-.TH stone 1 "version 2.3"
-.
-.SH NAME
-stone \- Simple Repeater
-.
-.SH SYNOPSIS
-.B "stone [-C \fIfile\fP] [-P \fIcommand\fP] [-Q \fIoptions\fP] [-N] [-d] [-p] [-n]"
-.br
-.B "      [-u \fImax\fP] [-f \fIn\fP] [-l] [-L \fIfile\fP] [-a \fIfile\fP] [-i \fIfile\fP]"
-.br
-.B "      [-X \fIn\fP] [-T \fIn\fP] [-r]"
-.br
-.B "      [-x \fIport\fP[,\fIport\fP][-\fIport\fP]... \fIxhost\fP... --]"
-.br
-.B "      [-s \fIsend\fP \fIexpect\fP... --]"
-.br
-.B "      [-b [\fIvar\fP=\fIval\fP]... \fIn\fP \fImaster\fP:\fIport\fP \fIbackup\fP:\fIport\fP]"
-.br
-.B "      [-B \fIhost\fP:\fIport\fP \fIhost1\fP:\fIport1\fP... --]"
-.br
-.B "      [-I \fIhost\fP]"
-.br
-.B "      [-o \fIn\fP] [-g \fIn\fP] [-t \fIdir\fP] [-D] [-c \fIdir\fP]"
-.br
-.B "      [-q \fISSL\fP] [-z \fISSL\fP]"
-.br
-.B "      [-M install \fIname\fP] [-M remove \fIname\fP]"
-.br
-.B "      \fIst\fP [-- \fIst\fP]..."
-.
-.SH DESCRIPTION
-\fBStone\fP is a TCP & UDP repeater in the application layer.  It repeats TCP
-and UDP from inside to outside of a firewall, or from outside to inside.
-.P
-\fBStone\fP has following features:
-.
-.TP
-.B 1. Stone supports Win32.
-Formerly, UNIX machines are used as firewalls, but recently
-WindowsNT machines are used, too.  You can easily run \fBstone\fP on
-WindowsNT and Windows95.  Of course, available on Linux,
-FreeBSD, BSD/OS, SunOS, Solaris, HP-UX and so on.
-.
-.TP
-.B 2. Simple.
-\fBStone\fP's source code is only 8000 lines long (written in C
-language), so you can minimize the risk of security
-holes.
-.
-.TP
-.B 3. Stone supports SSL.
-Using OpenSSL (\fIhttp://www.openssl.org/\fP), \fBstone\fP can
-encrypt/decrypt.  Client verifications, and server verifications
-are also supported.  \fBStone\fP can send a substring of the subject
-of the certificate to the destination.
-.
-.TP
-.B 4. Stone is a http proxy.
-\fBStone\fP can also be a tiny http proxy.
-.
-.TP
-.B 5. POP -> APOP conversion.
-With \fBstone\fP and a mailer that does not support APOP, you can
-access to an APOP server.
-.
-.TP
-.B 6. Stone supports IPv6.
-\fBStone\fP can convert IP and IPv6 each other.  With \fBstone\fP, you can
-use IP-only software on IPv6 network.
-.
-.SH OPTIONS
-If the \fB-C\fP \fIfile\fP flag is used, the program read these
-options and \fIst\fPs from the configuration file \fIfile\fP.
-If the \fB-P\fP \fIcommand\fP flag is used, the program executes
-specified pre-processor to read the configuration file.  \fB-Q\fP \fIoptions\fP
-can be used to pass options to the pre-processor.  If the \fB-N\fP
-flag is used, \fBstone\fP will terminate after parsing options
-and configuration file without opening the ports.
-.P
-If the \fB-d\fP flag is used, then increase the debug level.  If
-the \fB-p\fP flag is used, data repeated by \fBstone\fP are dumped.  If
-the \fB-n\fP is used, IP addresses and service port numbers are
-shown instead of host names and service names.
-.P
-If the \fB-u\fP \fImax\fP flag (\fImax\fP is integer) is used, the
-program memorize \fImax\fP UDP sources simultaneously.  The default value
-is 100. If the
-\fB-f\fP \fIn\fP flag (\fIn\fP is integer) is used, the program spawn
-\fIn\fP child processes. The default behavior is not to spawn any child processes.
-.P
-If the \fB-l\fP flag is used, the program sends error messages to
-the syslog instead of stderr.  If the \fB-L\fP \fIfile\fP (\fIfile\fP
-is a file name) flag is used, the program writes error messages
-to the file.  If the \fB-a\fP \fIfile\fP flag is used, the program
-writes accounting to the file.  If the \fB-i\fP \fIfile\fP flag is
-used, the program writes its process ID to the file.
-.P
-The \fB-X\fP \fIn\fP flag alters the buffer size of the repeater.
-The default value is 1000 bytes. If
-the \fB-T\fP \fIn\fP is used, the timeout of TCP sessions can be
-specified to \fIn\fP sec.  Default: 600 (10 min).  The \fB-r\fP flag is
-used, SO_REUSEADDR is set on the socket of \fIst\fP .
-.P
-Using the \fB-x\fP \fIport\fP[,\fIport\fP][-\fIport\fP]... \fIxhost\fP... \fB--\FP flag,
-the http proxy (described later) can only connect to
-\fIxhost\fP:\fIport\fP.  If more than one \fB-x\fP ... \fB--\fI flags are
-designated, the posterior one whose \fIport\fP list matches the
-connecting port.  If the \fB-x\fP \fB--\fP is used, prior \fB-x\fP flags
-are ignored.
-.P
-The \fB-b\fP \fIn\fP \fImaster\fP:\fIport\fP \fIbackup\fP:\fIport\fP flag designates
-the backup destination for \fImaster\fP:\fIport\fP.  The program checks
-every \fIn\fP seconds whether \fImaster\fP:\fIport\fP is connectable, using
-the health check script defined by \fB-s\fP flag described below.
-If not, the backup is used instead.  Alternative \fIhost\fP can be
-checked, using host=\fIhost\fP and alternative \fIport\fP, using
-port=\fIport\fP.
-.P
-The \fB-s\fP \fIsend\fP \fIexpect\fP... \fB--\fP flag defines the health check
-script.  Sending \fIsend\fP, then checks whether the response match
-the regular expression \fIexpect\fP.
-.P
-The \fB-B\fP \fIhost\fP:\fIport\fP \fIhost1\fP:\fIport1\fP... \fB--\fP is for the
-destination group.  If the destination of \fIst\fP is \fIhost\fP:\fIport\fP,
-the program chooses a destination randomly from the group.  The
-destination \fIhost\fP:\fIport\fP that is designated by \fB-b\fP flag and
-turned out unhealthy, is excluded from the group.
-.P
-The \fB-I\fP \fIhost\fP designates the interface used as the source
-address of the connection to the desctination.
-.P
-If the \fB-o\fP \fIn\fP or \fB-g\fP \fIn\fP flag is used, the program set
-its uid or gid to \fIn\fP respectively.  If the \fB-t\fP \fIdir\fP
-flag (\fIdir\fP is a directory) is used, the program change its
-root to the directory.  If the \fB-D\fP flas is used, \fBstone\fP runs
-as a daemon. The \fB-c\fP \fIdir\fP flag designates the
-directory for core dump.
-.P
-The \fB-M\fP install \fIname\fP and the \fB-M\fP remove \fIname\fP flags are
-for NT service.  \fIname\fP is the service name.  Start the
-service using the command: net start \fIname\fP.  To install \fBstone\fP
-service as the name \fIrepeater\fP, for example:
-.P
-.RS
-C:\\>\fBstone -M install \fIrepeater\fB -C \fIC:\\stone.cfg\fR
-.br
-C:\\>\fBnet start \fIrepeater\fR
-.RE
-.P
-The \fB-q\fP \FISSL\FP and the \fB-z\fP \FISSL\FP flags are for SSL
-encryption.  The \fB-q\fP \FISSL\FP is for the client mode, that is,
-when \fBstone\fP connects to the other SSL server as a SSL client.
-The \fB-z\fP \FISSL\FP if for the server mode, that is, when other SSL
-clients connect to the \fBstone\fP.
-.P
-\FISSL\FP is one of the following.
-.P
-.PD 0
-.IP default 15
-reset SSL options to the default.
-Using multiple \fIst\fP, different SSL options can
-be designated for each \fIst\fP.
-.IP verbose
-verbose mode.
-.IP verify
-require SSL certificate to the peer.
-.IP verify,once
-request a client certificate on the initial TLS/SSL
-handshake. (\fB-z\fP only)
-.IP verify,ifany
-The certificate returned (if any) is checked. (\fB-z\fP only)
-.IP verify,none
-never request SSL certificate to the peer.
-.IP crl_check
-lookup CRLs.
-.IP crl_check_all
-lookup CRLs for whole chain.
-.IP uniq
-if the serial number of peer's SSL certificate
-is different from the previous session, deny it.
-.IP re\fIn\fP=\fIregex\fP
-The certificate of the peer must satisfy the
-\fIregex\fP.  \fIn\fP is the depth.  re0 means the subject
-of the certificate, and re1 means the issure.
-The maximum of \fIn\fP is 9.
-.IP depth=\fIn\fP
-The maximum of the certificate chain.
-If the peer's certificate exceeds \fIn\fP, the
-verification fails.  The maximum of \fIn\fP is 9.
-.IP tls1
-Just use TLSv1 protocol.
-.IP ssl3
-Just use SSLv3 protocol.
-.IP ssl2
-Just use SSLv2 protocol.
-.IP no_tls1
-Turn off TLSv1 protocol.
-.IP no_ssl3
-Turn off SSLv3 protocol.
-.IP no_ssl2
-Turn off SSLv2 protocol.
-.IP bugs
-Switch on all SSL implementation bug workarounds.
-.IP serverpref
-Use server's cipher preferences (only SSLv2).
-.IP sid_ctx=\fIstr\fP
-Set session ID context.
-.IP passfile=\fIfile\fP
-The filename of the file containing password of the key
-.IP key=\fIfile\fP
-The filename of the secret key of the certificate.
-.IP cert=\fIfile\fP
-The filename of the certificate.
-.IP CAfile=\fIfile\fP
-The filename of the certificate of the CA.
-.IP CApath=\fIdir\fP
-The directory of the certificate files.
-.IP pfx=\fIfile\fP
-The filename of the PKCS#12 bag.
-.IP cipher=\fIlist\fP
-The list of ciphers.
-.IP lb\fIn\fP=\fIm\fP
-change the destination according to the
-certificate of the peer.  The number calculated
-from the matched string to the \fIn\fPth ( ... ) in
-the ``regex'' of SSL options (mod \fIm\fP) is used
-to select the destination from the destination
-group defined by \fB-B\fP flag.
-.PD
-.P
-\fIst\fP is one of the following.  Multiple \fIst\fP can be
-designated, separated by \fB--\fP.
-.P
-.PD 0
-.IP (1)
-\fIhost\fP:\fIport\fP \fIsport\fP [\fIxhost\fP...]
-.IP (2)
-\fIhost\fP:\fIport\fP \fIshost\fP:\fIsport\fP [\fIxhost\fP...]
-.IP (3)
-proxy \fIsport\fP [\fIxhost\fP...]
-.IP (4)
-\fIhost\fP:\fIport\fP/http \fIrequest\fP [\fIxhost\fP...]
-.IP (5)
-\fIhost\fP:\fIport\fP/proxy \fIheader\fP [\fIxhost\fP...]
-.IP (6)
-health \fIsport\fP [\fIxhost\fP...]
-.PD
-.P
-The program repeats the connection on port \fIsport\fP to the
-other machine \fIhost\fP port \fIport\fP.  If the machine, on
-which the program runs, has two or more interfaces, type (2) can
-be used to repeat the connection on the specified interface
-\fIshost\fP.  You can also specify path name that begins with
-``/'' or ``./'', instead of \fIhost\fP:\fIport\fP so that the
-program handles a unix domain socket.
-.P
-Type (3) is a http proxy.  Specify the machine, on which the
-program runs, and port \fIsport\fP in the http proxy settings of
-your WWW browser.
-Extentions can be added to the ``proxy'' like \fIxhost\fP/\fIext\fP.
-\fIext\fP is:
-.P
-.IP v4only
-limit the destination within IP addresses.
-.IP v6only
-limit the destination within IPv6 addresses.
-.P
-Type (4) relays stream over http request.  \fIrequest\fP is the
-request specified in HTTP 1.0.  In the \fIrequest\fP, \ is
-the escape character, and the following substitution occurs.
-.PP
-.RS 8
-.PD 0
-.IP \\\\n 8
-newline  (0x0A)
-.IP \\\\r
-return   (0x0D)
-.IP \\\\t
-tab      (0x09)
-.IP \\\\\\\\
-\ itself (0x5C)
-.IP \\\\a
-the IP address of the client connecting to the \fBstone\fP.
-.IP \\\\A
-\fIIP address of the client\fP:\fIport number\fP
-.IP \\\\0
-the serial number of peer's SSL certificate.
-.IP "\\\\1 - \\\\9"
-the matched string in the ``regex'' of SSL options.
-.IP \\\\?1\fIthen\fP\\\\:\fIelse\fP\\\\/
-if \1 (\2 - \9 in a similar way) is not null,
-\fIthen\fP, otherwise \fIelse\fP.
-.PD
-.RE
-.P
-Type (5) repeats http request with \fIheader\fP in the top of
-request headers.  The above escapes can be also used.
-.P
-Type (6) designates the port that other programs can check
-whether the \fBstone\fP runs `healthy' or not.  Following commands are
-available to check the \fBstone\fP.
-.P
-.RS 8
-.PD 0
-.IP "HELO \fIany string\fP" 24
-returns the status of the \fBstone\fP
-.IP "LIMIT \fIvar\fP \fIn\fP"
-check the value of \fIvar\fP is
-less than \fIn\fP
-.PD
-.RE
-.P
-\fIvar\fP is one of the following:
-.P
-.RS 8
-.PD 0
-.IP PAIR 16
-the number of ``pair''
-.IP CONN
-the number of ``conn''
-.IP ESTABLISHED
-seconds passed since the last conn established
-.IP READWRITE
-seconds passed since the last read/write
-.IP ASYNC
-the number of threads
-.PD
-.RE
-.P
-The response of the \fBstone\fP is 2xx when normal, or 5xx when
-abnormal on the top of line.
-.P
-If the \fIxhost\fP are used, only machines or its IP addresses
-listed in \fIxhost\fP separated by space character can
-connect to the program and to be repeated.
-.P
-Extentions can be added to the \fIxhost\fP like
-\fIxhost\fP/\fIex\fP,\fIex\fP....  \fIex\fP is:
-.IP \fIm\fP
-You can designate the length of prefix bits of the
-netmask, so that only machines on specified.  In the
-case of class C network 192.168.1.0, for example, use
-``192.168.1.0/24''.
-.IP v4
-\fIxhost\fP is resolved as the IP address.
-.IP v6
-\fIxhost\fP is resolved as the IPv6 address.
-.IP p\fIm\fP
-the data repeated by the program are dumped, only if it
-was connected by the machines specified by \fIxhost\fP.  \fIm\fP
-is the dump mode, equivalent to the number of \fB-p\fP
-options.
-.P
-Use ``!'' instead of ``\fIxhost\fP'', to deny machines by following
-\fIxhost\fP.
-.P
-Extentions can be added to the \fIport\fP like
-\fIport\fP/\fIext\fP,\fIext\fP....  \fIext\fP is:
-.IP udp
-repeats UDP instead of TCP.
-.IP ssl
-forwards with encryption.
-.IP v6
-connects to the destination using IPv6.
-.IP base
-forwards with MIME base64 encoding.
-.P
-Extentions can be added to the \fIsport\fP like
-\fIsport\fP/\fIext\fP,\fIext\fP....  \fIext\fP is:
-.IP udp
-repeats UDP instead of TCP.
-.IP apop
-converts POP to APOP.  The conversion is derived from
-the RSA Data Security, Inc. MD5 Message-Digest Algorithm.
-.IP ssl
-forwards with decryption.
-.IP v6
-accepts connection using IPv6.  If \fIshost\fP is omitted
-like (1), IP is also acceptable.
-.IP v6only
-accepts connection using IPv6 only.  Even if \fIshost\fP is
-omitted like (1), IP is not acceptable.
-.IP base
-forwards with MIME base64 decoding.
-.IP http
-relays stream over http.
-.IP ident
-identifies the owner of the incoming connection
-on the peer using ident protocol (RFC1413).
-.SH EXAMPLES
-.PD 0
-.IP \fIouter\fP\^:
-a machine in the outside of the firewall
-.IP \fIinner\fP\^:
-a machine in the inside of the firewall
-.IP \fIfwall\fP\^:
-the firewall on which the \fBstone\fP is executed
-.PD
-.TP
-\fBstone \fIouter\fB:telnet 10023\fR
-Repeats the telnet protocol to \fIouter\fP.
-Run telnet fwall 10023 on \fIinner\fR.
-.TP
-\fBstone \fIouter\fB:domain/udp domain/udp\fR
-Repeats the DNS query to \fIouter\fP.
-Run \fBnslookup -\fP \fIfwall\fP on \fIinner\fP.
-.TP
-\fBstone \fIouter\fB:ntp/udp ntp/udp\fR
-Repeats the NTP to \fIouter\fP.
-Run \fBntpdate \fIfwall\fR on \fIinner\fP.
-.TP
-\fBstone localhost:http 443/ssl\fR
-Make WWW server that supports https.
-Access \fBhttps://\fIfwall\fB/\fR using a WWW browser.
-.TP
-\fBstone localhost:telnet 10023/ssl\fR
-Make telnet server that supports SSL.
-Run \fBSSLtelnet -z ssl \fIfwall\fB 10023\fR on \fIinner\fP.
-.TP
-\fBstone proxy 8080\fR
-http proxy
-.TP
-\fBstone\fP \fIouter\fB:110/apop 110\fR
-connect to \fIinner\fP:pop using a mailer that does not
-support APOP.
-.PP
-Where \fIfwall\fP is a http proxy (port 8080):
-.TP
-\fBstone \fIfwall\fB:8080/http 10023 'POST http://\fIouter\fB:8023 HTTP/1.0'\fR
-.br
-.ns
-.TP
-\fBstone localhost:telnet 8023/http
-.nf
-Run \fBstone\fPs on \fIinner\fP and \fIouter\fP respectively.
-Relays stream over http.
-.TP
-\fBstone \fIfwall\fB:8080/proxy 9080 \'Proxy-Authorization: Basic \fIc2VuZ29rdTpoaXJvYWtp\fB\'\fR
-for browser that does not support proxy authorization.
-.fi
-.
-.SH HOMEPAGE
-The official homepage of \fBstone\fP is:
-.br
-\fIhttp://www.gcd.org/sengoku/stone/\fP
-.
-.SH COPYRIGHT
-All rights about this program \fBstone\fP are reserved by the
-original author, Hiroaki Sengoku.  The program is free software;
-you can redistribute it and/or modify it under the terms of the
-\fIGNU IGeneral Public License (GPL)\fP.  Furthermore you can link it
-with openssl.
-.
-.SH NO WARRANTY
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY.
-.
-.SH AUTHOR
-.nf
-Hiroaki Sengoku
-sengoku@gcd.org
-http://www.gcd.org/sengoku/
-.fi
diff --git a/net-misc/stone/metadata.xml b/net-misc/stone/metadata.xml
deleted file mode 100644
index fde75b04e631..000000000000
--- a/net-misc/stone/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>Stone is a TCP/IP packet repeater in the application layer.  It repeats TCP and UDP packets from inside to outside of a firewall, or from outside to inside.</longdescription>
-</pkgmetadata>
diff --git a/net-misc/stone/stone-2.3e-r1.ebuild b/net-misc/stone/stone-2.3e-r1.ebuild
deleted file mode 100644
index 6e1111841a3d..000000000000
--- a/net-misc/stone/stone-2.3e-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A simple TCP/IP packet repeater"
-HOMEPAGE="http://www.gcd.org/sengoku/stone/"
-SRC_URI="http://www.gcd.org/sengoku/stone/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-2.3d-2.3.2.7"
-
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) # bug #337879
-
-src_prepare() {
-	tc-export CC
-	append-cflags "-D_GNU_SOURCE"
-
-	epatch "${PATCHES[@]}"
-	epatch_user
-}
-
-src_compile() {
-	local myargs
-	if use ssl ; then
-		myargs="SSL=/usr linux-ssl"
-	else
-		myargs="linux"
-	fi
-	emake ${myargs}
-}
-
-src_install() {
-	dobin stone
-	newman "${FILESDIR}/${PN}.man" "${PN}.1"
-	dodoc README*
-}
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index da7bb25925f6..6503f250b622 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,6 +1,6 @@
 DIST streamlink-0.14.2.tar.gz 643695 BLAKE2B ea28daac32903738206226bce85a4615338b6039be1e4cce18325e977112c3301d6e6ed90d1210f4f362c898397fd980c136a98d8a0d5ff7ee2b6c5cf077f2c6 SHA512 0d9f1db32915392f9d29bcfb40743058352a924435a8ee77f1218c108e937204e88041c908d2f93546beaa70e18db62c961ea31fbdd85c5e7e4315a18118e276
 DIST streamlink-1.0.0.tar.gz 674393 BLAKE2B 091272bae71f1e89cf14872578091a01f9d05ee372d4b9379e672280735c6800a33ae198bf019fbb3e970aa060ef059e5106e1be3a20602874be6206b6303bf6 SHA512 22ba96ac0ec27fe923b99898c45548df88ed3dda3bcbcb10b55fea145e20731eb8aa3a90212a5863b4ef5a7387d4bcf3d09d447ea2789762a8cf5eaa87f263d7
-EBUILD streamlink-0.14.2-r1.ebuild 1873 BLAKE2B d65929f452d2263b895ed0fd7f0299ee045d649efff7f95e95e88460f262f5a6ca9db1ac20316704a67726e8b7c6c513a69259638f57d64e66ed01872d7068cf SHA512 98a52a9ead5700b82281343bca40bc010303e63be8961cdaa8eb29b68a328e8d233272a2b93cb6d6405a25da7b0092532011eb900c8272f591b42603ef5599f2
-EBUILD streamlink-1.0.0.ebuild 2020 BLAKE2B b54353585e6d6a9cd2b22895ba5dddaf0a516b4c7bb1e7a1c125ad2db477b1701c083f97cca83dd5db4802c5dde4d0e2561bc61134d7526112090c2e5c81ccd2 SHA512 b981253ca0f621eabe90e7e92c19f7e2f089ec215514209aaf8176daa5daa4bbdb9ae9ab2cdbc06765e6f9524c2c387864e155610898204915ebf01079ddaece
-EBUILD streamlink-9999.ebuild 1546 BLAKE2B 034d354005c4e72d769bc33de4068aa537d239050a64b83c3c260662ee1609d80a478fcb58bf42a94a50224e43a16ca2972d6ac7a2e9f31d54ddc1a643f5a235 SHA512 3c5f51958877bd15cd3c5f82c42c076bd8ff1ff52102702508d48a746b03b955520bccc14dbd13b80688f1824e68f79fb5a6fba565847a07e553bf42eb94b554
+EBUILD streamlink-0.14.2-r1.ebuild 1866 BLAKE2B 758a98d241d23ae7cebc684b6c4bba32a299367d8bfd2da00303fda8801cc7de12cb29f8651c31f44e998f9acd6afdb4f1e030a909af373202ddf0971dc48667 SHA512 4bad5f11c62c873c446c65974a8c29cb91137fdab9fbe0ce7c29004d45d6780f11a8691603da1649b4b17d89da9ce172074d67e2313ebbfcbe932703c3ffe7cb
+EBUILD streamlink-1.0.0.ebuild 2016 BLAKE2B 3df677b3d26216be7928269cca8b8d3b53d28ede18617e1ddce56874a405bde328e87c2168f09526a06160f8ff1f23f0109f166421bdb0e7299a4d06e2a40540 SHA512 977a6cf86917f9cd0025da1e39d8dd25b5870e88dcb8a6585caa70d8bdeaf102c24cd9b80d5aafcd1c21fc04f39358f9580a85838ebdfc5fdcebca01601bf1a2
+EBUILD streamlink-9999.ebuild 1539 BLAKE2B 2609504dfce4ba218fcdcccc25618cd569d5f056e97d9c482d7132cc7dd226fb2a566372abe654aaaa33d698b88b527fa32ed98880f3b49a0807321648018837 SHA512 126ef095ca4affcca4bde3bb54070c9ce28b6371cfae1a28ea31986daed5a389bdeebf20a3392d7aca0e34f2355ef804ad9848711aa7ba4dfa84f67db4ebca29
 MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672
diff --git a/net-misc/streamlink/streamlink-0.14.2-r1.ebuild b/net-misc/streamlink/streamlink-0.14.2-r1.ebuild
index acb189b5ae85..902f04a6bf10 100644
--- a/net-misc/streamlink/streamlink-0.14.2-r1.ebuild
+++ b/net-misc/streamlink/streamlink-0.14.2-r1.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
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE='xml(+),threads(+)'
 DISTUTILS_SINGLE_IMPL=1
 
diff --git a/net-misc/streamlink/streamlink-1.0.0.ebuild b/net-misc/streamlink/streamlink-1.0.0.ebuild
index 07f15c0c5a65..667a5f466f57 100644
--- a/net-misc/streamlink/streamlink-1.0.0.ebuild
+++ b/net-misc/streamlink/streamlink-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE='xml(+),threads(+)'
 DISTUTILS_SINGLE_IMPL=1
 
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index a824074d2cd5..3ceafa2b28e2 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.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
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE='xml(+),threads(+)'
 
 inherit distutils-r1 git-r3
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index d228d3976a2c..872cacd0f5ec 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -3,26 +3,15 @@ AUX stunnel-5.39-compat-libressl.patch 5329 BLAKE2B b88f615e88940dc091c264b34ef3
 AUX stunnel-5.43-compat-libressl.patch 5328 BLAKE2B 5a014b47e3a314ab2d016ca31fb98d8a4fd613816c38382ece2a9925be217151130fab7d14666aac2602513c1cb0af04742c6a80eb9b8bf51caa46fdc05ad4b1 SHA512 d45e660fc610636dc93b8f696fc378cda4fcf7989f22aecff6394f84bbddfabb70255ebc4a9291a29806b3631767bb64b826c4a9fb2ecfe0ab7e53aebcdc7eb3
 AUX stunnel-5.48-compat-libressl.patch 4845 BLAKE2B 0c6bc9059902be43970a78269632dcdbb82a9e07a6cfa8dca6b960f79832953a7d7173097c74a24ccad8c59deca1353887519cfde107b22d10422204bb83e9cf SHA512 b03277b8487fc9cd763c11e0b32c3755dd4aea76ecc21238204d4f27f03b5cfc72ee7ab148aa813a6eb21bb588d8dadc2b0610049175fa1278e799681a946098
 AUX stunnel-5.50-libressl.patch 8684 BLAKE2B 6c4b01ec93ba8e8d734dc5489b9eddabb3e655a858c709ed75cea7a38b745d3a281d483ea74d47ae98d3371321fbc9d2776cd470e56eaea0ab6851ec3b203f28 SHA512 802c5ae1c729cdeb72f1d4f53d8216243f5e3e801f964b057a53099ebe9cc67b1e8d09d58475130d5239c9cb5fd8a967a10193d1740daed182b7af43122b19d4
+AUX stunnel-5.51-libressl.patch 10288 BLAKE2B f403d620b6b1341d3934e560d8d7e81fb6567c5076c3c46a34ebafe7136d95e2c9bf0f1d56818384040e0dcf5a1a4e1e10afe29db1f32ff2008cef30b83a8da5 SHA512 d8c8562afeaed5a8843e08d50a5097a4e36a10a014ebe281d8ea0bc563ac5b9bfa9d884f8cf6008b58bf679a7e785d86b331cddcb0bd5e49ed664763d9b3e597
 AUX stunnel-compat-libressl.patch 1871 BLAKE2B e7545ae95b173b868fff7159a681497655f8c80c994add9901a752787d2c51728c994ef940f540abc7538585b51ca4de41ddd20e0f929330188ffd2e0d2ded78 SHA512 590f6be1962ef3ca1c8f1c64c02b1e63b7211a2ba5cb5fd4eb09127e45ee5251a7ec701aae3eda25e34caa1977378ad5f7b75e826aee7d9d5ff8b9acbd298f36
 AUX stunnel-r1 1437 BLAKE2B 92689cd4ee63920e1064cb96c88795132ee917e7886f9970f125f52d4eabf0fdb2515783c321771ae4e06598dca7e54f9b8131523c14dea7efa2769e0de0ed4b SHA512 6ccb1735770a4662e6fcb02bb7d0329cbed9aec16fc410f9d0f34f1a13dc5c9767eceafa406c55cca23b364c87c033bf5349d267838bbd5c560aaeec17ccd92c
 AUX stunnel.conf 1419 BLAKE2B 868f91060c0e43ded7eb6ae0c3734eaa1670caabb3b649cc552699a219a98b58374aa8864ef0d79d31e39185c8f3c35b3584f2c09218fff965966554e5335370 SHA512 4f76fd92eaf7fe878f7566a29ded673e7054edb8d7efeca8aad8621fdddeed457676d73b896d24466843874bb1b82ad3102cb1de4d24a7ac3597f3bf85d36826
 AUX stunnel.tmpfiles.conf 38 BLAKE2B cedd3eccd1964dcc86255fca0e47fe692a2619fbcbc576480adf193192a2218972d07961a3ab4d30f095c308844f25fe71cdf285bde201050be24d4ce0ca80d3 SHA512 8e06ec39547ce5991217e551e563f5d212742afda94da801ec266c632375aae489594d14815fe596319d9881eb5a58e32bf05baa69f3a9d1bae554419f5ac1bb
-DIST stunnel-5.36.tar.gz 645205 BLAKE2B 6287794b162212783c54fe199fde43d72347f7aeddba2b528eeaa857da5233e8892a157a3594790ae6174bc198731cd700970dc2ff4d3f260376756b72df5aa9 SHA512 663dd155aab17b628fd1ef8ae1c604efc0cdf026566e98fbff16ba4da5b12b06cd6801bf4f604a9b2ea98d993c184ce97c63c1f716fa86b5e630e5fd504e3317
-DIST stunnel-5.40.tar.gz 648828 BLAKE2B ce0e9cdd1d6c9ec2eb318e1a31307a4e4f27849b548ba755272c71c49b164cc1a6fb31a5dbec56c399349e590232aff84251670b6d8738c2b00ff182fdbb5dd7 SHA512 2dd403f212f701370775516d25ea441fe41564daf1460f8a9ba4eb960adfb5f007ebfb51a90503fa168c420f06e17a6d20f1b0eab697e2abb6a42dc6f1f898b2
 DIST stunnel-5.43.tar.gz 698715 BLAKE2B 21ac7014e571e1c22b1b21b6dc5c4f22ec91197c7088756fb65dd4dd22541538179d5b389cbd1c3bd8f8d61436eab36e23f6317757229035cd8e9f04ba536f0e SHA512 3158ab7573d8c548ee71aecb3f94e141bd80e123a62848945263004e28668050a8a08c904dbf61df28c4f5c1d94eb380943ab39835ccd18273a6acf05a3488a8
-DIST stunnel-5.44.tar.gz 699117 BLAKE2B 956c7ce8987f79efab3baaa5071263466ec01f0475bd7e66dff41e8de66811a10be3a5f14bd6430e26159682bd3c2abe93a0d5824a854ae0243e6bbfae14a664 SHA512 a1aa4f234926208bf1b2c9acc0bf83dc0f2c8f575bc57f5ce89b32b4e3fde0412ea0ef7c2edb364fbe0b52fdd89773fab4df53950c58797c11b7668f3e4e7638
-DIST stunnel-5.45.tar.gz 706423 BLAKE2B 81c5355419de3b0bc88d59ea8c98d1a4523d7a1ae6a3d12464f7ab6a1df1f5dd798d2f50ec7adce7515e68a650149321f13e34791781620ad071824246502dce SHA512 653fea6e5002983bb9231a542ab1bab078428821910b8e257adbeea88e583e84d080615f232d5d3086e8d6069c43ddbdfc7923c4b50071ab0c0be547e76d8983
-DIST stunnel-5.46.tar.gz 706499 BLAKE2B 6ece93015b2a59ec17fa60505bccb5e4444879d44fa0cea6e838aa56d178f61f26b8b9b469d8bf2991d4c094fd824eaed2b5214184f6a15e0c415c53b6f7d136 SHA512 2000e36d4d011a83e47afcaf19473e083da010d7b3909cb831c51975512257888615b5d64f4a4d78f48529d68c6740ea2be7f7935b0ab86de4535e290f78cc97
-DIST stunnel-5.48.tar.gz 708356 BLAKE2B 6f4538c5fe6bc00eb0f45edfbf83f1de6cfcd23257aa368dc0ba788dd17af7033ba20f1ab7c3f5bf48a5e2ff3d4048eb1a344d1ea4cebebe69e6e2277aaf19ba SHA512 5e6669ecd6e9b49aa6ef82b9a4dc6a2193c975eef85262aba70c7f264ef1b4d15dc287a2baa94b71be063deddcd07a20a5347ed5280f044fc6f68c61429a24fa
-DIST stunnel-5.49.tar.gz 713560 BLAKE2B c93b6ea7f9e8da2668919101caf30850370f1c7e742863959d2c1350829e7f5a6d12ff8a8cf66dbac47db40c150cb23a6bce3bea6d79e3c906c4fedad8d410a2 SHA512 8bfd17684ea0d6eeec278f00618c6f96af113fbe14aaafd882d43f3d834ca1e5ed27f9908dffb04224ea4a1234063846f816e3528b95234ae156b61ade6aaa16
 DIST stunnel-5.50.tar.gz 973685 BLAKE2B e4185fa0c4f15ea118a8f6590bae14a9e1d7ccf1f73b75e46d8c7f04e4ece471c29b0a3715a24568301c5220fe385cbf42295c91ae9b295e3d7ab2b0ffec45a1 SHA512 96029b4f0dc0f04130e847bf47e56e8fdd22f2aaddb5fe0f581a0da6b870049152216795a0a9d9cdb6b93621df0a7d999e968a8c59989d261fd81c5f02cc1bac
-EBUILD stunnel-5.36.ebuild 2888 BLAKE2B eeeb7cd12318516aabcfe224d531d6061e25d4e51ed0c607a4ff56a1d721eb09cf275759fb47ea3e787fc760155492d97c96f341c2a3e28f4f4ac546c10b4160 SHA512 1257f0dcc4e1bdfb32095577841b866535318aba496d662d34fec13d6acbb45f0f6ed46ef185549e317a8254782f4d73a6827622f62ab27e6b011b3bf306b5bd
-EBUILD stunnel-5.40.ebuild 2919 BLAKE2B de5cbf748e76f13d9b07591988ae868c0dbc6ac5d619564951c983bcfd71a195f306be41f86e602c2b87a709a8315ca65112082310458945ebb809a1b1925df7 SHA512 affc603a13a074d6b37dfe1c2cdf400814f13209b1d7ab11a48c4c99a3ff6b607b510d6719f47a4a51071422296ecb4c44455ab9792c594880f12b944c1476fa
+DIST stunnel-5.51.tar.gz 979334 BLAKE2B d01f2667691e7bbb8bd0cd0d625d511462d53a2061d3b3d774a8efaa832370ee5111c941f8f0875fd13a91620887aae0eb76c17a30bc9d37d8b77aafda2414b4 SHA512 ae135b0da789b3daf2114ebd2af50c376c34d5e911189d71af2a350f6f413b8642027027bcd5a9d547169c8ee2e05f4f9558b3a669842e5c0542dbe85f79229b
 EBUILD stunnel-5.43.ebuild 2908 BLAKE2B a0013d9661c772464743069e4e80ed3713fd8deb39002d1594581601e2f39dbfbe77196c5dcc03f19c66b9d693e5a7a6e4f3ded589976b3b181e9af3471e1951 SHA512 7f1336affe6ff12f4a6eb173a9e0f24a955fcfcfc6ff9650aafe66a4fc0724147473a9ad6056ea4b30489ac795224ee5302c67518c90307e1b69a89dda5bdd96
-EBUILD stunnel-5.44.ebuild 2919 BLAKE2B c0c06ad293fcd5f7ccc57040fab9ef8305107c5450535d0a6cb061f0cab39ea1bf5e55d06c6fc297b100c267d852e0926cbcc70b8519caf9cf8869cdb08afa97 SHA512 8545c5e5fd24fcd317c1eeecd1677c833830cb5be4c4df0ff403b995b1f5d06012155d1ade602a669f6f892c66ba195594452c41fe0b61280e50a2996560a064
-EBUILD stunnel-5.45.ebuild 2919 BLAKE2B 681bc10896db6846af224e3c96af98bad2889040594f02cee8ec80ebf92f77905c26c3412832abb465112fddf16a39c7e763eecf6054a99f3f83e18066ecdce8 SHA512 bebf0ff0498dc819dd95d603d514720b89ee757f9f0ca39b393862f0a3fbb91e6dde173e079178fa7e18bfd1a5bb6b33bce374dbe70fe49a0e1d07707123f497
-EBUILD stunnel-5.46.ebuild 2919 BLAKE2B 681bc10896db6846af224e3c96af98bad2889040594f02cee8ec80ebf92f77905c26c3412832abb465112fddf16a39c7e763eecf6054a99f3f83e18066ecdce8 SHA512 bebf0ff0498dc819dd95d603d514720b89ee757f9f0ca39b393862f0a3fbb91e6dde173e079178fa7e18bfd1a5bb6b33bce374dbe70fe49a0e1d07707123f497
-EBUILD stunnel-5.48.ebuild 2919 BLAKE2B 4196e977ad27c0c45ca0debcaba4f4bf375ed06a5e539b99521f147f63f6b2a2416bff031ece65101a1f05b9aa1f2e5b4e7381db7895806575ec9d32964b3047 SHA512 6757bea11de403ac525cf4d70f5746e5f20f1b1b04a537fb33f694d3cfc9a49ba4d92250dce0927424eb1edc0297ea27d72faae57a2f098c88a21d044a7524ca
-EBUILD stunnel-5.49.ebuild 2919 BLAKE2B 4196e977ad27c0c45ca0debcaba4f4bf375ed06a5e539b99521f147f63f6b2a2416bff031ece65101a1f05b9aa1f2e5b4e7381db7895806575ec9d32964b3047 SHA512 6757bea11de403ac525cf4d70f5746e5f20f1b1b04a537fb33f694d3cfc9a49ba4d92250dce0927424eb1edc0297ea27d72faae57a2f098c88a21d044a7524ca
-EBUILD stunnel-5.50-r1.ebuild 2898 BLAKE2B 3a71c72d4f1f2392c414842b0acda4a18e2ad703623ab4fa050110680546c945c374051c62a431ef13720fa1ff60247f19a4bddf626e291a1c1843ba4d2fcd6a SHA512 2f5ccbd150a87ee5bddca913e55d966e18b1dc02ef70907cf73e598bc8ab279c8e713c37b8f07f50c4014bdbbfb0421dd5da1fc83d326459a889a9a9541db954
+EBUILD stunnel-5.50-r1.ebuild 2893 BLAKE2B fa69516d44d8294a2375d7672b888ba17a356ea85accc5885dce96135fbffcc49e237cd2476db17675dc81d02b29d41757912802a35d6252dbfdcfd132918e89 SHA512 06143a4a32b093c4b9ac92a4625de631cad0480a314bf8d68b3d9649b43f0d9f336f04e226ca1fb0f6c8c95cde83801bb5e1df0a0a916c21293ab935ddf8ecc2
+EBUILD stunnel-5.51-r1.ebuild 2907 BLAKE2B 2aa8773750af083b3db5e5a232915c73e3985b8a32424ef6a6c0660f51a33b8c1049ef48e272e889e386fcd98c0e8464e22fdfe26309b0df37ffa0912c61557d SHA512 2e45350897ac5423492a0e90a6cdd80125a5aab49d9db9ff29701f63604559846be9b95ee5f58698b7c210758b1f97a9d0991055c2d509497285204e6ca59419
 MISC metadata.xml 712 BLAKE2B 2e112f8a1f4fb41bd678a7e845e109923f00c281b5673e87cf2c06e68e8c1ee79e6230150cf911f4c28085ab22dc76eff54c80d201ef2709d5ee58a70f1a0084 SHA512 03c867389e13ef2596e97bc64b47209fe445eb5f4b2012d78f426f5eec96ad8359a735d9fe981109502d297837fa6ad50c43e0fe0b618aa9aed3f30fbd01e362
diff --git a/net-misc/stunnel/files/stunnel-5.51-libressl.patch b/net-misc/stunnel/files/stunnel-5.51-libressl.patch
new file mode 100644
index 000000000000..7ca8ace454d8
--- /dev/null
+++ b/net-misc/stunnel/files/stunnel-5.51-libressl.patch
@@ -0,0 +1,268 @@
+diff --git a/src/client.c b/src/client.c
+index b67544a..6676529 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -680,7 +680,7 @@ NOEXPORT void transfer(CLI *c) {
+         }
+ 
+         /****************************** wait for an event */
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+         pending=SSL_pending(c->ssl) || SSL_has_pending(c->ssl);
+ #else
+         pending=SSL_pending(c->ssl);
+diff --git a/src/ctx.c b/src/ctx.c
+index b3dc684..0186968 100644
+--- a/src/ctx.c
++++ b/src/ctx.c
+@@ -91,7 +91,7 @@ NOEXPORT void set_prompt(const char *);
+ NOEXPORT int ui_retry();
+ 
+ /* session tickets */
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int generate_session_ticket_cb(SSL *, void *);
+ NOEXPORT int decrypt_session_ticket_cb(SSL *, SSL_SESSION *,
+     const unsigned char *, size_t, SSL_TICKET_STATUS, void *);
+@@ -125,7 +125,7 @@ NOEXPORT void sslerror_log(unsigned long, const char *, int, char *);
+ 
+ /**************************************** initialize section->ctx */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ typedef long unsigned SSL_OPTIONS_TYPE;
+ #else
+ typedef long SSL_OPTIONS_TYPE;
+@@ -133,7 +133,7 @@ typedef long SSL_OPTIONS_TYPE;
+ 
+ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
+     /* create TLS context */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     if(section->option.client)
+         section->ctx=SSL_CTX_new(TLS_client_method());
+     else /* server mode */
+@@ -229,7 +229,7 @@ int context_init(SERVICE_OPTIONS *section) { /* init TLS context */
+ #endif
+ 
+     /* setup session tickets */
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+     SSL_CTX_set_session_ticket_cb(section->ctx, generate_session_ticket_cb,
+         decrypt_session_ticket_cb, NULL);
+ #endif /* OpenSSL 1.1.1 or later */
+@@ -483,7 +483,7 @@ NOEXPORT int ecdh_init(SERVICE_OPTIONS *section) {
+ /**************************************** initialize OpenSSL CONF */
+ 
+ NOEXPORT int conf_init(SERVICE_OPTIONS *section) {
+-#if OPENSSL_VERSION_NUMBER>=0x10002000L
++#if OPENSSL_VERSION_NUMBER>=0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+     SSL_CONF_CTX *cctx;
+     NAME_LIST *curr;
+     char *cmd, *param;
+@@ -969,7 +969,7 @@ NOEXPORT int ui_retry() {
+ 
+ /**************************************** session tickets */
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ typedef struct {
+     void *session_authenticated;
+@@ -1412,7 +1412,7 @@ NOEXPORT void info_callback(const SSL *ssl, int where, int ret) {
+ 
+     c=SSL_get_ex_data((SSL *)ssl, index_ssl_cli);
+     if(c) {
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+         OSSL_HANDSHAKE_STATE state=SSL_get_state(ssl);
+ #else
+         int state=SSL_get_state((SSL *)ssl);
+diff --git a/src/options.c b/src/options.c
+index c7bd5c5..5441b80 100644
+--- a/src/options.c
++++ b/src/options.c
+@@ -81,7 +81,7 @@ NOEXPORT char *sni_init(SERVICE_OPTIONS *);
+ NOEXPORT void sni_free(SERVICE_OPTIONS *);
+ #endif /* !defined(OPENSSL_NO_TLSEXT) */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int str_to_proto_version(const char *);
+ #else /* OPENSSL_VERSION_NUMBER<0x10100000L */
+ NOEXPORT char *tls_methods_set(SERVICE_OPTIONS *, const char *);
+@@ -3098,7 +3098,7 @@ NOEXPORT char *parse_service_option(CMD cmd, SERVICE_OPTIONS **section_ptr,
+         break;
+     }
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+     /* sslVersion */
+     switch(cmd) {
+@@ -3671,7 +3671,7 @@ NOEXPORT void sni_free(SERVICE_OPTIONS *section) {
+ 
+ /**************************************** modern TLS version handling */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+ NOEXPORT int str_to_proto_version(const char *name) {
+     if(!strcasecmp(name, "all"))
+diff --git a/src/prototypes.h b/src/prototypes.h
+index 4a5d9af..057d3b9 100644
+--- a/src/prototypes.h
++++ b/src/prototypes.h
+@@ -226,7 +226,7 @@ typedef struct service_options_struct {
+ #if OPENSSL_VERSION_NUMBER>=0x009080dfL
+     long unsigned ssl_options_clear;
+ #endif /* OpenSSL 0.9.8m or later */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     int min_proto_version, max_proto_version;
+ #else /* OPENSSL_VERSION_NUMBER<0x10100000L */
+     SSL_METHOD *client_method, *server_method;
+@@ -666,7 +666,7 @@ int getnameinfo(const struct sockaddr *, socklen_t,
+ #define USE_OS_THREADS
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #ifdef USE_OS_THREADS
+ 
+@@ -714,7 +714,7 @@ typedef enum {
+ 
+ extern CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS];
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ /* Emulate the OpenSSL 1.1 locking API for older OpenSSL versions */
+ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void);
+ int CRYPTO_THREAD_read_lock(CRYPTO_RWLOCK *);
+diff --git a/src/ssl.c b/src/ssl.c
+index 60e31c1..10b0658 100644
+--- a/src/ssl.c
++++ b/src/ssl.c
+@@ -39,7 +39,7 @@
+ #include "prototypes.h"
+ 
+     /* global OpenSSL initialization: compression, engine, entropy */
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
+     void *from_d, int idx, long argl, void *argp);
+ #else
+@@ -114,7 +114,7 @@ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) {
+ #endif
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT int cb_dup_addr(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
+         void *from_d, int idx, long argl, void *argp) {
+ #else
+@@ -177,7 +177,7 @@ int ssl_configure(GLOBAL_OPTIONS *global) { /* configure global TLS settings */
+ 
+ #ifndef OPENSSL_NO_COMP
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ NOEXPORT int COMP_get_type(const COMP_METHOD *meth) {
+     return meth->type;
+diff --git a/src/sthreads.c b/src/sthreads.c
+index 37a1398..750e312 100644
+--- a/src/sthreads.c
++++ b/src/sthreads.c
+@@ -97,14 +97,16 @@ unsigned long stunnel_thread_id(void) {
+ 
+ #endif /* USE_WIN32 */
+ 
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L
++#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100004L) || \
++    defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT void threadid_func(CRYPTO_THREADID *tid) {
+     CRYPTO_THREADID_set_numeric(tid, stunnel_thread_id());
+ }
+ #endif
+ 
+ void thread_id_init(void) {
+-#if OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L
++#if (OPENSSL_VERSION_NUMBER>=0x10000000L && OPENSSL_VERSION_NUMBER<0x10100000L) || \
++    defined(LIBRESSL_VERSION_NUMBER)
+     CRYPTO_THREADID_set_callback(threadid_func);
+ #endif
+ #if OPENSSL_VERSION_NUMBER<0x10000000L || !defined(OPENSSL_NO_DEPRECATED)
+@@ -115,7 +117,7 @@ void thread_id_init(void) {
+ /**************************************** locking */
+ 
+ /* we only need to initialize locking with OpenSSL older than 1.1.0 */
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #ifdef USE_PTHREAD
+ 
+@@ -224,7 +226,7 @@ NOEXPORT int s_atomic_add(int *val, int amount, CRYPTO_RWLOCK *lock) {
+ 
+ CRYPTO_RWLOCK *stunnel_locks[STUNNEL_LOCKS];
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100004L
++#if OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #ifdef USE_OS_THREADS
+ 
+@@ -334,7 +336,8 @@ int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock) {
+ 
+ void locking_init(void) {
+     size_t i;
+-#if defined(USE_OS_THREADS) && OPENSSL_VERSION_NUMBER<0x10100004L
++#if defined(USE_OS_THREADS) && \
++    (OPENSSL_VERSION_NUMBER<0x10100004L || defined(LIBRESSL_VERSION_NUMBER))
+     size_t num;
+ 
+     /* initialize the OpenSSL static locking */
+diff --git a/src/tls.c b/src/tls.c
+index 6c92b96..5e60a95 100644
+--- a/src/tls.c
++++ b/src/tls.c
+@@ -41,7 +41,7 @@
+ volatile int tls_initialized=0;
+ 
+ NOEXPORT void tls_platform_init();
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT void free_function(void *);
+ #endif
+ 
+@@ -52,7 +52,7 @@ void tls_init() {
+     tls_platform_init();
+     tls_initialized=1;
+     ui_tls=tls_alloc(NULL, NULL, "ui");
+-#if OPENSSL_VERSION_NUMBER>=0x10100000L
++#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     CRYPTO_set_mem_functions(str_alloc_detached_debug,
+         str_realloc_detached_debug, str_free_debug);
+ #else
+@@ -184,7 +184,7 @@ TLS_DATA *tls_get() {
+ 
+ /**************************************** OpenSSL allocator hook */
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100000L
++#if OPENSSL_VERSION_NUMBER<0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ NOEXPORT void free_function(void *ptr) {
+     /* CRYPTO_set_mem_ex_functions() needs a function rather than a macro */
+     /* unfortunately, OpenSSL provides no file:line information here */
+diff --git a/src/verify.c b/src/verify.c
+index acdfb5b..d7b7655 100644
+--- a/src/verify.c
++++ b/src/verify.c
+@@ -346,7 +346,7 @@ NOEXPORT int cert_check_local(X509_STORE_CTX *callback_ctx) {
+     cert=X509_STORE_CTX_get_current_cert(callback_ctx);
+     subject=X509_get_subject_name(cert);
+ 
+-#if OPENSSL_VERSION_NUMBER<0x10100006L
++#if OPENSSL_VERSION_NUMBER<0x10100006L || defined(LIBRESSL_VERSION_NUMBER)
+ #define X509_STORE_CTX_get1_certs X509_STORE_get1_certs
+ #endif
+     /* modern API allows retrieving multiple matching certificates */
diff --git a/net-misc/stunnel/stunnel-5.36.ebuild b/net-misc/stunnel/stunnel-5.36.ebuild
deleted file mode 100644
index 430a5ab301d0..000000000000
--- a/net-misc/stunnel/stunnel-5.36.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit ssl-cert eutils multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 libressl selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
-	stunnel3? ( dev-lang/perl )
-	selinux? ( sec-policy/selinux-stunnel )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-
-	# libressl compat
-	epatch "${FILESDIR}"/stunnel-compat-libressl.patch
-
-	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel-r1 stunnel
-
-	doenvd "${T}"/20stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.44.ebuild b/net-misc/stunnel/stunnel-5.44.ebuild
deleted file mode 100644
index 00f1d19b6a2b..000000000000
--- a/net-misc/stunnel/stunnel-5.44.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ssl-cert multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 libressl selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
-	stunnel3? ( dev-lang/perl )
-	selinux? ( sec-policy/selinux-stunnel )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-
-	# libressl compat
-	eapply "${FILESDIR}"/${PN}-5.43-compat-libressl.patch
-
-	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	docinto html
-	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel-r1 stunnel
-
-	doenvd "${T}"/20stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.45.ebuild b/net-misc/stunnel/stunnel-5.45.ebuild
deleted file mode 100644
index 997849c87f0f..000000000000
--- a/net-misc/stunnel/stunnel-5.45.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ssl-cert multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 libressl selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
-	stunnel3? ( dev-lang/perl )
-	selinux? ( sec-policy/selinux-stunnel )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-
-	# libressl compat
-	eapply "${FILESDIR}"/${PN}-5.43-compat-libressl.patch
-
-	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	docinto html
-	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel-r1 stunnel
-
-	doenvd "${T}"/20stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.46.ebuild b/net-misc/stunnel/stunnel-5.46.ebuild
deleted file mode 100644
index 997849c87f0f..000000000000
--- a/net-misc/stunnel/stunnel-5.46.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ssl-cert multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 libressl selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
-	stunnel3? ( dev-lang/perl )
-	selinux? ( sec-policy/selinux-stunnel )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-
-	# libressl compat
-	eapply "${FILESDIR}"/${PN}-5.43-compat-libressl.patch
-
-	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	docinto html
-	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel-r1 stunnel
-
-	doenvd "${T}"/20stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.48.ebuild b/net-misc/stunnel/stunnel-5.48.ebuild
deleted file mode 100644
index 6e724f8d84f5..000000000000
--- a/net-misc/stunnel/stunnel-5.48.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ssl-cert multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 libressl selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
-	stunnel3? ( dev-lang/perl )
-	selinux? ( sec-policy/selinux-stunnel )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-
-	# libressl compat
-	eapply "${FILESDIR}"/${PN}-5.48-compat-libressl.patch
-
-	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	docinto html
-	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel-r1 stunnel
-
-	doenvd "${T}"/20stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.49.ebuild b/net-misc/stunnel/stunnel-5.49.ebuild
deleted file mode 100644
index 6e724f8d84f5..000000000000
--- a/net-misc/stunnel/stunnel-5.49.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ssl-cert multilib systemd user
-
-DESCRIPTION="TLS/SSL - Port Wrapper"
-HOMEPAGE="http://www.stunnel.org/index.html"
-SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
-	http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
-	ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="ipv6 libressl selinux stunnel3 tcpd"
-
-DEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
-	stunnel3? ( dev-lang/perl )
-	selinux? ( sec-policy/selinux-stunnel )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup stunnel
-	enewuser stunnel -1 -1 -1 stunnel
-}
-
-src_prepare() {
-	# Hack away generation of certificate
-	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
-		tools/Makefile.in || die "sed failed"
-
-	# libressl compat
-	eapply "${FILESDIR}"/${PN}-5.48-compat-libressl.patch
-
-	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
-
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use_enable ipv6) \
-		$(use_enable tcpd libwrap) \
-		--with-ssl="${EPREFIX}"/usr \
-		--disable-fips
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-	rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
-		"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
-	use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
-
-	# The binary was moved to /usr/bin with 4.21,
-	# symlink for backwards compatibility
-	dosym ../bin/stunnel /usr/sbin/stunnel
-
-	dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog
-	docinto html
-	dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
-		tools/importCA.html
-
-	insinto /etc/stunnel
-	doins "${FILESDIR}"/stunnel.conf
-	newinitd "${FILESDIR}"/stunnel-r1 stunnel
-
-	doenvd "${T}"/20stunnel
-
-	systemd_dounit "${S}/tools/stunnel.service"
-	systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
-}
-
-pkg_postinst() {
-	if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
-		install_cert /etc/stunnel/stunnel
-		chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-		chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
-	fi
-
-	einfo "If you want to run multiple instances of stunnel, create a new config"
-	einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change "
-	einfo "\'pid= \' with a unique filename."
-}
diff --git a/net-misc/stunnel/stunnel-5.50-r1.ebuild b/net-misc/stunnel/stunnel-5.50-r1.ebuild
index c2c51a0ff501..bc6fd0ec6221 100644
--- a/net-misc/stunnel/stunnel-5.50-r1.ebuild
+++ b/net-misc/stunnel/stunnel-5.50-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ipv6 libressl selinux stunnel3 tcpd"
 
 DEPEND="tcpd? ( sys-apps/tcp-wrappers )
diff --git a/net-misc/stunnel/stunnel-5.40.ebuild b/net-misc/stunnel/stunnel-5.51-r1.ebuild
index 779c55aafc89..0c9f131d6371 100644
--- a/net-misc/stunnel/stunnel-5.40.ebuild
+++ b/net-misc/stunnel/stunnel-5.51-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -39,8 +39,8 @@ src_prepare() {
 	sed -i -e "s/^install-data-local:/do-not-run-this:/" \
 		tools/Makefile.in || die "sed failed"
 
-	# libressl compat
-	eapply "${FILESDIR}"/${PN}-5.39-compat-libressl.patch
+	# bugs 656420, 682894
+	eapply "${FILESDIR}"/${P}-libressl.patch
 
 	echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
 
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 2649850bb180..ddcd45a39b13 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -5,7 +5,10 @@ DIST teamviewer_14.1.3399_amd64.tar.xz 11311600 BLAKE2B 082b23322b4a24add2f7a123
 DIST teamviewer_14.1.3399_i386.tar.xz 11305576 BLAKE2B 1a40cd6dd5e1554b44d210fb0ca78a3570185e046b12eba52d0e089cd317ab6c8828f774d6b786ab7232ad663785bd9fb2e9137eb0ea7364347ea5513ab5e6ef SHA512 0fef5c5794ea06d9a729cd5be0b2e7c28add1fca9bbf9e77ca69fe569a08fc1efb6dc007040d8a8d3608061469dc2e2d364584130316d58e2d8195b2389deb0f
 DIST teamviewer_14.1.9025_amd64.tar.xz 11357456 BLAKE2B d3401b4465341533e0e3e7d57515566b1833689cb55d3d2b2b4ca95ed706ebd5609698b128033737dc1532e10fd15837241f11e327d3345ef266b90d2837075c SHA512 2a6fcfd3bb74a9e0f97bd94cf92ba5c8500c17436887e186c6b65d1c02b984799a41003e0cb58af503ece6c9c4f8205c907ba179b491efd3b765ef34b1ec9f76
 DIST teamviewer_14.1.9025_i386.tar.xz 11357824 BLAKE2B 6eb496549e39a1f66a5e14af3d69f8f11dda1549e4af51d354fa8cdfd027dec58240dc6ddacbaf0b1c0ccecf918873d9307f6d75a09abf180a1be5aff65f2613 SHA512 b5ff7e417ffa59725656611348dd717141fa010460f2d872ef555471f22af24d7dde02b0356eece69eb2a7e8fb0d94024646b74e9c8d5c00577eeda1e8c9a713
+DIST teamviewer_14.2.2558_amd64.tar.xz 11986724 BLAKE2B 1369d60fcc10b31e7065bf8e8e238e7fc42cd57572c69ffb698b301ee2d421443663cd6d6e5f800cb0a046e3ac1ff97b82d103574cb46f2cf6beffad8d849261 SHA512 c64ca29d0a90c597c61993e90d6f66d85ffe3c9d8c59115abbde8814e2141c1e69092b8ce16aac413ed1bfa5eb2bd47cb9f0f737f14b22055a8a92c120e8a66e
+DIST teamviewer_14.2.2558_i386.tar.xz 12459844 BLAKE2B 108474be22f2b5d64cadb6d228232553aef304d017976a6785a716324d157c3fa580f4b54486b642f4d14ee258198a6f5cb6076d1ddc5de593c22fc320fc124f SHA512 f6c22ca12bddcec11a77ab67db7e8e5d83fc8ef41bdb5124afac23f1aa6ef908f4054bfce2d9cf1d20ddad9c39cbb5ecdd13d535c4f734f40271e23b824f7f01
 EBUILD teamviewer-14.1.18533.ebuild 3701 BLAKE2B 2413ca30f73a54cf75f69600d9928d8803b0d6c66a4ef0e40c37703573845984ab15f00dfdba33b9359676a1412828df84dafeb5649d68e71d4f8ce3e8331dd8 SHA512 871ded4d964787d875a4731fa6e44590df92746c855ec1e5d471ed8cea8b7d464c591b308df4ebfd9dcf29cfa5e6cedcc53a98d40547ee3725a54536f83fe65a
 EBUILD teamviewer-14.1.3399.ebuild 3701 BLAKE2B 4f022ce30f521cdac93245040fc1963960fbd83eb5349c8febb1e17019ab990036d6de02a250384b0f2fa332913feca4fa7bb18c0c46812d5e9f64834f17cf29 SHA512 b97758ece045326b9096538393fba63215690996ca5c0ac56b95d4e235b6c9ba182c5909846ba48bad2819dbc3d880f34ca67dfbd083c8770db4962a9150e8db
 EBUILD teamviewer-14.1.9025.ebuild 3701 BLAKE2B 2413ca30f73a54cf75f69600d9928d8803b0d6c66a4ef0e40c37703573845984ab15f00dfdba33b9359676a1412828df84dafeb5649d68e71d4f8ce3e8331dd8 SHA512 871ded4d964787d875a4731fa6e44590df92746c855ec1e5d471ed8cea8b7d464c591b308df4ebfd9dcf29cfa5e6cedcc53a98d40547ee3725a54536f83fe65a
+EBUILD teamviewer-14.2.2558.ebuild 3701 BLAKE2B 2413ca30f73a54cf75f69600d9928d8803b0d6c66a4ef0e40c37703573845984ab15f00dfdba33b9359676a1412828df84dafeb5649d68e71d4f8ce3e8331dd8 SHA512 871ded4d964787d875a4731fa6e44590df92746c855ec1e5d471ed8cea8b7d464c591b308df4ebfd9dcf29cfa5e6cedcc53a98d40547ee3725a54536f83fe65a
 MISC metadata.xml 250 BLAKE2B 94de840f3a83c87af4ee3224855111d06a5c77ebbe20d6691dd5a95b4677075a0e9e2fe405a327ac485056269bf3146d5ee6726843447f6436a97d1f7ef44288 SHA512 1ec261c858ac8824789dab07b4b01fde96e8d2a13add9b05617a4b824085d77c181057a7c602db5f4fd3b864b864e6314a64512159d174304fc4fba393b49734
diff --git a/net-misc/teamviewer/teamviewer-14.2.2558.ebuild b/net-misc/teamviewer/teamviewer-14.2.2558.ebuild
new file mode 100644
index 000000000000..2887c5d78191
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-14.2.2558.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=${PN}${PV/\.*}
+inherit desktop gnome2-utils systemd
+
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
+		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
+
+LICENSE="TeamViewer MIT"
+SLOT="${PV/\.*}"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/dbus
+"
+
+RESTRICT="bindist mirror"
+
+# Silence QA messages
+QA_PREBUILT="opt/${MY_PN}/*"
+
+S="${WORKDIR}"/teamviewer
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
+		-i tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_PN}" # install destination
+
+	# Quirk:
+	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
+	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
+	# when changing the ABI of one of its dependencies. According to the
+	# TeamViewer devs, this binary is an unused remnant of previous Wine-
+	# based builds and will be removed in future releases anyway
+	rm tv_bin/script/libdepend
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
+		fperms 755 ${dst}/${exe}
+	done
+
+	# No slotting here, binary expects this service path
+	newinitd "${FILESDIR}"/teamviewerd14.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
+	done
+
+	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
+	# have the undesired result of installing subdirectory 'doc' in /usr/
+	# share/doc/teamviewer-<version>)
+	for doc in $(find doc -type f); do
+		dodoc ${doc}
+	done
+
+	keepdir /etc/${MY_PN}
+	dosym ../../etc/${MY_PN} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_PN}
+	dosym ../../var/log/${MY_PN} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "Please note that parallel installation of multiple versions of"
+	elog "TeamViewer is currently not supported at runtime. Bug #621818"
+	elog ""
+	elog "Before using TeamViewer, you need to start its daemon:"
+	elog "OpenRC:"
+	elog "# /etc/init.d/teamviewerd start"
+	elog "# rc-update add teamviewerd default"
+	elog
+	elog "Systemd:"
+	elog "# systemctl start teamviewerd.service"
+	elog "# systemctl enable teamviewerd.service"
+	elog
+	elog "To display additional command line options simply run:"
+	elog "$ teamviewer help"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/tn5250/Manifest b/net-misc/tn5250/Manifest
deleted file mode 100644
index 75653e3d2b66..000000000000
--- a/net-misc/tn5250/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX tn5250-0.17.4-disable-sslv2-and-sslv3.patch 2333 BLAKE2B f0debeacfcfe2596b716733cd80195b402f9b1536b3bbc6be7d12b763a2724b84c7030e92d76cdeca2685fb1bfc1714ab8d545276d23460f6cff930db412e86d SHA512 938130a2211409ab179499f1b7b50f5517d609a0ad73051a6c1a89493b44cca28200723693698beb516733e3099976f5ec0335f290553e903604c5a1eee652bd
-AUX tn5250-0.17.4-duplicate-definition.patch 3848 BLAKE2B 22d22f71ac85429ac08b856710587c0c7a759e15ed09730c25de475c5be14b4cf49da2c5db3e420c34a7425900d226cfdb0e78eab22c57c8771f512680edadb9 SHA512 ed3976c07e207594e1f43f156e65f9a26bcf82c0ffd1f05174da9cdd7441ad2ffb6d6b34deb7a544350ddb50f29e42dafe00d0b05ebcefa8bdf5968d47425ec4
-AUX tn5250-0.17.4-fix-Wformat-security-warnings.patch 2283 BLAKE2B 59ffb231abf6ef7927d79e8be51133c6f1f31f63ec38514bbaeee2069c3d063dc7ef3642953b7777668c016bb30e06c590ed63bb618d7796c3475483d77708b1 SHA512 da9114d26e838e822d8c63faa68f8157e03404f86e03c38f9f557416199c5ae96a35f4dbf47717c2588a6f29549b69a84ec66f5b7de848803b90759cae1fda04
-AUX tn5250-0.17.4-openssl11.patch 1617 BLAKE2B 99c528fcc57b9356c9c58c9a161bf370a907207fdd1493f4b2a339cacc775769da8755dd6322847ed9441b62ddf3bcaa8a891c628e9de15c647bdb80bfebf2f6 SHA512 7b52a1787f19e743137409239e2d6fa03197d73513a355fcede9e079fff909fa2c3921351039bfed703be140377130e4b74784397134e4454faa140a721f9e2b
-AUX tn5250-0.17.4-tinfo.patch 294 BLAKE2B 6032318a041b7e495e709f44e6abeedaee17be5754f779d73b33cfd0bc9fd625c53687cc9e2e0f49dc8be48ea497f3d2f3d9cba0b48c59d3f84fd9a98bdeab50 SHA512 e348a54d74e79fd3b7d4a7ae8a8bbab9751f873317b82738c1b934c643a4fe28cefb38008d944af61fe64f0852a1bb5eeea7b6bb8143e51a3469bc20fb8e0b22
-AUX tn5250-0.17.4-whoami.patch 450 BLAKE2B 529c2822328ae5b7eb70e49e1459271d325f465c6ecc3c2f0621805e1f61892c58614cdcd84c522ffe7b78d05c554af9928ff181497fefc13fb82a62c916502b SHA512 404fd5913db7240f1db14ac2a45e2897866e50fc33d56e5eb22e810b238d47b5d6c3700dd73fe095c2f5714e5f8f745c7e0bf670450d6454d20f10fa2f8c69c2
-DIST tn5250-0.17.4.tar.gz 648452 BLAKE2B 9e4d2d2b3148d063eecfc57f32daa1936d9f829a219952c9eb666e3f128c42f5ac611c4ccf12cdd533b3758459ce7f2f4e7c8fe74090042cb796067a7f6afe14 SHA512 7c41bc47658f792fe7c6c6186d93095ac2eca67868070d84502bcff7de0cbc97afea1bd9987d2dbc5a340a444fdf1fbff81c7b844f5c205ec603f24c5e6c0804
-EBUILD tn5250-0.17.4-r1.ebuild 1247 BLAKE2B 6169023b231922ef82594a6359d2d3f824cec17d1def604fca3a1aa676f3b6939a89cf882fa2e21afab20c7a6e6f46d00df9953c6e342af9016974a3e50802dd SHA512 e57461bf744d4ffffad3c8046a9faf674d0cef81d6baf1ea88546d5155a1eef7668931955599ab64a4ff4566990591edb41aba55a45f5ccb54dccfac7319e722
-EBUILD tn5250-0.17.4-r2.ebuild 1190 BLAKE2B 12e610edc7efeb7e0ff561db603c1f9e3e14ee6b95336eb81046ecce1554b350015d7316054ff5b3f8b78fae206ba7f070e9ab05ca2f0ce1c6ff6ccb3b830b98 SHA512 95631351a044b1328ccfc1006d1a4f6941b698a84eb7800697ef52e0f30a978bfa0ebb22af5e7a376dbcb97b4dfa7f7b0701adb9d7ceb85e6d057e4e7d3974db
-EBUILD tn5250-0.17.4-r3.ebuild 1329 BLAKE2B 95b5939c5f8d6f999e30846096eec4d25258cb6f04af08d5ba559adb97b5ad5bfc081f513e86787e32ab40fb3cd8d28c0dad0e5284b08c9b971b9ed6efc2d397 SHA512 0f5f7b8c637ee195f39bedda7d193e6192a47ffaa93a419f928d3b797993244f328bfd06df302251f8fe58d6476cbf5b4ae8b34571a4a94110006cb238adda47
-MISC metadata.xml 215 BLAKE2B a53a3a3ece4a9e09b8df96f5f8a629b7119c0e95e3e428c185f25378748975728f080e999a5e434e6fb3a38bb6599562ffacb8197f0be3ece1bcc43ccc1954de SHA512 0e99f231bdcff1306e232af176e4ce38c754ea988c072324093f2ac5bca81432abeb12af3e5f1960d0047bcd6d8c558fc995d1e6670556e00e443ebb1b6fe09c
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-disable-sslv2-and-sslv3.patch b/net-misc/tn5250/files/tn5250-0.17.4-disable-sslv2-and-sslv3.patch
deleted file mode 100644
index 9c8d04f55851..000000000000
--- a/net-misc/tn5250/files/tn5250-0.17.4-disable-sslv2-and-sslv3.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 1acfebd966e8804e6573cbe9287b8b6f028a646c Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Tue, 23 Aug 2016 18:13:47 -0400
-Subject: [PATCH 1/1] sslstream.c: ignore the user's choice of ssl_method.
-
-The SSLv2 and SSLv3 protocols are insecure, and people have begun to
-operate without them. LibreSSL, for example, does not have them
-enabled, and it is possible to build OpenSSL in the same manner.
-
-If SSLv[23] are disabled, the user would not be able to choose "ssl2"
-or "ssl3" as his "ssl_method", an option that was undocumented
-anywhere. Therefore there is not much lost, and some security to gain,
-by removing the option completely. This commit does that, and uses the
-automatic protocol choice that is capable of negotiating TLSv1,
-TLSv1.1 and TLSv1.2.
-
-Gentoo-Bug: 591940
----
- lib5250/sslstream.c | 26 ++++++++++----------------
- 1 file changed, 10 insertions(+), 16 deletions(-)
-
-diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c
-index 7181566..2f91d1a 100644
---- a/lib5250/sslstream.c
-+++ b/lib5250/sslstream.c
-@@ -362,22 +362,16 @@ int tn5250_ssl_stream_init (Tn5250Stream *This)
- 
- /*  which SSL method do we use? */
- 
--   strcpy(methstr,"auto");
--   if (This->config!=NULL && tn5250_config_get (This->config, "ssl_method")) {
--        strncpy(methstr, tn5250_config_get (This->config, "ssl_method"), 4);
--        methstr[4] = '\0';
--   }
--
--   if (!strcmp(methstr, "ssl2")) {
--        meth = SSLv2_client_method();         
--        TN5250_LOG(("SSL Method = SSLv2_client_method()\n"));
--   } else if (!strcmp(methstr, "ssl3")) {
--        meth = SSLv3_client_method();         
--        TN5250_LOG(("SSL Method = SSLv3_client_method()\n"));
--   } else {
--        meth = SSLv23_client_method();         
--        TN5250_LOG(("SSL Method = SSLv23_client_method()\n"));
--   }
-+    /* Ignore the user's choice of ssl_method (which isn't documented
-+     * anyway...) if it was either "ssl2" or "ssl3". Both are insecure,
-+     * and this is only safe supported method left.
-+     *
-+     * This is a Gentoo-specific modification that lets us build
-+     * against LibreSSL and newer OpenSSL with its insecure protocols
-+     * disabled.
-+     */
-+    meth = SSLv23_client_method();
-+    TN5250_LOG(("SSL Method = SSLv23_client_method()\n"));
- 
- /*  create a new SSL context */
- 
--- 
-2.7.3
-
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-duplicate-definition.patch b/net-misc/tn5250/files/tn5250-0.17.4-duplicate-definition.patch
deleted file mode 100644
index 39b3ccb45552..000000000000
--- a/net-misc/tn5250/files/tn5250-0.17.4-duplicate-definition.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 66e1a2f80091e9ee9b99156ae23e5faaf9f24fe0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Mon, 20 Feb 2017 15:06:36 +0100
-Subject: [PATCH 3/4] remove duplicate definition for tn3270_ssl_stream_init()
-
----
- lib5250/sslstream.c | 93 -----------------------------------------------------
- 1 file changed, 93 deletions(-)
-
-diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c
-index f4353a9..86d38cf 100644
---- a/lib5250/sslstream.c
-+++ b/lib5250/sslstream.c
-@@ -477,99 +477,6 @@ int tn5250_ssl_stream_init (Tn5250Stream *This)
-    return 0; /* Ok */
- }
- 
--/****f* lib5250/tn3270_ssl_stream_init
-- * NAME
-- *    tn3270_ssl_stream_init
-- * SYNOPSIS
-- *    ret = tn3270_ssl_stream_init (This);
-- * INPUTS
-- *    Tn5250Stream *       This       - 
-- * DESCRIPTION
-- *    DOCUMENT ME!!!
-- *****/
--int tn3270_ssl_stream_init (Tn5250Stream *This)
--{
--   int len;
--
--/* initialize SSL library */
--
--   SSL_load_error_strings();
--   SSL_library_init();
--
--/* create a new SSL context */
--
--   This->ssl_context = SSL_CTX_new(SSLv23_client_method());
--   if (This->ssl_context==NULL) {
--        DUMP_ERR_STACK ();
--        return -1;
--   }
--
--/* if a certificate authority file is defined, load it into this context */
--
--   if (This->config!=NULL && tn5250_config_get (This->config, "ssl_ca_file")) {
--        if (SSL_CTX_load_verify_locations(This->ssl_context, 
--                  tn5250_config_get (This->config, "ssl_ca_file"), NULL)<1) {
--            DUMP_ERR_STACK ();
--            return -1;
--        }
--   }
--
--/* if a certificate authority file is defined, load it into this context */
--
--   if (This->config!=NULL && tn5250_config_get (This->config, "ssl_ca_file")) {
--        if (SSL_CTX_load_verify_locations(This->ssl_context, 
--                  tn5250_config_get (This->config, "ssl_ca_file"), NULL)<1) {
--            DUMP_ERR_STACK ();
--            return -1;
--        }
--   }
--
--   This->userdata = NULL;
--
--/* if a PEM passphrase is defined, set things up so that it can be used */
--
--   if (This->config!=NULL && tn5250_config_get (This->config,"ssl_pem_pass")){
--        TN5250_LOG(("SSL: Setting password callback\n"));
--        len = strlen(tn5250_config_get (This->config, "ssl_pem_pass"));
--        This->userdata = malloc(len+1);
--        strncpy(This->userdata,
--                tn5250_config_get (This->config, "ssl_pem_pass"), len);
--        SSL_CTX_set_default_passwd_cb(This->ssl_context,
--                (pem_password_cb *)ssl_stream_passwd_cb);
--        SSL_CTX_set_default_passwd_cb_userdata(This->ssl_context, (void *)This);
--
--   }
--
--/* If a certificate file has been defined, load it into this context as well */
--
--   if (This->config!=NULL && tn5250_config_get (This->config, "ssl_cert_file")){
--        TN5250_LOG(("SSL: Loading certificates from certificate file\n"));
--        if (SSL_CTX_use_certificate_file(This->ssl_context,
--                tn5250_config_get (This->config, "ssl_cert_file"),
--                SSL_FILETYPE_PEM) <= 0) {
--            DUMP_ERR_STACK ();
--            return -1;
--        }
--        TN5250_LOG(("SSL: Loading private keys from certificate file\n"));
--        if (SSL_CTX_use_PrivateKey_file(This->ssl_context,
--                tn5250_config_get (This->config, "ssl_cert_file"),
--                SSL_FILETYPE_PEM) <= 0) {
--            DUMP_ERR_STACK ();
--            return -1;
--        }
--   }
--
--   This->ssl_handle = NULL;
--   This->connect = ssl_stream_connect;
--   This->accept = ssl_stream_accept;
--   This->disconnect = ssl_stream_disconnect;
--   This->handle_receive = ssl_stream_handle_receive;
--   This->send_packet = tn3270_ssl_stream_send_packet;
--   This->destroy = ssl_stream_destroy;
--   This->streamtype = TN3270E_STREAM;
--   return 0; /* Ok */
--}
--
- /****i* lib5250/ssl_stream_connect
-  * NAME
-  *    ssl_stream_connect
--- 
-2.7.4
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-fix-Wformat-security-warnings.patch b/net-misc/tn5250/files/tn5250-0.17.4-fix-Wformat-security-warnings.patch
deleted file mode 100644
index 4927bce546f2..000000000000
--- a/net-misc/tn5250/files/tn5250-0.17.4-fix-Wformat-security-warnings.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 1bc9cac45be4bac46f58e325779bdb8c7b7bf502 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Tue, 23 Aug 2016 20:20:15 -0400
-Subject: [PATCH 1/1] Fix format-security warnings.
-
-Newer versions of GCC have the ability to warn you (or throw errors)
-about insecure format strings. Generally this is due to an omitted
-format string in the printf family of functions, and a few of those
-issues existed in the code base. They were all fixed by adding a
-trivial "%s" format string. The project now builds with
--Werror=format-security.
----
- curses/cursesterm.c | 4 ++--
- lib5250/sslstream.c | 2 +-
- lib5250/telnetstr.c | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/curses/cursesterm.c b/curses/cursesterm.c
-index bf20f05..3032966 100644
---- a/curses/cursesterm.c
-+++ b/curses/cursesterm.c
-@@ -640,9 +640,9 @@ static void curses_terminal_update(Tn5250Terminal * This, Tn5250Display *display
-       if(This->data->is_xterm) {
-          if (This->data->font_132!=NULL) {
-                if (tn5250_display_width (display)>100)
--                    printf(This->data->font_132);
-+		    printf("%s", This->data->font_132);
-                else
--                    printf(This->data->font_80);
-+		    printf("%s", This->data->font_80);
-          }
- 	 printf ("\x1b[8;%d;%dt", tn5250_display_height (display)+1,
- 	       tn5250_display_width (display));
-diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c
-index 2f91d1a..7f3009e 100644
---- a/lib5250/sslstream.c
-+++ b/lib5250/sslstream.c
-@@ -307,7 +307,7 @@ static void ssl_log_SB_buf(unsigned char *buf, int len)
- 
-    if (!tn5250_logfile)
-       return;
--   fprintf(tn5250_logfile,ssl_getTelOpt(type=*buf++));
-+   fprintf(tn5250_logfile,"%s",ssl_getTelOpt(type=*buf++));
-    switch (c=*buf++) {
-       case IS:
- 		fputs("<IS>",tn5250_logfile);
-diff --git a/lib5250/telnetstr.c b/lib5250/telnetstr.c
-index 9ad2624..cf1576f 100644
---- a/lib5250/telnetstr.c
-+++ b/lib5250/telnetstr.c
-@@ -282,7 +282,7 @@ static void log_SB_buf(unsigned char *buf, int len)
- 
-    if (!tn5250_logfile)
-       return;
--   fprintf(tn5250_logfile,getTelOpt(type=*buf++));
-+   fprintf(tn5250_logfile,"%s",getTelOpt(type=*buf++));
-    switch (c=*buf++) {
-       case IS:
- 		fputs("<IS>",tn5250_logfile);
--- 
-2.7.3
-
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch b/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch
deleted file mode 100644
index 8c6d0fde1c70..000000000000
--- a/net-misc/tn5250/files/tn5250-0.17.4-openssl11.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5922e57bb5ea78ff35f82a60f1721d533cc0584a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
-Date: Mon, 20 Feb 2017 15:37:51 +0100
-Subject: [PATCH 4/4] port to OpenSSL 1.1
-
-- check for better functions in configure
-- update SSL initialization call
----
- configure.ac        | 8 ++++----
- lib5250/sslstream.c | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4ba0007..8a16cff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -152,13 +152,13 @@ dnl ** happily, we don't have to hunt for them thanks to ldconfig!
- dnl **
- if test -n $sslincludedir; then
-      CPPFLAGS="$CPPFLAGS $sslincludedir"
--     AC_CHECK_LIB(crypto,CRYPTO_num_locks)
--     if test "$ac_cv_lib_crypto_CRYPTO_num_locks" != "yes"
-+     AC_CHECK_LIB(crypto,OPENSSL_init)
-+     if test "$ac_cv_lib_crypto_OPENSSL_init" != "yes"
-      then
-              AC_MSG_ERROR([** Unable to find OpenSSL libraries!])
-      fi
--     AC_CHECK_LIB(ssl,SSL_library_init)
--     if test "$ac_cv_lib_ssl_SSL_library_init" != "yes"
-+     AC_CHECK_LIB(ssl,OPENSSL_init_ssl)
-+     if test "$ac_cv_lib_ssl_OPENSSL_init_ssl" != "yes"
-      then
-              AC_MSG_ERROR([** Unable to find OpenSSL libraries!])
-      fi
-diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c
-index 86d38cf..3c0f390 100644
---- a/lib5250/sslstream.c
-+++ b/lib5250/sslstream.c
-@@ -368,7 +368,7 @@ int tn5250_ssl_stream_init (Tn5250Stream *This)
- /*  initialize SSL library */
- 
-    SSL_load_error_strings();
--   SSL_library_init();
-+   OPENSSL_init_ssl(0, NULL);
- 
- /*  which SSL method do we use? */
- 
--- 
-2.7.4
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-tinfo.patch b/net-misc/tn5250/files/tn5250-0.17.4-tinfo.patch
deleted file mode 100644
index 46469c4def8e..000000000000
--- a/net-misc/tn5250/files/tn5250-0.17.4-tinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,6 +64,7 @@
- 			AC_MSG_ERROR([** You need a curses-compatible library installed.])
- 		fi
- 	fi
-+	AC_SEARCH_LIBS(stdscr, tinfo, [CURSES_LIB="$CURSES_LIB -ltinfo"])
- 	AC_SUBST([CURSES_LIB])
-         if test "$ac_cv_use_old_keys" != "yes";
-         then
diff --git a/net-misc/tn5250/files/tn5250-0.17.4-whoami.patch b/net-misc/tn5250/files/tn5250-0.17.4-whoami.patch
deleted file mode 100644
index fbcece25af27..000000000000
--- a/net-misc/tn5250/files/tn5250-0.17.4-whoami.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/linux/Makefile.am
-+++ b/linux/Makefile.am
-@@ -18,10 +18,6 @@
- 	  if [ "$$(uname -s)" = "Linux" ]; then \
-             if which tic >/dev/null 2>&1 ; then \
- 	      if [ "`whoami`" = "root" ]; then \
--		rm -f /usr/share/terminfo/x/xterm-5250 ; \
--		rm -f /usr/share/terminfo/5/5250 ; \
--		rm -f /usr/lib/terminfo/x/xterm-5250 ; \
--		rm -f /usr/lib/terminfo/5/5250 ; \
- 		good=yes ; \
- 		tic $(srcdir)/5250.terminfo || good=no ; \
- 	      else \
diff --git a/net-misc/tn5250/metadata.xml b/net-misc/tn5250/metadata.xml
deleted file mode 100644
index 46bc7afa2da1..000000000000
--- a/net-misc/tn5250/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="sourceforge">tn5250</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/tn5250/tn5250-0.17.4-r1.ebuild b/net-misc/tn5250/tn5250-0.17.4-r1.ebuild
deleted file mode 100644
index 5ae73def9bfd..000000000000
--- a/net-misc/tn5250/tn5250-0.17.4-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Telnet client for the IBM AS/400 that emulates 5250 terminals and printers"
-HOMEPAGE="http://tn5250.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="X libressl ssl"
-
-RDEPEND="
-	sys-libs/ncurses:=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libXt )
-"
-
-src_prepare() {
-	default
-	# Next, the Makefile for the terminfo settings tries to remove
-	# some files it doesn't have access to.	 We can just remove those
-	# lines.
-	cd "${S}/linux"
-	sed -i \
-		-e "/rm -f \/usr\/.*\/terminfo.*5250/d" Makefile.in \
-		|| die "sed Makefile.in failed"
-	cd "${S}"
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--without-python \
-		$(use_with X x) \
-		$(use_with ssl)
-}
-
-src_install() {
-	# The TERMINFO variable needs to be defined for the install
-	# to work, because the install calls "tic."	 man tic for
-	# details.
-	dodir /usr/share/terminfo
-	emake DESTDIR="${D}" \
-		 TERMINFO="${D}/usr/share/terminfo" install
-
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/net-misc/tn5250/tn5250-0.17.4-r2.ebuild b/net-misc/tn5250/tn5250-0.17.4-r2.ebuild
deleted file mode 100644
index f3cfbf0f6174..000000000000
--- a/net-misc/tn5250/tn5250-0.17.4-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools ltprune
-
-DESCRIPTION="IBM AS/400 telnet client which emulates 5250 terminals/printers"
-HOMEPAGE="http://tn5250.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="libressl ssl static-libs"
-
-RDEPEND="
-	sys-libs/ncurses:=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.17.4-disable-sslv2-and-sslv3.patch
-	"${FILESDIR}"/${PN}-0.17.4-fix-Wformat-security-warnings.patch
-	"${FILESDIR}"/${PN}-0.17.4-tinfo.patch
-	"${FILESDIR}"/${PN}-0.17.4-whoami.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with ssl) \
-		--without-python
-}
-
-src_install() {
-	# The TERMINFO variable needs to be defined for the install
-	# to work, because the install calls "tic."	 man tic for
-	# details.
-	dodir /usr/share/terminfo
-	emake DESTDIR="${D}" TERMINFO="${D}/usr/share/terminfo" install
-
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/net-misc/tn5250/tn5250-0.17.4-r3.ebuild b/net-misc/tn5250/tn5250-0.17.4-r3.ebuild
deleted file mode 100644
index b28b5cc3723d..000000000000
--- a/net-misc/tn5250/tn5250-0.17.4-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="IBM AS/400 telnet client which emulates 5250 terminals/printers"
-HOMEPAGE="http://tn5250.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="libressl ssl"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.17.4-disable-sslv2-and-sslv3.patch
-	"${FILESDIR}"/${PN}-0.17.4-fix-Wformat-security-warnings.patch
-	"${FILESDIR}"/${PN}-0.17.4-tinfo.patch
-	"${FILESDIR}"/${PN}-0.17.4-whoami.patch
-	"${FILESDIR}"/${PN}-0.17.4-duplicate-definition.patch
-)
-
-src_prepare() {
-	default
-	if has_version ">=dev-libs/openssl-1.1.1"; then
-		eapply "${FILESDIR}"/${PN}-0.17.4-openssl11.patch
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ssl) \
-		--disable-static \
-		--without-python
-}
-
-src_install() {
-	# The TERMINFO variable needs to be defined for the install
-	# to work, because the install calls "tic."	 man tic for
-	# details.
-	dodir /usr/share/terminfo
-	emake DESTDIR="${D}" TERMINFO="${D}/usr/share/terminfo" install
-
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-misc/trackma/Manifest b/net-misc/trackma/Manifest
index 731daffc2270..9148ba197fce 100644
--- a/net-misc/trackma/Manifest
+++ b/net-misc/trackma/Manifest
@@ -1,6 +1,6 @@
 DIST trackma-0.7.3.tar.gz 142450 BLAKE2B 27ec903e7372d18349bdc978cf1b72c501bd028cb00b9e8e1facde367c9b6041b87561370351eb21ffba9ac23ac40dd370e2aa74b0ebe8b9142f870f4f7e018a SHA512 73a7caa1e740e96f29edfcdfc5dbcaf26f280371c176bba69947fff37ca935d56e280a6d3e12c0a7f6283fecdad3d8e8e82c0d45a75d1962e58fdd7458630791
 DIST trackma-0.7.4.tar.gz 143814 BLAKE2B 8fafa53b4af94a1078e2343b1b309efe8caa058809309ddbdae618b2b3d85fbf001cb73c2556fd50b8946c9d61ddb32d74c3bb5be9bb2c2501b29265a587e2d4 SHA512 88b7eacc6a60fec5b022787337274b95d0fb972dbdd8ffa1a000806612403d8f84a2317e5903ec1ffcdbac91132a960670855991c0885f526fdbc4a1033c3364
-EBUILD trackma-0.7.3.ebuild 1982 BLAKE2B 613d1ebeb5373c34ad15981ce91f3e7361da68083d18a3cf973c3aa97f60790c5ce350a7549707a1d3420fb14817d16c0da07fd5fe7ce0d9c700d113f846b213 SHA512 b4927b0864f1e94d3fafe92d731e9f835cea28cb1e84778a3571e51cd70338624b3b650fd5b6a6c1f0f8fc2e77068caefd41ec02cad6184dbb8949f482dc9217
-EBUILD trackma-0.7.4.ebuild 1986 BLAKE2B 937c55c9391c0db9d35ffbc55fbe0928770e989aea9c0be7adc226f4da882f412cf97ecbeb8361358675bbcf94f81f191aa0dd28a92c2c1ac3e2689fb331aac9 SHA512 faf3ec4db84da619153a0dc4f126ea217af704a60d93f61dec00fd3500fa604ecd5a9f8eb0d15e62366c67432e13cf3a38e18e21a139161a772969adb9a07679
-EBUILD trackma-9999.ebuild 1938 BLAKE2B 91c1a8d7483ebd947017faa670c67e83ecee7b0395a690291fd7decbe1f09f2fb442ba5e6c3d2b42c1f0b273d06aa01ce010de00faf42becf915f11882ead882 SHA512 93d96f916d9e7599033e1356e32125f754c70b07b6a94b51ccda9c2588e0cb0cdd6cc35e884d2a3b0c3db8a4a87c42897f9d4c0744081f89ea50ab998ea40945
+EBUILD trackma-0.7.3.ebuild 1973 BLAKE2B 70527b22320658ce358fe9ac31d3ffe24c6194af220f0da890bcbc80606f846fe5ce03fbedc368436356c9ff66424d95b58eb9cd5060fd8618f50efeb8e890ad SHA512 b98fa9fe204d76f996946e6d48d853885badc3fb6a77fbc9aca9990cf72bc876d6fba955ed811259b31e51d8e514afbd449566fb6f3d145cf1c4d849cecb975d
+EBUILD trackma-0.7.4.ebuild 1979 BLAKE2B b5a0190c8d128cf6c6419d06ae0cbfacd05ab2102ff6613ddff338da2bbc3e7936eeaf435171731e7b41a75668c8b8e9c8f5608b11efc091fb515a11d9d84b2f SHA512 034a2bff20f856767d08939cf1f151d71e4351bc118be26b086b4bfb64eb681cb0cc6ee44265f8be713c9d975d75e7650340e1f1fac8c9ef1f5c48958760dd2c
+EBUILD trackma-9999.ebuild 1931 BLAKE2B 3b52f598487bb469a890a96d978d31a4d796459da3908a28ce17994e0ad9a39709431152eb26bce72f4006449ed4c4582bb5d5422c4366f0e14877a5e06e7c23 SHA512 d953512cb15a9f05dd972487cc9f19a88b69b0f9810aee3755bd51b64e46965e22859832c97c57cdaa5518a3a3ddf34106398f443cd864f6f793db109a7ef9f9
 MISC metadata.xml 579 BLAKE2B 246c639d17e6a69b309624da7ca46720c19f7226b770012bd7d020cb409b842d90d3ada211934062f65202798031dcc667e6801720e588b604b69b71ed0fa34f SHA512 0cc21a27e6dfe16172926c5a0b61b4349c6e68a538e32c041d259c4ada8c147040595c782c8d2ef9e1054edb72c8475f9e1b4d0d3544f277e805d681401d46bf
diff --git a/net-misc/trackma/trackma-0.7.3.ebuild b/net-misc/trackma/trackma-0.7.3.ebuild
index ffaed1f4ad6f..e1a4538679a3 100644
--- a/net-misc/trackma/trackma-0.7.3.ebuild
+++ b/net-misc/trackma/trackma-0.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python3_5 )
 
 inherit distutils-r1 eutils
 
diff --git a/net-misc/trackma/trackma-0.7.4.ebuild b/net-misc/trackma/trackma-0.7.4.ebuild
index b50989cd76a8..1f5b5a79bb4d 100644
--- a/net-misc/trackma/trackma-0.7.4.ebuild
+++ b/net-misc/trackma/trackma-0.7.4.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
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1 eutils
 
diff --git a/net-misc/trackma/trackma-9999.ebuild b/net-misc/trackma/trackma-9999.ebuild
index 753bf11d7bb4..c267a57aade6 100644
--- a/net-misc/trackma/trackma-9999.ebuild
+++ b/net-misc/trackma/trackma-9999.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
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1 eutils git-r3
 
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index ececd5f0ba88..d50a6d1d543d 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,7 +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.1.ebuild 3186 BLAKE2B 0d8a494f8eedb24e7d24b963f489615ff61b1197e36ed588539c39835ac237b0c2bc7291ecec9e77b477a44addc0214dc84776520b3466592ce5c9d50e70d741 SHA512 fffa7b02c2c8386889d205e1e85d347d582fce184953deed59022d1918e5b64f818272557e0d7834843d89e5b6457e766bdbe0b0c5c759f43da19e30509c9b3f
 EBUILD wget-1.20.2.ebuild 3199 BLAKE2B b3bdf8e617b23ce92b23e9f958c5f3523666832760f5d4341067dcde3489d7d5c3cf10149b187181ffc08c55b67b5ea89b58009c66529407b18a25e01eda256e SHA512 10ba5b18809aed13e07d4e71cf2f0b3073d0f5ece4c2401b3d5e8dbd07f42d62d6776d163ed2daee39fc2bb1bf90bcdae712b3a1d491b94b45ea35ee9d05e5ee
-EBUILD wget-1.20.3.ebuild 3199 BLAKE2B b3bdf8e617b23ce92b23e9f958c5f3523666832760f5d4341067dcde3489d7d5c3cf10149b187181ffc08c55b67b5ea89b58009c66529407b18a25e01eda256e SHA512 10ba5b18809aed13e07d4e71cf2f0b3073d0f5ece4c2401b3d5e8dbd07f42d62d6776d163ed2daee39fc2bb1bf90bcdae712b3a1d491b94b45ea35ee9d05e5ee
+EBUILD wget-1.20.3.ebuild 3189 BLAKE2B e6b0560807374efc6b5ddb2858684d6895a3e49322fe9e7b374f700ef202e9ba18081658f3fa9d28faa477321d2f608c334dd1a00a6f9209d8e3f45d27ab67cb SHA512 f66b94f59122ceaee3f45ca79e3a35203162c07dffaa289349ff0850b4c820f01c2ae9e4488c722b7d7b219779033a9043aaf8373a59ef18e453287281773ba9
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/wget-1.20.1.ebuild b/net-misc/wget/wget-1.20.1.ebuild
index ae23b38c4306..db7181db9c4a 100644
--- a/net-misc/wget/wget-1.20.1.ebuild
+++ b/net-misc/wget/wget-1.20.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit flag-o-matic python-any-r1 toolchain-funcs
 
diff --git a/net-misc/wget/wget-1.20.3.ebuild b/net-misc/wget/wget-1.20.3.ebuild
index b9c1aa3290a5..3ab398da7d50 100644
--- a/net-misc/wget/wget-1.20.3.ebuild
+++ b/net-misc/wget/wget-1.20.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 )"
 
diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest
index 5f280aa96b68..39cd88d56715 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -1,3 +1,5 @@
+DIST you-get-0.4.1270.tar.gz 143127 BLAKE2B 2c18a97001caf0c44a5baf30042cde61ac0ad2e8a5d0c0dc178474ba9cb70671c4bc9ecbbb72515f4fec2306598ba1b42d66192f2a16aa8fd0d65ff47eeb0b61 SHA512 fc21563396d73b0fbd7ff02c423a256be548957ef5d72277c887d33ee05269c2aa404a66972e934d4f0076ebd30bfa1b0914b05c25b38b63b3701dad1361587b
 DIST you-get-0.4.536.tar.gz 104745 BLAKE2B 48a5432ae1d4448ce0dcbbfdf52225920eb8cd8e575030cc62da0637f10cc7bb02a983c27c5bdd4a9fac1b45ab129db4f7fcc2ebb4bd17189918e04dabae0cfd SHA512 13d280dd5f0e6b6b5033de6eb94a251007bfc21bd99a9c0af86a5ed7b1c9b267d742c278dd80ec0a13445e09f2e22aea23bc77a5da12557be33f97731258abc6
-EBUILD you-get-0.4.536.ebuild 492 BLAKE2B d32ee8409288bfa16160567f05afaaf5f043f9b044949c355a59cc0a17d117ab3f5656f6c53416c8e797311902315755d6731f34f62d110abec7968212047421 SHA512 63e5802bf030b3d029b8d123c098977305134ad21d9b94c3d9c89f74315594a4356bb24d7fe687b75448d20d6b901aead94d7ee5326a1210141edc1fde60012c
+EBUILD you-get-0.4.1270.ebuild 487 BLAKE2B 6c58374899f3a47ff69bc7a444b7776f5e5ef022d930c31b4aec49e8e05c6c52e9e2831ac825d5819394b5c449ada1fe408ba889c5676d1736970a3afdf4c17f SHA512 071fb6d7f9730196f24506fa810ca22cb80f5c029732cc5111f60c9d24235b868b20d1e7f97d5ee303247b8b35c1fa5eaf87f2b726fa7d35b1e53d08217b5f69
+EBUILD you-get-0.4.536.ebuild 485 BLAKE2B ad233ced25f0b304b79dde1e452c7c5393052ab4fbbd240cf08b60e27317c2d37e240cbb8ad92aa3f0d0573e42284f47bbd0fef1e4aa614c5ea99942196c7875 SHA512 69f0b7f67b115bb6393c09ccea4bcee23b2fca6545df43765c475e54667bd33013b1d81ad648ca7b21316cc09df388569bd7155ac4f0214915a45719512dc61a
 MISC metadata.xml 330 BLAKE2B 9d17cf8bd3386e62f13765cd48f3351ef8a3abd726772d0d2d1365c8f8fa531efe401c33a46232092aae2a0f846cee99d5bfba400f5f1b2d10466220d20477c5 SHA512 923e442a3f28cd825b34e717db363907d19638656c7045e705f1cd4460868e7b602de696096157097e2723d9b537d09130d2d8506ec206b3c874d205150a1dd6
diff --git a/net-misc/you-get/you-get-0.4.1270.ebuild b/net-misc/you-get/you-get-0.4.1270.ebuild
new file mode 100644
index 000000000000..21add64c6073
--- /dev/null
+++ b/net-misc/you-get/you-get-0.4.1270.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python{3_5,3_6})
+
+inherit eutils distutils-r1
+
+DESCRIPTION="utility to download media contents from the web"
+HOMEPAGE="http://www.soimort.org/you-get"
+SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	virtual/ffmpeg
+"
diff --git a/net-misc/you-get/you-get-0.4.536.ebuild b/net-misc/you-get/you-get-0.4.536.ebuild
index ec302071f7e5..f0240b90a3dd 100644
--- a/net-misc/you-get/you-get-0.4.536.ebuild
+++ b/net-misc/you-get/you-get-0.4.536.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=5
 
-PYTHON_COMPAT=(python{3_4,3_5,3_6})
+PYTHON_COMPAT=(python{3_5,3_6})
 
 inherit eutils distutils-r1
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 9169f8d57cde..ef30215ef6c3 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,6 @@
-DIST youtube-dl-2019.03.18.tar.gz 3122206 BLAKE2B 8a94cf92ebce960fe9b074d5cc23047fbf326fe4511c55f0a1c4843386e4e3c65da4f89a2401243dbaf73882f68aadc768e653e8ed9e5c91244172c24e55d8bb SHA512 0a683631da7d67aa2f23eb6326664e483b71ef776b3ff63c732bdef54f58c7f615733023f8c4b948078f59d136414bd059bdc753d89aec630126bbe826db58ce
-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
+DIST youtube-dl-2019.04.17.tar.gz 3146625 BLAKE2B 35f49bcb56daa3ddbeeaaab57e4be259ddd2ebd1b21f797098fecb33fc0e153947558406f91878e2bb2d2627c950b4e670dbde35a148f1c216e46d366a7bb462 SHA512 6277a96a6487d81be23e0772c8e6fa36337d5b2b90a50b9be328579334b92c6e1a6eb9634a66969435c0d47e734fb907e286578cbc2f693565055ed1111b8148
+DIST youtube-dl-2019.04.24.tar.gz 3152789 BLAKE2B a90bc795d80c1dd50910288eead0646ffb0757afe911e3d3429b7ad20bcb9a494e12c341833731cbaf7009e0aef9d30695cf8e8c4e4688950709e96b02f10aff SHA512 44fa60c4e62bcc8d81908d600349ad89b1123262c942fe206d5966e7e2e59aca94d13e56bfac61b8be6da365316634aeb057b3d6055d6ff8b57addc1597d8fa3
+EBUILD youtube-dl-2019.04.17.ebuild 2113 BLAKE2B ad2c7e843bf3f0ed831f112fd8db7eef33694b2140ecfbe2c521eed0e87fac4f1bda7dca048d21c47656c974b6537f5239b7fa21cad19c2725adb689f819b841 SHA512 06b5c65494bd6ec422d72f2478e44251a86eba81284b8d1a29c0ff2e6c0d380f5b0f9c16c8971ddbc39d4604892c53b6ac9678c4bb2838ecf8df3810f27bda74
+EBUILD youtube-dl-2019.04.24.ebuild 2119 BLAKE2B 97242d14fb3198185ef70123182c2def274cc0101555a13a447622c30baee2451ad611d6c2d211987abc56869830f4cfc2f4989d7f8f658d382af94f6adb335f SHA512 029ba27247f94c345be98f6262fefc616a6bf1e268c7103f73f2b513fbede75d64d920e4891127a93f5655efc52145da79975a42ca982f91f3b6991bb9c4a6dd
+EBUILD youtube-dl-99999999.ebuild 2008 BLAKE2B 0d73cc5f4c06fe047e9f6c111ee74928c77184ed1fb8f1378966d9e72466d9aaf6e24d9f1d0bced6700364e69ba89d68f053fc4bd10eb8800614561f6c26c1d0 SHA512 7ac9918237139f1dc59be95024ee76df8fa78b078c9f6182c5a290b70ef5672fa6df36b409e4d215e7a073df519d93ada3a4b90cff198ae5871202022648e9e6
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.03.18.ebuild b/net-misc/youtube-dl/youtube-dl-2019.04.17.ebuild
index 38bace475e54..031b60d9dd80 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.03.18.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.04.17.ebuild
@@ -2,7 +2,7 @@
 # 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})
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
diff --git a/net-misc/youtube-dl/youtube-dl-2019.04.01.ebuild b/net-misc/youtube-dl/youtube-dl-2019.04.24.ebuild
index 8249fc9c0e19..20bf8606772f 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.04.01.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.04.24.ebuild
@@ -2,7 +2,7 @@
 # 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})
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index b34881e4d229..9adb986d3027 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -2,7 +2,7 @@
 # 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})
+PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index c214f3bdec21..ffd3435d4eba 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1,6 +1,8 @@
 DIST youtube-viewer-3.3.3.tar.gz 232856 BLAKE2B 68f3529edeaeb443203f1c6bf4a9967346a5015d05d40ffeca65a1deeacb73cb9bd7fbc79ed2c70f161c82a03df8461b3d39b071ccbe480b10d4259eba08d430 SHA512 ca624c456d33aa804398f71f1dd4a095f7b9ca5ae5a1cb255b9e8a3dea671a8b0f986977428e797f1fc1f96d69087a66c71185e37cc521d668c036c4e7a5825f
 DIST youtube-viewer-3.3.4.tar.gz 232892 BLAKE2B d39d6406a664ea911ee6db76311b6526c5a962a10be45222613a54f5b11a34c81681389f9e6c9569076161444212a75d0a1053a2939b899a4935f391cc100300 SHA512 fc8a1c7ebda5efc7d1e32b211c3fe301e84db393fd6be06c026dd12903ad7a3dea7bc5b24e3125d55e0b56140a2d0fb2bf2ce001d3cde7792b8e4a3590496c7e
+DIST youtube-viewer-3.5.4.tar.gz 237736 BLAKE2B 900cd48025d28a1077f909a740d94824c07cc9d0c0fb0954c16fc79dd5bb7db53431fdadf4fca2ebb89b3fabc61801bd64bf8f042bbd70d53f1616d9fd74fcbd SHA512 60da8bd6017eeedb299ac5b226fc3094823a5dab8db938b603f4630724590dae5acc03c6ad609b8b3f3b0f2149bb37398d018893da7b2fde762f9f795bdaf618
 EBUILD youtube-viewer-3.3.3.ebuild 2025 BLAKE2B 390f88f32c0c4bfaca84c8265ac73dc1b712868b481d949f15f0c96bd83b780e42039d2d422faaaeeea557c5794164abe40694d4dd74c36e9e2519ef42661933 SHA512 2fa5e47ed3c5dca68f1176c26a468862c4e9f31782a8dc7328aca3754791114fb0f4090cd4936468c8b04f485919701eaa6c4a56301866dc7ddbe6eb97a0f726
 EBUILD youtube-viewer-3.3.4.ebuild 2027 BLAKE2B d090963e37b0a6198e6aaea0c358c860b36c59c8201cef648c42acb59d970aa28283eb63d1dc1173be74624e7161d4a284f0a2757416bce826a1cd68ba9c47a1 SHA512 a62061be86dfe9a526790673f3c47ce60146537956cbc2d1f1b0c64cdfec6954044662d770ac74ad8e3b8245f4da9e6c194d5175631a81e82deb89494f2f97b8
+EBUILD youtube-viewer-3.5.4.ebuild 2079 BLAKE2B 7757729231aff1136e15af651df558b62f015d0da273111ead2085461e52b65e3f5fb70df8fe132231ae4f1e80d99ac48e5f64191d9695c85985b58b23d16648 SHA512 72ac6fe280939c42eeaf44c6e2d2827db79eda151d88dd212ac6d378f70607e1e816e74429acd2d241a967fbb9d4e2376b3706965df8bb5bfda471a02d976d5c
 EBUILD youtube-viewer-9999.ebuild 2252 BLAKE2B 5cb27656f5f6ff899760f9f200ea3ddaae1f3a721bbeff90b8b7c3fe4b0c38f09b2ce7cc9be2a19cbd7b41c03d54426cc1e2e1d62dab1038d866b27e876e6875 SHA512 15f2acb1b4346ada4d71913569ef91852657ac52861ff89b6b7952903ef20c6a9bcb438f89a024aaab030c9e0a4820c2f0cab08a7ce4fbe92884a5d3e4044f04
 MISC metadata.xml 1001 BLAKE2B ea9aae31db72d91c37e3f37b672404262ad303a26461df31c78d4a45050ac27c46e9ed18b160eb96f34d15b08bd6250139ed2960834b0aa93923c2651bd19e58 SHA512 2136df64736fa79cae9cda680d3412ff700c03b943c19184a0d1c94d51f161b34eddefee88468ef63a99e87a553973caeb1241226fbac13eabb5462990d98fd6
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.5.4.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.5.4.ebuild
new file mode 100644
index 000000000000..b41e4a52107c
--- /dev/null
+++ b/net-misc/youtube-viewer/youtube-viewer-3.5.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils perl-module
+
+DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
+HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html"
+SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="
+	dev-perl/Data-Dump
+	dev-perl/JSON
+	dev-perl/libwww-perl[ssl]
+	dev-perl/Term-ReadLine-Gnu
+	dev-perl/LWP-Protocol-https
+	virtual/perl-Encode
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Term-ReadLine
+	virtual/perl-Text-ParseWords
+	virtual/perl-Text-Tabs+Wrap
+	gtk? (
+		dev-perl/File-ShareDir
+		>=dev-perl/Gtk2-1.244.0
+		virtual/freedesktop-icon-theme
+		x11-libs/gdk-pixbuf:2[X,jpeg]
+	)
+	|| ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] )
+	|| ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )"
+DEPEND="dev-perl/Module-Build"
+
+src_configure() {
+	local myconf
+	if use gtk ; then
+		myconf="--gtk-youtube-viewer"
+	fi
+	perl-module_src_configure
+}
+
+src_install() {
+	perl-module_src_install
+
+	if use gtk ; then
+		domenu share/gtk-youtube-viewer.desktop
+		doicon share/icons/gtk-youtube-viewer.png
+	fi
+}
+
+pkg_postinst() {
+	use gtk && gnome2_icon_cache_update
+	elog "Optional dependencies:"
+	optfeature "cache support" dev-perl/LWP-UserAgent-Cached
+	optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS
+	optfeature "the case if there are SSL problems" dev-perl/Mozilla-CA
+	optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth
+	optfeature "live streams support" net-misc/youtube-dl
+	optfeature "threads support" virtual/perl-threads
+	elog
+	elog "Check the configuration file in ~/.config/youtube-viewer/"
+	elog "and configure your video player backend."
+}
+
+pkg_postrm() {
+	use gtk && gnome2_icon_cache_update
+}
diff --git a/net-misc/zerotier/Manifest b/net-misc/zerotier/Manifest
index 2a09cbe32706..43c1a509e3b0 100644
--- a/net-misc/zerotier/Manifest
+++ b/net-misc/zerotier/Manifest
@@ -1,5 +1,5 @@
 AUX zerotier.init 437 BLAKE2B a43cc014d5ad311d14b13324e118c73c694623621c252ad6957af53064ccb53cda7c028cf2348e6999508262e86576fdd5c02feba81af6e1a9a88653bbd7a0e7 SHA512 938dcdf16228ca62a14c18658d746054590104dc50028d5dc4d56dba139dfc894d88d567e918533820df81723d56411cc046050b4b7c0e11e1128bef599fb12a
 AUX zerotier.service 179 BLAKE2B 8c27616a5092084a2450f08e5046528ce25f7697fca914436d9dddd003538e4d9bcfb50126e522936cf997d5f225f32751f59229d28cd6e85778b6b1bed8edb2 SHA512 80b685e2e6e851af924c1f84970be761e15086f52280819d75279b947f0e2a11f890035570b85becef85f208ef8f7952323f85fb811984701ff9f39e37d6c701
 DIST zerotier-1.2.12.tar.gz 6058902 BLAKE2B 851d0d871fac7f6cdd9feafb375f97181f9155c265f13e44122424bd7adcaff10e3f2c2a4484d2e2ad1f4f2f174fc723681451c1a728c9aa324bdcb02300af57 SHA512 a35029993d9266f3529a9922daa606b0d56a332514545f8cfab2092a4c9db4fc7217223f3bd7dbe59e536de325ee9b4f0226d673c0f0ec5859cf2937e8a4a2d4
-EBUILD zerotier-1.2.12.ebuild 907 BLAKE2B 0e22ec3b3c60feda4a13c8ae3962971fface27247ccb76fa8abbbcd50487e7ff251929548389a9519c8c938da0574c13a354891b0aa83b0c35a9408bda3e0040 SHA512 ea2df909823b40748376615d9e619104c8997f5e9395bd2600c30aa29f97af1f2cbb337f23b096170cd6ed6c9c80ff8922af32589f976cbac990607afbe6c5b4
+EBUILD zerotier-1.2.12.ebuild 914 BLAKE2B b321d596dcc72e2495c2a324b79a5d9a630f1e280a0ed40b7876dc2af359c166fb9024a00f49db1b19ca13a5dea2b5c69bacaf4254729c95e0fc58c8f15f6a46 SHA512 a102dc5a09237e6a98e4b8bf51c3397d4fc9ea698bdc6847c5efe5d31f0333f9281c3700abc6b477ef95e9cda68ede2a080cada13b1b2a6316ff87a2238d6d53
 MISC metadata.xml 550 BLAKE2B b2337f927bef36ec75e2329459f9f654e3e786ec8d4dfa2016e42c5c857db77a539df1e2e6398483995e72d2a71f9eee3bf81df3e26501354c8bdd8ac5243222 SHA512 2c76feb941ce99247828da120bf10b4c9152065a361230b06c2717716fe0eb8798fa59eb737dff449d9c2d8f7f99025576e42a1592ac7183163bd4d8e7e9ba8a
diff --git a/net-misc/zerotier/zerotier-1.2.12.ebuild b/net-misc/zerotier/zerotier-1.2.12.ebuild
index fa68ddc1c4f2..6f5351d0790d 100644
--- a/net-misc/zerotier/zerotier-1.2.12.ebuild
+++ b/net-misc/zerotier/zerotier-1.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zerotier/ZeroTierOne/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 S="${WORKDIR}/ZeroTierOne-${PV}"
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /net-misc
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)